From 6b8f40b3b1cf191d8218441dd5c7aa7669bb1822 Mon Sep 17 00:00:00 2001 From: TheXaman Date: Mon, 14 Jun 2021 17:29:42 +0200 Subject: [PATCH] new layout for evo screen and new buttons for the PE version --- graphics/pokedex/HGSS_tilemap_evo_screen.bin | Bin 1344 -> 1344 bytes .../pokedex/HGSS_tilemap_evo_screen_PE.bin | Bin 1344 -> 1344 bytes .../pokedex/HGSS_tilemap_forms_screen.bin | Bin 1344 -> 1344 bytes graphics/pokedex/HGSS_tileset_menu2.png | Bin 915 -> 855 bytes include/strings.h | 5 +++ src/pokedex.c | 35 +++++++++++++++++- src/strings.c | 5 +++ 7 files changed, 44 insertions(+), 1 deletion(-) diff --git a/graphics/pokedex/HGSS_tilemap_evo_screen.bin b/graphics/pokedex/HGSS_tilemap_evo_screen.bin index 18bcc40a13c63d16e6f355d01bd63e92104a40f7..e7407faf7628b66172d24557d59dc387a2914607 100644 GIT binary patch delta 123 scmX@Wb%1L_1Iy$CEF$SX4BkLUi1cLu0Y3(RASR2P%*bj#S%8%d0Hf;_Gynhq delta 63 mcmX@Wb%1L_1IuIwCWpxlEF$XO41}Q! diff --git a/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin b/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin index 8a13a6ffd8700298cfeb6133e6f2d557188d578c..77ac6ad54f3e98fecd0ecc4f6f28cb3c1ffaa64c 100644 GIT binary patch delta 143 zcmX@Wb%1L_15154Lj($pWQbz$Veke*LZmMP2t+f)FvJ2OjErN5XYgn6146Z=ojPw delta 99 zcmX@Wb%1L_1IuIwCLR9(hCqfOhG2#ehERquhHwTD@MQ2}@CHI;62!*_BN!qXq8OqX UVi;l>;uzv5GqT!G7GPxq0I@|8ga7~l diff --git a/graphics/pokedex/HGSS_tilemap_forms_screen.bin b/graphics/pokedex/HGSS_tilemap_forms_screen.bin index 0549c17f0b132ef5b4a3fc801b62507f8751e6b9..c72154071ceaf220d9f609ace0e6acdf035272df 100644 GIT binary patch delta 103 zcmX@Wb%1L_10!buLm(IiO+LtIxOo@jC#H!H_#7P>Kp>bQgdr3Nkx3Ar5DZ}mo6N{+ JKUsj44FClv6~q7l delta 114 zcmX@Wb%1L_10$y|gC7|BPd>;uzv5GqT!G7GPxq0Eyuh_W%F@ diff --git a/graphics/pokedex/HGSS_tileset_menu2.png b/graphics/pokedex/HGSS_tileset_menu2.png index e39cb4de556c5d7c87a726b0187d05cacfc8ec14..65018e3a0e6bb2d9de0e21fc11f2f0e64ec66f32 100644 GIT binary patch delta 681 zcmV;a0#^N#2iFFWD+vY;4;uhSs4k_EG?RaONkl$0k}T_0O%kLpaTKM0MN}6!QbK%U||5wGPx@ObYKMl3}L1Tbj1lO02#)NwFU&h zC;=Ys+nH*gYBv2Cpj~s+?={(#J7<(oN<#rrHweItsDOUOKTl#DCP^7m%6S_Vz{(xK z(To735rZ}vvbI+M(HvEKX;#{QX_kKofFRA&wzCRI9SLw&b2NurTL7y>luHZnGjTU# z5!cML1|=X$zn2=2<~pbY=&VM%sv}6k0hXKyhenh#%78a?fdO-$E>DtfUW84$Tr;dT z0jTIM)@$zd`c?pOYXwNxFlTPNQ-KWf0x@q3P$3L3(~umFDED!_jwHNqNLhc;wGryz z{G_?{NqZh3(#6t%yhTNZG#2UlXb0n$IB;@#VvkZE?d9<=<-TtQFvS;`0`|AhfBMZD z`nu!*ZT%oZpls|5L>F&>=9mM%YWpofn*jGaeFyNJR{dXq22LDkKE7I#>^v?^}Pg*ESma7;1mp*lobC0&t8W12{gA!kZ?3DEtk;zF-dm zmJ-mUnU&;|J?N7tu*AV4qF_po%-6*Qx{*1+4?}hju4Oi!a>! zy8v_KOa8#ffKLOs>;dM;?-p<@=cAroQR!U97Eqb50dg51D}a2S5A_uf$kZfa6T*}I P00000NkvXXu0mjf|7$Vn delta 741 zcmVU$n=qo~Pa^qSHULXQh?W7kJ^=t|BMhJo0mcB(O%lQ1;xZsGfUYvRTLWmr3IOQai7ud9?O+EW!<4bs zfB+aJz(4oxLbcB|8@~+Dt{Lig%rUYiU>+jjuT3{^Y0Nb7$G7ZLzkX`Z&7RY2;;9|&V>-YTuzmXM zFT0qdua6R-t?xw$ludnr=;Q_9P9@-|?Y96;2HfxT9l&Q=^?v~xc;SG1+nfAS#>zRa z0Hh%LZOfVpTC7gp+yXYDdEI{k3O#KB);4HAnq=&6?!fK?zO4YKDy>yYpGX1s`E)y_ z<05LM>a^|v!Ww|OuhTl!fI~x|J3ss9tF`ms&i?(6_t(V*_eKDEOK4{t4wCxtR}56t z83BO-vmfw{j7Ra10gd4|@?b56iV1^tX@Xv-*Fd=dTLR41;tKWNNselectedScreen == 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.");