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

Introduce NUM_ABILITY_SLOTS

Browse source
This commit is contained in:
ExpoSeed 2021-04-16 20:36:45 -05:00
parent d24ee25c94
commit db2b995bc6
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/pokemon.h
View file

@ -368,4 +368,6 @@
#define MON_PIC_SIZE (64 * 64 / 2)
#define NUM_ABILITY_SLOTS 2
#endif // GUARD_CONSTANTS_POKEMON_H

10
include/pokemon.h
View file

@ -204,12 +204,12 @@ struct BaseStats
/* 0x13 */ u8 growthRate;
/* 0x14 */ u8 eggGroup1;
/* 0x15 */ u8 eggGroup2;
/* 0x16 */ u8 abilities[2];
/* 0x18 */ u8 abilityHidden;
/* 0x19 */ u8 safariZoneFleeRate;
/* 0x1A */ u8 bodyColor : 7;
/* 0x16 */ u8 abilities[NUM_ABILITY_SLOTS];
u8 abilityHidden;
u8 safariZoneFleeRate;
u8 bodyColor : 7;
u8 noFlip : 1;
/* 0x1B */ u8 flags;
u8 flags;
};
struct BattleMove