tbld/tumbledemerald-legacy
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 5 Wiki Activity

Revert "Fairy type"

Browse Source 
This reverts commit 4b02cad24b.
This commit is contained in:
Skye Chappelle
2022-10-12 01:20:23 +00:00
parent 8eaf584c8b
commit a2b55c487b
10 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_main.h
View File

@ -85,7 +85,7 @@ extern struct MultiPartnerMenuPokemon gMultiPartnerParty[MULTI_PARTY_SIZE];
extern const struct SpriteTemplate gUnusedBattleInitSprite;
extern const struct OamData gOamData_BattleSpriteOpponentSide;
extern const struct OamData gOamData_BattleSpritePlayerSide;
extern const u8 gTypeEffectiveness[339];
extern const u8 gTypeEffectiveness[336];
extern const u8 gTypeNames[NUMBER_OF_MON_TYPES][TYPE_NAME_LENGTH + 1];
extern const struct TrainerMoney gTrainerMoneyTable[];
extern const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1];

3
include/constants/pokemon.h
View File

@ -21,8 +21,7 @@
#define TYPE_ICE 15
#define TYPE_DRAGON 16
#define TYPE_DARK 17
#define TYPE_FAIRY 18
#define NUMBER_OF_MON_TYPES 19
#define NUMBER_OF_MON_TYPES 18
// Pokemon egg groups
#define EGG_GROUP_NONE 0