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

…umentation
Missingmew · Apr 7, 2020 · 6451143 · 6451143
2 parents c05ca37 + 7f9e0ae
commit 6451143
Show file tree

Hide file tree

Showing 277 changed files with 435 additions and 637 deletions.
diff --git a/data/credits/unk_840C630.pal → graphics/credits/unk_840C630.pal b/data/credits/unk_840C630.pal → graphics/credits/unk_840C630.pal
diff --git a/data/credits/unk_840C650.png → graphics/credits/unk_840C650.png b/data/credits/unk_840C650.png → graphics/credits/unk_840C650.png
diff --git a/data/credits/unk_840CA54.bin → graphics/credits/unk_840CA54.bin b/data/credits/unk_840CA54.bin → graphics/credits/unk_840CA54.bin
diff --git a/data/credits/unk_840CB8C.bin → graphics/credits/unk_840CB8C.bin b/data/credits/unk_840CB8C.bin → graphics/credits/unk_840CB8C.bin
diff --git a/data/credits/unk_840D228.bin → graphics/credits/unk_840D228.bin b/data/credits/unk_840D228.bin → graphics/credits/unk_840D228.bin
diff --git a/data/credits/unk_840DC0C.bin → graphics/credits/unk_840DC0C.bin b/data/credits/unk_840DC0C.bin → graphics/credits/unk_840DC0C.bin
diff --git a/data/credits/unk_840E158.bin → graphics/credits/unk_840E158.bin b/data/credits/unk_840E158.bin → graphics/credits/unk_840E158.bin
diff --git a/data/credits/unk_840E904.bin → graphics/credits/unk_840E904.bin b/data/credits/unk_840E904.bin → graphics/credits/unk_840E904.bin
diff --git a/data/credits/unk_840F240.bin → graphics/credits/unk_840F240.bin b/data/credits/unk_840F240.bin → graphics/credits/unk_840F240.bin
diff --git a/data/credits/unk_840F944.bin → graphics/credits/unk_840F944.bin b/data/credits/unk_840F944.bin → graphics/credits/unk_840F944.bin
diff --git a/data/credits/unk_8410198.bin → graphics/credits/unk_8410198.bin b/data/credits/unk_8410198.bin → graphics/credits/unk_8410198.bin
diff --git a/data/credits/unk_84105B4.bin → graphics/credits/unk_84105B4.bin b/data/credits/unk_84105B4.bin → graphics/credits/unk_84105B4.bin
diff --git a/data/credits/unk_8410B20.bin → graphics/credits/unk_8410B20.bin b/data/credits/unk_8410B20.bin → graphics/credits/unk_8410B20.bin
diff --git a/data/credits/unk_8410B20.png → graphics/credits/unk_8410B20.png b/data/credits/unk_8410B20.png → graphics/credits/unk_8410B20.png
diff --git a/data/credits/unk_8410E10.pal → graphics/credits/unk_8410E10.pal b/data/credits/unk_8410E10.pal → graphics/credits/unk_8410E10.pal
diff --git a/data/credits/unk_8410E30.png → graphics/credits/unk_8410E30.png b/data/credits/unk_8410E30.png → graphics/credits/unk_8410E30.png
diff --git a/data/credits/unk_8411BF8.pal → graphics/credits/unk_8411BF8.pal b/data/credits/unk_8411BF8.pal → graphics/credits/unk_8411BF8.pal
diff --git a/data/credits/unk_8411C18.png → graphics/credits/unk_8411C18.png b/data/credits/unk_8411C18.png → graphics/credits/unk_8411C18.png
diff --git a/data/credits/unk_84129A0.pal → graphics/credits/unk_84129A0.pal b/data/credits/unk_84129A0.pal → graphics/credits/unk_84129A0.pal
diff --git a/data/credits/unk_84129C0.png → graphics/credits/unk_84129C0.png b/data/credits/unk_84129C0.png → graphics/credits/unk_84129C0.png
diff --git a/data/credits/unk_8413318.pal → graphics/credits/unk_8413318.pal b/data/credits/unk_8413318.pal → graphics/credits/unk_8413318.pal
diff --git a/data/credits/unk_8413338.png → graphics/credits/unk_8413338.png b/data/credits/unk_8413338.png → graphics/credits/unk_8413338.png
diff --git a/data/credits/unk_8413854.pal → graphics/credits/unk_8413854.pal b/data/credits/unk_8413854.pal → graphics/credits/unk_8413854.pal
diff --git a/data/credits/unk_8413874.png → graphics/credits/unk_8413874.png b/data/credits/unk_8413874.png → graphics/credits/unk_8413874.png
diff --git a/data/credits/unk_8413D98.pal → graphics/credits/unk_8413D98.pal b/data/credits/unk_8413D98.pal → graphics/credits/unk_8413D98.pal
diff --git a/data/credits/unk_8413DB8.png → graphics/credits/unk_8413DB8.png b/data/credits/unk_8413DB8.png → graphics/credits/unk_8413DB8.png
diff --git a/data/graphics/fame_checker_bg.pal → graphics/fame_checker/bg.pal b/data/graphics/fame_checker_bg.pal → graphics/fame_checker/bg.pal
diff --git a/data/graphics/fame_checker_bg.png → graphics/fame_checker/bg.png b/data/graphics/fame_checker_bg.png → graphics/fame_checker/bg.png
diff --git a/data/fame_checker/pal_845e540.pal → graphics/fame_checker/bill.pal b/data/fame_checker/pal_845e540.pal → graphics/fame_checker/bill.pal
diff --git a/data/fame_checker/img_845dd40.png → graphics/fame_checker/bill.png b/data/fame_checker/img_845dd40.png → graphics/fame_checker/bill.png
diff --git a/data/fame_checker/pal_845d500.pal → graphics/fame_checker/cursor.pal b/data/fame_checker/pal_845d500.pal → graphics/fame_checker/cursor.pal
diff --git a/data/fame_checker/img_845d100.png → graphics/fame_checker/cursor.png b/data/fame_checker/img_845d100.png → graphics/fame_checker/cursor.png
diff --git a/data/fame_checker/pal_845ed60.pal → graphics/fame_checker/daisy.pal b/data/fame_checker/pal_845ed60.pal → graphics/fame_checker/daisy.pal
diff --git a/data/fame_checker/img_845e560.png → graphics/fame_checker/daisy.png b/data/fame_checker/img_845e560.png → graphics/fame_checker/daisy.png
diff --git a/data/fame_checker/pal_845dd20.pal → graphics/fame_checker/mr_fuji.pal b/data/fame_checker/pal_845dd20.pal → graphics/fame_checker/mr_fuji.pal
diff --git a/data/fame_checker/img_845d520.png → graphics/fame_checker/mr_fuji.png b/data/fame_checker/img_845d520.png → graphics/fame_checker/mr_fuji.png
diff --git a/data/fame_checker/pal_845f580.pal → graphics/fame_checker/prof_oak.pal b/data/fame_checker/pal_845f580.pal → graphics/fame_checker/prof_oak.pal
diff --git a/data/fame_checker/img_845ed80.png → graphics/fame_checker/prof_oak.png b/data/fame_checker/img_845ed80.png → graphics/fame_checker/prof_oak.png
diff --git a/data/fame_checker/img_845ce00.png → graphics/fame_checker/question_mark.png b/data/fame_checker/img_845ce00.png → graphics/fame_checker/question_mark.png
diff --git a/data/fame_checker/pal_845f5c0.pal → graphics/fame_checker/silhouette.pal b/data/fame_checker/pal_845f5c0.pal → graphics/fame_checker/silhouette.pal
diff --git a/data/fame_checker/pal_845d0e0.pal → graphics/fame_checker/spinning_pokeball.pal b/data/fame_checker/pal_845d0e0.pal → graphics/fame_checker/spinning_pokeball.pal
diff --git a/data/fame_checker/img_845cf00.png → graphics/fame_checker/spinning_pokeball.png b/data/fame_checker/img_845cf00.png → graphics/fame_checker/spinning_pokeball.png
diff --git a/data/fame_checker/tilemap_845c600.bin → graphics/fame_checker/tilemap1.bin b/data/fame_checker/tilemap_845c600.bin → graphics/fame_checker/tilemap1.bin
diff --git a/data/graphics/fame_checker_tilemap2.bin → graphics/fame_checker/tilemap2.bin b/data/graphics/fame_checker_tilemap2.bin → graphics/fame_checker/tilemap2.bin
diff --git a/data/graphics/fame_checker_tilemap3.bin → graphics/fame_checker/tilemap3.bin b/data/graphics/fame_checker_tilemap3.bin → graphics/fame_checker/tilemap3.bin
diff --git a/data/fame_checker/pal_845f5a0.pal → graphics/fame_checker/unk.pal b/data/fame_checker/pal_845f5a0.pal → graphics/fame_checker/unk.pal
diff --git a/data/field_specials/unk_83F5F50.pal → graphics/field_specials/unk_83F5F50.pal b/data/field_specials/unk_83F5F50.pal → graphics/field_specials/unk_83F5F50.pal
diff --git a/data/field_specials/unk_83F5F70.pal → graphics/field_specials/unk_83F5F70.pal b/data/field_specials/unk_83F5F70.pal → graphics/field_specials/unk_83F5F70.pal
diff --git a/data/field_specials/unk_83F5F90.pal → graphics/field_specials/unk_83F5F90.pal b/data/field_specials/unk_83F5F90.pal → graphics/field_specials/unk_83F5F90.pal
diff --git a/data/field_specials/unk_83F5FB0.pal → graphics/field_specials/unk_83F5FB0.pal b/data/field_specials/unk_83F5FB0.pal → graphics/field_specials/unk_83F5FB0.pal
diff --git a/data/field_specials/unk_83F5FD0.pal → graphics/field_specials/unk_83F5FD0.pal b/data/field_specials/unk_83F5FD0.pal → graphics/field_specials/unk_83F5FD0.pal
diff --git a/data/field_specials/unk_83F5FF0.pal → graphics/field_specials/unk_83F5FF0.pal b/data/field_specials/unk_83F5FF0.pal → graphics/field_specials/unk_83F5FF0.pal
diff --git a/data/field_specials/unk_83F6010.pal → graphics/field_specials/unk_83F6010.pal b/data/field_specials/unk_83F6010.pal → graphics/field_specials/unk_83F6010.pal
diff --git a/data/field_specials/unk_83F6030.pal → graphics/field_specials/unk_83F6030.pal b/data/field_specials/unk_83F6030.pal → graphics/field_specials/unk_83F6030.pal
diff --git a/data/field_specials/unk_83F6050.pal → graphics/field_specials/unk_83F6050.pal b/data/field_specials/unk_83F6050.pal → graphics/field_specials/unk_83F6050.pal
diff --git a/data/field_specials/unk_83F6070.pal → graphics/field_specials/unk_83F6070.pal b/data/field_specials/unk_83F6070.pal → graphics/field_specials/unk_83F6070.pal
diff --git a/data/field_specials/unk_83F6090.pal → graphics/field_specials/unk_83F6090.pal b/data/field_specials/unk_83F6090.pal → graphics/field_specials/unk_83F6090.pal
diff --git a/data/field_specials/unk_83F60B0.pal → graphics/field_specials/unk_83F60B0.pal b/data/field_specials/unk_83F60B0.pal → graphics/field_specials/unk_83F60B0.pal
diff --git a/data/field_specials/unk_83F60D0.pal → graphics/field_specials/unk_83F60D0.pal b/data/field_specials/unk_83F60D0.pal → graphics/field_specials/unk_83F60D0.pal
diff --git a/data/field_specials/unk_83F60F0.pal → graphics/field_specials/unk_83F60F0.pal b/data/field_specials/unk_83F60F0.pal → graphics/field_specials/unk_83F60F0.pal
diff --git a/data/field_specials/unk_83F6110.pal → graphics/field_specials/unk_83F6110.pal b/data/field_specials/unk_83F6110.pal → graphics/field_specials/unk_83F6110.pal
diff --git a/data/field_specials/unk_83F6130.pal → graphics/field_specials/unk_83F6130.pal b/data/field_specials/unk_83F6130.pal → graphics/field_specials/unk_83F6130.pal
diff --git a/data/field_specials/unk_83F6150.pal → graphics/field_specials/unk_83F6150.pal b/data/field_specials/unk_83F6150.pal → graphics/field_specials/unk_83F6150.pal
diff --git a/data/field_specials/unk_83F6170.pal → graphics/field_specials/unk_83F6170.pal b/data/field_specials/unk_83F6170.pal → graphics/field_specials/unk_83F6170.pal
diff --git a/data/field_specials/unk_83F6190.pal → graphics/field_specials/unk_83F6190.pal b/data/field_specials/unk_83F6190.pal → graphics/field_specials/unk_83F6190.pal
diff --git a/data/field_specials/unk_83F61B0.pal → graphics/field_specials/unk_83F61B0.pal b/data/field_specials/unk_83F61B0.pal → graphics/field_specials/unk_83F61B0.pal
diff --git a/data/field_specials/unk_83F61D0.pal → graphics/field_specials/unk_83F61D0.pal b/data/field_specials/unk_83F61D0.pal → graphics/field_specials/unk_83F61D0.pal
diff --git a/data/field_specials/unk_83F6206.pal → graphics/field_specials/unk_83F6206.pal b/data/field_specials/unk_83F6206.pal → graphics/field_specials/unk_83F6206.pal
diff --git a/data/field_specials/unk_83F6226.pal → graphics/field_specials/unk_83F6226.pal b/data/field_specials/unk_83F6226.pal → graphics/field_specials/unk_83F6226.pal
diff --git a/data/field_specials/unk_83F6246.pal → graphics/field_specials/unk_83F6246.pal b/data/field_specials/unk_83F6246.pal → graphics/field_specials/unk_83F6246.pal
diff --git a/data/field_specials/unk_83F6266.pal → graphics/field_specials/unk_83F6266.pal b/data/field_specials/unk_83F6266.pal → graphics/field_specials/unk_83F6266.pal
diff --git a/data/field_specials/unk_83F6286.pal → graphics/field_specials/unk_83F6286.pal b/data/field_specials/unk_83F6286.pal → graphics/field_specials/unk_83F6286.pal
diff --git a/data/field_specials/unk_83F62A6.pal → graphics/field_specials/unk_83F62A6.pal b/data/field_specials/unk_83F62A6.pal → graphics/field_specials/unk_83F62A6.pal
diff --git a/data/field_specials/unk_83F62C6.pal → graphics/field_specials/unk_83F62C6.pal b/data/field_specials/unk_83F62C6.pal → graphics/field_specials/unk_83F62C6.pal
diff --git a/data/field_specials/unk_83F62E6.pal → graphics/field_specials/unk_83F62E6.pal b/data/field_specials/unk_83F62E6.pal → graphics/field_specials/unk_83F62E6.pal
diff --git a/data/field_specials/unk_83F6306.pal → graphics/field_specials/unk_83F6306.pal b/data/field_specials/unk_83F6306.pal → graphics/field_specials/unk_83F6306.pal
diff --git a/data/field_specials/unk_83F6326.pal → graphics/field_specials/unk_83F6326.pal b/data/field_specials/unk_83F6326.pal → graphics/field_specials/unk_83F6326.pal
diff --git a/data/field_specials/unk_83F6346.pal → graphics/field_specials/unk_83F6346.pal b/data/field_specials/unk_83F6346.pal → graphics/field_specials/unk_83F6346.pal
diff --git a/data/graphics/fonts/down_arrow.png → graphics/fonts/down_arrow.png b/data/graphics/fonts/down_arrow.png → graphics/fonts/down_arrow.png
diff --git a/data/graphics/fonts/down_arrow_2.png → graphics/fonts/down_arrow_2.png b/data/graphics/fonts/down_arrow_2.png → graphics/fonts/down_arrow_2.png
diff --git a/data/graphics/fonts/down_arrow_3.png → graphics/fonts/down_arrow_3.png b/data/graphics/fonts/down_arrow_3.png → graphics/fonts/down_arrow_3.png
diff --git a/data/graphics/fonts/down_arrow_4.png → graphics/fonts/down_arrow_4.png b/data/graphics/fonts/down_arrow_4.png → graphics/fonts/down_arrow_4.png
diff --git a/data/graphics/fonts/down_arrow_RS.png → graphics/fonts/down_arrow_RS.png b/data/graphics/fonts/down_arrow_RS.png → graphics/fonts/down_arrow_RS.png
diff --git a/data/graphics/fonts/down_arrow_RS_2.png → graphics/fonts/down_arrow_RS_2.png b/data/graphics/fonts/down_arrow_RS_2.png → graphics/fonts/down_arrow_RS_2.png
diff --git a/data/graphics/fonts/font0_jap.png → graphics/fonts/font0_jap.png b/data/graphics/fonts/font0_jap.png → graphics/fonts/font0_jap.png
diff --git a/data/graphics/fonts/font0_latin.png → graphics/fonts/font0_latin.png b/data/graphics/fonts/font0_latin.png → graphics/fonts/font0_latin.png
diff --git a/data/graphics/fonts/font1_jap.png → graphics/fonts/font1_jap.png b/data/graphics/fonts/font1_jap.png → graphics/fonts/font1_jap.png
diff --git a/data/graphics/fonts/font1_latin.png → graphics/fonts/font1_latin.png b/data/graphics/fonts/font1_latin.png → graphics/fonts/font1_latin.png
diff --git a/data/graphics/fonts/font2_jap.png → graphics/fonts/font2_jap.png b/data/graphics/fonts/font2_jap.png → graphics/fonts/font2_jap.png
diff --git a/data/graphics/fonts/font2_latin.png → graphics/fonts/font2_latin.png b/data/graphics/fonts/font2_latin.png → graphics/fonts/font2_latin.png
diff --git a/data/graphics/fonts/font4_jap.png → graphics/fonts/font4_jap.png b/data/graphics/fonts/font4_jap.png → graphics/fonts/font4_jap.png
diff --git a/data/graphics/fonts/font4_latin.png → graphics/fonts/font4_latin.png b/data/graphics/fonts/font4_latin.png → graphics/fonts/font4_latin.png
diff --git a/data/graphics/fonts/font5_jap.png → graphics/fonts/font5_jap.png b/data/graphics/fonts/font5_jap.png → graphics/fonts/font5_jap.png
diff --git a/data/graphics/fonts/font5_latin.png → graphics/fonts/font5_latin.png b/data/graphics/fonts/font5_latin.png → graphics/fonts/font5_latin.png
diff --git a/data/graphics/fonts/font6_braille.png → graphics/fonts/font6_braille.png b/data/graphics/fonts/font6_braille.png → graphics/fonts/font6_braille.png
diff --git a/data/graphics/fonts/font9_jap.png → graphics/fonts/font9_jap.png b/data/graphics/fonts/font9_jap.png → graphics/fonts/font9_jap.png
diff --git a/data/graphics/fonts/keypad_icons.png → graphics/fonts/keypad_icons.png b/data/graphics/fonts/keypad_icons.png → graphics/fonts/keypad_icons.png
diff --git a/data/bag/bag_window_pal.pal → graphics/item_menu/bag_window_pal.pal b/data/bag/bag_window_pal.pal → graphics/item_menu/bag_window_pal.pal
diff --git a/data/itemfinder/spr_tiles.png → graphics/itemfinder/spr_tiles.png b/data/itemfinder/spr_tiles.png → graphics/itemfinder/spr_tiles.png
diff --git a/data/graphics/unk_847a348.png → graphics/link_games/unk_847a348.png b/data/graphics/unk_847a348.png → graphics/link_games/unk_847a348.png
diff --git a/data/main_menu/unk_8234648.pal → graphics/main_menu/unk_8234648.pal b/data/main_menu/unk_8234648.pal → graphics/main_menu/unk_8234648.pal
diff --git a/data/main_menu/unk_8234668.pal → graphics/main_menu/unk_8234668.pal b/data/main_menu/unk_8234668.pal → graphics/main_menu/unk_8234668.pal
diff --git a/data/map_preview/altering_cave_pal.pal → graphics/map_preview/altering_cave_pal.pal b/data/map_preview/altering_cave_pal.pal → graphics/map_preview/altering_cave_pal.pal
diff --git a/data/map_preview/altering_cave_tilemap.bin → ...ics/map_preview/altering_cave_tilemap.bin b/data/map_preview/altering_cave_tilemap.bin → ...ics/map_preview/altering_cave_tilemap.bin
diff --git a/data/map_preview/altering_cave_tiles.png → graphics/map_preview/altering_cave_tiles.png b/data/map_preview/altering_cave_tiles.png → graphics/map_preview/altering_cave_tiles.png
diff --git a/data/map_preview/berry_forest_pal.pal → graphics/map_preview/berry_forest_pal.pal b/data/map_preview/berry_forest_pal.pal → graphics/map_preview/berry_forest_pal.pal
diff --git a/data/map_preview/berry_forest_tilemap.bin → ...hics/map_preview/berry_forest_tilemap.bin b/data/map_preview/berry_forest_tilemap.bin → ...hics/map_preview/berry_forest_tilemap.bin
diff --git a/data/map_preview/berry_forest_tiles.png → graphics/map_preview/berry_forest_tiles.png b/data/map_preview/berry_forest_tiles.png → graphics/map_preview/berry_forest_tiles.png
diff --git a/data/map_preview/cerulean_cave_pal.pal → graphics/map_preview/cerulean_cave_pal.pal b/data/map_preview/cerulean_cave_pal.pal → graphics/map_preview/cerulean_cave_pal.pal
diff --git a/data/map_preview/cerulean_cave_tilemap.bin → ...ics/map_preview/cerulean_cave_tilemap.bin b/data/map_preview/cerulean_cave_tilemap.bin → ...ics/map_preview/cerulean_cave_tilemap.bin
diff --git a/data/map_preview/cerulean_cave_tiles.png → graphics/map_preview/cerulean_cave_tiles.png b/data/map_preview/cerulean_cave_tiles.png → graphics/map_preview/cerulean_cave_tiles.png
diff --git a/data/map_preview/digletts_cave_pal.pal → graphics/map_preview/digletts_cave_pal.pal b/data/map_preview/digletts_cave_pal.pal → graphics/map_preview/digletts_cave_pal.pal
diff --git a/data/map_preview/digletts_cave_tilemap.bin → ...ics/map_preview/digletts_cave_tilemap.bin b/data/map_preview/digletts_cave_tilemap.bin → ...ics/map_preview/digletts_cave_tilemap.bin
diff --git a/data/map_preview/digletts_cave_tiles.png → graphics/map_preview/digletts_cave_tiles.png b/data/map_preview/digletts_cave_tiles.png → graphics/map_preview/digletts_cave_tiles.png
diff --git a/data/map_preview/dotted_hole_pal.pal → graphics/map_preview/dotted_hole_pal.pal b/data/map_preview/dotted_hole_pal.pal → graphics/map_preview/dotted_hole_pal.pal
diff --git a/data/map_preview/dotted_hole_tilemap.bin → graphics/map_preview/dotted_hole_tilemap.bin b/data/map_preview/dotted_hole_tilemap.bin → graphics/map_preview/dotted_hole_tilemap.bin
diff --git a/data/map_preview/dotted_hole_tiles.png → graphics/map_preview/dotted_hole_tiles.png b/data/map_preview/dotted_hole_tiles.png → graphics/map_preview/dotted_hole_tiles.png
diff --git a/data/map_preview/icefall_cave_pal.pal → graphics/map_preview/icefall_cave_pal.pal b/data/map_preview/icefall_cave_pal.pal → graphics/map_preview/icefall_cave_pal.pal
diff --git a/data/map_preview/icefall_cave_tilemap.bin → ...hics/map_preview/icefall_cave_tilemap.bin b/data/map_preview/icefall_cave_tilemap.bin → ...hics/map_preview/icefall_cave_tilemap.bin
diff --git a/data/map_preview/icefall_cave_tiles.png → graphics/map_preview/icefall_cave_tiles.png b/data/map_preview/icefall_cave_tiles.png → graphics/map_preview/icefall_cave_tiles.png
diff --git a/data/map_preview/kanto_safari_zone_pal.pal → ...ics/map_preview/kanto_safari_zone_pal.pal b/data/map_preview/kanto_safari_zone_pal.pal → ...ics/map_preview/kanto_safari_zone_pal.pal
diff --git a/...map_preview/kanto_safari_zone_tilemap.bin → ...map_preview/kanto_safari_zone_tilemap.bin b/...map_preview/kanto_safari_zone_tilemap.bin → ...map_preview/kanto_safari_zone_tilemap.bin
diff --git a/data/map_preview/kanto_safari_zone_tiles.png → ...s/map_preview/kanto_safari_zone_tiles.png b/data/map_preview/kanto_safari_zone_tiles.png → ...s/map_preview/kanto_safari_zone_tiles.png
diff --git a/data/map_preview/kanto_victory_road_pal.pal → ...cs/map_preview/kanto_victory_road_pal.pal b/data/map_preview/kanto_victory_road_pal.pal → ...cs/map_preview/kanto_victory_road_pal.pal
diff --git a/...ap_preview/kanto_victory_road_tilemap.bin → ...ap_preview/kanto_victory_road_tilemap.bin b/...ap_preview/kanto_victory_road_tilemap.bin → ...ap_preview/kanto_victory_road_tilemap.bin
diff --git a/.../map_preview/kanto_victory_road_tiles.png → .../map_preview/kanto_victory_road_tiles.png b/.../map_preview/kanto_victory_road_tiles.png → .../map_preview/kanto_victory_road_tiles.png
diff --git a/data/map_preview/lost_cave_pal.pal → graphics/map_preview/lost_cave_pal.pal b/data/map_preview/lost_cave_pal.pal → graphics/map_preview/lost_cave_pal.pal
diff --git a/data/map_preview/lost_cave_tilemap.bin → graphics/map_preview/lost_cave_tilemap.bin b/data/map_preview/lost_cave_tilemap.bin → graphics/map_preview/lost_cave_tilemap.bin
diff --git a/data/map_preview/lost_cave_tiles.png → graphics/map_preview/lost_cave_tiles.png b/data/map_preview/lost_cave_tiles.png → graphics/map_preview/lost_cave_tiles.png
diff --git a/data/map_preview/monean_chamber_pal.pal → graphics/map_preview/monean_chamber_pal.pal b/data/map_preview/monean_chamber_pal.pal → graphics/map_preview/monean_chamber_pal.pal
diff --git a/data/map_preview/monean_chamber_tilemap.bin → ...cs/map_preview/monean_chamber_tilemap.bin b/data/map_preview/monean_chamber_tilemap.bin → ...cs/map_preview/monean_chamber_tilemap.bin
diff --git a/data/map_preview/monean_chamber_tiles.png → ...hics/map_preview/monean_chamber_tiles.png b/data/map_preview/monean_chamber_tiles.png → ...hics/map_preview/monean_chamber_tiles.png
diff --git a/data/map_preview/mt_ember_pal.pal → graphics/map_preview/mt_ember_pal.pal b/data/map_preview/mt_ember_pal.pal → graphics/map_preview/mt_ember_pal.pal
diff --git a/data/map_preview/mt_ember_tilemap.bin → graphics/map_preview/mt_ember_tilemap.bin b/data/map_preview/mt_ember_tilemap.bin → graphics/map_preview/mt_ember_tilemap.bin
diff --git a/data/map_preview/mt_ember_tiles.png → graphics/map_preview/mt_ember_tiles.png b/data/map_preview/mt_ember_tiles.png → graphics/map_preview/mt_ember_tiles.png
diff --git a/data/map_preview/mt_moon_pal.pal → graphics/map_preview/mt_moon_pal.pal b/data/map_preview/mt_moon_pal.pal → graphics/map_preview/mt_moon_pal.pal
diff --git a/data/map_preview/mt_moon_tilemap.bin → graphics/map_preview/mt_moon_tilemap.bin b/data/map_preview/mt_moon_tilemap.bin → graphics/map_preview/mt_moon_tilemap.bin
diff --git a/data/map_preview/mt_moon_tiles.png → graphics/map_preview/mt_moon_tiles.png b/data/map_preview/mt_moon_tiles.png → graphics/map_preview/mt_moon_tiles.png
diff --git a/data/map_preview/pokemon_mansion_pal.pal → graphics/map_preview/pokemon_mansion_pal.pal b/data/map_preview/pokemon_mansion_pal.pal → graphics/map_preview/pokemon_mansion_pal.pal
diff --git a/data/map_preview/pokemon_mansion_tilemap.bin → ...s/map_preview/pokemon_mansion_tilemap.bin b/data/map_preview/pokemon_mansion_tilemap.bin → ...s/map_preview/pokemon_mansion_tilemap.bin
diff --git a/data/map_preview/pokemon_mansion_tiles.png → ...ics/map_preview/pokemon_mansion_tiles.png b/data/map_preview/pokemon_mansion_tiles.png → ...ics/map_preview/pokemon_mansion_tiles.png
diff --git a/data/map_preview/pokemon_tower_pal.pal → graphics/map_preview/pokemon_tower_pal.pal b/data/map_preview/pokemon_tower_pal.pal → graphics/map_preview/pokemon_tower_pal.pal
diff --git a/data/map_preview/pokemon_tower_tilemap.bin → ...ics/map_preview/pokemon_tower_tilemap.bin b/data/map_preview/pokemon_tower_tilemap.bin → ...ics/map_preview/pokemon_tower_tilemap.bin
diff --git a/data/map_preview/pokemon_tower_tiles.png → graphics/map_preview/pokemon_tower_tiles.png b/data/map_preview/pokemon_tower_tiles.png → graphics/map_preview/pokemon_tower_tiles.png
diff --git a/data/map_preview/power_plant_pal.pal → graphics/map_preview/power_plant_pal.pal b/data/map_preview/power_plant_pal.pal → graphics/map_preview/power_plant_pal.pal
diff --git a/data/map_preview/power_plant_tilemap.bin → graphics/map_preview/power_plant_tilemap.bin b/data/map_preview/power_plant_tilemap.bin → graphics/map_preview/power_plant_tilemap.bin
diff --git a/data/map_preview/power_plant_tiles.png → graphics/map_preview/power_plant_tiles.png b/data/map_preview/power_plant_tiles.png → graphics/map_preview/power_plant_tiles.png
diff --git a/data/map_preview/rock_tunnel_pal.pal → graphics/map_preview/rock_tunnel_pal.pal b/data/map_preview/rock_tunnel_pal.pal → graphics/map_preview/rock_tunnel_pal.pal
diff --git a/data/map_preview/rock_tunnel_tilemap.bin → graphics/map_preview/rock_tunnel_tilemap.bin b/data/map_preview/rock_tunnel_tilemap.bin → graphics/map_preview/rock_tunnel_tilemap.bin
diff --git a/data/map_preview/rock_tunnel_tiles.png → graphics/map_preview/rock_tunnel_tiles.png b/data/map_preview/rock_tunnel_tiles.png → graphics/map_preview/rock_tunnel_tiles.png
diff --git a/data/map_preview/rocket_hideout_pal.pal → graphics/map_preview/rocket_hideout_pal.pal b/data/map_preview/rocket_hideout_pal.pal → graphics/map_preview/rocket_hideout_pal.pal
diff --git a/data/map_preview/rocket_hideout_tilemap.bin → ...cs/map_preview/rocket_hideout_tilemap.bin b/data/map_preview/rocket_hideout_tilemap.bin → ...cs/map_preview/rocket_hideout_tilemap.bin
diff --git a/data/map_preview/rocket_hideout_tiles.png → ...hics/map_preview/rocket_hideout_tiles.png b/data/map_preview/rocket_hideout_tiles.png → ...hics/map_preview/rocket_hideout_tiles.png
diff --git a/data/map_preview/rocket_warehouse_pal.pal → ...hics/map_preview/rocket_warehouse_pal.pal b/data/map_preview/rocket_warehouse_pal.pal → ...hics/map_preview/rocket_warehouse_pal.pal
diff --git a/.../map_preview/rocket_warehouse_tilemap.bin → .../map_preview/rocket_warehouse_tilemap.bin b/.../map_preview/rocket_warehouse_tilemap.bin → .../map_preview/rocket_warehouse_tilemap.bin
diff --git a/data/map_preview/rocket_warehouse_tiles.png → ...cs/map_preview/rocket_warehouse_tiles.png b/data/map_preview/rocket_warehouse_tiles.png → ...cs/map_preview/rocket_warehouse_tiles.png
diff --git a/data/map_preview/seafoam_islands_pal.pal → graphics/map_preview/seafoam_islands_pal.pal b/data/map_preview/seafoam_islands_pal.pal → graphics/map_preview/seafoam_islands_pal.pal
diff --git a/data/map_preview/seafoam_islands_tilemap.bin → ...s/map_preview/seafoam_islands_tilemap.bin b/data/map_preview/seafoam_islands_tilemap.bin → ...s/map_preview/seafoam_islands_tilemap.bin
diff --git a/data/map_preview/seafoam_islands_tiles.png → ...ics/map_preview/seafoam_islands_tiles.png b/data/map_preview/seafoam_islands_tiles.png → ...ics/map_preview/seafoam_islands_tiles.png
diff --git a/data/map_preview/silph_co_pal.pal → graphics/map_preview/silph_co_pal.pal b/data/map_preview/silph_co_pal.pal → graphics/map_preview/silph_co_pal.pal
diff --git a/data/map_preview/silph_co_tilemap.bin → graphics/map_preview/silph_co_tilemap.bin b/data/map_preview/silph_co_tilemap.bin → graphics/map_preview/silph_co_tilemap.bin
diff --git a/data/map_preview/silph_co_tiles.png → graphics/map_preview/silph_co_tiles.png b/data/map_preview/silph_co_tiles.png → graphics/map_preview/silph_co_tiles.png
diff --git a/data/map_preview/viridian_forest_pal.pal → graphics/map_preview/viridian_forest_pal.pal b/data/map_preview/viridian_forest_pal.pal → graphics/map_preview/viridian_forest_pal.pal
diff --git a/data/map_preview/viridian_forest_tilemap.bin → ...s/map_preview/viridian_forest_tilemap.bin b/data/map_preview/viridian_forest_tilemap.bin → ...s/map_preview/viridian_forest_tilemap.bin
diff --git a/data/map_preview/viridian_forest_tiles.png → ...ics/map_preview/viridian_forest_tiles.png b/data/map_preview/viridian_forest_tiles.png → ...ics/map_preview/viridian_forest_tiles.png
diff --git a/data/graphics/mevent/gfx_46718C.png → graphics/mevent/gfx_46718C.png b/data/graphics/mevent/gfx_46718C.png → graphics/mevent/gfx_46718C.png
diff --git a/data/graphics/mevent/gfx_46737C.png → graphics/mevent/gfx_46737C.png b/data/graphics/mevent/gfx_46737C.png → graphics/mevent/gfx_46737C.png
diff --git a/data/graphics/mevent/gfx_467558.png → graphics/mevent/gfx_467558.png b/data/graphics/mevent/gfx_467558.png → graphics/mevent/gfx_467558.png
diff --git a/data/graphics/mevent/gfx_467700.png → graphics/mevent/gfx_467700.png b/data/graphics/mevent/gfx_467700.png → graphics/mevent/gfx_467700.png
diff --git a/data/graphics/mevent/gfx_467A7C.png → graphics/mevent/gfx_467A7C.png b/data/graphics/mevent/gfx_467A7C.png → graphics/mevent/gfx_467A7C.png
diff --git a/data/graphics/mevent/gfx_467EF4.png → graphics/mevent/gfx_467EF4.png b/data/graphics/mevent/gfx_467EF4.png → graphics/mevent/gfx_467EF4.png
diff --git a/data/graphics/mevent/gfx_4680C0.png → graphics/mevent/gfx_4680C0.png b/data/graphics/mevent/gfx_4680C0.png → graphics/mevent/gfx_4680C0.png
diff --git a/data/graphics/mevent/gfx_46821C.png → graphics/mevent/gfx_46821C.png b/data/graphics/mevent/gfx_46821C.png → graphics/mevent/gfx_46821C.png
diff --git a/data/graphics/mevent/gfx_46830C.png → graphics/mevent/gfx_46830C.png b/data/graphics/mevent/gfx_46830C.png → graphics/mevent/gfx_46830C.png
diff --git a/data/graphics/mevent/gfx_468448.png → graphics/mevent/gfx_468448.png b/data/graphics/mevent/gfx_468448.png → graphics/mevent/gfx_468448.png
diff --git a/data/graphics/mevent/gfx_4685B4.png → graphics/mevent/gfx_4685B4.png b/data/graphics/mevent/gfx_4685B4.png → graphics/mevent/gfx_4685B4.png
diff --git a/data/graphics/mevent/pal_46708C.pal → graphics/mevent/pal_46708C.pal b/data/graphics/mevent/pal_46708C.pal → graphics/mevent/pal_46708C.pal
diff --git a/data/graphics/mevent/pal_4670AC.pal → graphics/mevent/pal_4670AC.pal b/data/graphics/mevent/pal_4670AC.pal → graphics/mevent/pal_4670AC.pal
diff --git a/data/graphics/mevent/pal_4670CC.pal → graphics/mevent/pal_4670CC.pal b/data/graphics/mevent/pal_4670CC.pal → graphics/mevent/pal_4670CC.pal
diff --git a/data/graphics/mevent/pal_4670EC.pal → graphics/mevent/pal_4670EC.pal b/data/graphics/mevent/pal_4670EC.pal → graphics/mevent/pal_4670EC.pal
diff --git a/data/graphics/mevent/pal_46710C.pal → graphics/mevent/pal_46710C.pal b/data/graphics/mevent/pal_46710C.pal → graphics/mevent/pal_46710C.pal
diff --git a/data/graphics/mevent/pal_46712C.pal → graphics/mevent/pal_46712C.pal b/data/graphics/mevent/pal_46712C.pal → graphics/mevent/pal_46712C.pal
diff --git a/data/graphics/mevent/pal_46714C.pal → graphics/mevent/pal_46714C.pal b/data/graphics/mevent/pal_46714C.pal → graphics/mevent/pal_46714C.pal
diff --git a/data/graphics/mevent/pal_46716C.pal → graphics/mevent/pal_46716C.pal b/data/graphics/mevent/pal_46716C.pal → graphics/mevent/pal_46716C.pal
diff --git a/data/graphics/mevent/pal_467DF4.pal → graphics/mevent/pal_467DF4.pal b/data/graphics/mevent/pal_467DF4.pal → graphics/mevent/pal_467DF4.pal
diff --git a/data/graphics/mevent/pal_467E14.pal → graphics/mevent/pal_467E14.pal b/data/graphics/mevent/pal_467E14.pal → graphics/mevent/pal_467E14.pal
diff --git a/data/graphics/mevent/pal_467E34.pal → graphics/mevent/pal_467E34.pal b/data/graphics/mevent/pal_467E34.pal → graphics/mevent/pal_467E34.pal
diff --git a/data/graphics/mevent/pal_467E54.pal → graphics/mevent/pal_467E54.pal b/data/graphics/mevent/pal_467E54.pal → graphics/mevent/pal_467E54.pal
diff --git a/data/graphics/mevent/pal_467E74.pal → graphics/mevent/pal_467E74.pal b/data/graphics/mevent/pal_467E74.pal → graphics/mevent/pal_467E74.pal
diff --git a/data/graphics/mevent/pal_467E94.pal → graphics/mevent/pal_467E94.pal b/data/graphics/mevent/pal_467E94.pal → graphics/mevent/pal_467E94.pal
diff --git a/data/graphics/mevent/pal_467EB4.pal → graphics/mevent/pal_467EB4.pal b/data/graphics/mevent/pal_467EB4.pal → graphics/mevent/pal_467EB4.pal
diff --git a/data/graphics/mevent/pal_467ED4.pal → graphics/mevent/pal_467ED4.pal b/data/graphics/mevent/pal_467ED4.pal → graphics/mevent/pal_467ED4.pal
diff --git a/data/graphics/mevent/pal_468060.pal → graphics/mevent/pal_468060.pal b/data/graphics/mevent/pal_468060.pal → graphics/mevent/pal_468060.pal
diff --git a/data/graphics/mevent/pal_468080.pal → graphics/mevent/pal_468080.pal b/data/graphics/mevent/pal_468080.pal → graphics/mevent/pal_468080.pal
diff --git a/data/graphics/mevent/pal_4680A0.pal → graphics/mevent/pal_4680A0.pal b/data/graphics/mevent/pal_4680A0.pal → graphics/mevent/pal_4680A0.pal
diff --git a/data/graphics/mevent/tilemap_467288.bin → graphics/mevent/tilemap_467288.bin b/data/graphics/mevent/tilemap_467288.bin → graphics/mevent/tilemap_467288.bin
diff --git a/data/graphics/mevent/tilemap_467470.bin → graphics/mevent/tilemap_467470.bin b/data/graphics/mevent/tilemap_467470.bin → graphics/mevent/tilemap_467470.bin
diff --git a/data/graphics/mevent/tilemap_46762C.bin → graphics/mevent/tilemap_46762C.bin b/data/graphics/mevent/tilemap_46762C.bin → graphics/mevent/tilemap_46762C.bin
diff --git a/data/graphics/mevent/tilemap_467934.bin → graphics/mevent/tilemap_467934.bin b/data/graphics/mevent/tilemap_467934.bin → graphics/mevent/tilemap_467934.bin
diff --git a/data/graphics/mevent/tilemap_467CAC.bin → graphics/mevent/tilemap_467CAC.bin b/data/graphics/mevent/tilemap_467CAC.bin → graphics/mevent/tilemap_467CAC.bin
diff --git a/data/graphics/mevent/tilemap_468140.bin → graphics/mevent/tilemap_468140.bin b/data/graphics/mevent/tilemap_468140.bin → graphics/mevent/tilemap_468140.bin
diff --git a/data/graphics/mevent/tilemap_46824C.bin → graphics/mevent/tilemap_46824C.bin b/data/graphics/mevent/tilemap_46824C.bin → graphics/mevent/tilemap_46824C.bin
diff --git a/data/graphics/mevent/tilemap_46837C.bin → graphics/mevent/tilemap_46837C.bin b/data/graphics/mevent/tilemap_46837C.bin → graphics/mevent/tilemap_46837C.bin
diff --git a/data/graphics/mevent/tilemap_4684D8.bin → graphics/mevent/tilemap_4684D8.bin b/data/graphics/mevent/tilemap_4684D8.bin → graphics/mevent/tilemap_4684D8.bin
diff --git a/data/graphics/mevent/tilemap_468644.bin → graphics/mevent/tilemap_468644.bin b/data/graphics/mevent/tilemap_468644.bin → graphics/mevent/tilemap_468644.bin
diff --git a/..._speech/oak_speech_background_tilemap.bin → graphics/oak_speech/background_tilemap.bin b/..._speech/oak_speech_background_tilemap.bin → graphics/oak_speech/background_tilemap.bin
diff --git a/...ch/oak_speech_gfx_game_start_help_u_i.png → graphics/oak_speech/game_start_help_ui.png b/...ch/oak_speech_gfx_game_start_help_u_i.png → graphics/oak_speech/game_start_help_ui.png
diff --git a/..._speech/oak_speech_gfx_grass_platform.png → graphics/oak_speech/grass_platform.png b/..._speech/oak_speech_gfx_grass_platform.png → graphics/oak_speech/grass_platform.png
diff --git a/...ech/oak_speech_grass_platform_palette.pal → ...ics/oak_speech/grass_platform_palette.pal b/...ech/oak_speech_grass_platform_palette.pal → ...ics/oak_speech/grass_platform_palette.pal
diff --git a/data/oak_speech/help_docs_page2_tilemap.bin → ...cs/oak_speech/help_docs_page2_tilemap.bin b/data/oak_speech/help_docs_page2_tilemap.bin → ...cs/oak_speech/help_docs_page2_tilemap.bin
diff --git a/data/oak_speech/help_docs_page3_tilemap.bin → ...cs/oak_speech/help_docs_page3_tilemap.bin b/data/oak_speech/help_docs_page3_tilemap.bin → ...cs/oak_speech/help_docs_page3_tilemap.bin
diff --git a/data/oak_speech/help_docs_palette.pal → graphics/oak_speech/help_docs_palette.pal b/data/oak_speech/help_docs_palette.pal → graphics/oak_speech/help_docs_palette.pal
diff --git a/data/oak_speech/oak_speech_gfx_leaf_pal.pal → graphics/oak_speech/leaf_pal.pal b/data/oak_speech/oak_speech_gfx_leaf_pal.pal → graphics/oak_speech/leaf_pal.pal
diff --git a/data/oak_speech/oak_speech_gfx_leaf_pic.png → graphics/oak_speech/leaf_pic.png b/data/oak_speech/oak_speech_gfx_leaf_pic.png → graphics/oak_speech/leaf_pic.png
diff --git a/...eech/new_game_adventure_intro_tilemap.bin → ...eech/new_game_adventure_intro_tilemap.bin b/...eech/new_game_adventure_intro_tilemap.bin → ...eech/new_game_adventure_intro_tilemap.bin
diff --git a/data/oak_speech/oak_speech_gfx_oak_pal.pal → graphics/oak_speech/oak_pal.pal b/data/oak_speech/oak_speech_gfx_oak_pal.pal → graphics/oak_speech/oak_pal.pal
diff --git a/data/oak_speech/oak_speech_gfx_oak_pic.png → graphics/oak_speech/oak_pic.png b/data/oak_speech/oak_speech_gfx_oak_pic.png → graphics/oak_speech/oak_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_pika1.png → graphics/oak_speech/pika1.png b/data/oak_speech/oak_speech_gfx_pika1.png → graphics/oak_speech/pika1.png
diff --git a/data/oak_speech/oak_speech_gfx_pika2.png → graphics/oak_speech/pika2.png b/data/oak_speech/oak_speech_gfx_pika2.png → graphics/oak_speech/pika2.png
diff --git a/data/oak_speech/oak_speech_gfx_pika_eyes.png → graphics/oak_speech/pika_eyes.png b/data/oak_speech/oak_speech_gfx_pika_eyes.png → graphics/oak_speech/pika_eyes.png
diff --git a/data/oak_speech/oak_speech_pika_palette.pal → graphics/oak_speech/pika_palette.pal b/data/oak_speech/oak_speech_pika_palette.pal → graphics/oak_speech/pika_palette.pal
diff --git a/data/oak_speech/oak_speech_gfx_red_pal.pal → graphics/oak_speech/red_pal.pal b/data/oak_speech/oak_speech_gfx_red_pal.pal → graphics/oak_speech/red_pal.pal
diff --git a/data/oak_speech/oak_speech_gfx_red_pic.png → graphics/oak_speech/red_pic.png b/data/oak_speech/oak_speech_gfx_red_pic.png → graphics/oak_speech/red_pic.png
diff --git a/data/oak_speech/oak_speech_gfx_rival_pal.pal → graphics/oak_speech/rival_pal.pal b/data/oak_speech/oak_speech_gfx_rival_pal.pal → graphics/oak_speech/rival_pal.pal
diff --git a/data/oak_speech/oak_speech_gfx_rival_pic.png → graphics/oak_speech/rival_pic.png b/data/oak_speech/oak_speech_gfx_rival_pic.png → graphics/oak_speech/rival_pic.png
diff --git a/...ak_speech/oak_speech_gfx_solid_colors.png → graphics/oak_speech/solid_colors.png b/...ak_speech/oak_speech_gfx_solid_colors.png → graphics/oak_speech/solid_colors.png
diff --git a/data/pokedex_area_markers/marker.pal → graphics/pokedex/area_markers/marker.pal b/data/pokedex_area_markers/marker.pal → graphics/pokedex/area_markers/marker.pal
diff --git a/data/pokedex_area_markers/marker_0.png → graphics/pokedex/area_markers/marker_0.png b/data/pokedex_area_markers/marker_0.png → graphics/pokedex/area_markers/marker_0.png
diff --git a/data/pokedex_area_markers/marker_1.png → graphics/pokedex/area_markers/marker_1.png b/data/pokedex_area_markers/marker_1.png → graphics/pokedex/area_markers/marker_1.png
diff --git a/data/pokedex_area_markers/marker_2.png → graphics/pokedex/area_markers/marker_2.png b/data/pokedex_area_markers/marker_2.png → graphics/pokedex/area_markers/marker_2.png
diff --git a/data/pokedex_area_markers/marker_3.png → graphics/pokedex/area_markers/marker_3.png b/data/pokedex_area_markers/marker_3.png → graphics/pokedex/area_markers/marker_3.png
diff --git a/data/pokedex_area_markers/marker_4.png → graphics/pokedex/area_markers/marker_4.png b/data/pokedex_area_markers/marker_4.png → graphics/pokedex/area_markers/marker_4.png
diff --git a/data/pokedex_area_markers/marker_5.png → graphics/pokedex/area_markers/marker_5.png b/data/pokedex_area_markers/marker_5.png → graphics/pokedex/area_markers/marker_5.png
diff --git a/data/pokedex_area_markers/marker_6.png → graphics/pokedex/area_markers/marker_6.png b/data/pokedex_area_markers/marker_6.png → graphics/pokedex/area_markers/marker_6.png
diff --git a/data/script_menu/aerodactyl_fossil.png → graphics/script_menu/aerodactyl_fossil.png b/data/script_menu/aerodactyl_fossil.png → graphics/script_menu/aerodactyl_fossil.png
diff --git a/data/script_menu/kabutops_fossil.png → graphics/script_menu/kabutops_fossil.png b/data/script_menu/kabutops_fossil.png → graphics/script_menu/kabutops_fossil.png
diff --git a/data/seagallop/eb_tilemap.bin → graphics/seagallop/eb_tilemap.bin b/data/seagallop/eb_tilemap.bin → graphics/seagallop/eb_tilemap.bin
diff --git a/data/seagallop/ferry_and_wake.pal → graphics/seagallop/ferry_and_wake.pal b/data/seagallop/ferry_and_wake.pal → graphics/seagallop/ferry_and_wake.pal
diff --git a/data/seagallop/ferry_sprite.png → graphics/seagallop/ferry_sprite.png b/data/seagallop/ferry_sprite.png → graphics/seagallop/ferry_sprite.png
diff --git a/data/seagallop/wake.png → graphics/seagallop/wake.png b/data/seagallop/wake.png → graphics/seagallop/wake.png
diff --git a/data/seagallop/water.png → graphics/seagallop/water.png b/data/seagallop/water.png → graphics/seagallop/water.png
diff --git a/data/seagallop/wb_tilemap.bin → graphics/seagallop/wb_tilemap.bin b/data/seagallop/wb_tilemap.bin → graphics/seagallop/wb_tilemap.bin
diff --git a/data/graphics/title_screen/lg_border_bg.bin → graphics/title_screen/lg_border_bg.bin b/data/graphics/title_screen/lg_border_bg.bin → graphics/title_screen/lg_border_bg.bin
diff --git a/data/graphics/title_screen/unk_83BF58C.png → graphics/title_screen/unk_83BF58C.png b/data/graphics/title_screen/unk_83BF58C.png → graphics/title_screen/unk_83BF58C.png
diff --git a/data/graphics/title_screen/unk_83BF5A8.bin → graphics/title_screen/unk_83BF5A8.bin b/data/graphics/title_screen/unk_83BF5A8.bin → graphics/title_screen/unk_83BF5A8.bin
diff --git a/data/graphics/title_screen/unk_83bf64c.png → graphics/title_screen/unk_83bf64c.png b/data/graphics/title_screen/unk_83bf64c.png → graphics/title_screen/unk_83bf64c.png
diff --git a/data/graphics/title_screen/unk_83bf77c.pal → graphics/title_screen/unk_83bf77c.pal b/data/graphics/title_screen/unk_83bf77c.pal → graphics/title_screen/unk_83bf77c.pal
diff --git a/data/graphics/title_screen/unk_83bf79c.png → graphics/title_screen/unk_83bf79c.png b/data/graphics/title_screen/unk_83bf79c.png → graphics/title_screen/unk_83bf79c.png
diff --git a/data/graphics/title_screen/unk_83bfa14.png → graphics/title_screen/unk_83bfa14.png b/data/graphics/title_screen/unk_83bfa14.png → graphics/title_screen/unk_83bfa14.png
diff --git a/.../graphics/title_screen/unk_lg_83bf764.pal → graphics/title_screen/unk_lg_83bf764.pal b/.../graphics/title_screen/unk_lg_83bf764.pal → graphics/title_screen/unk_lg_83bf764.pal
diff --git a/.../graphics/title_screen/unk_lg_83bf784.png → graphics/title_screen/unk_lg_83bf784.png b/.../graphics/title_screen/unk_lg_83bf784.png → graphics/title_screen/unk_lg_83bf784.png
diff --git a/.../graphics/title_screen/unk_lg_83bf89c.png → graphics/title_screen/unk_lg_83bf89c.png b/.../graphics/title_screen/unk_lg_83bf89c.png → graphics/title_screen/unk_lg_83bf89c.png
diff --git a/data/graphics/unknown_8456638.bin → graphics/unknown/unknown_8456638.bin b/data/graphics/unknown_8456638.bin → graphics/unknown/unknown_8456638.bin
diff --git a/data/graphics/unknown_84566a8.bin → graphics/unknown/unknown_84566a8.bin b/data/graphics/unknown_84566a8.bin → graphics/unknown/unknown_84566a8.bin
diff --git 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
@@ -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
@@ -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/battle_script_commands.c b/src/battle_script_commands.c
@@ -6342,39 +6342,35 @@ static void atk7B_tryhealhalfhealth(void)
         gBattlescriptCurrInstr += 6;
 }
 
-#ifdef NONMATCHING
 static void atk7C_trymirrormove(void)
 {
     s32 validMovesCount;
     s32 i;
     u16 move;
-    u16 movesArray[4];
+    u16 movesArray[3];
 
-    // incorrect pointer load sequence
-    // and incorrect layout in data pools
     for (i = 0; i < 3; ++i)
         movesArray[i] = 0;
     for (validMovesCount = 0, i = 0; i < gBattlersCount; ++i)
     {
 
         if (i != gBattlerAttacker)
         {
-            move = *(i * 2 + gBattlerAttacker * 8 + gBattleStruct->lastTakenMoveFrom + 0)
-                | (*(i * 2 + gBattlerAttacker * 8 + gBattleStruct->lastTakenMoveFrom + 1) << 8);
+            move = T1_READ_16(i * 2 + gBattlerAttacker * 8 + gBattleStruct->lastTakenMoveFrom);
             if (move != MOVE_NONE && move != 0xFFFF)
                 movesArray[validMovesCount++] = move;
         }
     }
-    move = *(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 0)
-        | (*(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 1) << 8);
+    move = T1_READ_16(gBattleStruct->lastTakenMove + gBattlerAttacker * 2);
+    move++;move--;
     if (move != MOVE_NONE && move != 0xFFFF)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gCurrentMove = move;
         gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
-    else if (validMovesCount)
+    else if (validMovesCount != 0)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         i = Random() % validMovesCount;
@@ -6388,183 +6384,6 @@ static void atk7C_trymirrormove(void)
         ++gBattlescriptCurrInstr;
     }
 }
-#else
-NAKED
-static void atk7C_trymirrormove(void)
-{
-    asm_unified("\n\
-        push {r4-r7,lr}\n\
-        mov r7, r10\n\
-        mov r6, r9\n\
-        mov r5, r8\n\
-        push {r5-r7}\n\
-        sub sp, 0x8\n\
-        ldr r2, _080273E0 @ =gBattlersCount\n\
-        ldr r0, _080273E4 @ =gBattleStruct\n\
-        mov r10, r0\n\
-        movs r1, 0\n\
-        add r0, sp, 0x4\n\
-    _08027356:\n\
-        strh r1, [r0]\n\
-        subs r0, 0x2\n\
-        cmp r0, sp\n\
-        bge _08027356\n\
-        movs r1, 0\n\
-        mov r8, r1\n\
-        movs r5, 0\n\
-        ldrb r1, [r2]\n\
-        cmp r5, r1\n\
-        bge _080273AC\n\
-        ldr r0, _080273E8 @ =gBattlerAttacker\n\
-        ldrb r6, [r0]\n\
-        ldr r2, _080273EC @ =0x0000ffff\n\
-        mov r9, r2\n\
-        lsls r4, r6, 3\n\
-        mov r2, sp\n\
-        ldr r0, _080273E4 @ =gBattleStruct\n\
-        mov r12, r0\n\
-        adds r7, r1, 0\n\
-    _0802737C:\n\
-        cmp r5, r6\n\
-        beq _080273A4\n\
-        mov r1, r12\n\
-        ldr r0, [r1]\n\
-        adds r0, r4, r0\n\
-        adds r1, r0, 0\n\
-        adds r1, 0xE0\n\
-        ldrb r3, [r1]\n\
-        adds r0, 0xE1\n\
-        ldrb r0, [r0]\n\
-        lsls r0, 8\n\
-        orrs r3, r0\n\
-        cmp r3, 0\n\
-        beq _080273A4\n\
-        cmp r3, r9\n\
-        beq _080273A4\n\
-        strh r3, [r2]\n\
-        adds r2, 0x2\n\
-        movs r0, 0x1\n\
-        add r8, r0\n\
-    _080273A4:\n\
-        adds r4, 0x2\n\
-        adds r5, 0x1\n\
-        cmp r5, r7\n\
-        blt _0802737C\n\
-    _080273AC:\n\
-        ldr r1, _080273E8 @ =gBattlerAttacker\n\
-        ldrb r0, [r1]\n\
-        mov r2, r10\n\
-        ldr r1, [r2]\n\
-        lsls r0, 1\n\
-        adds r0, r1\n\
-        adds r1, r0, 0\n\
-        adds r1, 0x98\n\
-        ldrb r3, [r1]\n\
-        adds r0, 0x99\n\
-        ldrb r0, [r0]\n\
-        lsls r0, 8\n\
-        orrs r3, r0\n\
-        cmp r3, 0\n\
-        beq _080273FC\n\
-        ldr r0, _080273EC @ =0x0000ffff\n\
-        cmp r3, r0\n\
-        beq _080273FC\n\
-        ldr r2, _080273F0 @ =gHitMarker\n\
-        ldr r0, [r2]\n\
-        ldr r1, _080273F4 @ =0xfffffbff\n\
-        ands r0, r1\n\
-        str r0, [r2]\n\
-        ldr r4, _080273F8 @ =gCurrentMove\n\
-        strh r3, [r4]\n\
-        b _08027426\n\
-        .align 2, 0\n\
-    _080273E0: .4byte gBattlersCount\n\
-    _080273E4: .4byte gBattleStruct\n\
-    _080273E8: .4byte gBattlerAttacker\n\
-    _080273EC: .4byte 0x0000ffff\n\
-    _080273F0: .4byte gHitMarker\n\
-    _080273F4: .4byte 0xfffffbff\n\
-    _080273F8: .4byte gCurrentMove\n\
-    _080273FC:\n\
-        mov r0, r8\n\
-        cmp r0, 0\n\
-        beq _0802746C\n\
-        ldr r2, _08027450 @ =gHitMarker\n\
-        ldr r0, [r2]\n\
-        ldr r1, _08027454 @ =0xfffffbff\n\
-        ands r0, r1\n\
-        str r0, [r2]\n\
-        bl Random\n\
-        lsls r0, 16\n\
-        lsrs r0, 16\n\
-        mov r1, r8\n\
-        bl __modsi3\n\
-        adds r5, r0, 0\n\
-        ldr r4, _08027458 @ =gCurrentMove\n\
-        lsls r0, r5, 1\n\
-        add r0, sp\n\
-        ldrh r0, [r0]\n\
-        strh r0, [r4]\n\
-    _08027426:\n\
-        ldrh r0, [r4]\n\
-        movs r1, 0\n\
-        bl GetMoveTarget\n\
-        ldr r1, _0802745C @ =gBattlerTarget\n\
-        strb r0, [r1]\n\
-        ldr r5, _08027460 @ =gBattlescriptCurrInstr\n\
-        ldr r3, _08027464 @ =gBattleScriptsForMoveEffects\n\
-        ldr r2, _08027468 @ =gBattleMoves\n\
-        ldrh r1, [r4]\n\
-        lsls r0, r1, 1\n\
-        adds r0, r1\n\
-        lsls r0, 2\n\
-        adds r0, r2\n\
-        ldrb r0, [r0]\n\
-        lsls r0, 2\n\
-        adds r0, r3\n\
-        ldr r0, [r0]\n\
-        str r0, [r5]\n\
-        b _0802748A\n\
-        .align 2, 0\n\
-    _08027450: .4byte gHitMarker\n\
-    _08027454: .4byte 0xfffffbff\n\
-    _08027458: .4byte gCurrentMove\n\
-    _0802745C: .4byte gBattlerTarget\n\
-    _08027460: .4byte gBattlescriptCurrInstr\n\
-    _08027464: .4byte gBattleScriptsForMoveEffects\n\
-    _08027468: .4byte gBattleMoves\n\
-    _0802746C:\n\
-        ldr r2, _0802749C @ =gSpecialStatuses\n\
-        ldr r0, _080274A0 @ =gBattlerAttacker\n\
-        ldrb r1, [r0]\n\
-        lsls r0, r1, 2\n\
-        adds r0, r1\n\
-        lsls r0, 2\n\
-        adds r0, r2\n\
-        ldrb r1, [r0]\n\
-        movs r2, 0x20\n\
-        orrs r1, r2\n\
-        strb r1, [r0]\n\
-        ldr r1, _080274A4 @ =gBattlescriptCurrInstr\n\
-        ldr r0, [r1]\n\
-        adds r0, 0x1\n\
-        str r0, [r1]\n\
-    _0802748A:\n\
-        add sp, 0x8\n\
-        pop {r3-r5}\n\
-        mov r8, r3\n\
-        mov r9, r4\n\
-        mov r10, r5\n\
-        pop {r4-r7}\n\
-        pop {r0}\n\
-        bx r0\n\
-        .align 2, 0\n\
-    _0802749C: .4byte gSpecialStatuses\n\
-    _080274A0: .4byte gBattlerAttacker\n\
-    _080274A4: .4byte gBattlescriptCurrInstr\n\
-        ");
-}
-#endif
 
 static void atk7D_setrain(void)
 {

diff --git 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);