diff --git a/data/credits/unk_840C630.pal b/graphics/credits/unk_840C630.pal similarity index 100% rename from data/credits/unk_840C630.pal rename to graphics/credits/unk_840C630.pal diff --git a/data/credits/unk_840C650.png b/graphics/credits/unk_840C650.png similarity index 100% rename from data/credits/unk_840C650.png rename to graphics/credits/unk_840C650.png diff --git a/data/credits/unk_840CA54.bin b/graphics/credits/unk_840CA54.bin similarity index 100% rename from data/credits/unk_840CA54.bin rename to graphics/credits/unk_840CA54.bin diff --git a/data/credits/unk_840CB8C.bin b/graphics/credits/unk_840CB8C.bin similarity index 100% rename from data/credits/unk_840CB8C.bin rename to graphics/credits/unk_840CB8C.bin diff --git a/data/credits/unk_840D228.bin b/graphics/credits/unk_840D228.bin similarity index 100% rename from data/credits/unk_840D228.bin rename to graphics/credits/unk_840D228.bin diff --git a/data/credits/unk_840DC0C.bin b/graphics/credits/unk_840DC0C.bin similarity index 100% rename from data/credits/unk_840DC0C.bin rename to graphics/credits/unk_840DC0C.bin diff --git a/data/credits/unk_840E158.bin b/graphics/credits/unk_840E158.bin similarity index 100% rename from data/credits/unk_840E158.bin rename to graphics/credits/unk_840E158.bin diff --git a/data/credits/unk_840E904.bin b/graphics/credits/unk_840E904.bin similarity index 100% rename from data/credits/unk_840E904.bin rename to graphics/credits/unk_840E904.bin diff --git a/data/credits/unk_840F240.bin b/graphics/credits/unk_840F240.bin similarity index 100% rename from data/credits/unk_840F240.bin rename to graphics/credits/unk_840F240.bin diff --git a/data/credits/unk_840F944.bin b/graphics/credits/unk_840F944.bin similarity index 100% rename from data/credits/unk_840F944.bin rename to graphics/credits/unk_840F944.bin diff --git a/data/credits/unk_8410198.bin b/graphics/credits/unk_8410198.bin similarity index 100% rename from data/credits/unk_8410198.bin rename to graphics/credits/unk_8410198.bin diff --git a/data/credits/unk_84105B4.bin b/graphics/credits/unk_84105B4.bin similarity index 100% rename from data/credits/unk_84105B4.bin rename to graphics/credits/unk_84105B4.bin diff --git a/data/credits/unk_8410B20.bin b/graphics/credits/unk_8410B20.bin similarity index 100% rename from data/credits/unk_8410B20.bin rename to graphics/credits/unk_8410B20.bin diff --git a/data/credits/unk_8410B20.png b/graphics/credits/unk_8410B20.png similarity index 100% rename from data/credits/unk_8410B20.png rename to graphics/credits/unk_8410B20.png diff --git a/data/credits/unk_8410E10.pal b/graphics/credits/unk_8410E10.pal similarity index 100% rename from data/credits/unk_8410E10.pal rename to graphics/credits/unk_8410E10.pal diff --git a/data/credits/unk_8410E30.png b/graphics/credits/unk_8410E30.png similarity index 100% rename from data/credits/unk_8410E30.png rename to graphics/credits/unk_8410E30.png diff --git a/data/credits/unk_8411BF8.pal b/graphics/credits/unk_8411BF8.pal similarity index 100% rename from data/credits/unk_8411BF8.pal rename to graphics/credits/unk_8411BF8.pal diff --git a/data/credits/unk_8411C18.png b/graphics/credits/unk_8411C18.png similarity index 100% rename from data/credits/unk_8411C18.png rename to graphics/credits/unk_8411C18.png diff --git a/data/credits/unk_84129A0.pal b/graphics/credits/unk_84129A0.pal similarity index 100% rename from data/credits/unk_84129A0.pal rename to graphics/credits/unk_84129A0.pal diff --git a/data/credits/unk_84129C0.png b/graphics/credits/unk_84129C0.png similarity index 100% rename from data/credits/unk_84129C0.png rename to graphics/credits/unk_84129C0.png diff --git a/data/credits/unk_8413318.pal b/graphics/credits/unk_8413318.pal similarity index 100% rename from data/credits/unk_8413318.pal rename to graphics/credits/unk_8413318.pal diff --git a/data/credits/unk_8413338.png b/graphics/credits/unk_8413338.png similarity index 100% rename from data/credits/unk_8413338.png rename to graphics/credits/unk_8413338.png diff --git a/data/credits/unk_8413854.pal b/graphics/credits/unk_8413854.pal similarity index 100% rename from data/credits/unk_8413854.pal rename to graphics/credits/unk_8413854.pal diff --git a/data/credits/unk_8413874.png b/graphics/credits/unk_8413874.png similarity index 100% rename from data/credits/unk_8413874.png rename to graphics/credits/unk_8413874.png diff --git a/data/credits/unk_8413D98.pal b/graphics/credits/unk_8413D98.pal similarity index 100% rename from data/credits/unk_8413D98.pal rename to graphics/credits/unk_8413D98.pal diff --git a/data/credits/unk_8413DB8.png b/graphics/credits/unk_8413DB8.png similarity index 100% rename from data/credits/unk_8413DB8.png rename to graphics/credits/unk_8413DB8.png diff --git a/data/graphics/fame_checker_bg.pal b/graphics/fame_checker/bg.pal similarity index 100% rename from data/graphics/fame_checker_bg.pal rename to graphics/fame_checker/bg.pal diff --git a/data/graphics/fame_checker_bg.png b/graphics/fame_checker/bg.png similarity index 100% rename from data/graphics/fame_checker_bg.png rename to graphics/fame_checker/bg.png diff --git a/data/fame_checker/pal_845e540.pal b/graphics/fame_checker/bill.pal similarity index 100% rename from data/fame_checker/pal_845e540.pal rename to graphics/fame_checker/bill.pal diff --git a/data/fame_checker/img_845dd40.png b/graphics/fame_checker/bill.png similarity index 100% rename from data/fame_checker/img_845dd40.png rename to graphics/fame_checker/bill.png diff --git a/data/fame_checker/pal_845d500.pal b/graphics/fame_checker/cursor.pal similarity index 100% rename from data/fame_checker/pal_845d500.pal rename to graphics/fame_checker/cursor.pal diff --git a/data/fame_checker/img_845d100.png b/graphics/fame_checker/cursor.png similarity index 100% rename from data/fame_checker/img_845d100.png rename to graphics/fame_checker/cursor.png diff --git a/data/fame_checker/pal_845ed60.pal b/graphics/fame_checker/daisy.pal similarity index 100% rename from data/fame_checker/pal_845ed60.pal rename to graphics/fame_checker/daisy.pal diff --git a/data/fame_checker/img_845e560.png b/graphics/fame_checker/daisy.png similarity index 100% rename from data/fame_checker/img_845e560.png rename to graphics/fame_checker/daisy.png diff --git a/data/fame_checker/pal_845dd20.pal b/graphics/fame_checker/mr_fuji.pal similarity index 100% rename from data/fame_checker/pal_845dd20.pal rename to graphics/fame_checker/mr_fuji.pal diff --git a/data/fame_checker/img_845d520.png b/graphics/fame_checker/mr_fuji.png similarity index 100% rename from data/fame_checker/img_845d520.png rename to graphics/fame_checker/mr_fuji.png diff --git a/data/fame_checker/pal_845f5a0.pal b/graphics/fame_checker/pal_845f5a0.pal similarity index 100% rename from data/fame_checker/pal_845f5a0.pal rename to graphics/fame_checker/pal_845f5a0.pal diff --git a/data/fame_checker/pal_845f580.pal b/graphics/fame_checker/prof_oak.pal similarity index 100% rename from data/fame_checker/pal_845f580.pal rename to graphics/fame_checker/prof_oak.pal diff --git a/data/fame_checker/img_845ed80.png b/graphics/fame_checker/prof_oak.png similarity index 100% rename from data/fame_checker/img_845ed80.png rename to graphics/fame_checker/prof_oak.png diff --git a/data/fame_checker/img_845ce00.png b/graphics/fame_checker/question_mark.png similarity index 100% rename from data/fame_checker/img_845ce00.png rename to graphics/fame_checker/question_mark.png diff --git a/data/fame_checker/pal_845f5c0.pal b/graphics/fame_checker/silhouette.pal similarity index 100% rename from data/fame_checker/pal_845f5c0.pal rename to graphics/fame_checker/silhouette.pal diff --git a/data/fame_checker/pal_845d0e0.pal b/graphics/fame_checker/spinning_pokeball.pal similarity index 100% rename from data/fame_checker/pal_845d0e0.pal rename to graphics/fame_checker/spinning_pokeball.pal diff --git a/data/fame_checker/img_845cf00.png b/graphics/fame_checker/spinning_pokeball.png similarity index 100% rename from data/fame_checker/img_845cf00.png rename to graphics/fame_checker/spinning_pokeball.png diff --git a/data/fame_checker/tilemap_845c600.bin b/graphics/fame_checker/tilemap1.bin similarity index 100% rename from data/fame_checker/tilemap_845c600.bin rename to graphics/fame_checker/tilemap1.bin diff --git a/data/graphics/fame_checker_tilemap2.bin b/graphics/fame_checker/tilemap2.bin similarity index 100% rename from data/graphics/fame_checker_tilemap2.bin rename to graphics/fame_checker/tilemap2.bin diff --git a/data/graphics/fame_checker_tilemap3.bin b/graphics/fame_checker/tilemap3.bin similarity index 100% rename from data/graphics/fame_checker_tilemap3.bin rename to graphics/fame_checker/tilemap3.bin diff --git a/data/field_specials/unk_83F5F50.pal b/graphics/field_specials/unk_83F5F50.pal similarity index 100% rename from data/field_specials/unk_83F5F50.pal rename to graphics/field_specials/unk_83F5F50.pal diff --git a/data/field_specials/unk_83F5F70.pal b/graphics/field_specials/unk_83F5F70.pal similarity index 100% rename from data/field_specials/unk_83F5F70.pal rename to graphics/field_specials/unk_83F5F70.pal diff --git a/data/field_specials/unk_83F5F90.pal b/graphics/field_specials/unk_83F5F90.pal similarity index 100% rename from data/field_specials/unk_83F5F90.pal rename to graphics/field_specials/unk_83F5F90.pal diff --git a/data/field_specials/unk_83F5FB0.pal b/graphics/field_specials/unk_83F5FB0.pal similarity index 100% rename from data/field_specials/unk_83F5FB0.pal rename to graphics/field_specials/unk_83F5FB0.pal diff --git a/data/field_specials/unk_83F5FD0.pal b/graphics/field_specials/unk_83F5FD0.pal similarity index 100% rename from data/field_specials/unk_83F5FD0.pal rename to graphics/field_specials/unk_83F5FD0.pal diff --git a/data/field_specials/unk_83F5FF0.pal b/graphics/field_specials/unk_83F5FF0.pal similarity index 100% rename from data/field_specials/unk_83F5FF0.pal rename to graphics/field_specials/unk_83F5FF0.pal diff --git a/data/field_specials/unk_83F6010.pal b/graphics/field_specials/unk_83F6010.pal similarity index 100% rename from data/field_specials/unk_83F6010.pal rename to graphics/field_specials/unk_83F6010.pal diff --git a/data/field_specials/unk_83F6030.pal b/graphics/field_specials/unk_83F6030.pal similarity index 100% rename from data/field_specials/unk_83F6030.pal rename to graphics/field_specials/unk_83F6030.pal diff --git a/data/field_specials/unk_83F6050.pal b/graphics/field_specials/unk_83F6050.pal similarity index 100% rename from data/field_specials/unk_83F6050.pal rename to graphics/field_specials/unk_83F6050.pal diff --git a/data/field_specials/unk_83F6070.pal b/graphics/field_specials/unk_83F6070.pal similarity index 100% rename from data/field_specials/unk_83F6070.pal rename to graphics/field_specials/unk_83F6070.pal diff --git a/data/field_specials/unk_83F6090.pal b/graphics/field_specials/unk_83F6090.pal similarity index 100% rename from data/field_specials/unk_83F6090.pal rename to graphics/field_specials/unk_83F6090.pal diff --git a/data/field_specials/unk_83F60B0.pal b/graphics/field_specials/unk_83F60B0.pal similarity index 100% rename from data/field_specials/unk_83F60B0.pal rename to graphics/field_specials/unk_83F60B0.pal diff --git a/data/field_specials/unk_83F60D0.pal b/graphics/field_specials/unk_83F60D0.pal similarity index 100% rename from data/field_specials/unk_83F60D0.pal rename to graphics/field_specials/unk_83F60D0.pal diff --git a/data/field_specials/unk_83F60F0.pal b/graphics/field_specials/unk_83F60F0.pal similarity index 100% rename from data/field_specials/unk_83F60F0.pal rename to graphics/field_specials/unk_83F60F0.pal diff --git a/data/field_specials/unk_83F6110.pal b/graphics/field_specials/unk_83F6110.pal similarity index 100% rename from data/field_specials/unk_83F6110.pal rename to graphics/field_specials/unk_83F6110.pal diff --git a/data/field_specials/unk_83F6130.pal b/graphics/field_specials/unk_83F6130.pal similarity index 100% rename from data/field_specials/unk_83F6130.pal rename to graphics/field_specials/unk_83F6130.pal diff --git a/data/field_specials/unk_83F6150.pal b/graphics/field_specials/unk_83F6150.pal similarity index 100% rename from data/field_specials/unk_83F6150.pal rename to graphics/field_specials/unk_83F6150.pal diff --git a/data/field_specials/unk_83F6170.pal b/graphics/field_specials/unk_83F6170.pal similarity index 100% rename from data/field_specials/unk_83F6170.pal rename to graphics/field_specials/unk_83F6170.pal diff --git a/data/field_specials/unk_83F6190.pal b/graphics/field_specials/unk_83F6190.pal similarity index 100% rename from data/field_specials/unk_83F6190.pal rename to graphics/field_specials/unk_83F6190.pal diff --git a/data/field_specials/unk_83F61B0.pal b/graphics/field_specials/unk_83F61B0.pal similarity index 100% rename from data/field_specials/unk_83F61B0.pal rename to graphics/field_specials/unk_83F61B0.pal diff --git a/data/field_specials/unk_83F61D0.pal b/graphics/field_specials/unk_83F61D0.pal similarity index 100% rename from data/field_specials/unk_83F61D0.pal rename to graphics/field_specials/unk_83F61D0.pal diff --git a/data/field_specials/unk_83F6206.pal b/graphics/field_specials/unk_83F6206.pal similarity index 100% rename from data/field_specials/unk_83F6206.pal rename to graphics/field_specials/unk_83F6206.pal diff --git a/data/field_specials/unk_83F6226.pal b/graphics/field_specials/unk_83F6226.pal similarity index 100% rename from data/field_specials/unk_83F6226.pal rename to graphics/field_specials/unk_83F6226.pal diff --git a/data/field_specials/unk_83F6246.pal b/graphics/field_specials/unk_83F6246.pal similarity index 100% rename from data/field_specials/unk_83F6246.pal rename to graphics/field_specials/unk_83F6246.pal diff --git a/data/field_specials/unk_83F6266.pal b/graphics/field_specials/unk_83F6266.pal similarity index 100% rename from data/field_specials/unk_83F6266.pal rename to graphics/field_specials/unk_83F6266.pal diff --git a/data/field_specials/unk_83F6286.pal b/graphics/field_specials/unk_83F6286.pal similarity index 100% rename from data/field_specials/unk_83F6286.pal rename to graphics/field_specials/unk_83F6286.pal diff --git a/data/field_specials/unk_83F62A6.pal b/graphics/field_specials/unk_83F62A6.pal similarity index 100% rename from data/field_specials/unk_83F62A6.pal rename to graphics/field_specials/unk_83F62A6.pal diff --git a/data/field_specials/unk_83F62C6.pal b/graphics/field_specials/unk_83F62C6.pal similarity index 100% rename from data/field_specials/unk_83F62C6.pal rename to graphics/field_specials/unk_83F62C6.pal diff --git a/data/field_specials/unk_83F62E6.pal b/graphics/field_specials/unk_83F62E6.pal similarity index 100% rename from data/field_specials/unk_83F62E6.pal rename to graphics/field_specials/unk_83F62E6.pal diff --git a/data/field_specials/unk_83F6306.pal b/graphics/field_specials/unk_83F6306.pal similarity index 100% rename from data/field_specials/unk_83F6306.pal rename to graphics/field_specials/unk_83F6306.pal diff --git a/data/field_specials/unk_83F6326.pal b/graphics/field_specials/unk_83F6326.pal similarity index 100% rename from data/field_specials/unk_83F6326.pal rename to graphics/field_specials/unk_83F6326.pal diff --git a/data/field_specials/unk_83F6346.pal b/graphics/field_specials/unk_83F6346.pal similarity index 100% rename from data/field_specials/unk_83F6346.pal rename to graphics/field_specials/unk_83F6346.pal diff --git a/data/graphics/fonts/down_arrow.png b/graphics/fonts/down_arrow.png similarity index 100% rename from data/graphics/fonts/down_arrow.png rename to graphics/fonts/down_arrow.png diff --git a/data/graphics/fonts/down_arrow_2.png b/graphics/fonts/down_arrow_2.png similarity index 100% rename from data/graphics/fonts/down_arrow_2.png rename to graphics/fonts/down_arrow_2.png diff --git a/data/graphics/fonts/down_arrow_3.png b/graphics/fonts/down_arrow_3.png similarity index 100% rename from data/graphics/fonts/down_arrow_3.png rename to graphics/fonts/down_arrow_3.png diff --git a/data/graphics/fonts/down_arrow_4.png b/graphics/fonts/down_arrow_4.png similarity index 100% rename from data/graphics/fonts/down_arrow_4.png rename to graphics/fonts/down_arrow_4.png diff --git a/data/graphics/fonts/down_arrow_RS.png b/graphics/fonts/down_arrow_RS.png similarity index 100% rename from data/graphics/fonts/down_arrow_RS.png rename to 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 similarity index 100% rename from data/graphics/fonts/down_arrow_RS_2.png rename to graphics/fonts/down_arrow_RS_2.png diff --git a/data/graphics/fonts/font0_jap.png b/graphics/fonts/font0_jap.png similarity index 100% rename from data/graphics/fonts/font0_jap.png rename to graphics/fonts/font0_jap.png diff --git a/data/graphics/fonts/font0_latin.png b/graphics/fonts/font0_latin.png similarity index 100% rename from data/graphics/fonts/font0_latin.png rename to graphics/fonts/font0_latin.png diff --git a/data/graphics/fonts/font1_jap.png b/graphics/fonts/font1_jap.png similarity index 100% rename from data/graphics/fonts/font1_jap.png rename to graphics/fonts/font1_jap.png diff --git a/data/graphics/fonts/font1_latin.png b/graphics/fonts/font1_latin.png similarity index 100% rename from data/graphics/fonts/font1_latin.png rename to graphics/fonts/font1_latin.png diff --git a/data/graphics/fonts/font2_jap.png b/graphics/fonts/font2_jap.png similarity index 100% rename from data/graphics/fonts/font2_jap.png rename to graphics/fonts/font2_jap.png diff --git a/data/graphics/fonts/font2_latin.png b/graphics/fonts/font2_latin.png similarity index 100% rename from data/graphics/fonts/font2_latin.png rename to graphics/fonts/font2_latin.png diff --git a/data/graphics/fonts/font4_jap.png b/graphics/fonts/font4_jap.png similarity index 100% rename from data/graphics/fonts/font4_jap.png rename to graphics/fonts/font4_jap.png diff --git a/data/graphics/fonts/font4_latin.png b/graphics/fonts/font4_latin.png similarity index 100% rename from data/graphics/fonts/font4_latin.png rename to graphics/fonts/font4_latin.png diff --git a/data/graphics/fonts/font5_jap.png b/graphics/fonts/font5_jap.png similarity index 100% rename from data/graphics/fonts/font5_jap.png rename to graphics/fonts/font5_jap.png diff --git a/data/graphics/fonts/font5_latin.png b/graphics/fonts/font5_latin.png similarity index 100% rename from data/graphics/fonts/font5_latin.png rename to graphics/fonts/font5_latin.png diff --git a/data/graphics/fonts/font6_braille.png b/graphics/fonts/font6_braille.png similarity index 100% rename from data/graphics/fonts/font6_braille.png rename to graphics/fonts/font6_braille.png diff --git a/data/graphics/fonts/font9_jap.png b/graphics/fonts/font9_jap.png similarity index 100% rename from data/graphics/fonts/font9_jap.png rename to graphics/fonts/font9_jap.png diff --git a/data/graphics/fonts/keypad_icons.png b/graphics/fonts/keypad_icons.png similarity index 100% rename from data/graphics/fonts/keypad_icons.png rename to graphics/fonts/keypad_icons.png diff --git a/data/bag/bag_window_pal.pal b/graphics/item_menu/bag_window_pal.pal similarity index 100% rename from data/bag/bag_window_pal.pal rename to graphics/item_menu/bag_window_pal.pal diff --git a/data/itemfinder/spr_tiles.png b/graphics/itemfinder/spr_tiles.png similarity index 100% rename from data/itemfinder/spr_tiles.png rename to graphics/itemfinder/spr_tiles.png diff --git a/data/graphics/unk_847a348.png b/graphics/link_games/unk_847a348.png similarity index 100% rename from data/graphics/unk_847a348.png rename to graphics/link_games/unk_847a348.png diff --git a/data/main_menu/unk_8234648.pal b/graphics/main_menu/unk_8234648.pal similarity index 100% rename from data/main_menu/unk_8234648.pal rename to graphics/main_menu/unk_8234648.pal diff --git a/data/main_menu/unk_8234668.pal b/graphics/main_menu/unk_8234668.pal similarity index 100% rename from data/main_menu/unk_8234668.pal rename to graphics/main_menu/unk_8234668.pal diff --git a/data/map_preview/altering_cave_pal.pal b/graphics/map_preview/altering_cave_pal.pal similarity index 100% rename from data/map_preview/altering_cave_pal.pal rename to 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 similarity index 100% rename from data/map_preview/altering_cave_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/altering_cave_tiles.png rename to 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 similarity index 100% rename from data/map_preview/berry_forest_pal.pal rename to 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 similarity index 100% rename from data/map_preview/berry_forest_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/berry_forest_tiles.png rename to 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 similarity index 100% rename from data/map_preview/cerulean_cave_pal.pal rename to 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 similarity index 100% rename from data/map_preview/cerulean_cave_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/cerulean_cave_tiles.png rename to 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 similarity index 100% rename from data/map_preview/digletts_cave_pal.pal rename to 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 similarity index 100% rename from data/map_preview/digletts_cave_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/digletts_cave_tiles.png rename to 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 similarity index 100% rename from data/map_preview/dotted_hole_pal.pal rename to 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 similarity index 100% rename from data/map_preview/dotted_hole_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/dotted_hole_tiles.png rename to 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 similarity index 100% rename from data/map_preview/icefall_cave_pal.pal rename to 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 similarity index 100% rename from data/map_preview/icefall_cave_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/icefall_cave_tiles.png rename to 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 similarity index 100% rename from data/map_preview/kanto_safari_zone_pal.pal rename to 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 similarity index 100% rename from data/map_preview/kanto_safari_zone_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/kanto_safari_zone_tiles.png rename to 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 similarity index 100% rename from data/map_preview/kanto_victory_road_pal.pal rename to 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 similarity index 100% rename from data/map_preview/kanto_victory_road_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/kanto_victory_road_tiles.png rename to 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 similarity index 100% rename from data/map_preview/lost_cave_pal.pal rename to 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 similarity index 100% rename from data/map_preview/lost_cave_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/lost_cave_tiles.png rename to 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 similarity index 100% rename from data/map_preview/monean_chamber_pal.pal rename to 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 similarity index 100% rename from data/map_preview/monean_chamber_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/monean_chamber_tiles.png rename to 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 similarity index 100% rename from data/map_preview/mt_ember_pal.pal rename to 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 similarity index 100% rename from data/map_preview/mt_ember_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/mt_ember_tiles.png rename to 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 similarity index 100% rename from data/map_preview/mt_moon_pal.pal rename to 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 similarity index 100% rename from data/map_preview/mt_moon_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/mt_moon_tiles.png rename to 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 similarity index 100% rename from data/map_preview/pokemon_mansion_pal.pal rename to 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 similarity index 100% rename from data/map_preview/pokemon_mansion_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/pokemon_mansion_tiles.png rename to 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 similarity index 100% rename from data/map_preview/pokemon_tower_pal.pal rename to 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 similarity index 100% rename from data/map_preview/pokemon_tower_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/pokemon_tower_tiles.png rename to 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 similarity index 100% rename from data/map_preview/power_plant_pal.pal rename to 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 similarity index 100% rename from data/map_preview/power_plant_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/power_plant_tiles.png rename to 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 similarity index 100% rename from data/map_preview/rock_tunnel_pal.pal rename to 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 similarity index 100% rename from data/map_preview/rock_tunnel_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/rock_tunnel_tiles.png rename to 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 similarity index 100% rename from data/map_preview/rocket_hideout_pal.pal rename to 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 similarity index 100% rename from data/map_preview/rocket_hideout_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/rocket_hideout_tiles.png rename to 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 similarity index 100% rename from data/map_preview/rocket_warehouse_pal.pal rename to 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 similarity index 100% rename from data/map_preview/rocket_warehouse_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/rocket_warehouse_tiles.png rename to 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 similarity index 100% rename from data/map_preview/seafoam_islands_pal.pal rename to 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 similarity index 100% rename from data/map_preview/seafoam_islands_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/seafoam_islands_tiles.png rename to 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 similarity index 100% rename from data/map_preview/silph_co_pal.pal rename to 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 similarity index 100% rename from data/map_preview/silph_co_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/silph_co_tiles.png rename to 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 similarity index 100% rename from data/map_preview/viridian_forest_pal.pal rename to 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 similarity index 100% rename from data/map_preview/viridian_forest_tilemap.bin rename to 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 similarity index 100% rename from data/map_preview/viridian_forest_tiles.png rename to graphics/map_preview/viridian_forest_tiles.png diff --git a/data/graphics/mevent/gfx_46718C.png b/graphics/mevent/gfx_46718C.png similarity index 100% rename from data/graphics/mevent/gfx_46718C.png rename to graphics/mevent/gfx_46718C.png diff --git a/data/graphics/mevent/gfx_46737C.png b/graphics/mevent/gfx_46737C.png similarity index 100% rename from data/graphics/mevent/gfx_46737C.png rename to graphics/mevent/gfx_46737C.png diff --git a/data/graphics/mevent/gfx_467558.png b/graphics/mevent/gfx_467558.png similarity index 100% rename from data/graphics/mevent/gfx_467558.png rename to graphics/mevent/gfx_467558.png diff --git a/data/graphics/mevent/gfx_467700.png b/graphics/mevent/gfx_467700.png similarity index 100% rename from data/graphics/mevent/gfx_467700.png rename to graphics/mevent/gfx_467700.png diff --git a/data/graphics/mevent/gfx_467A7C.png b/graphics/mevent/gfx_467A7C.png similarity index 100% rename from data/graphics/mevent/gfx_467A7C.png rename to graphics/mevent/gfx_467A7C.png diff --git a/data/graphics/mevent/gfx_467EF4.png b/graphics/mevent/gfx_467EF4.png similarity index 100% rename from data/graphics/mevent/gfx_467EF4.png rename to graphics/mevent/gfx_467EF4.png diff --git a/data/graphics/mevent/gfx_4680C0.png b/graphics/mevent/gfx_4680C0.png similarity index 100% rename from data/graphics/mevent/gfx_4680C0.png rename to graphics/mevent/gfx_4680C0.png diff --git a/data/graphics/mevent/gfx_46821C.png b/graphics/mevent/gfx_46821C.png similarity index 100% rename from data/graphics/mevent/gfx_46821C.png rename to graphics/mevent/gfx_46821C.png diff --git a/data/graphics/mevent/gfx_46830C.png b/graphics/mevent/gfx_46830C.png similarity index 100% rename from data/graphics/mevent/gfx_46830C.png rename to graphics/mevent/gfx_46830C.png diff --git a/data/graphics/mevent/gfx_468448.png b/graphics/mevent/gfx_468448.png similarity index 100% rename from data/graphics/mevent/gfx_468448.png rename to graphics/mevent/gfx_468448.png diff --git a/data/graphics/mevent/gfx_4685B4.png b/graphics/mevent/gfx_4685B4.png similarity index 100% rename from data/graphics/mevent/gfx_4685B4.png rename to graphics/mevent/gfx_4685B4.png diff --git a/data/graphics/mevent/pal_46708C.pal b/graphics/mevent/pal_46708C.pal similarity index 100% rename from data/graphics/mevent/pal_46708C.pal rename to graphics/mevent/pal_46708C.pal diff --git a/data/graphics/mevent/pal_4670AC.pal b/graphics/mevent/pal_4670AC.pal similarity index 100% rename from data/graphics/mevent/pal_4670AC.pal rename to graphics/mevent/pal_4670AC.pal diff --git a/data/graphics/mevent/pal_4670CC.pal b/graphics/mevent/pal_4670CC.pal similarity index 100% rename from data/graphics/mevent/pal_4670CC.pal rename to graphics/mevent/pal_4670CC.pal diff --git a/data/graphics/mevent/pal_4670EC.pal b/graphics/mevent/pal_4670EC.pal similarity index 100% rename from data/graphics/mevent/pal_4670EC.pal rename to graphics/mevent/pal_4670EC.pal diff --git a/data/graphics/mevent/pal_46710C.pal b/graphics/mevent/pal_46710C.pal similarity index 100% rename from data/graphics/mevent/pal_46710C.pal rename to graphics/mevent/pal_46710C.pal diff --git a/data/graphics/mevent/pal_46712C.pal b/graphics/mevent/pal_46712C.pal similarity index 100% rename from data/graphics/mevent/pal_46712C.pal rename to graphics/mevent/pal_46712C.pal diff --git a/data/graphics/mevent/pal_46714C.pal b/graphics/mevent/pal_46714C.pal similarity index 100% rename from data/graphics/mevent/pal_46714C.pal rename to graphics/mevent/pal_46714C.pal diff --git a/data/graphics/mevent/pal_46716C.pal b/graphics/mevent/pal_46716C.pal similarity index 100% rename from data/graphics/mevent/pal_46716C.pal rename to graphics/mevent/pal_46716C.pal diff --git a/data/graphics/mevent/pal_467DF4.pal b/graphics/mevent/pal_467DF4.pal similarity index 100% rename from data/graphics/mevent/pal_467DF4.pal rename to graphics/mevent/pal_467DF4.pal diff --git a/data/graphics/mevent/pal_467E14.pal b/graphics/mevent/pal_467E14.pal similarity index 100% rename from data/graphics/mevent/pal_467E14.pal rename to graphics/mevent/pal_467E14.pal diff --git a/data/graphics/mevent/pal_467E34.pal b/graphics/mevent/pal_467E34.pal similarity index 100% rename from data/graphics/mevent/pal_467E34.pal rename to graphics/mevent/pal_467E34.pal diff --git a/data/graphics/mevent/pal_467E54.pal b/graphics/mevent/pal_467E54.pal similarity index 100% rename from data/graphics/mevent/pal_467E54.pal rename to graphics/mevent/pal_467E54.pal diff --git a/data/graphics/mevent/pal_467E74.pal b/graphics/mevent/pal_467E74.pal similarity index 100% rename from data/graphics/mevent/pal_467E74.pal rename to graphics/mevent/pal_467E74.pal diff --git a/data/graphics/mevent/pal_467E94.pal b/graphics/mevent/pal_467E94.pal similarity index 100% rename from data/graphics/mevent/pal_467E94.pal rename to graphics/mevent/pal_467E94.pal diff --git a/data/graphics/mevent/pal_467EB4.pal b/graphics/mevent/pal_467EB4.pal similarity index 100% rename from data/graphics/mevent/pal_467EB4.pal rename to graphics/mevent/pal_467EB4.pal diff --git a/data/graphics/mevent/pal_467ED4.pal b/graphics/mevent/pal_467ED4.pal similarity index 100% rename from data/graphics/mevent/pal_467ED4.pal rename to graphics/mevent/pal_467ED4.pal diff --git a/data/graphics/mevent/pal_468060.pal b/graphics/mevent/pal_468060.pal similarity index 100% rename from data/graphics/mevent/pal_468060.pal rename to graphics/mevent/pal_468060.pal diff --git a/data/graphics/mevent/pal_468080.pal b/graphics/mevent/pal_468080.pal similarity index 100% rename from data/graphics/mevent/pal_468080.pal rename to graphics/mevent/pal_468080.pal diff --git a/data/graphics/mevent/pal_4680A0.pal b/graphics/mevent/pal_4680A0.pal similarity index 100% rename from data/graphics/mevent/pal_4680A0.pal rename to graphics/mevent/pal_4680A0.pal diff --git a/data/graphics/mevent/tilemap_467288.bin b/graphics/mevent/tilemap_467288.bin similarity index 100% rename from data/graphics/mevent/tilemap_467288.bin rename to graphics/mevent/tilemap_467288.bin diff --git a/data/graphics/mevent/tilemap_467470.bin b/graphics/mevent/tilemap_467470.bin similarity index 100% rename from data/graphics/mevent/tilemap_467470.bin rename to graphics/mevent/tilemap_467470.bin diff --git a/data/graphics/mevent/tilemap_46762C.bin b/graphics/mevent/tilemap_46762C.bin similarity index 100% rename from data/graphics/mevent/tilemap_46762C.bin rename to graphics/mevent/tilemap_46762C.bin diff --git a/data/graphics/mevent/tilemap_467934.bin b/graphics/mevent/tilemap_467934.bin similarity index 100% rename from data/graphics/mevent/tilemap_467934.bin rename to graphics/mevent/tilemap_467934.bin diff --git a/data/graphics/mevent/tilemap_467CAC.bin b/graphics/mevent/tilemap_467CAC.bin similarity index 100% rename from data/graphics/mevent/tilemap_467CAC.bin rename to graphics/mevent/tilemap_467CAC.bin diff --git a/data/graphics/mevent/tilemap_468140.bin b/graphics/mevent/tilemap_468140.bin similarity index 100% rename from data/graphics/mevent/tilemap_468140.bin rename to graphics/mevent/tilemap_468140.bin diff --git a/data/graphics/mevent/tilemap_46824C.bin b/graphics/mevent/tilemap_46824C.bin similarity index 100% rename from data/graphics/mevent/tilemap_46824C.bin rename to graphics/mevent/tilemap_46824C.bin diff --git a/data/graphics/mevent/tilemap_46837C.bin b/graphics/mevent/tilemap_46837C.bin similarity index 100% rename from data/graphics/mevent/tilemap_46837C.bin rename to graphics/mevent/tilemap_46837C.bin diff --git a/data/graphics/mevent/tilemap_4684D8.bin b/graphics/mevent/tilemap_4684D8.bin similarity index 100% rename from data/graphics/mevent/tilemap_4684D8.bin rename to graphics/mevent/tilemap_4684D8.bin diff --git a/data/graphics/mevent/tilemap_468644.bin b/graphics/mevent/tilemap_468644.bin similarity index 100% rename from data/graphics/mevent/tilemap_468644.bin rename to graphics/mevent/tilemap_468644.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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_game_start_help_u_i.png rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_grass_platform.png rename to graphics/oak_speech/grass_platform.png diff --git a/data/oak_speech/help_docs_page2_tilemap.bin b/graphics/oak_speech/help_docs_page2_tilemap.bin similarity index 100% rename from data/oak_speech/help_docs_page2_tilemap.bin rename to 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 similarity index 100% rename from data/oak_speech/help_docs_page3_tilemap.bin rename to 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 similarity index 100% rename from data/oak_speech/help_docs_palette.pal rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_leaf_pal.pal rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_leaf_pic.png rename to 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 similarity index 100% rename from data/oak_speech/new_game_adventure_intro_tilemap.bin rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_oak_pal.pal rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_oak_pic.png rename to graphics/oak_speech/oak_pic.png diff --git a/data/oak_speech/oak_speech_background_tilemap.bin b/graphics/oak_speech/oak_speech_background_tilemap.bin similarity index 100% rename from data/oak_speech/oak_speech_background_tilemap.bin rename to graphics/oak_speech/oak_speech_background_tilemap.bin diff --git a/data/oak_speech/oak_speech_grass_platform_palette.pal b/graphics/oak_speech/oak_speech_grass_platform_palette.pal similarity index 100% rename from data/oak_speech/oak_speech_grass_platform_palette.pal rename to graphics/oak_speech/oak_speech_grass_platform_palette.pal diff --git a/data/oak_speech/oak_speech_pika_palette.pal b/graphics/oak_speech/oak_speech_pika_palette.pal similarity index 100% rename from data/oak_speech/oak_speech_pika_palette.pal rename to graphics/oak_speech/oak_speech_pika_palette.pal diff --git a/data/oak_speech/oak_speech_gfx_pika1.png b/graphics/oak_speech/pika1.png similarity index 100% rename from data/oak_speech/oak_speech_gfx_pika1.png rename to graphics/oak_speech/pika1.png diff --git a/data/oak_speech/oak_speech_gfx_pika2.png b/graphics/oak_speech/pika2.png similarity index 100% rename from data/oak_speech/oak_speech_gfx_pika2.png rename to graphics/oak_speech/pika2.png diff --git a/data/oak_speech/oak_speech_gfx_pika_eyes.png b/graphics/oak_speech/pika_eyes.png similarity index 100% rename from data/oak_speech/oak_speech_gfx_pika_eyes.png rename to graphics/oak_speech/pika_eyes.png diff --git a/data/oak_speech/oak_speech_gfx_red_pal.pal b/graphics/oak_speech/red_pal.pal similarity index 100% rename from data/oak_speech/oak_speech_gfx_red_pal.pal rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_red_pic.png rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_rival_pal.pal rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_rival_pic.png rename to 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 similarity index 100% rename from data/oak_speech/oak_speech_gfx_solid_colors.png rename to graphics/oak_speech/solid_colors.png diff --git a/data/pokedex_area_markers/marker.pal b/graphics/pokedex/area_markers/marker.pal similarity index 100% rename from data/pokedex_area_markers/marker.pal rename to graphics/pokedex/area_markers/marker.pal diff --git a/data/pokedex_area_markers/marker_0.png b/graphics/pokedex/area_markers/marker_0.png similarity index 100% rename from data/pokedex_area_markers/marker_0.png rename to 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 similarity index 100% rename from data/pokedex_area_markers/marker_1.png rename to 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 similarity index 100% rename from data/pokedex_area_markers/marker_2.png rename to 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 similarity index 100% rename from data/pokedex_area_markers/marker_3.png rename to 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 similarity index 100% rename from data/pokedex_area_markers/marker_4.png rename to 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 similarity index 100% rename from data/pokedex_area_markers/marker_5.png rename to 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 similarity index 100% rename from data/pokedex_area_markers/marker_6.png rename to graphics/pokedex/area_markers/marker_6.png diff --git a/data/script_menu/aerodactyl_fossil.png b/graphics/script_menu/aerodactyl_fossil.png similarity index 100% rename from data/script_menu/aerodactyl_fossil.png rename to graphics/script_menu/aerodactyl_fossil.png diff --git a/data/script_menu/kabutops_fossil.png b/graphics/script_menu/kabutops_fossil.png similarity index 100% rename from data/script_menu/kabutops_fossil.png rename to graphics/script_menu/kabutops_fossil.png diff --git a/data/seagallop/eb_tilemap.bin b/graphics/seagallop/eb_tilemap.bin similarity index 100% rename from data/seagallop/eb_tilemap.bin rename to graphics/seagallop/eb_tilemap.bin diff --git a/data/seagallop/ferry_and_wake.pal b/graphics/seagallop/ferry_and_wake.pal similarity index 100% rename from data/seagallop/ferry_and_wake.pal rename to graphics/seagallop/ferry_and_wake.pal diff --git a/data/seagallop/ferry_sprite.png b/graphics/seagallop/ferry_sprite.png similarity index 100% rename from data/seagallop/ferry_sprite.png rename to graphics/seagallop/ferry_sprite.png diff --git a/data/seagallop/wake.png b/graphics/seagallop/wake.png similarity index 100% rename from data/seagallop/wake.png rename to graphics/seagallop/wake.png diff --git a/data/seagallop/water.png b/graphics/seagallop/water.png similarity index 100% rename from data/seagallop/water.png rename to graphics/seagallop/water.png diff --git a/data/seagallop/wb_tilemap.bin b/graphics/seagallop/wb_tilemap.bin similarity index 100% rename from data/seagallop/wb_tilemap.bin rename to graphics/seagallop/wb_tilemap.bin diff --git a/data/graphics/title_screen/lg_border_bg.bin b/graphics/title_screen/lg_border_bg.bin similarity index 100% rename from data/graphics/title_screen/lg_border_bg.bin rename to graphics/title_screen/lg_border_bg.bin diff --git a/data/graphics/title_screen/unk_83BF58C.png b/graphics/title_screen/unk_83BF58C.png similarity index 100% rename from data/graphics/title_screen/unk_83BF58C.png rename to graphics/title_screen/unk_83BF58C.png diff --git a/data/graphics/title_screen/unk_83BF5A8.bin b/graphics/title_screen/unk_83BF5A8.bin similarity index 100% rename from data/graphics/title_screen/unk_83BF5A8.bin rename to graphics/title_screen/unk_83BF5A8.bin diff --git a/data/graphics/title_screen/unk_83bf64c.png b/graphics/title_screen/unk_83bf64c.png similarity index 100% rename from data/graphics/title_screen/unk_83bf64c.png rename to graphics/title_screen/unk_83bf64c.png diff --git a/data/graphics/title_screen/unk_83bf77c.pal b/graphics/title_screen/unk_83bf77c.pal similarity index 100% rename from data/graphics/title_screen/unk_83bf77c.pal rename to graphics/title_screen/unk_83bf77c.pal diff --git a/data/graphics/title_screen/unk_83bf79c.png b/graphics/title_screen/unk_83bf79c.png similarity index 100% rename from data/graphics/title_screen/unk_83bf79c.png rename to graphics/title_screen/unk_83bf79c.png diff --git a/data/graphics/title_screen/unk_83bfa14.png b/graphics/title_screen/unk_83bfa14.png similarity index 100% rename from data/graphics/title_screen/unk_83bfa14.png rename to 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 similarity index 100% rename from data/graphics/title_screen/unk_lg_83bf764.pal rename to 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 similarity index 100% rename from data/graphics/title_screen/unk_lg_83bf784.png rename to 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 similarity index 100% rename from data/graphics/title_screen/unk_lg_83bf89c.png rename to graphics/title_screen/unk_lg_83bf89c.png diff --git a/data/graphics/unknown_8456638.bin b/graphics/unknown/unknown_8456638.bin similarity index 100% rename from data/graphics/unknown_8456638.bin rename to graphics/unknown/unknown_8456638.bin diff --git a/data/graphics/unknown_84566a8.bin b/graphics/unknown/unknown_84566a8.bin similarity index 100% rename from data/graphics/unknown_84566a8.bin rename to 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/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..2b6baefe1 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 gUnknown_845F5A0[] = INCBIN_U16("graphics/fame_checker/pal_845f5a0.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 bd062e6bf..425528d50 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 c8a479efe..14c20496a 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/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 1788b17cc..fa949fd1e 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -21,69 +21,69 @@ 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 gViridianForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/viridian_forest_pal.gbapal"); +static const u8 gViridianForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/viridian_forest_tiles.4bpp.lz"); +static const u8 gViridianForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/viridian_forest_tilemap.bin"); +static const u8 gRockTunnelMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rock_tunnel_pal.gbapal"); +static const u8 gRockTunnelMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rock_tunnel_tiles.4bpp.lz"); +static const u8 gRockTunnelMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rock_tunnel_tilemap.bin"); +static const u8 gRocketHideoutMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_hideout_pal.gbapal"); +static const u8 gRocketHideoutMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_hideout_tiles.4bpp.lz"); +static const u8 gRocketHideoutMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_hideout_tilemap.bin"); +static const u8 gPowerPlantMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/power_plant_pal.gbapal"); +static const u8 gPowerPlantMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/power_plant_tiles.4bpp.lz"); +static const u8 gPowerPlantMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/power_plant_tilemap.bin"); +static const u8 gPokemonMansionMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_pal.gbapal"); +static const u8 gPokemonMansionMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_tiles.4bpp.lz"); +static const u8 gPokemonMansionMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_tilemap.bin"); +static const u8 gPokemonTowerMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_tower_pal.gbapal"); +static const u8 gPokemonTowerMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_tower_tiles.4bpp.lz"); +static const u8 gPokemonTowerMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_tower_tilemap.bin"); +static const u8 gSilphCoMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/silph_co_pal.gbapal"); +static const u8 gSilphCoMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/silph_co_tiles.4bpp.lz"); +static const u8 gSilphCoMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/silph_co_tilemap.bin"); +static const u8 gMtMoonMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_moon_pal.gbapal"); +static const u8 gMtMoonMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_moon_tiles.4bpp.lz"); +static const u8 gMtMoonMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_moon_tilemap.bin"); +static const u8 gSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/seafoam_islands_pal.gbapal"); +static const u8 gSeafoamIslandsMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/seafoam_islands_tiles.4bpp.lz"); +static const u8 gSeafoamIslandsMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/seafoam_islands_tilemap.bin"); +static const u8 gRocketWarehouseMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_pal.gbapal"); +static const u8 gRocketWarehouseMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_tiles.4bpp.lz"); +static const u8 gRocketWarehouseMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_tilemap.bin"); +static const u8 gKantoVictoryRoadMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_pal.gbapal"); +static const u8 gKantoVictoryRoadMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_tiles.4bpp.lz"); +static const u8 gKantoVictoryRoadMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_tilemap.bin"); +static const u8 gMtEmberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_ember_pal.gbapal"); +static const u8 gMtEmberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_ember_tiles.4bpp.lz"); +static const u8 gMtEmberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_ember_tilemap.bin"); +static const u8 gKantoSafariZoneMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_pal.gbapal"); +static const u8 gKantoSafariZoneMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_tiles.4bpp.lz"); +static const u8 gKantoSafariZoneMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_tilemap.bin"); +static const u8 gMoneanChamberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/monean_chamber_pal.gbapal"); +static const u8 gMoneanChamberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/monean_chamber_tiles.4bpp.lz"); +static const u8 gMoneanChamberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/monean_chamber_tilemap.bin"); +static const u8 gDottedHoleMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/dotted_hole_pal.gbapal"); +static const u8 gDottedHoleMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/dotted_hole_tiles.4bpp.lz"); +static const u8 gDottedHoleMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/dotted_hole_tilemap.bin"); +static const u8 gCeruleanCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/cerulean_cave_pal.gbapal"); +static const u8 gCeruleanCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/cerulean_cave_tiles.4bpp.lz"); +static const u8 gCeruleanCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/cerulean_cave_tilemap.bin"); +static const u8 gDiglettsCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/digletts_cave_pal.gbapal"); +static const u8 gDiglettsCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/digletts_cave_tiles.4bpp.lz"); +static const u8 gDiglettsCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/digletts_cave_tilemap.bin"); +static const u8 gLostCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/lost_cave_pal.gbapal"); +static const u8 gLostCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/lost_cave_tiles.4bpp.lz"); +static const u8 gLostCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/lost_cave_tilemap.bin"); +static const u8 gBerryForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/berry_forest_pal.gbapal"); +static const u8 gBerryForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/berry_forest_tiles.4bpp.lz"); +static const u8 gBerryForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/berry_forest_tilemap.bin"); +static const u8 gIcefallCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/icefall_cave_pal.gbapal"); +static const u8 gIcefallCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/icefall_cave_tiles.4bpp.lz"); +static const u8 gIcefallCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/icefall_cave_tilemap.bin"); +static const u8 gAlteringCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/altering_cave_pal.gbapal"); +static const u8 gAlteringCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/altering_cave_tiles.4bpp.lz"); +static const u8 gAlteringCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/altering_cave_tilemap.bin"); static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = { [MPS_VIRIDIAN_FOREST] = { diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c index d2df613ae..b4b0b65a6 100644 --- a/src/mevent_show_card.c +++ b/src/mevent_show_card.c @@ -80,33 +80,33 @@ 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 gCard0Pal[] = 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 gCard6Pal[] = INCBIN_U16("graphics/mevent/pal_46714C.gbapal"); +static const u16 gCard7Pal[] = 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 gUnknown_8467DF4[] = INCBIN_U16("graphics/mevent/pal_467DF4.gbapal"); +static const u16 gUnknown_8467E14[] = INCBIN_U16("graphics/mevent/pal_467E14.gbapal"); +static const u16 gUnknown_8467E34[] = INCBIN_U16("graphics/mevent/pal_467E34.gbapal"); +static const u16 gUnknown_8467E54[] = INCBIN_U16("graphics/mevent/pal_467E54.gbapal"); +static const u16 gUnknown_8467E74[] = INCBIN_U16("graphics/mevent/pal_467E74.gbapal"); +static const u16 gUnknown_8467E94[] = INCBIN_U16("graphics/mevent/pal_467E94.gbapal"); +static const u16 gUnknown_8467EB4[] = INCBIN_U16("graphics/mevent/pal_467EB4.gbapal"); +static const u16 gUnknown_8467ED4[] = INCBIN_U16("graphics/mevent/pal_467ED4.gbapal"); +static const u32 gUnknown_8467EF4[] = INCBIN_U32("graphics/mevent/gfx_467EF4.4bpp.lz"); static const struct CompressedSpriteSheet sShadowSpriteSheet = { gUnknown_8467EF4, 0x100, 0x8000 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..b6a7d0a8e 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/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/oak_speech_grass_platform_palette.gbapal"); +static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("graphics/oak_speech/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 51e09e899..4bb8c84ec 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -289,7 +289,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 gUnknown_8456638[] = INCBIN_U16("graphics/unknown/unknown_8456638.bin"); static const u8 sQuestLogTextLineYCoords[] = {17, 10, 3}; @@ -1829,7 +1829,7 @@ void sub_8112E3C(u8 a0, struct UnkStruct_300201C * a1, u16 a2) // Probable file boundary, help_message.c below, quest_log.c above -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 = { 0x00, 0, 15, 30, 5, 15, 0x008F 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 2d4d4a9b0..eb9f6d423 100644 --- a/src/text.c +++ b/src/text.c @@ -18,12 +18,12 @@ 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"); +const u8 gDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow.4bpp"); +const u8 gDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS.4bpp"); +const u8 gTinyArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_2.4bpp"); +const u8 gTinyDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS_2.4bpp"); +const u8 gDoubleArrowTiles1[] = INCBIN_U8("graphics/fonts/down_arrow_3.4bpp"); +const u8 gDoubleArrowTiles2[] = INCBIN_U8("graphics/fonts/down_arrow_4.4bpp"); const u8 gDownArrowYCoords[] = { 0x0, 0x10, 0x20, 0x10 }; const u8 gWindowVerticalScrollSpeeds[] = { 0x1, 0x2 , 0x4 , 0x0 }; @@ -78,10 +78,10 @@ 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 u16 gFont0LatinGlyphs[] = INCBIN_U16("graphics/fonts/font0_latin.latfont"); const u8 gFont0LatinGlyphWidths[] = { 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x05, 0x04, 0x04, 0x05, @@ -122,10 +122,10 @@ 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"); +const u16 gFont0JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font0_jap.fwjpnfont"); // Font 1 -const u16 gFont1LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font1_latin.latfont"); +const u16 gFont1LatinGlyphs[] = INCBIN_U16("graphics/fonts/font1_latin.latfont"); const u8 gFont1LatinGlyphWidths[] = { 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, @@ -166,10 +166,10 @@ 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"); +const u16 gFont1JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font1_jap.fwjpnfont"); // Font 2 -const u16 gFont2LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font2_latin.latfont"); +const u16 gFont2LatinGlyphs[] = INCBIN_U16("graphics/fonts/font2_latin.latfont"); const u8 gFont2LatinGlyphWidths[] = { 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, @@ -210,7 +210,7 @@ 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 u16 gFont2JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font2_jap.fwjpnfont"); const u8 gFont2JapaneseGlyphWidths[] = { 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, @@ -236,7 +236,7 @@ const u8 gFont2JapaneseGlyphWidths[] = }; // Font 4 -const u16 gFont4LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font4_latin.latfont"); +const u16 gFont4LatinGlyphs[] = INCBIN_U16("graphics/fonts/font4_latin.latfont"); const u8 gFont4LatinGlyphWidths[] = { 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, @@ -277,7 +277,7 @@ 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 u16 gFont4JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font4_jap.fwjpnfont"); const u8 gFont4JapaneseGlyphWidths[] = { 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, @@ -303,7 +303,7 @@ const u8 gFont4JapaneseGlyphWidths[] = }; // Font 5 -const u16 gFont5LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font5_latin.latfont"); +const u16 gFont5LatinGlyphs[] = INCBIN_U16("graphics/fonts/font5_latin.latfont"); const u8 gFont5LatinGlyphWidths[] = { 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, @@ -344,7 +344,7 @@ 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 u16 gFont5JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font5_jap.fwjpnfont"); const u8 gFont5JapaneseGlyphWidths[] = { 0x00, 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"); +const u16 gFont9JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font9_jap.fwjpnfont"); u16 Font0Func(struct TextPrinter *textPrinter) { 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 = {