atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8.

Browse source
This commit is contained in:
ultima-soul 2020-11-17 10:32:24 -08:00
parent 63bd0ec836
commit e15a86caae
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/battle.h
View file

@ -815,7 +815,7 @@ extern u16 gMoveToLearn;
extern u8 gBattleMonForms[MAX_BATTLERS_COUNT]; extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
extern u32 gFieldStatuses; extern u32 gFieldStatuses;
extern struct FieldTimer gFieldTimers; extern struct FieldTimer gFieldTimers;
extern u16 gBattlerAbility; extern u8 gBattlerAbility;
extern u16 gPartnerSpriteId; extern u16 gPartnerSpriteId;
extern void (*gPreBattleCallback1)(void); extern void (*gPreBattleCallback1)(void);

7
include/pokemon.h
View file

@ -199,8 +199,11 @@ struct BaseStats
/* 0x14 */ u8 eggGroup1; /* 0x14 */ u8 eggGroup1;
/* 0x15 */ u8 eggGroup2; /* 0x15 */ u8 eggGroup2;
/* 0x16 */ u16 abilities[2]; /* 0x16 */ u16 abilities[2];
/* 0x1A */ u8 safariZoneFleeRate; #ifdef POKEMON_EXPANSION
/* 0x1B */ u8 bodyColor : 7; u16 abilityHidden;
#endif
u8 safariZoneFleeRate;
u8 bodyColor : 7;
u8 noFlip : 1; u8 noFlip : 1;
}; };

2
src/battle_main.c
View file

@ -226,7 +226,7 @@ EWRAM_DATA u16 gMoveToLearn = 0;
EWRAM_DATA u8 gBattleMonForms[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u8 gBattleMonForms[MAX_BATTLERS_COUNT] = {0};
EWRAM_DATA u32 gFieldStatuses = 0; EWRAM_DATA u32 gFieldStatuses = 0;
EWRAM_DATA struct FieldTimer gFieldTimers = {0}; EWRAM_DATA struct FieldTimer gFieldTimers = {0};
EWRAM_DATA u16 gBattlerAbility = 0; EWRAM_DATA u8 gBattlerAbility = 0;
EWRAM_DATA u16 gPartnerSpriteId = 0; EWRAM_DATA u16 gPartnerSpriteId = 0;
// IWRAM common vars // IWRAM common vars