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

Merge branch 'num_ability_slots' into BE/num_ability_slots

Browse source
This commit is contained in:
ExpoSeed 2021-04-16 20:45:34 -05:00
commit 27c6964a05
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/pokemon.h
View file

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

5
include/pokemon.h
View file

@ -201,10 +201,7 @@ struct BaseStats
/* 0x13 */ u8 growthRate;
/* 0x14 */ u8 eggGroup1;
/* 0x15 */ u8 eggGroup2;
/* 0x16 */ u16 abilities[2];
#ifdef POKEMON_EXPANSION
u16 abilityHidden;
#endif
/* 0x16 */ u16 abilities[NUM_ABILITY_SLOTS];
u8 safariZoneFleeRate;
u8 bodyColor : 7;
u8 noFlip : 1;