From 8b43cffe09d3357a5de3dfdbde4aa99ae6ff5fc8 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Tue, 22 Feb 2022 18:43:23 -0500
Subject: [PATCH] Move remaining region map graphics to region map folder

---
 .../{ => region_map}/city_maps/dewford_0.bin  | Bin
 .../city_maps/ever_grande_0.bin               | Bin
 .../city_maps/ever_grande_1.bin               | Bin
 .../city_maps/fallarbor_0.bin                 | Bin
 .../{ => region_map}/city_maps/fortree_0.bin  | Bin
 .../city_maps/lavaridge_0.bin                 | Bin
 .../{ => region_map}/city_maps/lilycove_0.bin | Bin
 .../{ => region_map}/city_maps/lilycove_1.bin | Bin
 .../city_maps/littleroot_0.bin                | Bin
 .../{ => region_map}/city_maps/mauville_0.bin | Bin
 .../{ => region_map}/city_maps/mauville_1.bin | Bin
 .../{ => region_map}/city_maps/mossdeep_0.bin | Bin
 .../{ => region_map}/city_maps/mossdeep_1.bin | Bin
 .../{ => region_map}/city_maps/oldale_0.bin   | Bin
 .../city_maps/pacifidlog_0.bin                | Bin
 .../city_maps/petalburg_0.bin                 | Bin
 .../{ => region_map}/city_maps/rustboro_0.bin | Bin
 .../{ => region_map}/city_maps/rustboro_1.bin | Bin
 .../city_maps/slateport_0.bin                 | Bin
 .../city_maps/slateport_1.bin                 | Bin
 .../city_maps/sootopolis_0.bin                | Bin
 .../city_maps/verdanturf_0.bin                | Bin
 .../{ => region_map}/city_zoom_text.png       | Bin
 .../map.bin}                                  | Bin
 .../{region_map.pal => region_map/map.pal}    |   0
 .../{region_map.png => region_map/map.png}    | Bin
 .../pokenav/{ => region_map}/zoom_tiles.png   | Bin
 graphics_file_rules.mk                        |   2 +-
 src/data/region_map/city_map_tilemaps.h       |  44 +++++++++---------
 src/graphics.c                                |   4 +-
 src/pokenav_region_map.c                      |   2 +-
 src/region_map.c                              |   8 ++--
 32 files changed, 29 insertions(+), 31 deletions(-)
 rename graphics/pokenav/{ => region_map}/city_maps/dewford_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/ever_grande_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/ever_grande_1.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/fallarbor_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/fortree_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/lavaridge_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/lilycove_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/lilycove_1.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/littleroot_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/mauville_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/mauville_1.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/mossdeep_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/mossdeep_1.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/oldale_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/pacifidlog_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/petalburg_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/rustboro_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/rustboro_1.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/slateport_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/slateport_1.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/sootopolis_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_maps/verdanturf_0.bin (100%)
 rename graphics/pokenav/{ => region_map}/city_zoom_text.png (100%)
 rename graphics/pokenav/{region_map_map.bin => region_map/map.bin} (100%)
 rename graphics/pokenav/{region_map.pal => region_map/map.pal} (100%)
 rename graphics/pokenav/{region_map.png => region_map/map.png} (100%)
 rename graphics/pokenav/{ => region_map}/zoom_tiles.png (100%)

diff --git a/graphics/pokenav/city_maps/dewford_0.bin b/graphics/pokenav/region_map/city_maps/dewford_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/dewford_0.bin
rename to graphics/pokenav/region_map/city_maps/dewford_0.bin
diff --git a/graphics/pokenav/city_maps/ever_grande_0.bin b/graphics/pokenav/region_map/city_maps/ever_grande_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/ever_grande_0.bin
rename to graphics/pokenav/region_map/city_maps/ever_grande_0.bin
diff --git a/graphics/pokenav/city_maps/ever_grande_1.bin b/graphics/pokenav/region_map/city_maps/ever_grande_1.bin
similarity index 100%
rename from graphics/pokenav/city_maps/ever_grande_1.bin
rename to graphics/pokenav/region_map/city_maps/ever_grande_1.bin
diff --git a/graphics/pokenav/city_maps/fallarbor_0.bin b/graphics/pokenav/region_map/city_maps/fallarbor_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/fallarbor_0.bin
rename to graphics/pokenav/region_map/city_maps/fallarbor_0.bin
diff --git a/graphics/pokenav/city_maps/fortree_0.bin b/graphics/pokenav/region_map/city_maps/fortree_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/fortree_0.bin
rename to graphics/pokenav/region_map/city_maps/fortree_0.bin
diff --git a/graphics/pokenav/city_maps/lavaridge_0.bin b/graphics/pokenav/region_map/city_maps/lavaridge_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/lavaridge_0.bin
rename to graphics/pokenav/region_map/city_maps/lavaridge_0.bin
diff --git a/graphics/pokenav/city_maps/lilycove_0.bin b/graphics/pokenav/region_map/city_maps/lilycove_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/lilycove_0.bin
rename to graphics/pokenav/region_map/city_maps/lilycove_0.bin
diff --git a/graphics/pokenav/city_maps/lilycove_1.bin b/graphics/pokenav/region_map/city_maps/lilycove_1.bin
similarity index 100%
rename from graphics/pokenav/city_maps/lilycove_1.bin
rename to graphics/pokenav/region_map/city_maps/lilycove_1.bin
diff --git a/graphics/pokenav/city_maps/littleroot_0.bin b/graphics/pokenav/region_map/city_maps/littleroot_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/littleroot_0.bin
rename to graphics/pokenav/region_map/city_maps/littleroot_0.bin
diff --git a/graphics/pokenav/city_maps/mauville_0.bin b/graphics/pokenav/region_map/city_maps/mauville_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/mauville_0.bin
rename to graphics/pokenav/region_map/city_maps/mauville_0.bin
diff --git a/graphics/pokenav/city_maps/mauville_1.bin b/graphics/pokenav/region_map/city_maps/mauville_1.bin
similarity index 100%
rename from graphics/pokenav/city_maps/mauville_1.bin
rename to graphics/pokenav/region_map/city_maps/mauville_1.bin
diff --git a/graphics/pokenav/city_maps/mossdeep_0.bin b/graphics/pokenav/region_map/city_maps/mossdeep_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/mossdeep_0.bin
rename to graphics/pokenav/region_map/city_maps/mossdeep_0.bin
diff --git a/graphics/pokenav/city_maps/mossdeep_1.bin b/graphics/pokenav/region_map/city_maps/mossdeep_1.bin
similarity index 100%
rename from graphics/pokenav/city_maps/mossdeep_1.bin
rename to graphics/pokenav/region_map/city_maps/mossdeep_1.bin
diff --git a/graphics/pokenav/city_maps/oldale_0.bin b/graphics/pokenav/region_map/city_maps/oldale_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/oldale_0.bin
rename to graphics/pokenav/region_map/city_maps/oldale_0.bin
diff --git a/graphics/pokenav/city_maps/pacifidlog_0.bin b/graphics/pokenav/region_map/city_maps/pacifidlog_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/pacifidlog_0.bin
rename to graphics/pokenav/region_map/city_maps/pacifidlog_0.bin
diff --git a/graphics/pokenav/city_maps/petalburg_0.bin b/graphics/pokenav/region_map/city_maps/petalburg_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/petalburg_0.bin
rename to graphics/pokenav/region_map/city_maps/petalburg_0.bin
diff --git a/graphics/pokenav/city_maps/rustboro_0.bin b/graphics/pokenav/region_map/city_maps/rustboro_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/rustboro_0.bin
rename to graphics/pokenav/region_map/city_maps/rustboro_0.bin
diff --git a/graphics/pokenav/city_maps/rustboro_1.bin b/graphics/pokenav/region_map/city_maps/rustboro_1.bin
similarity index 100%
rename from graphics/pokenav/city_maps/rustboro_1.bin
rename to graphics/pokenav/region_map/city_maps/rustboro_1.bin
diff --git a/graphics/pokenav/city_maps/slateport_0.bin b/graphics/pokenav/region_map/city_maps/slateport_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/slateport_0.bin
rename to graphics/pokenav/region_map/city_maps/slateport_0.bin
diff --git a/graphics/pokenav/city_maps/slateport_1.bin b/graphics/pokenav/region_map/city_maps/slateport_1.bin
similarity index 100%
rename from graphics/pokenav/city_maps/slateport_1.bin
rename to graphics/pokenav/region_map/city_maps/slateport_1.bin
diff --git a/graphics/pokenav/city_maps/sootopolis_0.bin b/graphics/pokenav/region_map/city_maps/sootopolis_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/sootopolis_0.bin
rename to graphics/pokenav/region_map/city_maps/sootopolis_0.bin
diff --git a/graphics/pokenav/city_maps/verdanturf_0.bin b/graphics/pokenav/region_map/city_maps/verdanturf_0.bin
similarity index 100%
rename from graphics/pokenav/city_maps/verdanturf_0.bin
rename to graphics/pokenav/region_map/city_maps/verdanturf_0.bin
diff --git a/graphics/pokenav/city_zoom_text.png b/graphics/pokenav/region_map/city_zoom_text.png
similarity index 100%
rename from graphics/pokenav/city_zoom_text.png
rename to graphics/pokenav/region_map/city_zoom_text.png
diff --git a/graphics/pokenav/region_map_map.bin b/graphics/pokenav/region_map/map.bin
similarity index 100%
rename from graphics/pokenav/region_map_map.bin
rename to graphics/pokenav/region_map/map.bin
diff --git a/graphics/pokenav/region_map.pal b/graphics/pokenav/region_map/map.pal
similarity index 100%
rename from graphics/pokenav/region_map.pal
rename to graphics/pokenav/region_map/map.pal
diff --git a/graphics/pokenav/region_map.png b/graphics/pokenav/region_map/map.png
similarity index 100%
rename from graphics/pokenav/region_map.png
rename to graphics/pokenav/region_map/map.png
diff --git a/graphics/pokenav/zoom_tiles.png b/graphics/pokenav/region_map/zoom_tiles.png
similarity index 100%
rename from graphics/pokenav/zoom_tiles.png
rename to graphics/pokenav/region_map/zoom_tiles.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 9e5c191930..f0e349970d 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -336,7 +336,7 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 63
 
-graphics/pokenav/region_map.8bpp: %.8bpp: %.png
+graphics/pokenav/region_map/map.8bpp: %.8bpp: %.png
 	$(GFX) $< $@ -num_tiles 233
 
 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
diff --git a/src/data/region_map/city_map_tilemaps.h b/src/data/region_map/city_map_tilemaps.h
index fed1589352..11a48c15dc 100644
--- a/src/data/region_map/city_map_tilemaps.h
+++ b/src/data/region_map/city_map_tilemaps.h
@@ -1,22 +1,22 @@
-const u32 gPokenavCityMap_Lavaridge_0[] = INCBIN_U32("graphics/pokenav/city_maps/lavaridge_0.bin.lz");
-const u32 gPokenavCityMap_Fallarbor_0[] = INCBIN_U32("graphics/pokenav/city_maps/fallarbor_0.bin.lz");
-const u32 gPokenavCityMap_Fortree_0[] = INCBIN_U32("graphics/pokenav/city_maps/fortree_0.bin.lz");
-const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("graphics/pokenav/city_maps/slateport_0.bin.lz");
-const u32 gPokenavCityMap_Slateport_1[] = INCBIN_U32("graphics/pokenav/city_maps/slateport_1.bin.lz");
-const u32 gPokenavCityMap_Rustboro_0[] = INCBIN_U32("graphics/pokenav/city_maps/rustboro_0.bin.lz");
-const u32 gPokenavCityMap_Rustboro_1[] = INCBIN_U32("graphics/pokenav/city_maps/rustboro_1.bin.lz");
-const u32 gPokenavCityMap_Pacifidlog_0[] = INCBIN_U32("graphics/pokenav/city_maps/pacifidlog_0.bin.lz");
-const u32 gPokenavCityMap_Mauville_1[] = INCBIN_U32("graphics/pokenav/city_maps/mauville_1.bin.lz");
-const u32 gPokenavCityMap_Mauville_0[] = INCBIN_U32("graphics/pokenav/city_maps/mauville_0.bin.lz");
-const u32 gPokenavCityMap_Oldale_0[] = INCBIN_U32("graphics/pokenav/city_maps/oldale_0.bin.lz");
-const u32 gPokenavCityMap_Lilycove_1[] = INCBIN_U32("graphics/pokenav/city_maps/lilycove_1.bin.lz");
-const u32 gPokenavCityMap_Lilycove_0[] = INCBIN_U32("graphics/pokenav/city_maps/lilycove_0.bin.lz");
-const u32 gPokenavCityMap_Littleroot_0[] = INCBIN_U32("graphics/pokenav/city_maps/littleroot_0.bin.lz");
-const u32 gPokenavCityMap_Dewford_0[] = INCBIN_U32("graphics/pokenav/city_maps/dewford_0.bin.lz");
-const u32 gPokenavCityMap_Sootopolis_0[] = INCBIN_U32("graphics/pokenav/city_maps/sootopolis_0.bin.lz");
-const u32 gPokenavCityMap_EverGrande_0[] = INCBIN_U32("graphics/pokenav/city_maps/ever_grande_0.bin.lz");
-const u32 gPokenavCityMap_EverGrande_1[] = INCBIN_U32("graphics/pokenav/city_maps/ever_grande_1.bin.lz");
-const u32 gPokenavCityMap_Verdanturf_0[] = INCBIN_U32("graphics/pokenav/city_maps/verdanturf_0.bin.lz");
-const u32 gPokenavCityMap_Mossdeep_1[] = INCBIN_U32("graphics/pokenav/city_maps/mossdeep_1.bin.lz");
-const u32 gPokenavCityMap_Mossdeep_0[] = INCBIN_U32("graphics/pokenav/city_maps/mossdeep_0.bin.lz");
-const u32 gPokenavCityMap_Petalburg_0[] = INCBIN_U32("graphics/pokenav/city_maps/petalburg_0.bin.lz");
+const u32 gPokenavCityMap_Lavaridge_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lavaridge_0.bin.lz");
+const u32 gPokenavCityMap_Fallarbor_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/fallarbor_0.bin.lz");
+const u32 gPokenavCityMap_Fortree_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/fortree_0.bin.lz");
+const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/slateport_0.bin.lz");
+const u32 gPokenavCityMap_Slateport_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/slateport_1.bin.lz");
+const u32 gPokenavCityMap_Rustboro_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/rustboro_0.bin.lz");
+const u32 gPokenavCityMap_Rustboro_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/rustboro_1.bin.lz");
+const u32 gPokenavCityMap_Pacifidlog_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/pacifidlog_0.bin.lz");
+const u32 gPokenavCityMap_Mauville_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mauville_1.bin.lz");
+const u32 gPokenavCityMap_Mauville_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mauville_0.bin.lz");
+const u32 gPokenavCityMap_Oldale_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/oldale_0.bin.lz");
+const u32 gPokenavCityMap_Lilycove_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lilycove_1.bin.lz");
+const u32 gPokenavCityMap_Lilycove_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lilycove_0.bin.lz");
+const u32 gPokenavCityMap_Littleroot_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/littleroot_0.bin.lz");
+const u32 gPokenavCityMap_Dewford_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/dewford_0.bin.lz");
+const u32 gPokenavCityMap_Sootopolis_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/sootopolis_0.bin.lz");
+const u32 gPokenavCityMap_EverGrande_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/ever_grande_0.bin.lz");
+const u32 gPokenavCityMap_EverGrande_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/ever_grande_1.bin.lz");
+const u32 gPokenavCityMap_Verdanturf_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/verdanturf_0.bin.lz");
+const u32 gPokenavCityMap_Mossdeep_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mossdeep_1.bin.lz");
+const u32 gPokenavCityMap_Mossdeep_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mossdeep_0.bin.lz");
+const u32 gPokenavCityMap_Petalburg_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/petalburg_0.bin.lz");
diff --git a/src/graphics.c b/src/graphics.c
index 9f708f18b4..45be8e9089 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1323,8 +1323,8 @@ const u16 gPokenavMessageBox_Pal[] = INCBIN_U16("graphics/pokenav/message.gbapal
 const u32 gPokenavMessageBox_Gfx[] = INCBIN_U32("graphics/pokenav/message.4bpp.lz");
 const u32 gPokenavMessageBox_Tilemap[] = INCBIN_U32("graphics/pokenav/message.bin.lz");
 
-const u16 gRegionMapCityZoomTiles_Pal[] = INCBIN_U16("graphics/pokenav/zoom_tiles.gbapal");
-const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/city_zoom_text.4bpp.lz");
+const u16 gRegionMapCityZoomTiles_Pal[] = INCBIN_U16("graphics/pokenav/region_map/zoom_tiles.gbapal");
+const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/region_map/city_zoom_text.4bpp.lz");
 
 const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/condition/cancel.gbapal");
 const u8 gPokenavConditionCancel_Gfx[] = INCBIN_U8("graphics/pokenav/condition/cancel.4bpp");
diff --git a/src/pokenav_region_map.c b/src/pokenav_region_map.c
index 16ba480703..4860aeec07 100755
--- a/src/pokenav_region_map.c
+++ b/src/pokenav_region_map.c
@@ -78,7 +78,7 @@ extern const u16 gRegionMapCityZoomTiles_Pal[];
 extern const u32 gRegionMapCityZoomText_Gfx[];
 
 static const u16 sMapSecInfoWindow_Pal[] = INCBIN_U16("graphics/pokenav/region_map/info_window.gbapal");
-static const u32 sRegionMapCityZoomTiles_Gfx[] = INCBIN_U32("graphics/pokenav/zoom_tiles.4bpp.lz");
+static const u32 sRegionMapCityZoomTiles_Gfx[] = INCBIN_U32("graphics/pokenav/region_map/zoom_tiles.4bpp.lz");
 
 #include "data/region_map/city_map_tilemaps.h"
 
diff --git a/src/region_map.c b/src/region_map.c
index 24ab5fad8b..1da3afb3ad 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -109,14 +109,12 @@ static void CB_FadeInFlyMap(void);
 static void CB_HandleFlyMapInput(void);
 static void CB_ExitFlyMap(void);
 
-// NOTE: Some of the below graphics are not in graphics/pokenav/region_map
-//       because porymap expects them to be in their current location.
 static const u16 sRegionMapCursorPal[] = INCBIN_U16("graphics/pokenav/region_map/cursor.gbapal");
 static const u32 sRegionMapCursorSmallGfxLZ[] = INCBIN_U32("graphics/pokenav/region_map/cursor_small.4bpp.lz");
 static const u32 sRegionMapCursorLargeGfxLZ[] = INCBIN_U32("graphics/pokenav/region_map/cursor_large.4bpp.lz");
-static const u16 sRegionMapBg_Pal[] = INCBIN_U16("graphics/pokenav/region_map.gbapal");
-static const u32 sRegionMapBg_GfxLZ[] = INCBIN_U32("graphics/pokenav/region_map.8bpp.lz");
-static const u32 sRegionMapBg_TilemapLZ[] = INCBIN_U32("graphics/pokenav/region_map_map.bin.lz");
+static const u16 sRegionMapBg_Pal[] = INCBIN_U16("graphics/pokenav/region_map/map.gbapal");
+static const u32 sRegionMapBg_GfxLZ[] = INCBIN_U32("graphics/pokenav/region_map/map.8bpp.lz");
+static const u32 sRegionMapBg_TilemapLZ[] = INCBIN_U32("graphics/pokenav/region_map/map.bin.lz");
 static const u16 sRegionMapPlayerIcon_BrendanPal[] = INCBIN_U16("graphics/pokenav/region_map/brendan_icon.gbapal");
 static const u8 sRegionMapPlayerIcon_BrendanGfx[] = INCBIN_U8("graphics/pokenav/region_map/brendan_icon.4bpp");
 static const u16 sRegionMapPlayerIcon_MayPal[] = INCBIN_U16("graphics/pokenav/region_map/may_icon.gbapal");