diff --git a/include/daycare.h b/include/daycare.h index ac6e4281c5..c9a8c614cb 100644 --- a/include/daycare.h +++ b/include/daycare.h @@ -30,9 +30,7 @@ void SetDaycareCompatibilityString(void); bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio); void ShowDaycareLevelMenu(void); void ChooseSendDaycareMon(void); -#if POKEDEX_PLUS_HGSS == TRUE u8 GetEggMovesSpecies(u16 species, u16 *eggMoves); bool8 SpeciesCanLearnEggMove(u16 species, u16 move); -#endif #endif // GUARD_DAYCARE_H diff --git a/src/daycare.c b/src/daycare.c index 42493bb92b..380a390b0b 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -774,7 +774,6 @@ static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves) return numEggMoves; } -#if POKEDEX_PLUS_HGSS == TRUE u8 GetEggMovesSpecies(u16 species, u16 *eggMoves) { u16 eggMoveIdx; @@ -831,7 +830,6 @@ bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HG } return FALSE; } -#endif static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother) { diff --git a/src/fonts.c b/src/fonts.c index 8ae3b63904..381fd795e9 100644 --- a/src/fonts.c +++ b/src/fonts.c @@ -37,7 +37,6 @@ ALIGNED(4) const u8 gFontSmallNarrowLatinGlyphWidths[] = { }; ALIGNED(4) const u16 gFontSmallLatinGlyphs[] = INCBIN_U16("graphics/fonts/small.latfont"); -#if POKEDEX_PLUS_HGSS == TRUE ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = { 3, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 3, 5, 5, 5, 5, 5, 4, 3, @@ -72,42 +71,6 @@ ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3, }; -#else -ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = { - 3, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 4, 4, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 3, 5, 5, 5, 5, 5, 4, 3, - 4, 4, 5, 5, 5, 6, 5, 5, 5, 5, 5, 5, 8, 7, 8, 3, - 3, 3, 3, 3, 8, 8, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 5, 5, 5, 8, 8, 8, 8, 8, 8, 8, 4, 7, 5, 5, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 3, 3, 3, 3, 3, 4, - 3, 3, 3, 3, 3, 3, 3, 5, 3, 8, 8, 8, 8, 1, 2, 3, - 4, 5, 6, 7, 5, 7, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 8, 5, 8, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, - 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 8, - 7, 5, 5, 5, 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3, -}; -#endif ALIGNED(4) const u16 gFontNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/narrow.latfont"); ALIGNED(4) const u8 gFontNarrowLatinGlyphWidths[] = { diff --git a/src/graphics.c b/src/graphics.c index b2065356bf..5601ad2303 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1741,37 +1741,37 @@ const u32 gPokedexSearchMenuNational_Tilemap[] = INCBIN_U32("graphics/pokedex/se const u32 gPokedexSearchMenuHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_hoenn.bin.lz"); // Pokedex HGSS #if POKEDEX_PLUS_HGSS == TRUE -const u16 gPokedexPlusHGSS_Default_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_default.gbapal"); -const u16 gPokedexPlusHGSS_National_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_national.gbapal"); -const u16 gPokedexPlusHGSS_MenuSearch_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_menu.gbapal"); -const u16 gPokedexPlusHGSS_SearchResults_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_results.gbapal"); -const u16 gPokedexPlusHGSS_Default_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_default_dark.gbapal"); -const u16 gPokedexPlusHGSS_National_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_national_dark.gbapal"); -const u16 gPokedexPlusHGSS_MenuSearch_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_menu_dark.gbapal"); -const u16 gPokedexPlusHGSS_SearchResults_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_results_dark.gbapal"); -const u32 gPokedexPlusHGSS_MenuList_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_list.4bpp.lz"); -const u32 gPokedexPlusHGSS_MenuList_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_list_DECA.4bpp.lz"); -const u32 gPokedexPlusHGSS_Interface_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_interface.4bpp.lz"); -const u32 gPokedexPlusHGSS_Interface_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_interface_DECA.4bpp.lz"); -const u32 gPokedexPlusHGSS_Menu_1_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu1.4bpp.lz"); -const u32 gPokedexPlusHGSS_Menu_2_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu2.4bpp.lz"); -const u32 gPokedexPlusHGSS_Menu_3_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu3.4bpp.lz"); -const u32 gPokedexPlusHGSS_MenuSearch_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_search.4bpp.lz"); -const u32 gPokedexPlusHGSS_MenuSearch_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_search_DECA.4bpp.lz"); -const u32 gPokedexPlusHGSS_StartMenuMain_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_start_menu.bin.lz"); -const u32 gPokedexPlusHGSS_StartMenuSearchResults_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_start_menu_search_results.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/SelectBar.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap_Clear[] = INCBIN_U32("graphics/pokedex/hgss/SelectBar_clear.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenList_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_list_screen.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenListUnderlay_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_list_screen_underlay.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenInfo_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_info_screen.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenStats_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_stats_screen.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_evo_screen.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap_PE[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_evo_screen_PE.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenForms_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_forms_screen.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenCry_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_cry_screen.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenSize_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_size_screen.bin.lz"); -const u32 gPokedexPlusHGSS_ScreenSearchHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin.lz"); +const u16 gPokedexPlusHGSS_Default_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_default.gbapal"); +const u16 gPokedexPlusHGSS_National_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_national.gbapal"); +const u16 gPokedexPlusHGSS_MenuSearch_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_menu.gbapal"); +const u16 gPokedexPlusHGSS_SearchResults_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_results.gbapal"); +const u16 gPokedexPlusHGSS_Default_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_default_dark.gbapal"); +const u16 gPokedexPlusHGSS_National_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_national_dark.gbapal"); +const u16 gPokedexPlusHGSS_MenuSearch_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_menu_dark.gbapal"); +const u16 gPokedexPlusHGSS_SearchResults_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_results_dark.gbapal"); +const u32 gPokedexPlusHGSS_MenuList_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_list.4bpp.lz"); +const u32 gPokedexPlusHGSS_MenuList_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_list_DECA.4bpp.lz"); +const u32 gPokedexPlusHGSS_Interface_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_interface.4bpp.lz"); +const u32 gPokedexPlusHGSS_Interface_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_interface_DECA.4bpp.lz"); +const u32 gPokedexPlusHGSS_Menu_1_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu1.4bpp.lz"); +const u32 gPokedexPlusHGSS_Menu_2_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu2.4bpp.lz"); +const u32 gPokedexPlusHGSS_Menu_3_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu3.4bpp.lz"); +const u32 gPokedexPlusHGSS_MenuSearch_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_search.4bpp.lz"); +const u32 gPokedexPlusHGSS_MenuSearch_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_search_DECA.4bpp.lz"); +const u32 gPokedexPlusHGSS_StartMenuMain_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_start_menu.bin.lz"); +const u32 gPokedexPlusHGSS_StartMenuSearchResults_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_start_menu_search_results.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/SelectBar.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap_Clear[] = INCBIN_U32("graphics/pokedex/hgss/SelectBar_clear.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenList_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_list_screen.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenListUnderlay_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_list_screen_underlay.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenInfo_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_info_screen.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenStats_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_stats_screen.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_evo_screen.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap_PE[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_evo_screen_PE.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenForms_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_forms_screen.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenCry_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_cry_screen.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenSize_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_size_screen.bin.lz"); +const u32 gPokedexPlusHGSS_ScreenSearchHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin.lz"); const u32 gPokedexPlusHGSS_ScreenSearchNational_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_search_screen_national.bin.lz"); #endif diff --git a/src/pokedex.c b/src/pokedex.c index cf30ba549a..42bb44798e 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -14,11 +14,9 @@ #include "overworld.h" #include "palette.h" #include "pokedex.h" -#if POKEDEX_PLUS_HGSS == TRUE -#include "pokedex_plus_hgss.h" -#endif #include "pokedex_area_screen.h" #include "pokedex_cry_screen.h" +#include "pokedex_plus_hgss.h" #include "scanline_effect.h" #include "sound.h" #include "sprite.h" diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index 2bef72589f..d5aa3f96c9 100755 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -667,7 +667,6 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId) return; break; case 1: -#if POKEDEX_PLUS_HGSS == TRUE if (JOY_NEW(B_BUTTON)) { gTasks[taskId].data[1] = 1; @@ -691,31 +690,6 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId) else return; break; -#else - if (JOY_NEW(B_BUTTON)) - { - gTasks[taskId].data[1] = 1; - PlaySE(SE_DEX_PAGE); - } - else if (JOY_NEW(DPAD_LEFT) || (JOY_NEW(L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) - { - gTasks[taskId].data[1] = 1; - PlaySE(SE_DEX_PAGE); - } - else if (JOY_NEW(DPAD_RIGHT) || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) - { - if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(sPokedexAreaScreen->species), FLAG_GET_CAUGHT)) - { - PlaySE(SE_FAILURE); - return; - } - gTasks[taskId].data[1] = 2; - PlaySE(SE_DEX_PAGE); - } - else - return; - break; -#endif case 2: BeginNormalPaletteFade(PALETTES_ALL & ~(0x14), 0, 0, 16, RGB_BLACK); break; diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 4ca784e3a9..da9a320935 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -204,7 +204,7 @@ struct PokedexListItem u16 owned:1; }; -//HGSS_Ui + struct PokemonStats { u16 species; @@ -268,21 +268,21 @@ struct PokedexView u16 seenCount; u16 ownCount; u16 monSpriteIds[MAX_MONS_ON_SCREEN]; - u8 typeIconSpriteIds[2]; //HGSS_Ui - u16 moveSelected; //HGSS_Ui - u8 movesTotal; //HGSS_Ui - u8 statBarsSpriteId; //HGSS_Ui - u8 statBarsBgSpriteId; //HGSS_Ui - bool8 justScrolled; //HGSS_Ui - u8 splitIconSpriteId; //HGSS_Ui Physical/Special Split - u8 numEggMoves; //HGSS_Ui - u8 numLevelUpMoves; //HGSS_Ui - u8 numTMHMMoves; //HGSS_Ui - u8 numTutorMoves; //HGSS_Ui - u8 numPreEvolutions; //HGSS_Ui - struct PokemonStats sPokemonStats; //HGSS_Ui - struct EvoScreenData sEvoScreenData; //HGSS_Ui - struct FromScreenData sFormScreenData; //HGSS_Ui + u8 typeIconSpriteIds[2]; + u16 moveSelected; + u8 movesTotal; + u8 statBarsSpriteId; + u8 statBarsBgSpriteId; + bool8 justScrolled; + u8 splitIconSpriteId; //Physical/Special Split + u8 numEggMoves; + u8 numLevelUpMoves; + u8 numTMHMMoves; + u8 numTutorMoves; + u8 numPreEvolutions; + struct PokemonStats sPokemonStats; + struct EvoScreenData sEvoScreenData; + struct FromScreenData sFormScreenData; u16 formSpecies; u16 selectedMonSpriteId; u16 pokeBallRotationStep; @@ -452,14 +452,14 @@ static void CreateStatBarsBg(void); static void SpriteCB_StatBars(struct Sprite *sprite); static void SpriteCB_StatBarsBg(struct Sprite *sprite); -//HGSS_UI Forms screen +//Forms screen static void Task_LoadFormsScreen(u8 taskId); static void Task_HandleFormsScreenInput(u8 taskId); static void PrintForms(u8 taskId, u16 species); static void Task_SwitchScreensFromFormsScreen(u8 taskId); static void Task_ExitFormsScreen(u8 taskId); -//HGSS_UI Physical Special Split icon +//Physical Special Split icon static u8 ShowSplitIcon(u32 split); //Physical/Special Split from BE static void DestroySplitIcon(void); //Physical/Special Split from BE @@ -518,7 +518,7 @@ static const struct SpriteTemplate sSpriteTemplate_SplitIcons = .callback = SpriteCallbackDummy }; -//HGSS_Ui Stat bars by DizzyEgg +//Stat bars by DizzyEgg #define TAG_STAT_BAR 4097 #define TAG_STAT_BAR_BG 4098 static const struct OamData sOamData_StatBar = @@ -2066,7 +2066,7 @@ static void Task_HandlePokedexInput(u8 taskId) if (sPokedexView->menuY) { sPokedexView->menuY -= 8; - if (sPokedexView->menuIsOpen == FALSE && sPokedexView->menuY == 8) //HGSS_Ui + if (sPokedexView->menuIsOpen == FALSE && sPokedexView->menuY == 8) { CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); CreateStatBarsBg(); @@ -2076,7 +2076,7 @@ static void Task_HandlePokedexInput(u8 taskId) { if (JOY_NEW(A_BUTTON) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen) { - TryDestroyStatBars(); //HGSS_Ui + TryDestroyStatBars(); UpdateSelectedMonSpriteId(); BeginNormalPaletteFade(~(1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16)), 0, 0, 0x10, RGB_BLACK); gSprites[sPokedexView->selectedMonSpriteId].callback = SpriteCB_MoveMonForInfoScreen; @@ -2086,8 +2086,8 @@ static void Task_HandlePokedexInput(u8 taskId) } else if (JOY_NEW(START_BUTTON)) { - TryDestroyStatBars(); //HGSS_Ui - TryDestroyStatBarsBg(); //HGSS_Ui + TryDestroyStatBars(); + TryDestroyStatBarsBg(); sPokedexView->menuY = 0; sPokedexView->menuIsOpen = TRUE; sPokedexView->menuCursorPos = 0; @@ -2110,7 +2110,7 @@ static void Task_HandlePokedexInput(u8 taskId) } else if (JOY_NEW(B_BUTTON)) { - TryDestroyStatBars(); //HGSS_Ui + TryDestroyStatBars(); BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ClosePokedex; PlaySE(SE_PC_OFF); @@ -2121,15 +2121,15 @@ static void Task_HandlePokedexInput(u8 taskId) sPokedexView->selectedPokemon = TryDoPokedexScroll(sPokedexView->selectedPokemon, 0xE); if (sPokedexView->scrollTimer) gTasks[taskId].func = Task_WaitForScroll; - else if (!sPokedexView->scrollTimer && !sPokedexView->scrollSpeed &&sPokedexView->justScrolled) //HGSS_Ui - CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); //HGSS_Ui + else if (!sPokedexView->scrollTimer && !sPokedexView->scrollSpeed &&sPokedexView->justScrolled) + CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); } } } static void Task_WaitForScroll(u8 taskId) { - TryDestroyStatBars(); //HGSS_Ui + TryDestroyStatBars(); if (UpdateDexListScroll(sPokedexView->scrollDirection, sPokedexView->scrollMonIncrement, sPokedexView->maxScrollTimer)) gTasks[taskId].func = Task_HandlePokedexInput; } @@ -2320,7 +2320,7 @@ static bool8 LoadPokedexListPage(u8 page) gReservedSpritePaletteCount = 8; LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[HGSS_DECAPPED]); LoadSpritePalettes(sInterfaceSpritePalette); - LoadSpritePalettes(sStatBarSpritePal); //HGSS_Ui + LoadSpritePalettes(sStatBarSpritePal); CreateInterfaceSprites(page); gMain.state++; break; @@ -2331,10 +2331,10 @@ static bool8 LoadPokedexListPage(u8 page) if (page == PAGE_MAIN) CreatePokedexList(sPokedexView->dexMode, sPokedexView->dexOrder); CreateMonSpritesAtPos(sPokedexView->selectedPokemon, 0xE); - sPokedexView->statBarsSpriteId = 0xFF; //HGSS_Ui stat bars - CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); //HGSS_Ui stat bars - sPokedexView->statBarsBgSpriteId = 0xFF; //HGSS_Ui stat bars background - CreateStatBarsBg(); //HGSS_Ui stat bars background + sPokedexView->statBarsSpriteId = 0xFF; //stat bars + CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); //stat bars + sPokedexView->statBarsBgSpriteId = 0xFF; //stat bars background + CreateStatBarsBg(); //stat bars background sPokedexView->menuIsOpen = FALSE; sPokedexView->menuY = 0; CopyBgTilemapBufferToVram(0); @@ -2532,7 +2532,7 @@ static void PrintMonDexNumAndName(u8 windowId, u8 fontId, const u8 *str, u8 left AddTextPrinterParameterized4(windowId, fontId, left * 8, (top * 8) + 1, 0, 0, color, TEXT_SKIP_DRAW, str); } -static void PrintMonDexNumAndName_2(u8 windowId, u8 fontId, const u8* str, u8 left, u8 top) //HGSS_Ui offset for closer numer + text +static void PrintMonDexNumAndName_2(u8 windowId, u8 fontId, const u8* str, u8 left, u8 top) //offset for closer numer + text { u8 color[3]; @@ -2813,7 +2813,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored) selectedMon = GetNextPosition(1, selectedMon, 0, sPokedexView->pokemonListCount - 1); CreateScrollingPokemonSprite(1, selectedMon); CreateMonListEntry(1, selectedMon, ignored); - sPokedexView->justScrolled = TRUE; //HGSS_Ui + sPokedexView->justScrolled = TRUE; PlaySE(SE_DEX_SCROLL); } else if (JOY_HELD(DPAD_DOWN) && (selectedMon < sPokedexView->pokemonListCount - 1)) @@ -2822,7 +2822,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored) selectedMon = GetNextPosition(0, selectedMon, 0, sPokedexView->pokemonListCount - 1); CreateScrollingPokemonSprite(2, selectedMon); CreateMonListEntry(2, selectedMon, ignored); - sPokedexView->justScrolled = TRUE; //HGSS_Ui + sPokedexView->justScrolled = TRUE; PlaySE(SE_DEX_SCROLL); } else if (JOY_NEW(DPAD_LEFT) && (selectedMon > 0)) @@ -2834,7 +2834,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored) sPokedexView->pokeBallRotation += 16 * (selectedMon - startingPos); ClearMonSprites(); CreateMonSpritesAtPos(selectedMon, 0xE); - sPokedexView->justScrolled = TRUE; //HGSS_Ui + sPokedexView->justScrolled = TRUE; PlaySE(SE_DEX_PAGE); } else if (JOY_NEW(DPAD_RIGHT) && (selectedMon < sPokedexView->pokemonListCount - 1)) @@ -2845,7 +2845,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored) sPokedexView->pokeBallRotation += 16 * (selectedMon - startingPos); ClearMonSprites(); CreateMonSpritesAtPos(selectedMon, 0xE); - sPokedexView->justScrolled = TRUE; //HGSS_Ui + sPokedexView->justScrolled = TRUE; PlaySE(SE_DEX_PAGE); } @@ -3528,7 +3528,7 @@ static void CreateStatBars(struct PokedexListItem *dexMon) } sPokedexView->statBarsSpriteId = CreateSprite(&sStatBarSpriteTemplate, 36+offset_x, 107+offset_y, 10); } -static void CreateStatBarsBg(void) //HGSS_Ui stat bars background text +static void CreateStatBarsBg(void) //stat bars background text { static const struct SpriteSheet sheetStatBarsBg = {sStatBarsGfx, 64 * 64, TAG_STAT_BAR_BG}; u8 offset_x = 184; //Moves the complete stat box left/right @@ -3845,7 +3845,7 @@ static void Task_LoadAreaScreen(u8 taskId) } break; case 1: - LoadScreenSelectBarSubmenu(0xD); //HGSS_Ui + LoadScreenSelectBarSubmenu(0xD); LoadPokedexBgPalette(sPokedexView->isSearchResults); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256); gMain.state++; @@ -3906,7 +3906,7 @@ static void LoadScreenSelectBarSubmenu(u16 unused) CopyBgTilemapBufferToVram(1); } -static void HighlightScreenSelectBarItem(u8 selectedScreen, u16 unused) //HGSS_Ui +static void HighlightScreenSelectBarItem(u8 selectedScreen, u16 unused) { u8 i; u8 j; @@ -4160,7 +4160,7 @@ static void PrintInfoScreenText(const u8 *str, u8 left, u8 top) AddTextPrinterParameterized4(0, 1, left, top, 0, 0, color, -1, str); } -static void PrintInfoScreenTextWhite(const u8* str, u8 left, u8 top) //HGSS_Ui +static void PrintInfoScreenTextWhite(const u8* str, u8 left, u8 top) { u8 color[3]; color[0] = TEXT_COLOR_TRANSPARENT; @@ -4320,13 +4320,13 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry) else value = num; ConvertIntToDecimalStringN(StringCopy(str, gText_NumberClear01), value, STR_CONV_MODE_LEADING_ZEROS, 3); - PrintInfoScreenTextWhite(str, 123, 17); //HGSS_Ui + PrintInfoScreenTextWhite(str, 123, 17); species = NationalPokedexNumToSpeciesHGSS(num); if (species) name = gSpeciesNames[species]; else name = sText_TenDashes2; - PrintInfoScreenTextWhite(name, 157, 17); //HGSS_Ui + PrintInfoScreenTextWhite(name, 157, 17); if (owned) { CopyMonCategoryText(num, str2); @@ -4336,18 +4336,18 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry) { category = gText_5MarksPokemon; } - PrintInfoScreenText(category, 123, 31); //HGSS_Ui - PrintInfoScreenText(gText_HTHeight, 155, 64); //HGSS_Ui - PrintInfoScreenText(gText_WTWeight, 155, 77); //HGSS_Ui + PrintInfoScreenText(category, 123, 31); + PrintInfoScreenText(gText_HTHeight, 155, 64); + PrintInfoScreenText(gText_WTWeight, 155, 77); if (owned) { - PrintMonHeight(gPokedexEntries[num].height, 180, 64); //HGSS_Ui - PrintMonWeight(gPokedexEntries[num].weight, 180, 77); //HGSS_Ui + PrintMonHeight(gPokedexEntries[num].height, 180, 64); + PrintMonWeight(gPokedexEntries[num].weight, 180, 77); } else { - PrintInfoScreenText(gText_UnkHeight, 180, 64); //HGSS_Ui - PrintInfoScreenText(gText_UnkWeight, 180, 77); //HGSS_Ui + PrintInfoScreenText(gText_UnkHeight, 180, 64); + PrintInfoScreenText(gText_UnkWeight, 180, 77); } if (owned) { @@ -4355,11 +4355,11 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry) } else description = sExpandedPlaceholder_PokedexDescription; - PrintInfoScreenText(description, GetStringCenterAlignXOffset(FONT_NORMAL, description, 0xF0), 93); //HGSS_Ui + PrintInfoScreenText(description, GetStringCenterAlignXOffset(FONT_NORMAL, description, 0xF0), 93); - //Type Icon(s) //HGSS_Ui + //Type Icon(s) if (owned) - PrintCurrentSpeciesTypeInfo(newEntry, species); //HGSS_Ui + PrintCurrentSpeciesTypeInfo(newEntry, species); } static void PrintMonHeight(u16 height, u8 left, u8 top) @@ -6022,7 +6022,7 @@ static void Task_LoadEvolutionScreen(u8 taskId) LoadMonIconPalette(NationalPokedexNumToSpeciesHGSS(sPokedexListItem->dexNum)); //Loads pallete for current mon PrintPreEvolutions(taskId, NationalPokedexNumToSpeciesHGSS(sPokedexListItem->dexNum)); gTasks[taskId].data[4] = CreateMonIcon(NationalPokedexNumToSpeciesHGSS(sPokedexListItem->dexNum), SpriteCB_MonIcon, 18 + 32*sPokedexView->numPreEvolutions, 31, 4, 0); //Create pokemon sprite - EvoFormsPage_PrintNavigationButtons(); //HGSS_Ui Navigation buttons + EvoFormsPage_PrintNavigationButtons(); // Navigation buttons gSprites[gTasks[taskId].data[4]].oam.priority = 0; } gMain.state++; @@ -6699,7 +6699,7 @@ static void Task_LoadFormsScreen(u8 taskId) gTasks[taskId].data[4] = CreateMonIcon(NationalPokedexNumToSpeciesHGSS(sPokedexListItem->dexNum), SpriteCB_MonIcon, 18, 31, 4, 0); //Create pokemon sprite gSprites[gTasks[taskId].data[4]].oam.priority = 0; } - EvoFormsPage_PrintNavigationButtons(); //HGSS_Ui Navigation buttons + EvoFormsPage_PrintNavigationButtons(); // Navigation buttons sPokedexView->sFormScreenData.menuPos = 1; gMain.state++; break; @@ -6988,7 +6988,7 @@ static void Task_LoadCryScreen(u8 taskId) gMain.state++; break; case 2: - LoadScreenSelectBarMain(0xD); //HGSS_Ui + LoadScreenSelectBarMain(0xD); LoadPokedexBgPalette(sPokedexView->isSearchResults); gMain.state++; break; @@ -7173,7 +7173,7 @@ static void Task_LoadSizeScreen(u8 taskId) gMain.state++; break; case 2: - LoadScreenSelectBarMain(0xD); //HGSS_Ui + LoadScreenSelectBarMain(0xD); LoadPokedexBgPalette(sPokedexView->isSearchResults); gMain.state++; break; @@ -7312,8 +7312,8 @@ static void Task_WaitForExitSearch(u8 taskId) if (!gTasks[gTasks[taskId].tLoadScreenTaskId].isActive) { ClearMonSprites(); - TryDestroyStatBars(); //HGSS_Ui - TryDestroyStatBarsBg(); //HGSS_Ui + TryDestroyStatBars(); + TryDestroyStatBarsBg(); // Search produced results if (sPokedexView->screenSwitchState != 0) @@ -7352,7 +7352,7 @@ static void Task_HandleSearchResultsInput(u8 taskId) if (sPokedexView->menuY) { sPokedexView->menuY -= 8; - if (sPokedexView->menuIsOpen == FALSE && sPokedexView->menuY == 8) //HGSS_Ui + if (sPokedexView->menuIsOpen == FALSE && sPokedexView->menuY == 8) { CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); CreateStatBarsBg(); @@ -7364,7 +7364,7 @@ static void Task_HandleSearchResultsInput(u8 taskId) { u32 a; - TryDestroyStatBars(); //HGSS_Ui + TryDestroyStatBars(); UpdateSelectedMonSpriteId(); a = (1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16)); gSprites[sPokedexView->selectedMonSpriteId].callback = SpriteCB_MoveMonForInfoScreen; @@ -7375,8 +7375,8 @@ static void Task_HandleSearchResultsInput(u8 taskId) } else if (JOY_NEW(START_BUTTON)) { - TryDestroyStatBars(); //HGSS_Ui - TryDestroyStatBarsBg(); //HGSS_Ui + TryDestroyStatBars(); + TryDestroyStatBarsBg(); sPokedexView->menuY = 0; sPokedexView->menuIsOpen = TRUE; sPokedexView->menuCursorPos = 0; @@ -7394,7 +7394,7 @@ static void Task_HandleSearchResultsInput(u8 taskId) } else if (JOY_NEW(B_BUTTON)) { - TryDestroyStatBars(); //HGSS_Ui + TryDestroyStatBars(); BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ReturnToPokedexFromSearchResults; PlaySE(SE_PC_OFF); @@ -7405,15 +7405,15 @@ static void Task_HandleSearchResultsInput(u8 taskId) sPokedexView->selectedPokemon = TryDoPokedexScroll(sPokedexView->selectedPokemon, 0xE); if (sPokedexView->scrollTimer) gTasks[taskId].func = Task_WaitForSearchResultsScroll; - else if (!sPokedexView->scrollTimer && !sPokedexView->scrollSpeed && sPokedexView->justScrolled) //HGSS_Ui - CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); //HGSS_Ui + else if (!sPokedexView->scrollTimer && !sPokedexView->scrollSpeed && sPokedexView->justScrolled) + CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); } } } static void Task_WaitForSearchResultsScroll(u8 taskId) { - TryDestroyStatBars(); //HGSS_Ui + TryDestroyStatBars(); if (UpdateDexListScroll(sPokedexView->scrollDirection, sPokedexView->scrollMonIncrement, sPokedexView->maxScrollTimer)) gTasks[taskId].func = Task_HandleSearchResultsInput; } @@ -7738,7 +7738,7 @@ static void Task_LoadSearchMenu(u8 taskId) case 1: LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[HGSS_DECAPPED]); LoadSpritePalettes(sInterfaceSpritePalette); - LoadSpritePalettes(sStatBarSpritePal); //HGSS_Ui + LoadSpritePalettes(sStatBarSpritePal); CreateSearchParameterScrollArrows(taskId); for (i = 0; i < NUM_TASK_DATA; i++) gTasks[taskId].data[i] = 0; @@ -7753,8 +7753,8 @@ static void Task_LoadSearchMenu(u8 taskId) break; case 2: BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); - sPokedexView->statBarsSpriteId = 0xFF; //HGSS_Ui - CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); //HGSS_Ui + sPokedexView->statBarsSpriteId = 0xFF; + CreateStatBars(&sPokedexView->pokedexList[sPokedexView->selectedPokemon]); gMain.state++; break; case 3: diff --git a/src/strings.c b/src/strings.c index 5c96c9a4c8..292a5e4ee1 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1836,128 +1836,128 @@ const u8 gText_ExpShareOff[] = _("The Exp. Share has been turned off.{PAUSE_UNTI //HGSS_Ui PokedexPlus #if POKEDEX_PLUS_HGSS == TRUE -const u8 gText_Stats_Buttons[] = _("{A_BUTTON}TOGGLE {DPAD_UPDOWN}MOVES"); -const u8 gText_Stats_Buttons_Decapped[] = _("{A_BUTTON}Toggle {DPAD_UPDOWN}Moves"); -const u8 gText_Stats_HP[] = _("HP"); -const u8 gText_Stats_Attack[] = _("ATK"); -const u8 gText_Stats_Defense[] = _("DEF"); -const u8 gText_Stats_Speed[] = _("SPE"); -const u8 gText_Stats_SpAttack[] = _("SP.A"); -const u8 gText_Stats_SpDefense[] = _("SP.D"); -const u8 gText_Stats_EV_Plus1[] = _("{UP_ARROW_2}"); -const u8 gText_Stats_EV_Plus2[] = _("{UP_ARROW_2}{UP_ARROW_2}"); -const u8 gText_Stats_EV_Plus3[] = _("{UP_ARROW_2}{UP_ARROW_2}{UP_ARROW_2}"); -const u8 gText_Stats_EvStr1Str2[] = _("{STR_VAR_1}{STR_VAR_2}"); -const u8 gText_Stats_MoveSelectedMax[] = _("{STR_VAR_1} / {STR_VAR_2}"); -const u8 gText_Stats_MoveLevel[] = _("LVL"); -const u8 gText_Stats_Gender_0[] = _("♂"); -const u8 gText_Stats_Gender_12_5[] = _("♀ 1/7 ♂"); //_("♀ 12.5 / 87.5 ♂"); -const u8 gText_Stats_Gender_25[] = _("♀ 1/3 ♂"); //_("♀ 25 / 75 ♂"); -const u8 gText_Stats_Gender_50[] = _("♀ 1/1 ♂"); //_("♀ 50 / 50 ♂"); -const u8 gText_Stats_Gender_75[] = _("♀ 3/1 ♂"); //_("♀ 75 / 25 ♂"); -const u8 gText_Stats_Gender_87_5[] = _("♀ 7/1 ♂"); -const u8 gText_Stats_Gender_100[] = _("♀"); -const u8 gText_Stats_CatchRate[] = _("CATCH{0x5B}: "); -const u8 gText_Stats_CatchRate_Legend[] = _("LEGENDARY"); -const u8 gText_Stats_CatchRate_VeryHard[] = _("VERY HARD"); -const u8 gText_Stats_CatchRate_Difficult[] = _("DIFFICULT"); -const u8 gText_Stats_CatchRate_Medium[] = _("MEDIUM"); -const u8 gText_Stats_CatchRate_Relaxed[] = _("RELAXED"); -const u8 gText_Stats_CatchRate_Easy[] = _("EASY"); -const u8 gText_Stats_ExpYield[] = _("EXP YIELD: "); -const u8 gText_Stats_EggCycles[] = _("HATCH STEPS:"); -const u8 gText_Stats_EggCycles_VeryFast[] = _("{EMOJI_BOLT}{EMOJI_DIZZYEGG}"); -const u8 gText_Stats_EggCycles_Fast[] = _("{EMOJI_DIZZYEGG}"); -const u8 gText_Stats_EggCycles_Normal[] = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}"); -const u8 gText_Stats_EggCycles_Slow[] = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}"); -const u8 gText_Stats_Growthrate[] = _("GROW: "); -const u8 gText_Stats_Friendship[] = _("FRIENDSHIP:"); -const u8 gText_Stats_Friendship_BigAnger[] = _("{EMOJI_BIGANGER}"); -const u8 gText_Stats_Friendship_Neutral[] = _("{EMOJI_NEUTRAL}"); -const u8 gText_Stats_Friendship_Happy[] = _("{EMOJI_HAPPY}"); -const u8 gText_Stats_Friendship_BigSmile[] = _("{EMOJI_BIGSMILE}"); -const u8 gText_Stats_MEDIUM_FAST[] = _("MED. FAST"); -const u8 gText_Stats_ERRATIC[] = _("ERRATIC"); -const u8 gText_Stats_FLUCTUATING[] = _("FLUCTUATING"); -const u8 gText_Stats_MEDIUM_SLOW[] = _("MED. SLOW"); -const u8 gText_Stats_FAST[] = _("FAST"); -const u8 gText_Stats_SLOW[] = _("SLOW"); -const u8 gText_Stats_ContestHeart[] = _("H"); +const u8 gText_Stats_Buttons[] = _("{A_BUTTON}TOGGLE {DPAD_UPDOWN}MOVES"); +const u8 gText_Stats_Buttons_Decapped[] = _("{A_BUTTON}Toggle {DPAD_UPDOWN}Moves"); +const u8 gText_Stats_HP[] = _("HP"); +const u8 gText_Stats_Attack[] = _("ATK"); +const u8 gText_Stats_Defense[] = _("DEF"); +const u8 gText_Stats_Speed[] = _("SPE"); +const u8 gText_Stats_SpAttack[] = _("SP.A"); +const u8 gText_Stats_SpDefense[] = _("SP.D"); +const u8 gText_Stats_EV_Plus1[] = _("{UP_ARROW_2}"); +const u8 gText_Stats_EV_Plus2[] = _("{UP_ARROW_2}{UP_ARROW_2}"); +const u8 gText_Stats_EV_Plus3[] = _("{UP_ARROW_2}{UP_ARROW_2}{UP_ARROW_2}"); +const u8 gText_Stats_EvStr1Str2[] = _("{STR_VAR_1}{STR_VAR_2}"); +const u8 gText_Stats_MoveSelectedMax[] = _("{STR_VAR_1} / {STR_VAR_2}"); +const u8 gText_Stats_MoveLevel[] = _("LVL"); +const u8 gText_Stats_Gender_0[] = _("♂"); +const u8 gText_Stats_Gender_12_5[] = _("♀ 1/7 ♂"); //_("♀ 12.5 / 87.5 ♂"); +const u8 gText_Stats_Gender_25[] = _("♀ 1/3 ♂"); //_("♀ 25 / 75 ♂"); +const u8 gText_Stats_Gender_50[] = _("♀ 1/1 ♂"); //_("♀ 50 / 50 ♂"); +const u8 gText_Stats_Gender_75[] = _("♀ 3/1 ♂"); //_("♀ 75 / 25 ♂"); +const u8 gText_Stats_Gender_87_5[] = _("♀ 7/1 ♂"); +const u8 gText_Stats_Gender_100[] = _("♀"); +const u8 gText_Stats_CatchRate[] = _("CATCH{0x5B}: "); +const u8 gText_Stats_CatchRate_Legend[] = _("LEGENDARY"); +const u8 gText_Stats_CatchRate_VeryHard[] = _("VERY HARD"); +const u8 gText_Stats_CatchRate_Difficult[] = _("DIFFICULT"); +const u8 gText_Stats_CatchRate_Medium[] = _("MEDIUM"); +const u8 gText_Stats_CatchRate_Relaxed[] = _("RELAXED"); +const u8 gText_Stats_CatchRate_Easy[] = _("EASY"); +const u8 gText_Stats_ExpYield[] = _("EXP YIELD: "); +const u8 gText_Stats_EggCycles[] = _("HATCH STEPS:"); +const u8 gText_Stats_EggCycles_VeryFast[] = _("{EMOJI_BOLT}{EMOJI_DIZZYEGG}"); +const u8 gText_Stats_EggCycles_Fast[] = _("{EMOJI_DIZZYEGG}"); +const u8 gText_Stats_EggCycles_Normal[] = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}"); +const u8 gText_Stats_EggCycles_Slow[] = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}"); +const u8 gText_Stats_Growthrate[] = _("GROW: "); +const u8 gText_Stats_Friendship[] = _("FRIENDSHIP:"); +const u8 gText_Stats_Friendship_BigAnger[] = _("{EMOJI_BIGANGER}"); +const u8 gText_Stats_Friendship_Neutral[] = _("{EMOJI_NEUTRAL}"); +const u8 gText_Stats_Friendship_Happy[] = _("{EMOJI_HAPPY}"); +const u8 gText_Stats_Friendship_BigSmile[] = _("{EMOJI_BIGSMILE}"); +const u8 gText_Stats_MEDIUM_FAST[] = _("MED. FAST"); +const u8 gText_Stats_ERRATIC[] = _("ERRATIC"); +const u8 gText_Stats_FLUCTUATING[] = _("FLUCTUATING"); +const u8 gText_Stats_MEDIUM_SLOW[] = _("MED. SLOW"); +const u8 gText_Stats_FAST[] = _("FAST"); +const u8 gText_Stats_SLOW[] = _("SLOW"); +const u8 gText_Stats_ContestHeart[] = _("H"); const u8 gText_Stats_Minus[] = _("-"); -const u8 gText_Stats_eggGroup[] = _("EGG G1:"); -const u8 gText_Stats_eggGroup_Groups[] = _("{STR_VAR_1}/{STR_VAR_2}"); -const u8 gText_Stats_eggGroup_MONSTER[] = _("MONSTER"); -const u8 gText_Stats_eggGroup_WATER_1[] = _("WATER {CIRCLE_1}"); -const u8 gText_Stats_eggGroup_BUG[] = _("BUG"); -const u8 gText_Stats_eggGroup_FLYING[] = _("FLYING"); -const u8 gText_Stats_eggGroup_FIELD[] = _("FIELD"); -const u8 gText_Stats_eggGroup_FAIRY[] = _("FAIRY"); -const u8 gText_Stats_eggGroup_GRASS[] = _("GRASS"); -const u8 gText_Stats_eggGroup_HUMAN_LIKE[] = _("HUMANE"); -const u8 gText_Stats_eggGroup_WATER_3[] = _("WATER {CIRCLE_3}"); -const u8 gText_Stats_eggGroup_MINERAL[] = _("MINERAL"); -const u8 gText_Stats_eggGroup_AMORPHOUS[] = _("AMORPHOUS"); -const u8 gText_Stats_eggGroup_WATER_2[] = _("WATER {CIRCLE_2}"); -const u8 gText_Stats_eggGroup_DITTO[] = _("DITTO"); -const u8 gText_Stats_eggGroup_DRAGON[] = _("DRAGON"); -const u8 gText_Stats_eggGroup_UNDISCOVERED[]= _("---"); -const u8 gText_Dex_SEEN[] = _("SEEN"); -const u8 gText_Dex_OWN[] = _("OWN"); +const u8 gText_Stats_eggGroup[] = _("EGG G1:"); +const u8 gText_Stats_eggGroup_Groups[] = _("{STR_VAR_1}/{STR_VAR_2}"); +const u8 gText_Stats_eggGroup_MONSTER[] = _("MONSTER"); +const u8 gText_Stats_eggGroup_WATER_1[] = _("WATER {CIRCLE_1}"); +const u8 gText_Stats_eggGroup_BUG[] = _("BUG"); +const u8 gText_Stats_eggGroup_FLYING[] = _("FLYING"); +const u8 gText_Stats_eggGroup_FIELD[] = _("FIELD"); +const u8 gText_Stats_eggGroup_FAIRY[] = _("FAIRY"); +const u8 gText_Stats_eggGroup_GRASS[] = _("GRASS"); +const u8 gText_Stats_eggGroup_HUMAN_LIKE[] = _("HUMANE"); +const u8 gText_Stats_eggGroup_WATER_3[] = _("WATER {CIRCLE_3}"); +const u8 gText_Stats_eggGroup_MINERAL[] = _("MINERAL"); +const u8 gText_Stats_eggGroup_AMORPHOUS[] = _("AMORPHOUS"); +const u8 gText_Stats_eggGroup_WATER_2[] = _("WATER {CIRCLE_2}"); +const u8 gText_Stats_eggGroup_DITTO[] = _("DITTO"); +const u8 gText_Stats_eggGroup_DRAGON[] = _("DRAGON"); +const u8 gText_Stats_eggGroup_UNDISCOVERED[] = _("---"); +const u8 gText_Dex_SEEN[] = _("SEEN"); +const u8 gText_Dex_OWN[] = _("OWN"); -const u8 gText_EVO_Buttons[] = _("{DPAD_UPDOWN}EVOs {A_BUTTON}CHECK"); -const u8 gText_EVO_Buttons_Decapped[] = _("{DPAD_UPDOWN}Evos {A_BUTTON}Check"); -const u8 gText_EVO_Buttons_PE[] = _("{DPAD_UPDOWN}EVOs {A_BUTTON}CHECK {START_BUTTON}FORMs"); -const u8 gText_EVO_Buttons_Decapped_PE[] = _("{DPAD_UPDOWN}Evos {A_BUTTON}Check {START_BUTTON}Froms"); -const u8 gText_EVO_Name[] = _("{STR_VAR_3}:"); -const u8 gText_EVO_PreEvo[] = _("{STR_VAR_1} evolves from {STR_VAR_2}"); -const u8 gText_EVO_PreEvo_PE_Mega[] = _("{STR_VAR_1} mega evolves with {STR_VAR_2}"); -const u8 gText_EVO_FRIENDSHIP[] = _("LvlUp, high friendship"); -const u8 gText_EVO_FRIENDSHIP_DAY[] = _("LvlUp, high friendship, day"); -const u8 gText_EVO_FRIENDSHIP_NIGHT[] = _("Lvlup, high friendship, night"); -const u8 gText_EVO_LEVEL[] = _("LvlUp to {STR_VAR_2}"); -const u8 gText_EVO_TRADE[] = _("Trading"); -const u8 gText_EVO_TRADE_ITEM[] = _("Trading, holding {STR_VAR_2}"); -const u8 gText_EVO_ITEM[] = _("{STR_VAR_2} is used"); -const u8 gText_EVO_LEVEL_ATK_GT_DEF[] = _("LvlUp to {STR_VAR_2}, Atk > Def"); -const u8 gText_EVO_LEVEL_ATK_EQ_DEF[] = _("LvlUp to {STR_VAR_2}, Atk = Def"); -const u8 gText_EVO_LEVEL_ATK_LT_DEF[] = _("LvlUp to {STR_VAR_2}, Atk < Def"); -const u8 gText_EVO_LEVEL_SILCOON[] = _("LvlUp to {STR_VAR_2}, Silcoon persona"); -const u8 gText_EVO_LEVEL_CASCOON[] = _("LvlUp to {STR_VAR_2}, Cascoon persona"); -const u8 gText_EVO_LEVEL_NINJASK[] = _("LvlUp to {STR_VAR_2}"); -const u8 gText_EVO_LEVEL_SHEDINJA[] = _("LvlUp to {STR_VAR_2}, party<6, 1x POKéBALL"); -const u8 gText_EVO_BEAUTY[] = _("LvlUp, high beauty"); -const u8 gText_EVO_LEVEL_FEMALE[] = _("LvlUp to {STR_VAR_2}, is female"); -const u8 gText_EVO_LEVEL_MALE[] = _("LvlUp to {STR_VAR_2}, is male"); -const u8 gText_EVO_LEVEL_NIGHT[] = _("LvlUp to {STR_VAR_2}, night"); -const u8 gText_EVO_LEVEL_DAY[] = _("LvlUp to {STR_VAR_2}, day"); -const u8 gText_EVO_LEVEL_DUSK[] = _("LvlUp to {STR_VAR_2}, dusk (5-6PM)"); -const u8 gText_EVO_ITEM_HOLD_DAY[] = _("LvlUp, holds {STR_VAR_2}, day"); -const u8 gText_EVO_ITEM_HOLD_NIGHT[] = _("LvlUp, holds {STR_VAR_2}, night"); -const u8 gText_EVO_MOVE[] = _("LvlUp, knows {STR_VAR_2}"); -const u8 gText_EVO_MOVE_TYPE[] = _("LvlUp, knows {STR_VAR_2} move"); -const u8 gText_EVO_MAPSEC[] = _("LvlUp on {STR_VAR_2}"); -const u8 gText_EVO_ITEM_MALE[] = _("{STR_VAR_2} used on male"); -const u8 gText_EVO_ITEM_FEMALE[] = _("{STR_VAR_2} used on female"); -const u8 gText_EVO_LEVEL_RAIN[] = _("LvlUp to {STR_VAR_2} while raining"); -const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[] = _("LvlUp with {STR_VAR_2} in party"); -const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("LvlUp with dark type in party"); -const u8 gText_EVO_TRADE_SPECIFIC_MON[] = _("Traded for {STR_VAR_2}"); -const u8 gText_EVO_SPECIFIC_MAP[] = _("LvlUp on {STR_VAR_2}"); -const u8 gText_EVO_LEVEL_NATURE_AMPED[] = _("LvlUp to {STR_VAR_2}, Amped natures"); -const u8 gText_EVO_LEVEL_NATURE_LOW_KEY[] = _("LvlUp to {STR_VAR_2}, Low Key natures"); -const u8 gText_EVO_CRITICAL_HITS[] = _("Land {STR_VAR_2} critical hits in\nsingle battle"); -const u8 gText_EVO_SCRIPT_TRIGGER_DMG[] = _("Takes at least {STR_VAR_2} HP in damage"); -const u8 gText_EVO_DARK_SCROLL[] = _("ScrllOfDrknss is used"); -const u8 gText_EVO_WATER_SCROLL[] = _("ScrollOfWatrs is used"); -const u8 gText_EVO_ITEM_NIGHT[] = _("{STR_VAR_2} is used, night"); -const u8 gText_EVO_ITEM_DAY[] = _("{STR_VAR_2} is used, day"); -const u8 gText_EVO_ITEM_HOLD[] = _("LvlUp, holds {STR_VAR_2}"); -const u8 gText_EVO_UNKNOWN[] = _("Method unknown"); -const u8 gText_EVO_NONE[] = _("{STR_VAR_1} has no evolution."); +const u8 gText_EVO_Buttons[] = _("{DPAD_UPDOWN}EVOs {A_BUTTON}CHECK"); +const u8 gText_EVO_Buttons_Decapped[] = _("{DPAD_UPDOWN}Evos {A_BUTTON}Check"); +const u8 gText_EVO_Buttons_PE[] = _("{DPAD_UPDOWN}EVOs {A_BUTTON}CHECK {START_BUTTON}FORMs"); +const u8 gText_EVO_Buttons_Decapped_PE[] = _("{DPAD_UPDOWN}Evos {A_BUTTON}Check {START_BUTTON}Froms"); +const u8 gText_EVO_Name[] = _("{STR_VAR_3}:"); +const u8 gText_EVO_PreEvo[] = _("{STR_VAR_1} evolves from {STR_VAR_2}"); +const u8 gText_EVO_PreEvo_PE_Mega[] = _("{STR_VAR_1} mega evolves with {STR_VAR_2}"); +const u8 gText_EVO_FRIENDSHIP[] = _("LvlUp, high friendship"); +const u8 gText_EVO_FRIENDSHIP_DAY[] = _("LvlUp, high friendship, day"); +const u8 gText_EVO_FRIENDSHIP_NIGHT[] = _("Lvlup, high friendship, night"); +const u8 gText_EVO_LEVEL[] = _("LvlUp to {STR_VAR_2}"); +const u8 gText_EVO_TRADE[] = _("Trading"); +const u8 gText_EVO_TRADE_ITEM[] = _("Trading, holding {STR_VAR_2}"); +const u8 gText_EVO_ITEM[] = _("{STR_VAR_2} is used"); +const u8 gText_EVO_LEVEL_ATK_GT_DEF[] = _("LvlUp to {STR_VAR_2}, Atk > Def"); +const u8 gText_EVO_LEVEL_ATK_EQ_DEF[] = _("LvlUp to {STR_VAR_2}, Atk = Def"); +const u8 gText_EVO_LEVEL_ATK_LT_DEF[] = _("LvlUp to {STR_VAR_2}, Atk < Def"); +const u8 gText_EVO_LEVEL_SILCOON[] = _("LvlUp to {STR_VAR_2}, Silcoon persona"); +const u8 gText_EVO_LEVEL_CASCOON[] = _("LvlUp to {STR_VAR_2}, Cascoon persona"); +const u8 gText_EVO_LEVEL_NINJASK[] = _("LvlUp to {STR_VAR_2}"); +const u8 gText_EVO_LEVEL_SHEDINJA[] = _("LvlUp to {STR_VAR_2}, party<6, 1x POKéBALL"); +const u8 gText_EVO_BEAUTY[] = _("LvlUp, high beauty"); +const u8 gText_EVO_LEVEL_FEMALE[] = _("LvlUp to {STR_VAR_2}, is female"); +const u8 gText_EVO_LEVEL_MALE[] = _("LvlUp to {STR_VAR_2}, is male"); +const u8 gText_EVO_LEVEL_NIGHT[] = _("LvlUp to {STR_VAR_2}, night"); +const u8 gText_EVO_LEVEL_DAY[] = _("LvlUp to {STR_VAR_2}, day"); +const u8 gText_EVO_LEVEL_DUSK[] = _("LvlUp to {STR_VAR_2}, dusk (5-6PM)"); +const u8 gText_EVO_ITEM_HOLD_DAY[] = _("LvlUp, holds {STR_VAR_2}, day"); +const u8 gText_EVO_ITEM_HOLD_NIGHT[] = _("LvlUp, holds {STR_VAR_2}, night"); +const u8 gText_EVO_MOVE[] = _("LvlUp, knows {STR_VAR_2}"); +const u8 gText_EVO_MOVE_TYPE[] = _("LvlUp, knows {STR_VAR_2} move"); +const u8 gText_EVO_MAPSEC[] = _("LvlUp on {STR_VAR_2}"); +const u8 gText_EVO_ITEM_MALE[] = _("{STR_VAR_2} used on male"); +const u8 gText_EVO_ITEM_FEMALE[] = _("{STR_VAR_2} used on female"); +const u8 gText_EVO_LEVEL_RAIN[] = _("LvlUp to {STR_VAR_2} while raining"); +const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[] = _("LvlUp with {STR_VAR_2} in party"); +const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("LvlUp with dark type in party"); +const u8 gText_EVO_TRADE_SPECIFIC_MON[] = _("Traded for {STR_VAR_2}"); +const u8 gText_EVO_SPECIFIC_MAP[] = _("LvlUp on {STR_VAR_2}"); +const u8 gText_EVO_LEVEL_NATURE_AMPED[] = _("LvlUp to {STR_VAR_2}, Amped natures"); +const u8 gText_EVO_LEVEL_NATURE_LOW_KEY[] = _("LvlUp to {STR_VAR_2}, Low Key natures"); +const u8 gText_EVO_CRITICAL_HITS[] = _("Land {STR_VAR_2} critical hits in\nsingle battle"); +const u8 gText_EVO_SCRIPT_TRIGGER_DMG[] = _("Takes at least {STR_VAR_2} HP in damage"); +const u8 gText_EVO_DARK_SCROLL[] = _("ScrllOfDrknss is used"); +const u8 gText_EVO_WATER_SCROLL[] = _("ScrollOfWatrs is used"); +const u8 gText_EVO_ITEM_NIGHT[] = _("{STR_VAR_2} is used, night"); +const u8 gText_EVO_ITEM_DAY[] = _("{STR_VAR_2} is used, day"); +const u8 gText_EVO_ITEM_HOLD[] = _("LvlUp, holds {STR_VAR_2}"); +const u8 gText_EVO_UNKNOWN[] = _("Method unknown"); +const u8 gText_EVO_NONE[] = _("{STR_VAR_1} has no evolution."); -const u8 gText_FORMS_Buttons_PE[] = _("{A_BUTTON}FORM MODE {START_BUTTON}EVOs"); -const u8 gText_FORMS_Buttons_Decapped_PE[] = _("{START_BUTTON}Evos"); -const u8 gText_FORMS_Buttons_Submenu_PE[] = _("{DPAD_NONE}FORMs {A_BUTTON}CHECK {START_BUTTON}EVOs"); -const u8 gText_FORMS_Buttons_Submenu_Decapped_PE[] = _("{START_BUTTON}Evos"); -const u8 gText_FORMS_NONE[] = _("{STR_VAR_1} has no alternate forms."); +const u8 gText_FORMS_Buttons_PE[] = _("{A_BUTTON}FORM MODE {START_BUTTON}EVOs"); +const u8 gText_FORMS_Buttons_Decapped_PE[] = _("{START_BUTTON}Evos"); +const u8 gText_FORMS_Buttons_Submenu_PE[] = _("{DPAD_NONE}FORMs {A_BUTTON}CHECK {START_BUTTON}EVOs"); +const u8 gText_FORMS_Buttons_Submenu_Decapped_PE[] = _("{START_BUTTON}Evos"); +const u8 gText_FORMS_NONE[] = _("{STR_VAR_1} has no alternate forms."); #endif