summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2022-01-06 23:39:01 -0500
committerGitHub <noreply@github.com>2022-01-06 23:39:01 -0500
commitd0c79e4e479d633b65cb5a821de882416946a975 (patch)
tree178071e2a7f2052d5e79087b2b5022c296436c09
parentcb7b53adeeb96550428f55ba57438312c30803fc (diff)
parent2a59523ad94fe6489675562bdc6660aa67d517dc (diff)
Merge pull request #480 from GriffinRichards/map-preview-gfx
Clean up map preview graphics
-rw-r--r--graphics/map_preview/altering_cave/pal.pal (renamed from graphics/map_preview/altering_cave_pal.pal)0
-rw-r--r--graphics/map_preview/altering_cave/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/altering_cave/tiles.pngbin0 -> 4029 bytes
-rw-r--r--graphics/map_preview/altering_cave_tilemap.binbin976 -> 0 bytes
-rw-r--r--graphics/map_preview/altering_cave_tiles.pngbin4476 -> 0 bytes
-rw-r--r--graphics/map_preview/berry_forest/pal.pal (renamed from graphics/map_preview/berry_forest_pal.pal)0
-rw-r--r--graphics/map_preview/berry_forest/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/berry_forest/tiles.pngbin0 -> 5264 bytes
-rw-r--r--graphics/map_preview/berry_forest_tilemap.binbin992 -> 0 bytes
-rw-r--r--graphics/map_preview/berry_forest_tiles.pngbin5875 -> 0 bytes
-rw-r--r--graphics/map_preview/cerulean_cave/pal.pal (renamed from graphics/map_preview/cerulean_cave_pal.pal)0
-rw-r--r--graphics/map_preview/cerulean_cave/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/cerulean_cave/tiles.pngbin0 -> 3893 bytes
-rw-r--r--graphics/map_preview/cerulean_cave_tilemap.binbin1020 -> 0 bytes
-rw-r--r--graphics/map_preview/cerulean_cave_tiles.pngbin4533 -> 0 bytes
-rw-r--r--graphics/map_preview/digletts_cave/pal.pal (renamed from graphics/map_preview/digletts_cave_pal.pal)0
-rw-r--r--graphics/map_preview/digletts_cave/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/digletts_cave/tiles.pngbin0 -> 4657 bytes
-rw-r--r--graphics/map_preview/digletts_cave_tilemap.binbin996 -> 0 bytes
-rw-r--r--graphics/map_preview/digletts_cave_tiles.pngbin5235 -> 0 bytes
-rw-r--r--graphics/map_preview/dotted_hole/pal.pal (renamed from graphics/map_preview/dotted_hole_pal.pal)0
-rw-r--r--graphics/map_preview/dotted_hole/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/dotted_hole/tiles.pngbin0 -> 3852 bytes
-rw-r--r--graphics/map_preview/dotted_hole_tilemap.binbin836 -> 0 bytes
-rw-r--r--graphics/map_preview/dotted_hole_tiles.pngbin4125 -> 0 bytes
-rw-r--r--graphics/map_preview/icefall_cave/pal.pal (renamed from graphics/map_preview/icefall_cave_pal.pal)0
-rw-r--r--graphics/map_preview/icefall_cave/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/icefall_cave/tiles.pngbin0 -> 4828 bytes
-rw-r--r--graphics/map_preview/icefall_cave_tilemap.binbin992 -> 0 bytes
-rw-r--r--graphics/map_preview/icefall_cave_tiles.pngbin5268 -> 0 bytes
-rw-r--r--graphics/map_preview/kanto_safari_zone_tilemap.binbin864 -> 0 bytes
-rw-r--r--graphics/map_preview/kanto_safari_zone_tiles.pngbin4931 -> 0 bytes
-rw-r--r--graphics/map_preview/kanto_victory_road_tilemap.binbin956 -> 0 bytes
-rw-r--r--graphics/map_preview/kanto_victory_road_tiles.pngbin5237 -> 0 bytes
-rw-r--r--graphics/map_preview/lost_cave/pal.pal (renamed from graphics/map_preview/lost_cave_pal.pal)0
-rw-r--r--graphics/map_preview/lost_cave/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/lost_cave/tiles.pngbin0 -> 3964 bytes
-rw-r--r--graphics/map_preview/lost_cave_tilemap.binbin1000 -> 0 bytes
-rw-r--r--graphics/map_preview/lost_cave_tiles.pngbin4428 -> 0 bytes
-rw-r--r--graphics/map_preview/monean_chamber/pal.pal (renamed from graphics/map_preview/monean_chamber_pal.pal)0
-rw-r--r--graphics/map_preview/monean_chamber/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/monean_chamber/tiles.pngbin0 -> 4441 bytes
-rw-r--r--graphics/map_preview/monean_chamber_tilemap.binbin860 -> 0 bytes
-rw-r--r--graphics/map_preview/monean_chamber_tiles.pngbin4809 -> 0 bytes
-rw-r--r--graphics/map_preview/mt_ember/pal.pal (renamed from graphics/map_preview/mt_ember_pal.pal)0
-rw-r--r--graphics/map_preview/mt_ember/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/mt_ember/tiles.pngbin0 -> 4684 bytes
-rw-r--r--graphics/map_preview/mt_ember_tilemap.binbin908 -> 0 bytes
-rw-r--r--graphics/map_preview/mt_ember_tiles.pngbin5160 -> 0 bytes
-rw-r--r--graphics/map_preview/mt_moon/pal.pal (renamed from graphics/map_preview/mt_moon_pal.pal)0
-rw-r--r--graphics/map_preview/mt_moon/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/mt_moon/tiles.pngbin0 -> 5240 bytes
-rw-r--r--graphics/map_preview/mt_moon_tilemap.binbin920 -> 0 bytes
-rw-r--r--graphics/map_preview/mt_moon_tiles.pngbin5790 -> 0 bytes
-rw-r--r--graphics/map_preview/pokemon_mansion/pal.pal (renamed from graphics/map_preview/pokemon_mansion_pal.pal)0
-rw-r--r--graphics/map_preview/pokemon_mansion/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/pokemon_mansion/tiles.pngbin0 -> 5133 bytes
-rw-r--r--graphics/map_preview/pokemon_mansion_tilemap.binbin988 -> 0 bytes
-rw-r--r--graphics/map_preview/pokemon_mansion_tiles.pngbin5595 -> 0 bytes
-rw-r--r--graphics/map_preview/pokemon_tower/pal.pal (renamed from graphics/map_preview/pokemon_tower_pal.pal)0
-rw-r--r--graphics/map_preview/pokemon_tower/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/pokemon_tower/tiles.pngbin0 -> 2982 bytes
-rw-r--r--graphics/map_preview/pokemon_tower_tilemap.binbin788 -> 0 bytes
-rw-r--r--graphics/map_preview/pokemon_tower_tiles.pngbin3379 -> 0 bytes
-rw-r--r--graphics/map_preview/power_plant/pal.pal (renamed from graphics/map_preview/power_plant_pal.pal)0
-rw-r--r--graphics/map_preview/power_plant/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/power_plant/tiles.pngbin0 -> 3490 bytes
-rw-r--r--graphics/map_preview/power_plant_tilemap.binbin948 -> 0 bytes
-rw-r--r--graphics/map_preview/power_plant_tiles.pngbin3923 -> 0 bytes
-rw-r--r--graphics/map_preview/rock_tunnel/pal.pal (renamed from graphics/map_preview/rock_tunnel_pal.pal)0
-rw-r--r--graphics/map_preview/rock_tunnel/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/rock_tunnel/tiles.pngbin0 -> 4550 bytes
-rw-r--r--graphics/map_preview/rock_tunnel_tilemap.binbin1008 -> 0 bytes
-rw-r--r--graphics/map_preview/rock_tunnel_tiles.pngbin5019 -> 0 bytes
-rw-r--r--graphics/map_preview/rocket_hideout/pal.pal (renamed from graphics/map_preview/rocket_hideout_pal.pal)0
-rw-r--r--graphics/map_preview/rocket_hideout/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/rocket_hideout/tiles.pngbin0 -> 1593 bytes
-rw-r--r--graphics/map_preview/rocket_hideout_tilemap.binbin604 -> 0 bytes
-rw-r--r--graphics/map_preview/rocket_hideout_tiles.pngbin1764 -> 0 bytes
-rw-r--r--graphics/map_preview/rocket_warehouse/pal.pal (renamed from graphics/map_preview/rocket_warehouse_pal.pal)0
-rw-r--r--graphics/map_preview/rocket_warehouse/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/rocket_warehouse/tiles.pngbin0 -> 1878 bytes
-rw-r--r--graphics/map_preview/rocket_warehouse_tilemap.binbin700 -> 0 bytes
-rw-r--r--graphics/map_preview/rocket_warehouse_tiles.pngbin2068 -> 0 bytes
-rw-r--r--graphics/map_preview/safari_zone/pal.pal (renamed from graphics/map_preview/kanto_safari_zone_pal.pal)0
-rw-r--r--graphics/map_preview/safari_zone/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/safari_zone/tiles.pngbin0 -> 4379 bytes
-rw-r--r--graphics/map_preview/seafoam_islands/pal.pal (renamed from graphics/map_preview/seafoam_islands_pal.pal)0
-rw-r--r--graphics/map_preview/seafoam_islands/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/seafoam_islands/tiles.pngbin0 -> 4408 bytes
-rw-r--r--graphics/map_preview/seafoam_islands_tilemap.binbin1016 -> 0 bytes
-rw-r--r--graphics/map_preview/seafoam_islands_tiles.pngbin4997 -> 0 bytes
-rw-r--r--graphics/map_preview/silph_co/pal.pal (renamed from graphics/map_preview/silph_co_pal.pal)0
-rw-r--r--graphics/map_preview/silph_co/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/silph_co/tiles.pngbin0 -> 3504 bytes
-rw-r--r--graphics/map_preview/silph_co_tilemap.binbin928 -> 0 bytes
-rw-r--r--graphics/map_preview/silph_co_tiles.pngbin3980 -> 0 bytes
-rw-r--r--graphics/map_preview/victory_road/pal.pal (renamed from graphics/map_preview/kanto_victory_road_pal.pal)0
-rw-r--r--graphics/map_preview/victory_road/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/victory_road/tiles.pngbin0 -> 4738 bytes
-rw-r--r--graphics/map_preview/viridian_forest/pal.pal (renamed from graphics/map_preview/viridian_forest_pal.pal)0
-rw-r--r--graphics/map_preview/viridian_forest/tilemap.binbin0 -> 1280 bytes
-rw-r--r--graphics/map_preview/viridian_forest/tiles.pngbin0 -> 4916 bytes
-rw-r--r--graphics/map_preview/viridian_forest_tilemap.binbin984 -> 0 bytes
-rw-r--r--graphics/map_preview/viridian_forest_tiles.pngbin5543 -> 0 bytes
-rw-r--r--graphics_file_rules.mk61
-rw-r--r--src/map_preview_screen.c138
107 files changed, 130 insertions, 69 deletions
diff --git a/graphics/map_preview/altering_cave_pal.pal b/graphics/map_preview/altering_cave/pal.pal
index f451adce2..f451adce2 100644
--- a/graphics/map_preview/altering_cave_pal.pal
+++ b/graphics/map_preview/altering_cave/pal.pal
diff --git a/graphics/map_preview/altering_cave/tilemap.bin b/graphics/map_preview/altering_cave/tilemap.bin
new file mode 100644
index 000000000..e097a2a13
--- /dev/null
+++ b/graphics/map_preview/altering_cave/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/altering_cave/tiles.png b/graphics/map_preview/altering_cave/tiles.png
new file mode 100644
index 000000000..46dbcfde3
--- /dev/null
+++ b/graphics/map_preview/altering_cave/tiles.png
Binary files differ
diff --git a/graphics/map_preview/altering_cave_tilemap.bin b/graphics/map_preview/altering_cave_tilemap.bin
deleted file mode 100644
index fa907c6e7..000000000
--- a/graphics/map_preview/altering_cave_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/altering_cave_tiles.png b/graphics/map_preview/altering_cave_tiles.png
deleted file mode 100644
index 4ea8496a2..000000000
--- a/graphics/map_preview/altering_cave_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/berry_forest_pal.pal b/graphics/map_preview/berry_forest/pal.pal
index 755a6c2ed..755a6c2ed 100644
--- a/graphics/map_preview/berry_forest_pal.pal
+++ b/graphics/map_preview/berry_forest/pal.pal
diff --git a/graphics/map_preview/berry_forest/tilemap.bin b/graphics/map_preview/berry_forest/tilemap.bin
new file mode 100644
index 000000000..678eff8f9
--- /dev/null
+++ b/graphics/map_preview/berry_forest/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/berry_forest/tiles.png b/graphics/map_preview/berry_forest/tiles.png
new file mode 100644
index 000000000..84d269594
--- /dev/null
+++ b/graphics/map_preview/berry_forest/tiles.png
Binary files differ
diff --git a/graphics/map_preview/berry_forest_tilemap.bin b/graphics/map_preview/berry_forest_tilemap.bin
deleted file mode 100644
index fe7312a9f..000000000
--- a/graphics/map_preview/berry_forest_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/berry_forest_tiles.png b/graphics/map_preview/berry_forest_tiles.png
deleted file mode 100644
index 6f6efd0fe..000000000
--- a/graphics/map_preview/berry_forest_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/cerulean_cave_pal.pal b/graphics/map_preview/cerulean_cave/pal.pal
index 074a6b6f7..074a6b6f7 100644
--- a/graphics/map_preview/cerulean_cave_pal.pal
+++ b/graphics/map_preview/cerulean_cave/pal.pal
diff --git a/graphics/map_preview/cerulean_cave/tilemap.bin b/graphics/map_preview/cerulean_cave/tilemap.bin
new file mode 100644
index 000000000..71f2bff2e
--- /dev/null
+++ b/graphics/map_preview/cerulean_cave/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/cerulean_cave/tiles.png b/graphics/map_preview/cerulean_cave/tiles.png
new file mode 100644
index 000000000..cc73c782e
--- /dev/null
+++ b/graphics/map_preview/cerulean_cave/tiles.png
Binary files differ
diff --git a/graphics/map_preview/cerulean_cave_tilemap.bin b/graphics/map_preview/cerulean_cave_tilemap.bin
deleted file mode 100644
index e66ab7ea3..000000000
--- a/graphics/map_preview/cerulean_cave_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/cerulean_cave_tiles.png b/graphics/map_preview/cerulean_cave_tiles.png
deleted file mode 100644
index e9f7b4e2e..000000000
--- a/graphics/map_preview/cerulean_cave_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/digletts_cave_pal.pal b/graphics/map_preview/digletts_cave/pal.pal
index 923d83144..923d83144 100644
--- a/graphics/map_preview/digletts_cave_pal.pal
+++ b/graphics/map_preview/digletts_cave/pal.pal
diff --git a/graphics/map_preview/digletts_cave/tilemap.bin b/graphics/map_preview/digletts_cave/tilemap.bin
new file mode 100644
index 000000000..50e297383
--- /dev/null
+++ b/graphics/map_preview/digletts_cave/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/digletts_cave/tiles.png b/graphics/map_preview/digletts_cave/tiles.png
new file mode 100644
index 000000000..543cc2e85
--- /dev/null
+++ b/graphics/map_preview/digletts_cave/tiles.png
Binary files differ
diff --git a/graphics/map_preview/digletts_cave_tilemap.bin b/graphics/map_preview/digletts_cave_tilemap.bin
deleted file mode 100644
index 2f8bbd665..000000000
--- a/graphics/map_preview/digletts_cave_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/digletts_cave_tiles.png b/graphics/map_preview/digletts_cave_tiles.png
deleted file mode 100644
index c3e7d2879..000000000
--- a/graphics/map_preview/digletts_cave_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/dotted_hole_pal.pal b/graphics/map_preview/dotted_hole/pal.pal
index fd424fa28..fd424fa28 100644
--- a/graphics/map_preview/dotted_hole_pal.pal
+++ b/graphics/map_preview/dotted_hole/pal.pal
diff --git a/graphics/map_preview/dotted_hole/tilemap.bin b/graphics/map_preview/dotted_hole/tilemap.bin
new file mode 100644
index 000000000..08e5278b6
--- /dev/null
+++ b/graphics/map_preview/dotted_hole/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/dotted_hole/tiles.png b/graphics/map_preview/dotted_hole/tiles.png
new file mode 100644
index 000000000..cd72bfa11
--- /dev/null
+++ b/graphics/map_preview/dotted_hole/tiles.png
Binary files differ
diff --git a/graphics/map_preview/dotted_hole_tilemap.bin b/graphics/map_preview/dotted_hole_tilemap.bin
deleted file mode 100644
index a83083b38..000000000
--- a/graphics/map_preview/dotted_hole_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/dotted_hole_tiles.png b/graphics/map_preview/dotted_hole_tiles.png
deleted file mode 100644
index f2d23d46e..000000000
--- a/graphics/map_preview/dotted_hole_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/icefall_cave_pal.pal b/graphics/map_preview/icefall_cave/pal.pal
index 4e31e5380..4e31e5380 100644
--- a/graphics/map_preview/icefall_cave_pal.pal
+++ b/graphics/map_preview/icefall_cave/pal.pal
diff --git a/graphics/map_preview/icefall_cave/tilemap.bin b/graphics/map_preview/icefall_cave/tilemap.bin
new file mode 100644
index 000000000..3a067c726
--- /dev/null
+++ b/graphics/map_preview/icefall_cave/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/icefall_cave/tiles.png b/graphics/map_preview/icefall_cave/tiles.png
new file mode 100644
index 000000000..ca8e1c390
--- /dev/null
+++ b/graphics/map_preview/icefall_cave/tiles.png
Binary files differ
diff --git a/graphics/map_preview/icefall_cave_tilemap.bin b/graphics/map_preview/icefall_cave_tilemap.bin
deleted file mode 100644
index bd1d05d1b..000000000
--- a/graphics/map_preview/icefall_cave_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/icefall_cave_tiles.png b/graphics/map_preview/icefall_cave_tiles.png
deleted file mode 100644
index 211f19758..000000000
--- a/graphics/map_preview/icefall_cave_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/kanto_safari_zone_tilemap.bin b/graphics/map_preview/kanto_safari_zone_tilemap.bin
deleted file mode 100644
index 756de73b6..000000000
--- a/graphics/map_preview/kanto_safari_zone_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/kanto_safari_zone_tiles.png b/graphics/map_preview/kanto_safari_zone_tiles.png
deleted file mode 100644
index b1da5a41d..000000000
--- a/graphics/map_preview/kanto_safari_zone_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/kanto_victory_road_tilemap.bin b/graphics/map_preview/kanto_victory_road_tilemap.bin
deleted file mode 100644
index 03d1cc292..000000000
--- a/graphics/map_preview/kanto_victory_road_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/kanto_victory_road_tiles.png b/graphics/map_preview/kanto_victory_road_tiles.png
deleted file mode 100644
index b3432b9c9..000000000
--- a/graphics/map_preview/kanto_victory_road_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/lost_cave_pal.pal b/graphics/map_preview/lost_cave/pal.pal
index 33b29a07b..33b29a07b 100644
--- a/graphics/map_preview/lost_cave_pal.pal
+++ b/graphics/map_preview/lost_cave/pal.pal
diff --git a/graphics/map_preview/lost_cave/tilemap.bin b/graphics/map_preview/lost_cave/tilemap.bin
new file mode 100644
index 000000000..160ab9c5a
--- /dev/null
+++ b/graphics/map_preview/lost_cave/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/lost_cave/tiles.png b/graphics/map_preview/lost_cave/tiles.png
new file mode 100644
index 000000000..bb685f5a5
--- /dev/null
+++ b/graphics/map_preview/lost_cave/tiles.png
Binary files differ
diff --git a/graphics/map_preview/lost_cave_tilemap.bin b/graphics/map_preview/lost_cave_tilemap.bin
deleted file mode 100644
index 6c256acc2..000000000
--- a/graphics/map_preview/lost_cave_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/lost_cave_tiles.png b/graphics/map_preview/lost_cave_tiles.png
deleted file mode 100644
index a2c4c8f38..000000000
--- a/graphics/map_preview/lost_cave_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/monean_chamber_pal.pal b/graphics/map_preview/monean_chamber/pal.pal
index ce72a4891..ce72a4891 100644
--- a/graphics/map_preview/monean_chamber_pal.pal
+++ b/graphics/map_preview/monean_chamber/pal.pal
diff --git a/graphics/map_preview/monean_chamber/tilemap.bin b/graphics/map_preview/monean_chamber/tilemap.bin
new file mode 100644
index 000000000..90549f14b
--- /dev/null
+++ b/graphics/map_preview/monean_chamber/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/monean_chamber/tiles.png b/graphics/map_preview/monean_chamber/tiles.png
new file mode 100644
index 000000000..f53026124
--- /dev/null
+++ b/graphics/map_preview/monean_chamber/tiles.png
Binary files differ
diff --git a/graphics/map_preview/monean_chamber_tilemap.bin b/graphics/map_preview/monean_chamber_tilemap.bin
deleted file mode 100644
index f228d3daf..000000000
--- a/graphics/map_preview/monean_chamber_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/monean_chamber_tiles.png b/graphics/map_preview/monean_chamber_tiles.png
deleted file mode 100644
index 6426d175f..000000000
--- a/graphics/map_preview/monean_chamber_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/mt_ember_pal.pal b/graphics/map_preview/mt_ember/pal.pal
index 4f5066e64..4f5066e64 100644
--- a/graphics/map_preview/mt_ember_pal.pal
+++ b/graphics/map_preview/mt_ember/pal.pal
diff --git a/graphics/map_preview/mt_ember/tilemap.bin b/graphics/map_preview/mt_ember/tilemap.bin
new file mode 100644
index 000000000..75b6a7d67
--- /dev/null
+++ b/graphics/map_preview/mt_ember/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/mt_ember/tiles.png b/graphics/map_preview/mt_ember/tiles.png
new file mode 100644
index 000000000..854e6f22c
--- /dev/null
+++ b/graphics/map_preview/mt_ember/tiles.png
Binary files differ
diff --git a/graphics/map_preview/mt_ember_tilemap.bin b/graphics/map_preview/mt_ember_tilemap.bin
deleted file mode 100644
index 52af71494..000000000
--- a/graphics/map_preview/mt_ember_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/mt_ember_tiles.png b/graphics/map_preview/mt_ember_tiles.png
deleted file mode 100644
index 9145e9d4f..000000000
--- a/graphics/map_preview/mt_ember_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/mt_moon_pal.pal b/graphics/map_preview/mt_moon/pal.pal
index 9a858a8c6..9a858a8c6 100644
--- a/graphics/map_preview/mt_moon_pal.pal
+++ b/graphics/map_preview/mt_moon/pal.pal
diff --git a/graphics/map_preview/mt_moon/tilemap.bin b/graphics/map_preview/mt_moon/tilemap.bin
new file mode 100644
index 000000000..59860715a
--- /dev/null
+++ b/graphics/map_preview/mt_moon/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/mt_moon/tiles.png b/graphics/map_preview/mt_moon/tiles.png
new file mode 100644
index 000000000..5bada0e75
--- /dev/null
+++ b/graphics/map_preview/mt_moon/tiles.png
Binary files differ
diff --git a/graphics/map_preview/mt_moon_tilemap.bin b/graphics/map_preview/mt_moon_tilemap.bin
deleted file mode 100644
index 469efcf77..000000000
--- a/graphics/map_preview/mt_moon_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/mt_moon_tiles.png b/graphics/map_preview/mt_moon_tiles.png
deleted file mode 100644
index 8ede39bdd..000000000
--- a/graphics/map_preview/mt_moon_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/pokemon_mansion_pal.pal b/graphics/map_preview/pokemon_mansion/pal.pal
index 7f6ef22a5..7f6ef22a5 100644
--- a/graphics/map_preview/pokemon_mansion_pal.pal
+++ b/graphics/map_preview/pokemon_mansion/pal.pal
diff --git a/graphics/map_preview/pokemon_mansion/tilemap.bin b/graphics/map_preview/pokemon_mansion/tilemap.bin
new file mode 100644
index 000000000..2d97bc7d2
--- /dev/null
+++ b/graphics/map_preview/pokemon_mansion/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/pokemon_mansion/tiles.png b/graphics/map_preview/pokemon_mansion/tiles.png
new file mode 100644
index 000000000..0be4ddc03
--- /dev/null
+++ b/graphics/map_preview/pokemon_mansion/tiles.png
Binary files differ
diff --git a/graphics/map_preview/pokemon_mansion_tilemap.bin b/graphics/map_preview/pokemon_mansion_tilemap.bin
deleted file mode 100644
index a8b1b3d3f..000000000
--- a/graphics/map_preview/pokemon_mansion_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/pokemon_mansion_tiles.png b/graphics/map_preview/pokemon_mansion_tiles.png
deleted file mode 100644
index 1fa94ceda..000000000
--- a/graphics/map_preview/pokemon_mansion_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/pokemon_tower_pal.pal b/graphics/map_preview/pokemon_tower/pal.pal
index 93f4847ae..93f4847ae 100644
--- a/graphics/map_preview/pokemon_tower_pal.pal
+++ b/graphics/map_preview/pokemon_tower/pal.pal
diff --git a/graphics/map_preview/pokemon_tower/tilemap.bin b/graphics/map_preview/pokemon_tower/tilemap.bin
new file mode 100644
index 000000000..503007939
--- /dev/null
+++ b/graphics/map_preview/pokemon_tower/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/pokemon_tower/tiles.png b/graphics/map_preview/pokemon_tower/tiles.png
new file mode 100644
index 000000000..0539f2380
--- /dev/null
+++ b/graphics/map_preview/pokemon_tower/tiles.png
Binary files differ
diff --git a/graphics/map_preview/pokemon_tower_tilemap.bin b/graphics/map_preview/pokemon_tower_tilemap.bin
deleted file mode 100644
index f12b9bdf8..000000000
--- a/graphics/map_preview/pokemon_tower_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/pokemon_tower_tiles.png b/graphics/map_preview/pokemon_tower_tiles.png
deleted file mode 100644
index 21583f9b3..000000000
--- a/graphics/map_preview/pokemon_tower_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/power_plant_pal.pal b/graphics/map_preview/power_plant/pal.pal
index 49e5d6800..49e5d6800 100644
--- a/graphics/map_preview/power_plant_pal.pal
+++ b/graphics/map_preview/power_plant/pal.pal
diff --git a/graphics/map_preview/power_plant/tilemap.bin b/graphics/map_preview/power_plant/tilemap.bin
new file mode 100644
index 000000000..4e7b314ea
--- /dev/null
+++ b/graphics/map_preview/power_plant/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/power_plant/tiles.png b/graphics/map_preview/power_plant/tiles.png
new file mode 100644
index 000000000..0d152cf2d
--- /dev/null
+++ b/graphics/map_preview/power_plant/tiles.png
Binary files differ
diff --git a/graphics/map_preview/power_plant_tilemap.bin b/graphics/map_preview/power_plant_tilemap.bin
deleted file mode 100644
index 609cbb30d..000000000
--- a/graphics/map_preview/power_plant_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/power_plant_tiles.png b/graphics/map_preview/power_plant_tiles.png
deleted file mode 100644
index 6cd334aa9..000000000
--- a/graphics/map_preview/power_plant_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/rock_tunnel_pal.pal b/graphics/map_preview/rock_tunnel/pal.pal
index 1412128d0..1412128d0 100644
--- a/graphics/map_preview/rock_tunnel_pal.pal
+++ b/graphics/map_preview/rock_tunnel/pal.pal
diff --git a/graphics/map_preview/rock_tunnel/tilemap.bin b/graphics/map_preview/rock_tunnel/tilemap.bin
new file mode 100644
index 000000000..9d274fa87
--- /dev/null
+++ b/graphics/map_preview/rock_tunnel/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/rock_tunnel/tiles.png b/graphics/map_preview/rock_tunnel/tiles.png
new file mode 100644
index 000000000..68c63c2d3
--- /dev/null
+++ b/graphics/map_preview/rock_tunnel/tiles.png
Binary files differ
diff --git a/graphics/map_preview/rock_tunnel_tilemap.bin b/graphics/map_preview/rock_tunnel_tilemap.bin
deleted file mode 100644
index 9c322e0b1..000000000
--- a/graphics/map_preview/rock_tunnel_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/rock_tunnel_tiles.png b/graphics/map_preview/rock_tunnel_tiles.png
deleted file mode 100644
index e58ef7fb1..000000000
--- a/graphics/map_preview/rock_tunnel_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/rocket_hideout_pal.pal b/graphics/map_preview/rocket_hideout/pal.pal
index 9c969e843..9c969e843 100644
--- a/graphics/map_preview/rocket_hideout_pal.pal
+++ b/graphics/map_preview/rocket_hideout/pal.pal
diff --git a/graphics/map_preview/rocket_hideout/tilemap.bin b/graphics/map_preview/rocket_hideout/tilemap.bin
new file mode 100644
index 000000000..59e715a08
--- /dev/null
+++ b/graphics/map_preview/rocket_hideout/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/rocket_hideout/tiles.png b/graphics/map_preview/rocket_hideout/tiles.png
new file mode 100644
index 000000000..c5c63ce24
--- /dev/null
+++ b/graphics/map_preview/rocket_hideout/tiles.png
Binary files differ
diff --git a/graphics/map_preview/rocket_hideout_tilemap.bin b/graphics/map_preview/rocket_hideout_tilemap.bin
deleted file mode 100644
index db9757ebb..000000000
--- a/graphics/map_preview/rocket_hideout_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/rocket_hideout_tiles.png b/graphics/map_preview/rocket_hideout_tiles.png
deleted file mode 100644
index 8f57f8afe..000000000
--- a/graphics/map_preview/rocket_hideout_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/rocket_warehouse_pal.pal b/graphics/map_preview/rocket_warehouse/pal.pal
index c4fffd171..c4fffd171 100644
--- a/graphics/map_preview/rocket_warehouse_pal.pal
+++ b/graphics/map_preview/rocket_warehouse/pal.pal
diff --git a/graphics/map_preview/rocket_warehouse/tilemap.bin b/graphics/map_preview/rocket_warehouse/tilemap.bin
new file mode 100644
index 000000000..ecd0bbb2d
--- /dev/null
+++ b/graphics/map_preview/rocket_warehouse/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/rocket_warehouse/tiles.png b/graphics/map_preview/rocket_warehouse/tiles.png
new file mode 100644
index 000000000..0ac5d6048
--- /dev/null
+++ b/graphics/map_preview/rocket_warehouse/tiles.png
Binary files differ
diff --git a/graphics/map_preview/rocket_warehouse_tilemap.bin b/graphics/map_preview/rocket_warehouse_tilemap.bin
deleted file mode 100644
index 7636eea0a..000000000
--- a/graphics/map_preview/rocket_warehouse_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/rocket_warehouse_tiles.png b/graphics/map_preview/rocket_warehouse_tiles.png
deleted file mode 100644
index cc9dae203..000000000
--- a/graphics/map_preview/rocket_warehouse_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/kanto_safari_zone_pal.pal b/graphics/map_preview/safari_zone/pal.pal
index 0434848d8..0434848d8 100644
--- a/graphics/map_preview/kanto_safari_zone_pal.pal
+++ b/graphics/map_preview/safari_zone/pal.pal
diff --git a/graphics/map_preview/safari_zone/tilemap.bin b/graphics/map_preview/safari_zone/tilemap.bin
new file mode 100644
index 000000000..afed89142
--- /dev/null
+++ b/graphics/map_preview/safari_zone/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/safari_zone/tiles.png b/graphics/map_preview/safari_zone/tiles.png
new file mode 100644
index 000000000..a226f731e
--- /dev/null
+++ b/graphics/map_preview/safari_zone/tiles.png
Binary files differ
diff --git a/graphics/map_preview/seafoam_islands_pal.pal b/graphics/map_preview/seafoam_islands/pal.pal
index 348275aca..348275aca 100644
--- a/graphics/map_preview/seafoam_islands_pal.pal
+++ b/graphics/map_preview/seafoam_islands/pal.pal
diff --git a/graphics/map_preview/seafoam_islands/tilemap.bin b/graphics/map_preview/seafoam_islands/tilemap.bin
new file mode 100644
index 000000000..77a8f5afb
--- /dev/null
+++ b/graphics/map_preview/seafoam_islands/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/seafoam_islands/tiles.png b/graphics/map_preview/seafoam_islands/tiles.png
new file mode 100644
index 000000000..ad31c1aa7
--- /dev/null
+++ b/graphics/map_preview/seafoam_islands/tiles.png
Binary files differ
diff --git a/graphics/map_preview/seafoam_islands_tilemap.bin b/graphics/map_preview/seafoam_islands_tilemap.bin
deleted file mode 100644
index 05afc22fc..000000000
--- a/graphics/map_preview/seafoam_islands_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/seafoam_islands_tiles.png b/graphics/map_preview/seafoam_islands_tiles.png
deleted file mode 100644
index b76a85053..000000000
--- a/graphics/map_preview/seafoam_islands_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/silph_co_pal.pal b/graphics/map_preview/silph_co/pal.pal
index 07acfb986..07acfb986 100644
--- a/graphics/map_preview/silph_co_pal.pal
+++ b/graphics/map_preview/silph_co/pal.pal
diff --git a/graphics/map_preview/silph_co/tilemap.bin b/graphics/map_preview/silph_co/tilemap.bin
new file mode 100644
index 000000000..156a652e6
--- /dev/null
+++ b/graphics/map_preview/silph_co/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/silph_co/tiles.png b/graphics/map_preview/silph_co/tiles.png
new file mode 100644
index 000000000..886892168
--- /dev/null
+++ b/graphics/map_preview/silph_co/tiles.png
Binary files differ
diff --git a/graphics/map_preview/silph_co_tilemap.bin b/graphics/map_preview/silph_co_tilemap.bin
deleted file mode 100644
index 9449f6cd7..000000000
--- a/graphics/map_preview/silph_co_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/silph_co_tiles.png b/graphics/map_preview/silph_co_tiles.png
deleted file mode 100644
index c5433bcee..000000000
--- a/graphics/map_preview/silph_co_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/kanto_victory_road_pal.pal b/graphics/map_preview/victory_road/pal.pal
index 828ff7e22..828ff7e22 100644
--- a/graphics/map_preview/kanto_victory_road_pal.pal
+++ b/graphics/map_preview/victory_road/pal.pal
diff --git a/graphics/map_preview/victory_road/tilemap.bin b/graphics/map_preview/victory_road/tilemap.bin
new file mode 100644
index 000000000..1fa44494c
--- /dev/null
+++ b/graphics/map_preview/victory_road/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/victory_road/tiles.png b/graphics/map_preview/victory_road/tiles.png
new file mode 100644
index 000000000..a4a6b6104
--- /dev/null
+++ b/graphics/map_preview/victory_road/tiles.png
Binary files differ
diff --git a/graphics/map_preview/viridian_forest_pal.pal b/graphics/map_preview/viridian_forest/pal.pal
index ff1655587..ff1655587 100644
--- a/graphics/map_preview/viridian_forest_pal.pal
+++ b/graphics/map_preview/viridian_forest/pal.pal
diff --git a/graphics/map_preview/viridian_forest/tilemap.bin b/graphics/map_preview/viridian_forest/tilemap.bin
new file mode 100644
index 000000000..fa30d65d3
--- /dev/null
+++ b/graphics/map_preview/viridian_forest/tilemap.bin
Binary files differ
diff --git a/graphics/map_preview/viridian_forest/tiles.png b/graphics/map_preview/viridian_forest/tiles.png
new file mode 100644
index 000000000..6fcea90f5
--- /dev/null
+++ b/graphics/map_preview/viridian_forest/tiles.png
Binary files differ
diff --git a/graphics/map_preview/viridian_forest_tilemap.bin b/graphics/map_preview/viridian_forest_tilemap.bin
deleted file mode 100644
index 37883b634..000000000
--- a/graphics/map_preview/viridian_forest_tilemap.bin
+++ /dev/null
Binary files differ
diff --git a/graphics/map_preview/viridian_forest_tiles.png b/graphics/map_preview/viridian_forest_tiles.png
deleted file mode 100644
index 79b70c2e5..000000000
--- a/graphics/map_preview/viridian_forest_tiles.png
+++ /dev/null
Binary files differ
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index dbb583269..859b7b8d6 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -28,6 +28,7 @@ INTROGFXDIR := graphics/intro
BATTLETERRAINGFXDIR := graphics/battle_terrain
BERRYPOUCHGFXDIR := graphics/berry_pouch
HALLOFFAMEGFXDIR := graphics/hall_of_fame
+MAPPREVIEWGFXDIR := graphics/map_preview
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
contest_types := cool beauty cute smart tough
@@ -593,3 +594,63 @@ $(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png
$(TILESETGFXDIR)/primary/general/anim/water_current_landwatersedge/7.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 47
+
+$(MAPPREVIEWGFXDIR)/altering_cave/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 391
+
+$(MAPPREVIEWGFXDIR)/berry_forest/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 395
+
+$(MAPPREVIEWGFXDIR)/digletts_cave/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 398
+
+$(MAPPREVIEWGFXDIR)/dotted_hole/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 317
+
+$(MAPPREVIEWGFXDIR)/icefall_cave/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 399
+
+$(MAPPREVIEWGFXDIR)/lost_cave/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 404
+
+$(MAPPREVIEWGFXDIR)/monean_chamber/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 326
+
+$(MAPPREVIEWGFXDIR)/mt_ember/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 355
+
+$(MAPPREVIEWGFXDIR)/mt_moon/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 364
+
+$(MAPPREVIEWGFXDIR)/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 388
+
+$(MAPPREVIEWGFXDIR)/pokemon_tower/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 290
+
+$(MAPPREVIEWGFXDIR)/power_plant/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 368
+
+$(MAPPREVIEWGFXDIR)/rock_tunnel/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 407
+
+$(MAPPREVIEWGFXDIR)/rocket_hideout/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 194
+
+$(MAPPREVIEWGFXDIR)/rocket_warehouse/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 234
+
+$(MAPPREVIEWGFXDIR)/safari_zone/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 330
+
+$(MAPPREVIEWGFXDIR)/seafoam_islands/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 408
+
+$(MAPPREVIEWGFXDIR)/silph_co/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 355
+
+$(MAPPREVIEWGFXDIR)/victory_road/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 375
+
+$(MAPPREVIEWGFXDIR)/viridian_forest/tiles.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 389
diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c
index ec889a2f5..0490f23e0 100644
--- a/src/map_preview_screen.c
+++ b/src/map_preview_screen.c
@@ -17,69 +17,69 @@ static EWRAM_DATA bool8 sAllocedBg0TilemapBuffer = FALSE;
static void Task_RunMapPreviewScreenForest(u8 taskId);
-static const u8 sViridianForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/viridian_forest_pal.gbapal");
-static const u8 sViridianForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/viridian_forest_tiles.4bpp.lz");
-static const u8 sViridianForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/viridian_forest_tilemap.bin");
-static const u8 sRockTunnelMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rock_tunnel_pal.gbapal");
-static const u8 sRockTunnelMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rock_tunnel_tiles.4bpp.lz");
-static const u8 sRockTunnelMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rock_tunnel_tilemap.bin");
-static const u8 sRocketHideoutMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_hideout_pal.gbapal");
-static const u8 sRocketHideoutMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_hideout_tiles.4bpp.lz");
-static const u8 sRocketHideoutMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_hideout_tilemap.bin");
-static const u8 sPowerPlantMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/power_plant_pal.gbapal");
-static const u8 sPowerPlantMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/power_plant_tiles.4bpp.lz");
-static const u8 sPowerPlantMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/power_plant_tilemap.bin");
-static const u8 sPokemonMansionMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_pal.gbapal");
-static const u8 sPokemonMansionMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_tiles.4bpp.lz");
-static const u8 sPokemonMansionMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_tilemap.bin");
-static const u8 sPokemonTowerMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_tower_pal.gbapal");
-static const u8 sPokemonTowerMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_tower_tiles.4bpp.lz");
-static const u8 sPokemonTowerMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_tower_tilemap.bin");
-static const u8 sSilphCoMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/silph_co_pal.gbapal");
-static const u8 sSilphCoMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/silph_co_tiles.4bpp.lz");
-static const u8 sSilphCoMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/silph_co_tilemap.bin");
-static const u8 sMtMoonMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_moon_pal.gbapal");
-static const u8 sMtMoonMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_moon_tiles.4bpp.lz");
-static const u8 sMtMoonMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_moon_tilemap.bin");
-static const u8 sSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/seafoam_islands_pal.gbapal");
-static const u8 sSeafoamIslandsMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/seafoam_islands_tiles.4bpp.lz");
-static const u8 sSeafoamIslandsMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/seafoam_islands_tilemap.bin");
-static const u8 sRocketWarehouseMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_pal.gbapal");
-static const u8 sRocketWarehouseMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_tiles.4bpp.lz");
-static const u8 sRocketWarehouseMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_tilemap.bin");
-static const u8 sKantoVictoryRoadMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_pal.gbapal");
-static const u8 sKantoVictoryRoadMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_tiles.4bpp.lz");
-static const u8 sKantoVictoryRoadMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_tilemap.bin");
-static const u8 sMtEmberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_ember_pal.gbapal");
-static const u8 sMtEmberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_ember_tiles.4bpp.lz");
-static const u8 sMtEmberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_ember_tilemap.bin");
-static const u8 sKantoSafariZoneMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_pal.gbapal");
-static const u8 sKantoSafariZoneMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_tiles.4bpp.lz");
-static const u8 sKantoSafariZoneMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_tilemap.bin");
-static const u8 sMoneanChamberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/monean_chamber_pal.gbapal");
-static const u8 sMoneanChamberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/monean_chamber_tiles.4bpp.lz");
-static const u8 sMoneanChamberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/monean_chamber_tilemap.bin");
-static const u8 sDottedHoleMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/dotted_hole_pal.gbapal");
-static const u8 sDottedHoleMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/dotted_hole_tiles.4bpp.lz");
-static const u8 sDottedHoleMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/dotted_hole_tilemap.bin");
-static const u8 sCeruleanCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/cerulean_cave_pal.gbapal");
-static const u8 sCeruleanCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/cerulean_cave_tiles.4bpp.lz");
-static const u8 sCeruleanCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/cerulean_cave_tilemap.bin");
-static const u8 sDiglettsCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/digletts_cave_pal.gbapal");
-static const u8 sDiglettsCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/digletts_cave_tiles.4bpp.lz");
-static const u8 sDiglettsCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/digletts_cave_tilemap.bin");
-static const u8 sLostCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/lost_cave_pal.gbapal");
-static const u8 sLostCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/lost_cave_tiles.4bpp.lz");
-static const u8 sLostCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/lost_cave_tilemap.bin");
-static const u8 sBerryForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/berry_forest_pal.gbapal");
-static const u8 sBerryForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/berry_forest_tiles.4bpp.lz");
-static const u8 sBerryForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/berry_forest_tilemap.bin");
-static const u8 sIcefallCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/icefall_cave_pal.gbapal");
-static const u8 sIcefallCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/icefall_cave_tiles.4bpp.lz");
-static const u8 sIcefallCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/icefall_cave_tilemap.bin");
-static const u8 sAlteringCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/altering_cave_pal.gbapal");
-static const u8 sAlteringCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/altering_cave_tiles.4bpp.lz");
-static const u8 sAlteringCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/altering_cave_tilemap.bin");
+static const u8 sViridianForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/viridian_forest/pal.gbapal");
+static const u8 sViridianForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/viridian_forest/tiles.4bpp.lz");
+static const u8 sViridianForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/viridian_forest/tilemap.bin.lz");
+static const u8 sRockTunnelMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rock_tunnel/pal.gbapal");
+static const u8 sRockTunnelMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rock_tunnel/tiles.4bpp.lz");
+static const u8 sRockTunnelMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rock_tunnel/tilemap.bin.lz");
+static const u8 sRocketHideoutMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_hideout/pal.gbapal");
+static const u8 sRocketHideoutMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_hideout/tiles.4bpp.lz");
+static const u8 sRocketHideoutMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_hideout/tilemap.bin.lz");
+static const u8 sPowerPlantMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/power_plant/pal.gbapal");
+static const u8 sPowerPlantMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/power_plant/tiles.4bpp.lz");
+static const u8 sPowerPlantMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/power_plant/tilemap.bin.lz");
+static const u8 sPokemonMansionMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_mansion/pal.gbapal");
+static const u8 sPokemonMansionMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_mansion/tiles.4bpp.lz");
+static const u8 sPokemonMansionMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_mansion/tilemap.bin.lz");
+static const u8 sPokemonTowerMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_tower/pal.gbapal");
+static const u8 sPokemonTowerMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_tower/tiles.4bpp.lz");
+static const u8 sPokemonTowerMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_tower/tilemap.bin.lz");
+static const u8 sSilphCoMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/silph_co/pal.gbapal");
+static const u8 sSilphCoMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/silph_co/tiles.4bpp.lz");
+static const u8 sSilphCoMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/silph_co/tilemap.bin.lz");
+static const u8 sMtMoonMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_moon/pal.gbapal");
+static const u8 sMtMoonMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_moon/tiles.4bpp.lz");
+static const u8 sMtMoonMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_moon/tilemap.bin.lz");
+static const u8 sSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/seafoam_islands/pal.gbapal");
+static const u8 sSeafoamIslandsMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/seafoam_islands/tiles.4bpp.lz");
+static const u8 sSeafoamIslandsMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/seafoam_islands/tilemap.bin.lz");
+static const u8 sRocketWarehouseMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_warehouse/pal.gbapal");
+static const u8 sRocketWarehouseMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_warehouse/tiles.4bpp.lz");
+static const u8 sRocketWarehouseMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_warehouse/tilemap.bin.lz");
+static const u8 sVictoryRoadMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/victory_road/pal.gbapal");
+static const u8 sVictoryRoadMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/victory_road/tiles.4bpp.lz");
+static const u8 sVictoryRoadMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/victory_road/tilemap.bin.lz");
+static const u8 sMtEmberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_ember/pal.gbapal");
+static const u8 sMtEmberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_ember/tiles.4bpp.lz");
+static const u8 sMtEmberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_ember/tilemap.bin.lz");
+static const u8 sSafariZoneMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/safari_zone/pal.gbapal");
+static const u8 sSafariZoneMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/safari_zone/tiles.4bpp.lz");
+static const u8 sSafariZoneMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/safari_zone/tilemap.bin.lz");
+static const u8 sMoneanChamberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/monean_chamber/pal.gbapal");
+static const u8 sMoneanChamberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/monean_chamber/tiles.4bpp.lz");
+static const u8 sMoneanChamberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/monean_chamber/tilemap.bin.lz");
+static const u8 sDottedHoleMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/dotted_hole/pal.gbapal");
+static const u8 sDottedHoleMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/dotted_hole/tiles.4bpp.lz");
+static const u8 sDottedHoleMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/dotted_hole/tilemap.bin.lz");
+static const u8 sCeruleanCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/cerulean_cave/pal.gbapal");
+static const u8 sCeruleanCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/cerulean_cave/tiles.4bpp.lz");
+static const u8 sCeruleanCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/cerulean_cave/tilemap.bin.lz");
+static const u8 sDiglettsCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/digletts_cave/pal.gbapal");
+static const u8 sDiglettsCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/digletts_cave/tiles.4bpp.lz");
+static const u8 sDiglettsCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/digletts_cave/tilemap.bin.lz");
+static const u8 sLostCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/lost_cave/pal.gbapal");
+static const u8 sLostCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/lost_cave/tiles.4bpp.lz");
+static const u8 sLostCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/lost_cave/tilemap.bin.lz");
+static const u8 sBerryForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/berry_forest/pal.gbapal");
+static const u8 sBerryForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/berry_forest/tiles.4bpp.lz");
+static const u8 sBerryForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/berry_forest/tilemap.bin.lz");
+static const u8 sIcefallCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/icefall_cave/pal.gbapal");
+static const u8 sIcefallCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/icefall_cave/tiles.4bpp.lz");
+static const u8 sIcefallCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/icefall_cave/tilemap.bin.lz");
+static const u8 sAlteringCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/altering_cave/pal.gbapal");
+static const u8 sAlteringCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/altering_cave/tiles.4bpp.lz");
+static const u8 sAlteringCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/altering_cave/tilemap.bin.lz");
static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
[MPS_VIRIDIAN_FOREST] = {
@@ -126,9 +126,9 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
.mapsec = MAPSEC_KANTO_SAFARI_ZONE,
.type = MPS_TYPE_FOREST,
.flagId = FLAG_WORLD_MAP_SAFARI_ZONE_CENTER,
- .tilesptr = sKantoSafariZoneMapPreviewTiles,
- .tilemapptr = sKantoSafariZoneMapPreviewTilemap,
- .palptr = sKantoSafariZoneMapPreviewPalette
+ .tilesptr = sSafariZoneMapPreviewTiles,
+ .tilemapptr = sSafariZoneMapPreviewTilemap,
+ .palptr = sSafariZoneMapPreviewPalette
},
[MPS_SEAFOAM_ISLANDS] = {
.mapsec = MAPSEC_SEAFOAM_ISLANDS,
@@ -166,9 +166,9 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
.mapsec = MAPSEC_KANTO_VICTORY_ROAD,
.type = MPS_TYPE_CAVE,
.flagId = FLAG_WORLD_MAP_VICTORY_ROAD_1F,
- .tilesptr = sKantoVictoryRoadMapPreviewTiles,
- .tilemapptr = sKantoVictoryRoadMapPreviewTilemap,
- .palptr = sKantoVictoryRoadMapPreviewPalette
+ .tilesptr = sVictoryRoadMapPreviewTiles,
+ .tilemapptr = sVictoryRoadMapPreviewTilemap,
+ .palptr = sVictoryRoadMapPreviewPalette
},
[MPS_CERULEAN_CAVE] = {
.mapsec = MAPSEC_CERULEAN_CAVE,