Merge branch 'master' of github.com:pret/pokefirered into various_documentation

277 files changed, 430 insertions, 451 deletions

diff --git a/data/credits/unk_840C630.pal b/graphics/credits/unk_840C630.pal
index 01f113381..01f113381 100644
--- a/data/credits/unk_840C630.pal
+++ b/graphics/credits/unk_840C630.pal
diff --git a/data/credits/unk_840C650.png b/graphics/credits/unk_840C650.png
index 9afadd699..9afadd699 100644
--- a/data/credits/unk_840C650.png
+++ b/graphics/credits/unk_840C650.png
diff --git a/data/credits/unk_840CA54.bin b/graphics/credits/unk_840CA54.bin
index a127ba9ca..a127ba9ca 100644
--- a/data/credits/unk_840CA54.bin
+++ b/graphics/credits/unk_840CA54.bin
diff --git a/data/credits/unk_840CB8C.bin b/graphics/credits/unk_840CB8C.bin
index 3dd1c74a0..3dd1c74a0 100644
--- a/data/credits/unk_840CB8C.bin
+++ b/graphics/credits/unk_840CB8C.bin
diff --git a/data/credits/unk_840D228.bin b/graphics/credits/unk_840D228.bin
index f6c336c01..f6c336c01 100644
--- a/data/credits/unk_840D228.bin
+++ b/graphics/credits/unk_840D228.bin
diff --git a/data/credits/unk_840DC0C.bin b/graphics/credits/unk_840DC0C.bin
index a52ea8056..a52ea8056 100644
--- a/data/credits/unk_840DC0C.bin
+++ b/graphics/credits/unk_840DC0C.bin
diff --git a/data/credits/unk_840E158.bin b/graphics/credits/unk_840E158.bin
index 2d9128634..2d9128634 100644
--- a/data/credits/unk_840E158.bin
+++ b/graphics/credits/unk_840E158.bin
diff --git a/data/credits/unk_840E904.bin b/graphics/credits/unk_840E904.bin
index 4887c1e7e..4887c1e7e 100644
--- a/data/credits/unk_840E904.bin
+++ b/graphics/credits/unk_840E904.bin
diff --git a/data/credits/unk_840F240.bin b/graphics/credits/unk_840F240.bin
index 285a468b6..285a468b6 100644
--- a/data/credits/unk_840F240.bin
+++ b/graphics/credits/unk_840F240.bin
diff --git a/data/credits/unk_840F944.bin b/graphics/credits/unk_840F944.bin
index ba2cdab77..ba2cdab77 100644
--- a/data/credits/unk_840F944.bin
+++ b/graphics/credits/unk_840F944.bin
diff --git a/data/credits/unk_8410198.bin b/graphics/credits/unk_8410198.bin
index f7b3a02a5..f7b3a02a5 100644
--- a/data/credits/unk_8410198.bin
+++ b/graphics/credits/unk_8410198.bin
diff --git a/data/credits/unk_84105B4.bin b/graphics/credits/unk_84105B4.bin
index d173e611e..d173e611e 100644
--- a/data/credits/unk_84105B4.bin
+++ b/graphics/credits/unk_84105B4.bin
diff --git a/data/credits/unk_8410B20.bin b/graphics/credits/unk_8410B20.bin
index eea1940ee..eea1940ee 100644
--- a/data/credits/unk_8410B20.bin
+++ b/graphics/credits/unk_8410B20.bin
diff --git a/data/credits/unk_8410B20.png b/graphics/credits/unk_8410B20.png
index 19ce2f796..19ce2f796 100644
--- a/data/credits/unk_8410B20.png
+++ b/graphics/credits/unk_8410B20.png
diff --git a/data/credits/unk_8410E10.pal b/graphics/credits/unk_8410E10.pal
index 5667181bd..5667181bd 100644
--- a/data/credits/unk_8410E10.pal
+++ b/graphics/credits/unk_8410E10.pal
diff --git a/data/credits/unk_8410E30.png b/graphics/credits/unk_8410E30.png
index ec065cdb6..ec065cdb6 100644
--- a/data/credits/unk_8410E30.png
+++ b/graphics/credits/unk_8410E30.png
diff --git a/data/credits/unk_8411BF8.pal b/graphics/credits/unk_8411BF8.pal
index 5667181bd..5667181bd 100644
--- a/data/credits/unk_8411BF8.pal
+++ b/graphics/credits/unk_8411BF8.pal
diff --git a/data/credits/unk_8411C18.png b/graphics/credits/unk_8411C18.png
index 341594160..341594160 100644
--- a/data/credits/unk_8411C18.png
+++ b/graphics/credits/unk_8411C18.png
diff --git a/data/credits/unk_84129A0.pal b/graphics/credits/unk_84129A0.pal
index ac601cddf..ac601cddf 100644
--- a/data/credits/unk_84129A0.pal
+++ b/graphics/credits/unk_84129A0.pal
diff --git a/data/credits/unk_84129C0.png b/graphics/credits/unk_84129C0.png
index ea9c61c88..ea9c61c88 100644
--- a/data/credits/unk_84129C0.png
+++ b/graphics/credits/unk_84129C0.png
diff --git a/data/credits/unk_8413318.pal b/graphics/credits/unk_8413318.pal
index 284b70b77..284b70b77 100644
--- a/data/credits/unk_8413318.pal
+++ b/graphics/credits/unk_8413318.pal
diff --git a/data/credits/unk_8413338.png b/graphics/credits/unk_8413338.png
index 7fa79c06a..7fa79c06a 100644
--- a/data/credits/unk_8413338.png
+++ b/graphics/credits/unk_8413338.png
diff --git a/data/credits/unk_8413854.pal b/graphics/credits/unk_8413854.pal
index 46d4f48dd..46d4f48dd 100644
--- a/data/credits/unk_8413854.pal
+++ b/graphics/credits/unk_8413854.pal
diff --git a/data/credits/unk_8413874.png b/graphics/credits/unk_8413874.png
index 18e34725f..18e34725f 100644
--- a/data/credits/unk_8413874.png
+++ b/graphics/credits/unk_8413874.png
diff --git a/data/credits/unk_8413D98.pal b/graphics/credits/unk_8413D98.pal
index a3476d0d4..a3476d0d4 100644
--- a/data/credits/unk_8413D98.pal
+++ b/graphics/credits/unk_8413D98.pal
diff --git a/data/credits/unk_8413DB8.png b/graphics/credits/unk_8413DB8.png
index 5b10bd699..5b10bd699 100644
--- a/data/credits/unk_8413DB8.png
+++ b/graphics/credits/unk_8413DB8.png
diff --git a/data/graphics/fame_checker_bg.pal b/graphics/fame_checker/bg.pal
index 9fc41db87..9fc41db87 100644
--- a/data/graphics/fame_checker_bg.pal
+++ b/graphics/fame_checker/bg.pal
diff --git a/data/graphics/fame_checker_bg.png b/graphics/fame_checker/bg.png
index ed1a9a0f8..ed1a9a0f8 100644
--- a/data/graphics/fame_checker_bg.png
+++ b/graphics/fame_checker/bg.png
diff --git a/data/fame_checker/pal_845e540.pal b/graphics/fame_checker/bill.pal
index 485e27c48..485e27c48 100644
--- a/data/fame_checker/pal_845e540.pal
+++ b/graphics/fame_checker/bill.pal
diff --git a/data/fame_checker/img_845dd40.png b/graphics/fame_checker/bill.png
index 7e3a7b39b..7e3a7b39b 100644
--- a/data/fame_checker/img_845dd40.png
+++ b/graphics/fame_checker/bill.png
diff --git a/data/fame_checker/pal_845d500.pal b/graphics/fame_checker/cursor.pal
index 212d9eb69..212d9eb69 100644
--- a/data/fame_checker/pal_845d500.pal
+++ b/graphics/fame_checker/cursor.pal
diff --git a/data/fame_checker/img_845d100.png b/graphics/fame_checker/cursor.png
index 4cc3e200d..4cc3e200d 100644
--- a/data/fame_checker/img_845d100.png
+++ b/graphics/fame_checker/cursor.png
diff --git a/data/fame_checker/pal_845ed60.pal b/graphics/fame_checker/daisy.pal
index adf46bf14..adf46bf14 100644
--- a/data/fame_checker/pal_845ed60.pal
+++ b/graphics/fame_checker/daisy.pal
diff --git a/data/fame_checker/img_845e560.png b/graphics/fame_checker/daisy.png
index 1abf1a63e..1abf1a63e 100644
--- a/data/fame_checker/img_845e560.png
+++ b/graphics/fame_checker/daisy.png
diff --git a/data/fame_checker/pal_845dd20.pal b/graphics/fame_checker/mr_fuji.pal
index e6dcabf2f..e6dcabf2f 100644
--- a/data/fame_checker/pal_845dd20.pal
+++ b/graphics/fame_checker/mr_fuji.pal
diff --git a/data/fame_checker/img_845d520.png b/graphics/fame_checker/mr_fuji.png
index 4d23c4c87..4d23c4c87 100644
--- a/data/fame_checker/img_845d520.png
+++ b/graphics/fame_checker/mr_fuji.png
diff --git a/data/fame_checker/pal_845f580.pal b/graphics/fame_checker/prof_oak.pal
index eb6f2f18b..eb6f2f18b 100644
--- a/data/fame_checker/pal_845f580.pal
+++ b/graphics/fame_checker/prof_oak.pal
diff --git a/data/fame_checker/img_845ed80.png b/graphics/fame_checker/prof_oak.png
index 5e2a19aed..5e2a19aed 100644
--- a/data/fame_checker/img_845ed80.png
+++ b/graphics/fame_checker/prof_oak.png
diff --git a/data/fame_checker/img_845ce00.png b/graphics/fame_checker/question_mark.png
index b0a170e09..b0a170e09 100644
--- a/data/fame_checker/img_845ce00.png
+++ b/graphics/fame_checker/question_mark.png
diff --git a/data/fame_checker/pal_845f5c0.pal b/graphics/fame_checker/silhouette.pal
index 4b0812f09..4b0812f09 100644
--- a/data/fame_checker/pal_845f5c0.pal
+++ b/graphics/fame_checker/silhouette.pal
diff --git a/data/fame_checker/pal_845d0e0.pal b/graphics/fame_checker/spinning_pokeball.pal
index dac232f78..dac232f78 100644
--- a/data/fame_checker/pal_845d0e0.pal
+++ b/graphics/fame_checker/spinning_pokeball.pal
diff --git a/data/fame_checker/img_845cf00.png b/graphics/fame_checker/spinning_pokeball.png
index 0d692439a..0d692439a 100644
--- a/data/fame_checker/img_845cf00.png
+++ b/graphics/fame_checker/spinning_pokeball.png
diff --git a/data/fame_checker/tilemap_845c600.bin b/graphics/fame_checker/tilemap1.bin
index 8ff09b289..8ff09b289 100644
--- a/data/fame_checker/tilemap_845c600.bin
+++ b/graphics/fame_checker/tilemap1.bin
diff --git a/data/graphics/fame_checker_tilemap2.bin b/graphics/fame_checker/tilemap2.bin
index 6e2eed695..6e2eed695 100644
--- a/data/graphics/fame_checker_tilemap2.bin
+++ b/graphics/fame_checker/tilemap2.bin
diff --git a/data/graphics/fame_checker_tilemap3.bin b/graphics/fame_checker/tilemap3.bin
index fdf419278..fdf419278 100644
--- a/data/graphics/fame_checker_tilemap3.bin
+++ b/graphics/fame_checker/tilemap3.bin
diff --git a/data/fame_checker/pal_845f5a0.pal b/graphics/fame_checker/unk.pal
index 25a3ac1d2..25a3ac1d2 100644
--- a/data/fame_checker/pal_845f5a0.pal
+++ b/graphics/fame_checker/unk.pal
diff --git a/data/field_specials/unk_83F5F50.pal b/graphics/field_specials/unk_83F5F50.pal
index 6528f9f75..6528f9f75 100644
--- a/data/field_specials/unk_83F5F50.pal
+++ b/graphics/field_specials/unk_83F5F50.pal
diff --git a/data/field_specials/unk_83F5F70.pal b/graphics/field_specials/unk_83F5F70.pal
index 934306488..934306488 100644
--- a/data/field_specials/unk_83F5F70.pal
+++ b/graphics/field_specials/unk_83F5F70.pal
diff --git a/data/field_specials/unk_83F5F90.pal b/graphics/field_specials/unk_83F5F90.pal
index 624c69448..624c69448 100644
--- a/data/field_specials/unk_83F5F90.pal
+++ b/graphics/field_specials/unk_83F5F90.pal
diff --git a/data/field_specials/unk_83F5FB0.pal b/graphics/field_specials/unk_83F5FB0.pal
index fb3cdebd0..fb3cdebd0 100644
--- a/data/field_specials/unk_83F5FB0.pal
+++ b/graphics/field_specials/unk_83F5FB0.pal
diff --git a/data/field_specials/unk_83F5FD0.pal b/graphics/field_specials/unk_83F5FD0.pal
index f2c6c78af..f2c6c78af 100644
--- a/data/field_specials/unk_83F5FD0.pal
+++ b/graphics/field_specials/unk_83F5FD0.pal
diff --git a/data/field_specials/unk_83F5FF0.pal b/graphics/field_specials/unk_83F5FF0.pal
index 3e2c5757a..3e2c5757a 100644
--- a/data/field_specials/unk_83F5FF0.pal
+++ b/graphics/field_specials/unk_83F5FF0.pal
diff --git a/data/field_specials/unk_83F6010.pal b/graphics/field_specials/unk_83F6010.pal
index 84e6e811a..84e6e811a 100644
--- a/data/field_specials/unk_83F6010.pal
+++ b/graphics/field_specials/unk_83F6010.pal
diff --git a/data/field_specials/unk_83F6030.pal b/graphics/field_specials/unk_83F6030.pal
index f49f8ef99..f49f8ef99 100644
--- a/data/field_specials/unk_83F6030.pal
+++ b/graphics/field_specials/unk_83F6030.pal
diff --git a/data/field_specials/unk_83F6050.pal b/graphics/field_specials/unk_83F6050.pal
index 538ebf789..538ebf789 100644
--- a/data/field_specials/unk_83F6050.pal
+++ b/graphics/field_specials/unk_83F6050.pal
diff --git a/data/field_specials/unk_83F6070.pal b/graphics/field_specials/unk_83F6070.pal
index 49b9d85b6..49b9d85b6 100644
--- a/data/field_specials/unk_83F6070.pal
+++ b/graphics/field_specials/unk_83F6070.pal
diff --git a/data/field_specials/unk_83F6090.pal b/graphics/field_specials/unk_83F6090.pal
index ff81da8b3..ff81da8b3 100644
--- a/data/field_specials/unk_83F6090.pal
+++ b/graphics/field_specials/unk_83F6090.pal
diff --git a/data/field_specials/unk_83F60B0.pal b/graphics/field_specials/unk_83F60B0.pal
index a0763ff47..a0763ff47 100644
--- a/data/field_specials/unk_83F60B0.pal
+++ b/graphics/field_specials/unk_83F60B0.pal
diff --git a/data/field_specials/unk_83F60D0.pal b/graphics/field_specials/unk_83F60D0.pal
index 6528f9f75..6528f9f75 100644
--- a/data/field_specials/unk_83F60D0.pal
+++ b/graphics/field_specials/unk_83F60D0.pal
diff --git a/data/field_specials/unk_83F60F0.pal b/graphics/field_specials/unk_83F60F0.pal
index 75dfaa19a..75dfaa19a 100644
--- a/data/field_specials/unk_83F60F0.pal
+++ b/graphics/field_specials/unk_83F60F0.pal
diff --git a/data/field_specials/unk_83F6110.pal b/graphics/field_specials/unk_83F6110.pal
index 092544dec..092544dec 100644
--- a/data/field_specials/unk_83F6110.pal
+++ b/graphics/field_specials/unk_83F6110.pal
diff --git a/data/field_specials/unk_83F6130.pal b/graphics/field_specials/unk_83F6130.pal
index 3b93965ad..3b93965ad 100644
--- a/data/field_specials/unk_83F6130.pal
+++ b/graphics/field_specials/unk_83F6130.pal
diff --git a/data/field_specials/unk_83F6150.pal b/graphics/field_specials/unk_83F6150.pal
index be23edc23..be23edc23 100644
--- a/data/field_specials/unk_83F6150.pal
+++ b/graphics/field_specials/unk_83F6150.pal
diff --git a/data/field_specials/unk_83F6170.pal b/graphics/field_specials/unk_83F6170.pal
index 788d0bd65..788d0bd65 100644
--- a/data/field_specials/unk_83F6170.pal
+++ b/graphics/field_specials/unk_83F6170.pal
diff --git a/data/field_specials/unk_83F6190.pal b/graphics/field_specials/unk_83F6190.pal
index 8ca385f0d..8ca385f0d 100644
--- a/data/field_specials/unk_83F6190.pal
+++ b/graphics/field_specials/unk_83F6190.pal
diff --git a/data/field_specials/unk_83F61B0.pal b/graphics/field_specials/unk_83F61B0.pal
index 63fe8e97e..63fe8e97e 100644
--- a/data/field_specials/unk_83F61B0.pal
+++ b/graphics/field_specials/unk_83F61B0.pal
diff --git a/data/field_specials/unk_83F61D0.pal b/graphics/field_specials/unk_83F61D0.pal
index a0763ff47..a0763ff47 100644
--- a/data/field_specials/unk_83F61D0.pal
+++ b/graphics/field_specials/unk_83F61D0.pal
diff --git a/data/field_specials/unk_83F6206.pal b/graphics/field_specials/unk_83F6206.pal
index c20bacb57..c20bacb57 100644
--- a/data/field_specials/unk_83F6206.pal
+++ b/graphics/field_specials/unk_83F6206.pal
diff --git a/data/field_specials/unk_83F6226.pal b/graphics/field_specials/unk_83F6226.pal
index 2c106a4ae..2c106a4ae 100644
--- a/data/field_specials/unk_83F6226.pal
+++ b/graphics/field_specials/unk_83F6226.pal
diff --git a/data/field_specials/unk_83F6246.pal b/graphics/field_specials/unk_83F6246.pal
index 38fe7d084..38fe7d084 100644
--- a/data/field_specials/unk_83F6246.pal
+++ b/graphics/field_specials/unk_83F6246.pal
diff --git a/data/field_specials/unk_83F6266.pal b/graphics/field_specials/unk_83F6266.pal
index 7b7fb7c44..7b7fb7c44 100644
--- a/data/field_specials/unk_83F6266.pal
+++ b/graphics/field_specials/unk_83F6266.pal
diff --git a/data/field_specials/unk_83F6286.pal b/graphics/field_specials/unk_83F6286.pal
index 4eda607b7..4eda607b7 100644
--- a/data/field_specials/unk_83F6286.pal
+++ b/graphics/field_specials/unk_83F6286.pal
diff --git a/data/field_specials/unk_83F62A6.pal b/graphics/field_specials/unk_83F62A6.pal
index a92bc65fd..a92bc65fd 100644
--- a/data/field_specials/unk_83F62A6.pal
+++ b/graphics/field_specials/unk_83F62A6.pal
diff --git a/data/field_specials/unk_83F62C6.pal b/graphics/field_specials/unk_83F62C6.pal
index 0de8519c6..0de8519c6 100644
--- a/data/field_specials/unk_83F62C6.pal
+++ b/graphics/field_specials/unk_83F62C6.pal
diff --git a/data/field_specials/unk_83F62E6.pal b/graphics/field_specials/unk_83F62E6.pal
index ae67047d4..ae67047d4 100644
--- a/data/field_specials/unk_83F62E6.pal
+++ b/graphics/field_specials/unk_83F62E6.pal
diff --git a/data/field_specials/unk_83F6306.pal b/graphics/field_specials/unk_83F6306.pal
index 27cf345e4..27cf345e4 100644
--- a/data/field_specials/unk_83F6306.pal
+++ b/graphics/field_specials/unk_83F6306.pal
diff --git a/data/field_specials/unk_83F6326.pal b/graphics/field_specials/unk_83F6326.pal
index fcca0b4de..fcca0b4de 100644
--- a/data/field_specials/unk_83F6326.pal
+++ b/graphics/field_specials/unk_83F6326.pal
diff --git a/data/field_specials/unk_83F6346.pal b/graphics/field_specials/unk_83F6346.pal
index 6c7540611..6c7540611 100644
--- a/data/field_specials/unk_83F6346.pal
+++ b/graphics/field_specials/unk_83F6346.pal
diff --git a/data/graphics/fonts/down_arrow.png b/graphics/fonts/down_arrow.png
index e74ed47ef..e74ed47ef 100644
--- a/data/graphics/fonts/down_arrow.png
+++ b/graphics/fonts/down_arrow.png
diff --git a/data/graphics/fonts/down_arrow_2.png b/graphics/fonts/down_arrow_2.png
index aefcf4f08..aefcf4f08 100644
--- a/data/graphics/fonts/down_arrow_2.png
+++ b/graphics/fonts/down_arrow_2.png
diff --git a/data/graphics/fonts/down_arrow_3.png b/graphics/fonts/down_arrow_3.png
index 6345eacfb..6345eacfb 100644
--- a/data/graphics/fonts/down_arrow_3.png
+++ b/graphics/fonts/down_arrow_3.png
diff --git a/data/graphics/fonts/down_arrow_4.png b/graphics/fonts/down_arrow_4.png
index b6cba25f3..b6cba25f3 100644
--- a/data/graphics/fonts/down_arrow_4.png
+++ b/graphics/fonts/down_arrow_4.png
diff --git a/data/graphics/fonts/down_arrow_RS.png b/graphics/fonts/down_arrow_RS.png
index c0aae894f..c0aae894f 100644
--- a/data/graphics/fonts/down_arrow_RS.png
+++ b/graphics/fonts/down_arrow_RS.png
diff --git a/data/graphics/fonts/down_arrow_RS_2.png b/graphics/fonts/down_arrow_RS_2.png
index de9d9cf47..de9d9cf47 100644
--- a/data/graphics/fonts/down_arrow_RS_2.png
+++ b/graphics/fonts/down_arrow_RS_2.png
diff --git a/data/graphics/fonts/font0_jap.png b/graphics/fonts/font0_jap.png
index 23903f343..23903f343 100644
--- a/data/graphics/fonts/font0_jap.png
+++ b/graphics/fonts/font0_jap.png
diff --git a/data/graphics/fonts/font0_latin.png b/graphics/fonts/font0_latin.png
index 7a79f2389..7a79f2389 100644
--- a/data/graphics/fonts/font0_latin.png
+++ b/graphics/fonts/font0_latin.png
diff --git a/data/graphics/fonts/font1_jap.png b/graphics/fonts/font1_jap.png
index 0041b477a..0041b477a 100644
--- a/data/graphics/fonts/font1_jap.png
+++ b/graphics/fonts/font1_jap.png
diff --git a/data/graphics/fonts/font1_latin.png b/graphics/fonts/font1_latin.png
index 42e847faf..42e847faf 100644
--- a/data/graphics/fonts/font1_latin.png
+++ b/graphics/fonts/font1_latin.png
diff --git a/data/graphics/fonts/font2_jap.png b/graphics/fonts/font2_jap.png
index efdb4b77e..efdb4b77e 100644
--- a/data/graphics/fonts/font2_jap.png
+++ b/graphics/fonts/font2_jap.png
diff --git a/data/graphics/fonts/font2_latin.png b/graphics/fonts/font2_latin.png
index 42e847faf..42e847faf 100644
--- a/data/graphics/fonts/font2_latin.png
+++ b/graphics/fonts/font2_latin.png
diff --git a/data/graphics/fonts/font4_jap.png b/graphics/fonts/font4_jap.png
index da4f2beac..da4f2beac 100644
--- a/data/graphics/fonts/font4_jap.png
+++ b/graphics/fonts/font4_jap.png
diff --git a/data/graphics/fonts/font4_latin.png b/graphics/fonts/font4_latin.png
index 42e847faf..42e847faf 100644
--- a/data/graphics/fonts/font4_latin.png
+++ b/graphics/fonts/font4_latin.png
diff --git a/data/graphics/fonts/font5_jap.png b/graphics/fonts/font5_jap.png
index 7da59c0eb..7da59c0eb 100644
--- a/data/graphics/fonts/font5_jap.png
+++ b/graphics/fonts/font5_jap.png
diff --git a/data/graphics/fonts/font5_latin.png b/graphics/fonts/font5_latin.png
index 42e847faf..42e847faf 100644
--- a/data/graphics/fonts/font5_latin.png
+++ b/graphics/fonts/font5_latin.png
diff --git a/data/graphics/fonts/font6_braille.png b/graphics/fonts/font6_braille.png
index cb4451bc2..cb4451bc2 100644
--- a/data/graphics/fonts/font6_braille.png
+++ b/graphics/fonts/font6_braille.png
diff --git a/data/graphics/fonts/font9_jap.png b/graphics/fonts/font9_jap.png
index 14cf6c042..14cf6c042 100644
--- a/data/graphics/fonts/font9_jap.png
+++ b/graphics/fonts/font9_jap.png
diff --git a/data/graphics/fonts/keypad_icons.png b/graphics/fonts/keypad_icons.png
index f8c162bb9..f8c162bb9 100644
--- a/data/graphics/fonts/keypad_icons.png
+++ b/graphics/fonts/keypad_icons.png
diff --git a/data/bag/bag_window_pal.pal b/graphics/item_menu/bag_window_pal.pal
index 426ea279e..426ea279e 100644
--- a/data/bag/bag_window_pal.pal
+++ b/graphics/item_menu/bag_window_pal.pal
diff --git a/data/itemfinder/spr_tiles.png b/graphics/itemfinder/spr_tiles.png
index 4171f37b4..4171f37b4 100644
--- a/data/itemfinder/spr_tiles.png
+++ b/graphics/itemfinder/spr_tiles.png
diff --git a/data/graphics/unk_847a348.png b/graphics/link_games/unk_847a348.png
index 9897a6d36..9897a6d36 100644
--- a/data/graphics/unk_847a348.png
+++ b/graphics/link_games/unk_847a348.png
diff --git a/data/main_menu/unk_8234648.pal b/graphics/main_menu/unk_8234648.pal
index 7aca54c52..7aca54c52 100644
--- a/data/main_menu/unk_8234648.pal
+++ b/graphics/main_menu/unk_8234648.pal
diff --git a/data/main_menu/unk_8234668.pal b/graphics/main_menu/unk_8234668.pal
index 022f0051f..022f0051f 100644
--- a/data/main_menu/unk_8234668.pal
+++ b/graphics/main_menu/unk_8234668.pal
diff --git a/data/map_preview/altering_cave_pal.pal b/graphics/map_preview/altering_cave_pal.pal
index f451adce2..f451adce2 100644
--- a/data/map_preview/altering_cave_pal.pal
+++ b/graphics/map_preview/altering_cave_pal.pal
diff --git a/data/map_preview/altering_cave_tilemap.bin b/graphics/map_preview/altering_cave_tilemap.bin
index fa907c6e7..fa907c6e7 100644
--- a/data/map_preview/altering_cave_tilemap.bin
+++ b/graphics/map_preview/altering_cave_tilemap.bin
diff --git a/data/map_preview/altering_cave_tiles.png b/graphics/map_preview/altering_cave_tiles.png
index 4ea8496a2..4ea8496a2 100644
--- a/data/map_preview/altering_cave_tiles.png
+++ b/graphics/map_preview/altering_cave_tiles.png
diff --git a/data/map_preview/berry_forest_pal.pal b/graphics/map_preview/berry_forest_pal.pal
index 755a6c2ed..755a6c2ed 100644
--- a/data/map_preview/berry_forest_pal.pal
+++ b/graphics/map_preview/berry_forest_pal.pal
diff --git a/data/map_preview/berry_forest_tilemap.bin b/graphics/map_preview/berry_forest_tilemap.bin
index fe7312a9f..fe7312a9f 100644
--- a/data/map_preview/berry_forest_tilemap.bin
+++ b/graphics/map_preview/berry_forest_tilemap.bin
diff --git a/data/map_preview/berry_forest_tiles.png b/graphics/map_preview/berry_forest_tiles.png
index 6f6efd0fe..6f6efd0fe 100644
--- a/data/map_preview/berry_forest_tiles.png
+++ b/graphics/map_preview/berry_forest_tiles.png
diff --git a/data/map_preview/cerulean_cave_pal.pal b/graphics/map_preview/cerulean_cave_pal.pal
index 074a6b6f7..074a6b6f7 100644
--- a/data/map_preview/cerulean_cave_pal.pal
+++ b/graphics/map_preview/cerulean_cave_pal.pal
diff --git a/data/map_preview/cerulean_cave_tilemap.bin b/graphics/map_preview/cerulean_cave_tilemap.bin
index e66ab7ea3..e66ab7ea3 100644
--- a/data/map_preview/cerulean_cave_tilemap.bin
+++ b/graphics/map_preview/cerulean_cave_tilemap.bin
diff --git a/data/map_preview/cerulean_cave_tiles.png b/graphics/map_preview/cerulean_cave_tiles.png
index e9f7b4e2e..e9f7b4e2e 100644
--- a/data/map_preview/cerulean_cave_tiles.png
+++ b/graphics/map_preview/cerulean_cave_tiles.png
diff --git a/data/map_preview/digletts_cave_pal.pal b/graphics/map_preview/digletts_cave_pal.pal
index 923d83144..923d83144 100644
--- a/data/map_preview/digletts_cave_pal.pal
+++ b/graphics/map_preview/digletts_cave_pal.pal
diff --git a/data/map_preview/digletts_cave_tilemap.bin b/graphics/map_preview/digletts_cave_tilemap.bin
index 2f8bbd665..2f8bbd665 100644
--- a/data/map_preview/digletts_cave_tilemap.bin
+++ b/graphics/map_preview/digletts_cave_tilemap.bin
diff --git a/data/map_preview/digletts_cave_tiles.png b/graphics/map_preview/digletts_cave_tiles.png
index c3e7d2879..c3e7d2879 100644
--- a/data/map_preview/digletts_cave_tiles.png
+++ b/graphics/map_preview/digletts_cave_tiles.png
diff --git a/data/map_preview/dotted_hole_pal.pal b/graphics/map_preview/dotted_hole_pal.pal
index fd424fa28..fd424fa28 100644
--- a/data/map_preview/dotted_hole_pal.pal
+++ b/graphics/map_preview/dotted_hole_pal.pal
diff --git a/data/map_preview/dotted_hole_tilemap.bin b/graphics/map_preview/dotted_hole_tilemap.bin
index a83083b38..a83083b38 100644
--- a/data/map_preview/dotted_hole_tilemap.bin
+++ b/graphics/map_preview/dotted_hole_tilemap.bin
diff --git a/data/map_preview/dotted_hole_tiles.png b/graphics/map_preview/dotted_hole_tiles.png
index f2d23d46e..f2d23d46e 100644
--- a/data/map_preview/dotted_hole_tiles.png
+++ b/graphics/map_preview/dotted_hole_tiles.png
diff --git a/data/map_preview/icefall_cave_pal.pal b/graphics/map_preview/icefall_cave_pal.pal
index 4e31e5380..4e31e5380 100644
--- a/data/map_preview/icefall_cave_pal.pal
+++ b/graphics/map_preview/icefall_cave_pal.pal
diff --git a/data/map_preview/icefall_cave_tilemap.bin b/graphics/map_preview/icefall_cave_tilemap.bin
index bd1d05d1b..bd1d05d1b 100644
--- a/data/map_preview/icefall_cave_tilemap.bin
+++ b/graphics/map_preview/icefall_cave_tilemap.bin
diff --git a/data/map_preview/icefall_cave_tiles.png b/graphics/map_preview/icefall_cave_tiles.png
index 211f19758..211f19758 100644
--- a/data/map_preview/icefall_cave_tiles.png
+++ b/graphics/map_preview/icefall_cave_tiles.png
diff --git a/data/map_preview/kanto_safari_zone_pal.pal b/graphics/map_preview/kanto_safari_zone_pal.pal
index 0434848d8..0434848d8 100644
--- a/data/map_preview/kanto_safari_zone_pal.pal
+++ b/graphics/map_preview/kanto_safari_zone_pal.pal
diff --git a/data/map_preview/kanto_safari_zone_tilemap.bin b/graphics/map_preview/kanto_safari_zone_tilemap.bin
index 756de73b6..756de73b6 100644
--- a/data/map_preview/kanto_safari_zone_tilemap.bin
+++ b/graphics/map_preview/kanto_safari_zone_tilemap.bin
diff --git a/data/map_preview/kanto_safari_zone_tiles.png b/graphics/map_preview/kanto_safari_zone_tiles.png
index b1da5a41d..b1da5a41d 100644
--- a/data/map_preview/kanto_safari_zone_tiles.png
+++ b/graphics/map_preview/kanto_safari_zone_tiles.png
diff --git a/data/map_preview/kanto_victory_road_pal.pal b/graphics/map_preview/kanto_victory_road_pal.pal
index 828ff7e22..828ff7e22 100644
--- a/data/map_preview/kanto_victory_road_pal.pal
+++ b/graphics/map_preview/kanto_victory_road_pal.pal
diff --git a/data/map_preview/kanto_victory_road_tilemap.bin b/graphics/map_preview/kanto_victory_road_tilemap.bin
index 03d1cc292..03d1cc292 100644
--- a/data/map_preview/kanto_victory_road_tilemap.bin
+++ b/graphics/map_preview/kanto_victory_road_tilemap.bin
diff --git a/data/map_preview/kanto_victory_road_tiles.png b/graphics/map_preview/kanto_victory_road_tiles.png
index b3432b9c9..b3432b9c9 100644
--- a/data/map_preview/kanto_victory_road_tiles.png
+++ b/graphics/map_preview/kanto_victory_road_tiles.png
diff --git a/data/map_preview/lost_cave_pal.pal b/graphics/map_preview/lost_cave_pal.pal
index 33b29a07b..33b29a07b 100644
--- a/data/map_preview/lost_cave_pal.pal
+++ b/graphics/map_preview/lost_cave_pal.pal
diff --git a/data/map_preview/lost_cave_tilemap.bin b/graphics/map_preview/lost_cave_tilemap.bin
index 6c256acc2..6c256acc2 100644
--- a/data/map_preview/lost_cave_tilemap.bin
+++ b/graphics/map_preview/lost_cave_tilemap.bin
diff --git a/data/map_preview/lost_cave_tiles.png b/graphics/map_preview/lost_cave_tiles.png
index a2c4c8f38..a2c4c8f38 100644
--- a/data/map_preview/lost_cave_tiles.png
+++ b/graphics/map_preview/lost_cave_tiles.png
diff --git a/data/map_preview/monean_chamber_pal.pal b/graphics/map_preview/monean_chamber_pal.pal
index ce72a4891..ce72a4891 100644
--- a/data/map_preview/monean_chamber_pal.pal
+++ b/graphics/map_preview/monean_chamber_pal.pal
diff --git a/data/map_preview/monean_chamber_tilemap.bin b/graphics/map_preview/monean_chamber_tilemap.bin
index f228d3daf..f228d3daf 100644
--- a/data/map_preview/monean_chamber_tilemap.bin
+++ b/graphics/map_preview/monean_chamber_tilemap.bin
diff --git a/data/map_preview/monean_chamber_tiles.png b/graphics/map_preview/monean_chamber_tiles.png
index 6426d175f..6426d175f 100644
--- a/data/map_preview/monean_chamber_tiles.png
+++ b/graphics/map_preview/monean_chamber_tiles.png
diff --git a/data/map_preview/mt_ember_pal.pal b/graphics/map_preview/mt_ember_pal.pal
index 4f5066e64..4f5066e64 100644
--- a/data/map_preview/mt_ember_pal.pal
+++ b/graphics/map_preview/mt_ember_pal.pal
diff --git a/data/map_preview/mt_ember_tilemap.bin b/graphics/map_preview/mt_ember_tilemap.bin
index 52af71494..52af71494 100644
--- a/data/map_preview/mt_ember_tilemap.bin
+++ b/graphics/map_preview/mt_ember_tilemap.bin
diff --git a/data/map_preview/mt_ember_tiles.png b/graphics/map_preview/mt_ember_tiles.png
index 9145e9d4f..9145e9d4f 100644
--- a/data/map_preview/mt_ember_tiles.png
+++ b/graphics/map_preview/mt_ember_tiles.png
diff --git a/data/map_preview/mt_moon_pal.pal b/graphics/map_preview/mt_moon_pal.pal
index 9a858a8c6..9a858a8c6 100644
--- a/data/map_preview/mt_moon_pal.pal
+++ b/graphics/map_preview/mt_moon_pal.pal
diff --git a/data/map_preview/mt_moon_tilemap.bin b/graphics/map_preview/mt_moon_tilemap.bin
index 469efcf77..469efcf77 100644
--- a/data/map_preview/mt_moon_tilemap.bin
+++ b/graphics/map_preview/mt_moon_tilemap.bin
diff --git a/data/map_preview/mt_moon_tiles.png b/graphics/map_preview/mt_moon_tiles.png
index 8ede39bdd..8ede39bdd 100644
--- a/data/map_preview/mt_moon_tiles.png
+++ b/graphics/map_preview/mt_moon_tiles.png
diff --git a/data/map_preview/pokemon_mansion_pal.pal b/graphics/map_preview/pokemon_mansion_pal.pal
index 7f6ef22a5..7f6ef22a5 100644
--- a/data/map_preview/pokemon_mansion_pal.pal
+++ b/graphics/map_preview/pokemon_mansion_pal.pal
diff --git a/data/map_preview/pokemon_mansion_tilemap.bin b/graphics/map_preview/pokemon_mansion_tilemap.bin
index a8b1b3d3f..a8b1b3d3f 100644
--- a/data/map_preview/pokemon_mansion_tilemap.bin
+++ b/graphics/map_preview/pokemon_mansion_tilemap.bin
diff --git a/data/map_preview/pokemon_mansion_tiles.png b/graphics/map_preview/pokemon_mansion_tiles.png
index 1fa94ceda..1fa94ceda 100644
--- a/data/map_preview/pokemon_mansion_tiles.png
+++ b/graphics/map_preview/pokemon_mansion_tiles.png
diff --git a/data/map_preview/pokemon_tower_pal.pal b/graphics/map_preview/pokemon_tower_pal.pal
index 93f4847ae..93f4847ae 100644
--- a/data/map_preview/pokemon_tower_pal.pal
+++ b/graphics/map_preview/pokemon_tower_pal.pal
diff --git a/data/map_preview/pokemon_tower_tilemap.bin b/graphics/map_preview/pokemon_tower_tilemap.bin
index f12b9bdf8..f12b9bdf8 100644
--- a/data/map_preview/pokemon_tower_tilemap.bin
+++ b/graphics/map_preview/pokemon_tower_tilemap.bin
diff --git a/data/map_preview/pokemon_tower_tiles.png b/graphics/map_preview/pokemon_tower_tiles.png
index 21583f9b3..21583f9b3 100644
--- a/data/map_preview/pokemon_tower_tiles.png
+++ b/graphics/map_preview/pokemon_tower_tiles.png
diff --git a/data/map_preview/power_plant_pal.pal b/graphics/map_preview/power_plant_pal.pal
index 49e5d6800..49e5d6800 100644
--- a/data/map_preview/power_plant_pal.pal
+++ b/graphics/map_preview/power_plant_pal.pal
diff --git a/data/map_preview/power_plant_tilemap.bin b/graphics/map_preview/power_plant_tilemap.bin
index 609cbb30d..609cbb30d 100644
--- a/data/map_preview/power_plant_tilemap.bin
+++ b/graphics/map_preview/power_plant_tilemap.bin
diff --git a/data/map_preview/power_plant_tiles.png b/graphics/map_preview/power_plant_tiles.png
index 6cd334aa9..6cd334aa9 100644
--- a/data/map_preview/power_plant_tiles.png
+++ b/graphics/map_preview/power_plant_tiles.png
diff --git a/data/map_preview/rock_tunnel_pal.pal b/graphics/map_preview/rock_tunnel_pal.pal
index 1412128d0..1412128d0 100644
--- a/data/map_preview/rock_tunnel_pal.pal
+++ b/graphics/map_preview/rock_tunnel_pal.pal
diff --git a/data/map_preview/rock_tunnel_tilemap.bin b/graphics/map_preview/rock_tunnel_tilemap.bin
index 9c322e0b1..9c322e0b1 100644
--- a/data/map_preview/rock_tunnel_tilemap.bin
+++ b/graphics/map_preview/rock_tunnel_tilemap.bin
diff --git a/data/map_preview/rock_tunnel_tiles.png b/graphics/map_preview/rock_tunnel_tiles.png
index e58ef7fb1..e58ef7fb1 100644
--- a/data/map_preview/rock_tunnel_tiles.png
+++ b/graphics/map_preview/rock_tunnel_tiles.png
diff --git a/data/map_preview/rocket_hideout_pal.pal b/graphics/map_preview/rocket_hideout_pal.pal
index 9c969e843..9c969e843 100644
--- a/data/map_preview/rocket_hideout_pal.pal
+++ b/graphics/map_preview/rocket_hideout_pal.pal
diff --git a/data/map_preview/rocket_hideout_tilemap.bin b/graphics/map_preview/rocket_hideout_tilemap.bin
index db9757ebb..db9757ebb 100644
--- a/data/map_preview/rocket_hideout_tilemap.bin
+++ b/graphics/map_preview/rocket_hideout_tilemap.bin
diff --git a/data/map_preview/rocket_hideout_tiles.png b/graphics/map_preview/rocket_hideout_tiles.png
index 8f57f8afe..8f57f8afe 100644
--- a/data/map_preview/rocket_hideout_tiles.png
+++ b/graphics/map_preview/rocket_hideout_tiles.png
diff --git a/data/map_preview/rocket_warehouse_pal.pal b/graphics/map_preview/rocket_warehouse_pal.pal
index c4fffd171..c4fffd171 100644
--- a/data/map_preview/rocket_warehouse_pal.pal
+++ b/graphics/map_preview/rocket_warehouse_pal.pal
diff --git a/data/map_preview/rocket_warehouse_tilemap.bin b/graphics/map_preview/rocket_warehouse_tilemap.bin
index 7636eea0a..7636eea0a 100644
--- a/data/map_preview/rocket_warehouse_tilemap.bin
+++ b/graphics/map_preview/rocket_warehouse_tilemap.bin
diff --git a/data/map_preview/rocket_warehouse_tiles.png b/graphics/map_preview/rocket_warehouse_tiles.png
index cc9dae203..cc9dae203 100644
--- a/data/map_preview/rocket_warehouse_tiles.png
+++ b/graphics/map_preview/rocket_warehouse_tiles.png
diff --git a/data/map_preview/seafoam_islands_pal.pal b/graphics/map_preview/seafoam_islands_pal.pal
index 348275aca..348275aca 100644
--- a/data/map_preview/seafoam_islands_pal.pal
+++ b/graphics/map_preview/seafoam_islands_pal.pal
diff --git a/data/map_preview/seafoam_islands_tilemap.bin b/graphics/map_preview/seafoam_islands_tilemap.bin
index 05afc22fc..05afc22fc 100644
--- a/data/map_preview/seafoam_islands_tilemap.bin
+++ b/graphics/map_preview/seafoam_islands_tilemap.bin
diff --git a/data/map_preview/seafoam_islands_tiles.png b/graphics/map_preview/seafoam_islands_tiles.png
index b76a85053..b76a85053 100644
--- a/data/map_preview/seafoam_islands_tiles.png
+++ b/graphics/map_preview/seafoam_islands_tiles.png
diff --git a/data/map_preview/silph_co_pal.pal b/graphics/map_preview/silph_co_pal.pal
index 07acfb986..07acfb986 100644
--- a/data/map_preview/silph_co_pal.pal
+++ b/graphics/map_preview/silph_co_pal.pal
diff --git a/data/map_preview/silph_co_tilemap.bin b/graphics/map_preview/silph_co_tilemap.bin
index 9449f6cd7..9449f6cd7 100644
--- a/data/map_preview/silph_co_tilemap.bin
+++ b/graphics/map_preview/silph_co_tilemap.bin
diff --git a/data/map_preview/silph_co_tiles.png b/graphics/map_preview/silph_co_tiles.png
index c5433bcee..c5433bcee 100644
--- a/data/map_preview/silph_co_tiles.png
+++ b/graphics/map_preview/silph_co_tiles.png
diff --git a/data/map_preview/viridian_forest_pal.pal b/graphics/map_preview/viridian_forest_pal.pal
index ff1655587..ff1655587 100644
--- a/data/map_preview/viridian_forest_pal.pal
+++ b/graphics/map_preview/viridian_forest_pal.pal
diff --git a/data/map_preview/viridian_forest_tilemap.bin b/graphics/map_preview/viridian_forest_tilemap.bin
index 37883b634..37883b634 100644
--- a/data/map_preview/viridian_forest_tilemap.bin
+++ b/graphics/map_preview/viridian_forest_tilemap.bin
diff --git a/data/map_preview/viridian_forest_tiles.png b/graphics/map_preview/viridian_forest_tiles.png
index 79b70c2e5..79b70c2e5 100644
--- a/data/map_preview/viridian_forest_tiles.png
+++ b/graphics/map_preview/viridian_forest_tiles.png
diff --git a/data/graphics/mevent/gfx_46718C.png b/graphics/mevent/gfx_46718C.png
index bf52445e6..bf52445e6 100644
--- a/data/graphics/mevent/gfx_46718C.png
+++ b/graphics/mevent/gfx_46718C.png
diff --git a/data/graphics/mevent/gfx_46737C.png b/graphics/mevent/gfx_46737C.png
index 1a23f8b94..1a23f8b94 100644
--- a/data/graphics/mevent/gfx_46737C.png
+++ b/graphics/mevent/gfx_46737C.png
diff --git a/data/graphics/mevent/gfx_467558.png b/graphics/mevent/gfx_467558.png
index c28edd891..c28edd891 100644
--- a/data/graphics/mevent/gfx_467558.png
+++ b/graphics/mevent/gfx_467558.png
diff --git a/data/graphics/mevent/gfx_467700.png b/graphics/mevent/gfx_467700.png
index f31385746..f31385746 100644
--- a/data/graphics/mevent/gfx_467700.png
+++ b/graphics/mevent/gfx_467700.png
diff --git a/data/graphics/mevent/gfx_467A7C.png b/graphics/mevent/gfx_467A7C.png
index f94b6c50f..f94b6c50f 100644
--- a/data/graphics/mevent/gfx_467A7C.png
+++ b/graphics/mevent/gfx_467A7C.png
diff --git a/data/graphics/mevent/gfx_467EF4.png b/graphics/mevent/gfx_467EF4.png
index 51a1aeb0c..51a1aeb0c 100644
--- a/data/graphics/mevent/gfx_467EF4.png
+++ b/graphics/mevent/gfx_467EF4.png
diff --git a/data/graphics/mevent/gfx_4680C0.png b/graphics/mevent/gfx_4680C0.png
index 1a27f3213..1a27f3213 100644
--- a/data/graphics/mevent/gfx_4680C0.png
+++ b/graphics/mevent/gfx_4680C0.png
diff --git a/data/graphics/mevent/gfx_46821C.png b/graphics/mevent/gfx_46821C.png
index aab27d16c..aab27d16c 100644
--- a/data/graphics/mevent/gfx_46821C.png
+++ b/graphics/mevent/gfx_46821C.png
diff --git a/data/graphics/mevent/gfx_46830C.png b/graphics/mevent/gfx_46830C.png
index 3c2b8e6d1..3c2b8e6d1 100644
--- a/data/graphics/mevent/gfx_46830C.png
+++ b/graphics/mevent/gfx_46830C.png
diff --git a/data/graphics/mevent/gfx_468448.png b/graphics/mevent/gfx_468448.png
index 137dbe9f3..137dbe9f3 100644
--- a/data/graphics/mevent/gfx_468448.png
+++ b/graphics/mevent/gfx_468448.png
diff --git a/data/graphics/mevent/gfx_4685B4.png b/graphics/mevent/gfx_4685B4.png
index 137dbe9f3..137dbe9f3 100644
--- a/data/graphics/mevent/gfx_4685B4.png
+++ b/graphics/mevent/gfx_4685B4.png
diff --git a/data/graphics/mevent/pal_46708C.pal b/graphics/mevent/pal_46708C.pal
index 9c5ef9b26..9c5ef9b26 100644
--- a/data/graphics/mevent/pal_46708C.pal
+++ b/graphics/mevent/pal_46708C.pal
diff --git a/data/graphics/mevent/pal_4670AC.pal b/graphics/mevent/pal_4670AC.pal
index 18c2be3fd..18c2be3fd 100644
--- a/data/graphics/mevent/pal_4670AC.pal
+++ b/graphics/mevent/pal_4670AC.pal
diff --git a/data/graphics/mevent/pal_4670CC.pal b/graphics/mevent/pal_4670CC.pal
index db02d5d4b..db02d5d4b 100644
--- a/data/graphics/mevent/pal_4670CC.pal
+++ b/graphics/mevent/pal_4670CC.pal
diff --git a/data/graphics/mevent/pal_4670EC.pal b/graphics/mevent/pal_4670EC.pal
index bfbf036a5..bfbf036a5 100644
--- a/data/graphics/mevent/pal_4670EC.pal
+++ b/graphics/mevent/pal_4670EC.pal
diff --git a/data/graphics/mevent/pal_46710C.pal b/graphics/mevent/pal_46710C.pal
index fa41ee3b0..fa41ee3b0 100644
--- a/data/graphics/mevent/pal_46710C.pal
+++ b/graphics/mevent/pal_46710C.pal
diff --git a/data/graphics/mevent/pal_46712C.pal b/graphics/mevent/pal_46712C.pal
index 8a71f5846..8a71f5846 100644
--- a/data/graphics/mevent/pal_46712C.pal
+++ b/graphics/mevent/pal_46712C.pal
diff --git a/data/graphics/mevent/pal_46714C.pal b/graphics/mevent/pal_46714C.pal
index 01832b5e2..01832b5e2 100644
--- a/data/graphics/mevent/pal_46714C.pal
+++ b/graphics/mevent/pal_46714C.pal
diff --git a/data/graphics/mevent/pal_46716C.pal b/graphics/mevent/pal_46716C.pal
index 28a498b57..28a498b57 100644
--- a/data/graphics/mevent/pal_46716C.pal
+++ b/graphics/mevent/pal_46716C.pal
diff --git a/data/graphics/mevent/pal_467DF4.pal b/graphics/mevent/pal_467DF4.pal
index 7314ddbc8..7314ddbc8 100644
--- a/data/graphics/mevent/pal_467DF4.pal
+++ b/graphics/mevent/pal_467DF4.pal
diff --git a/data/graphics/mevent/pal_467E14.pal b/graphics/mevent/pal_467E14.pal
index 333dd9280..333dd9280 100644
--- a/data/graphics/mevent/pal_467E14.pal
+++ b/graphics/mevent/pal_467E14.pal
diff --git a/data/graphics/mevent/pal_467E34.pal b/graphics/mevent/pal_467E34.pal
index 3fca3cdf3..3fca3cdf3 100644
--- a/data/graphics/mevent/pal_467E34.pal
+++ b/graphics/mevent/pal_467E34.pal
diff --git a/data/graphics/mevent/pal_467E54.pal b/graphics/mevent/pal_467E54.pal
index f5125b4c9..f5125b4c9 100644
--- a/data/graphics/mevent/pal_467E54.pal
+++ b/graphics/mevent/pal_467E54.pal
diff --git a/data/graphics/mevent/pal_467E74.pal b/graphics/mevent/pal_467E74.pal
index e8ec07ab5..e8ec07ab5 100644
--- a/data/graphics/mevent/pal_467E74.pal
+++ b/graphics/mevent/pal_467E74.pal
diff --git a/data/graphics/mevent/pal_467E94.pal b/graphics/mevent/pal_467E94.pal
index 783979089..783979089 100644
--- a/data/graphics/mevent/pal_467E94.pal
+++ b/graphics/mevent/pal_467E94.pal
diff --git a/data/graphics/mevent/pal_467EB4.pal b/graphics/mevent/pal_467EB4.pal
index 1c74daace..1c74daace 100644
--- a/data/graphics/mevent/pal_467EB4.pal
+++ b/graphics/mevent/pal_467EB4.pal
diff --git a/data/graphics/mevent/pal_467ED4.pal b/graphics/mevent/pal_467ED4.pal
index d1d92ba57..d1d92ba57 100644
--- a/data/graphics/mevent/pal_467ED4.pal
+++ b/graphics/mevent/pal_467ED4.pal
diff --git a/data/graphics/mevent/pal_468060.pal b/graphics/mevent/pal_468060.pal
index 970736bbb..970736bbb 100644
--- a/data/graphics/mevent/pal_468060.pal
+++ b/graphics/mevent/pal_468060.pal
diff --git a/data/graphics/mevent/pal_468080.pal b/graphics/mevent/pal_468080.pal
index 01832b5e2..01832b5e2 100644
--- a/data/graphics/mevent/pal_468080.pal
+++ b/graphics/mevent/pal_468080.pal
diff --git a/data/graphics/mevent/pal_4680A0.pal b/graphics/mevent/pal_4680A0.pal
index 28a498b57..28a498b57 100644
--- a/data/graphics/mevent/pal_4680A0.pal
+++ b/graphics/mevent/pal_4680A0.pal
diff --git a/data/graphics/mevent/tilemap_467288.bin b/graphics/mevent/tilemap_467288.bin
index 8e4a4717b..8e4a4717b 100644
--- a/data/graphics/mevent/tilemap_467288.bin
+++ b/graphics/mevent/tilemap_467288.bin
diff --git a/data/graphics/mevent/tilemap_467470.bin b/graphics/mevent/tilemap_467470.bin
index b59dbabb5..b59dbabb5 100644
--- a/data/graphics/mevent/tilemap_467470.bin
+++ b/graphics/mevent/tilemap_467470.bin
diff --git a/data/graphics/mevent/tilemap_46762C.bin b/graphics/mevent/tilemap_46762C.bin
index aba2b9e92..aba2b9e92 100644
--- a/data/graphics/mevent/tilemap_46762C.bin
+++ b/graphics/mevent/tilemap_46762C.bin
diff --git a/data/graphics/mevent/tilemap_467934.bin b/graphics/mevent/tilemap_467934.bin
index 1800bff4d..1800bff4d 100644
--- a/data/graphics/mevent/tilemap_467934.bin
+++ b/graphics/mevent/tilemap_467934.bin
diff --git a/data/graphics/mevent/tilemap_467CAC.bin b/graphics/mevent/tilemap_467CAC.bin
index 1800bff4d..1800bff4d 100644
--- a/data/graphics/mevent/tilemap_467CAC.bin
+++ b/graphics/mevent/tilemap_467CAC.bin
diff --git a/data/graphics/mevent/tilemap_468140.bin b/graphics/mevent/tilemap_468140.bin
index f8185b28e..f8185b28e 100644
--- a/data/graphics/mevent/tilemap_468140.bin
+++ b/graphics/mevent/tilemap_468140.bin
diff --git a/data/graphics/mevent/tilemap_46824C.bin b/graphics/mevent/tilemap_46824C.bin
index 72c7ea278..72c7ea278 100644
--- a/data/graphics/mevent/tilemap_46824C.bin
+++ b/graphics/mevent/tilemap_46824C.bin
diff --git a/data/graphics/mevent/tilemap_46837C.bin b/graphics/mevent/tilemap_46837C.bin
index c7b2e3e21..c7b2e3e21 100644
--- a/data/graphics/mevent/tilemap_46837C.bin
+++ b/graphics/mevent/tilemap_46837C.bin
diff --git a/data/graphics/mevent/tilemap_4684D8.bin b/graphics/mevent/tilemap_4684D8.bin
index f8185b28e..f8185b28e 100644
--- a/data/graphics/mevent/tilemap_4684D8.bin
+++ b/graphics/mevent/tilemap_4684D8.bin
diff --git a/data/graphics/mevent/tilemap_468644.bin b/graphics/mevent/tilemap_468644.bin
index f8185b28e..f8185b28e 100644
--- a/data/graphics/mevent/tilemap_468644.bin
+++ b/graphics/mevent/tilemap_468644.bin
diff --git a/data/oak_speech/oak_speech_background_tilemap.bin b/graphics/oak_speech/background_tilemap.bin
index 64374cd24..64374cd24 100644
--- a/data/oak_speech/oak_speech_background_tilemap.bin
+++ b/graphics/oak_speech/background_tilemap.bin
diff --git a/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png b/graphics/oak_speech/game_start_help_ui.png
index 419858b1b..419858b1b 100644
--- a/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png
+++ b/graphics/oak_speech/game_start_help_ui.png
diff --git a/data/oak_speech/oak_speech_gfx_grass_platform.png b/graphics/oak_speech/grass_platform.png
index 2c8e425d2..2c8e425d2 100644
--- a/data/oak_speech/oak_speech_gfx_grass_platform.png
+++ b/graphics/oak_speech/grass_platform.png
diff --git a/data/oak_speech/oak_speech_grass_platform_palette.pal b/graphics/oak_speech/grass_platform_palette.pal
index 4fb339128..4fb339128 100644
--- a/data/oak_speech/oak_speech_grass_platform_palette.pal
+++ b/graphics/oak_speech/grass_platform_palette.pal
diff --git a/data/oak_speech/help_docs_page2_tilemap.bin b/graphics/oak_speech/help_docs_page2_tilemap.bin
index 6d3cd42f1..6d3cd42f1 100644
--- a/data/oak_speech/help_docs_page2_tilemap.bin
+++ b/graphics/oak_speech/help_docs_page2_tilemap.bin
diff --git a/data/oak_speech/help_docs_page3_tilemap.bin b/graphics/oak_speech/help_docs_page3_tilemap.bin
index 24805c96e..24805c96e 100644
--- a/data/oak_speech/help_docs_page3_tilemap.bin
+++ b/graphics/oak_speech/help_docs_page3_tilemap.bin
diff --git a/data/oak_speech/help_docs_palette.pal b/graphics/oak_speech/help_docs_palette.pal
index b6905b913..b6905b913 100644
--- a/data/oak_speech/help_docs_palette.pal
+++ b/graphics/oak_speech/help_docs_palette.pal
diff --git a/data/oak_speech/oak_speech_gfx_leaf_pal.pal b/graphics/oak_speech/leaf_pal.pal
index feb1214a1..feb1214a1 100644
--- a/data/oak_speech/oak_speech_gfx_leaf_pal.pal
+++ b/graphics/oak_speech/leaf_pal.pal
diff --git a/data/oak_speech/oak_speech_gfx_leaf_pic.png b/graphics/oak_speech/leaf_pic.png
index 1825f9960..1825f9960 100644
--- a/data/oak_speech/oak_speech_gfx_leaf_pic.png
+++ b/graphics/oak_speech/leaf_pic.png
diff --git a/data/oak_speech/new_game_adventure_intro_tilemap.bin b/graphics/oak_speech/new_game_adventure_intro_tilemap.bin
index ad1c8216c..ad1c8216c 100644
--- a/data/oak_speech/new_game_adventure_intro_tilemap.bin
+++ b/graphics/oak_speech/new_game_adventure_intro_tilemap.bin
diff --git a/data/oak_speech/oak_speech_gfx_oak_pal.pal b/graphics/oak_speech/oak_pal.pal
index a0b648b2b..a0b648b2b 100644
--- a/data/oak_speech/oak_speech_gfx_oak_pal.pal
+++ b/graphics/oak_speech/oak_pal.pal
diff --git a/data/oak_speech/oak_speech_gfx_oak_pic.png b/graphics/oak_speech/oak_pic.png
index 9ac602944..9ac602944 100644
--- a/data/oak_speech/oak_speech_gfx_oak_pic.png
+++ b/graphics/oak_speech/oak_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_pika1.png b/graphics/oak_speech/pika1.png
index 71644c355..71644c355 100644
--- a/data/oak_speech/oak_speech_gfx_pika1.png
+++ b/graphics/oak_speech/pika1.png
diff --git a/data/oak_speech/oak_speech_gfx_pika2.png b/graphics/oak_speech/pika2.png
index e85cbfa9c..e85cbfa9c 100644
--- a/data/oak_speech/oak_speech_gfx_pika2.png
+++ b/graphics/oak_speech/pika2.png
diff --git a/data/oak_speech/oak_speech_gfx_pika_eyes.png b/graphics/oak_speech/pika_eyes.png
index 5e2fd80c0..5e2fd80c0 100644
--- a/data/oak_speech/oak_speech_gfx_pika_eyes.png
+++ b/graphics/oak_speech/pika_eyes.png
diff --git a/data/oak_speech/oak_speech_pika_palette.pal b/graphics/oak_speech/pika_palette.pal
index 4d2e92c74..4d2e92c74 100644
--- a/data/oak_speech/oak_speech_pika_palette.pal
+++ b/graphics/oak_speech/pika_palette.pal
diff --git a/data/oak_speech/oak_speech_gfx_red_pal.pal b/graphics/oak_speech/red_pal.pal
index 7eec09831..7eec09831 100644
--- a/data/oak_speech/oak_speech_gfx_red_pal.pal
+++ b/graphics/oak_speech/red_pal.pal
diff --git a/data/oak_speech/oak_speech_gfx_red_pic.png b/graphics/oak_speech/red_pic.png
index edf5cf9b1..edf5cf9b1 100644
--- a/data/oak_speech/oak_speech_gfx_red_pic.png
+++ b/graphics/oak_speech/red_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_rival_pal.pal b/graphics/oak_speech/rival_pal.pal
index 8240527a6..8240527a6 100644
--- a/data/oak_speech/oak_speech_gfx_rival_pal.pal
+++ b/graphics/oak_speech/rival_pal.pal
diff --git a/data/oak_speech/oak_speech_gfx_rival_pic.png b/graphics/oak_speech/rival_pic.png
index 317cbc038..317cbc038 100644
--- a/data/oak_speech/oak_speech_gfx_rival_pic.png
+++ b/graphics/oak_speech/rival_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_solid_colors.png b/graphics/oak_speech/solid_colors.png
index 30066cdd8..30066cdd8 100644
--- a/data/oak_speech/oak_speech_gfx_solid_colors.png
+++ b/graphics/oak_speech/solid_colors.png
diff --git a/data/pokedex_area_markers/marker.pal b/graphics/pokedex/area_markers/marker.pal
index 5a7190a3a..5a7190a3a 100644
--- a/data/pokedex_area_markers/marker.pal
+++ b/graphics/pokedex/area_markers/marker.pal
diff --git a/data/pokedex_area_markers/marker_0.png b/graphics/pokedex/area_markers/marker_0.png
index 10ef6d24b..10ef6d24b 100644
--- a/data/pokedex_area_markers/marker_0.png
+++ b/graphics/pokedex/area_markers/marker_0.png
diff --git a/data/pokedex_area_markers/marker_1.png b/graphics/pokedex/area_markers/marker_1.png
index 21db66b29..21db66b29 100644
--- a/data/pokedex_area_markers/marker_1.png
+++ b/graphics/pokedex/area_markers/marker_1.png
diff --git a/data/pokedex_area_markers/marker_2.png b/graphics/pokedex/area_markers/marker_2.png
index e25be6f5c..e25be6f5c 100644
--- a/data/pokedex_area_markers/marker_2.png
+++ b/graphics/pokedex/area_markers/marker_2.png
diff --git a/data/pokedex_area_markers/marker_3.png b/graphics/pokedex/area_markers/marker_3.png
index 1e8fe22d2..1e8fe22d2 100644
--- a/data/pokedex_area_markers/marker_3.png
+++ b/graphics/pokedex/area_markers/marker_3.png
diff --git a/data/pokedex_area_markers/marker_4.png b/graphics/pokedex/area_markers/marker_4.png
index 193697384..193697384 100644
--- a/data/pokedex_area_markers/marker_4.png
+++ b/graphics/pokedex/area_markers/marker_4.png
diff --git a/data/pokedex_area_markers/marker_5.png b/graphics/pokedex/area_markers/marker_5.png
index 0919682f4..0919682f4 100644
--- a/data/pokedex_area_markers/marker_5.png
+++ b/graphics/pokedex/area_markers/marker_5.png
diff --git a/data/pokedex_area_markers/marker_6.png b/graphics/pokedex/area_markers/marker_6.png
index 439d858e1..439d858e1 100644
--- a/data/pokedex_area_markers/marker_6.png
+++ b/graphics/pokedex/area_markers/marker_6.png
diff --git a/data/script_menu/aerodactyl_fossil.png b/graphics/script_menu/aerodactyl_fossil.png
index 067483d6e..067483d6e 100644
--- a/data/script_menu/aerodactyl_fossil.png
+++ b/graphics/script_menu/aerodactyl_fossil.png
diff --git a/data/script_menu/kabutops_fossil.png b/graphics/script_menu/kabutops_fossil.png
index e396b080a..e396b080a 100644
--- a/data/script_menu/kabutops_fossil.png
+++ b/graphics/script_menu/kabutops_fossil.png
diff --git a/data/seagallop/eb_tilemap.bin b/graphics/seagallop/eb_tilemap.bin
index 2f912fb18..2f912fb18 100644
--- a/data/seagallop/eb_tilemap.bin
+++ b/graphics/seagallop/eb_tilemap.bin
diff --git a/data/seagallop/ferry_and_wake.pal b/graphics/seagallop/ferry_and_wake.pal
index c25501332..c25501332 100644
--- a/data/seagallop/ferry_and_wake.pal
+++ b/graphics/seagallop/ferry_and_wake.pal
diff --git a/data/seagallop/ferry_sprite.png b/graphics/seagallop/ferry_sprite.png
index cc06fbffa..cc06fbffa 100644
--- a/data/seagallop/ferry_sprite.png
+++ b/graphics/seagallop/ferry_sprite.png
diff --git a/data/seagallop/wake.png b/graphics/seagallop/wake.png
index a5ff28c6e..a5ff28c6e 100644
--- a/data/seagallop/wake.png
+++ b/graphics/seagallop/wake.png
diff --git a/data/seagallop/water.png b/graphics/seagallop/water.png
index ccf64591a..ccf64591a 100644
--- a/data/seagallop/water.png
+++ b/graphics/seagallop/water.png
diff --git a/data/seagallop/wb_tilemap.bin b/graphics/seagallop/wb_tilemap.bin
index a3c27d319..a3c27d319 100644
--- a/data/seagallop/wb_tilemap.bin
+++ b/graphics/seagallop/wb_tilemap.bin
diff --git a/data/graphics/title_screen/lg_border_bg.bin b/graphics/title_screen/lg_border_bg.bin
index 108680bc3..108680bc3 100644
--- a/data/graphics/title_screen/lg_border_bg.bin
+++ b/graphics/title_screen/lg_border_bg.bin
diff --git a/data/graphics/title_screen/unk_83BF58C.png b/graphics/title_screen/unk_83BF58C.png
index 895457c3c..895457c3c 100644
--- a/data/graphics/title_screen/unk_83BF58C.png
+++ b/graphics/title_screen/unk_83BF58C.png
diff --git a/data/graphics/title_screen/unk_83BF5A8.bin b/graphics/title_screen/unk_83BF5A8.bin
index 375fbeb7a..375fbeb7a 100644
--- a/data/graphics/title_screen/unk_83BF5A8.bin
+++ b/graphics/title_screen/unk_83BF5A8.bin
diff --git a/data/graphics/title_screen/unk_83bf64c.png b/graphics/title_screen/unk_83bf64c.png
index 260e00a01..260e00a01 100644
--- a/data/graphics/title_screen/unk_83bf64c.png
+++ b/graphics/title_screen/unk_83bf64c.png
diff --git a/data/graphics/title_screen/unk_83bf77c.pal b/graphics/title_screen/unk_83bf77c.pal
index 815547f37..815547f37 100644
--- a/data/graphics/title_screen/unk_83bf77c.pal
+++ b/graphics/title_screen/unk_83bf77c.pal
diff --git a/data/graphics/title_screen/unk_83bf79c.png b/graphics/title_screen/unk_83bf79c.png
index 66a57a899..66a57a899 100644
--- a/data/graphics/title_screen/unk_83bf79c.png
+++ b/graphics/title_screen/unk_83bf79c.png
diff --git a/data/graphics/title_screen/unk_83bfa14.png b/graphics/title_screen/unk_83bfa14.png
index f4f030a5b..f4f030a5b 100644
--- a/data/graphics/title_screen/unk_83bfa14.png
+++ b/graphics/title_screen/unk_83bfa14.png
diff --git a/data/graphics/title_screen/unk_lg_83bf764.pal b/graphics/title_screen/unk_lg_83bf764.pal
index 9a13f7dad..9a13f7dad 100644
--- a/data/graphics/title_screen/unk_lg_83bf764.pal
+++ b/graphics/title_screen/unk_lg_83bf764.pal
diff --git a/data/graphics/title_screen/unk_lg_83bf784.png b/graphics/title_screen/unk_lg_83bf784.png
index d4f7dd622..d4f7dd622 100644
--- a/data/graphics/title_screen/unk_lg_83bf784.png
+++ b/graphics/title_screen/unk_lg_83bf784.png
diff --git a/data/graphics/title_screen/unk_lg_83bf89c.png b/graphics/title_screen/unk_lg_83bf89c.png
index d783c1204..d783c1204 100644
--- a/data/graphics/title_screen/unk_lg_83bf89c.png
+++ b/graphics/title_screen/unk_lg_83bf89c.png
diff --git a/data/graphics/unknown_8456638.bin b/graphics/unknown/unknown_8456638.bin
index 53ea8cfb8..53ea8cfb8 100644
--- a/data/graphics/unknown_8456638.bin
+++ b/graphics/unknown/unknown_8456638.bin
diff --git a/data/graphics/unknown_84566a8.bin b/graphics/unknown/unknown_84566a8.bin
index 2fc4a648a..2fc4a648a 100644
--- a/data/graphics/unknown_84566a8.bin
+++ b/graphics/unknown/unknown_84566a8.bin
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 4b1d9e996..7a2173172 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -1,7 +1,6 @@
 TILESETGFXDIR := data/tilesets
-GLOBALGFXDIR := data/graphics
-FONTGFXDIR := $(GLOBALGFXDIR)/fonts
-FAMECHECKERGFXDIR := data/fame_checker
+FONTGFXDIR := graphics/fonts
+FAMECHECKERGFXDIR := graphics/fame_checker
 INTERFACEGFXDIR := graphics/interface
 BTLANMSPRGFXDIR := graphics/battle_anims/sprites
 UNUSEDGFXDIR := graphics/unused
@@ -13,8 +12,6 @@ TYPESGFXDIR := graphics/types
 RAYQUAZAGFXDIR := graphics/rayquaza_scene
 ROULETTEGFXDIR := graphics/roulette
 SLOTMACHINEGFXDIR := graphics/slot_machine
-PKNAVGFXDIR := graphics/pokenav
-PKNAVOPTIONSGFXDIR := graphics/pokenav/options
 PSSGFXDIR := graphics/pokemon_storage
 EVENTOBJGFXDIR := graphics/event_objects
 MISCGFXDIR := graphics/misc
@@ -98,9 +95,6 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 63
 
-graphics/pokenav/region_map.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 233
-
 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29
 
@@ -440,21 +434,6 @@ $(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png
 
 graphics/tm_case/unk_8E845D8.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 91
-	
-$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/party.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/search.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/cool.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/beauty.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/cute.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/smart.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/tough.4bpp \
-								$(PKNAVOPTIONSGFXDIR)/cancel.4bpp
-	@cat $^ >$@
 
 $(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 53
@@ -474,13 +453,13 @@ $(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
 $(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp
 	@cat $^ >$@
 	
-$(FAMECHECKERGFXDIR)/img_845cf00.4bpp: %.4bpp: %.png
+$(FAMECHECKERGFXDIR)/spinning_pokeball.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 15
 
-$(GLOBALGFXDIR)/fame_checker_bg.4bpp: %.4bpp: %.png
+$(FAMECHECKERGFXDIR)/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 165
 
-data/seagallop/water.4bpp: %.4bpp: %.png
+graphics/seagallop/water.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 41
 
 $(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png
@@ -513,7 +492,7 @@ $(TITLESCREENGFXDIR)/unk_lg_8ead788.4bpp: %.4bpp: %.png
 $(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 77
 
-POKEDEXAREAMARKERSDATADIR := data/pokedex_area_markers
+POKEDEXAREAMARKERSDATADIR := graphics/pokedex/area_markers
 
 POKEDEXAREAMARKERFILES := \
 	$(POKEDEXAREAMARKERSDATADIR)/marker_0.4bpp \
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 5fa15b95a..fceec9daf 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -28,7 +28,7 @@ enum
 enum
 {
     TILE_ENCOUNTER_NONE,
-    TILE_ENCOUNTER_GRASS,
+    TILE_ENCOUNTER_LAND,
     TILE_ENCOUNTER_WATER,
 };
 
diff --git a/src/bag.c b/src/bag.c
index 198be971a..e790ce20e 100644
--- a/src/bag.c
+++ b/src/bag.c
@@ -8,7 +8,7 @@
 #include "money.h"
 #include "strings.h"
 
-static const u16 sBagWindowPalF[] = INCBIN_U16("data/bag/bag_window_pal.gbapal");
+static const u16 sBagWindowPalF[] = INCBIN_U16("graphics/item_menu/bag_window_pal.gbapal");
 
 static const u8 sTextColors[][3] = {
     {0, 1, 2},
diff --git a/src/braille_text.c b/src/braille_text.c
index 4a06cd319..8a4114fce 100644
--- a/src/braille_text.c
+++ b/src/braille_text.c
@@ -7,7 +7,7 @@
 extern u8 gGlyphInfo[];
 
 static const u8 gUnknown_846FB08[] = {1, 2, 4};
-static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
+static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("graphics/fonts/font6.fwjpnfont");
 
 static void DecompressGlyphFont6(u16);
 
diff --git a/src/credits.c b/src/credits.c
index 58647f7b1..dfcdfb418 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -337,24 +337,24 @@ static const struct WindowTemplate sWindowTemplates_Pikachu[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-static const u16 sPalette_OneBlackThenAllWhite[] = INCBIN_U16("data/credits/unk_840C630.gbapal");
-static const u32 sAffineCircleGfx[] = INCBIN_U32("data/credits/unk_840C650.8bpp.lz");
-static const u32 sAffineCircleMap[] = INCBIN_U32("data/credits/unk_840CA54.bin.lz");
-static const u32 sWindow1Map_Charizard[] = INCBIN_U32("data/credits/unk_840CB8C.bin.lz");
-static const u32 sWindow2Map_Charizard[] = INCBIN_U32("data/credits/unk_840D228.bin.lz");
-static const u32 sUnusedTilemap[] = INCBIN_U32("data/credits/unk_840DC0C.bin.lz");
-static const u32 sWindow1Map_Venusaur[] = INCBIN_U32("data/credits/unk_840E158.bin.lz");
-static const u32 sWindow2Map_Venusaur[] = INCBIN_U32("data/credits/unk_840E904.bin.lz");
-static const u32 sWindow1Map_Blastoise[] = INCBIN_U32("data/credits/unk_840F240.bin.lz");
-static const u32 sWindow2Map_Blastoise[] = INCBIN_U32("data/credits/unk_840F944.bin.lz");
-static const u32 sWindow1Map_Pikachu[] = INCBIN_U32("data/credits/unk_8410198.bin.lz");
-static const u32 sWindow2Map_Pikachu[] = INCBIN_U32("data/credits/unk_84105B4.bin.lz");
+static const u16 sPalette_OneBlackThenAllWhite[] = INCBIN_U16("graphics/credits/unk_840C630.gbapal");
+static const u32 sAffineCircleGfx[] = INCBIN_U32("graphics/credits/unk_840C650.8bpp.lz");
+static const u32 sAffineCircleMap[] = INCBIN_U32("graphics/credits/unk_840CA54.bin.lz");
+static const u32 sWindow1Map_Charizard[] = INCBIN_U32("graphics/credits/unk_840CB8C.bin.lz");
+static const u32 sWindow2Map_Charizard[] = INCBIN_U32("graphics/credits/unk_840D228.bin.lz");
+static const u32 sUnusedTilemap[] = INCBIN_U32("graphics/credits/unk_840DC0C.bin.lz");
+static const u32 sWindow1Map_Venusaur[] = INCBIN_U32("graphics/credits/unk_840E158.bin.lz");
+static const u32 sWindow2Map_Venusaur[] = INCBIN_U32("graphics/credits/unk_840E904.bin.lz");
+static const u32 sWindow1Map_Blastoise[] = INCBIN_U32("graphics/credits/unk_840F240.bin.lz");
+static const u32 sWindow2Map_Blastoise[] = INCBIN_U32("graphics/credits/unk_840F944.bin.lz");
+static const u32 sWindow1Map_Pikachu[] = INCBIN_U32("graphics/credits/unk_8410198.bin.lz");
+static const u32 sWindow2Map_Pikachu[] = INCBIN_U32("graphics/credits/unk_84105B4.bin.lz");
 
 static const u32 filler_8410AFC = 0xF0;
 
-static const u16 sTheEndGfxPal[] = INCBIN_U16("data/credits/unk_8410B20.gbapal");
-static const u8 sTheEndGfxTiles[] = INCBIN_U8("data/credits/unk_8410B20.4bpp.lz");
-static const u8 sTheEndGfxMap[] = INCBIN_U8("data/credits/unk_8410B20.bin.lz");
+static const u16 sTheEndGfxPal[] = INCBIN_U16("graphics/credits/unk_8410B20.gbapal");
+static const u8 sTheEndGfxTiles[] = INCBIN_U8("graphics/credits/unk_8410B20.4bpp.lz");
+static const u8 sTheEndGfxMap[] = INCBIN_U8("graphics/credits/unk_8410B20.bin.lz");
 
 static const struct CompressedGraphicsHeader sCopyrightOrTheEndGfxHeaders[] = {
     {
@@ -458,18 +458,18 @@ static const struct WindowTemplate sCreditsWindowTemplate = {
     .baseBlock = 0x008
 };
 
-static const u16 sMalePlayerSpritePal[] = INCBIN_U16("data/credits/unk_8410E10.gbapal");
-static const u32 sMalePlayerSpriteGfx[] = INCBIN_U32("data/credits/unk_8410E30.4bpp.lz");
-static const u16 sFemalePlayerSpritePal[] = INCBIN_U16("data/credits/unk_8411BF8.gbapal");
-static const u32 sFemalePlayerSpriteGfx[] = INCBIN_U32("data/credits/unk_8411C18.4bpp.lz");
-static const u16 sRivalSpritePal[] = INCBIN_U16("data/credits/unk_84129A0.gbapal");
-static const u32 sRivalSpriteGfx[] = INCBIN_U32("data/credits/unk_84129C0.4bpp.lz");
-static const u16 sGroundSpritePal_Grass[] = INCBIN_U16("data/credits/unk_8413318.gbapal");
-static const u32 sGroundSpriteGfx_Grass[] = INCBIN_U32("data/credits/unk_8413338.4bpp.lz");
-static const u16 sGroundSpritePal_Dirt[] = INCBIN_U16("data/credits/unk_8413854.gbapal");
-static const u32 sGroundSpriteGfx_Dirt[] = INCBIN_U32("data/credits/unk_8413874.4bpp.lz");
-static const u16 sGroundSpritePal_City[] = INCBIN_U16("data/credits/unk_8413D98.gbapal");
-static const u32 sGroundSpriteGfx_City[] = INCBIN_U32("data/credits/unk_8413DB8.4bpp.lz");
+static const u16 sMalePlayerSpritePal[] = INCBIN_U16("graphics/credits/unk_8410E10.gbapal");
+static const u32 sMalePlayerSpriteGfx[] = INCBIN_U32("graphics/credits/unk_8410E30.4bpp.lz");
+static const u16 sFemalePlayerSpritePal[] = INCBIN_U16("graphics/credits/unk_8411BF8.gbapal");
+static const u32 sFemalePlayerSpriteGfx[] = INCBIN_U32("graphics/credits/unk_8411C18.4bpp.lz");
+static const u16 sRivalSpritePal[] = INCBIN_U16("graphics/credits/unk_84129A0.gbapal");
+static const u32 sRivalSpriteGfx[] = INCBIN_U32("graphics/credits/unk_84129C0.4bpp.lz");
+static const u16 sGroundSpritePal_Grass[] = INCBIN_U16("graphics/credits/unk_8413318.gbapal");
+static const u32 sGroundSpriteGfx_Grass[] = INCBIN_U32("graphics/credits/unk_8413338.4bpp.lz");
+static const u16 sGroundSpritePal_Dirt[] = INCBIN_U16("graphics/credits/unk_8413854.gbapal");
+static const u32 sGroundSpriteGfx_Dirt[] = INCBIN_U32("graphics/credits/unk_8413874.4bpp.lz");
+static const u16 sGroundSpritePal_City[] = INCBIN_U16("graphics/credits/unk_8413D98.gbapal");
+static const u32 sGroundSpriteGfx_City[] = INCBIN_U32("graphics/credits/unk_8413DB8.4bpp.lz");
 
 static const u16 sPlayerRivalSpriteParams[][3] = {
     { 0, 3, 1 },
diff --git a/src/fame_checker.c b/src/fame_checker.c
index 7b71610ed..dbdb47da8 100644
--- a/src/fame_checker.c
+++ b/src/fame_checker.c
@@ -125,22 +125,22 @@ static void Task_FCOpenOrCloseInfoBox(u8 taskId);
 static void UpdateInfoBoxTilemap(u8 bg, s16 state);
 static void PlaceListMenuCursor(bool8 isActive);
 
-static const u16 sFameCheckerTilemap[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin");
-static const u8 sQuestionMarkSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp");
-static const u8 sSpinningPokeballSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp");
-static const u16 sSpinningPokeballSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845d0e0.gbapal");
-static const u8 sSelectorCursorSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845d100.4bpp");
-static const u16 sSelectorCursorSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845d500.gbapal");
-static const u8 sFujiSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845d520.4bpp");
-static const u16 sFujiSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal");
-static const u8 sBillSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845dd40.4bpp");
-static const u16 sBillSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal");
-static const u8 sDaisySpriteGfx[] = INCBIN_U8("data/fame_checker/img_845e560.4bpp");
-static const u16 sDaisySpritePalette[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal");
-static const u8 sOakSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp");
-static const u16 sOakSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal");
-static const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); // unused?
-static const u16 sSilhouettePalette[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal");
+static const u16 sFameCheckerTilemap[] = INCBIN_U16("graphics/fame_checker/tilemap1.bin");
+static const u8 sQuestionMarkSpriteGfx[] = INCBIN_U8("graphics/fame_checker/question_mark.4bpp");
+static const u8 sSpinningPokeballSpriteGfx[] = INCBIN_U8("graphics/fame_checker/spinning_pokeball.4bpp");
+static const u16 sSpinningPokeballSpritePalette[] = INCBIN_U16("graphics/fame_checker/spinning_pokeball.gbapal");
+static const u8 sSelectorCursorSpriteGfx[] = INCBIN_U8("graphics/fame_checker/cursor.4bpp");
+static const u16 sSelectorCursorSpritePalette[] = INCBIN_U16("graphics/fame_checker/cursor.gbapal");
+static const u8 sFujiSpriteGfx[] = INCBIN_U8("graphics/fame_checker/mr_fuji.4bpp");
+static const u16 sFujiSpritePalette[] = INCBIN_U16("graphics/fame_checker/mr_fuji.gbapal");
+static const u8 sBillSpriteGfx[] = INCBIN_U8("graphics/fame_checker/bill.4bpp");
+static const u16 sBillSpritePalette[] = INCBIN_U16("graphics/fame_checker/bill.gbapal");
+static const u8 sDaisySpriteGfx[] = INCBIN_U8("graphics/fame_checker/daisy.4bpp");
+static const u16 sDaisySpritePalette[] = INCBIN_U16("graphics/fame_checker/daisy.gbapal");
+static const u8 sOakSpriteGfx[] = INCBIN_U8("graphics/fame_checker/prof_oak.4bpp");
+static const u16 sOakSpritePalette[] = INCBIN_U16("graphics/fame_checker/prof_oak.gbapal");
+static const u16 sUnkPalette[] = INCBIN_U16("graphics/fame_checker/unk.gbapal"); // unused?
+static const u16 sSilhouettePalette[] = INCBIN_U16("graphics/fame_checker/silhouette.gbapal");
 
 static const u8 sTextColor_White[3]  = {0, 1, 2};
 static const u8 sTextColor_DkGrey[3] = {0, 2, 3};
diff --git a/src/field_specials.c b/src/field_specials.c
index b163d7f28..f6cdae90b 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -2075,30 +2075,30 @@ void DaisyMassageServices(void)
 }
 
 static const u16 sEliteFourLightingPalettes[][16] = {
-    INCBIN_U16("data/field_specials/unk_83F5F50.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F5F70.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F5F90.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F5FB0.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F5FD0.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F5FF0.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6010.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6030.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6050.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6070.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6090.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F60B0.gbapal")
+    INCBIN_U16("graphics/field_specials/unk_83F5F50.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F5F70.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F5F90.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F5FB0.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F5FD0.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F5FF0.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6010.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6030.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6050.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6070.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6090.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F60B0.gbapal")
 };
 
 static const u16 sChampionRoomLightingPalettes[][16] = {
-    INCBIN_U16("data/field_specials/unk_83F60D0.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F60F0.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6110.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6130.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6150.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6170.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6190.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F61B0.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F61D0.gbapal")
+    INCBIN_U16("graphics/field_specials/unk_83F60D0.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F60F0.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6110.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6130.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6150.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6170.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6190.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F61B0.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F61D0.gbapal")
 };
 
 static const u8 sEliteFourLightingTimers[] = {
@@ -2317,17 +2317,17 @@ void CutMoveOpenDottedHoleDoor(void)
 }
 
 static const u16 sDeoxysObjectPals[][16] = {
-    INCBIN_U16("data/field_specials/unk_83F6206.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6226.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6246.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6266.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6286.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F62A6.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F62C6.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F62E6.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6306.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6326.gbapal"),
-    INCBIN_U16("data/field_specials/unk_83F6346.gbapal")
+    INCBIN_U16("graphics/field_specials/unk_83F6206.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6226.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6246.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6266.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6286.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F62A6.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F62C6.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F62E6.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6306.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6326.gbapal"),
+    INCBIN_U16("graphics/field_specials/unk_83F6346.gbapal")
 };
 
 static const u8 sDeoxysCoords[][2] = {
diff --git a/src/graphics.c b/src/graphics.c
index 01539c0fa..7eee42bf0 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1265,10 +1265,10 @@ const u16 gUnknown_8E9E9DC[] = INCBIN_U16("graphics/unused/unused_DDCEE4.bin");
 const u16 gUnknown_8E9E9FC[] = INCBIN_U16("graphics/trade/unknown_DDCF04.bin");
 const u16 gTradeMenuMonBox_Tilemap[] = INCBIN_U16("graphics/trade/menu_mon_box.bin");
 
-const u16 gFameCheckerBgPals[] = INCBIN_U16("data/graphics/fame_checker_bg.gbapal");
-const u16 gFameCheckerBgTiles[] = INCBIN_U16("data/graphics/fame_checker_bg.4bpp");
-const u16 gFameCheckerBg3Tilemap[] = INCBIN_U16("data/graphics/fame_checker_tilemap3.bin");
-const u16 gFameCheckerBg2Tilemap[] = INCBIN_U16("data/graphics/fame_checker_tilemap2.bin");
+const u16 gFameCheckerBgPals[] = INCBIN_U16("graphics/fame_checker/bg.gbapal");
+const u16 gFameCheckerBgTiles[] = INCBIN_U16("graphics/fame_checker/bg.4bpp");
+const u16 gFameCheckerBg3Tilemap[] = INCBIN_U16("graphics/fame_checker/tilemap3.bin");
+const u16 gFameCheckerBg2Tilemap[] = INCBIN_U16("graphics/fame_checker/tilemap2.bin");
 
 const u16 gLinkMiscMenu_Pal[] = INCBIN_U16("graphics/interface/union_room_chat.gbapal");
 const u32 gLinkMiscMenu_Gfx[] = INCBIN_U32("graphics/interface/union_room_chat.4bpp.lz");
diff --git a/src/help_message.c b/src/help_message.c
index ff85d1f82..630e32ecd 100644
--- a/src/help_message.c
+++ b/src/help_message.c
@@ -4,7 +4,7 @@
 
 static EWRAM_DATA u8 sHelpMessageWindowId = 0;
 
-const u16 gUnknown_84566A8[] = INCBIN_U16("data/graphics/unknown_84566a8.bin");
+const u16 gUnknown_84566A8[] = INCBIN_U16("graphics/unknown/unknown_84566a8.bin");
 
 static const struct WindowTemplate sHelpMessageWindowTemplate = {
     .bg = 0,
diff --git a/src/itemfinder.c b/src/itemfinder.c
index 51a670b0f..19d58b471 100644
--- a/src/itemfinder.c
+++ b/src/itemfinder.c
@@ -36,7 +36,7 @@ static void SpriteCallback_DestroyStar(struct Sprite * sprite);
 
 #define ARROW_TILE_TAG 2000
 
-static const u16 sArrowAndStarSpriteTiles[] = INCBIN_U16("data/itemfinder/spr_tiles.4bpp");
+static const u16 sArrowAndStarSpriteTiles[] = INCBIN_U16("graphics/itemfinder/spr_tiles.4bpp");
 
 static const union AnimCmd sArrowAnim0[] = {
     ANIMCMD_FRAME( 0, 10),
diff --git a/src/main_menu.c b/src/main_menu.c
index 542bcf8ea..899119654 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -127,8 +127,8 @@ static const struct WindowTemplate sWindowTemplate[] = {
     [MAIN_MENU_WINDOW_COUNT] = DUMMY_WIN_TEMPLATE
 };
 
-static const u16 sBgPal00[] = INCBIN_U16("data/main_menu/unk_8234648.gbapal");
-static const u16 sBgPal15[] = INCBIN_U16("data/main_menu/unk_8234668.gbapal");
+static const u16 sBgPal00[] = INCBIN_U16("graphics/main_menu/unk_8234648.gbapal");
+static const u16 sBgPal15[] = INCBIN_U16("graphics/main_menu/unk_8234668.gbapal");
 
 static const u8 sTextColor1[] = { 10, 11, 12 };
 
diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c
index 5e6cc38da..6418a3139 100644
--- a/src/map_preview_screen.c
+++ b/src/map_preview_screen.c
@@ -21,294 +21,294 @@ static EWRAM_DATA bool8 sAllocedBg0TilemapBuffer = FALSE;
 
 static void Task_RunMapPreviewScreenForest(u8 taskId);
 
-static const u8 gViridianForestMapPreviewPalette[] = INCBIN_U8("data/map_preview/viridian_forest_pal.gbapal");
-static const u8 gViridianForestMapPreviewTiles[] = INCBIN_U8("data/map_preview/viridian_forest_tiles.4bpp.lz");
-static const u8 gViridianForestMapPreviewTilemap[] = INCBIN_U8("data/map_preview/viridian_forest_tilemap.bin");
-static const u8 gRockTunnelMapPreviewPalette[] = INCBIN_U8("data/map_preview/rock_tunnel_pal.gbapal");
-static const u8 gRockTunnelMapPreviewTiles[] = INCBIN_U8("data/map_preview/rock_tunnel_tiles.4bpp.lz");
-static const u8 gRockTunnelMapPreviewTilemap[] = INCBIN_U8("data/map_preview/rock_tunnel_tilemap.bin");
-static const u8 gRocketHideoutMapPreviewPalette[] = INCBIN_U8("data/map_preview/rocket_hideout_pal.gbapal");
-static const u8 gRocketHideoutMapPreviewTiles[] = INCBIN_U8("data/map_preview/rocket_hideout_tiles.4bpp.lz");
-static const u8 gRocketHideoutMapPreviewTilemap[] = INCBIN_U8("data/map_preview/rocket_hideout_tilemap.bin");
-static const u8 gPowerPlantMapPreviewPalette[] = INCBIN_U8("data/map_preview/power_plant_pal.gbapal");
-static const u8 gPowerPlantMapPreviewTiles[] = INCBIN_U8("data/map_preview/power_plant_tiles.4bpp.lz");
-static const u8 gPowerPlantMapPreviewTilemap[] = INCBIN_U8("data/map_preview/power_plant_tilemap.bin");
-static const u8 gPokemonMansionMapPreviewPalette[] = INCBIN_U8("data/map_preview/pokemon_mansion_pal.gbapal");
-static const u8 gPokemonMansionMapPreviewTiles[] = INCBIN_U8("data/map_preview/pokemon_mansion_tiles.4bpp.lz");
-static const u8 gPokemonMansionMapPreviewTilemap[] = INCBIN_U8("data/map_preview/pokemon_mansion_tilemap.bin");
-static const u8 gPokemonTowerMapPreviewPalette[] = INCBIN_U8("data/map_preview/pokemon_tower_pal.gbapal");
-static const u8 gPokemonTowerMapPreviewTiles[] = INCBIN_U8("data/map_preview/pokemon_tower_tiles.4bpp.lz");
-static const u8 gPokemonTowerMapPreviewTilemap[] = INCBIN_U8("data/map_preview/pokemon_tower_tilemap.bin");
-static const u8 gSilphCoMapPreviewPalette[] = INCBIN_U8("data/map_preview/silph_co_pal.gbapal");
-static const u8 gSilphCoMapPreviewTiles[] = INCBIN_U8("data/map_preview/silph_co_tiles.4bpp.lz");
-static const u8 gSilphCoMapPreviewTilemap[] = INCBIN_U8("data/map_preview/silph_co_tilemap.bin");
-static const u8 gMtMoonMapPreviewPalette[] = INCBIN_U8("data/map_preview/mt_moon_pal.gbapal");
-static const u8 gMtMoonMapPreviewTiles[] = INCBIN_U8("data/map_preview/mt_moon_tiles.4bpp.lz");
-static const u8 gMtMoonMapPreviewTilemap[] = INCBIN_U8("data/map_preview/mt_moon_tilemap.bin");
-static const u8 gSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("data/map_preview/seafoam_islands_pal.gbapal");
-static const u8 gSeafoamIslandsMapPreviewTiles[] = INCBIN_U8("data/map_preview/seafoam_islands_tiles.4bpp.lz");
-static const u8 gSeafoamIslandsMapPreviewTilemap[] = INCBIN_U8("data/map_preview/seafoam_islands_tilemap.bin");
-static const u8 gRocketWarehouseMapPreviewPalette[] = INCBIN_U8("data/map_preview/rocket_warehouse_pal.gbapal");
-static const u8 gRocketWarehouseMapPreviewTiles[] = INCBIN_U8("data/map_preview/rocket_warehouse_tiles.4bpp.lz");
-static const u8 gRocketWarehouseMapPreviewTilemap[] = INCBIN_U8("data/map_preview/rocket_warehouse_tilemap.bin");
-static const u8 gKantoVictoryRoadMapPreviewPalette[] = INCBIN_U8("data/map_preview/kanto_victory_road_pal.gbapal");
-static const u8 gKantoVictoryRoadMapPreviewTiles[] = INCBIN_U8("data/map_preview/kanto_victory_road_tiles.4bpp.lz");
-static const u8 gKantoVictoryRoadMapPreviewTilemap[] = INCBIN_U8("data/map_preview/kanto_victory_road_tilemap.bin");
-static const u8 gMtEmberMapPreviewPalette[] = INCBIN_U8("data/map_preview/mt_ember_pal.gbapal");
-static const u8 gMtEmberMapPreviewTiles[] = INCBIN_U8("data/map_preview/mt_ember_tiles.4bpp.lz");
-static const u8 gMtEmberMapPreviewTilemap[] = INCBIN_U8("data/map_preview/mt_ember_tilemap.bin");
-static const u8 gKantoSafariZoneMapPreviewPalette[] = INCBIN_U8("data/map_preview/kanto_safari_zone_pal.gbapal");
-static const u8 gKantoSafariZoneMapPreviewTiles[] = INCBIN_U8("data/map_preview/kanto_safari_zone_tiles.4bpp.lz");
-static const u8 gKantoSafariZoneMapPreviewTilemap[] = INCBIN_U8("data/map_preview/kanto_safari_zone_tilemap.bin");
-static const u8 gMoneanChamberMapPreviewPalette[] = INCBIN_U8("data/map_preview/monean_chamber_pal.gbapal");
-static const u8 gMoneanChamberMapPreviewTiles[] = INCBIN_U8("data/map_preview/monean_chamber_tiles.4bpp.lz");
-static const u8 gMoneanChamberMapPreviewTilemap[] = INCBIN_U8("data/map_preview/monean_chamber_tilemap.bin");
-static const u8 gDottedHoleMapPreviewPalette[] = INCBIN_U8("data/map_preview/dotted_hole_pal.gbapal");
-static const u8 gDottedHoleMapPreviewTiles[] = INCBIN_U8("data/map_preview/dotted_hole_tiles.4bpp.lz");
-static const u8 gDottedHoleMapPreviewTilemap[] = INCBIN_U8("data/map_preview/dotted_hole_tilemap.bin");
-static const u8 gCeruleanCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/cerulean_cave_pal.gbapal");
-static const u8 gCeruleanCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/cerulean_cave_tiles.4bpp.lz");
-static const u8 gCeruleanCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/cerulean_cave_tilemap.bin");
-static const u8 gDiglettsCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/digletts_cave_pal.gbapal");
-static const u8 gDiglettsCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/digletts_cave_tiles.4bpp.lz");
-static const u8 gDiglettsCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/digletts_cave_tilemap.bin");
-static const u8 gLostCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/lost_cave_pal.gbapal");
-static const u8 gLostCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/lost_cave_tiles.4bpp.lz");
-static const u8 gLostCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/lost_cave_tilemap.bin");
-static const u8 gBerryForestMapPreviewPalette[] = INCBIN_U8("data/map_preview/berry_forest_pal.gbapal");
-static const u8 gBerryForestMapPreviewTiles[] = INCBIN_U8("data/map_preview/berry_forest_tiles.4bpp.lz");
-static const u8 gBerryForestMapPreviewTilemap[] = INCBIN_U8("data/map_preview/berry_forest_tilemap.bin");
-static const u8 gIcefallCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/icefall_cave_pal.gbapal");
-static const u8 gIcefallCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/icefall_cave_tiles.4bpp.lz");
-static const u8 gIcefallCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/icefall_cave_tilemap.bin");
-static const u8 gAlteringCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/altering_cave_pal.gbapal");
-static const u8 gAlteringCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/altering_cave_tiles.4bpp.lz");
-static const u8 gAlteringCaveMapPreviewTilemap[] = INCBIN_U8("data/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");
+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 struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
     [MPS_VIRIDIAN_FOREST] = {
         .mapsec = MAPSEC_VIRIDIAN_FOREST,
         .type = MPS_TYPE_FOREST,
         .flagId = FLAG_WORLD_MAP_VIRIDIAN_FOREST,
-        .tilesptr = gViridianForestMapPreviewTiles,
-        .tilemapptr = gViridianForestMapPreviewTilemap,
-        .palptr = gViridianForestMapPreviewPalette
+        .tilesptr = sViridianForestMapPreviewTiles,
+        .tilemapptr = sViridianForestMapPreviewTilemap,
+        .palptr = sViridianForestMapPreviewPalette
     },
     [MPS_MT_MOON] = {
         .mapsec = MAPSEC_MT_MOON,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_MT_MOON_1F,
-        .tilesptr = gMtMoonMapPreviewTiles,
-        .tilemapptr = gMtMoonMapPreviewTilemap,
-        .palptr = gMtMoonMapPreviewPalette
+        .tilesptr = sMtMoonMapPreviewTiles,
+        .tilemapptr = sMtMoonMapPreviewTilemap,
+        .palptr = sMtMoonMapPreviewPalette
     },
     [MPS_DIGLETTS_CAVE] = {
         .mapsec = MAPSEC_DIGLETTS_CAVE,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F,
-        .tilesptr = gDiglettsCaveMapPreviewTiles,
-        .tilemapptr = gDiglettsCaveMapPreviewTilemap,
-        .palptr = gDiglettsCaveMapPreviewPalette
+        .tilesptr = sDiglettsCaveMapPreviewTiles,
+        .tilemapptr = sDiglettsCaveMapPreviewTilemap,
+        .palptr = sDiglettsCaveMapPreviewPalette
     },
     [MPS_ROCK_TUNNEL] = {
         .mapsec = MAPSEC_ROCK_TUNNEL,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_ROCK_TUNNEL_1F,
-        .tilesptr = gRockTunnelMapPreviewTiles,
-        .tilemapptr = gRockTunnelMapPreviewTilemap,
-        .palptr = gRockTunnelMapPreviewPalette
+        .tilesptr = sRockTunnelMapPreviewTiles,
+        .tilemapptr = sRockTunnelMapPreviewTilemap,
+        .palptr = sRockTunnelMapPreviewPalette
     },
     [MPS_POKEMON_TOWER] = {
         .mapsec = MAPSEC_POKEMON_TOWER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_POKEMON_TOWER_1F,
-        .tilesptr = gPokemonTowerMapPreviewTiles,
-        .tilemapptr = gPokemonTowerMapPreviewTilemap,
-        .palptr = gPokemonTowerMapPreviewPalette
+        .tilesptr = sPokemonTowerMapPreviewTiles,
+        .tilemapptr = sPokemonTowerMapPreviewTilemap,
+        .palptr = sPokemonTowerMapPreviewPalette
     },
     [MPS_SAFARI_ZONE] = {
         .mapsec = MAPSEC_KANTO_SAFARI_ZONE,
         .type = MPS_TYPE_FOREST,
         .flagId = FLAG_WORLD_MAP_SAFARI_ZONE_CENTER,
-        .tilesptr = gKantoSafariZoneMapPreviewTiles,
-        .tilemapptr = gKantoSafariZoneMapPreviewTilemap,
-        .palptr = gKantoSafariZoneMapPreviewPalette
+        .tilesptr = sKantoSafariZoneMapPreviewTiles,
+        .tilemapptr = sKantoSafariZoneMapPreviewTilemap,
+        .palptr = sKantoSafariZoneMapPreviewPalette
     },
     [MPS_SEAFOAM_ISLANDS] = {
         .mapsec = MAPSEC_SEAFOAM_ISLANDS,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F,
-        .tilesptr = gSeafoamIslandsMapPreviewTiles,
-        .tilemapptr = gSeafoamIslandsMapPreviewTilemap,
-        .palptr = gSeafoamIslandsMapPreviewPalette
+        .tilesptr = sSeafoamIslandsMapPreviewTiles,
+        .tilemapptr = sSeafoamIslandsMapPreviewTilemap,
+        .palptr = sSeafoamIslandsMapPreviewPalette
     },
     [MPS_POKEMON_MANSION] = {
         .mapsec = MAPSEC_POKEMON_MANSION,
         .type = MPS_TYPE_FOREST,
         .flagId = FLAG_WORLD_MAP_POKEMON_MANSION_1F,
-        .tilesptr = gPokemonMansionMapPreviewTiles,
-        .tilemapptr = gPokemonMansionMapPreviewTilemap,
-        .palptr = gPokemonMansionMapPreviewPalette
+        .tilesptr = sPokemonMansionMapPreviewTiles,
+        .tilemapptr = sPokemonMansionMapPreviewTilemap,
+        .palptr = sPokemonMansionMapPreviewPalette
     },
     [MPS_ROCKET_HIDEOUT] = {
         .mapsec = MAPSEC_ROCKET_HIDEOUT,
         .type = MPS_TYPE_FOREST,
         .flagId = FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F,
-        .tilesptr = gRocketHideoutMapPreviewTiles,
-        .tilemapptr = gRocketHideoutMapPreviewTilemap,
-        .palptr = gRocketHideoutMapPreviewPalette
+        .tilesptr = sRocketHideoutMapPreviewTiles,
+        .tilemapptr = sRocketHideoutMapPreviewTilemap,
+        .palptr = sRocketHideoutMapPreviewPalette
     },
     [MPS_SILPH_CO] = {
         .mapsec = MAPSEC_SILPH_CO,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SILPH_CO_1F,
-        .tilesptr = gSilphCoMapPreviewTiles,
-        .tilemapptr = gSilphCoMapPreviewTilemap,
-        .palptr = gSilphCoMapPreviewPalette
+        .tilesptr = sSilphCoMapPreviewTiles,
+        .tilemapptr = sSilphCoMapPreviewTilemap,
+        .palptr = sSilphCoMapPreviewPalette
     },
     [MPS_VICTORY_ROAD] = {
         .mapsec = MAPSEC_KANTO_VICTORY_ROAD,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_VICTORY_ROAD_1F,
-        .tilesptr = gKantoVictoryRoadMapPreviewTiles,
-        .tilemapptr = gKantoVictoryRoadMapPreviewTilemap,
-        .palptr = gKantoVictoryRoadMapPreviewPalette
+        .tilesptr = sKantoVictoryRoadMapPreviewTiles,
+        .tilemapptr = sKantoVictoryRoadMapPreviewTilemap,
+        .palptr = sKantoVictoryRoadMapPreviewPalette
     },
     [MPS_CERULEAN_CAVE] = {
         .mapsec = MAPSEC_CERULEAN_CAVE,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_CERULEAN_CAVE_1F,
-        .tilesptr = gCeruleanCaveMapPreviewTiles,
-        .tilemapptr = gCeruleanCaveMapPreviewTilemap,
-        .palptr = gCeruleanCaveMapPreviewPalette
+        .tilesptr = sCeruleanCaveMapPreviewTiles,
+        .tilemapptr = sCeruleanCaveMapPreviewTilemap,
+        .palptr = sCeruleanCaveMapPreviewPalette
     },
     [MPS_POWER_PLANT] = {
         .mapsec = MAPSEC_POWER_PLANT,
         .type = MPS_TYPE_FOREST,
         .flagId = FLAG_WORLD_MAP_POWER_PLANT,
-        .tilesptr = gPowerPlantMapPreviewTiles,
-        .tilemapptr = gPowerPlantMapPreviewTilemap,
-        .palptr = gPowerPlantMapPreviewPalette
+        .tilesptr = sPowerPlantMapPreviewTiles,
+        .tilemapptr = sPowerPlantMapPreviewTilemap,
+        .palptr = sPowerPlantMapPreviewPalette
     },
     [MPS_MT_EMBER] = {
         .mapsec = MAPSEC_MT_EMBER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_MT_EMBER_EXTERIOR,
-        .tilesptr = gMtEmberMapPreviewTiles,
-        .tilemapptr = gMtEmberMapPreviewTilemap,
-        .palptr = gMtEmberMapPreviewPalette
+        .tilesptr = sMtEmberMapPreviewTiles,
+        .tilemapptr = sMtEmberMapPreviewTilemap,
+        .palptr = sMtEmberMapPreviewPalette
     },
     [MPS_ROCKET_WAREHOUSE] = {
         .mapsec = MAPSEC_ROCKET_WAREHOUSE,
         .type = MPS_TYPE_FOREST,
         .flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST,
-        .tilesptr = gRocketWarehouseMapPreviewTiles,
-        .tilemapptr = gRocketWarehouseMapPreviewTilemap,
-        .palptr = gRocketWarehouseMapPreviewPalette
+        .tilesptr = sRocketWarehouseMapPreviewTiles,
+        .tilemapptr = sRocketWarehouseMapPreviewTilemap,
+        .palptr = sRocketWarehouseMapPreviewPalette
     },
     [MPS_MONEAN_CHAMBER] = {
         .mapsec = MAPSEC_MONEAN_CHAMBER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
-        .tilesptr = gMoneanChamberMapPreviewTiles,
-        .tilemapptr = gMoneanChamberMapPreviewTilemap,
-        .palptr = gMoneanChamberMapPreviewPalette
+        .tilesptr = sMoneanChamberMapPreviewTiles,
+        .tilemapptr = sMoneanChamberMapPreviewTilemap,
+        .palptr = sMoneanChamberMapPreviewPalette
     },
     [MPS_DOTTED_HOLE] = {
         .mapsec = MAPSEC_DOTTED_HOLE,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F,
-        .tilesptr = gDottedHoleMapPreviewTiles,
-        .tilemapptr = gDottedHoleMapPreviewTilemap,
-        .palptr = gDottedHoleMapPreviewPalette
+        .tilesptr = sDottedHoleMapPreviewTiles,
+        .tilemapptr = sDottedHoleMapPreviewTilemap,
+        .palptr = sDottedHoleMapPreviewPalette
     },
     [MPS_BERRY_FOREST] = {
         .mapsec = MAPSEC_BERRY_FOREST,
         .type = MPS_TYPE_FOREST,
         .flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST,
-        .tilesptr = gBerryForestMapPreviewTiles,
-        .tilemapptr = gBerryForestMapPreviewTilemap,
-        .palptr = gBerryForestMapPreviewPalette
+        .tilesptr = sBerryForestMapPreviewTiles,
+        .tilemapptr = sBerryForestMapPreviewTilemap,
+        .palptr = sBerryForestMapPreviewPalette
     },
     [MPS_ICEFALL_CAVE] = {
         .mapsec = MAPSEC_ICEFALL_CAVE,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE,
-        .tilesptr = gIcefallCaveMapPreviewTiles,
-        .tilemapptr = gIcefallCaveMapPreviewTilemap,
-        .palptr = gIcefallCaveMapPreviewPalette
+        .tilesptr = sIcefallCaveMapPreviewTiles,
+        .tilemapptr = sIcefallCaveMapPreviewTilemap,
+        .palptr = sIcefallCaveMapPreviewPalette
     },
     [MPS_LOST_CAVE] = {
         .mapsec = MAPSEC_LOST_CAVE,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE,
-        .tilesptr = gLostCaveMapPreviewTiles,
-        .tilemapptr = gLostCaveMapPreviewTilemap,
-        .palptr = gLostCaveMapPreviewPalette
+        .tilesptr = sLostCaveMapPreviewTiles,
+        .tilemapptr = sLostCaveMapPreviewTilemap,
+        .palptr = sLostCaveMapPreviewPalette
     },
     [MPS_ALTERING_CAVE] = {
         .mapsec = MAPSEC_ALTERING_CAVE,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE,
-        .tilesptr = gAlteringCaveMapPreviewTiles,
-        .tilemapptr = gAlteringCaveMapPreviewTilemap,
-        .palptr = gAlteringCaveMapPreviewPalette
+        .tilesptr = sAlteringCaveMapPreviewTiles,
+        .tilemapptr = sAlteringCaveMapPreviewTilemap,
+        .palptr = sAlteringCaveMapPreviewPalette
     },
     [MPS_PATTERN_BUSH] = {
         .mapsec = MAPSEC_PATTERN_BUSH,
         .type = MPS_TYPE_FOREST,
         .flagId = FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH,
-        .tilesptr = gViridianForestMapPreviewTiles,
-        .tilemapptr = gViridianForestMapPreviewTilemap,
-        .palptr = gViridianForestMapPreviewPalette
+        .tilesptr = sViridianForestMapPreviewTiles,
+        .tilemapptr = sViridianForestMapPreviewTilemap,
+        .palptr = sViridianForestMapPreviewPalette
     },
     [MPS_LIPTOO_CHAMBER] = {
         .mapsec = MAPSEC_LIPTOO_CHAMBER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
-        .tilesptr = gMoneanChamberMapPreviewTiles,
-        .tilemapptr = gMoneanChamberMapPreviewTilemap,
-        .palptr = gMoneanChamberMapPreviewPalette
+        .tilesptr = sMoneanChamberMapPreviewTiles,
+        .tilemapptr = sMoneanChamberMapPreviewTilemap,
+        .palptr = sMoneanChamberMapPreviewPalette
     },
     [MPS_WEEPTH_CHAMBER] = {
         .mapsec = MAPSEC_WEEPTH_CHAMBER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
-        .tilesptr = gMoneanChamberMapPreviewTiles,
-        .tilemapptr = gMoneanChamberMapPreviewTilemap,
-        .palptr = gMoneanChamberMapPreviewPalette
+        .tilesptr = sMoneanChamberMapPreviewTiles,
+        .tilemapptr = sMoneanChamberMapPreviewTilemap,
+        .palptr = sMoneanChamberMapPreviewPalette
     },
     [MPS_TDILFORD_CHAMBER] = {
         .mapsec = MAPSEC_DILFORD_CHAMBER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
-        .tilesptr = gMoneanChamberMapPreviewTiles,
-        .tilemapptr = gMoneanChamberMapPreviewTilemap,
-        .palptr = gMoneanChamberMapPreviewPalette
+        .tilesptr = sMoneanChamberMapPreviewTiles,
+        .tilemapptr = sMoneanChamberMapPreviewTilemap,
+        .palptr = sMoneanChamberMapPreviewPalette
     },
     [MPS_SCUFIB_CHAMBER] = {
         .mapsec = MAPSEC_SCUFIB_CHAMBER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
-        .tilesptr = gMoneanChamberMapPreviewTiles,
-        .tilemapptr = gMoneanChamberMapPreviewTilemap,
-        .palptr = gMoneanChamberMapPreviewPalette
+        .tilesptr = sMoneanChamberMapPreviewTiles,
+        .tilemapptr = sMoneanChamberMapPreviewTilemap,
+        .palptr = sMoneanChamberMapPreviewPalette
     },
     [MPS_RIXY_CHAMBER] = {
         .mapsec = MAPSEC_RIXY_CHAMBER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
-        .tilesptr = gMoneanChamberMapPreviewTiles,
-        .tilemapptr = gMoneanChamberMapPreviewTilemap,
-        .palptr = gMoneanChamberMapPreviewPalette
+        .tilesptr = sMoneanChamberMapPreviewTiles,
+        .tilemapptr = sMoneanChamberMapPreviewTilemap,
+        .palptr = sMoneanChamberMapPreviewPalette
     },
     [MPS_VIAPOIS_CHAMBER] = {
         .mapsec = MAPSEC_VIAPOIS_CHAMBER,
         .type = MPS_TYPE_CAVE,
         .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
-        .tilesptr = gMoneanChamberMapPreviewTiles,
-        .tilemapptr = gMoneanChamberMapPreviewTilemap,
-        .palptr = gMoneanChamberMapPreviewPalette
+        .tilesptr = sMoneanChamberMapPreviewTiles,
+        .tilemapptr = sMoneanChamberMapPreviewTilemap,
+        .palptr = sMoneanChamberMapPreviewPalette
     }
 };
 
diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c
index d2df613ae..5f92a36bf 100644
--- a/src/mevent_show_card.c
+++ b/src/mevent_show_card.c
@@ -80,47 +80,47 @@ static const struct WindowTemplate sWindowTemplates[] = {
         .baseBlock = 0x130}
 };
 
-static const u16 gCard0Pal[] = INCBIN_U16("data/graphics/mevent/pal_46708C.gbapal");
-const u16 gCard1Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670AC.gbapal");
-const u16 gCard2Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670CC.gbapal");
-const u16 gCard3Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670EC.gbapal");
-const u16 gCard4Pal[] = INCBIN_U16("data/graphics/mevent/pal_46710C.gbapal");
-const u16 gCard5Pal[] = INCBIN_U16("data/graphics/mevent/pal_46712C.gbapal");
-static const u16 gCard6Pal[] = INCBIN_U16("data/graphics/mevent/pal_46714C.gbapal");
-static const u16 gCard7Pal[] = INCBIN_U16("data/graphics/mevent/pal_46716C.gbapal");
-static const u8 sCard0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46718C.4bpp.lz");
-static const u8 sCard0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467288.bin.lz");
-static const u8 sCard1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46737C.4bpp.lz");
-static const u8 sCard1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467470.bin.lz");
-static const u8 sCard2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467558.4bpp.lz");
-static const u8 sCard2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46762C.bin.lz");
-static const u8 sCard6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467700.4bpp.lz");
-static const u8 sCard6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467934.bin.lz");
-static const u8 sCard7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467A7C.4bpp.lz");
-static const u8 sCard7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467CAC.bin.lz");
-static const u16 gUnknown_8467DF4[] = INCBIN_U16("data/graphics/mevent/pal_467DF4.gbapal");
-static const u16 gUnknown_8467E14[] = INCBIN_U16("data/graphics/mevent/pal_467E14.gbapal");
-static const u16 gUnknown_8467E34[] = INCBIN_U16("data/graphics/mevent/pal_467E34.gbapal");
-static const u16 gUnknown_8467E54[] = INCBIN_U16("data/graphics/mevent/pal_467E54.gbapal");
-static const u16 gUnknown_8467E74[] = INCBIN_U16("data/graphics/mevent/pal_467E74.gbapal");
-static const u16 gUnknown_8467E94[] = INCBIN_U16("data/graphics/mevent/pal_467E94.gbapal");
-static const u16 gUnknown_8467EB4[] = INCBIN_U16("data/graphics/mevent/pal_467EB4.gbapal");
-static const u16 gUnknown_8467ED4[] = INCBIN_U16("data/graphics/mevent/pal_467ED4.gbapal");
-static const u32 gUnknown_8467EF4[] = INCBIN_U32("data/graphics/mevent/gfx_467EF4.4bpp.lz");
+static const u16 sCard0Pal[] = INCBIN_U16("graphics/mevent/pal_46708C.gbapal");
+const u16 gCard1Pal[] = INCBIN_U16("graphics/mevent/pal_4670AC.gbapal");
+const u16 gCard2Pal[] = INCBIN_U16("graphics/mevent/pal_4670CC.gbapal");
+const u16 gCard3Pal[] = INCBIN_U16("graphics/mevent/pal_4670EC.gbapal");
+const u16 gCard4Pal[] = INCBIN_U16("graphics/mevent/pal_46710C.gbapal");
+const u16 gCard5Pal[] = INCBIN_U16("graphics/mevent/pal_46712C.gbapal");
+static const u16 sCard6Pal[] = INCBIN_U16("graphics/mevent/pal_46714C.gbapal");
+static const u16 sCard7Pal[] = INCBIN_U16("graphics/mevent/pal_46716C.gbapal");
+static const u8 sCard0Gfx[] = INCBIN_U8("graphics/mevent/gfx_46718C.4bpp.lz");
+static const u8 sCard0Map[] = INCBIN_U8("graphics/mevent/tilemap_467288.bin.lz");
+static const u8 sCard1Gfx[] = INCBIN_U8("graphics/mevent/gfx_46737C.4bpp.lz");
+static const u8 sCard1Map[] = INCBIN_U8("graphics/mevent/tilemap_467470.bin.lz");
+static const u8 sCard2Gfx[] = INCBIN_U8("graphics/mevent/gfx_467558.4bpp.lz");
+static const u8 sCard2Map[] = INCBIN_U8("graphics/mevent/tilemap_46762C.bin.lz");
+static const u8 sCard6Gfx[] = INCBIN_U8("graphics/mevent/gfx_467700.4bpp.lz");
+static const u8 sCard6Map[] = INCBIN_U8("graphics/mevent/tilemap_467934.bin.lz");
+static const u8 sCard7Gfx[] = INCBIN_U8("graphics/mevent/gfx_467A7C.4bpp.lz");
+static const u8 sCard7Map[] = INCBIN_U8("graphics/mevent/tilemap_467CAC.bin.lz");
+static const u16 sUnknown_8467DF4[] = INCBIN_U16("graphics/mevent/pal_467DF4.gbapal");
+static const u16 sUnknown_8467E14[] = INCBIN_U16("graphics/mevent/pal_467E14.gbapal");
+static const u16 sUnknown_8467E34[] = INCBIN_U16("graphics/mevent/pal_467E34.gbapal");
+static const u16 sUnknown_8467E54[] = INCBIN_U16("graphics/mevent/pal_467E54.gbapal");
+static const u16 sUnknown_8467E74[] = INCBIN_U16("graphics/mevent/pal_467E74.gbapal");
+static const u16 sUnknown_8467E94[] = INCBIN_U16("graphics/mevent/pal_467E94.gbapal");
+static const u16 sUnknown_8467EB4[] = INCBIN_U16("graphics/mevent/pal_467EB4.gbapal");
+static const u16 sUnknown_8467ED4[] = INCBIN_U16("graphics/mevent/pal_467ED4.gbapal");
+static const u32 sUnknown_8467EF4[] = INCBIN_U32("graphics/mevent/gfx_467EF4.4bpp.lz");
 
 static const struct CompressedSpriteSheet sShadowSpriteSheet = {
-    gUnknown_8467EF4, 0x100, 0x8000
+    sUnknown_8467EF4, 0x100, 0x8000
 };
 
 static const struct SpritePalette sShadowSpritePalettes[] = {
-    {gUnknown_8467DF4, 0x8000},
-    {gUnknown_8467E14, 0x8000},
-    {gUnknown_8467E34, 0x8000},
-    {gUnknown_8467E54, 0x8000},
-    {gUnknown_8467E74, 0x8000},
-    {gUnknown_8467E94, 0x8000},
-    {gUnknown_8467EB4, 0x8000},
-    {gUnknown_8467ED4, 0x8000}
+    {sUnknown_8467DF4, 0x8000},
+    {sUnknown_8467E14, 0x8000},
+    {sUnknown_8467E34, 0x8000},
+    {sUnknown_8467E54, 0x8000},
+    {sUnknown_8467E74, 0x8000},
+    {sUnknown_8467E94, 0x8000},
+    {sUnknown_8467EB4, 0x8000},
+    {sUnknown_8467ED4, 0x8000}
 };
 
 static const struct SpriteTemplate sShadowSpriteTemplate = {
@@ -128,14 +128,14 @@ static const struct SpriteTemplate sShadowSpriteTemplate = {
 };
 
 static const struct UnkStruct_8467FB8 sCardGfxPtrs[8] = {
-    {1, 0, 0, 0, sCard0Gfx, sCard0Map, gCard0Pal},
+    {1, 0, 0, 0, sCard0Gfx, sCard0Map, sCard0Pal},
     {1, 0, 0, 1, sCard1Gfx, sCard1Map, gCard1Pal},
     {1, 0, 0, 2, sCard2Gfx, sCard2Map, gCard2Pal},
     {1, 0, 0, 3, sCard2Gfx, sCard2Map, gCard3Pal},
     {1, 0, 0, 4, sCard2Gfx, sCard2Map, gCard4Pal},
     {1, 0, 0, 5, sCard2Gfx, sCard2Map, gCard5Pal},
-    {1, 0, 0, 6, sCard6Gfx, sCard6Map, gCard6Pal},
-    {1, 0, 0, 7, sCard7Gfx, sCard7Map, gCard7Pal}
+    {1, 0, 0, 6, sCard6Gfx, sCard6Map, sCard6Pal},
+    {1, 0, 0, 7, sCard7Gfx, sCard7Map, sCard7Pal}
 };
 
 bool32 InitWonderCardResources(struct MEWonderCardData * card, struct MEventBuffer_3430_Sub * b3430sub)
diff --git a/src/mevent_show_news.c b/src/mevent_show_news.c
index 44b19b130..029a6ca99 100644
--- a/src/mevent_show_news.c
+++ b/src/mevent_show_news.c
@@ -47,19 +47,19 @@ static const struct ScrollArrowsTemplate sScrollArrowsTemplate = {
     0x0000, 0x0002, 0x1000, 0x1000, 0x0,
 };
 
-static const u16 sNews1Pal[] = INCBIN_U16("data/graphics/mevent/pal_468060.gbapal");
-static const u16 sNews6Pal[] = INCBIN_U16("data/graphics/mevent/pal_468080.gbapal");
-static const u16 sNews7Pal[] = INCBIN_U16("data/graphics/mevent/pal_4680A0.gbapal");
-static const u8 sNews0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4680C0.4bpp.lz");
-static const u8 sNews0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468140.bin.lz");
-static const u8 sNews1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46821C.4bpp.lz");
-static const u8 sNews1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46824C.bin.lz");
-static const u8 sNews2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46830C.4bpp.lz");
-static const u8 sNews2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46837C.bin.lz");
-static const u8 sNews6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_468448.4bpp.lz");
-static const u8 sNews6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_4684D8.bin.lz");
-static const u8 sNews7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4685B4.4bpp.lz");
-static const u8 sNews7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468644.bin.lz");
+static const u16 sNews1Pal[] = INCBIN_U16("graphics/mevent/pal_468060.gbapal");
+static const u16 sNews6Pal[] = INCBIN_U16("graphics/mevent/pal_468080.gbapal");
+static const u16 sNews7Pal[] = INCBIN_U16("graphics/mevent/pal_4680A0.gbapal");
+static const u8 sNews0Gfx[] = INCBIN_U8("graphics/mevent/gfx_4680C0.4bpp.lz");
+static const u8 sNews0Map[] = INCBIN_U8("graphics/mevent/tilemap_468140.bin.lz");
+static const u8 sNews1Gfx[] = INCBIN_U8("graphics/mevent/gfx_46821C.4bpp.lz");
+static const u8 sNews1Map[] = INCBIN_U8("graphics/mevent/tilemap_46824C.bin.lz");
+static const u8 sNews2Gfx[] = INCBIN_U8("graphics/mevent/gfx_46830C.4bpp.lz");
+static const u8 sNews2Map[] = INCBIN_U8("graphics/mevent/tilemap_46837C.bin.lz");
+static const u8 sNews6Gfx[] = INCBIN_U8("graphics/mevent/gfx_468448.4bpp.lz");
+static const u8 sNews6Map[] = INCBIN_U8("graphics/mevent/tilemap_4684D8.bin.lz");
+static const u8 sNews7Gfx[] = INCBIN_U8("graphics/mevent/gfx_4685B4.4bpp.lz");
+static const u8 sNews7Map[] = INCBIN_U8("graphics/mevent/tilemap_468644.bin.lz");
 
 static const struct UnkStruct_8467FB8 sBgSpecs[] = {
     {1, 0, 0, 0, sNews0Gfx, sNews0Map, sNews1Pal},
diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c
index 5911676bb..81d1cb7df 100644
--- a/src/minigame_countdown.c
+++ b/src/minigame_countdown.c
@@ -211,8 +211,8 @@ static void SpriteCB_Start(struct Sprite * sprite)
     }
 }
 
-static const u16 sSpritePal_321Start[] = INCBIN_U16("data/graphics/unk_847a348.gbapal");
-static const u16 sSpriteSheet_321Start[] = INCBIN_U16("data/graphics/unk_847a348.4bpp.lz");
+static const u16 sSpritePal_321Start[] = INCBIN_U16("graphics/link_games/unk_847a348.gbapal");
+static const u16 sSpriteSheet_321Start[] = INCBIN_U16("graphics/link_games/unk_847a348.4bpp.lz");
 
 static void Load321StartGfx(u16 tilesTag, u16 palTag)
 {
diff --git a/src/oak_speech.c b/src/oak_speech.c
index 11281da30..91fe117f1 100644
--- a/src/oak_speech.c
+++ b/src/oak_speech.c
@@ -109,27 +109,27 @@ extern const u8 gText_ABUTTONNext_BBUTTONBack[];
 extern const u8 gText_Boy[];
 extern const u8 gText_Girl[];
 
-ALIGNED(4) static const u16 sHelpDocsPalette[] = INCBIN_U16("data/oak_speech/help_docs_palette.gbapal");
-static const u32 sOakSpeechGfx_GameStartHelpUI[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_game_start_help_u_i.4bpp.lz");
-static const u32 sNewGameAdventureIntroTilemap[] = INCBIN_U32("data/oak_speech/new_game_adventure_intro_tilemap.bin.lz");
-static const u32 sOakSpeechGfx_SolidColors[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_solid_colors.4bpp.lz");
-static const u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("data/oak_speech/oak_speech_background_tilemap.bin.lz");
-static const u16 sHelpDocsPage2Tilemap[] = INCBIN_U16("data/oak_speech/help_docs_page2_tilemap.bin");
-static const u16 sHelpDocsPage3Tilemap[] = INCBIN_U16("data/oak_speech/help_docs_page3_tilemap.bin");
-static const u16 sOakSpeechGfx_LeafPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_leaf_pal.gbapal");
-static const u32 sOakSpeechGfx_LeafPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_leaf_pic.8bpp.lz");
-static const u16 sOakSpeechGfx_RedPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_red_pal.gbapal");
-static const u32 sOakSpeechGfx_RedPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_red_pic.8bpp.lz");
-static const u16 sOakSpeechGfx_OakPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_oak_pal.gbapal");
-static const u32 sOakSpeechGfx_OakPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_oak_pic.8bpp.lz");
-static const u16 sOakSpeechGfx_RivalPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_rival_pal.gbapal");
-static const u32 sOakSpeechGfx_RivalPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_rival_pic.8bpp.lz");
-static const u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("data/oak_speech/oak_speech_grass_platform_palette.gbapal");
-static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("data/oak_speech/oak_speech_pika_palette.gbapal");
-static const u32 sOakSpeechGfx_GrassPlatform[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_grass_platform.4bpp.lz");
-static const u32 sOakSpeechGfx_Pika1[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika1.4bpp.lz");
-static const u32 sOakSpeechGfx_Pika2[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika2.4bpp.lz");
-static const u32 sOakSpeechGfx_PikaEyes[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika_eyes.4bpp.lz");
+ALIGNED(4) static const u16 sHelpDocsPalette[] = INCBIN_U16("graphics/oak_speech/help_docs_palette.gbapal");
+static const u32 sOakSpeechGfx_GameStartHelpUI[] = INCBIN_U32("graphics/oak_speech/game_start_help_ui.4bpp.lz");
+static const u32 sNewGameAdventureIntroTilemap[] = INCBIN_U32("graphics/oak_speech/new_game_adventure_intro_tilemap.bin.lz");
+static const u32 sOakSpeechGfx_SolidColors[] = INCBIN_U32("graphics/oak_speech/solid_colors.4bpp.lz");
+static const u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("graphics/oak_speech/background_tilemap.bin.lz");
+static const u16 sHelpDocsPage2Tilemap[] = INCBIN_U16("graphics/oak_speech/help_docs_page2_tilemap.bin");
+static const u16 sHelpDocsPage3Tilemap[] = INCBIN_U16("graphics/oak_speech/help_docs_page3_tilemap.bin");
+static const u16 sOakSpeechGfx_LeafPal[] = INCBIN_U16("graphics/oak_speech/leaf_pal.gbapal");
+static const u32 sOakSpeechGfx_LeafPic[] = INCBIN_U32("graphics/oak_speech/leaf_pic.8bpp.lz");
+static const u16 sOakSpeechGfx_RedPal[] = INCBIN_U16("graphics/oak_speech/red_pal.gbapal");
+static const u32 sOakSpeechGfx_RedPic[] = INCBIN_U32("graphics/oak_speech/red_pic.8bpp.lz");
+static const u16 sOakSpeechGfx_OakPal[] = INCBIN_U16("graphics/oak_speech/oak_pal.gbapal");
+static const u32 sOakSpeechGfx_OakPic[] = INCBIN_U32("graphics/oak_speech/oak_pic.8bpp.lz");
+static const u16 sOakSpeechGfx_RivalPal[] = INCBIN_U16("graphics/oak_speech/rival_pal.gbapal");
+static const u32 sOakSpeechGfx_RivalPic[] = INCBIN_U32("graphics/oak_speech/rival_pic.8bpp.lz");
+static const u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("graphics/oak_speech/grass_platform_palette.gbapal");
+static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("graphics/oak_speech/pika_palette.gbapal");
+static const u32 sOakSpeechGfx_GrassPlatform[] = INCBIN_U32("graphics/oak_speech/grass_platform.4bpp.lz");
+static const u32 sOakSpeechGfx_Pika1[] = INCBIN_U32("graphics/oak_speech/pika1.4bpp.lz");
+static const u32 sOakSpeechGfx_Pika2[] = INCBIN_U32("graphics/oak_speech/pika2.4bpp.lz");
+static const u32 sOakSpeechGfx_PikaEyes[] = INCBIN_U32("graphics/oak_speech/pika_eyes.4bpp.lz");
 
 static const struct BgTemplate sBgTemplates[3] = {
     {
diff --git a/src/pokedex_area_markers.c b/src/pokedex_area_markers.c
index d3c36a83e..3ff2aa496 100644
--- a/src/pokedex_area_markers.c
+++ b/src/pokedex_area_markers.c
@@ -8,8 +8,8 @@
 #include "wild_pokemon_area.h"
 #include "pokedex_area_markers.h"
 
-static const u16 sMarkerPal[] = INCBIN_U16("data/pokedex_area_markers/marker.gbapal");
-static const u32 sMarkerTiles[] = INCBIN_U32("data/pokedex_area_markers/marker.4bpp.lz");
+static const u16 sMarkerPal[] = INCBIN_U16("graphics/pokedex/area_markers/marker.gbapal");
+static const u32 sMarkerTiles[] = INCBIN_U32("graphics/pokedex/area_markers/marker.4bpp.lz");
 
 static const struct Subsprite sSubsprite0 = {
     .size = ST_OAM_SIZE_0,
diff --git a/src/quest_log.c b/src/quest_log.c
index d3991e646..1a028f19d 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -168,7 +168,7 @@ static const struct WindowTemplate sQuestLogHeaderWindowTemplates[3] = {
 
 static const u8 sTextColors[3] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_3};
 
-static const u16 gUnknown_8456638[] = INCBIN_U16("data/graphics/unknown_8456638.bin");
+static const u16 sUnknown_8456638[] = INCBIN_U16("graphics/unknown/unknown_8456638.bin");
 
 static const u8 sQuestLogTextLineYCoords[] = {17, 10, 3};
 
@@ -1016,7 +1016,7 @@ static void DrawQuestLogSceneDescription(void)
 
 static void sub_8111D90(u8 a0)
 {
-    const u16 *src = gUnknown_8456638;
+    const u16 *src = sUnknown_8456638;
     u16 *buffer = Alloc(0x1680);
     u8 i, j, y;
 
diff --git a/src/script_menu.c b/src/script_menu.c
index 94aaf528d..b2748db38 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -640,10 +640,10 @@ static const struct SpriteTemplate sMuseumFossilSprTemplate = {
     .callback = SpriteCallbackDummy
 };
 
-static const u16 sMuseumAerodactylSprTiles[] = INCBIN_U16("data/script_menu/aerodactyl_fossil.4bpp");
-static const u16 sMuseumAerodactylSprPalette[] = INCBIN_U16("data/script_menu/aerodactyl_fossil.gbapal");
-static const u16 sMuseumKabutopsSprTiles[] = INCBIN_U16("data/script_menu/kabutops_fossil.4bpp");
-static const u16 sMuseumKabutopsSprPalette[] = INCBIN_U16("data/script_menu/kabutops_fossil.gbapal");
+static const u16 sMuseumAerodactylSprTiles[] = INCBIN_U16("graphics/script_menu/aerodactyl_fossil.4bpp");
+static const u16 sMuseumAerodactylSprPalette[] = INCBIN_U16("graphics/script_menu/aerodactyl_fossil.gbapal");
+static const u16 sMuseumKabutopsSprTiles[] = INCBIN_U16("graphics/script_menu/kabutops_fossil.4bpp");
+static const u16 sMuseumKabutopsSprPalette[] = INCBIN_U16("graphics/script_menu/kabutops_fossil.gbapal");
 
 static const struct SpriteSheet sMuseumKabutopsSprSheets[] = {
     {sMuseumKabutopsSprTiles, 0x800, 7000},
diff --git a/src/seagallop.c b/src/seagallop.c
index f7405296f..11022f315 100644
--- a/src/seagallop.c
+++ b/src/seagallop.c
@@ -44,13 +44,13 @@ static void CreateWakeSprite(s16 x);
 static void SpriteCB_Wake(struct Sprite * sprite);
 static bool8 GetDirectionOfTravel(void);
 
-static const u16 sWaterTiles[] = INCBIN_U16("data/seagallop/water.4bpp");
-static const u16 sWaterPal[] = INCBIN_U16("data/seagallop/water.gbapal");
-static const u16 sWaterTilemap_WB[] = INCBIN_U16("data/seagallop/wb_tilemap.bin");
-static const u16 sWaterTilemap_EB[] = INCBIN_U16("data/seagallop/eb_tilemap.bin");
-static const u16 sFerrySpriteTiles[] = INCBIN_U16("data/seagallop/ferry_sprite.4bpp");
-static const u16 sFerryAndWakePal[] = INCBIN_U16("data/seagallop/ferry_and_wake.gbapal");
-static const u16 sWakeSpriteTiles[] = INCBIN_U16("data/seagallop/wake.4bpp");
+static const u16 sWaterTiles[] = INCBIN_U16("graphics/seagallop/water.4bpp");
+static const u16 sWaterPal[] = INCBIN_U16("graphics/seagallop/water.gbapal");
+static const u16 sWaterTilemap_WB[] = INCBIN_U16("graphics/seagallop/wb_tilemap.bin");
+static const u16 sWaterTilemap_EB[] = INCBIN_U16("graphics/seagallop/eb_tilemap.bin");
+static const u16 sFerrySpriteTiles[] = INCBIN_U16("graphics/seagallop/ferry_sprite.4bpp");
+static const u16 sFerryAndWakePal[] = INCBIN_U16("graphics/seagallop/ferry_and_wake.gbapal");
+static const u16 sWakeSpriteTiles[] = INCBIN_U16("graphics/seagallop/wake.4bpp");
 
 static const struct BgTemplate sBGTemplates[] = {
     {
diff --git a/src/text.c b/src/text.c
index 956ee9082..1a0858604 100644
--- a/src/text.c
+++ b/src/text.c
@@ -18,17 +18,17 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese);
 
 TextFlags gTextFlags;
 
-const u8 gDownArrowTiles[]         = INCBIN_U8("data/graphics/fonts/down_arrow.4bpp");
-const u8 gDarkDownArrowTiles[]     = INCBIN_U8("data/graphics/fonts/down_arrow_RS.4bpp");
-const u8 gTinyArrowTiles[]         = INCBIN_U8("data/graphics/fonts/down_arrow_2.4bpp");
-const u8 gTinyDarkDownArrowTiles[] = INCBIN_U8("data/graphics/fonts/down_arrow_RS_2.4bpp");
-const u8 gDoubleArrowTiles1[]       = INCBIN_U8("data/graphics/fonts/down_arrow_3.4bpp");
-const u8 gDoubleArrowTiles2[]       = INCBIN_U8("data/graphics/fonts/down_arrow_4.4bpp");
+static const u8 sDownArrowTiles[]         = INCBIN_U8("graphics/fonts/down_arrow.4bpp");
+static const u8 sDarkDownArrowTiles[]     = INCBIN_U8("graphics/fonts/down_arrow_RS.4bpp");
+static const u8 sTinyArrowTiles[]         = INCBIN_U8("graphics/fonts/down_arrow_2.4bpp");
+static const u8 sTinyDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS_2.4bpp");
+static const u8 sDoubleArrowTiles1[]       = INCBIN_U8("graphics/fonts/down_arrow_3.4bpp");
+static const u8 sDoubleArrowTiles2[]       = INCBIN_U8("graphics/fonts/down_arrow_4.4bpp");
 
-const u8 gDownArrowYCoords[]           = { 0x0, 0x10, 0x20, 0x10 };
-const u8 gWindowVerticalScrollSpeeds[] = { 0x1, 0x2 , 0x4 , 0x0 };
+static const u8 sDownArrowYCoords[]           = { 0x0, 0x10, 0x20, 0x10 };
+static const u8 sWindowVerticalScrollSpeeds[] = { 0x1, 0x2 , 0x4 , 0x0 };
 
-const struct GlyphWidthFunc gGlyphWidthFuncs[] = {
+static const struct GlyphWidthFunc sGlyphWidthFuncs[] = {
     { 0x0, GetGlyphWidthFont0 },
     { 0x1, GetGlyphWidthFont1 },
     { 0x2, GetGlyphWidthFont2 },
@@ -38,20 +38,20 @@ const struct GlyphWidthFunc gGlyphWidthFuncs[] = {
     { 0x6, GetGlyphWidthFont6 }
 };
 
-const struct SpriteSheet gUnknown_81EA68C[] =
+static const struct SpriteSheet sUnknown_81EA68C[] =
 {
-    {gDoubleArrowTiles1, sizeof(gDoubleArrowTiles1), 0x8000},
-    {gDoubleArrowTiles2, sizeof(gDoubleArrowTiles2), 0x8000},
+    {sDoubleArrowTiles1, sizeof(sDoubleArrowTiles1), 0x8000},
+    {sDoubleArrowTiles2, sizeof(sDoubleArrowTiles2), 0x8000},
     {NULL}
 };
 
-const struct SpritePalette gUnknown_81EA6A4[] =
+static const struct SpritePalette sUnknown_81EA6A4[] =
 {
     {gTMCaseMainWindowPalette, 0x8000},
     {NULL}
 };
 
-const struct SpriteTemplate gUnknown_81EA6B4 =
+static const struct SpriteTemplate sUnknown_81EA6B4 =
 {
     .tileTag = 0x8000,
     .paletteTag = 0x8000,
@@ -62,7 +62,7 @@ const struct SpriteTemplate gUnknown_81EA6B4 =
     .callback = sub_80062B0,
 };
 
-const struct KeypadIcon gKeypadIcons[] = {
+static const struct KeypadIcon sKeypadIcons[] = {
     {  0x0,  0x8, 0xC },
     {  0x1,  0x8, 0xC },
     {  0x2, 0x10, 0xC },
@@ -78,11 +78,11 @@ const struct KeypadIcon gKeypadIcons[] = {
     { 0x22,  0x8, 0xC },
 };
 
-const u8 gKeypadIconTiles[] = INCBIN_U8("data/graphics/fonts/keypad_icons.4bpp");
+const u8 gKeypadIconTiles[] = INCBIN_U8("graphics/fonts/keypad_icons.4bpp");
 
 // Font 0
-const u16 gFont0LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font0_latin.latfont");
-const u8 gFont0LatinGlyphWidths[] = 
+static const u16 sFont0LatinGlyphs[] = INCBIN_U16("graphics/fonts/font0_latin.latfont");
+static const u8 sFont0LatinGlyphWidths[] = 
 {
     0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x05, 0x04, 0x04, 0x05, 
     0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
@@ -122,11 +122,11 @@ const u8 gFont0LatinGlyphWidths[] =
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x05
 };
-const u16 gFont0JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font0_jap.fwjpnfont");
+static const u16 sFont0JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font0_jap.fwjpnfont");
 
 // Font 1
-const u16 gFont1LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font1_latin.latfont");
-const u8 gFont1LatinGlyphWidths[] =
+static const u16 sFont1LatinGlyphs[] = INCBIN_U16("graphics/fonts/font1_latin.latfont");
+static const u8 sFont1LatinGlyphWidths[] =
 {
     0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
     0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
@@ -166,11 +166,11 @@ const u8 gFont1LatinGlyphWidths[] =
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06
 };
-const u16 gFont1JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font1_jap.fwjpnfont");
+static const u16 sFont1JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font1_jap.fwjpnfont");
 
 // Font 2
-const u16 gFont2LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font2_latin.latfont");
-const u8 gFont2LatinGlyphWidths[] =
+static const u16 sFont2LatinGlyphs[] = INCBIN_U16("graphics/fonts/font2_latin.latfont");
+static const u8 sFont2LatinGlyphWidths[] =
 {
     0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
     0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
@@ -210,8 +210,8 @@ const u8 gFont2LatinGlyphWidths[] =
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06
 };
-const u16 gFont2JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font2_jap.fwjpnfont");
-const u8 gFont2JapaneseGlyphWidths[] =
+static const u16 sFont2JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font2_jap.fwjpnfont");
+static const u8 sFont2JapaneseGlyphWidths[] =
 {
     0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
     0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
@@ -236,8 +236,8 @@ const u8 gFont2JapaneseGlyphWidths[] =
 };
 
 // Font 4
-const u16 gFont4LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font4_latin.latfont");
-const u8 gFont4LatinGlyphWidths[] =
+static const u16 sFont4LatinGlyphs[] = INCBIN_U16("graphics/fonts/font4_latin.latfont");
+static const u8 sFont4LatinGlyphWidths[] =
 {
     0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
     0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
@@ -277,8 +277,8 @@ const u8 gFont4LatinGlyphWidths[] =
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06
 };
-const u16 gFont4JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font4_jap.fwjpnfont");
-const u8 gFont4JapaneseGlyphWidths[] = 
+static const u16 sFont4JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font4_jap.fwjpnfont");
+static const u8 sFont4JapaneseGlyphWidths[] = 
 {
     0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
     0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
@@ -303,8 +303,8 @@ const u8 gFont4JapaneseGlyphWidths[] =
 };
 
 // Font 5
-const u16 gFont5LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font5_latin.latfont");
-const u8 gFont5LatinGlyphWidths[] =
+static const u16 sFont5LatinGlyphs[] = INCBIN_U16("graphics/fonts/font5_latin.latfont");
+static const u8 sFont5LatinGlyphWidths[] =
 {
     0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
     0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
@@ -344,8 +344,8 @@ const u8 gFont5LatinGlyphWidths[] =
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06
 };
-const u16 gFont5JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font5_jap.fwjpnfont");
-const u8 gFont5JapaneseGlyphWidths[] =
+static const u16 sFont5JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font5_jap.fwjpnfont");
+static const u8 sFont5JapaneseGlyphWidths[] =
 {
     0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
     0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
@@ -370,7 +370,7 @@ const u8 gFont5JapaneseGlyphWidths[] =
 };
 
 // Font 9
-const u16 gFont9JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font9_jap.fwjpnfont");
+static const u16 sFont9JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font9_jap.fwjpnfont");
 
 u16 Font0Func(struct TextPrinter *textPrinter)
 {
@@ -482,17 +482,17 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
             {
                 case 0:
                 default:
-                    arrowTiles = gDownArrowTiles;
+                    arrowTiles = sDownArrowTiles;
                     break;
                 case 1:
-                    arrowTiles = gDarkDownArrowTiles;
+                    arrowTiles = sDarkDownArrowTiles;
                     break;
             }
 
             BlitBitmapRectToWindow(
                 textPrinter->printerTemplate.windowId,
                 arrowTiles,
-                gDownArrowYCoords[*(u32*)subStruct << 17 >> 30], // subStruct->downArrowYPosIdx but again, stupidly retrieved
+                sDownArrowYCoords[*(u32*)subStruct << 17 >> 30], // subStruct->downArrowYPosIdx but again, stupidly retrieved
                 0,
                 0x80,
                 0x10,
@@ -590,17 +590,17 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *c
             {
                 case 0:
                 default:
-                    arrowTiles = gDownArrowTiles;
+                    arrowTiles = sDownArrowTiles;
                     break;
                 case 1:
-                    arrowTiles = gDarkDownArrowTiles;
+                    arrowTiles = sDarkDownArrowTiles;
                     break;
             }
 
             BlitBitmapRectToWindow(
                 windowId,
                 arrowTiles,
-                gDownArrowYCoords[*yCoordIndex & 3],
+                sDownArrowYCoords[*yCoordIndex & 3],
                 0,
                 0x80,
                 0x10,
@@ -870,15 +870,15 @@ u16 RenderText(struct TextPrinter *textPrinter)
         if (textPrinter->scrollDistance)
         {
     
-            if (textPrinter->scrollDistance < gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed])
+            if (textPrinter->scrollDistance < sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed])
             {
                 ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PIXEL_FILL(textPrinter->printerTemplate.bgColor));
                 textPrinter->scrollDistance = 0;
             }
             else
             {
-                ScrollWindow(textPrinter->printerTemplate.windowId, 0, gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor));
-                textPrinter->scrollDistance -= gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed];
+                ScrollWindow(textPrinter->printerTemplate.windowId, 0, sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor));
+                textPrinter->scrollDistance -= sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed];
             }
             CopyWindowToVram(textPrinter->printerTemplate.windowId, 2);
         }
@@ -999,8 +999,8 @@ s32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese)
 
     for (i = 0; i < 7; ++i)
     {
-        if (glyphId == gGlyphWidthFuncs[i].fontId)
-            return *gGlyphWidthFuncs[i].func;
+        if (glyphId == sGlyphWidthFuncs[i].fontId)
+            return *sGlyphWidthFuncs[i].func;
     }
 
     return NULL;
@@ -1308,9 +1308,9 @@ void sub_80062B0(struct Sprite *sprite)
 u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority)
 {
     u8 spriteId;
-    LoadSpriteSheet(&gUnknown_81EA68C[sheetId & 1]);
-    LoadSpritePalette(gUnknown_81EA6A4);
-    spriteId = CreateSprite(&gUnknown_81EA6B4, x + 3, y + 4, subpriority);
+    LoadSpriteSheet(&sUnknown_81EA68C[sheetId & 1]);
+    LoadSpritePalette(sUnknown_81EA6A4);
+    spriteId = CreateSprite(&sUnknown_81EA6B4, x + 3, y + 4, subpriority);
     gSprites[spriteId].oam.priority = (priority & 3);
     gSprites[spriteId].oam.matrixNum = 0;
     gSprites[spriteId].data[0] = 8;
@@ -1328,31 +1328,31 @@ u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y)
 {
     BlitBitmapRectToWindow(
         windowId,
-        gKeypadIconTiles + (gKeypadIcons[keypadIconId].tileOffset * 0x20),
+        gKeypadIconTiles + (sKeypadIcons[keypadIconId].tileOffset * 0x20),
         0,
         0,
         0x80,
         0x80,
         x,
         y,
-        gKeypadIcons[keypadIconId].width,
-        gKeypadIcons[keypadIconId].height);
-    return gKeypadIcons[keypadIconId].width;
+        sKeypadIcons[keypadIconId].width,
+        sKeypadIcons[keypadIconId].height);
+    return sKeypadIcons[keypadIconId].width;
 }
 
 u8 GetKeypadIconTileOffset(u8 keypadIconId)
 {
-    return gKeypadIcons[keypadIconId].tileOffset;
+    return sKeypadIcons[keypadIconId].tileOffset;
 }
 
 u8 GetKeypadIconWidth(u8 keypadIconId)
 {
-    return gKeypadIcons[keypadIconId].width;
+    return sKeypadIcons[keypadIconId].width;
 }
 
 u8 GetKeypadIconHeight(u8 keypadIconId)
 {
-    return gKeypadIcons[keypadIconId].height;
+    return sKeypadIcons[keypadIconId].height;
 }
 
 void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
@@ -1361,7 +1361,7 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
 
     if (isJapanese == 1)
     {
-        glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
+        glyphs = sFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
         DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
         DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
         gGlyphInfo[0x80] = 8;
@@ -1369,10 +1369,10 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
     }
     else
     {
-        glyphs = gFont0LatinGlyphs + (0x10 * glyphId);
+        glyphs = sFont0LatinGlyphs + (0x10 * glyphId);
         DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
         DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x40));
-        gGlyphInfo[0x80] = gFont0LatinGlyphWidths[glyphId];
+        gGlyphInfo[0x80] = sFont0LatinGlyphWidths[glyphId];
         gGlyphInfo[0x81] = 13;
     }
 }
@@ -1382,7 +1382,7 @@ s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese)
     if (isJapanese == TRUE)
         return 8;
     else
-        return gFont0LatinGlyphWidths[glyphId];
+        return sFont0LatinGlyphWidths[glyphId];
 }
 
 void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
@@ -1392,7 +1392,7 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
     if (isJapanese == TRUE)
     {
         int eff;
-        glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF)));  // shh, no questions, only matching now
+        glyphs = sFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF)));  // shh, no questions, only matching now
         DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
         DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
         gGlyphInfo[0x80] = 8;
@@ -1400,12 +1400,12 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
     }
     else
     {
-        glyphs = gFont1LatinGlyphs + (0x20 * glyphId);
+        glyphs = sFont1LatinGlyphs + (0x20 * glyphId);
         DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
         DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
         DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40));
         DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60));
-        gGlyphInfo[0x80] = gFont1LatinGlyphWidths[glyphId];
+        gGlyphInfo[0x80] = sFont1LatinGlyphWidths[glyphId];
         gGlyphInfo[0x81] = 14;
     }
 }
@@ -1415,7 +1415,7 @@ s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese)
     if (isJapanese == TRUE)
         return 8;
     else
-        return gFont1LatinGlyphWidths[glyphId];
+        return sFont1LatinGlyphWidths[glyphId];
 }
 
 void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
@@ -1440,12 +1440,12 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
         }
         else
         {
-            glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
+            glyphs = sFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
             DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
             DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
             DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
             DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60));
-            gGlyphInfo[0x80] = gFont2JapaneseGlyphWidths[glyphId];
+            gGlyphInfo[0x80] = sFont2JapaneseGlyphWidths[glyphId];
             gGlyphInfo[0x81] = 12;
         }
     }
@@ -1459,18 +1459,18 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
             {
                 gGlyphInfo[i] = lastColor | lastColor << 4;
                 // but why
-                gGlyphInfo[0x80] = gFont2LatinGlyphWidths[0];
+                gGlyphInfo[0x80] = sFont2LatinGlyphWidths[0];
                 gGlyphInfo[0x81] = 14;
             }
         }
         else
         {
-            glyphs = gFont2LatinGlyphs + (0x20 * glyphId);
+            glyphs = sFont2LatinGlyphs + (0x20 * glyphId);
             DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
             DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
             DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40));
             DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60));
-            gGlyphInfo[0x80] = gFont2LatinGlyphWidths[glyphId];
+            gGlyphInfo[0x80] = sFont2LatinGlyphWidths[glyphId];
             gGlyphInfo[0x81] = 14;
         }
     }
@@ -1483,11 +1483,11 @@ s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese)
         if(glyphId == 0)
             return 10;
 
-        return gFont2JapaneseGlyphWidths[glyphId];
+        return sFont2JapaneseGlyphWidths[glyphId];
     }
     else
     {
-        return gFont2LatinGlyphWidths[glyphId];
+        return sFont2LatinGlyphWidths[glyphId];
     }
 }
 
@@ -1513,7 +1513,7 @@ static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese)
         }
         else
         {
-            glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
+            glyphs = sFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
             DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
             DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
             DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
@@ -1531,7 +1531,7 @@ s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese)
     if(isJapanese == TRUE)
         return 10;
     else
-        return gFont2LatinGlyphWidths[glyphId];
+        return sFont2LatinGlyphWidths[glyphId];
 }
 
 static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
@@ -1556,12 +1556,12 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
         }
         else
         {
-            glyphs = gFont4JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
+            glyphs = sFont4JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
             DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
             DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
             DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
             DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60));
-            gGlyphInfo[0x80] = gFont4JapaneseGlyphWidths[glyphId];
+            gGlyphInfo[0x80] = sFont4JapaneseGlyphWidths[glyphId];
             gGlyphInfo[0x81] = 12;
         }
     }
@@ -1575,18 +1575,18 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
             {
                 gGlyphInfo[i] = lastColor | lastColor << 4;
                 // but why
-                gGlyphInfo[0x80] = gFont4LatinGlyphWidths[0];
+                gGlyphInfo[0x80] = sFont4LatinGlyphWidths[0];
                 gGlyphInfo[0x81] = 14;
             }
         }
         else
         {
-            glyphs = gFont4LatinGlyphs + (0x20 * glyphId);
+            glyphs = sFont4LatinGlyphs + (0x20 * glyphId);
             DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
             DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
             DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40));
             DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60));
-            gGlyphInfo[0x80] = gFont4LatinGlyphWidths[glyphId];
+            gGlyphInfo[0x80] = sFont4LatinGlyphWidths[glyphId];
             gGlyphInfo[0x81] = 14;
         }
     }
@@ -1599,10 +1599,10 @@ s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese)
         if(glyphId == 0)
             return 10;
 
-        return gFont4JapaneseGlyphWidths[glyphId];
+        return sFont4JapaneseGlyphWidths[glyphId];
     }
     else
-        return gFont4LatinGlyphWidths[glyphId];
+        return sFont4LatinGlyphWidths[glyphId];
 }
 
 void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
@@ -1627,12 +1627,12 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
         }
         else
         {
-            glyphs = gFont5JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
+            glyphs = sFont5JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
             DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
             DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
             DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
             DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60));
-            gGlyphInfo[0x80] = gFont5JapaneseGlyphWidths[glyphId];
+            gGlyphInfo[0x80] = sFont5JapaneseGlyphWidths[glyphId];
             gGlyphInfo[0x81] = 12;
         }
     }
@@ -1646,18 +1646,18 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
             {
                 gGlyphInfo[i] = lastColor | lastColor << 4;
                 // but why
-                gGlyphInfo[0x80] = gFont5LatinGlyphWidths[0];
+                gGlyphInfo[0x80] = sFont5LatinGlyphWidths[0];
                 gGlyphInfo[0x81] = 14;
             }
         }
         else
         {
-            glyphs = gFont5LatinGlyphs + (0x20 * glyphId);
+            glyphs = sFont5LatinGlyphs + (0x20 * glyphId);
             DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
             DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
             DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40));
             DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60));
-            gGlyphInfo[0x80] = gFont5LatinGlyphWidths[glyphId];
+            gGlyphInfo[0x80] = sFont5LatinGlyphWidths[glyphId];
             gGlyphInfo[0x81] = 14;
         }
     }
@@ -1670,15 +1670,15 @@ s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese)
         if(glyphId == 0)
             return 10;
         
-        return gFont5JapaneseGlyphWidths[glyphId];
+        return sFont5JapaneseGlyphWidths[glyphId];
     }
     else
-        return gFont5LatinGlyphWidths[glyphId];
+        return sFont5LatinGlyphWidths[glyphId];
 }
 
 void DecompressGlyphFont9(u16 glyphId)
 {
-    const u16* glyphs = gFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
+    const u16* glyphs = sFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
     DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
     DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
     gGlyphInfo[0x80] = 8;
diff --git a/src/title_screen.c b/src/title_screen.c
index 14f7a8732..e7ac79401 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -74,23 +74,23 @@ static bool32 IsSlashSpriteHidden(u8 spriteId);
 static void SpriteCallback_Slash(struct Sprite * sprite);
 
 // bg3
-static const u8 sBorderBgTiles[] = INCBIN_U8("data/graphics/title_screen/unk_83BF58C.4bpp.lz");
+static const u8 sBorderBgTiles[] = INCBIN_U8("graphics/title_screen/unk_83BF58C.4bpp.lz");
 #if defined(FIRERED)
-static const u8 sBorderBgMap[] = INCBIN_U8("data/graphics/title_screen/unk_83BF5A8.bin.lz");
+static const u8 sBorderBgMap[] = INCBIN_U8("graphics/title_screen/unk_83BF5A8.bin.lz");
 #elif defined(LEAFGREEN)
-static const u8 sBorderBgMap[] = INCBIN_U8("data/graphics/title_screen/lg_border_bg.bin.lz");
+static const u8 sBorderBgMap[] = INCBIN_U8("graphics/title_screen/lg_border_bg.bin.lz");
 #endif
 
 //sprites
-static const u32 sSlashSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bf64c.4bpp.lz");
+static const u32 sSlashSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bf64c.4bpp.lz");
 #if defined(FIRERED)
-static const u16 sSlashSpritePals[] = INCBIN_U16("data/graphics/title_screen/unk_83bf77c.gbapal");
-static const u32 sFireSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bf79c.4bpp.lz");
-static const u32 sBlankFireSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bfa14.4bpp.lz");
+static const u16 sSlashSpritePals[] = INCBIN_U16("graphics/title_screen/unk_83bf77c.gbapal");
+static const u32 sFireSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bf79c.4bpp.lz");
+static const u32 sBlankFireSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bfa14.4bpp.lz");
 #elif defined(LEAFGREEN)
-static const u16 sSlashSpritePals[] = INCBIN_U16("data/graphics/title_screen/unk_lg_83bf764.gbapal");
-static const u32 sLeafSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_lg_83bf784.4bpp.lz");
-static const u32 sBlankLeafSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_lg_83bf89c.4bpp.lz");
+static const u16 sSlashSpritePals[] = INCBIN_U16("graphics/title_screen/unk_lg_83bf764.gbapal");
+static const u32 sLeafSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_lg_83bf784.4bpp.lz");
+static const u32 sBlankLeafSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_lg_83bf89c.4bpp.lz");
 #endif
 
 static const struct OamData sOamData_FlameOrLeaf = {
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 76f20c85e..5e1daaf36 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -367,7 +367,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
     headerId = GetCurrentMapWildMonHeaderId();
     if (headerId != 0xFFFF)
     {
-        if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_GRASS)
+        if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_LAND)
         {
             if (gWildMonHeaders[headerId].landMonsInfo == NULL)
                 return FALSE;
@@ -474,7 +474,7 @@ bool8 SweetScentWildEncounter(void)
     headerId = GetCurrentMapWildMonHeaderId();
     if (headerId != 0xFFFF)
     {
-        if (MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_GRASS)
+        if (MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_LAND)
         {
             if (TryStartRoamerEncounter() == TRUE)
             {
@@ -680,7 +680,7 @@ static u8 GetMapBaseEncounterCooldown(u8 encounterType)
     u16 headerIdx = GetCurrentMapWildMonHeaderId();
     if (headerIdx == 0xFFFF)
         return 0xFF;
-    if (encounterType == TILE_ENCOUNTER_GRASS)
+    if (encounterType == TILE_ENCOUNTER_LAND)
     {
         if (gWildMonHeaders[headerIdx].landMonsInfo == NULL)
             return 0xFF;