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

Species info hex (#4798)

Browse Source 
* Adds missing hex in speciesInfo

* fix

* review

* fix compiling

* dumb mistakes
This commit is contained in:
Alex 2024-06-14 10:20:27 +02:00 committed by GitHub
parent a7642da544
commit 9f7222e48b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/pokemon.h
View File

@ -349,7 +349,7 @@ struct Evolution
u16 targetSpecies;
};
struct SpeciesInfo /*0x8C*/
struct SpeciesInfo /*0xC0*/
{
/* 0x00 */ u8 baseHP;
/* 0x01 */ u8 baseAttack;
@ -445,15 +445,15 @@ struct SpeciesInfo /*0x8C*/
// Move Data
/* 0x80 */ const struct LevelUpMove *levelUpLearnset;
/* 0x84 */ const u16 *teachableLearnset;
const u16 *eggMoveLearnset;
/* 0x88 */ const struct Evolution *evolutions;
/* 0x84 */ const u16 *formSpeciesIdTable;
/* 0x84 */ const struct FormChange *formChangeTable;
/* 0x88 */ const u16 *eggMoveLearnset;
/* 0x8C */ const struct Evolution *evolutions;
/* 0x90 */ const u16 *formSpeciesIdTable;
/* 0x94 */ const struct FormChange *formChangeTable;
#if OW_POKEMON_OBJECT_EVENTS
struct ObjectEventGraphicsInfo overworldData;
/* 0x98 */ struct ObjectEventGraphicsInfo overworldData;
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
const void* overworldPalette;
const void* overworldShinyPalette;
/* 0xB8 */ const void* overworldPalette;
/* 0xBC */ const void* overworldShinyPalette;
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
#endif //OW_POKEMON_OBJECT_EVENTS
};