diff --git a/graphics/pokedex/screen_select_bar_submenu.bin b/graphics/pokedex/HGSS_SelectBar.bin similarity index 100% rename from graphics/pokedex/screen_select_bar_submenu.bin rename to graphics/pokedex/HGSS_SelectBar.bin diff --git a/graphics/pokedex/screen_select_bar_submenu_clear.bin b/graphics/pokedex/HGSS_SelectBar_clear.bin similarity index 100% rename from graphics/pokedex/screen_select_bar_submenu_clear.bin rename to graphics/pokedex/HGSS_SelectBar_clear.bin diff --git a/graphics/pokedex/HGSS_palette_default.pal b/graphics/pokedex/HGSS_palette_default.pal new file mode 100644 index 0000000000..5889ede7ac --- /dev/null +++ b/graphics/pokedex/HGSS_palette_default.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +193 33 177 +249 249 249 +225 225 225 +201 201 201 +169 169 169 +129 129 129 +249 153 161 +233 49 49 +193 33 41 +145 17 33 +249 153 161 +193 33 41 +141 251 184 +52 66 162 +194 181 66 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +49 213 74 +24 131 32 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/HGSS_palette_default_dark.pal b/graphics/pokedex/HGSS_palette_default_dark.pal new file mode 100644 index 0000000000..5889ede7ac --- /dev/null +++ b/graphics/pokedex/HGSS_palette_default_dark.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +193 33 177 +249 249 249 +225 225 225 +201 201 201 +169 169 169 +129 129 129 +249 153 161 +233 49 49 +193 33 41 +145 17 33 +249 153 161 +193 33 41 +141 251 184 +52 66 162 +194 181 66 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +49 213 74 +24 131 32 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/HGSS_palette_national.pal b/graphics/pokedex/HGSS_palette_national.pal new file mode 100644 index 0000000000..5889ede7ac --- /dev/null +++ b/graphics/pokedex/HGSS_palette_national.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +193 33 177 +249 249 249 +225 225 225 +201 201 201 +169 169 169 +129 129 129 +249 153 161 +233 49 49 +193 33 41 +145 17 33 +249 153 161 +193 33 41 +141 251 184 +52 66 162 +194 181 66 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +49 213 74 +24 131 32 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/HGSS_palette_national_dark.pal b/graphics/pokedex/HGSS_palette_national_dark.pal new file mode 100644 index 0000000000..5889ede7ac --- /dev/null +++ b/graphics/pokedex/HGSS_palette_national_dark.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +193 33 177 +249 249 249 +225 225 225 +201 201 201 +169 169 169 +129 129 129 +249 153 161 +233 49 49 +193 33 41 +145 17 33 +249 153 161 +193 33 41 +141 251 184 +52 66 162 +194 181 66 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +49 213 74 +24 131 32 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/search_menu.pal b/graphics/pokedex/HGSS_palette_search_menu.pal similarity index 100% rename from graphics/pokedex/search_menu.pal rename to graphics/pokedex/HGSS_palette_search_menu.pal diff --git a/graphics/pokedex/HGSS_palette_search_menu_dark.pal b/graphics/pokedex/HGSS_palette_search_menu_dark.pal new file mode 100644 index 0000000000..b6142eb3f7 --- /dev/null +++ b/graphics/pokedex/HGSS_palette_search_menu_dark.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +123 131 0 +0 0 0 +172 172 172 +255 255 255 +255 255 255 +98 98 115 +57 57 57 +123 115 74 +156 230 0 +57 115 0 +255 172 0 +131 32 32 +82 189 90 +24 131 32 +255 32 32 +0 0 0 +123 131 0 +0 0 0 +172 172 172 +255 255 255 +255 255 255 +98 98 115 +57 57 57 +123 115 74 +41 115 0 +32 49 32 +180 106 0 +16 0 0 +82 189 90 +24 131 32 +0 0 0 +0 0 0 +123 131 0 +0 0 0 +172 172 172 +172 172 172 +172 172 172 +98 98 115 +57 57 57 +123 115 74 +32 49 32 +32 32 32 +74 32 32 +32 32 32 +82 189 90 +24 131 32 +255 32 32 +0 0 0 +123 131 0 +0 0 0 +172 172 172 +172 172 172 +172 172 172 +98 98 115 +57 57 57 +123 115 74 +32 49 32 +32 32 32 +74 32 32 +32 32 32 +82 189 90 +24 131 32 +0 0 0 +0 0 0 diff --git a/graphics/pokedex/hgss_pokedex_tileset.pal b/graphics/pokedex/HGSS_palette_search_results.pal similarity index 100% rename from graphics/pokedex/hgss_pokedex_tileset.pal rename to graphics/pokedex/HGSS_palette_search_results.pal diff --git a/graphics/pokedex/HGSS_palette_search_results_dark.pal b/graphics/pokedex/HGSS_palette_search_results_dark.pal new file mode 100644 index 0000000000..892bb6c104 --- /dev/null +++ b/graphics/pokedex/HGSS_palette_search_results_dark.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +193 33 177 +249 249 249 +225 225 225 +201 201 201 +169 169 169 +129 129 129 +249 153 161 +233 49 49 +193 33 41 +145 17 33 +156 226 199 +141 251 184 +52 66 162 +194 181 66 +159 216 234 +0 0 0 diff --git a/graphics/pokedex/cry_screen.bin b/graphics/pokedex/HGSS_tilemap_cry_screen.bin similarity index 100% rename from graphics/pokedex/cry_screen.bin rename to graphics/pokedex/HGSS_tilemap_cry_screen.bin diff --git a/graphics/pokedex/evo_tilemap.bin b/graphics/pokedex/HGSS_tilemap_evo_screen.bin similarity index 100% rename from graphics/pokedex/evo_tilemap.bin rename to graphics/pokedex/HGSS_tilemap_evo_screen.bin diff --git a/graphics/pokedex/evoPE_tilemap.bin b/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin similarity index 100% rename from graphics/pokedex/evoPE_tilemap.bin rename to graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin diff --git a/graphics/pokedex/forms_tilemap.bin b/graphics/pokedex/HGSS_tilemap_forms_screen.bin similarity index 100% rename from graphics/pokedex/forms_tilemap.bin rename to graphics/pokedex/HGSS_tilemap_forms_screen.bin diff --git a/graphics/pokedex/info_screen.bin b/graphics/pokedex/HGSS_tilemap_info_screen.bin similarity index 100% rename from graphics/pokedex/info_screen.bin rename to graphics/pokedex/HGSS_tilemap_info_screen.bin diff --git a/graphics/pokedex/list.bin b/graphics/pokedex/HGSS_tilemap_list_screen.bin similarity index 100% rename from graphics/pokedex/list.bin rename to graphics/pokedex/HGSS_tilemap_list_screen.bin diff --git a/graphics/pokedex/list_underlay.bin b/graphics/pokedex/HGSS_tilemap_list_screen_underlay.bin similarity index 100% rename from graphics/pokedex/list_underlay.bin rename to graphics/pokedex/HGSS_tilemap_list_screen_underlay.bin diff --git a/graphics/pokedex/search_menu_hoenn.bin b/graphics/pokedex/HGSS_tilemap_search_screen_hoenn.bin similarity index 100% rename from graphics/pokedex/search_menu_hoenn.bin rename to graphics/pokedex/HGSS_tilemap_search_screen_hoenn.bin diff --git a/graphics/pokedex/search_menu_national.bin b/graphics/pokedex/HGSS_tilemap_search_screen_national.bin similarity index 100% rename from graphics/pokedex/search_menu_national.bin rename to graphics/pokedex/HGSS_tilemap_search_screen_national.bin diff --git a/graphics/pokedex/size_screen.bin b/graphics/pokedex/HGSS_tilemap_size_screen.bin similarity index 100% rename from graphics/pokedex/size_screen.bin rename to graphics/pokedex/HGSS_tilemap_size_screen.bin diff --git a/graphics/pokedex/start_menu_main.bin b/graphics/pokedex/HGSS_tilemap_start_menu.bin similarity index 100% rename from graphics/pokedex/start_menu_main.bin rename to graphics/pokedex/HGSS_tilemap_start_menu.bin diff --git a/graphics/pokedex/start_menu_search_results.bin b/graphics/pokedex/HGSS_tilemap_start_menu_search_results.bin similarity index 100% rename from graphics/pokedex/start_menu_search_results.bin rename to graphics/pokedex/HGSS_tilemap_start_menu_search_results.bin diff --git a/graphics/pokedex/stats_screen.bin b/graphics/pokedex/HGSS_tilemap_stats_screen.bin similarity index 100% rename from graphics/pokedex/stats_screen.bin rename to graphics/pokedex/HGSS_tilemap_stats_screen.bin diff --git a/graphics/pokedex/interface.png b/graphics/pokedex/HGSS_tileset_interface.png similarity index 100% rename from graphics/pokedex/interface.png rename to graphics/pokedex/HGSS_tileset_interface.png diff --git a/graphics/pokedex/HGSS_tileset_interface_DECA.png b/graphics/pokedex/HGSS_tileset_interface_DECA.png new file mode 100644 index 0000000000..2332c79fa0 Binary files /dev/null and b/graphics/pokedex/HGSS_tileset_interface_DECA.png differ diff --git a/graphics/pokedex/menu.png b/graphics/pokedex/HGSS_tileset_menu1.png similarity index 100% rename from graphics/pokedex/menu.png rename to graphics/pokedex/HGSS_tileset_menu1.png diff --git a/graphics/pokedex/evo_tileset.png b/graphics/pokedex/HGSS_tileset_menu2.png similarity index 100% rename from graphics/pokedex/evo_tileset.png rename to graphics/pokedex/HGSS_tileset_menu2.png diff --git a/graphics/pokedex/menu_rest.png b/graphics/pokedex/HGSS_tileset_menu3.png similarity index 100% rename from graphics/pokedex/menu_rest.png rename to graphics/pokedex/HGSS_tileset_menu3.png diff --git a/graphics/pokedex/menu_list.png b/graphics/pokedex/HGSS_tileset_menu_list.png similarity index 100% rename from graphics/pokedex/menu_list.png rename to graphics/pokedex/HGSS_tileset_menu_list.png diff --git a/graphics/pokedex/HGSS_tileset_menu_list_DECA.png b/graphics/pokedex/HGSS_tileset_menu_list_DECA.png new file mode 100644 index 0000000000..dc84b9ea38 Binary files /dev/null and b/graphics/pokedex/HGSS_tileset_menu_list_DECA.png differ diff --git a/graphics/pokedex/search_menu.png b/graphics/pokedex/HGSS_tileset_menu_search.png similarity index 100% rename from graphics/pokedex/search_menu.png rename to graphics/pokedex/HGSS_tileset_menu_search.png diff --git a/graphics/pokedex/HGSS_tileset_menu_search_DECA.png b/graphics/pokedex/HGSS_tileset_menu_search_DECA.png new file mode 100644 index 0000000000..3104d35452 Binary files /dev/null and b/graphics/pokedex/HGSS_tileset_menu_search_DECA.png differ diff --git a/graphics/pokedex/RES_HGSS_palette.pal b/graphics/pokedex/RES_HGSS_palette.pal new file mode 100644 index 0000000000..96fe4b782a --- /dev/null +++ b/graphics/pokedex/RES_HGSS_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +193 33 177 +249 249 249 +225 225 225 +201 201 201 +169 169 169 +129 129 129 +249 153 161 +233 49 49 +193 33 41 +145 17 33 +249 153 161 +193 33 41 +141 251 184 +52 66 162 +194 181 66 +0 0 0 \ No newline at end of file diff --git a/graphics/pokedex/bg_national.pal b/graphics/pokedex/bg_national.pal deleted file mode 100644 index 10dc02e885..0000000000 --- a/graphics/pokedex/bg_national.pal +++ /dev/null @@ -1,99 +0,0 @@ -JASC-PAL -0100 -96 -193 33 177 -249 249 249 -225 225 225 -201 201 201 -169 169 169 -129 129 129 -249 153 161 -233 49 49 -193 33 41 -145 17 33 -249 153 161 -193 33 41 -141 251 184 -52 66 162 -194 181 66 -0 0 0 -123 131 0 -255 255 255 -197 32 32 -189 189 189 -164 164 164 -98 98 115 -41 57 65 -164 164 164 -41 57 65 -255 255 255 -238 246 57 -255 0 189 -123 164 115 -74 115 65 -189 156 90 -0 0 0 -123 131 0 -255 255 255 -197 32 32 -189 189 189 -164 164 164 -98 98 115 -41 57 65 -164 164 164 -41 57 65 -255 255 255 -238 246 57 -255 0 189 -180 205 246 -49 139 255 -189 156 90 -0 0 0 -123 131 0 -255 255 255 -255 238 0 -255 189 0 -255 115 0 -98 98 115 -41 57 65 -164 164 164 -41 57 65 -255 255 255 -238 246 57 -255 0 189 -123 164 115 -74 115 65 -189 156 90 -0 0 0 -123 131 0 -255 255 255 -197 32 32 -189 189 189 -164 164 164 -98 98 115 -41 57 65 -164 164 164 -41 57 65 -255 255 255 -238 246 57 -189 0 0 -74 148 180 -8 90 131 -189 156 90 -0 0 0 -123 131 0 -255 255 255 -197 32 32 -189 189 189 -164 164 164 -98 98 115 -41 57 65 -164 164 164 -41 57 65 -255 255 255 -238 246 57 -255 0 189 -180 205 246 -49 139 255 -189 156 90 -0 0 0 diff --git a/graphics/pokedex/menuOLD.png b/graphics/pokedex/menuOLD.png deleted file mode 100644 index fea195312c..0000000000 Binary files a/graphics/pokedex/menuOLD.png and /dev/null differ diff --git a/graphics/pokedex/screen_select_bar_main.bin b/graphics/pokedex/screen_select_bar_main.bin deleted file mode 100644 index 16bff53618..0000000000 Binary files a/graphics/pokedex/screen_select_bar_main.bin and /dev/null differ diff --git a/graphics/pokedex/search_results_bg.pal b/graphics/pokedex/search_results_bg.pal deleted file mode 100644 index a5df732edf..0000000000 --- a/graphics/pokedex/search_results_bg.pal +++ /dev/null @@ -1,99 +0,0 @@ -JASC-PAL -0100 -96 -193 33 177 -249 249 249 -225 225 225 -201 201 201 -169 169 169 -129 129 129 -249 153 161 -233 49 49 -193 33 41 -145 17 33 -249 153 161 -193 33 41 -141 251 184 -52 66 162 -194 181 66 -0 0 0 -123 131 0 -255 255 255 -197 32 32 -189 189 189 -164 164 164 -98 98 115 -41 57 65 -98 98 115 -49 49 65 -255 255 255 -238 246 57 -255 0 189 -123 148 32 -41 82 0 -189 156 90 -0 0 0 -123 131 0 -255 255 255 -197 32 32 -189 189 189 -164 164 164 -98 98 115 -41 57 65 -98 98 115 -49 49 65 -255 255 255 -238 246 57 -255 0 189 -180 205 246 -49 139 255 -189 156 90 -0 0 0 -123 131 0 -255 255 255 -255 238 0 -255 189 0 -255 115 0 -98 98 115 -41 57 65 -98 98 115 -49 49 65 -255 255 255 -238 246 57 -255 0 189 -123 148 32 -41 82 0 -189 156 90 -0 0 0 -123 131 0 -255 255 255 -197 32 32 -189 189 189 -164 164 164 -98 98 115 -41 57 65 -98 98 115 -49 49 65 -255 255 255 -238 246 57 -180 0 0 -74 148 180 -8 90 131 -189 156 90 -0 0 0 -123 131 0 -255 255 255 -197 32 32 -189 189 189 -164 164 164 -98 98 115 -41 57 65 -98 98 115 -49 49 65 -255 255 255 -238 246 57 -180 0 0 -180 205 246 -49 139 255 -189 156 90 -0 0 0 diff --git a/include/graphics.h b/include/graphics.h index 7934619035..a62302443e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3283,33 +3283,42 @@ extern const u32 gBattleTerrainPalette_StadiumDrake[]; extern const u32 gBattleTerrainPalette_StadiumWallace[]; // pokedex -extern const u32 gPokedexInterface_Gfx[]; -extern const u16 gPokedexBgHoenn_Pal[]; -extern const u32 gPokedexMenuRest_Gfx[]; -extern const u32 gPokedexEvo_Gfx[]; -extern const u32 gPokedexMenuList_Gfx[]; -extern const u32 gPokedexMenu_Gfx[]; -extern const u8 gPokedexList_Tilemap[]; -extern const u8 gPokedexListUnderlay_Tilemap[]; -extern const u8 gPokedexStartMenuMain_Tilemap[]; -extern const u8 gPokedexStartMenuSearchResults_Tilemap[]; +extern const u16 gPokedexDefault_Pal[]; +extern const u16 gPokedexNational_Pal[]; +extern const u16 gPokedexMenuSearch_Pal[]; extern const u16 gPokedexSearchResults_Pal[]; -extern const u16 gPokedexBgNational_Pal[]; -extern const u8 gPokedexInfoScreen_Tilemap[]; -extern const u8 gPokedexStatsScreen_Tilemap[]; -extern const u8 gPokedexEvolutionScreen_Tilemap[]; -extern const u8 gPokedexEvolutionScreen_Tilemap_PE[]; -extern const u8 gPokedexFormsScreen_Tilemap[]; -extern const u8 gPokedexCryScreen_Tilemap[]; -extern const u8 gPokedexSizeScreen_Tilemap[]; -extern const u8 gPokedexScreenSelectBarMain_Tilemap[]; -extern const u8 gPokedexScreenSelectBarSubmenu_Tilemap[]; -extern const u8 gPokedexScreenSelectBarSubmenu_Tilemap_Clear[]; -extern const u16 gPokedexCaughtScreen_Pal[]; -extern const u32 gPokedexSearchMenu_Gfx[]; -extern const u32 gPokedexSearchMenuHoenn_Tilemap[]; -extern const u32 gPokedexSearchMenuNational_Tilemap[]; -extern const u16 gPokedexSearchMenu_Pal[]; +extern const u16 gPokedexDefault_dark_Pal[]; +extern const u16 gPokedexNational_dark_Pal[]; +extern const u16 gPokedexMenuSearch_dark_Pal[]; +extern const u16 gPokedexSearchResults_dark_Pal[]; + +extern const u32 gPokedexMenuList_Gfx[]; +extern const u32 gPokedexMenuList_DECA_Gfx[]; +extern const u32 gPokedexInterface_Gfx[]; +extern const u32 gPokedexInterface_DECA_Gfx[]; +extern const u32 gPokedexMenu_1_Gfx[]; +extern const u32 gPokedexMenu_2_Gfx[]; +extern const u32 gPokedexMenu_3_Gfx[]; +extern const u32 gPokedexMenuSearch_Gfx[]; +extern const u32 gPokedexMenuSearch_DECA_Gfx[]; +extern const u32 gPokedexStartMenuMain_Tilemap[]; +extern const u32 gPokedexStartMenuSearchResults_Tilemap[]; +extern const u32 gUnused_PokedexNoBall[]; +extern const u32 gPokedexScreenSelectBarSubmenu_Tilemap[]; +extern const u32 gPokedexScreenSelectBarSubmenu_Tilemap_Clear[]; + +extern const u32 gPokedexScreenList_Tilemap[]; +extern const u32 gPokedexScreenListUnderlay_Tilemap[]; +extern const u32 gPokedexScreenInfo_Tilemap[]; +extern const u32 gPokedexScreenStats_Tilemap[]; +extern const u32 gPokedexScreenEvolution_Tilemap[]; +extern const u32 gPokedexScreenEvolution_Tilemap_PE[]; +extern const u32 gPokedexScreenForms_Tilemap[]; +extern const u32 gPokedexScreenCry_Tilemap[]; +extern const u32 gPokedexScreenSize_Tilemap[]; +extern const u32 gPokedexScreenSearchHoenn_Tilemap[]; +extern const u32 gPokedexScreenSearchNational_Tilemap[]; + // berry tag screen extern const u32 gBerryCheck_Gfx[]; diff --git a/src/graphics.c b/src/graphics.c index bf69f95bba..411bcc5be4 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1253,37 +1253,43 @@ const u16 gFrontierPassMedalsSilver_Pal[] = INCBIN_U16("graphics/frontier_pass/s const u16 gFrontierPassMedalsGold_Pal[] = INCBIN_U16("graphics/frontier_pass/gold.gbapal"); // Pokedex -const u16 gPokedexBgHoenn_Pal[] = INCBIN_U16("graphics/pokedex/bg_hoenn.gbapal"); -const u16 gPokedexCaughtScreen_Pal[] = INCBIN_U16("graphics/pokedex/caught_screen.gbapal"); -const u16 gPokedexSearchResults_Pal[] = INCBIN_U16("graphics/pokedex/search_results_bg.gbapal"); -const u16 gPokedexBgNational_Pal[] = INCBIN_U16("graphics/pokedex/bg_national.gbapal"); -const u32 gPokedexMenuRest_Gfx[] = INCBIN_U32("graphics/pokedex/menu_rest.4bpp.lz"); -const u32 gPokedexEvo_Gfx[] = INCBIN_U32("graphics/pokedex/evo_tileset.4bpp.lz"); -const u32 gPokedexMenuList_Gfx[] = INCBIN_U32("graphics/pokedex/menu_list.4bpp.lz"); -const u32 gPokedexMenu_Gfx[] = INCBIN_U32("graphics/pokedex/menu.4bpp.lz"); -const u32 gPokedexInterface_Gfx[] = INCBIN_U32("graphics/pokedex/interface.4bpp.lz"); -const u32 gUnused_PokedexNoBall[] = INCBIN_U32("graphics/pokedex/noball_unused.4bpp.lz"); -const u32 gPokedexStartMenuMain_Tilemap[] = INCBIN_U32("graphics/pokedex/start_menu_main.bin.lz"); -const u32 gPokedexStartMenuSearchResults_Tilemap[] = INCBIN_U32("graphics/pokedex/start_menu_search_results.bin.lz"); -const u32 gPokedexList_Tilemap[] = INCBIN_U32("graphics/pokedex/list.bin.lz"); -const u32 gPokedexListUnderlay_Tilemap[] = INCBIN_U32("graphics/pokedex/list_underlay.bin.lz"); -const u32 gPokedexSizeScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/size_screen.bin.lz"); -const u32 gPokedexScreenSelectBarMain_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_main.bin.lz"); -const u32 gPokedexScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu.bin.lz"); -const u32 gPokedexScreenSelectBarSubmenu_Tilemap_Clear[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu_clear.bin.lz"); -// const u32 gPokedexScreenSelectBarSubmenu_Area_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu_area.bin.lz"); -// const u32 gPokedexScreenSelectBarSubmenu_Cry_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu_cry.bin.lz"); -// const u32 gPokedexScreenSelectBarSubmenu_Size_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu_size.bin.lz"); -const u32 gPokedexInfoScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/info_screen.bin.lz"); -const u32 gPokedexStatsScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/stats_screen.bin.lz"); -const u32 gPokedexEvolutionScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/evo_tilemap.bin.lz"); -const u32 gPokedexEvolutionScreen_Tilemap_PE[] = INCBIN_U32("graphics/pokedex/evoPE_tilemap.bin.lz"); -const u32 gPokedexFormsScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/forms_tilemap.bin.lz"); -const u32 gPokedexCryScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/cry_screen.bin.lz"); -const u16 gPokedexSearchMenu_Pal[] = INCBIN_U16("graphics/pokedex/search_menu.gbapal"); -const u32 gPokedexSearchMenu_Gfx[] = INCBIN_U32("graphics/pokedex/search_menu.4bpp.lz"); -const u32 gPokedexSearchMenuNational_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_national.bin.lz"); -const u32 gPokedexSearchMenuHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_hoenn.bin.lz"); +const u16 gPokedexDefault_Pal[] = INCBIN_U16("graphics/pokedex/HGSS_palette_default.gbapal"); +const u16 gPokedexNational_Pal[] = INCBIN_U16("graphics/pokedex/HGSS_palette_national.gbapal"); +const u16 gPokedexMenuSearch_Pal[] = INCBIN_U16("graphics/pokedex/HGSS_palette_search_menu.gbapal"); +const u16 gPokedexSearchResults_Pal[] = INCBIN_U16("graphics/pokedex/HGSS_palette_search_results.gbapal"); +const u16 gPokedexDefault_dark_Pal[] = INCBIN_U16("graphics/pokedex/HGSS_palette_default_dark.gbapal"); +const u16 gPokedexNational_dark_Pal[] = INCBIN_U16("graphics/pokedex/HGSS_palette_national_dark.gbapal"); +const u16 gPokedexMenuSearch_dark_Pal[] = INCBIN_U16("graphics/pokedex/HGSS_palette_search_menu_dark.gbapal"); +const u16 gPokedexSearchResults_dark_Pal[] = INCBIN_U16("graphics/pokedex/HGSS_palette_search_results_dark.gbapal"); + +const u32 gPokedexMenuList_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu_list.4bpp.lz"); +const u32 gPokedexMenuList_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu_list_DECA.4bpp.lz"); +const u32 gPokedexInterface_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_interface.4bpp.lz"); +const u32 gPokedexInterface_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_interface_DECA.4bpp.lz"); +const u32 gPokedexMenu_1_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu1.4bpp.lz"); +const u32 gPokedexMenu_2_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu2.4bpp.lz"); +const u32 gPokedexMenu_3_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu3.4bpp.lz"); +const u32 gPokedexMenuSearch_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu_search.4bpp.lz"); +const u32 gPokedexMenuSearch_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu_search_DECA.4bpp.lz"); +const u32 gPokedexStartMenuMain_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_start_menu.bin.lz"); +const u32 gPokedexStartMenuSearchResults_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_start_menu_search_results.bin.lz"); +const u32 gUnused_PokedexNoBall[] = INCBIN_U32("graphics/pokedex/noball_unused.4bpp.lz"); +const u32 gPokedexScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_SelectBar.bin.lz"); +const u32 gPokedexScreenSelectBarSubmenu_Tilemap_Clear[] = INCBIN_U32("graphics/pokedex/HGSS_SelectBar_clear.bin.lz"); + +const u32 gPokedexScreenList_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_list_screen.bin.lz"); +const u32 gPokedexScreenListUnderlay_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_list_screen_underlay.bin.lz"); +const u32 gPokedexScreenInfo_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_info_screen.bin.lz"); +const u32 gPokedexScreenStats_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_stats_screen.bin.lz"); +const u32 gPokedexScreenEvolution_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_evo_screen.bin.lz"); +const u32 gPokedexScreenEvolution_Tilemap_PE[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin.lz"); +const u32 gPokedexScreenForms_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_forms_screen.bin.lz"); +const u32 gPokedexScreenCry_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_cry_screen.bin.lz"); +const u32 gPokedexScreenSize_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_size_screen.bin.lz"); +const u32 gPokedexScreenSearchHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_search_screen_hoenn.bin.lz"); +const u32 gPokedexScreenSearchNational_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_search_screen_national.bin.lz"); + + const u16 gSummaryScreenPowAcc_Tilemap[] = INCBIN_U16("graphics/interface/powacc_tilemap.bin"); const u16 gSummaryScreenAppealJam_Tilemap[] = INCBIN_U16("graphics/interface/appealjam_tilemap.bin"); diff --git a/src/pokedex.c b/src/pokedex.c index 5fa51ea292..fce07ce619 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -207,10 +207,10 @@ struct PokedexView #ifdef BATTLE_ENGINE u8 splitIconSpriteId; //HGSS_Ui Physical/Special Split from BE #endif - u8 numEggMoves; - u8 numLevelUpMoves; - u8 numTMHMMoves; - u8 numTutorMoves; + u8 numEggMoves; //HGSS_Ui + u8 numLevelUpMoves; //HGSS_Ui + u8 numTMHMMoves; //HGSS_Ui + u8 numTutorMoves; //HGSS_Ui u16 selectedMonSpriteId; s16 pokeBallRotationStep; s16 pokeBallRotationBackup; @@ -344,6 +344,9 @@ static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible); static void CreateTypeIconSprites(void); //Stats screen HGSS_Ui #define SCROLLING_MON_X 146 +#define HGSS_DECAPPED 0 //0 false, 1 true +#define HGSS_DARK_MODE 0 //0 false, 1 true +static void LoadTilesetTilemapHGSS(u8 page); static void Task_HandleStatsScreenInput(u8 taskId); static void PrintMonStats(u8 taskId, u32 num, u32 value, u32 owned, u32 newEntry); static void Task_LoadStatsScreen(u8 taskId); @@ -1001,12 +1004,13 @@ static const struct SpriteTemplate sDexListStartMenuCursorSpriteTemplate = static const struct CompressedSpriteSheet sInterfaceSpriteSheet[] = { {gPokedexInterface_Gfx, 0x2000, TAG_DEX_INTERFACE}, + {gPokedexInterface_DECA_Gfx, 0x2000, TAG_DEX_INTERFACE}, {0} }; static const struct SpritePalette sInterfaceSpritePalette[] = { - {gPokedexBgHoenn_Pal, TAG_DEX_INTERFACE}, + {gPokedexDefault_Pal, TAG_DEX_INTERFACE}, {0} }; @@ -2327,9 +2331,12 @@ static bool8 LoadPokedexListPage(u8 page) SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE)); SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE)); SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE)); - DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuList_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(1, gPokedexList_Tilemap, 0, 0); - CopyToBgTilemapBuffer(3, gPokedexListUnderlay_Tilemap, 0, 0); + if (!HGSS_DECAPPED) + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuList_Gfx, 0x2000, 0, 0); + else + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuList_DECA_Gfx, 0x2000, 0, 0); + CopyToBgTilemapBuffer(1, gPokedexScreenList_Tilemap, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexScreenListUnderlay_Tilemap, 0, 0); if (page == PAGE_MAIN) CopyToBgTilemapBuffer(0, gPokedexStartMenuMain_Tilemap, 0, 0x280); else @@ -2350,7 +2357,7 @@ static bool8 LoadPokedexListPage(u8 page) ResetSpriteData(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; - LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[0]); + LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[HGSS_DARK_MODE]); LoadSpritePalettes(sInterfaceSpritePalette); LoadSpritePalettes(sStatBarSpritePal); //HGSS_Ui CreateInterfaceSprites(page); @@ -2410,13 +2417,27 @@ static bool8 LoadPokedexListPage(u8 page) static void LoadPokedexBgPalette(bool8 isSearchResults) { - if (isSearchResults == TRUE) - LoadPalette(gPokedexSearchResults_Pal + 1, 1, 0xBE); - else if (!IsNationalPokedexEnabled()) - LoadPalette(gPokedexBgHoenn_Pal + 1, 1, 0xBE); + if (!HGSS_DARK_MODE) + { + if (isSearchResults == TRUE) + LoadPalette(gPokedexSearchResults_Pal + 1, 1, 0xBE); + else if (!IsNationalPokedexEnabled()) + LoadPalette(gPokedexDefault_Pal + 1, 1, 0xBE); + else + LoadPalette(gPokedexNational_Pal + 1, 1, 0xBE); + LoadPalette(GetOverworldTextboxPalettePtr(), 0xF0, 32); + } else - LoadPalette(gPokedexBgNational_Pal + 1, 1, 0xBE); - LoadPalette(GetOverworldTextboxPalettePtr(), 0xF0, 32); + { + if (isSearchResults == TRUE) + LoadPalette(gPokedexSearchResults_dark_Pal + 1, 1, 0xBE); + else if (!IsNationalPokedexEnabled()) + LoadPalette(gPokedexDefault_dark_Pal + 1, 1, 0xBE); + else + LoadPalette(gPokedexNational_dark_Pal + 1, 1, 0xBE); + LoadPalette(GetOverworldTextboxPalettePtr(), 0xF0, 32); + } + } static void FreeWindowAndBgBuffers(void) @@ -3542,8 +3563,9 @@ static void Task_LoadInfoScreen(u8 taskId) } break; case 1: - DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, gPokedexInfoScreen_Tilemap, 0, 0); + LoadTilesetTilemapHGSS(INFO_SCREEN); + // DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); + // CopyToBgTilemapBuffer(3, gPokedexInfoScreen_Tilemap, 0, 0); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); PutWindowTilemap(WIN_FOOTPRINT); @@ -3858,8 +3880,9 @@ static void Task_LoadCryScreen(u8 taskId) } break; case 1: - DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenuRest_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, &gPokedexCryScreen_Tilemap, 0, 0); + LoadTilesetTilemapHGSS(CRY_SCREEN); + // DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenuRest_Gfx, 0x2000, 0, 0); + // CopyToBgTilemapBuffer(3, &gPokedexCryScreen_Tilemap, 0, 0); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); PutWindowTilemap(WIN_VU_METER); @@ -4052,8 +4075,9 @@ static void Task_LoadSizeScreen(u8 taskId) } break; case 1: - DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuRest_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, gPokedexSizeScreen_Tilemap, 0, 0); + LoadTilesetTilemapHGSS(SIZE_SCREEN); + // DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuRest_Gfx, 0x2000, 0, 0); + // CopyToBgTilemapBuffer(3, gPokedexSizeScreen_Tilemap, 0, 0); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); gMain.state++; @@ -4285,8 +4309,9 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId) } break; case 1: - DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, gPokedexInfoScreen_Tilemap, 0, 0); + LoadTilesetTilemapHGSS(INFO_SCREEN); + // DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); + // CopyToBgTilemapBuffer(3, gPokedexInfoScreen_Tilemap, 0, 0); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); PutWindowTilemap(WIN_FOOTPRINT); @@ -4345,11 +4370,17 @@ static void Task_HandleCaughtMonPageInput(u8 taskId) // Flicker caught screen color else if (++gTasks[taskId].tPalTimer & 16) { - LoadPalette(gPokedexBgHoenn_Pal + 1, 0x31, 14); + if (!HGSS_DARK_MODE) + LoadPalette(gPokedexDefault_Pal + 1, 0x31, 14); + else + LoadPalette(gPokedexDefault_dark_Pal + 1, 0x31, 14); } else { - LoadPalette(gPokedexCaughtScreen_Pal + 1, 0x31, 14); + if (!HGSS_DARK_MODE) + LoadPalette(gPokedexDefault_Pal + 1, 0x31, 14); //gPokedexCaughtScreen_Pal + else + LoadPalette(gPokedexDefault_dark_Pal + 1, 0x31, 14); } } @@ -5339,18 +5370,23 @@ static void Task_LoadSearchMenu(u8 taskId) InitWindows(sSearchMenu_WindowTemplate); DeactivateAllTextPrinters(); PutWindowTilemap(0); - DecompressAndLoadBgGfxUsingHeap(3, gPokedexSearchMenu_Gfx, 0x2000, 0, 0); - - if (!IsNationalPokedexEnabled()) - CopyToBgTilemapBuffer(3, gPokedexSearchMenuHoenn_Tilemap, 0, 0); + if (!HGSS_DECAPPED) + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuSearch_Gfx, 0x2000, 0, 0); else - CopyToBgTilemapBuffer(3, gPokedexSearchMenuNational_Tilemap, 0, 0); - LoadPalette(gPokedexSearchMenu_Pal + 1, 1, 0x7E); + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuSearch_DECA_Gfx, 0x2000, 0, 0); + if (!IsNationalPokedexEnabled()) + CopyToBgTilemapBuffer(3, gPokedexScreenSearchHoenn_Tilemap, 0, 0); + else + CopyToBgTilemapBuffer(3, gPokedexScreenSearchNational_Tilemap, 0, 0); + if (!HGSS_DARK_MODE) + LoadPalette(gPokedexMenuSearch_Pal + 1, 1, 0x7E); + else + LoadPalette(gPokedexMenuSearch_dark_Pal + 1, 1, 0x7E); gMain.state = 1; } break; case 1: - LoadCompressedSpriteSheet(sInterfaceSpriteSheet); + LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[HGSS_DECAPPED]); LoadSpritePalettes(sInterfaceSpritePalette); LoadSpritePalettes(sStatBarSpritePal); //HGSS_Ui CreateSearchParameterScrollArrows(taskId); @@ -6152,6 +6188,60 @@ static void ClearSearchParameterBoxText(void) +//PokedexPlus HGSS_Ui +static void LoadTilesetTilemapHGSS(u8 page) +{ + switch (page) + { + case INFO_SCREEN: + if (!HGSS_DECAPPED) + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_1_Gfx, 0x2000, 0, 0); + else + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_1_Gfx, 0x2000, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexScreenInfo_Tilemap, 0, 0); + break; + case STATS_SCREEN: + if (!HGSS_DECAPPED) + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_1_Gfx, 0x2000, 0, 0); + else + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_1_Gfx, 0x2000, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexScreenStats_Tilemap, 0, 0); + break; + case EVO_SCREEN: + if (!HGSS_DECAPPED) + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_2_Gfx, 0x2000, 0, 0); + else + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_2_Gfx, 0x2000, 0, 0); + #ifndef POKEMON_EXPANSION + CopyToBgTilemapBuffer(3, gPokedexScreenEvolution_Tilemap, 0, 0); + #endif + #ifdef POKEMON_EXPANSION + CopyToBgTilemapBuffer(3, gPokedexScreenEvolution_Tilemap_PE, 0, 0); + #endif + break; + case FORMS_SCREEN: //Pokemonexpansion only (rhh) + if (!HGSS_DECAPPED) + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_2_Gfx, 0x2000, 0, 0); + else + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_2_Gfx, 0x2000, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexScreenForms_Tilemap, 0, 0); + break; + case CRY_SCREEN: + if (!HGSS_DECAPPED) + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_3_Gfx, 0x2000, 0, 0); + else + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_3_Gfx, 0x2000, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexScreenCry_Tilemap, 0, 0); + break; + case SIZE_SCREEN: + if (!HGSS_DECAPPED) + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_3_Gfx, 0x2000, 0, 0); + else + DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_3_Gfx, 0x2000, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexScreenSize_Tilemap, 0, 0); + break; + } +} //PokedexPlus HGSS_Ui Stats Page #define tMonSpriteId data[4] @@ -6178,8 +6268,9 @@ static void Task_LoadStatsScreen(u8 taskId) } break; case 1: - DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, gPokedexStatsScreen_Tilemap, 0, 0); + LoadTilesetTilemapHGSS(STATS_SCREEN); + // DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); + // CopyToBgTilemapBuffer(3, gPokedexStatsScreen_Tilemap, 0, 0); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); CopyWindowToVram(WIN_INFO, 3); @@ -7027,13 +7118,7 @@ static void Task_LoadEvolutionScreen(u8 taskId) } break; case 1: - DecompressAndLoadBgGfxUsingHeap(3, gPokedexEvo_Gfx, 0x2000, 0, 0); - #ifndef POKEMON_EXPANSION - CopyToBgTilemapBuffer(3, gPokedexEvolutionScreen_Tilemap, 0, 0); - #endif - #ifdef POKEMON_EXPANSION - CopyToBgTilemapBuffer(3, gPokedexEvolutionScreen_Tilemap_PE, 0, 0); - #endif + LoadTilesetTilemapHGSS(EVO_SCREEN); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); CopyWindowToVram(WIN_INFO, 3); @@ -7731,8 +7816,9 @@ static void Task_LoadFormsScreen(u8 taskId) } break; case 1: - DecompressAndLoadBgGfxUsingHeap(3, gPokedexEvo_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, gPokedexFormsScreen_Tilemap, 0, 0); + LoadTilesetTilemapHGSS(FORMS_SCREEN); + // DecompressAndLoadBgGfxUsingHeap(3, gPokedexEvo_Gfx, 0x2000, 0, 0); + // CopyToBgTilemapBuffer(3, gPokedexFormsScreen_Tilemap, 0, 0); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); CopyWindowToVram(WIN_INFO, 3);