From 66e90595785f0e8e6277009ae25b497736394cf6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 11 Nov 2020 21:02:20 -0500 Subject: Move pokedex_screen data from asm to C --- include/graphics.h | 4 ++++ include/strings.h | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 35ef29391..7d3b6a29e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4930,4 +4930,8 @@ extern const u16 gPSSMenu_Pal[]; extern const u16 gUnknown_8E9C3F8[]; extern const u16 gUnknown_8E9C418[]; +// pokedex_screen +extern const u16 gUnknown_8E9C14C[]; +extern const u16 gUnknown_8E9C16C[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/strings.h b/include/strings.h index ce1a41a98..d8f2a649e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1516,4 +1516,27 @@ extern const u8 gUnknown_8419AA2[]; extern const u8 gUnknown_8419ADE[]; extern const u8 gUnknown_8419B18[]; +// pokedex_screen +extern const u8 gText_DexCategory_GrasslandPkmn[]; +extern const u8 gText_DexCategory_ForestPkmn[]; +extern const u8 gText_DexCategory_WatersEdgePkmn[]; +extern const u8 gText_DexCategory_SeaPkmn[]; +extern const u8 gText_DexCategory_CavePkmn[]; +extern const u8 gText_DexCategory_MountainPkmn[]; +extern const u8 gText_DexCategory_RoughTerrainPkmn[]; +extern const u8 gText_DexCategory_UrbanPkmn[]; +extern const u8 gText_DexCategory_RarePkmn[]; +extern const u8 gUnknown_8415EFB[]; +extern const u8 gUnknown_8415E95[]; +extern const u8 gUnknown_8415DE0[]; +extern const u8 gUnknown_8415E88[]; +extern const u8 gUnknown_8415EA4[]; +extern const u8 gUnknown_8415ED5[]; +extern const u8 gUnknown_8415EDF[]; +extern const u8 gUnknown_8415EED[]; +extern const u8 gUnknown_8415EB0[]; +extern const u8 gUnknown_8415EC7[]; +extern const u8 gUnknown_8415F0E[]; +extern const u8 gUnknown_8415F24[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 1d820d4e0f1e1aae078a5209ad0f5f634ef3260d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Nov 2020 00:03:59 -0500 Subject: Clean up pokedex screen text --- include/strings.h | 79 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 35 deletions(-) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index d8f2a649e..28dcec66b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -964,18 +964,50 @@ extern const u8 gText_HereYouGoThankYou[]; extern const u8 gText_NoMoreRoomForThis[]; // pokedex_screen -extern const u8 gUnknown_8415D9C[]; -extern const u8 gUnknown_8415DB8[]; -extern const u8 gUnknown_8415DC4[]; -extern const u8 gUnknown_8415DCA[]; -extern const u8 gUnknown_8415DD1[]; -extern const u8 gUnknown_8415DD7[]; -extern const u8 gUnknown_8415F3D[]; -extern const u8 gUnknown_8415F4A[]; -extern const u8 gUnknown_8415F66[]; -extern const u8 gUnknown_8415F6C[]; -extern const u8 gUnknown_8415FFF[]; -extern const u8 gUnknown_8416002[]; +extern const u8 gText_PokedexTableOfContents[]; +extern const u8 gText_PickOK[]; +extern const u8 gText_Seen[]; +extern const u8 gText_Owned[]; +extern const u8 gText_Kanto[]; +extern const u8 gText_National[]; +extern const u8 gText_PokemonListNoColor[]; +extern const u8 gText_SearchNoColor[]; +extern const u8 gText_5Dashes[]; +extern const u8 gText_PickFlipPageCheckCancel[]; +extern const u8 gText_PokedexNo[]; +extern const u8 gText_Page[]; +extern const u8 gText_DexCategory_GrasslandPkmn[]; +extern const u8 gText_DexCategory_ForestPkmn[]; +extern const u8 gText_DexCategory_WatersEdgePkmn[]; +extern const u8 gText_DexCategory_SeaPkmn[]; +extern const u8 gText_DexCategory_CavePkmn[]; +extern const u8 gText_DexCategory_MountainPkmn[]; +extern const u8 gText_DexCategory_RoughTerrainPkmn[]; +extern const u8 gText_DexCategory_UrbanPkmn[]; +extern const u8 gText_DexCategory_RarePkmn[]; +extern const u8 gText_PokemonList[]; +extern const u8 gText_NumericalMode[]; +extern const u8 gText_PokemonHabitats[]; +extern const u8 gText_Search[]; +extern const u8 gText_AToZMode[]; +extern const u8 gText_TypeMode[]; +extern const u8 gText_LightestMode[]; +extern const u8 gText_SmallestMode[]; +extern const u8 gText_PokedexOther[]; +extern const u8 gText_ClosePokedex[]; +extern const u8 gText_NumericalModeKanto[]; +extern const u8 gText_NumericalModeNational[]; +extern const u8 gText_PokedexPokemon[]; +extern const u8 gText_HT[]; +extern const u8 gText_WT[]; +extern const u8 gText_Lbs[]; +extern const u8 gText_Cry[]; +extern const u8 gText_NextDataCancel[]; +extern const u8 gText_Next[]; +extern const u8 gText_CancelPreviousData[]; +extern const u8 gText_Area[]; +extern const u8 gText_Size[]; +extern const u8 gText_AreaUnknown[]; // daycare extern const u8 gText_Lv[]; @@ -1516,27 +1548,4 @@ extern const u8 gUnknown_8419AA2[]; extern const u8 gUnknown_8419ADE[]; extern const u8 gUnknown_8419B18[]; -// pokedex_screen -extern const u8 gText_DexCategory_GrasslandPkmn[]; -extern const u8 gText_DexCategory_ForestPkmn[]; -extern const u8 gText_DexCategory_WatersEdgePkmn[]; -extern const u8 gText_DexCategory_SeaPkmn[]; -extern const u8 gText_DexCategory_CavePkmn[]; -extern const u8 gText_DexCategory_MountainPkmn[]; -extern const u8 gText_DexCategory_RoughTerrainPkmn[]; -extern const u8 gText_DexCategory_UrbanPkmn[]; -extern const u8 gText_DexCategory_RarePkmn[]; -extern const u8 gUnknown_8415EFB[]; -extern const u8 gUnknown_8415E95[]; -extern const u8 gUnknown_8415DE0[]; -extern const u8 gUnknown_8415E88[]; -extern const u8 gUnknown_8415EA4[]; -extern const u8 gUnknown_8415ED5[]; -extern const u8 gUnknown_8415EDF[]; -extern const u8 gUnknown_8415EED[]; -extern const u8 gUnknown_8415EB0[]; -extern const u8 gUnknown_8415EC7[]; -extern const u8 gUnknown_8415F0E[]; -extern const u8 gUnknown_8415F24[]; - #endif //GUARD_STRINGS_H -- cgit v1.2.3