From 4a71a61e58507281252eb0406fea966d6fb7ebd4 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 15 Feb 2018 18:20:19 -0500 Subject: start decompiling --- include/global.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/global.h b/include/global.h index 4a71a8a87..1f272f969 100644 --- a/include/global.h +++ b/include/global.h @@ -37,6 +37,7 @@ #define PARTY_SIZE 6 +#define POKEMON_SLOTS_NUMBER 412 #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 -- cgit v1.2.3 From 3006ff177b1020c0270ff33f48b3216c9d5381b1 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Fri, 30 Mar 2018 16:48:30 -0400 Subject: pushing so I can pull from master --- include/graphics.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 6e5de9ef4..4cb7ec814 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2651,8 +2651,17 @@ extern const u8 gBattleTerrainPalette_StadiumGlacia[]; extern const u8 gBattleTerrainPalette_StadiumDrake[]; extern const u8 gBattleTerrainPalette_StadiumWallace[]; +// pokedex extern const u8 gPokedexMenu2_Gfx[]; -extern const u8 gPokedexText_Pal[]; +extern const u16 gPokedexText_Pal[]; +extern const u8 gPokedexMenu_Gfx[]; +extern const u8 gUnknown_08DC2C5C[]; +extern const u8 gUnknown_08DC2DAC[]; +extern const u8 gUnknown_08DC2A08[]; +extern const u8 gUnknown_08DC2B1C[]; +extern const u16 gPokedexHoennBg_Pal[]; +extern const u16 gPokedexText_Pal[]; +extern const u16 gPokedexNationalBg_Pal[]; // berry tag screen extern const u8 gUnknown_08D9BB44[]; -- cgit v1.2.3 From f9331f15ef3db551fb288737d1070adfc79150b2 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Mon, 30 Apr 2018 20:41:17 -0400 Subject: decompiled up to sub_80BFCF4 --- include/graphics.h | 5 +++++ include/pokedex_area_screen.h | 6 ++++++ include/pokedex_cry_screen.h | 19 +++++++++++++++++++ include/strings.h | 5 +++++ 4 files changed, 35 insertions(+) create mode 100755 include/pokedex_area_screen.h create mode 100755 include/pokedex_cry_screen.h (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 1fbccea05..36b337753 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2662,6 +2662,11 @@ extern const u8 gUnknown_08DC2B1C[]; extern const u16 gPokedexHoennBg_Pal[]; extern const u16 gPokedexText_Pal[]; extern const u16 gPokedexNationalBg_Pal[]; +extern const u8 gUnknown_08DC3080[]; +extern const u8 gUnknown_08DC3198[]; +extern const u8 gUnknown_08DC2E6C[]; +extern const u8 gUnknown_08DC2F5C[]; +extern const u8 gUnknown_08DC2FEC[]; // berry tag screen extern const u8 gUnknown_08D9BB44[]; diff --git a/include/pokedex_area_screen.h b/include/pokedex_area_screen.h new file mode 100755 index 000000000..2fb5ade51 --- /dev/null +++ b/include/pokedex_area_screen.h @@ -0,0 +1,6 @@ +#ifndef GUARD_POKEDEX_AREA_SCREEN_H +#define GUARD_POKEDEX_AREA_SCREEN_H + +void sub_813D3D8(u16, u8*); + +#endif // GUARD_POKEDEX_AREA_SCREEN_H diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h new file mode 100755 index 000000000..6b5cc13f2 --- /dev/null +++ b/include/pokedex_cry_screen.h @@ -0,0 +1,19 @@ +#ifndef GUARD_POKEDEX_CRY_SCREEN_H +#define GUARD_POKEDEX_CRY_SCREEN_H + +struct CryRelatedStruct +{ + u16 unk0; + u8 unk2; + u8 paletteNo; + u8 xPos; + u8 yPos; +}; + +bool8 sub_8145354(struct CryRelatedStruct*, u8); +void sub_814545C(u8); +void sub_8145534(u16); +void sub_8145914(void); +bool8 sub_8145850(struct CryRelatedStruct*, u8); + +#endif diff --git a/include/strings.h b/include/strings.h index 7c81dbcfb..c51824225 100644 --- a/include/strings.h +++ b/include/strings.h @@ -366,6 +366,11 @@ extern const u8 gText_ThreeDashes[]; extern const u8 gText_PkmnHPRestoredByVar2[]; extern const u8 gText_CantBeUsedOnPkmn[]; +//pokedex text + +extern const u8 gText_CryOf[]; +extern const u8 gText_SizeComparedTo[]; + //birch dex rating text extern const u8 gBirchDexRatingText_LessThan10[]; extern const u8 gBirchDexRatingText_LessThan20[]; -- cgit v1.2.3 From d31600e70e53fb252fe67e8c427ecb7498719b86 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 10 May 2018 03:30:42 -0400 Subject: finish decompiling pokedex --- include/global.h | 10 ++++++---- include/graphics.h | 5 +++++ include/pokedex.h | 2 +- include/strings.h | 12 ++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) (limited to 'include') 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[]; -- cgit v1.2.3