diff --git a/graphics/pokedex/HGSS_tilemap_evo_screen.bin b/graphics/pokedex/HGSS_tilemap_evo_screen.bin index 18bcc40a13..e7407faf76 100644 Binary files a/graphics/pokedex/HGSS_tilemap_evo_screen.bin and b/graphics/pokedex/HGSS_tilemap_evo_screen.bin differ diff --git a/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin b/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin index 8a13a6ffd8..77ac6ad54f 100644 Binary files a/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin and b/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin differ diff --git a/graphics/pokedex/HGSS_tilemap_forms_screen.bin b/graphics/pokedex/HGSS_tilemap_forms_screen.bin index 0549c17f0b..c72154071c 100644 Binary files a/graphics/pokedex/HGSS_tilemap_forms_screen.bin and b/graphics/pokedex/HGSS_tilemap_forms_screen.bin differ diff --git a/graphics/pokedex/HGSS_tileset_menu2.png b/graphics/pokedex/HGSS_tileset_menu2.png index e39cb4de55..65018e3a0e 100644 Binary files a/graphics/pokedex/HGSS_tileset_menu2.png and b/graphics/pokedex/HGSS_tileset_menu2.png differ diff --git a/include/strings.h b/include/strings.h index 26dfd514b8..920af7e7a6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -602,6 +602,8 @@ extern const u8 gText_Stats_eggGroup_UNDISCOVERED[]; extern const u8 gText_Dex_SEEN[]; extern const u8 gText_Dex_OWN[]; +extern const u8 gText_EVO_Buttons_PE[]; +extern const u8 gText_EVO_Buttons_Decapped_PE[]; extern const u8 gText_EVO_Name[]; extern const u8 gText_EVO_FRIENDSHIP[]; extern const u8 gText_EVO_FRIENDSHIP_DAY[]; @@ -636,6 +638,9 @@ extern const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[]; extern const u8 gText_EVO_TRADE_SPECIFIC_MON[]; extern const u8 gText_EVO_SPECIFIC_MAP[]; extern const u8 gText_EVO_NONE[]; + +extern const u8 gText_FORMS_Buttons_PE[]; +extern const u8 gText_FORMS_Buttons_Decapped_PE[]; extern const u8 gText_FORMS_NONE[]; diff --git a/src/pokedex.c b/src/pokedex.c index 1e8b4c1218..4479cb7cdf 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -7320,6 +7320,31 @@ static void DestroySplitIcon(void) #endif //PokedexPlus HGSS_Ui Evolution Page +static const u8 sEvoFormsPageNavigationTextColor[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; +static void EvoFormsPage_PrintAToggleUpdownEvos(void) +{ + u8 x = 9; + u8 y = 0; + #ifdef POKEMON_EXPANSION + if (sPokedexView->selectedScreen == EVO_SCREEN) + { + if (!HGSS_DECAPPED) + AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, gText_EVO_Buttons_PE); + else + AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, gText_EVO_Buttons_Decapped_PE); + } + else if (sPokedexView->selectedScreen == FORMS_SCREEN) + { + if (!HGSS_DECAPPED) + AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, gText_FORMS_Buttons_PE); + else + AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, gText_FORMS_Buttons_Decapped_PE); + } + // DrawKeypadIcon(WIN_NAVIGATION_BUTTONS, 10, 5, 0); //(u8 windowId, u8 keypadIconId, u16 x, u16 y) + PutWindowTilemap(WIN_NAVIGATION_BUTTONS); + CopyWindowToVram(WIN_NAVIGATION_BUTTONS, 3); + #endif +} static void Task_LoadEvolutionScreen(u8 taskId) { switch (gMain.state) @@ -7347,6 +7372,9 @@ static void Task_LoadEvolutionScreen(u8 taskId) FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); CopyWindowToVram(WIN_INFO, 3); + FillWindowPixelBuffer(WIN_NAVIGATION_BUTTONS, PIXEL_FILL(0)); + PutWindowTilemap(WIN_NAVIGATION_BUTTONS); + CopyWindowToVram(WIN_NAVIGATION_BUTTONS, 3); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(3); @@ -7370,6 +7398,7 @@ static void Task_LoadEvolutionScreen(u8 taskId) gTasks[taskId].data[4] = CreateMonIcon(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), SpriteCB_MonIcon, 18, 31, 4, 0); //Create pokemon sprite #endif gSprites[gTasks[taskId].data[4]].oam.priority = 0; + EvoFormsPage_PrintAToggleUpdownEvos(); //HGSS_Ui Navigation buttons } gMain.state++; break; @@ -7515,7 +7544,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species) bool8 left = TRUE; u8 base_x = 13; u8 base_x_offset = 54; - u8 base_y = 52; + u8 base_y = 51; u8 base_y_offset = 9; u8 base_i = 0; u8 times = 0; @@ -8095,6 +8124,9 @@ static void Task_LoadFormsScreen(u8 taskId) FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); CopyWindowToVram(WIN_INFO, 3); + FillWindowPixelBuffer(WIN_NAVIGATION_BUTTONS, PIXEL_FILL(0)); + PutWindowTilemap(WIN_NAVIGATION_BUTTONS); + CopyWindowToVram(WIN_NAVIGATION_BUTTONS, 3); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(3); @@ -8114,6 +8146,7 @@ static void Task_LoadFormsScreen(u8 taskId) gTasks[taskId].data[4] = CreateMonIcon(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), SpriteCB_MonIcon, 18, 31, 4, 0); //Create pokemon sprite gSprites[gTasks[taskId].data[4]].oam.priority = 0; } + EvoFormsPage_PrintAToggleUpdownEvos(); //HGSS_Ui Navigation buttons gMain.state++; break; case 4: diff --git a/src/strings.c b/src/strings.c index e2b7e07852..5706ff4d29 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1888,6 +1888,8 @@ const u8 gText_Stats_eggGroup_UNDISCOVERED[]= _("---"); const u8 gText_Dex_SEEN[] = _("SEEN"); const u8 gText_Dex_OWN[] = _("OWN"); +const u8 gText_EVO_Buttons_PE[] = _("{A_BUTTON}FORMS"); +const u8 gText_EVO_Buttons_Decapped_PE[] = _("{A_BUTTON}Forms"); const u8 gText_EVO_Name[] = _("{STR_VAR_3}:"); const u8 gText_EVO_FRIENDSHIP[] = _("LvlUp, high friendship"); const u8 gText_EVO_FRIENDSHIP_DAY[] = _("LvlUp, high friendship, day"); @@ -1922,4 +1924,7 @@ const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("LvlUp with dark type in 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_NONE[] = _("{STR_VAR_1} has no evolution."); + +const u8 gText_FORMS_Buttons_PE[] = _("{A_BUTTON}EVOLUTIONS"); +const u8 gText_FORMS_Buttons_Decapped_PE[] = _("{A_BUTTON}Evolutions"); const u8 gText_FORMS_NONE[] = _("{STR_VAR_1} has no alternate forms.");