diff --git a/graphics/pokedex/hgss/HGSS_SelectBar.bin b/graphics/pokedex/hgss/SelectBar.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_SelectBar.bin
rename to graphics/pokedex/hgss/SelectBar.bin
diff --git a/graphics/pokedex/hgss/HGSS_SelectBar_clear.bin b/graphics/pokedex/hgss/SelectBar_clear.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_SelectBar_clear.bin
rename to graphics/pokedex/hgss/SelectBar_clear.bin
diff --git a/graphics/pokedex/hgss/HGSS_palette_default.pal b/graphics/pokedex/hgss/palette_default.pal
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_palette_default.pal
rename to graphics/pokedex/hgss/palette_default.pal
diff --git a/graphics/pokedex/hgss/HGSS_palette_default_dark.pal b/graphics/pokedex/hgss/palette_default_dark.pal
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_palette_default_dark.pal
rename to graphics/pokedex/hgss/palette_default_dark.pal
diff --git a/graphics/pokedex/hgss/HGSS_palette_national.pal b/graphics/pokedex/hgss/palette_national.pal
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_palette_national.pal
rename to graphics/pokedex/hgss/palette_national.pal
diff --git a/graphics/pokedex/hgss/HGSS_palette_national_dark.pal b/graphics/pokedex/hgss/palette_national_dark.pal
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_palette_national_dark.pal
rename to graphics/pokedex/hgss/palette_national_dark.pal
diff --git a/graphics/pokedex/hgss/HGSS_palette_search_menu.pal b/graphics/pokedex/hgss/palette_search_menu.pal
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_palette_search_menu.pal
rename to graphics/pokedex/hgss/palette_search_menu.pal
diff --git a/graphics/pokedex/hgss/HGSS_palette_search_menu_dark.pal b/graphics/pokedex/hgss/palette_search_menu_dark.pal
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_palette_search_menu_dark.pal
rename to graphics/pokedex/hgss/palette_search_menu_dark.pal
diff --git a/graphics/pokedex/hgss/HGSS_palette_search_results.pal b/graphics/pokedex/hgss/palette_search_results.pal
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_palette_search_results.pal
rename to graphics/pokedex/hgss/palette_search_results.pal
diff --git a/graphics/pokedex/hgss/HGSS_palette_search_results_dark.pal b/graphics/pokedex/hgss/palette_search_results_dark.pal
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_palette_search_results_dark.pal
rename to graphics/pokedex/hgss/palette_search_results_dark.pal
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_cry_screen.bin b/graphics/pokedex/hgss/tilemap_cry_screen.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_cry_screen.bin
rename to graphics/pokedex/hgss/tilemap_cry_screen.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_evo_screen.bin b/graphics/pokedex/hgss/tilemap_evo_screen.bin
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_evo_screen.bin
rename to graphics/pokedex/hgss/tilemap_evo_screen.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_evo_screen_PE.bin b/graphics/pokedex/hgss/tilemap_evo_screen_PE.bin
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_evo_screen_PE.bin
rename to graphics/pokedex/hgss/tilemap_evo_screen_PE.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_forms_screen.bin b/graphics/pokedex/hgss/tilemap_forms_screen.bin
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_forms_screen.bin
rename to graphics/pokedex/hgss/tilemap_forms_screen.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_info_screen.bin b/graphics/pokedex/hgss/tilemap_info_screen.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_info_screen.bin
rename to graphics/pokedex/hgss/tilemap_info_screen.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_list_screen.bin b/graphics/pokedex/hgss/tilemap_list_screen.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_list_screen.bin
rename to graphics/pokedex/hgss/tilemap_list_screen.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_list_screen_underlay.bin b/graphics/pokedex/hgss/tilemap_list_screen_underlay.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_list_screen_underlay.bin
rename to graphics/pokedex/hgss/tilemap_list_screen_underlay.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_search_screen_hoenn.bin b/graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_search_screen_hoenn.bin
rename to graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_search_screen_national.bin b/graphics/pokedex/hgss/tilemap_search_screen_national.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_search_screen_national.bin
rename to graphics/pokedex/hgss/tilemap_search_screen_national.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_size_screen.bin b/graphics/pokedex/hgss/tilemap_size_screen.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_size_screen.bin
rename to graphics/pokedex/hgss/tilemap_size_screen.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_start_menu.bin b/graphics/pokedex/hgss/tilemap_start_menu.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_start_menu.bin
rename to graphics/pokedex/hgss/tilemap_start_menu.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_start_menu_search_results.bin b/graphics/pokedex/hgss/tilemap_start_menu_search_results.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_start_menu_search_results.bin
rename to graphics/pokedex/hgss/tilemap_start_menu_search_results.bin
diff --git a/graphics/pokedex/hgss/HGSS_tilemap_stats_screen.bin b/graphics/pokedex/hgss/tilemap_stats_screen.bin
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tilemap_stats_screen.bin
rename to graphics/pokedex/hgss/tilemap_stats_screen.bin
diff --git a/graphics/pokedex/hgss/HGSS_tileset_interface.png b/graphics/pokedex/hgss/tileset_interface.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_interface.png
rename to graphics/pokedex/hgss/tileset_interface.png
diff --git a/graphics/pokedex/hgss/HGSS_tileset_interface_DECA.png b/graphics/pokedex/hgss/tileset_interface_DECA.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_interface_DECA.png
rename to graphics/pokedex/hgss/tileset_interface_DECA.png
diff --git a/graphics/pokedex/hgss/HGSS_tileset_menu1.png b/graphics/pokedex/hgss/tileset_menu1.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_menu1.png
rename to graphics/pokedex/hgss/tileset_menu1.png
diff --git a/graphics/pokedex/hgss/HGSS_tileset_menu2.png b/graphics/pokedex/hgss/tileset_menu2.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_menu2.png
rename to graphics/pokedex/hgss/tileset_menu2.png
diff --git a/graphics/pokedex/hgss/HGSS_tileset_menu3.png b/graphics/pokedex/hgss/tileset_menu3.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_menu3.png
rename to graphics/pokedex/hgss/tileset_menu3.png
diff --git a/graphics/pokedex/hgss/HGSS_tileset_menu_list.png b/graphics/pokedex/hgss/tileset_menu_list.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_menu_list.png
rename to graphics/pokedex/hgss/tileset_menu_list.png
diff --git a/graphics/pokedex/hgss/HGSS_tileset_menu_list_DECA.png b/graphics/pokedex/hgss/tileset_menu_list_DECA.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_menu_list_DECA.png
rename to graphics/pokedex/hgss/tileset_menu_list_DECA.png
diff --git a/graphics/pokedex/hgss/HGSS_tileset_menu_search.png b/graphics/pokedex/hgss/tileset_menu_search.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_menu_search.png
rename to graphics/pokedex/hgss/tileset_menu_search.png
diff --git a/graphics/pokedex/hgss/HGSS_tileset_menu_search_DECA.png b/graphics/pokedex/hgss/tileset_menu_search_DECA.png
similarity index 100%
rename from graphics/pokedex/hgss/HGSS_tileset_menu_search_DECA.png
rename to graphics/pokedex/hgss/tileset_menu_search_DECA.png
diff --git a/src/graphics.c b/src/graphics.c
index c4c41b2b3f..b2065356bf 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1741,38 +1741,38 @@ 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/HGSS_palette_default.gbapal");
-const u16 gPokedexPlusHGSS_National_Pal[]            = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_national.gbapal");
-const u16 gPokedexPlusHGSS_MenuSearch_Pal[]          = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_search_menu.gbapal");
-const u16 gPokedexPlusHGSS_SearchResults_Pal[]       = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_search_results.gbapal");
-const u16 gPokedexPlusHGSS_Default_dark_Pal[]             = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_default_dark.gbapal");
-const u16 gPokedexPlusHGSS_National_dark_Pal[]            = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_national_dark.gbapal");
-const u16 gPokedexPlusHGSS_MenuSearch_dark_Pal[]          = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_search_menu_dark.gbapal");
-const u16 gPokedexPlusHGSS_SearchResults_dark_Pal[]       = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_search_results_dark.gbapal");
-const u32 gPokedexPlusHGSS_MenuList_Gfx[]        = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu_list.4bpp.lz");
-const u32 gPokedexPlusHGSS_MenuList_DECA_Gfx[]   = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu_list_DECA.4bpp.lz");
-const u32 gPokedexPlusHGSS_Interface_Gfx[]       = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_interface.4bpp.lz");
-const u32 gPokedexPlusHGSS_Interface_DECA_Gfx[]  = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_interface_DECA.4bpp.lz");
-const u32 gPokedexPlusHGSS_Menu_1_Gfx[]      = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu1.4bpp.lz");
-const u32 gPokedexPlusHGSS_Menu_2_Gfx[]      = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu2.4bpp.lz");
-const u32 gPokedexPlusHGSS_Menu_3_Gfx[]      = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu3.4bpp.lz");
-const u32 gPokedexPlusHGSS_MenuSearch_Gfx[]          = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu_search.4bpp.lz");
-const u32 gPokedexPlusHGSS_MenuSearch_DECA_Gfx[]     = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu_search_DECA.4bpp.lz");
-const u32 gPokedexPlusHGSS_StartMenuMain_Tilemap[]           = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_start_menu.bin.lz");
-const u32 gPokedexPlusHGSS_StartMenuSearchResults_Tilemap[]  = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_start_menu_search_results.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap[]          = INCBIN_U32("graphics/pokedex/hgss/HGSS_SelectBar.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap_Clear[]    = INCBIN_U32("graphics/pokedex/hgss/HGSS_SelectBar_clear.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenList_Tilemap[]          = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_list_screen.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenListUnderlay_Tilemap[]  = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_list_screen_underlay.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenInfo_Tilemap[]          = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_info_screen.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenStats_Tilemap[]         = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_stats_screen.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap[]     = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_evo_screen.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap_PE[]  = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_evo_screen_PE.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenForms_Tilemap[]         = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_forms_screen.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenCry_Tilemap[]           = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_cry_screen.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenSize_Tilemap[]          = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_size_screen.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenSearchHoenn_Tilemap[]   = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_search_screen_hoenn.bin.lz");
-const u32 gPokedexPlusHGSS_ScreenSearchNational_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_search_screen_national.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
 
 const u16 gSummaryScreen_MoveEffect_Battle_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_battle.bin");