diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-15 18:06:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-15 18:06:42 -0600 |
| commit | fb9a365dc6ddfebde03ac1ea3e770b30dbb5dbf2 (patch) | |
| tree | 0960d1d78a4c4b758008cf7fbcab8048d1c371de /include | |
| parent | 1ca3656d74faf8565e0f61b31a1cd3ab22a44706 (diff) | |
| parent | 1d09216e4b776ed03daa83c66fd6600bc43f8d25 (diff) | |
Merge pull request #448 from Meowsy/pokedex-documentation
Pokedex Documentation
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/pokedex.h | 11 | ||||
| -rw-r--r-- | include/pokemon.h | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h index 3aee597de..e3792ac56 100644 --- a/include/global.h +++ b/include/global.h @@ -236,7 +236,7 @@ struct Time struct Pokedex { /*0x00*/ u8 order; - /*0x01*/ u8 unknown1; + /*0x01*/ u8 mode; /*0x02*/ u8 nationalMagic; // must equal 0xDA in order to have National mode /*0x03*/ u8 unknown2; /*0x04*/ u32 unownPersonality; // set when you first see Unown diff --git a/include/pokedex.h b/include/pokedex.h index 3f90e9508..b6d323fd3 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -4,6 +4,15 @@ extern u8 gUnknown_030060B0; extern void (*gUnknown_030060B4)(void); +#define HOENN_DEX_COUNT 202 +#define NATIONAL_DEX_COUNT 386 + +enum +{ + DEX_MODE_HOENN, + DEX_MODE_NATIONAL +}; + enum { FLAG_GET_SEEN, @@ -31,6 +40,6 @@ u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); -u16 sub_80C0E9C(u16, s16, s16, u16); +u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); #endif // GUARD_POKEDEX_H diff --git a/include/pokemon.h b/include/pokemon.h index 1d9fbf0ee..94dae089f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -566,7 +566,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves); u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves); u8 GetNumberOfRelearnableMoves(struct Pokemon *mon); u16 SpeciesToPokedexNum(u16 species); -bool32 sub_806E3F8(u16 species); +bool32 IsSpeciesInHoennDex(u16 species); void ClearBattleMonForms(void); u16 GetBattleBGM(void); void PlayBattleBGM(void); |