diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:30:42 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:30:42 -0400 |
| commit | d31600e70e53fb252fe67e8c427ecb7498719b86 (patch) | |
| tree | f5dd1832dbb2b5f37dd6c46999950c5e63d35e1d /include | |
| parent | f9331f15ef3db551fb288737d1070adfc79150b2 (diff) | |
finish decompiling pokedex
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 10 | ||||
| -rw-r--r-- | include/graphics.h | 5 | ||||
| -rw-r--r-- | include/pokedex.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 12 |
4 files changed, 24 insertions, 5 deletions
diff --git a/include/global.h b/include/global.h index 37c064e79..18db15ea4 100644 --- a/include/global.h +++ b/include/global.h @@ -171,6 +171,8 @@ struct Time /*0x04*/ s8 seconds; }; +#define DEX_FLAGS_NO ((POKEMON_SLOTS_NUMBER / 8) + ((POKEMON_SLOTS_NUMBER % 8) ? 1 : 0)) + struct Pokedex { /*0x00*/ u8 order; @@ -180,8 +182,8 @@ struct Pokedex /*0x04*/ u32 unownPersonality; // set when you first see Unown /*0x08*/ u32 spindaPersonality; // set when you first see Spinda /*0x0C*/ u32 unknown3; - /*0x10*/ u8 owned[52]; - /*0x44*/ u8 seen[52]; + /*0x10*/ u8 owned[DEX_FLAGS_NO]; + /*0x44*/ u8 seen[DEX_FLAGS_NO]; }; struct PokemonJumpResults // possibly used in the game itself? @@ -657,7 +659,7 @@ struct SaveBlock1 /*0x690*/ struct ItemSlot bagPocket_TMHM[64]; /*0x790*/ struct ItemSlot bagPocket_Berries[46]; /*0x848*/ struct Pokeblock pokeblocks[POKEBLOCKS_COUNT]; - /*0x988*/ u8 seen1[52]; + /*0x988*/ u8 seen1[DEX_FLAGS_NO]; /*0x9BC*/ u16 berryBlenderRecords[3]; /*0x9C2*/ u8 field_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; @@ -713,7 +715,7 @@ struct SaveBlock1 /*0x322C*/ u8 field_322C[1276]; /*0x3728*/ struct RamScript ramScript; /*0x3B14*/ struct RecordMixingGift recordMixingGift; - /*0x3B24*/ u8 seen2[52]; + /*0x3B24*/ u8 seen2[DEX_FLAGS_NO]; /*0x3B58*/ LilycoveLady lilycoveLady; /*0x3B88*/ u8 filler_3B88[0x10]; /*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20]; diff --git a/include/graphics.h b/include/graphics.h index 36b337753..4b93606b6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2667,6 +2667,11 @@ extern const u8 gUnknown_08DC3198[]; extern const u8 gUnknown_08DC2E6C[]; extern const u8 gUnknown_08DC2F5C[]; extern const u8 gUnknown_08DC2FEC[]; +extern const u16 gPokedexCaughtScreenFade_Pal[]; +extern const u8 gPokedexSearchMenu_Gfx[]; +extern const u8 gPokedexSearch2_Tilemap[]; +extern const u8 gPokedexSearch1_Tilemap[]; +extern const u16 gPokedexSearchMenu_Pal[]; // berry tag screen extern const u8 gUnknown_08D9BB44[]; diff --git a/include/pokedex.h b/include/pokedex.h index 19e1162e2..f9e236588 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -2,7 +2,7 @@ #define GUARD_POKEDEX_H void ResetPokedex(void); -void CopyMonCategoryText(u16 species, u8 *dst); +void CopyMonCategoryText(u32 species, u8 *dst); u16 GetPokedexHeightWeight(u16 dexNum, u8 data); u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); diff --git a/include/strings.h b/include/strings.h index c51824225..b8caf80a0 100644 --- a/include/strings.h +++ b/include/strings.h @@ -370,6 +370,18 @@ extern const u8 gText_CantBeUsedOnPkmn[]; extern const u8 gText_CryOf[]; extern const u8 gText_SizeComparedTo[]; +extern const u8 gText_PokedexRegistration[]; +extern const u8 gText_UnkCtrlF908Clear01[]; +extern const u8 sText_TenDashes2[]; +extern const u8 gText_5MarksPokemon[]; +extern const u8 gText_UnkHeight[]; +extern const u8 gText_UnkWeight[]; +extern const u8 gText_HTHeight[]; +extern const u8 gText_WTWeight[]; +extern const u8 gText_SearchingPleaseWait[]; +extern const u8 gText_SearchCompleted[]; +extern const u8 gUnknown_085E8785[]; +extern const u8 gText_SelectorArrow[]; //birch dex rating text extern const u8 gBirchDexRatingText_LessThan10[]; |