Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1465 from ExpoSeed/BE/num_ability_slots

Browse Source 
Introduce NUM_ABILITY_SLOTS
This commit is contained in:
ghoulslash 2021-05-04 09:49:35 -06:00 committed by GitHub
commit 3d22799cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 MON_PIC_SIZE (64 * 64 / 2)
#define NUM_ABILITY_SLOTS 2
#endif // GUARD_CONSTANTS_POKEMON_H #endif // GUARD_CONSTANTS_POKEMON_H

5
include/pokemon.h
View File

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