From 100188ac439991954f82dd7788dd61e8b7d89919 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 6 Apr 2020 10:01:35 -0400 Subject: Move gfx out of data --- data/bag/bag_window_pal.pal | 19 ---- data/credits/unk_840C630.pal | 19 ---- data/credits/unk_840C650.png | Bin 1499 -> 0 bytes data/credits/unk_840CA54.bin | Bin 1024 -> 0 bytes data/credits/unk_840CB8C.bin | Bin 3200 -> 0 bytes data/credits/unk_840D228.bin | Bin 4992 -> 0 bytes data/credits/unk_840DC0C.bin | Bin 2048 -> 0 bytes data/credits/unk_840E158.bin | Bin 3200 -> 0 bytes data/credits/unk_840E904.bin | Bin 3840 -> 0 bytes data/credits/unk_840F240.bin | Bin 3200 -> 0 bytes data/credits/unk_840F944.bin | Bin 3840 -> 0 bytes data/credits/unk_8410198.bin | Bin 3200 -> 0 bytes data/credits/unk_84105B4.bin | Bin 4608 -> 0 bytes data/credits/unk_8410B20.bin | Bin 2048 -> 0 bytes data/credits/unk_8410B20.png | Bin 218 -> 0 bytes data/credits/unk_8410E10.pal | 19 ---- data/credits/unk_8410E30.png | Bin 2105 -> 0 bytes data/credits/unk_8411BF8.pal | 19 ---- data/credits/unk_8411C18.png | Bin 2083 -> 0 bytes data/credits/unk_84129A0.pal | 19 ---- data/credits/unk_84129C0.png | Bin 1162 -> 0 bytes data/credits/unk_8413318.pal | 19 ---- data/credits/unk_8413338.png | Bin 624 -> 0 bytes data/credits/unk_8413854.pal | 19 ---- data/credits/unk_8413874.png | Bin 632 -> 0 bytes data/credits/unk_8413D98.pal | 19 ---- data/credits/unk_8413DB8.png | Bin 786 -> 0 bytes data/fame_checker/img_845ce00.png | Bin 129 -> 0 bytes data/fame_checker/img_845cf00.png | Bin 297 -> 0 bytes data/fame_checker/img_845d100.png | Bin 177 -> 0 bytes data/fame_checker/img_845d520.png | Bin 726 -> 0 bytes data/fame_checker/img_845dd40.png | Bin 629 -> 0 bytes data/fame_checker/img_845e560.png | Bin 517 -> 0 bytes data/fame_checker/img_845ed80.png | Bin 761 -> 0 bytes data/fame_checker/pal_845d0e0.pal | 19 ---- data/fame_checker/pal_845d500.pal | 19 ---- data/fame_checker/pal_845dd20.pal | 19 ---- data/fame_checker/pal_845e540.pal | 19 ---- data/fame_checker/pal_845ed60.pal | 19 ---- data/fame_checker/pal_845f580.pal | 19 ---- data/fame_checker/pal_845f5a0.pal | 19 ---- data/fame_checker/pal_845f5c0.pal | 19 ---- data/fame_checker/tilemap_845c600.bin | Bin 2048 -> 0 bytes data/field_specials/unk_83F5F50.pal | 19 ---- data/field_specials/unk_83F5F70.pal | 19 ---- data/field_specials/unk_83F5F90.pal | 19 ---- data/field_specials/unk_83F5FB0.pal | 19 ---- data/field_specials/unk_83F5FD0.pal | 19 ---- data/field_specials/unk_83F5FF0.pal | 19 ---- data/field_specials/unk_83F6010.pal | 19 ---- data/field_specials/unk_83F6030.pal | 19 ---- data/field_specials/unk_83F6050.pal | 19 ---- data/field_specials/unk_83F6070.pal | 19 ---- data/field_specials/unk_83F6090.pal | 19 ---- data/field_specials/unk_83F60B0.pal | 19 ---- data/field_specials/unk_83F60D0.pal | 19 ---- data/field_specials/unk_83F60F0.pal | 19 ---- data/field_specials/unk_83F6110.pal | 19 ---- data/field_specials/unk_83F6130.pal | 19 ---- data/field_specials/unk_83F6150.pal | 19 ---- data/field_specials/unk_83F6170.pal | 19 ---- data/field_specials/unk_83F6190.pal | 19 ---- data/field_specials/unk_83F61B0.pal | 19 ---- data/field_specials/unk_83F61D0.pal | 19 ---- data/field_specials/unk_83F6206.pal | 19 ---- data/field_specials/unk_83F6226.pal | 19 ---- data/field_specials/unk_83F6246.pal | 19 ---- data/field_specials/unk_83F6266.pal | 19 ---- data/field_specials/unk_83F6286.pal | 19 ---- data/field_specials/unk_83F62A6.pal | 19 ---- data/field_specials/unk_83F62C6.pal | 19 ---- data/field_specials/unk_83F62E6.pal | 19 ---- data/field_specials/unk_83F6306.pal | 19 ---- data/field_specials/unk_83F6326.pal | 19 ---- data/field_specials/unk_83F6346.pal | 19 ---- data/graphics/fame_checker_bg.pal | 35 ------ data/graphics/fame_checker_bg.png | Bin 906 -> 0 bytes data/graphics/fame_checker_tilemap2.bin | Bin 2048 -> 0 bytes data/graphics/fame_checker_tilemap3.bin | Bin 2048 -> 0 bytes data/graphics/fonts/down_arrow.png | Bin 162 -> 0 bytes data/graphics/fonts/down_arrow_2.png | Bin 150 -> 0 bytes data/graphics/fonts/down_arrow_3.png | Bin 159 -> 0 bytes data/graphics/fonts/down_arrow_4.png | Bin 160 -> 0 bytes data/graphics/fonts/down_arrow_RS.png | Bin 163 -> 0 bytes data/graphics/fonts/down_arrow_RS_2.png | Bin 150 -> 0 bytes data/graphics/fonts/font0_jap.png | Bin 3073 -> 0 bytes data/graphics/fonts/font0_latin.png | Bin 3285 -> 0 bytes data/graphics/fonts/font1_jap.png | Bin 3135 -> 0 bytes data/graphics/fonts/font1_latin.png | Bin 3470 -> 0 bytes data/graphics/fonts/font2_jap.png | Bin 4532 -> 0 bytes data/graphics/fonts/font2_latin.png | Bin 3470 -> 0 bytes data/graphics/fonts/font4_jap.png | Bin 4480 -> 0 bytes data/graphics/fonts/font4_latin.png | Bin 3470 -> 0 bytes data/graphics/fonts/font5_jap.png | Bin 4507 -> 0 bytes data/graphics/fonts/font5_latin.png | Bin 3470 -> 0 bytes data/graphics/fonts/font6_braille.png | Bin 220 -> 0 bytes data/graphics/fonts/font9_jap.png | Bin 2281 -> 0 bytes data/graphics/fonts/keypad_icons.png | Bin 297 -> 0 bytes data/graphics/mevent/gfx_46718C.png | Bin 330 -> 0 bytes data/graphics/mevent/gfx_46737C.png | Bin 314 -> 0 bytes data/graphics/mevent/gfx_467558.png | Bin 288 -> 0 bytes data/graphics/mevent/gfx_467700.png | Bin 558 -> 0 bytes data/graphics/mevent/gfx_467A7C.png | Bin 551 -> 0 bytes data/graphics/mevent/gfx_467EF4.png | Bin 116 -> 0 bytes data/graphics/mevent/gfx_4680C0.png | Bin 169 -> 0 bytes data/graphics/mevent/gfx_46821C.png | Bin 103 -> 0 bytes data/graphics/mevent/gfx_46830C.png | Bin 146 -> 0 bytes data/graphics/mevent/gfx_468448.png | Bin 173 -> 0 bytes data/graphics/mevent/gfx_4685B4.png | Bin 173 -> 0 bytes data/graphics/mevent/pal_46708C.pal | 19 ---- data/graphics/mevent/pal_4670AC.pal | 19 ---- data/graphics/mevent/pal_4670CC.pal | 19 ---- data/graphics/mevent/pal_4670EC.pal | 19 ---- data/graphics/mevent/pal_46710C.pal | 19 ---- data/graphics/mevent/pal_46712C.pal | 19 ---- data/graphics/mevent/pal_46714C.pal | 19 ---- data/graphics/mevent/pal_46716C.pal | 19 ---- data/graphics/mevent/pal_467DF4.pal | 19 ---- data/graphics/mevent/pal_467E14.pal | 19 ---- data/graphics/mevent/pal_467E34.pal | 19 ---- data/graphics/mevent/pal_467E54.pal | 19 ---- data/graphics/mevent/pal_467E74.pal | 19 ---- data/graphics/mevent/pal_467E94.pal | 19 ---- data/graphics/mevent/pal_467EB4.pal | 19 ---- data/graphics/mevent/pal_467ED4.pal | 19 ---- data/graphics/mevent/pal_468060.pal | 19 ---- data/graphics/mevent/pal_468080.pal | 19 ---- data/graphics/mevent/pal_4680A0.pal | 19 ---- data/graphics/mevent/tilemap_467288.bin | Bin 1200 -> 0 bytes data/graphics/mevent/tilemap_467470.bin | Bin 1200 -> 0 bytes data/graphics/mevent/tilemap_46762C.bin | Bin 1200 -> 0 bytes data/graphics/mevent/tilemap_467934.bin | Bin 1200 -> 0 bytes data/graphics/mevent/tilemap_467CAC.bin | Bin 1200 -> 0 bytes data/graphics/mevent/tilemap_468140.bin | Bin 1440 -> 0 bytes data/graphics/mevent/tilemap_46824C.bin | Bin 1440 -> 0 bytes data/graphics/mevent/tilemap_46837C.bin | Bin 1440 -> 0 bytes data/graphics/mevent/tilemap_4684D8.bin | Bin 1440 -> 0 bytes data/graphics/mevent/tilemap_468644.bin | Bin 1440 -> 0 bytes data/graphics/title_screen/lg_border_bg.bin | 1 - data/graphics/title_screen/unk_83BF58C.png | Bin 78 -> 0 bytes data/graphics/title_screen/unk_83BF5A8.bin | 1 - data/graphics/title_screen/unk_83bf64c.png | Bin 188 -> 0 bytes data/graphics/title_screen/unk_83bf77c.pal | 19 ---- data/graphics/title_screen/unk_83bf79c.png | Bin 539 -> 0 bytes data/graphics/title_screen/unk_83bfa14.png | Bin 150 -> 0 bytes data/graphics/title_screen/unk_lg_83bf764.pal | 19 ---- data/graphics/title_screen/unk_lg_83bf784.png | Bin 350 -> 0 bytes data/graphics/title_screen/unk_lg_83bf89c.png | Bin 135 -> 0 bytes data/graphics/unk_847a348.png | Bin 828 -> 0 bytes data/graphics/unknown_8456638.bin | 1 - data/graphics/unknown_84566a8.bin | Bin 640 -> 0 bytes data/itemfinder/spr_tiles.png | Bin 279 -> 0 bytes data/main_menu/unk_8234648.pal | 19 ---- data/main_menu/unk_8234668.pal | 19 ---- data/map_preview/altering_cave_pal.pal | 35 ------ data/map_preview/altering_cave_tilemap.bin | Bin 976 -> 0 bytes data/map_preview/altering_cave_tiles.png | Bin 4476 -> 0 bytes data/map_preview/berry_forest_pal.pal | 35 ------ data/map_preview/berry_forest_tilemap.bin | Bin 992 -> 0 bytes data/map_preview/berry_forest_tiles.png | Bin 5875 -> 0 bytes data/map_preview/cerulean_cave_pal.pal | 35 ------ data/map_preview/cerulean_cave_tilemap.bin | Bin 1020 -> 0 bytes data/map_preview/cerulean_cave_tiles.png | Bin 4533 -> 0 bytes data/map_preview/digletts_cave_pal.pal | 35 ------ data/map_preview/digletts_cave_tilemap.bin | Bin 996 -> 0 bytes data/map_preview/digletts_cave_tiles.png | Bin 5235 -> 0 bytes data/map_preview/dotted_hole_pal.pal | 35 ------ data/map_preview/dotted_hole_tilemap.bin | Bin 836 -> 0 bytes data/map_preview/dotted_hole_tiles.png | Bin 4125 -> 0 bytes data/map_preview/icefall_cave_pal.pal | 35 ------ data/map_preview/icefall_cave_tilemap.bin | Bin 992 -> 0 bytes data/map_preview/icefall_cave_tiles.png | Bin 5268 -> 0 bytes data/map_preview/kanto_safari_zone_pal.pal | 35 ------ data/map_preview/kanto_safari_zone_tilemap.bin | Bin 864 -> 0 bytes data/map_preview/kanto_safari_zone_tiles.png | Bin 4931 -> 0 bytes data/map_preview/kanto_victory_road_pal.pal | 35 ------ data/map_preview/kanto_victory_road_tilemap.bin | Bin 956 -> 0 bytes data/map_preview/kanto_victory_road_tiles.png | Bin 5237 -> 0 bytes data/map_preview/lost_cave_pal.pal | 35 ------ data/map_preview/lost_cave_tilemap.bin | Bin 1000 -> 0 bytes data/map_preview/lost_cave_tiles.png | Bin 4428 -> 0 bytes data/map_preview/monean_chamber_pal.pal | 35 ------ data/map_preview/monean_chamber_tilemap.bin | Bin 860 -> 0 bytes data/map_preview/monean_chamber_tiles.png | Bin 4809 -> 0 bytes data/map_preview/mt_ember_pal.pal | 35 ------ data/map_preview/mt_ember_tilemap.bin | Bin 908 -> 0 bytes data/map_preview/mt_ember_tiles.png | Bin 5160 -> 0 bytes data/map_preview/mt_moon_pal.pal | 35 ------ data/map_preview/mt_moon_tilemap.bin | Bin 920 -> 0 bytes data/map_preview/mt_moon_tiles.png | Bin 5790 -> 0 bytes data/map_preview/pokemon_mansion_pal.pal | 35 ------ data/map_preview/pokemon_mansion_tilemap.bin | Bin 988 -> 0 bytes data/map_preview/pokemon_mansion_tiles.png | Bin 5595 -> 0 bytes data/map_preview/pokemon_tower_pal.pal | 35 ------ data/map_preview/pokemon_tower_tilemap.bin | Bin 788 -> 0 bytes data/map_preview/pokemon_tower_tiles.png | Bin 3379 -> 0 bytes data/map_preview/power_plant_pal.pal | 35 ------ data/map_preview/power_plant_tilemap.bin | Bin 948 -> 0 bytes data/map_preview/power_plant_tiles.png | Bin 3923 -> 0 bytes data/map_preview/rock_tunnel_pal.pal | 35 ------ data/map_preview/rock_tunnel_tilemap.bin | Bin 1008 -> 0 bytes data/map_preview/rock_tunnel_tiles.png | Bin 5019 -> 0 bytes data/map_preview/rocket_hideout_pal.pal | 35 ------ data/map_preview/rocket_hideout_tilemap.bin | Bin 604 -> 0 bytes data/map_preview/rocket_hideout_tiles.png | Bin 1764 -> 0 bytes data/map_preview/rocket_warehouse_pal.pal | 35 ------ data/map_preview/rocket_warehouse_tilemap.bin | Bin 700 -> 0 bytes data/map_preview/rocket_warehouse_tiles.png | Bin 2068 -> 0 bytes data/map_preview/seafoam_islands_pal.pal | 35 ------ data/map_preview/seafoam_islands_tilemap.bin | Bin 1016 -> 0 bytes data/map_preview/seafoam_islands_tiles.png | Bin 4997 -> 0 bytes data/map_preview/silph_co_pal.pal | 35 ------ data/map_preview/silph_co_tilemap.bin | Bin 928 -> 0 bytes data/map_preview/silph_co_tiles.png | Bin 3980 -> 0 bytes data/map_preview/viridian_forest_pal.pal | 35 ------ data/map_preview/viridian_forest_tilemap.bin | Bin 984 -> 0 bytes data/map_preview/viridian_forest_tiles.png | Bin 5543 -> 0 bytes data/oak_speech/help_docs_page2_tilemap.bin | Bin 160 -> 0 bytes data/oak_speech/help_docs_page3_tilemap.bin | Bin 160 -> 0 bytes data/oak_speech/help_docs_palette.pal | 67 ----------- .../new_game_adventure_intro_tilemap.bin | 2 - data/oak_speech/oak_speech_background_tilemap.bin | Bin 1280 -> 0 bytes .../oak_speech_gfx_game_start_help_u_i.png | Bin 1118 -> 0 bytes data/oak_speech/oak_speech_gfx_grass_platform.png | Bin 341 -> 0 bytes data/oak_speech/oak_speech_gfx_leaf_pal.pal | 35 ------ data/oak_speech/oak_speech_gfx_leaf_pic.png | Bin 1219 -> 0 bytes data/oak_speech/oak_speech_gfx_oak_pal.pal | 35 ------ data/oak_speech/oak_speech_gfx_oak_pic.png | Bin 1172 -> 0 bytes data/oak_speech/oak_speech_gfx_pika1.png | Bin 414 -> 0 bytes data/oak_speech/oak_speech_gfx_pika2.png | Bin 297 -> 0 bytes data/oak_speech/oak_speech_gfx_pika_eyes.png | Bin 187 -> 0 bytes data/oak_speech/oak_speech_gfx_red_pal.pal | 35 ------ data/oak_speech/oak_speech_gfx_red_pic.png | Bin 1087 -> 0 bytes data/oak_speech/oak_speech_gfx_rival_pal.pal | 35 ------ data/oak_speech/oak_speech_gfx_rival_pic.png | Bin 970 -> 0 bytes data/oak_speech/oak_speech_gfx_solid_colors.png | Bin 110 -> 0 bytes .../oak_speech_grass_platform_palette.pal | 19 ---- data/oak_speech/oak_speech_pika_palette.pal | 19 ---- data/pokedex_area_markers/marker.pal | 19 ---- data/pokedex_area_markers/marker_0.png | Bin 157 -> 0 bytes data/pokedex_area_markers/marker_1.png | Bin 165 -> 0 bytes data/pokedex_area_markers/marker_2.png | Bin 165 -> 0 bytes data/pokedex_area_markers/marker_3.png | Bin 175 -> 0 bytes data/pokedex_area_markers/marker_4.png | Bin 177 -> 0 bytes data/pokedex_area_markers/marker_5.png | Bin 180 -> 0 bytes data/pokedex_area_markers/marker_6.png | Bin 186 -> 0 bytes data/script_menu/aerodactyl_fossil.png | Bin 767 -> 0 bytes data/script_menu/kabutops_fossil.png | Bin 747 -> 0 bytes data/seagallop/eb_tilemap.bin | Bin 2048 -> 0 bytes data/seagallop/ferry_and_wake.pal | 19 ---- data/seagallop/ferry_sprite.png | Bin 595 -> 0 bytes data/seagallop/wake.png | Bin 574 -> 0 bytes data/seagallop/water.png | Bin 283 -> 0 bytes data/seagallop/wb_tilemap.bin | Bin 2048 -> 0 bytes graphics/credits/unk_840C630.pal | 19 ++++ graphics/credits/unk_840C650.png | Bin 0 -> 1499 bytes graphics/credits/unk_840CA54.bin | Bin 0 -> 1024 bytes graphics/credits/unk_840CB8C.bin | Bin 0 -> 3200 bytes graphics/credits/unk_840D228.bin | Bin 0 -> 4992 bytes graphics/credits/unk_840DC0C.bin | Bin 0 -> 2048 bytes graphics/credits/unk_840E158.bin | Bin 0 -> 3200 bytes graphics/credits/unk_840E904.bin | Bin 0 -> 3840 bytes graphics/credits/unk_840F240.bin | Bin 0 -> 3200 bytes graphics/credits/unk_840F944.bin | Bin 0 -> 3840 bytes graphics/credits/unk_8410198.bin | Bin 0 -> 3200 bytes graphics/credits/unk_84105B4.bin | Bin 0 -> 4608 bytes graphics/credits/unk_8410B20.bin | Bin 0 -> 2048 bytes graphics/credits/unk_8410B20.png | Bin 0 -> 218 bytes graphics/credits/unk_8410E10.pal | 19 ++++ graphics/credits/unk_8410E30.png | Bin 0 -> 2105 bytes graphics/credits/unk_8411BF8.pal | 19 ++++ graphics/credits/unk_8411C18.png | Bin 0 -> 2083 bytes graphics/credits/unk_84129A0.pal | 19 ++++ graphics/credits/unk_84129C0.png | Bin 0 -> 1162 bytes graphics/credits/unk_8413318.pal | 19 ++++ graphics/credits/unk_8413338.png | Bin 0 -> 624 bytes graphics/credits/unk_8413854.pal | 19 ++++ graphics/credits/unk_8413874.png | Bin 0 -> 632 bytes graphics/credits/unk_8413D98.pal | 19 ++++ graphics/credits/unk_8413DB8.png | Bin 0 -> 786 bytes graphics/fame_checker/bg.pal | 35 ++++++ graphics/fame_checker/bg.png | Bin 0 -> 906 bytes graphics/fame_checker/bill.pal | 19 ++++ graphics/fame_checker/bill.png | Bin 0 -> 629 bytes graphics/fame_checker/cursor.pal | 19 ++++ graphics/fame_checker/cursor.png | Bin 0 -> 177 bytes graphics/fame_checker/daisy.pal | 19 ++++ graphics/fame_checker/daisy.png | Bin 0 -> 517 bytes graphics/fame_checker/mr_fuji.pal | 19 ++++ graphics/fame_checker/mr_fuji.png | Bin 0 -> 726 bytes graphics/fame_checker/pal_845f5a0.pal | 19 ++++ graphics/fame_checker/prof_oak.pal | 19 ++++ graphics/fame_checker/prof_oak.png | Bin 0 -> 761 bytes graphics/fame_checker/question_mark.png | Bin 0 -> 129 bytes graphics/fame_checker/silhouette.pal | 19 ++++ graphics/fame_checker/spinning_pokeball.pal | 19 ++++ graphics/fame_checker/spinning_pokeball.png | Bin 0 -> 297 bytes graphics/fame_checker/tilemap1.bin | Bin 0 -> 2048 bytes graphics/fame_checker/tilemap2.bin | Bin 0 -> 2048 bytes graphics/fame_checker/tilemap3.bin | Bin 0 -> 2048 bytes graphics/field_specials/unk_83F5F50.pal | 19 ++++ graphics/field_specials/unk_83F5F70.pal | 19 ++++ graphics/field_specials/unk_83F5F90.pal | 19 ++++ graphics/field_specials/unk_83F5FB0.pal | 19 ++++ graphics/field_specials/unk_83F5FD0.pal | 19 ++++ graphics/field_specials/unk_83F5FF0.pal | 19 ++++ graphics/field_specials/unk_83F6010.pal | 19 ++++ graphics/field_specials/unk_83F6030.pal | 19 ++++ graphics/field_specials/unk_83F6050.pal | 19 ++++ graphics/field_specials/unk_83F6070.pal | 19 ++++ graphics/field_specials/unk_83F6090.pal | 19 ++++ graphics/field_specials/unk_83F60B0.pal | 19 ++++ graphics/field_specials/unk_83F60D0.pal | 19 ++++ graphics/field_specials/unk_83F60F0.pal | 19 ++++ graphics/field_specials/unk_83F6110.pal | 19 ++++ graphics/field_specials/unk_83F6130.pal | 19 ++++ graphics/field_specials/unk_83F6150.pal | 19 ++++ graphics/field_specials/unk_83F6170.pal | 19 ++++ graphics/field_specials/unk_83F6190.pal | 19 ++++ graphics/field_specials/unk_83F61B0.pal | 19 ++++ graphics/field_specials/unk_83F61D0.pal | 19 ++++ graphics/field_specials/unk_83F6206.pal | 19 ++++ graphics/field_specials/unk_83F6226.pal | 19 ++++ graphics/field_specials/unk_83F6246.pal | 19 ++++ graphics/field_specials/unk_83F6266.pal | 19 ++++ graphics/field_specials/unk_83F6286.pal | 19 ++++ graphics/field_specials/unk_83F62A6.pal | 19 ++++ graphics/field_specials/unk_83F62C6.pal | 19 ++++ graphics/field_specials/unk_83F62E6.pal | 19 ++++ graphics/field_specials/unk_83F6306.pal | 19 ++++ graphics/field_specials/unk_83F6326.pal | 19 ++++ graphics/field_specials/unk_83F6346.pal | 19 ++++ graphics/fonts/down_arrow.png | Bin 0 -> 162 bytes graphics/fonts/down_arrow_2.png | Bin 0 -> 150 bytes graphics/fonts/down_arrow_3.png | Bin 0 -> 159 bytes graphics/fonts/down_arrow_4.png | Bin 0 -> 160 bytes graphics/fonts/down_arrow_RS.png | Bin 0 -> 163 bytes graphics/fonts/down_arrow_RS_2.png | Bin 0 -> 150 bytes graphics/fonts/font0_jap.png | Bin 0 -> 3073 bytes graphics/fonts/font0_latin.png | Bin 0 -> 3285 bytes graphics/fonts/font1_jap.png | Bin 0 -> 3135 bytes graphics/fonts/font1_latin.png | Bin 0 -> 3470 bytes graphics/fonts/font2_jap.png | Bin 0 -> 4532 bytes graphics/fonts/font2_latin.png | Bin 0 -> 3470 bytes graphics/fonts/font4_jap.png | Bin 0 -> 4480 bytes graphics/fonts/font4_latin.png | Bin 0 -> 3470 bytes graphics/fonts/font5_jap.png | Bin 0 -> 4507 bytes graphics/fonts/font5_latin.png | Bin 0 -> 3470 bytes graphics/fonts/font6_braille.png | Bin 0 -> 220 bytes graphics/fonts/font9_jap.png | Bin 0 -> 2281 bytes graphics/fonts/keypad_icons.png | Bin 0 -> 297 bytes graphics/item_menu/bag_window_pal.pal | 19 ++++ graphics/itemfinder/spr_tiles.png | Bin 0 -> 279 bytes graphics/link_games/unk_847a348.png | Bin 0 -> 828 bytes graphics/main_menu/unk_8234648.pal | 19 ++++ graphics/main_menu/unk_8234668.pal | 19 ++++ graphics/map_preview/altering_cave_pal.pal | 35 ++++++ graphics/map_preview/altering_cave_tilemap.bin | Bin 0 -> 976 bytes graphics/map_preview/altering_cave_tiles.png | Bin 0 -> 4476 bytes graphics/map_preview/berry_forest_pal.pal | 35 ++++++ graphics/map_preview/berry_forest_tilemap.bin | Bin 0 -> 992 bytes graphics/map_preview/berry_forest_tiles.png | Bin 0 -> 5875 bytes graphics/map_preview/cerulean_cave_pal.pal | 35 ++++++ graphics/map_preview/cerulean_cave_tilemap.bin | Bin 0 -> 1020 bytes graphics/map_preview/cerulean_cave_tiles.png | Bin 0 -> 4533 bytes graphics/map_preview/digletts_cave_pal.pal | 35 ++++++ graphics/map_preview/digletts_cave_tilemap.bin | Bin 0 -> 996 bytes graphics/map_preview/digletts_cave_tiles.png | Bin 0 -> 5235 bytes graphics/map_preview/dotted_hole_pal.pal | 35 ++++++ graphics/map_preview/dotted_hole_tilemap.bin | Bin 0 -> 836 bytes graphics/map_preview/dotted_hole_tiles.png | Bin 0 -> 4125 bytes graphics/map_preview/icefall_cave_pal.pal | 35 ++++++ graphics/map_preview/icefall_cave_tilemap.bin | Bin 0 -> 992 bytes graphics/map_preview/icefall_cave_tiles.png | Bin 0 -> 5268 bytes graphics/map_preview/kanto_safari_zone_pal.pal | 35 ++++++ graphics/map_preview/kanto_safari_zone_tilemap.bin | Bin 0 -> 864 bytes graphics/map_preview/kanto_safari_zone_tiles.png | Bin 0 -> 4931 bytes graphics/map_preview/kanto_victory_road_pal.pal | 35 ++++++ .../map_preview/kanto_victory_road_tilemap.bin | Bin 0 -> 956 bytes graphics/map_preview/kanto_victory_road_tiles.png | Bin 0 -> 5237 bytes graphics/map_preview/lost_cave_pal.pal | 35 ++++++ graphics/map_preview/lost_cave_tilemap.bin | Bin 0 -> 1000 bytes graphics/map_preview/lost_cave_tiles.png | Bin 0 -> 4428 bytes graphics/map_preview/monean_chamber_pal.pal | 35 ++++++ graphics/map_preview/monean_chamber_tilemap.bin | Bin 0 -> 860 bytes graphics/map_preview/monean_chamber_tiles.png | Bin 0 -> 4809 bytes graphics/map_preview/mt_ember_pal.pal | 35 ++++++ graphics/map_preview/mt_ember_tilemap.bin | Bin 0 -> 908 bytes graphics/map_preview/mt_ember_tiles.png | Bin 0 -> 5160 bytes graphics/map_preview/mt_moon_pal.pal | 35 ++++++ graphics/map_preview/mt_moon_tilemap.bin | Bin 0 -> 920 bytes graphics/map_preview/mt_moon_tiles.png | Bin 0 -> 5790 bytes graphics/map_preview/pokemon_mansion_pal.pal | 35 ++++++ graphics/map_preview/pokemon_mansion_tilemap.bin | Bin 0 -> 988 bytes graphics/map_preview/pokemon_mansion_tiles.png | Bin 0 -> 5595 bytes graphics/map_preview/pokemon_tower_pal.pal | 35 ++++++ graphics/map_preview/pokemon_tower_tilemap.bin | Bin 0 -> 788 bytes graphics/map_preview/pokemon_tower_tiles.png | Bin 0 -> 3379 bytes graphics/map_preview/power_plant_pal.pal | 35 ++++++ graphics/map_preview/power_plant_tilemap.bin | Bin 0 -> 948 bytes graphics/map_preview/power_plant_tiles.png | Bin 0 -> 3923 bytes graphics/map_preview/rock_tunnel_pal.pal | 35 ++++++ graphics/map_preview/rock_tunnel_tilemap.bin | Bin 0 -> 1008 bytes graphics/map_preview/rock_tunnel_tiles.png | Bin 0 -> 5019 bytes graphics/map_preview/rocket_hideout_pal.pal | 35 ++++++ graphics/map_preview/rocket_hideout_tilemap.bin | Bin 0 -> 604 bytes graphics/map_preview/rocket_hideout_tiles.png | Bin 0 -> 1764 bytes graphics/map_preview/rocket_warehouse_pal.pal | 35 ++++++ graphics/map_preview/rocket_warehouse_tilemap.bin | Bin 0 -> 700 bytes graphics/map_preview/rocket_warehouse_tiles.png | Bin 0 -> 2068 bytes graphics/map_preview/seafoam_islands_pal.pal | 35 ++++++ graphics/map_preview/seafoam_islands_tilemap.bin | Bin 0 -> 1016 bytes graphics/map_preview/seafoam_islands_tiles.png | Bin 0 -> 4997 bytes graphics/map_preview/silph_co_pal.pal | 35 ++++++ graphics/map_preview/silph_co_tilemap.bin | Bin 0 -> 928 bytes graphics/map_preview/silph_co_tiles.png | Bin 0 -> 3980 bytes graphics/map_preview/viridian_forest_pal.pal | 35 ++++++ graphics/map_preview/viridian_forest_tilemap.bin | Bin 0 -> 984 bytes graphics/map_preview/viridian_forest_tiles.png | Bin 0 -> 5543 bytes graphics/mevent/gfx_46718C.png | Bin 0 -> 330 bytes graphics/mevent/gfx_46737C.png | Bin 0 -> 314 bytes graphics/mevent/gfx_467558.png | Bin 0 -> 288 bytes graphics/mevent/gfx_467700.png | Bin 0 -> 558 bytes graphics/mevent/gfx_467A7C.png | Bin 0 -> 551 bytes graphics/mevent/gfx_467EF4.png | Bin 0 -> 116 bytes graphics/mevent/gfx_4680C0.png | Bin 0 -> 169 bytes graphics/mevent/gfx_46821C.png | Bin 0 -> 103 bytes graphics/mevent/gfx_46830C.png | Bin 0 -> 146 bytes graphics/mevent/gfx_468448.png | Bin 0 -> 173 bytes graphics/mevent/gfx_4685B4.png | Bin 0 -> 173 bytes graphics/mevent/pal_46708C.pal | 19 ++++ graphics/mevent/pal_4670AC.pal | 19 ++++ graphics/mevent/pal_4670CC.pal | 19 ++++ graphics/mevent/pal_4670EC.pal | 19 ++++ graphics/mevent/pal_46710C.pal | 19 ++++ graphics/mevent/pal_46712C.pal | 19 ++++ graphics/mevent/pal_46714C.pal | 19 ++++ graphics/mevent/pal_46716C.pal | 19 ++++ graphics/mevent/pal_467DF4.pal | 19 ++++ graphics/mevent/pal_467E14.pal | 19 ++++ graphics/mevent/pal_467E34.pal | 19 ++++ graphics/mevent/pal_467E54.pal | 19 ++++ graphics/mevent/pal_467E74.pal | 19 ++++ graphics/mevent/pal_467E94.pal | 19 ++++ graphics/mevent/pal_467EB4.pal | 19 ++++ graphics/mevent/pal_467ED4.pal | 19 ++++ graphics/mevent/pal_468060.pal | 19 ++++ graphics/mevent/pal_468080.pal | 19 ++++ graphics/mevent/pal_4680A0.pal | 19 ++++ graphics/mevent/tilemap_467288.bin | Bin 0 -> 1200 bytes graphics/mevent/tilemap_467470.bin | Bin 0 -> 1200 bytes graphics/mevent/tilemap_46762C.bin | Bin 0 -> 1200 bytes graphics/mevent/tilemap_467934.bin | Bin 0 -> 1200 bytes graphics/mevent/tilemap_467CAC.bin | Bin 0 -> 1200 bytes graphics/mevent/tilemap_468140.bin | Bin 0 -> 1440 bytes graphics/mevent/tilemap_46824C.bin | Bin 0 -> 1440 bytes graphics/mevent/tilemap_46837C.bin | Bin 0 -> 1440 bytes graphics/mevent/tilemap_4684D8.bin | Bin 0 -> 1440 bytes graphics/mevent/tilemap_468644.bin | Bin 0 -> 1440 bytes graphics/oak_speech/game_start_help_ui.png | Bin 0 -> 1118 bytes graphics/oak_speech/grass_platform.png | Bin 0 -> 341 bytes graphics/oak_speech/help_docs_page2_tilemap.bin | Bin 0 -> 160 bytes graphics/oak_speech/help_docs_page3_tilemap.bin | Bin 0 -> 160 bytes graphics/oak_speech/help_docs_palette.pal | 67 +++++++++++ graphics/oak_speech/leaf_pal.pal | 35 ++++++ graphics/oak_speech/leaf_pic.png | Bin 0 -> 1219 bytes .../new_game_adventure_intro_tilemap.bin | 2 + graphics/oak_speech/oak_pal.pal | 35 ++++++ graphics/oak_speech/oak_pic.png | Bin 0 -> 1172 bytes .../oak_speech/oak_speech_background_tilemap.bin | Bin 0 -> 1280 bytes .../oak_speech_grass_platform_palette.pal | 19 ++++ graphics/oak_speech/oak_speech_pika_palette.pal | 19 ++++ graphics/oak_speech/pika1.png | Bin 0 -> 414 bytes graphics/oak_speech/pika2.png | Bin 0 -> 297 bytes graphics/oak_speech/pika_eyes.png | Bin 0 -> 187 bytes graphics/oak_speech/red_pal.pal | 35 ++++++ graphics/oak_speech/red_pic.png | Bin 0 -> 1087 bytes graphics/oak_speech/rival_pal.pal | 35 ++++++ graphics/oak_speech/rival_pic.png | Bin 0 -> 970 bytes graphics/oak_speech/solid_colors.png | Bin 0 -> 110 bytes graphics/pokedex/area_markers/marker.pal | 19 ++++ graphics/pokedex/area_markers/marker_0.png | Bin 0 -> 157 bytes graphics/pokedex/area_markers/marker_1.png | Bin 0 -> 165 bytes graphics/pokedex/area_markers/marker_2.png | Bin 0 -> 165 bytes graphics/pokedex/area_markers/marker_3.png | Bin 0 -> 175 bytes graphics/pokedex/area_markers/marker_4.png | Bin 0 -> 177 bytes graphics/pokedex/area_markers/marker_5.png | Bin 0 -> 180 bytes graphics/pokedex/area_markers/marker_6.png | Bin 0 -> 186 bytes graphics/script_menu/aerodactyl_fossil.png | Bin 0 -> 767 bytes graphics/script_menu/kabutops_fossil.png | Bin 0 -> 747 bytes graphics/seagallop/eb_tilemap.bin | Bin 0 -> 2048 bytes graphics/seagallop/ferry_and_wake.pal | 19 ++++ graphics/seagallop/ferry_sprite.png | Bin 0 -> 595 bytes graphics/seagallop/wake.png | Bin 0 -> 574 bytes graphics/seagallop/water.png | Bin 0 -> 283 bytes graphics/seagallop/wb_tilemap.bin | Bin 0 -> 2048 bytes graphics/title_screen/lg_border_bg.bin | 1 + graphics/title_screen/unk_83BF58C.png | Bin 0 -> 78 bytes graphics/title_screen/unk_83BF5A8.bin | 1 + graphics/title_screen/unk_83bf64c.png | Bin 0 -> 188 bytes graphics/title_screen/unk_83bf77c.pal | 19 ++++ graphics/title_screen/unk_83bf79c.png | Bin 0 -> 539 bytes graphics/title_screen/unk_83bfa14.png | Bin 0 -> 150 bytes graphics/title_screen/unk_lg_83bf764.pal | 19 ++++ graphics/title_screen/unk_lg_83bf784.png | Bin 0 -> 350 bytes graphics/title_screen/unk_lg_83bf89c.png | Bin 0 -> 135 bytes graphics/unknown/unknown_8456638.bin | 1 + graphics/unknown/unknown_84566a8.bin | Bin 0 -> 640 bytes graphics_file_rules.mk | 33 +----- src/bag.c | 2 +- src/braille_text.c | 2 +- src/credits.c | 54 ++++----- src/fame_checker.c | 32 +++--- src/field_specials.c | 64 +++++------ src/graphics.c | 8 +- src/itemfinder.c | 2 +- src/main_menu.c | 4 +- src/map_preview_screen.c | 126 ++++++++++----------- src/mevent_show_card.c | 54 ++++----- src/mevent_show_news.c | 26 ++--- src/minigame_countdown.c | 4 +- src/oak_speech.c | 42 +++---- src/pokedex_area_markers.c | 4 +- src/quest_log.c | 4 +- src/script_menu.c | 8 +- src/seagallop.c | 14 +-- src/text.c | 36 +++--- src/title_screen.c | 20 ++-- 528 files changed, 2666 insertions(+), 2687 deletions(-) delete mode 100644 data/bag/bag_window_pal.pal delete mode 100644 data/credits/unk_840C630.pal delete mode 100644 data/credits/unk_840C650.png delete mode 100644 data/credits/unk_840CA54.bin delete mode 100644 data/credits/unk_840CB8C.bin delete mode 100644 data/credits/unk_840D228.bin delete mode 100644 data/credits/unk_840DC0C.bin delete mode 100644 data/credits/unk_840E158.bin delete mode 100644 data/credits/unk_840E904.bin delete mode 100644 data/credits/unk_840F240.bin delete mode 100644 data/credits/unk_840F944.bin delete mode 100644 data/credits/unk_8410198.bin delete mode 100644 data/credits/unk_84105B4.bin delete mode 100644 data/credits/unk_8410B20.bin delete mode 100644 data/credits/unk_8410B20.png delete mode 100644 data/credits/unk_8410E10.pal delete mode 100644 data/credits/unk_8410E30.png delete mode 100644 data/credits/unk_8411BF8.pal delete mode 100644 data/credits/unk_8411C18.png delete mode 100644 data/credits/unk_84129A0.pal delete mode 100644 data/credits/unk_84129C0.png delete mode 100644 data/credits/unk_8413318.pal delete mode 100644 data/credits/unk_8413338.png delete mode 100644 data/credits/unk_8413854.pal delete mode 100644 data/credits/unk_8413874.png delete mode 100644 data/credits/unk_8413D98.pal delete mode 100644 data/credits/unk_8413DB8.png delete mode 100644 data/fame_checker/img_845ce00.png delete mode 100644 data/fame_checker/img_845cf00.png delete mode 100644 data/fame_checker/img_845d100.png delete mode 100644 data/fame_checker/img_845d520.png delete mode 100644 data/fame_checker/img_845dd40.png delete mode 100644 data/fame_checker/img_845e560.png delete mode 100644 data/fame_checker/img_845ed80.png delete mode 100644 data/fame_checker/pal_845d0e0.pal delete mode 100644 data/fame_checker/pal_845d500.pal delete mode 100644 data/fame_checker/pal_845dd20.pal delete mode 100644 data/fame_checker/pal_845e540.pal delete mode 100644 data/fame_checker/pal_845ed60.pal delete mode 100644 data/fame_checker/pal_845f580.pal delete mode 100644 data/fame_checker/pal_845f5a0.pal delete mode 100644 data/fame_checker/pal_845f5c0.pal delete mode 100644 data/fame_checker/tilemap_845c600.bin delete mode 100644 data/field_specials/unk_83F5F50.pal delete mode 100644 data/field_specials/unk_83F5F70.pal delete mode 100644 data/field_specials/unk_83F5F90.pal delete mode 100644 data/field_specials/unk_83F5FB0.pal delete mode 100644 data/field_specials/unk_83F5FD0.pal delete mode 100644 data/field_specials/unk_83F5FF0.pal delete mode 100644 data/field_specials/unk_83F6010.pal delete mode 100644 data/field_specials/unk_83F6030.pal delete mode 100644 data/field_specials/unk_83F6050.pal delete mode 100644 data/field_specials/unk_83F6070.pal delete mode 100644 data/field_specials/unk_83F6090.pal delete mode 100644 data/field_specials/unk_83F60B0.pal delete mode 100644 data/field_specials/unk_83F60D0.pal delete mode 100644 data/field_specials/unk_83F60F0.pal delete mode 100644 data/field_specials/unk_83F6110.pal delete mode 100644 data/field_specials/unk_83F6130.pal delete mode 100644 data/field_specials/unk_83F6150.pal delete mode 100644 data/field_specials/unk_83F6170.pal delete mode 100644 data/field_specials/unk_83F6190.pal delete mode 100644 data/field_specials/unk_83F61B0.pal delete mode 100644 data/field_specials/unk_83F61D0.pal delete mode 100644 data/field_specials/unk_83F6206.pal delete mode 100644 data/field_specials/unk_83F6226.pal delete mode 100644 data/field_specials/unk_83F6246.pal delete mode 100644 data/field_specials/unk_83F6266.pal delete mode 100644 data/field_specials/unk_83F6286.pal delete mode 100644 data/field_specials/unk_83F62A6.pal delete mode 100644 data/field_specials/unk_83F62C6.pal delete mode 100644 data/field_specials/unk_83F62E6.pal delete mode 100644 data/field_specials/unk_83F6306.pal delete mode 100644 data/field_specials/unk_83F6326.pal delete mode 100644 data/field_specials/unk_83F6346.pal delete mode 100644 data/graphics/fame_checker_bg.pal delete mode 100644 data/graphics/fame_checker_bg.png delete mode 100644 data/graphics/fame_checker_tilemap2.bin delete mode 100644 data/graphics/fame_checker_tilemap3.bin delete mode 100644 data/graphics/fonts/down_arrow.png delete mode 100644 data/graphics/fonts/down_arrow_2.png delete mode 100644 data/graphics/fonts/down_arrow_3.png delete mode 100644 data/graphics/fonts/down_arrow_4.png delete mode 100644 data/graphics/fonts/down_arrow_RS.png delete mode 100644 data/graphics/fonts/down_arrow_RS_2.png delete mode 100644 data/graphics/fonts/font0_jap.png delete mode 100644 data/graphics/fonts/font0_latin.png delete mode 100644 data/graphics/fonts/font1_jap.png delete mode 100644 data/graphics/fonts/font1_latin.png delete mode 100644 data/graphics/fonts/font2_jap.png delete mode 100644 data/graphics/fonts/font2_latin.png delete mode 100644 data/graphics/fonts/font4_jap.png delete mode 100644 data/graphics/fonts/font4_latin.png delete mode 100644 data/graphics/fonts/font5_jap.png delete mode 100644 data/graphics/fonts/font5_latin.png delete mode 100644 data/graphics/fonts/font6_braille.png delete mode 100644 data/graphics/fonts/font9_jap.png delete mode 100644 data/graphics/fonts/keypad_icons.png delete mode 100644 data/graphics/mevent/gfx_46718C.png delete mode 100644 data/graphics/mevent/gfx_46737C.png delete mode 100644 data/graphics/mevent/gfx_467558.png delete mode 100644 data/graphics/mevent/gfx_467700.png delete mode 100644 data/graphics/mevent/gfx_467A7C.png delete mode 100644 data/graphics/mevent/gfx_467EF4.png delete mode 100644 data/graphics/mevent/gfx_4680C0.png delete mode 100644 data/graphics/mevent/gfx_46821C.png delete mode 100644 data/graphics/mevent/gfx_46830C.png delete mode 100644 data/graphics/mevent/gfx_468448.png delete mode 100644 data/graphics/mevent/gfx_4685B4.png delete mode 100644 data/graphics/mevent/pal_46708C.pal delete mode 100644 data/graphics/mevent/pal_4670AC.pal delete mode 100644 data/graphics/mevent/pal_4670CC.pal delete mode 100644 data/graphics/mevent/pal_4670EC.pal delete mode 100644 data/graphics/mevent/pal_46710C.pal delete mode 100644 data/graphics/mevent/pal_46712C.pal delete mode 100644 data/graphics/mevent/pal_46714C.pal delete mode 100644 data/graphics/mevent/pal_46716C.pal delete mode 100644 data/graphics/mevent/pal_467DF4.pal delete mode 100644 data/graphics/mevent/pal_467E14.pal delete mode 100644 data/graphics/mevent/pal_467E34.pal delete mode 100644 data/graphics/mevent/pal_467E54.pal delete mode 100644 data/graphics/mevent/pal_467E74.pal delete mode 100644 data/graphics/mevent/pal_467E94.pal delete mode 100644 data/graphics/mevent/pal_467EB4.pal delete mode 100644 data/graphics/mevent/pal_467ED4.pal delete mode 100644 data/graphics/mevent/pal_468060.pal delete mode 100644 data/graphics/mevent/pal_468080.pal delete mode 100644 data/graphics/mevent/pal_4680A0.pal delete mode 100644 data/graphics/mevent/tilemap_467288.bin delete mode 100644 data/graphics/mevent/tilemap_467470.bin delete mode 100644 data/graphics/mevent/tilemap_46762C.bin delete mode 100644 data/graphics/mevent/tilemap_467934.bin delete mode 100644 data/graphics/mevent/tilemap_467CAC.bin delete mode 100644 data/graphics/mevent/tilemap_468140.bin delete mode 100644 data/graphics/mevent/tilemap_46824C.bin delete mode 100644 data/graphics/mevent/tilemap_46837C.bin delete mode 100644 data/graphics/mevent/tilemap_4684D8.bin delete mode 100644 data/graphics/mevent/tilemap_468644.bin delete mode 100644 data/graphics/title_screen/lg_border_bg.bin delete mode 100644 data/graphics/title_screen/unk_83BF58C.png delete mode 100644 data/graphics/title_screen/unk_83BF5A8.bin delete mode 100644 data/graphics/title_screen/unk_83bf64c.png delete mode 100644 data/graphics/title_screen/unk_83bf77c.pal delete mode 100644 data/graphics/title_screen/unk_83bf79c.png delete mode 100644 data/graphics/title_screen/unk_83bfa14.png delete mode 100644 data/graphics/title_screen/unk_lg_83bf764.pal delete mode 100644 data/graphics/title_screen/unk_lg_83bf784.png delete mode 100644 data/graphics/title_screen/unk_lg_83bf89c.png delete mode 100644 data/graphics/unk_847a348.png delete mode 100644 data/graphics/unknown_8456638.bin delete mode 100644 data/graphics/unknown_84566a8.bin delete mode 100644 data/itemfinder/spr_tiles.png delete mode 100644 data/main_menu/unk_8234648.pal delete mode 100644 data/main_menu/unk_8234668.pal delete mode 100644 data/map_preview/altering_cave_pal.pal delete mode 100644 data/map_preview/altering_cave_tilemap.bin delete mode 100644 data/map_preview/altering_cave_tiles.png delete mode 100644 data/map_preview/berry_forest_pal.pal delete mode 100644 data/map_preview/berry_forest_tilemap.bin delete mode 100644 data/map_preview/berry_forest_tiles.png delete mode 100644 data/map_preview/cerulean_cave_pal.pal delete mode 100644 data/map_preview/cerulean_cave_tilemap.bin delete mode 100644 data/map_preview/cerulean_cave_tiles.png delete mode 100644 data/map_preview/digletts_cave_pal.pal delete mode 100644 data/map_preview/digletts_cave_tilemap.bin delete mode 100644 data/map_preview/digletts_cave_tiles.png delete mode 100644 data/map_preview/dotted_hole_pal.pal delete mode 100644 data/map_preview/dotted_hole_tilemap.bin delete mode 100644 data/map_preview/dotted_hole_tiles.png delete mode 100644 data/map_preview/icefall_cave_pal.pal delete mode 100644 data/map_preview/icefall_cave_tilemap.bin delete mode 100644 data/map_preview/icefall_cave_tiles.png delete mode 100644 data/map_preview/kanto_safari_zone_pal.pal delete mode 100644 data/map_preview/kanto_safari_zone_tilemap.bin delete mode 100644 data/map_preview/kanto_safari_zone_tiles.png delete mode 100644 data/map_preview/kanto_victory_road_pal.pal delete mode 100644 data/map_preview/kanto_victory_road_tilemap.bin delete mode 100644 data/map_preview/kanto_victory_road_tiles.png delete mode 100644 data/map_preview/lost_cave_pal.pal delete mode 100644 data/map_preview/lost_cave_tilemap.bin delete mode 100644 data/map_preview/lost_cave_tiles.png delete mode 100644 data/map_preview/monean_chamber_pal.pal delete mode 100644 data/map_preview/monean_chamber_tilemap.bin delete mode 100644 data/map_preview/monean_chamber_tiles.png delete mode 100644 data/map_preview/mt_ember_pal.pal delete mode 100644 data/map_preview/mt_ember_tilemap.bin delete mode 100644 data/map_preview/mt_ember_tiles.png delete mode 100644 data/map_preview/mt_moon_pal.pal delete mode 100644 data/map_preview/mt_moon_tilemap.bin delete mode 100644 data/map_preview/mt_moon_tiles.png delete mode 100644 data/map_preview/pokemon_mansion_pal.pal delete mode 100644 data/map_preview/pokemon_mansion_tilemap.bin delete mode 100644 data/map_preview/pokemon_mansion_tiles.png delete mode 100644 data/map_preview/pokemon_tower_pal.pal delete mode 100644 data/map_preview/pokemon_tower_tilemap.bin delete mode 100644 data/map_preview/pokemon_tower_tiles.png delete mode 100644 data/map_preview/power_plant_pal.pal delete mode 100644 data/map_preview/power_plant_tilemap.bin delete mode 100644 data/map_preview/power_plant_tiles.png delete mode 100644 data/map_preview/rock_tunnel_pal.pal delete mode 100644 data/map_preview/rock_tunnel_tilemap.bin delete mode 100644 data/map_preview/rock_tunnel_tiles.png delete mode 100644 data/map_preview/rocket_hideout_pal.pal delete mode 100644 data/map_preview/rocket_hideout_tilemap.bin delete mode 100644 data/map_preview/rocket_hideout_tiles.png delete mode 100644 data/map_preview/rocket_warehouse_pal.pal delete mode 100644 data/map_preview/rocket_warehouse_tilemap.bin delete mode 100644 data/map_preview/rocket_warehouse_tiles.png delete mode 100644 data/map_preview/seafoam_islands_pal.pal delete mode 100644 data/map_preview/seafoam_islands_tilemap.bin delete mode 100644 data/map_preview/seafoam_islands_tiles.png delete mode 100644 data/map_preview/silph_co_pal.pal delete mode 100644 data/map_preview/silph_co_tilemap.bin delete mode 100644 data/map_preview/silph_co_tiles.png delete mode 100644 data/map_preview/viridian_forest_pal.pal delete mode 100644 data/map_preview/viridian_forest_tilemap.bin delete mode 100644 data/map_preview/viridian_forest_tiles.png delete mode 100644 data/oak_speech/help_docs_page2_tilemap.bin delete mode 100644 data/oak_speech/help_docs_page3_tilemap.bin delete mode 100644 data/oak_speech/help_docs_palette.pal delete mode 100644 data/oak_speech/new_game_adventure_intro_tilemap.bin delete mode 100644 data/oak_speech/oak_speech_background_tilemap.bin delete mode 100644 data/oak_speech/oak_speech_gfx_game_start_help_u_i.png delete mode 100644 data/oak_speech/oak_speech_gfx_grass_platform.png delete mode 100644 data/oak_speech/oak_speech_gfx_leaf_pal.pal delete mode 100644 data/oak_speech/oak_speech_gfx_leaf_pic.png delete mode 100644 data/oak_speech/oak_speech_gfx_oak_pal.pal delete mode 100644 data/oak_speech/oak_speech_gfx_oak_pic.png delete mode 100644 data/oak_speech/oak_speech_gfx_pika1.png delete mode 100644 data/oak_speech/oak_speech_gfx_pika2.png delete mode 100644 data/oak_speech/oak_speech_gfx_pika_eyes.png delete mode 100644 data/oak_speech/oak_speech_gfx_red_pal.pal delete mode 100644 data/oak_speech/oak_speech_gfx_red_pic.png delete mode 100644 data/oak_speech/oak_speech_gfx_rival_pal.pal delete mode 100644 data/oak_speech/oak_speech_gfx_rival_pic.png delete mode 100644 data/oak_speech/oak_speech_gfx_solid_colors.png delete mode 100644 data/oak_speech/oak_speech_grass_platform_palette.pal delete mode 100644 data/oak_speech/oak_speech_pika_palette.pal delete mode 100644 data/pokedex_area_markers/marker.pal delete mode 100644 data/pokedex_area_markers/marker_0.png delete mode 100644 data/pokedex_area_markers/marker_1.png delete mode 100644 data/pokedex_area_markers/marker_2.png delete mode 100644 data/pokedex_area_markers/marker_3.png delete mode 100644 data/pokedex_area_markers/marker_4.png delete mode 100644 data/pokedex_area_markers/marker_5.png delete mode 100644 data/pokedex_area_markers/marker_6.png delete mode 100644 data/script_menu/aerodactyl_fossil.png delete mode 100644 data/script_menu/kabutops_fossil.png delete mode 100644 data/seagallop/eb_tilemap.bin delete mode 100644 data/seagallop/ferry_and_wake.pal delete mode 100644 data/seagallop/ferry_sprite.png delete mode 100644 data/seagallop/wake.png delete mode 100644 data/seagallop/water.png delete mode 100644 data/seagallop/wb_tilemap.bin create mode 100644 graphics/credits/unk_840C630.pal create mode 100644 graphics/credits/unk_840C650.png create mode 100644 graphics/credits/unk_840CA54.bin create mode 100644 graphics/credits/unk_840CB8C.bin create mode 100644 graphics/credits/unk_840D228.bin create mode 100644 graphics/credits/unk_840DC0C.bin create mode 100644 graphics/credits/unk_840E158.bin create mode 100644 graphics/credits/unk_840E904.bin create mode 100644 graphics/credits/unk_840F240.bin create mode 100644 graphics/credits/unk_840F944.bin create mode 100644 graphics/credits/unk_8410198.bin create mode 100644 graphics/credits/unk_84105B4.bin create mode 100644 graphics/credits/unk_8410B20.bin create mode 100644 graphics/credits/unk_8410B20.png create mode 100644 graphics/credits/unk_8410E10.pal create mode 100644 graphics/credits/unk_8410E30.png create mode 100644 graphics/credits/unk_8411BF8.pal create mode 100644 graphics/credits/unk_8411C18.png create mode 100644 graphics/credits/unk_84129A0.pal create mode 100644 graphics/credits/unk_84129C0.png create mode 100644 graphics/credits/unk_8413318.pal create mode 100644 graphics/credits/unk_8413338.png create mode 100644 graphics/credits/unk_8413854.pal create mode 100644 graphics/credits/unk_8413874.png create mode 100644 graphics/credits/unk_8413D98.pal create mode 100644 graphics/credits/unk_8413DB8.png create mode 100644 graphics/fame_checker/bg.pal create mode 100644 graphics/fame_checker/bg.png create mode 100644 graphics/fame_checker/bill.pal create mode 100644 graphics/fame_checker/bill.png create mode 100644 graphics/fame_checker/cursor.pal create mode 100644 graphics/fame_checker/cursor.png create mode 100644 graphics/fame_checker/daisy.pal create mode 100644 graphics/fame_checker/daisy.png create mode 100644 graphics/fame_checker/mr_fuji.pal create mode 100644 graphics/fame_checker/mr_fuji.png create mode 100644 graphics/fame_checker/pal_845f5a0.pal create mode 100644 graphics/fame_checker/prof_oak.pal create mode 100644 graphics/fame_checker/prof_oak.png create mode 100644 graphics/fame_checker/question_mark.png create mode 100644 graphics/fame_checker/silhouette.pal create mode 100644 graphics/fame_checker/spinning_pokeball.pal create mode 100644 graphics/fame_checker/spinning_pokeball.png create mode 100644 graphics/fame_checker/tilemap1.bin create mode 100644 graphics/fame_checker/tilemap2.bin create mode 100644 graphics/fame_checker/tilemap3.bin create mode 100644 graphics/field_specials/unk_83F5F50.pal create mode 100644 graphics/field_specials/unk_83F5F70.pal create mode 100644 graphics/field_specials/unk_83F5F90.pal create mode 100644 graphics/field_specials/unk_83F5FB0.pal create mode 100644 graphics/field_specials/unk_83F5FD0.pal create mode 100644 graphics/field_specials/unk_83F5FF0.pal create mode 100644 graphics/field_specials/unk_83F6010.pal create mode 100644 graphics/field_specials/unk_83F6030.pal create mode 100644 graphics/field_specials/unk_83F6050.pal create mode 100644 graphics/field_specials/unk_83F6070.pal create mode 100644 graphics/field_specials/unk_83F6090.pal create mode 100644 graphics/field_specials/unk_83F60B0.pal create mode 100644 graphics/field_specials/unk_83F60D0.pal create mode 100644 graphics/field_specials/unk_83F60F0.pal create mode 100644 graphics/field_specials/unk_83F6110.pal create mode 100644 graphics/field_specials/unk_83F6130.pal create mode 100644 graphics/field_specials/unk_83F6150.pal create mode 100644 graphics/field_specials/unk_83F6170.pal create mode 100644 graphics/field_specials/unk_83F6190.pal create mode 100644 graphics/field_specials/unk_83F61B0.pal create mode 100644 graphics/field_specials/unk_83F61D0.pal create mode 100644 graphics/field_specials/unk_83F6206.pal create mode 100644 graphics/field_specials/unk_83F6226.pal create mode 100644 graphics/field_specials/unk_83F6246.pal create mode 100644 graphics/field_specials/unk_83F6266.pal create mode 100644 graphics/field_specials/unk_83F6286.pal create mode 100644 graphics/field_specials/unk_83F62A6.pal create mode 100644 graphics/field_specials/unk_83F62C6.pal create mode 100644 graphics/field_specials/unk_83F62E6.pal create mode 100644 graphics/field_specials/unk_83F6306.pal create mode 100644 graphics/field_specials/unk_83F6326.pal create mode 100644 graphics/field_specials/unk_83F6346.pal create mode 100644 graphics/fonts/down_arrow.png create mode 100644 graphics/fonts/down_arrow_2.png create mode 100644 graphics/fonts/down_arrow_3.png create mode 100644 graphics/fonts/down_arrow_4.png create mode 100644 graphics/fonts/down_arrow_RS.png create mode 100644 graphics/fonts/down_arrow_RS_2.png create mode 100644 graphics/fonts/font0_jap.png create mode 100644 graphics/fonts/font0_latin.png create mode 100644 graphics/fonts/font1_jap.png create mode 100644 graphics/fonts/font1_latin.png create mode 100644 graphics/fonts/font2_jap.png create mode 100644 graphics/fonts/font2_latin.png create mode 100644 graphics/fonts/font4_jap.png create mode 100644 graphics/fonts/font4_latin.png create mode 100644 graphics/fonts/font5_jap.png create mode 100644 graphics/fonts/font5_latin.png create mode 100644 graphics/fonts/font6_braille.png create mode 100644 graphics/fonts/font9_jap.png create mode 100644 graphics/fonts/keypad_icons.png create mode 100644 graphics/item_menu/bag_window_pal.pal create mode 100644 graphics/itemfinder/spr_tiles.png create mode 100644 graphics/link_games/unk_847a348.png create mode 100644 graphics/main_menu/unk_8234648.pal create mode 100644 graphics/main_menu/unk_8234668.pal create mode 100644 graphics/map_preview/altering_cave_pal.pal create mode 100644 graphics/map_preview/altering_cave_tilemap.bin create mode 100644 graphics/map_preview/altering_cave_tiles.png create mode 100644 graphics/map_preview/berry_forest_pal.pal create mode 100644 graphics/map_preview/berry_forest_tilemap.bin create mode 100644 graphics/map_preview/berry_forest_tiles.png create mode 100644 graphics/map_preview/cerulean_cave_pal.pal create mode 100644 graphics/map_preview/cerulean_cave_tilemap.bin create mode 100644 graphics/map_preview/cerulean_cave_tiles.png create mode 100644 graphics/map_preview/digletts_cave_pal.pal create mode 100644 graphics/map_preview/digletts_cave_tilemap.bin create mode 100644 graphics/map_preview/digletts_cave_tiles.png create mode 100644 graphics/map_preview/dotted_hole_pal.pal create mode 100644 graphics/map_preview/dotted_hole_tilemap.bin create mode 100644 graphics/map_preview/dotted_hole_tiles.png create mode 100644 graphics/map_preview/icefall_cave_pal.pal create mode 100644 graphics/map_preview/icefall_cave_tilemap.bin create mode 100644 graphics/map_preview/icefall_cave_tiles.png create mode 100644 graphics/map_preview/kanto_safari_zone_pal.pal create mode 100644 graphics/map_preview/kanto_safari_zone_tilemap.bin create mode 100644 graphics/map_preview/kanto_safari_zone_tiles.png create mode 100644 graphics/map_preview/kanto_victory_road_pal.pal create mode 100644 graphics/map_preview/kanto_victory_road_tilemap.bin create mode 100644 graphics/map_preview/kanto_victory_road_tiles.png create mode 100644 graphics/map_preview/lost_cave_pal.pal create mode 100644 graphics/map_preview/lost_cave_tilemap.bin create mode 100644 graphics/map_preview/lost_cave_tiles.png create mode 100644 graphics/map_preview/monean_chamber_pal.pal create mode 100644 graphics/map_preview/monean_chamber_tilemap.bin create mode 100644 graphics/map_preview/monean_chamber_tiles.png create mode 100644 graphics/map_preview/mt_ember_pal.pal create mode 100644 graphics/map_preview/mt_ember_tilemap.bin create mode 100644 graphics/map_preview/mt_ember_tiles.png create mode 100644 graphics/map_preview/mt_moon_pal.pal create mode 100644 graphics/map_preview/mt_moon_tilemap.bin create mode 100644 graphics/map_preview/mt_moon_tiles.png create mode 100644 graphics/map_preview/pokemon_mansion_pal.pal create mode 100644 graphics/map_preview/pokemon_mansion_tilemap.bin create mode 100644 graphics/map_preview/pokemon_mansion_tiles.png create mode 100644 graphics/map_preview/pokemon_tower_pal.pal create mode 100644 graphics/map_preview/pokemon_tower_tilemap.bin create mode 100644 graphics/map_preview/pokemon_tower_tiles.png create mode 100644 graphics/map_preview/power_plant_pal.pal create mode 100644 graphics/map_preview/power_plant_tilemap.bin create mode 100644 graphics/map_preview/power_plant_tiles.png create mode 100644 graphics/map_preview/rock_tunnel_pal.pal create mode 100644 graphics/map_preview/rock_tunnel_tilemap.bin create mode 100644 graphics/map_preview/rock_tunnel_tiles.png create mode 100644 graphics/map_preview/rocket_hideout_pal.pal create mode 100644 graphics/map_preview/rocket_hideout_tilemap.bin create mode 100644 graphics/map_preview/rocket_hideout_tiles.png create mode 100644 graphics/map_preview/rocket_warehouse_pal.pal create mode 100644 graphics/map_preview/rocket_warehouse_tilemap.bin create mode 100644 graphics/map_preview/rocket_warehouse_tiles.png create mode 100644 graphics/map_preview/seafoam_islands_pal.pal create mode 100644 graphics/map_preview/seafoam_islands_tilemap.bin create mode 100644 graphics/map_preview/seafoam_islands_tiles.png create mode 100644 graphics/map_preview/silph_co_pal.pal create mode 100644 graphics/map_preview/silph_co_tilemap.bin create mode 100644 graphics/map_preview/silph_co_tiles.png create mode 100644 graphics/map_preview/viridian_forest_pal.pal create mode 100644 graphics/map_preview/viridian_forest_tilemap.bin create mode 100644 graphics/map_preview/viridian_forest_tiles.png create mode 100644 graphics/mevent/gfx_46718C.png create mode 100644 graphics/mevent/gfx_46737C.png create mode 100644 graphics/mevent/gfx_467558.png create mode 100644 graphics/mevent/gfx_467700.png create mode 100644 graphics/mevent/gfx_467A7C.png create mode 100644 graphics/mevent/gfx_467EF4.png create mode 100644 graphics/mevent/gfx_4680C0.png create mode 100644 graphics/mevent/gfx_46821C.png create mode 100644 graphics/mevent/gfx_46830C.png create mode 100644 graphics/mevent/gfx_468448.png create mode 100644 graphics/mevent/gfx_4685B4.png create mode 100644 graphics/mevent/pal_46708C.pal create mode 100644 graphics/mevent/pal_4670AC.pal create mode 100644 graphics/mevent/pal_4670CC.pal create mode 100644 graphics/mevent/pal_4670EC.pal create mode 100644 graphics/mevent/pal_46710C.pal create mode 100644 graphics/mevent/pal_46712C.pal create mode 100644 graphics/mevent/pal_46714C.pal create mode 100644 graphics/mevent/pal_46716C.pal create mode 100644 graphics/mevent/pal_467DF4.pal create mode 100644 graphics/mevent/pal_467E14.pal create mode 100644 graphics/mevent/pal_467E34.pal create mode 100644 graphics/mevent/pal_467E54.pal create mode 100644 graphics/mevent/pal_467E74.pal create mode 100644 graphics/mevent/pal_467E94.pal create mode 100644 graphics/mevent/pal_467EB4.pal create mode 100644 graphics/mevent/pal_467ED4.pal create mode 100644 graphics/mevent/pal_468060.pal create mode 100644 graphics/mevent/pal_468080.pal create mode 100644 graphics/mevent/pal_4680A0.pal create mode 100644 graphics/mevent/tilemap_467288.bin create mode 100644 graphics/mevent/tilemap_467470.bin create mode 100644 graphics/mevent/tilemap_46762C.bin create mode 100644 graphics/mevent/tilemap_467934.bin create mode 100644 graphics/mevent/tilemap_467CAC.bin create mode 100644 graphics/mevent/tilemap_468140.bin create mode 100644 graphics/mevent/tilemap_46824C.bin create mode 100644 graphics/mevent/tilemap_46837C.bin create mode 100644 graphics/mevent/tilemap_4684D8.bin create mode 100644 graphics/mevent/tilemap_468644.bin create mode 100644 graphics/oak_speech/game_start_help_ui.png create mode 100644 graphics/oak_speech/grass_platform.png create mode 100644 graphics/oak_speech/help_docs_page2_tilemap.bin create mode 100644 graphics/oak_speech/help_docs_page3_tilemap.bin create mode 100644 graphics/oak_speech/help_docs_palette.pal create mode 100644 graphics/oak_speech/leaf_pal.pal create mode 100644 graphics/oak_speech/leaf_pic.png create mode 100644 graphics/oak_speech/new_game_adventure_intro_tilemap.bin create mode 100644 graphics/oak_speech/oak_pal.pal create mode 100644 graphics/oak_speech/oak_pic.png create mode 100644 graphics/oak_speech/oak_speech_background_tilemap.bin create mode 100644 graphics/oak_speech/oak_speech_grass_platform_palette.pal create mode 100644 graphics/oak_speech/oak_speech_pika_palette.pal create mode 100644 graphics/oak_speech/pika1.png create mode 100644 graphics/oak_speech/pika2.png create mode 100644 graphics/oak_speech/pika_eyes.png create mode 100644 graphics/oak_speech/red_pal.pal create mode 100644 graphics/oak_speech/red_pic.png create mode 100644 graphics/oak_speech/rival_pal.pal create mode 100644 graphics/oak_speech/rival_pic.png create mode 100644 graphics/oak_speech/solid_colors.png create mode 100644 graphics/pokedex/area_markers/marker.pal create mode 100644 graphics/pokedex/area_markers/marker_0.png create mode 100644 graphics/pokedex/area_markers/marker_1.png create mode 100644 graphics/pokedex/area_markers/marker_2.png create mode 100644 graphics/pokedex/area_markers/marker_3.png create mode 100644 graphics/pokedex/area_markers/marker_4.png create mode 100644 graphics/pokedex/area_markers/marker_5.png create mode 100644 graphics/pokedex/area_markers/marker_6.png create mode 100644 graphics/script_menu/aerodactyl_fossil.png create mode 100644 graphics/script_menu/kabutops_fossil.png create mode 100644 graphics/seagallop/eb_tilemap.bin create mode 100644 graphics/seagallop/ferry_and_wake.pal create mode 100644 graphics/seagallop/ferry_sprite.png create mode 100644 graphics/seagallop/wake.png create mode 100644 graphics/seagallop/water.png create mode 100644 graphics/seagallop/wb_tilemap.bin create mode 100644 graphics/title_screen/lg_border_bg.bin create mode 100644 graphics/title_screen/unk_83BF58C.png create mode 100644 graphics/title_screen/unk_83BF5A8.bin create mode 100644 graphics/title_screen/unk_83bf64c.png create mode 100644 graphics/title_screen/unk_83bf77c.pal create mode 100644 graphics/title_screen/unk_83bf79c.png create mode 100644 graphics/title_screen/unk_83bfa14.png create mode 100644 graphics/title_screen/unk_lg_83bf764.pal create mode 100644 graphics/title_screen/unk_lg_83bf784.png create mode 100644 graphics/title_screen/unk_lg_83bf89c.png create mode 100644 graphics/unknown/unknown_8456638.bin create mode 100644 graphics/unknown/unknown_84566a8.bin diff --git a/data/bag/bag_window_pal.pal b/data/bag/bag_window_pal.pal deleted file mode 100644 index 426ea279e..000000000 --- a/data/bag/bag_window_pal.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -98 98 98 -213 213 205 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -0 0 0 -0 0 0 -0 0 0 -255 156 148 -255 255 255 -189 90 82 diff --git a/data/credits/unk_840C630.pal b/data/credits/unk_840C630.pal deleted file mode 100644 index 01f113381..000000000 --- a/data/credits/unk_840C630.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/data/credits/unk_840C650.png b/data/credits/unk_840C650.png deleted file mode 100644 index 9afadd699..000000000 Binary files a/data/credits/unk_840C650.png and /dev/null differ diff --git a/data/credits/unk_840CA54.bin b/data/credits/unk_840CA54.bin deleted file mode 100644 index a127ba9ca..000000000 Binary files a/data/credits/unk_840CA54.bin and /dev/null differ diff --git a/data/credits/unk_840CB8C.bin b/data/credits/unk_840CB8C.bin deleted file mode 100644 index 3dd1c74a0..000000000 Binary files a/data/credits/unk_840CB8C.bin and /dev/null differ diff --git a/data/credits/unk_840D228.bin b/data/credits/unk_840D228.bin deleted file mode 100644 index f6c336c01..000000000 Binary files a/data/credits/unk_840D228.bin and /dev/null differ diff --git a/data/credits/unk_840DC0C.bin b/data/credits/unk_840DC0C.bin deleted file mode 100644 index a52ea8056..000000000 Binary files a/data/credits/unk_840DC0C.bin and /dev/null differ diff --git a/data/credits/unk_840E158.bin b/data/credits/unk_840E158.bin deleted file mode 100644 index 2d9128634..000000000 Binary files a/data/credits/unk_840E158.bin and /dev/null differ diff --git a/data/credits/unk_840E904.bin b/data/credits/unk_840E904.bin deleted file mode 100644 index 4887c1e7e..000000000 Binary files a/data/credits/unk_840E904.bin and /dev/null differ diff --git a/data/credits/unk_840F240.bin b/data/credits/unk_840F240.bin deleted file mode 100644 index 285a468b6..000000000 Binary files a/data/credits/unk_840F240.bin and /dev/null differ diff --git a/data/credits/unk_840F944.bin b/data/credits/unk_840F944.bin deleted file mode 100644 index ba2cdab77..000000000 Binary files a/data/credits/unk_840F944.bin and /dev/null differ diff --git a/data/credits/unk_8410198.bin b/data/credits/unk_8410198.bin deleted file mode 100644 index f7b3a02a5..000000000 Binary files a/data/credits/unk_8410198.bin and /dev/null differ diff --git a/data/credits/unk_84105B4.bin b/data/credits/unk_84105B4.bin deleted file mode 100644 index d173e611e..000000000 Binary files a/data/credits/unk_84105B4.bin and /dev/null differ diff --git a/data/credits/unk_8410B20.bin b/data/credits/unk_8410B20.bin deleted file mode 100644 index eea1940ee..000000000 Binary files a/data/credits/unk_8410B20.bin and /dev/null differ diff --git a/data/credits/unk_8410B20.png b/data/credits/unk_8410B20.png deleted file mode 100644 index 19ce2f796..000000000 Binary files a/data/credits/unk_8410B20.png and /dev/null differ diff --git a/data/credits/unk_8410E10.pal b/data/credits/unk_8410E10.pal deleted file mode 100644 index 5667181bd..000000000 --- a/data/credits/unk_8410E10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -57 57 123 -172 123 65 -255 197 148 -222 148 115 -123 65 65 -82 106 156 -57 57 123 -115 164 197 -123 123 131 -238 238 255 -180 180 213 -255 106 74 -197 57 57 -255 222 90 -213 180 74 -0 0 0 diff --git a/data/credits/unk_8410E30.png b/data/credits/unk_8410E30.png deleted file mode 100644 index ec065cdb6..000000000 Binary files a/data/credits/unk_8410E30.png and /dev/null differ diff --git a/data/credits/unk_8411BF8.pal b/data/credits/unk_8411BF8.pal deleted file mode 100644 index 5667181bd..000000000 --- a/data/credits/unk_8411BF8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -57 57 123 -172 123 65 -255 197 148 -222 148 115 -123 65 65 -82 106 156 -57 57 123 -115 164 197 -123 123 131 -238 238 255 -180 180 213 -255 106 74 -197 57 57 -255 222 90 -213 180 74 -0 0 0 diff --git a/data/credits/unk_8411C18.png b/data/credits/unk_8411C18.png deleted file mode 100644 index 341594160..000000000 Binary files a/data/credits/unk_8411C18.png and /dev/null differ diff --git a/data/credits/unk_84129A0.pal b/data/credits/unk_84129A0.pal deleted file mode 100644 index ac601cddf..000000000 --- a/data/credits/unk_84129A0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -49 49 49 -255 222 205 -238 180 148 -197 139 106 -106 74 74 -222 164 74 -197 123 8 -49 65 82 -205 139 255 -115 82 131 -156 106 172 -106 123 131 -197 205 180 -238 74 24 -255 255 255 -0 0 0 diff --git a/data/credits/unk_84129C0.png b/data/credits/unk_84129C0.png deleted file mode 100644 index ea9c61c88..000000000 Binary files a/data/credits/unk_84129C0.png and /dev/null differ diff --git a/data/credits/unk_8413318.pal b/data/credits/unk_8413318.pal deleted file mode 100644 index 284b70b77..000000000 --- a/data/credits/unk_8413318.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -131 197 0 -74 139 0 -32 115 0 -0 82 0 -106 172 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/credits/unk_8413338.png b/data/credits/unk_8413338.png deleted file mode 100644 index 7fa79c06a..000000000 Binary files a/data/credits/unk_8413338.png and /dev/null differ diff --git a/data/credits/unk_8413854.pal b/data/credits/unk_8413854.pal deleted file mode 100644 index 46d4f48dd..000000000 --- a/data/credits/unk_8413854.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 180 98 -172 164 74 -156 148 49 -123 115 24 -222 213 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 0 255 diff --git a/data/credits/unk_8413874.png b/data/credits/unk_8413874.png deleted file mode 100644 index 18e34725f..000000000 Binary files a/data/credits/unk_8413874.png and /dev/null differ diff --git a/data/credits/unk_8413D98.pal b/data/credits/unk_8413D98.pal deleted file mode 100644 index a3476d0d4..000000000 --- a/data/credits/unk_8413D98.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -131 197 0 -74 139 0 -32 115 0 -0 82 0 -106 172 0 -189 180 98 -172 164 74 -156 148 49 -123 115 24 -222 213 131 -222 222 222 -205 205 205 -189 189 189 -238 238 238 -131 131 131 diff --git a/data/credits/unk_8413DB8.png b/data/credits/unk_8413DB8.png deleted file mode 100644 index 5b10bd699..000000000 Binary files a/data/credits/unk_8413DB8.png and /dev/null differ diff --git a/data/fame_checker/img_845ce00.png b/data/fame_checker/img_845ce00.png deleted file mode 100644 index b0a170e09..000000000 Binary files a/data/fame_checker/img_845ce00.png and /dev/null differ diff --git a/data/fame_checker/img_845cf00.png b/data/fame_checker/img_845cf00.png deleted file mode 100644 index 0d692439a..000000000 Binary files a/data/fame_checker/img_845cf00.png and /dev/null differ diff --git a/data/fame_checker/img_845d100.png b/data/fame_checker/img_845d100.png deleted file mode 100644 index 4cc3e200d..000000000 Binary files a/data/fame_checker/img_845d100.png and /dev/null differ diff --git a/data/fame_checker/img_845d520.png b/data/fame_checker/img_845d520.png deleted file mode 100644 index 4d23c4c87..000000000 Binary files a/data/fame_checker/img_845d520.png and /dev/null differ diff --git a/data/fame_checker/img_845dd40.png b/data/fame_checker/img_845dd40.png deleted file mode 100644 index 7e3a7b39b..000000000 Binary files a/data/fame_checker/img_845dd40.png and /dev/null differ diff --git a/data/fame_checker/img_845e560.png b/data/fame_checker/img_845e560.png deleted file mode 100644 index 1abf1a63e..000000000 Binary files a/data/fame_checker/img_845e560.png and /dev/null differ diff --git a/data/fame_checker/img_845ed80.png b/data/fame_checker/img_845ed80.png deleted file mode 100644 index 5e2a19aed..000000000 Binary files a/data/fame_checker/img_845ed80.png and /dev/null differ diff --git a/data/fame_checker/pal_845d0e0.pal b/data/fame_checker/pal_845d0e0.pal deleted file mode 100644 index dac232f78..000000000 --- a/data/fame_checker/pal_845d0e0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 106 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 139 139 -189 189 189 -205 205 205 -238 238 238 -230 230 230 -222 222 222 -180 180 180 -255 255 255 -106 106 106 diff --git a/data/fame_checker/pal_845d500.pal b/data/fame_checker/pal_845d500.pal deleted file mode 100644 index 212d9eb69..000000000 --- a/data/fame_checker/pal_845d500.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -246 222 82 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -246 148 41 -255 82 0 diff --git a/data/fame_checker/pal_845dd20.pal b/data/fame_checker/pal_845dd20.pal deleted file mode 100644 index e6dcabf2f..000000000 --- a/data/fame_checker/pal_845dd20.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -115 90 65 -222 164 82 -180 139 65 -148 106 57 -172 164 189 -255 230 131 -230 205 106 -238 131 90 -90 90 106 -213 205 213 -255 255 255 -0 0 0 diff --git a/data/fame_checker/pal_845e540.pal b/data/fame_checker/pal_845e540.pal deleted file mode 100644 index 485e27c48..000000000 --- a/data/fame_checker/pal_845e540.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 230 205 -230 189 156 -205 156 115 -106 74 57 -180 139 213 -139 98 172 -98 65 106 -213 189 131 -189 164 98 -139 123 74 -180 139 115 -156 106 82 -90 74 49 -255 255 255 -0 0 0 diff --git a/data/fame_checker/pal_845ed60.pal b/data/fame_checker/pal_845ed60.pal deleted file mode 100644 index adf46bf14..000000000 --- a/data/fame_checker/pal_845ed60.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -172 123 98 -213 172 115 -156 123 74 -90 82 65 -205 115 98 -164 213 156 -115 172 106 -90 123 82 -222 230 255 -164 172 197 -255 255 255 -0 0 0 diff --git a/data/fame_checker/pal_845f580.pal b/data/fame_checker/pal_845f580.pal deleted file mode 100644 index eb6f2f18b..000000000 --- a/data/fame_checker/pal_845f580.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -106 74 74 -139 156 164 -205 164 205 -164 123 164 -82 82 57 -213 213 222 -123 123 82 -115 115 115 -197 189 131 -156 156 90 -255 255 255 -0 0 0 diff --git a/data/fame_checker/pal_845f5a0.pal b/data/fame_checker/pal_845f5a0.pal deleted file mode 100644 index 25a3ac1d2..000000000 --- a/data/fame_checker/pal_845f5a0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -98 98 98 -213 213 205 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/fame_checker/pal_845f5c0.pal b/data/fame_checker/pal_845f5c0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/fame_checker/pal_845f5c0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/fame_checker/tilemap_845c600.bin b/data/fame_checker/tilemap_845c600.bin deleted file mode 100644 index 8ff09b289..000000000 Binary files a/data/fame_checker/tilemap_845c600.bin and /dev/null differ diff --git a/data/field_specials/unk_83F5F50.pal b/data/field_specials/unk_83F5F50.pal deleted file mode 100644 index 6528f9f75..000000000 --- a/data/field_specials/unk_83F5F50.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 diff --git a/data/field_specials/unk_83F5F70.pal b/data/field_specials/unk_83F5F70.pal deleted file mode 100644 index 934306488..000000000 --- a/data/field_specials/unk_83F5F70.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -41 115 205 -82 82 106 diff --git a/data/field_specials/unk_83F5F90.pal b/data/field_specials/unk_83F5F90.pal deleted file mode 100644 index 624c69448..000000000 --- a/data/field_specials/unk_83F5F90.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -82 82 106 -41 115 205 -131 238 255 -0 41 156 diff --git a/data/field_specials/unk_83F5FB0.pal b/data/field_specials/unk_83F5FB0.pal deleted file mode 100644 index fb3cdebd0..000000000 --- a/data/field_specials/unk_83F5FB0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -41 115 205 -131 238 255 -82 172 230 -0 65 189 diff --git a/data/field_specials/unk_83F5FD0.pal b/data/field_specials/unk_83F5FD0.pal deleted file mode 100644 index f2c6c78af..000000000 --- a/data/field_specials/unk_83F5FD0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -41 115 205 -131 238 255 -82 172 230 -41 115 205 -41 115 205 diff --git a/data/field_specials/unk_83F5FF0.pal b/data/field_specials/unk_83F5FF0.pal deleted file mode 100644 index 3e2c5757a..000000000 --- a/data/field_specials/unk_83F5FF0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -41 115 205 -131 238 255 -82 172 230 -41 115 205 -0 65 189 -82 172 230 diff --git a/data/field_specials/unk_83F6010.pal b/data/field_specials/unk_83F6010.pal deleted file mode 100644 index 84e6e811a..000000000 --- a/data/field_specials/unk_83F6010.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -131 238 255 -82 172 230 -41 115 205 -0 65 189 -0 41 156 -131 238 255 diff --git a/data/field_specials/unk_83F6030.pal b/data/field_specials/unk_83F6030.pal deleted file mode 100644 index f49f8ef99..000000000 --- a/data/field_specials/unk_83F6030.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 172 230 -41 115 205 -0 65 189 -0 41 156 -82 82 106 -90 180 238 diff --git a/data/field_specials/unk_83F6050.pal b/data/field_specials/unk_83F6050.pal deleted file mode 100644 index 538ebf789..000000000 --- a/data/field_specials/unk_83F6050.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -41 115 205 -0 65 189 -0 41 156 -82 82 106 -82 82 106 -41 115 205 diff --git a/data/field_specials/unk_83F6070.pal b/data/field_specials/unk_83F6070.pal deleted file mode 100644 index 49b9d85b6..000000000 --- a/data/field_specials/unk_83F6070.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -0 65 189 -0 41 156 -82 82 106 -82 82 106 -82 82 106 -0 65 189 diff --git a/data/field_specials/unk_83F6090.pal b/data/field_specials/unk_83F6090.pal deleted file mode 100644 index ff81da8b3..000000000 --- a/data/field_specials/unk_83F6090.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -0 41 156 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -0 41 156 diff --git a/data/field_specials/unk_83F60B0.pal b/data/field_specials/unk_83F60B0.pal deleted file mode 100644 index a0763ff47..000000000 --- a/data/field_specials/unk_83F60B0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -131 238 255 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -172 172 98 -148 148 74 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 diff --git a/data/field_specials/unk_83F60D0.pal b/data/field_specials/unk_83F60D0.pal deleted file mode 100644 index 6528f9f75..000000000 --- a/data/field_specials/unk_83F60D0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 diff --git a/data/field_specials/unk_83F60F0.pal b/data/field_specials/unk_83F60F0.pal deleted file mode 100644 index 75dfaa19a..000000000 --- a/data/field_specials/unk_83F60F0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 172 230 -41 115 205 diff --git a/data/field_specials/unk_83F6110.pal b/data/field_specials/unk_83F6110.pal deleted file mode 100644 index 092544dec..000000000 --- a/data/field_specials/unk_83F6110.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 82 106 -82 82 106 -82 172 230 -41 115 205 -131 238 255 -82 172 230 diff --git a/data/field_specials/unk_83F6130.pal b/data/field_specials/unk_83F6130.pal deleted file mode 100644 index 3b93965ad..000000000 --- a/data/field_specials/unk_83F6130.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 172 230 -41 115 205 -131 238 255 -82 172 230 -82 172 230 -41 115 205 diff --git a/data/field_specials/unk_83F6150.pal b/data/field_specials/unk_83F6150.pal deleted file mode 100644 index be23edc23..000000000 --- a/data/field_specials/unk_83F6150.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -131 238 255 -82 172 230 -82 172 230 -41 115 205 -41 115 205 -0 65 189 diff --git a/data/field_specials/unk_83F6170.pal b/data/field_specials/unk_83F6170.pal deleted file mode 100644 index 788d0bd65..000000000 --- a/data/field_specials/unk_83F6170.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -82 172 230 -41 115 205 -41 115 205 -0 65 189 -0 65 189 -82 82 106 diff --git a/data/field_specials/unk_83F6190.pal b/data/field_specials/unk_83F6190.pal deleted file mode 100644 index 8ca385f0d..000000000 --- a/data/field_specials/unk_83F6190.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -41 115 205 -0 65 189 -0 65 189 -82 82 106 -82 82 106 -82 82 106 diff --git a/data/field_specials/unk_83F61B0.pal b/data/field_specials/unk_83F61B0.pal deleted file mode 100644 index 63fe8e97e..000000000 --- a/data/field_specials/unk_83F61B0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -255 74 0 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -255 255 180 -189 189 115 -0 65 189 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 diff --git a/data/field_specials/unk_83F61D0.pal b/data/field_specials/unk_83F61D0.pal deleted file mode 100644 index a0763ff47..000000000 --- a/data/field_specials/unk_83F61D0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -82 82 106 -123 123 123 -131 238 255 -255 213 131 -230 164 98 -197 115 74 -164 82 65 -172 172 98 -148 148 74 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 -82 82 106 diff --git a/data/field_specials/unk_83F6206.pal b/data/field_specials/unk_83F6206.pal deleted file mode 100644 index c20bacb57..000000000 --- a/data/field_specials/unk_83F6206.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 156 197 -32 32 32 -82 82 82 -139 139 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F6226.pal b/data/field_specials/unk_83F6226.pal deleted file mode 100644 index 2c106a4ae..000000000 --- a/data/field_specials/unk_83F6226.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 156 197 -41 32 32 -82 82 82 -139 139 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F6246.pal b/data/field_specials/unk_83F6246.pal deleted file mode 100644 index 38fe7d084..000000000 --- a/data/field_specials/unk_83F6246.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -49 32 32 -90 82 82 -148 148 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F6266.pal b/data/field_specials/unk_83F6266.pal deleted file mode 100644 index 7b7fb7c44..000000000 --- a/data/field_specials/unk_83F6266.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -65 32 32 -115 82 82 -156 148 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F6286.pal b/data/field_specials/unk_83F6286.pal deleted file mode 100644 index 4eda607b7..000000000 --- a/data/field_specials/unk_83F6286.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -74 32 32 -123 82 82 -164 156 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F62A6.pal b/data/field_specials/unk_83F62A6.pal deleted file mode 100644 index a92bc65fd..000000000 --- a/data/field_specials/unk_83F62A6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -98 32 32 -139 82 82 -172 156 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F62C6.pal b/data/field_specials/unk_83F62C6.pal deleted file mode 100644 index 0de8519c6..000000000 --- a/data/field_specials/unk_83F62C6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -98 32 32 -148 82 82 -180 164 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F62E6.pal b/data/field_specials/unk_83F62E6.pal deleted file mode 100644 index ae67047d4..000000000 --- a/data/field_specials/unk_83F62E6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -106 32 32 -156 82 82 -189 164 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F6306.pal b/data/field_specials/unk_83F6306.pal deleted file mode 100644 index 27cf345e4..000000000 --- a/data/field_specials/unk_83F6306.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -123 32 32 -172 82 82 -197 172 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F6326.pal b/data/field_specials/unk_83F6326.pal deleted file mode 100644 index fcca0b4de..000000000 --- a/data/field_specials/unk_83F6326.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -131 32 32 -180 82 82 -205 172 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/field_specials/unk_83F6346.pal b/data/field_specials/unk_83F6346.pal deleted file mode 100644 index 6c7540611..000000000 --- a/data/field_specials/unk_83F6346.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 156 197 -205 32 32 -255 82 82 -255 205 156 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/graphics/fame_checker_bg.pal b/data/graphics/fame_checker_bg.pal deleted file mode 100644 index 9fc41db87..000000000 --- a/data/graphics/fame_checker_bg.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -246 222 82 -255 255 156 -246 222 82 -255 238 98 -255 255 213 -255 172 106 -222 148 74 -255 246 222 -156 148 164 -238 230 180 -255 255 213 -123 123 123 -213 213 213 -255 255 255 -106 106 106 -24 98 197 -246 222 82 -172 164 90 -148 156 230 -98 106 180 -123 131 205 -255 255 255 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -115 0 0 -0 255 0 -205 213 213 -238 238 246 -106 106 106 diff --git a/data/graphics/fame_checker_bg.png b/data/graphics/fame_checker_bg.png deleted file mode 100644 index ed1a9a0f8..000000000 Binary files a/data/graphics/fame_checker_bg.png and /dev/null differ diff --git a/data/graphics/fame_checker_tilemap2.bin b/data/graphics/fame_checker_tilemap2.bin deleted file mode 100644 index 6e2eed695..000000000 Binary files a/data/graphics/fame_checker_tilemap2.bin and /dev/null differ diff --git a/data/graphics/fame_checker_tilemap3.bin b/data/graphics/fame_checker_tilemap3.bin deleted file mode 100644 index fdf419278..000000000 Binary files a/data/graphics/fame_checker_tilemap3.bin and /dev/null differ diff --git a/data/graphics/fonts/down_arrow.png b/data/graphics/fonts/down_arrow.png deleted file mode 100644 index e74ed47ef..000000000 Binary files a/data/graphics/fonts/down_arrow.png and /dev/null differ diff --git a/data/graphics/fonts/down_arrow_2.png b/data/graphics/fonts/down_arrow_2.png deleted file mode 100644 index aefcf4f08..000000000 Binary files a/data/graphics/fonts/down_arrow_2.png and /dev/null differ diff --git a/data/graphics/fonts/down_arrow_3.png b/data/graphics/fonts/down_arrow_3.png deleted file mode 100644 index 6345eacfb..000000000 Binary files a/data/graphics/fonts/down_arrow_3.png and /dev/null differ diff --git a/data/graphics/fonts/down_arrow_4.png b/data/graphics/fonts/down_arrow_4.png deleted file mode 100644 index b6cba25f3..000000000 Binary files a/data/graphics/fonts/down_arrow_4.png and /dev/null differ diff --git a/data/graphics/fonts/down_arrow_RS.png b/data/graphics/fonts/down_arrow_RS.png deleted file mode 100644 index c0aae894f..000000000 Binary files a/data/graphics/fonts/down_arrow_RS.png and /dev/null differ diff --git a/data/graphics/fonts/down_arrow_RS_2.png b/data/graphics/fonts/down_arrow_RS_2.png deleted file mode 100644 index de9d9cf47..000000000 Binary files a/data/graphics/fonts/down_arrow_RS_2.png and /dev/null differ diff --git a/data/graphics/fonts/font0_jap.png b/data/graphics/fonts/font0_jap.png deleted file mode 100644 index 23903f343..000000000 Binary files a/data/graphics/fonts/font0_jap.png and /dev/null differ diff --git a/data/graphics/fonts/font0_latin.png b/data/graphics/fonts/font0_latin.png deleted file mode 100644 index 7a79f2389..000000000 Binary files a/data/graphics/fonts/font0_latin.png and /dev/null differ diff --git a/data/graphics/fonts/font1_jap.png b/data/graphics/fonts/font1_jap.png deleted file mode 100644 index 0041b477a..000000000 Binary files a/data/graphics/fonts/font1_jap.png and /dev/null differ diff --git a/data/graphics/fonts/font1_latin.png b/data/graphics/fonts/font1_latin.png deleted file mode 100644 index 42e847faf..000000000 Binary files a/data/graphics/fonts/font1_latin.png and /dev/null differ diff --git a/data/graphics/fonts/font2_jap.png b/data/graphics/fonts/font2_jap.png deleted file mode 100644 index efdb4b77e..000000000 Binary files a/data/graphics/fonts/font2_jap.png and /dev/null differ diff --git a/data/graphics/fonts/font2_latin.png b/data/graphics/fonts/font2_latin.png deleted file mode 100644 index 42e847faf..000000000 Binary files a/data/graphics/fonts/font2_latin.png and /dev/null differ diff --git a/data/graphics/fonts/font4_jap.png b/data/graphics/fonts/font4_jap.png deleted file mode 100644 index da4f2beac..000000000 Binary files a/data/graphics/fonts/font4_jap.png and /dev/null differ diff --git a/data/graphics/fonts/font4_latin.png b/data/graphics/fonts/font4_latin.png deleted file mode 100644 index 42e847faf..000000000 Binary files a/data/graphics/fonts/font4_latin.png and /dev/null differ diff --git a/data/graphics/fonts/font5_jap.png b/data/graphics/fonts/font5_jap.png deleted file mode 100644 index 7da59c0eb..000000000 Binary files a/data/graphics/fonts/font5_jap.png and /dev/null differ diff --git a/data/graphics/fonts/font5_latin.png b/data/graphics/fonts/font5_latin.png deleted file mode 100644 index 42e847faf..000000000 Binary files a/data/graphics/fonts/font5_latin.png and /dev/null differ diff --git a/data/graphics/fonts/font6_braille.png b/data/graphics/fonts/font6_braille.png deleted file mode 100644 index cb4451bc2..000000000 Binary files a/data/graphics/fonts/font6_braille.png and /dev/null differ diff --git a/data/graphics/fonts/font9_jap.png b/data/graphics/fonts/font9_jap.png deleted file mode 100644 index 14cf6c042..000000000 Binary files a/data/graphics/fonts/font9_jap.png and /dev/null differ diff --git a/data/graphics/fonts/keypad_icons.png b/data/graphics/fonts/keypad_icons.png deleted file mode 100644 index f8c162bb9..000000000 Binary files a/data/graphics/fonts/keypad_icons.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_46718C.png b/data/graphics/mevent/gfx_46718C.png deleted file mode 100644 index bf52445e6..000000000 Binary files a/data/graphics/mevent/gfx_46718C.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_46737C.png b/data/graphics/mevent/gfx_46737C.png deleted file mode 100644 index 1a23f8b94..000000000 Binary files a/data/graphics/mevent/gfx_46737C.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_467558.png b/data/graphics/mevent/gfx_467558.png deleted file mode 100644 index c28edd891..000000000 Binary files a/data/graphics/mevent/gfx_467558.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_467700.png b/data/graphics/mevent/gfx_467700.png deleted file mode 100644 index f31385746..000000000 Binary files a/data/graphics/mevent/gfx_467700.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_467A7C.png b/data/graphics/mevent/gfx_467A7C.png deleted file mode 100644 index f94b6c50f..000000000 Binary files a/data/graphics/mevent/gfx_467A7C.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_467EF4.png b/data/graphics/mevent/gfx_467EF4.png deleted file mode 100644 index 51a1aeb0c..000000000 Binary files a/data/graphics/mevent/gfx_467EF4.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_4680C0.png b/data/graphics/mevent/gfx_4680C0.png deleted file mode 100644 index 1a27f3213..000000000 Binary files a/data/graphics/mevent/gfx_4680C0.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_46821C.png b/data/graphics/mevent/gfx_46821C.png deleted file mode 100644 index aab27d16c..000000000 Binary files a/data/graphics/mevent/gfx_46821C.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_46830C.png b/data/graphics/mevent/gfx_46830C.png deleted file mode 100644 index 3c2b8e6d1..000000000 Binary files a/data/graphics/mevent/gfx_46830C.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_468448.png b/data/graphics/mevent/gfx_468448.png deleted file mode 100644 index 137dbe9f3..000000000 Binary files a/data/graphics/mevent/gfx_468448.png and /dev/null differ diff --git a/data/graphics/mevent/gfx_4685B4.png b/data/graphics/mevent/gfx_4685B4.png deleted file mode 100644 index 137dbe9f3..000000000 Binary files a/data/graphics/mevent/gfx_4685B4.png and /dev/null differ diff --git a/data/graphics/mevent/pal_46708C.pal b/data/graphics/mevent/pal_46708C.pal deleted file mode 100644 index 9c5ef9b26..000000000 --- a/data/graphics/mevent/pal_46708C.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -213 213 213 -74 74 74 -98 106 106 -213 189 74 -238 213 82 -246 246 213 -255 255 255 -230 230 213 -238 238 213 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_4670AC.pal b/data/graphics/mevent/pal_4670AC.pal deleted file mode 100644 index 18c2be3fd..000000000 --- a/data/graphics/mevent/pal_4670AC.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -82 82 106 -131 131 139 -197 189 213 -205 230 255 -115 139 197 -49 74 82 -0 0 0 -0 0 0 -222 255 246 -197 255 222 -222 238 255 -156 180 222 -156 106 115 -172 139 164 -255 255 255 diff --git a/data/graphics/mevent/pal_4670CC.pal b/data/graphics/mevent/pal_4670CC.pal deleted file mode 100644 index db02d5d4b..000000000 --- a/data/graphics/mevent/pal_4670CC.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -82 82 106 -131 131 139 -164 156 172 -197 189 213 -246 238 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 230 230 -255 197 197 -255 164 164 -246 139 139 -238 90 90 -255 255 255 diff --git a/data/graphics/mevent/pal_4670EC.pal b/data/graphics/mevent/pal_4670EC.pal deleted file mode 100644 index bfbf036a5..000000000 --- a/data/graphics/mevent/pal_4670EC.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -82 82 106 -131 131 139 -164 156 172 -197 189 213 -246 238 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -238 255 230 -213 255 189 -189 230 156 -164 213 131 -148 197 106 -255 255 255 diff --git a/data/graphics/mevent/pal_46710C.pal b/data/graphics/mevent/pal_46710C.pal deleted file mode 100644 index fa41ee3b0..000000000 --- a/data/graphics/mevent/pal_46710C.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -82 82 106 -131 131 139 -164 156 172 -197 189 213 -246 238 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -238 246 255 -205 238 246 -180 222 246 -156 197 238 -115 156 197 -255 255 255 diff --git a/data/graphics/mevent/pal_46712C.pal b/data/graphics/mevent/pal_46712C.pal deleted file mode 100644 index 8a71f5846..000000000 --- a/data/graphics/mevent/pal_46712C.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -82 82 106 -131 131 139 -164 156 172 -197 189 213 -246 238 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -238 238 197 -230 230 139 -222 222 115 -213 213 90 -189 189 57 -255 255 255 diff --git a/data/graphics/mevent/pal_46714C.pal b/data/graphics/mevent/pal_46714C.pal deleted file mode 100644 index 01832b5e2..000000000 --- a/data/graphics/mevent/pal_46714C.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -189 123 148 -213 213 213 -74 74 74 -115 123 123 -164 156 90 -164 148 90 -197 197 90 -213 205 90 -222 213 90 -213 213 106 -238 246 98 -230 222 98 -213 205 98 -197 180 98 -238 230 98 -246 238 106 diff --git a/data/graphics/mevent/pal_46716C.pal b/data/graphics/mevent/pal_46716C.pal deleted file mode 100644 index 28a498b57..000000000 --- a/data/graphics/mevent/pal_46716C.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -189 123 148 -213 213 213 -74 74 74 -115 123 123 -156 156 156 -139 139 148 -180 180 197 -197 189 205 -205 205 222 -189 189 189 -197 230 222 -189 213 213 -180 197 197 -156 164 172 -222 222 230 -230 230 238 diff --git a/data/graphics/mevent/pal_467DF4.pal b/data/graphics/mevent/pal_467DF4.pal deleted file mode 100644 index 7314ddbc8..000000000 --- a/data/graphics/mevent/pal_467DF4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -189 189 164 -205 205 172 -213 213 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_467E14.pal b/data/graphics/mevent/pal_467E14.pal deleted file mode 100644 index 333dd9280..000000000 --- a/data/graphics/mevent/pal_467E14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -82 82 106 -164 156 180 -246 238 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_467E34.pal b/data/graphics/mevent/pal_467E34.pal deleted file mode 100644 index 3fca3cdf3..000000000 --- a/data/graphics/mevent/pal_467E34.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -246 139 139 -246 180 180 -255 230 230 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_467E54.pal b/data/graphics/mevent/pal_467E54.pal deleted file mode 100644 index f5125b4c9..000000000 --- a/data/graphics/mevent/pal_467E54.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -164 213 131 -197 230 180 -238 255 230 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_467E74.pal b/data/graphics/mevent/pal_467E74.pal deleted file mode 100644 index e8ec07ab5..000000000 --- a/data/graphics/mevent/pal_467E74.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -156 197 238 -197 222 246 -238 246 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_467E94.pal b/data/graphics/mevent/pal_467E94.pal deleted file mode 100644 index 783979089..000000000 --- a/data/graphics/mevent/pal_467E94.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -213 213 90 -222 222 139 -238 238 197 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_467EB4.pal b/data/graphics/mevent/pal_467EB4.pal deleted file mode 100644 index 1c74daace..000000000 --- a/data/graphics/mevent/pal_467EB4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -205 189 98 -222 205 115 -230 222 98 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_467ED4.pal b/data/graphics/mevent/pal_467ED4.pal deleted file mode 100644 index d1d92ba57..000000000 --- a/data/graphics/mevent/pal_467ED4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -197 197 197 -205 205 205 -213 213 213 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_468060.pal b/data/graphics/mevent/pal_468060.pal deleted file mode 100644 index 970736bbb..000000000 --- a/data/graphics/mevent/pal_468060.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -213 213 213 -74 74 74 -98 106 106 -213 189 74 -238 213 82 -246 246 213 -255 255 255 -230 230 213 -238 238 213 -246 246 238 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/graphics/mevent/pal_468080.pal b/data/graphics/mevent/pal_468080.pal deleted file mode 100644 index 01832b5e2..000000000 --- a/data/graphics/mevent/pal_468080.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -189 123 148 -213 213 213 -74 74 74 -115 123 123 -164 156 90 -164 148 90 -197 197 90 -213 205 90 -222 213 90 -213 213 106 -238 246 98 -230 222 98 -213 205 98 -197 180 98 -238 230 98 -246 238 106 diff --git a/data/graphics/mevent/pal_4680A0.pal b/data/graphics/mevent/pal_4680A0.pal deleted file mode 100644 index 28a498b57..000000000 --- a/data/graphics/mevent/pal_4680A0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -189 123 148 -213 213 213 -74 74 74 -115 123 123 -156 156 156 -139 139 148 -180 180 197 -197 189 205 -205 205 222 -189 189 189 -197 230 222 -189 213 213 -180 197 197 -156 164 172 -222 222 230 -230 230 238 diff --git a/data/graphics/mevent/tilemap_467288.bin b/data/graphics/mevent/tilemap_467288.bin deleted file mode 100644 index 8e4a4717b..000000000 Binary files a/data/graphics/mevent/tilemap_467288.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_467470.bin b/data/graphics/mevent/tilemap_467470.bin deleted file mode 100644 index b59dbabb5..000000000 Binary files a/data/graphics/mevent/tilemap_467470.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_46762C.bin b/data/graphics/mevent/tilemap_46762C.bin deleted file mode 100644 index aba2b9e92..000000000 Binary files a/data/graphics/mevent/tilemap_46762C.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_467934.bin b/data/graphics/mevent/tilemap_467934.bin deleted file mode 100644 index 1800bff4d..000000000 Binary files a/data/graphics/mevent/tilemap_467934.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_467CAC.bin b/data/graphics/mevent/tilemap_467CAC.bin deleted file mode 100644 index 1800bff4d..000000000 Binary files a/data/graphics/mevent/tilemap_467CAC.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_468140.bin b/data/graphics/mevent/tilemap_468140.bin deleted file mode 100644 index f8185b28e..000000000 Binary files a/data/graphics/mevent/tilemap_468140.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_46824C.bin b/data/graphics/mevent/tilemap_46824C.bin deleted file mode 100644 index 72c7ea278..000000000 Binary files a/data/graphics/mevent/tilemap_46824C.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_46837C.bin b/data/graphics/mevent/tilemap_46837C.bin deleted file mode 100644 index c7b2e3e21..000000000 Binary files a/data/graphics/mevent/tilemap_46837C.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_4684D8.bin b/data/graphics/mevent/tilemap_4684D8.bin deleted file mode 100644 index f8185b28e..000000000 Binary files a/data/graphics/mevent/tilemap_4684D8.bin and /dev/null differ diff --git a/data/graphics/mevent/tilemap_468644.bin b/data/graphics/mevent/tilemap_468644.bin deleted file mode 100644 index f8185b28e..000000000 Binary files a/data/graphics/mevent/tilemap_468644.bin and /dev/null differ diff --git a/data/graphics/title_screen/lg_border_bg.bin b/data/graphics/title_screen/lg_border_bg.bin deleted file mode 100644 index 108680bc3..000000000 --- a/data/graphics/title_screen/lg_border_bg.bin +++ /dev/null @@ -1 +0,0 @@ -àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààððððàððàààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà \ No newline at end of file diff --git a/data/graphics/title_screen/unk_83BF58C.png b/data/graphics/title_screen/unk_83BF58C.png deleted file mode 100644 index 895457c3c..000000000 Binary files a/data/graphics/title_screen/unk_83BF58C.png and /dev/null differ diff --git a/data/graphics/title_screen/unk_83BF5A8.bin b/data/graphics/title_screen/unk_83BF5A8.bin deleted file mode 100644 index 375fbeb7a..000000000 --- a/data/graphics/title_screen/unk_83BF5A8.bin +++ /dev/null @@ -1 +0,0 @@ -àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà \ No newline at end of file diff --git a/data/graphics/title_screen/unk_83bf64c.png b/data/graphics/title_screen/unk_83bf64c.png deleted file mode 100644 index 260e00a01..000000000 Binary files a/data/graphics/title_screen/unk_83bf64c.png and /dev/null differ diff --git a/data/graphics/title_screen/unk_83bf77c.pal b/data/graphics/title_screen/unk_83bf77c.pal deleted file mode 100644 index 815547f37..000000000 --- a/data/graphics/title_screen/unk_83bf77c.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -82 205 180 -0 0 0 -255 255 189 -255 246 139 -255 213 65 -255 172 0 -197 164 49 -115 180 139 -98 189 156 -90 197 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -82 205 180 diff --git a/data/graphics/title_screen/unk_83bf79c.png b/data/graphics/title_screen/unk_83bf79c.png deleted file mode 100644 index 66a57a899..000000000 Binary files a/data/graphics/title_screen/unk_83bf79c.png and /dev/null differ diff --git a/data/graphics/title_screen/unk_83bfa14.png b/data/graphics/title_screen/unk_83bfa14.png deleted file mode 100644 index f4f030a5b..000000000 Binary files a/data/graphics/title_screen/unk_83bfa14.png and /dev/null differ diff --git a/data/graphics/title_screen/unk_lg_83bf764.pal b/data/graphics/title_screen/unk_lg_83bf764.pal deleted file mode 100644 index 9a13f7dad..000000000 --- a/data/graphics/title_screen/unk_lg_83bf764.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -230 123 90 -16 164 74 -148 255 57 -98 222 57 -57 189 65 -230 255 230 -148 255 205 -82 246 131 -180 180 115 -255 205 148 -246 172 123 -238 148 106 -0 0 0 -0 0 0 -0 0 0 -230 123 90 diff --git a/data/graphics/title_screen/unk_lg_83bf784.png b/data/graphics/title_screen/unk_lg_83bf784.png deleted file mode 100644 index d4f7dd622..000000000 Binary files a/data/graphics/title_screen/unk_lg_83bf784.png and /dev/null differ diff --git a/data/graphics/title_screen/unk_lg_83bf89c.png b/data/graphics/title_screen/unk_lg_83bf89c.png deleted file mode 100644 index d783c1204..000000000 Binary files a/data/graphics/title_screen/unk_lg_83bf89c.png and /dev/null differ diff --git a/data/graphics/unk_847a348.png b/data/graphics/unk_847a348.png deleted file mode 100644 index 9897a6d36..000000000 Binary files a/data/graphics/unk_847a348.png and /dev/null differ diff --git a/data/graphics/unknown_8456638.bin b/data/graphics/unknown_8456638.bin deleted file mode 100644 index 53ea8cfb8..000000000 --- a/data/graphics/unknown_8456638.bin +++ /dev/null @@ -1 +0,0 @@ -»»»»ÌÌÌÌÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÌÌÌÌ»»»» \ No newline at end of file diff --git a/data/graphics/unknown_84566a8.bin b/data/graphics/unknown_84566a8.bin deleted file mode 100644 index 2fc4a648a..000000000 Binary files a/data/graphics/unknown_84566a8.bin and /dev/null differ diff --git a/data/itemfinder/spr_tiles.png b/data/itemfinder/spr_tiles.png deleted file mode 100644 index 4171f37b4..000000000 Binary files a/data/itemfinder/spr_tiles.png and /dev/null differ diff --git a/data/main_menu/unk_8234648.pal b/data/main_menu/unk_8234648.pal deleted file mode 100644 index 7aca54c52..000000000 --- a/data/main_menu/unk_8234648.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 148 255 -255 255 255 -49 57 82 -90 98 115 -8 8 16 -148 156 172 -205 222 238 -180 180 189 -189 205 222 -32 32 49 -123 131 139 -49 82 123 -41 123 197 -57 139 213 -90 164 230 -139 197 246 diff --git a/data/main_menu/unk_8234668.pal b/data/main_menu/unk_8234668.pal deleted file mode 100644 index 022f0051f..000000000 --- a/data/main_menu/unk_8234668.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -98 98 98 -213 213 205 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -255 255 255 -98 98 98 -213 213 205 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/altering_cave_pal.pal b/data/map_preview/altering_cave_pal.pal deleted file mode 100644 index f451adce2..000000000 --- a/data/map_preview/altering_cave_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -65 74 90 -139 205 123 -90 164 98 -213 205 172 -189 172 139 -156 205 164 -230 230 205 -148 213 106 -189 222 197 -148 131 90 -238 230 189 -213 246 255 -164 205 255 -205 230 255 -238 246 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/altering_cave_tilemap.bin b/data/map_preview/altering_cave_tilemap.bin deleted file mode 100644 index fa907c6e7..000000000 Binary files a/data/map_preview/altering_cave_tilemap.bin and /dev/null differ diff --git a/data/map_preview/altering_cave_tiles.png b/data/map_preview/altering_cave_tiles.png deleted file mode 100644 index 4ea8496a2..000000000 Binary files a/data/map_preview/altering_cave_tiles.png and /dev/null differ diff --git a/data/map_preview/berry_forest_pal.pal b/data/map_preview/berry_forest_pal.pal deleted file mode 100644 index 755a6c2ed..000000000 --- a/data/map_preview/berry_forest_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 90 -238 238 246 -197 197 98 -180 180 90 -106 115 24 -156 156 49 -197 164 90 -164 131 74 -131 106 65 -213 213 156 -222 238 172 -156 189 115 -131 156 82 -131 123 57 -246 246 246 -189 213 139 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/berry_forest_tilemap.bin b/data/map_preview/berry_forest_tilemap.bin deleted file mode 100644 index fe7312a9f..000000000 Binary files a/data/map_preview/berry_forest_tilemap.bin and /dev/null differ diff --git a/data/map_preview/berry_forest_tiles.png b/data/map_preview/berry_forest_tiles.png deleted file mode 100644 index 6f6efd0fe..000000000 Binary files a/data/map_preview/berry_forest_tiles.png and /dev/null differ diff --git a/data/map_preview/cerulean_cave_pal.pal b/data/map_preview/cerulean_cave_pal.pal deleted file mode 100644 index 074a6b6f7..000000000 --- a/data/map_preview/cerulean_cave_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -49 57 106 -222 205 246 -189 164 205 -156 123 164 -238 230 255 -82 106 123 -123 156 172 -222 230 238 -189 197 205 -164 172 180 -139 172 148 -180 205 189 -115 123 131 -213 238 222 -49 57 74 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/cerulean_cave_tilemap.bin b/data/map_preview/cerulean_cave_tilemap.bin deleted file mode 100644 index e66ab7ea3..000000000 Binary files a/data/map_preview/cerulean_cave_tilemap.bin and /dev/null differ diff --git a/data/map_preview/cerulean_cave_tiles.png b/data/map_preview/cerulean_cave_tiles.png deleted file mode 100644 index e9f7b4e2e..000000000 Binary files a/data/map_preview/cerulean_cave_tiles.png and /dev/null differ diff --git a/data/map_preview/digletts_cave_pal.pal b/data/map_preview/digletts_cave_pal.pal deleted file mode 100644 index 923d83144..000000000 --- a/data/map_preview/digletts_cave_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -49 57 74 -197 197 205 -189 180 172 -148 148 115 -222 238 246 -90 98 90 -106 148 106 -222 222 180 -189 189 148 -164 164 123 -156 197 123 -115 164 82 -106 106 98 -197 222 156 -74 74 65 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/digletts_cave_tilemap.bin b/data/map_preview/digletts_cave_tilemap.bin deleted file mode 100644 index 2f8bbd665..000000000 Binary files a/data/map_preview/digletts_cave_tilemap.bin and /dev/null differ diff --git a/data/map_preview/digletts_cave_tiles.png b/data/map_preview/digletts_cave_tiles.png deleted file mode 100644 index c3e7d2879..000000000 Binary files a/data/map_preview/digletts_cave_tiles.png and /dev/null differ diff --git a/data/map_preview/dotted_hole_pal.pal b/data/map_preview/dotted_hole_pal.pal deleted file mode 100644 index fd424fa28..000000000 --- a/data/map_preview/dotted_hole_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -65 74 90 -238 246 246 -74 156 106 -115 197 115 -156 230 148 -180 189 197 -213 222 230 -230 238 246 -115 123 90 -156 164 123 -197 205 156 -213 222 189 -222 230 197 -213 238 255 -255 255 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/dotted_hole_tilemap.bin b/data/map_preview/dotted_hole_tilemap.bin deleted file mode 100644 index a83083b38..000000000 Binary files a/data/map_preview/dotted_hole_tilemap.bin and /dev/null differ diff --git a/data/map_preview/dotted_hole_tiles.png b/data/map_preview/dotted_hole_tiles.png deleted file mode 100644 index f2d23d46e..000000000 Binary files a/data/map_preview/dotted_hole_tiles.png and /dev/null differ diff --git a/data/map_preview/icefall_cave_pal.pal b/data/map_preview/icefall_cave_pal.pal deleted file mode 100644 index 4e31e5380..000000000 --- a/data/map_preview/icefall_cave_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -65 74 106 -238 246 246 -82 139 115 -131 180 131 -172 213 164 -205 205 189 -222 222 205 -238 238 222 -115 115 115 -156 156 139 -180 180 156 -197 197 189 -213 213 205 -213 238 255 -255 255 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/icefall_cave_tilemap.bin b/data/map_preview/icefall_cave_tilemap.bin deleted file mode 100644 index bd1d05d1b..000000000 Binary files a/data/map_preview/icefall_cave_tilemap.bin and /dev/null differ diff --git a/data/map_preview/icefall_cave_tiles.png b/data/map_preview/icefall_cave_tiles.png deleted file mode 100644 index 211f19758..000000000 Binary files a/data/map_preview/icefall_cave_tiles.png and /dev/null differ diff --git a/data/map_preview/kanto_safari_zone_pal.pal b/data/map_preview/kanto_safari_zone_pal.pal deleted file mode 100644 index 0434848d8..000000000 --- a/data/map_preview/kanto_safari_zone_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -0 0 0 -222 230 213 -222 213 148 -197 230 148 -213 238 164 -123 164 90 -230 246 246 -222 238 246 -213 222 255 -180 222 98 -205 180 115 -205 213 197 -180 156 106 -164 197 90 -222 238 197 -222 246 213 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -189 222 98 -172 205 90 -115 172 65 -222 213 148 -139 197 98 -205 180 115 -205 230 246 -180 156 106 -222 238 246 -189 213 255 -197 230 148 diff --git a/data/map_preview/kanto_safari_zone_tilemap.bin b/data/map_preview/kanto_safari_zone_tilemap.bin deleted file mode 100644 index 756de73b6..000000000 Binary files a/data/map_preview/kanto_safari_zone_tilemap.bin and /dev/null differ diff --git a/data/map_preview/kanto_safari_zone_tiles.png b/data/map_preview/kanto_safari_zone_tiles.png deleted file mode 100644 index b1da5a41d..000000000 Binary files a/data/map_preview/kanto_safari_zone_tiles.png and /dev/null differ diff --git a/data/map_preview/kanto_victory_road_pal.pal b/data/map_preview/kanto_victory_road_pal.pal deleted file mode 100644 index 828ff7e22..000000000 --- a/data/map_preview/kanto_victory_road_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -74 82 98 -222 238 246 -98 139 106 -131 172 98 -164 205 123 -180 189 197 -205 213 222 -222 230 238 -139 131 74 -172 172 98 -197 197 123 -213 205 148 -222 213 156 -213 230 246 -246 246 246 -0 0 0 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -131 172 98 -164 205 123 -139 131 74 -172 172 98 -197 197 123 -213 205 148 -222 213 156 -148 189 131 -205 213 222 -222 238 246 -98 139 106 diff --git a/data/map_preview/kanto_victory_road_tilemap.bin b/data/map_preview/kanto_victory_road_tilemap.bin deleted file mode 100644 index 03d1cc292..000000000 Binary files a/data/map_preview/kanto_victory_road_tilemap.bin and /dev/null differ diff --git a/data/map_preview/kanto_victory_road_tiles.png b/data/map_preview/kanto_victory_road_tiles.png deleted file mode 100644 index b3432b9c9..000000000 Binary files a/data/map_preview/kanto_victory_road_tiles.png and /dev/null differ diff --git a/data/map_preview/lost_cave_pal.pal b/data/map_preview/lost_cave_pal.pal deleted file mode 100644 index 33b29a07b..000000000 --- a/data/map_preview/lost_cave_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -65 74 90 -98 106 123 -123 131 148 -189 189 164 -164 156 131 -238 238 222 -213 213 197 -213 238 238 -189 213 213 -131 123 98 -213 213 180 -197 222 222 -172 189 230 -189 205 222 -230 230 213 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/lost_cave_tilemap.bin b/data/map_preview/lost_cave_tilemap.bin deleted file mode 100644 index 6c256acc2..000000000 Binary files a/data/map_preview/lost_cave_tilemap.bin and /dev/null differ diff --git a/data/map_preview/lost_cave_tiles.png b/data/map_preview/lost_cave_tiles.png deleted file mode 100644 index a2c4c8f38..000000000 Binary files a/data/map_preview/lost_cave_tiles.png and /dev/null differ diff --git a/data/map_preview/monean_chamber_pal.pal b/data/map_preview/monean_chamber_pal.pal deleted file mode 100644 index ce72a4891..000000000 --- a/data/map_preview/monean_chamber_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -74 82 98 -205 213 139 -156 164 82 -123 131 82 -213 189 164 -222 230 164 -115 189 106 -172 213 131 -172 148 123 -213 238 238 -230 205 180 -131 106 98 -180 189 123 -197 230 255 -230 246 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/monean_chamber_tilemap.bin b/data/map_preview/monean_chamber_tilemap.bin deleted file mode 100644 index f228d3daf..000000000 Binary files a/data/map_preview/monean_chamber_tilemap.bin and /dev/null differ diff --git a/data/map_preview/monean_chamber_tiles.png b/data/map_preview/monean_chamber_tiles.png deleted file mode 100644 index 6426d175f..000000000 Binary files a/data/map_preview/monean_chamber_tiles.png and /dev/null differ diff --git a/data/map_preview/mt_ember_pal.pal b/data/map_preview/mt_ember_pal.pal deleted file mode 100644 index 4f5066e64..000000000 --- a/data/map_preview/mt_ember_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -65 74 90 -238 246 246 -222 246 255 -230 230 255 -156 230 148 -205 189 213 -222 205 230 -238 222 246 -131 106 106 -172 148 148 -197 172 172 -222 197 197 -238 213 213 -213 238 255 -255 255 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/mt_ember_tilemap.bin b/data/map_preview/mt_ember_tilemap.bin deleted file mode 100644 index 52af71494..000000000 Binary files a/data/map_preview/mt_ember_tilemap.bin and /dev/null differ diff --git a/data/map_preview/mt_ember_tiles.png b/data/map_preview/mt_ember_tiles.png deleted file mode 100644 index 9145e9d4f..000000000 Binary files a/data/map_preview/mt_ember_tiles.png and /dev/null differ diff --git a/data/map_preview/mt_moon_pal.pal b/data/map_preview/mt_moon_pal.pal deleted file mode 100644 index 9a858a8c6..000000000 --- a/data/map_preview/mt_moon_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -74 82 98 -230 238 255 -65 131 90 -115 180 115 -156 213 148 -205 205 230 -230 222 255 -222 222 180 -115 106 90 -148 139 98 -172 164 115 -205 197 164 -205 197 164 -205 230 255 -238 230 213 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/mt_moon_tilemap.bin b/data/map_preview/mt_moon_tilemap.bin deleted file mode 100644 index 469efcf77..000000000 Binary files a/data/map_preview/mt_moon_tilemap.bin and /dev/null differ diff --git a/data/map_preview/mt_moon_tiles.png b/data/map_preview/mt_moon_tiles.png deleted file mode 100644 index 8ede39bdd..000000000 Binary files a/data/map_preview/mt_moon_tiles.png and /dev/null differ diff --git a/data/map_preview/pokemon_mansion_pal.pal b/data/map_preview/pokemon_mansion_pal.pal deleted file mode 100644 index 7f6ef22a5..000000000 --- a/data/map_preview/pokemon_mansion_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -106 115 131 -213 164 180 -180 131 148 -238 189 205 -230 238 213 -115 82 131 -172 180 172 -131 139 139 -205 213 205 -238 213 238 -238 238 205 -230 222 189 -246 238 164 -222 213 139 -246 246 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/pokemon_mansion_tilemap.bin b/data/map_preview/pokemon_mansion_tilemap.bin deleted file mode 100644 index a8b1b3d3f..000000000 Binary files a/data/map_preview/pokemon_mansion_tilemap.bin and /dev/null differ diff --git a/data/map_preview/pokemon_mansion_tiles.png b/data/map_preview/pokemon_mansion_tiles.png deleted file mode 100644 index 1fa94ceda..000000000 Binary files a/data/map_preview/pokemon_mansion_tiles.png and /dev/null differ diff --git a/data/map_preview/pokemon_tower_pal.pal b/data/map_preview/pokemon_tower_pal.pal deleted file mode 100644 index 93f4847ae..000000000 --- a/data/map_preview/pokemon_tower_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -222 213 246 -213 230 213 -172 180 205 -205 197 156 -180 205 180 -148 164 148 -238 246 238 -238 230 189 -230 238 255 -148 156 180 -255 246 205 -172 164 123 -115 123 148 -197 205 230 -238 246 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/pokemon_tower_tilemap.bin b/data/map_preview/pokemon_tower_tilemap.bin deleted file mode 100644 index f12b9bdf8..000000000 Binary files a/data/map_preview/pokemon_tower_tilemap.bin and /dev/null differ diff --git a/data/map_preview/pokemon_tower_tiles.png b/data/map_preview/pokemon_tower_tiles.png deleted file mode 100644 index 21583f9b3..000000000 Binary files a/data/map_preview/pokemon_tower_tiles.png and /dev/null differ diff --git a/data/map_preview/power_plant_pal.pal b/data/map_preview/power_plant_pal.pal deleted file mode 100644 index 49e5d6800..000000000 --- a/data/map_preview/power_plant_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -74 82 98 -255 246 205 -189 180 189 -189 189 222 -230 222 123 -222 205 205 -246 230 230 -139 156 189 -222 238 255 -106 123 156 -213 189 164 -164 156 164 -238 246 255 -255 238 238 -255 255 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/power_plant_tilemap.bin b/data/map_preview/power_plant_tilemap.bin deleted file mode 100644 index 609cbb30d..000000000 Binary files a/data/map_preview/power_plant_tilemap.bin and /dev/null differ diff --git a/data/map_preview/power_plant_tiles.png b/data/map_preview/power_plant_tiles.png deleted file mode 100644 index 6cd334aa9..000000000 Binary files a/data/map_preview/power_plant_tiles.png and /dev/null differ diff --git a/data/map_preview/rock_tunnel_pal.pal b/data/map_preview/rock_tunnel_pal.pal deleted file mode 100644 index 1412128d0..000000000 --- a/data/map_preview/rock_tunnel_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -65 74 90 -238 246 246 -74 156 106 -115 197 115 -156 230 148 -205 205 189 -222 222 205 -238 238 222 -123 123 90 -164 164 123 -197 197 148 -213 213 180 -230 230 197 -213 238 255 -255 255 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/rock_tunnel_tilemap.bin b/data/map_preview/rock_tunnel_tilemap.bin deleted file mode 100644 index 9c322e0b1..000000000 Binary files a/data/map_preview/rock_tunnel_tilemap.bin and /dev/null differ diff --git a/data/map_preview/rock_tunnel_tiles.png b/data/map_preview/rock_tunnel_tiles.png deleted file mode 100644 index e58ef7fb1..000000000 Binary files a/data/map_preview/rock_tunnel_tiles.png and /dev/null differ diff --git a/data/map_preview/rocket_hideout_pal.pal b/data/map_preview/rocket_hideout_pal.pal deleted file mode 100644 index 9c969e843..000000000 --- a/data/map_preview/rocket_hideout_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -98 106 123 -156 180 156 -222 213 172 -238 238 246 -246 238 197 -189 156 131 -222 189 164 -213 213 222 -222 238 222 -139 156 139 -197 222 197 -197 230 180 -131 139 156 -238 205 180 -255 255 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/rocket_hideout_tilemap.bin b/data/map_preview/rocket_hideout_tilemap.bin deleted file mode 100644 index db9757ebb..000000000 Binary files a/data/map_preview/rocket_hideout_tilemap.bin and /dev/null differ diff --git a/data/map_preview/rocket_hideout_tiles.png b/data/map_preview/rocket_hideout_tiles.png deleted file mode 100644 index 8f57f8afe..000000000 Binary files a/data/map_preview/rocket_hideout_tiles.png and /dev/null differ diff --git a/data/map_preview/rocket_warehouse_pal.pal b/data/map_preview/rocket_warehouse_pal.pal deleted file mode 100644 index c4fffd171..000000000 --- a/data/map_preview/rocket_warehouse_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -98 106 123 -139 180 172 -222 213 172 -238 238 246 -246 238 197 -189 156 131 -222 189 164 -213 213 222 -222 238 222 -139 156 139 -197 222 197 -197 230 180 -131 139 156 -238 205 180 -255 255 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/rocket_warehouse_tilemap.bin b/data/map_preview/rocket_warehouse_tilemap.bin deleted file mode 100644 index 7636eea0a..000000000 Binary files a/data/map_preview/rocket_warehouse_tilemap.bin and /dev/null differ diff --git a/data/map_preview/rocket_warehouse_tiles.png b/data/map_preview/rocket_warehouse_tiles.png deleted file mode 100644 index cc9dae203..000000000 Binary files a/data/map_preview/rocket_warehouse_tiles.png and /dev/null differ diff --git a/data/map_preview/seafoam_islands_pal.pal b/data/map_preview/seafoam_islands_pal.pal deleted file mode 100644 index 348275aca..000000000 --- a/data/map_preview/seafoam_islands_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -65 74 90 -156 222 123 -106 180 98 -197 205 172 -172 172 139 -172 222 164 -222 230 205 -164 230 106 -205 238 197 -131 131 90 -238 230 189 -213 246 255 -164 205 255 -205 230 255 -238 246 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/seafoam_islands_tilemap.bin b/data/map_preview/seafoam_islands_tilemap.bin deleted file mode 100644 index 05afc22fc..000000000 Binary files a/data/map_preview/seafoam_islands_tilemap.bin and /dev/null differ diff --git a/data/map_preview/seafoam_islands_tiles.png b/data/map_preview/seafoam_islands_tiles.png deleted file mode 100644 index b76a85053..000000000 Binary files a/data/map_preview/seafoam_islands_tiles.png and /dev/null differ diff --git a/data/map_preview/silph_co_pal.pal b/data/map_preview/silph_co_pal.pal deleted file mode 100644 index 07acfb986..000000000 --- a/data/map_preview/silph_co_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 0 -238 246 246 -213 238 246 -164 205 197 -131 197 123 -197 230 230 -139 180 172 -180 180 205 -131 131 164 -205 205 230 -172 222 172 -197 213 246 -90 164 90 -123 172 164 -205 238 246 -246 246 255 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/silph_co_tilemap.bin b/data/map_preview/silph_co_tilemap.bin deleted file mode 100644 index 9449f6cd7..000000000 Binary files a/data/map_preview/silph_co_tilemap.bin and /dev/null differ diff --git a/data/map_preview/silph_co_tiles.png b/data/map_preview/silph_co_tiles.png deleted file mode 100644 index c5433bcee..000000000 Binary files a/data/map_preview/silph_co_tiles.png and /dev/null differ diff --git a/data/map_preview/viridian_forest_pal.pal b/data/map_preview/viridian_forest_pal.pal deleted file mode 100644 index ff1655587..000000000 --- a/data/map_preview/viridian_forest_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 90 -222 246 246 -156 230 148 -115 197 115 -41 106 106 -90 172 123 -197 189 106 -148 139 90 -106 98 74 -205 246 197 -180 213 230 -123 189 205 -90 156 164 -65 131 139 -246 246 255 -32 41 41 -255 255 90 -246 246 255 -74 98 123 -213 213 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/map_preview/viridian_forest_tilemap.bin b/data/map_preview/viridian_forest_tilemap.bin deleted file mode 100644 index 37883b634..000000000 Binary files a/data/map_preview/viridian_forest_tilemap.bin and /dev/null differ diff --git a/data/map_preview/viridian_forest_tiles.png b/data/map_preview/viridian_forest_tiles.png deleted file mode 100644 index 79b70c2e5..000000000 Binary files a/data/map_preview/viridian_forest_tiles.png and /dev/null differ diff --git a/data/oak_speech/help_docs_page2_tilemap.bin b/data/oak_speech/help_docs_page2_tilemap.bin deleted file mode 100644 index 6d3cd42f1..000000000 Binary files a/data/oak_speech/help_docs_page2_tilemap.bin and /dev/null differ diff --git a/data/oak_speech/help_docs_page3_tilemap.bin b/data/oak_speech/help_docs_page3_tilemap.bin deleted file mode 100644 index 24805c96e..000000000 Binary files a/data/oak_speech/help_docs_page3_tilemap.bin and /dev/null differ diff --git a/data/oak_speech/help_docs_palette.pal b/data/oak_speech/help_docs_palette.pal deleted file mode 100644 index b6905b913..000000000 --- a/data/oak_speech/help_docs_palette.pal +++ /dev/null @@ -1,67 +0,0 @@ -JASC-PAL -0100 -64 -16 115 230 -65 139 131 -82 148 139 -106 164 156 -131 180 172 -156 197 189 -180 213 205 -205 230 222 -230 246 238 -255 0 255 -255 0 255 -0 90 16 -255 0 0 -49 82 205 -255 255 255 -32 32 32 -16 115 230 -255 255 164 -255 255 106 -222 222 90 -189 189 74 -156 156 57 -156 156 57 -123 123 49 -90 90 32 -57 57 16 -255 0 0 -255 0 0 -255 0 0 -255 0 0 -255 0 0 -0 0 0 -238 230 172 -115 180 197 -156 213 238 -205 238 246 -246 255 255 -230 246 246 -106 106 106 -74 82 106 -82 98 180 -230 246 246 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 74 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 0 255 -123 123 123 -172 172 156 -197 197 197 -222 222 222 -238 238 238 -255 255 255 diff --git a/data/oak_speech/new_game_adventure_intro_tilemap.bin b/data/oak_speech/new_game_adventure_intro_tilemap.bin deleted file mode 100644 index ad1c8216c..000000000 --- a/data/oak_speech/new_game_adventure_intro_tilemap.bin +++ /dev/null @@ -1,2 +0,0 @@ -^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^                                ` `   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` `   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (`   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (`   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` `   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` ` a b c d e f   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (p q r s t u v   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` g h i j k l m   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (w x y z { | }   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` n o ‚ ƒ „ … †   ` ~  ’ “ ” • –   - \ No newline at end of file diff --git a/data/oak_speech/oak_speech_background_tilemap.bin b/data/oak_speech/oak_speech_background_tilemap.bin deleted file mode 100644 index 64374cd24..000000000 Binary files a/data/oak_speech/oak_speech_background_tilemap.bin and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png b/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png deleted file mode 100644 index 419858b1b..000000000 Binary files a/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_grass_platform.png b/data/oak_speech/oak_speech_gfx_grass_platform.png deleted file mode 100644 index 2c8e425d2..000000000 Binary files a/data/oak_speech/oak_speech_gfx_grass_platform.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_leaf_pal.pal b/data/oak_speech/oak_speech_gfx_leaf_pal.pal deleted file mode 100644 index feb1214a1..000000000 --- a/data/oak_speech/oak_speech_gfx_leaf_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -115 197 164 -255 238 205 -246 205 180 -213 164 148 -172 131 106 -106 74 65 -205 164 139 -164 123 98 -115 74 49 -74 41 16 -222 222 222 -180 180 180 -131 131 131 -82 82 90 -41 41 49 -255 255 255 -0 0 0 -131 189 213 -106 156 180 -82 131 156 -49 90 115 -32 65 90 -0 0 255 -255 255 189 -222 222 82 -172 172 57 -98 98 0 -213 131 123 -189 106 98 -164 82 74 -139 57 49 -98 24 16 diff --git a/data/oak_speech/oak_speech_gfx_leaf_pic.png b/data/oak_speech/oak_speech_gfx_leaf_pic.png deleted file mode 100644 index 1825f9960..000000000 Binary files a/data/oak_speech/oak_speech_gfx_leaf_pic.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_oak_pal.pal b/data/oak_speech/oak_speech_gfx_oak_pal.pal deleted file mode 100644 index a0b648b2b..000000000 --- a/data/oak_speech/oak_speech_gfx_oak_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -115 197 164 -255 230 205 -222 189 156 -197 148 115 -106 74 65 -238 222 148 -205 189 115 -172 156 90 -139 123 65 -98 90 49 -255 0 255 -205 205 222 -123 131 156 -57 74 106 -255 255 255 -0 0 0 -0 0 255 -172 148 222 -131 115 172 -82 65 115 -230 222 180 -205 197 156 -180 172 139 -164 156 123 -123 115 90 -82 57 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/data/oak_speech/oak_speech_gfx_oak_pic.png b/data/oak_speech/oak_speech_gfx_oak_pic.png deleted file mode 100644 index 9ac602944..000000000 Binary files a/data/oak_speech/oak_speech_gfx_oak_pic.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_pika1.png b/data/oak_speech/oak_speech_gfx_pika1.png deleted file mode 100644 index 71644c355..000000000 Binary files a/data/oak_speech/oak_speech_gfx_pika1.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_pika2.png b/data/oak_speech/oak_speech_gfx_pika2.png deleted file mode 100644 index e85cbfa9c..000000000 Binary files a/data/oak_speech/oak_speech_gfx_pika2.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_pika_eyes.png b/data/oak_speech/oak_speech_gfx_pika_eyes.png deleted file mode 100644 index 5e2fd80c0..000000000 Binary files a/data/oak_speech/oak_speech_gfx_pika_eyes.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_red_pal.pal b/data/oak_speech/oak_speech_gfx_red_pal.pal deleted file mode 100644 index 7eec09831..000000000 --- a/data/oak_speech/oak_speech_gfx_red_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -115 197 164 -255 230 205 -222 189 156 -197 148 131 -148 106 90 -106 74 65 -205 164 139 -164 123 98 -115 74 49 -82 65 32 -222 222 222 -180 180 180 -131 131 131 -82 82 90 -57 57 65 -255 255 255 -0 0 0 -131 189 213 -106 156 180 -82 131 156 -49 90 115 -32 65 90 -0 0 255 -238 238 74 -205 205 49 -164 164 32 -98 98 0 -213 131 123 -189 106 98 -164 82 74 -139 57 49 -98 24 16 diff --git a/data/oak_speech/oak_speech_gfx_red_pic.png b/data/oak_speech/oak_speech_gfx_red_pic.png deleted file mode 100644 index edf5cf9b1..000000000 Binary files a/data/oak_speech/oak_speech_gfx_red_pic.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_rival_pal.pal b/data/oak_speech/oak_speech_gfx_rival_pal.pal deleted file mode 100644 index 8240527a6..000000000 --- a/data/oak_speech/oak_speech_gfx_rival_pal.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -115 197 164 -255 230 205 -222 189 156 -197 148 115 -106 74 65 -238 189 74 -213 156 57 -189 123 41 -139 82 41 -164 123 106 -222 222 222 -197 197 197 -139 139 139 -98 98 98 -65 65 65 -255 255 255 -0 0 0 -180 148 180 -139 106 139 -106 74 106 -82 49 82 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -246 131 131 -205 82 82 diff --git a/data/oak_speech/oak_speech_gfx_rival_pic.png b/data/oak_speech/oak_speech_gfx_rival_pic.png deleted file mode 100644 index 317cbc038..000000000 Binary files a/data/oak_speech/oak_speech_gfx_rival_pic.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_gfx_solid_colors.png b/data/oak_speech/oak_speech_gfx_solid_colors.png deleted file mode 100644 index 30066cdd8..000000000 Binary files a/data/oak_speech/oak_speech_gfx_solid_colors.png and /dev/null differ diff --git a/data/oak_speech/oak_speech_grass_platform_palette.pal b/data/oak_speech/oak_speech_grass_platform_palette.pal deleted file mode 100644 index 4fb339128..000000000 --- a/data/oak_speech/oak_speech_grass_platform_palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -189 189 164 -65 139 131 -82 148 139 -106 164 156 -131 180 172 -156 197 189 -180 213 205 -205 230 222 -230 246 238 -0 0 0 -255 0 255 -139 189 164 -156 205 172 -180 222 197 -205 238 222 -115 172 156 diff --git a/data/oak_speech/oak_speech_pika_palette.pal b/data/oak_speech/oak_speech_pika_palette.pal deleted file mode 100644 index 4d2e92c74..000000000 --- a/data/oak_speech/oak_speech_pika_palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 205 180 -255 255 255 -255 246 106 -246 213 0 -238 172 0 -197 139 0 -131 82 0 -255 0 255 -255 0 255 -180 180 180 -255 74 74 -230 0 0 -180 0 0 -106 106 106 -16 16 16 -255 0 255 diff --git a/data/pokedex_area_markers/marker.pal b/data/pokedex_area_markers/marker.pal deleted file mode 100644 index 5a7190a3a..000000000 --- a/data/pokedex_area_markers/marker.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 197 115 -255 139 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/pokedex_area_markers/marker_0.png b/data/pokedex_area_markers/marker_0.png deleted file mode 100644 index 10ef6d24b..000000000 Binary files a/data/pokedex_area_markers/marker_0.png and /dev/null differ diff --git a/data/pokedex_area_markers/marker_1.png b/data/pokedex_area_markers/marker_1.png deleted file mode 100644 index 21db66b29..000000000 Binary files a/data/pokedex_area_markers/marker_1.png and /dev/null differ diff --git a/data/pokedex_area_markers/marker_2.png b/data/pokedex_area_markers/marker_2.png deleted file mode 100644 index e25be6f5c..000000000 Binary files a/data/pokedex_area_markers/marker_2.png and /dev/null differ diff --git a/data/pokedex_area_markers/marker_3.png b/data/pokedex_area_markers/marker_3.png deleted file mode 100644 index 1e8fe22d2..000000000 Binary files a/data/pokedex_area_markers/marker_3.png and /dev/null differ diff --git a/data/pokedex_area_markers/marker_4.png b/data/pokedex_area_markers/marker_4.png deleted file mode 100644 index 193697384..000000000 Binary files a/data/pokedex_area_markers/marker_4.png and /dev/null differ diff --git a/data/pokedex_area_markers/marker_5.png b/data/pokedex_area_markers/marker_5.png deleted file mode 100644 index 0919682f4..000000000 Binary files a/data/pokedex_area_markers/marker_5.png and /dev/null differ diff --git a/data/pokedex_area_markers/marker_6.png b/data/pokedex_area_markers/marker_6.png deleted file mode 100644 index 439d858e1..000000000 Binary files a/data/pokedex_area_markers/marker_6.png and /dev/null differ diff --git a/data/script_menu/aerodactyl_fossil.png b/data/script_menu/aerodactyl_fossil.png deleted file mode 100644 index 067483d6e..000000000 Binary files a/data/script_menu/aerodactyl_fossil.png and /dev/null differ diff --git a/data/script_menu/kabutops_fossil.png b/data/script_menu/kabutops_fossil.png deleted file mode 100644 index e396b080a..000000000 Binary files a/data/script_menu/kabutops_fossil.png and /dev/null differ diff --git a/data/seagallop/eb_tilemap.bin b/data/seagallop/eb_tilemap.bin deleted file mode 100644 index 2f912fb18..000000000 Binary files a/data/seagallop/eb_tilemap.bin and /dev/null differ diff --git a/data/seagallop/ferry_and_wake.pal b/data/seagallop/ferry_and_wake.pal deleted file mode 100644 index c25501332..000000000 --- a/data/seagallop/ferry_and_wake.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 123 180 -238 246 255 -222 230 238 -189 205 230 -156 164 189 -139 139 156 -98 98 123 -57 57 106 -197 98 98 -172 65 106 -32 74 156 -197 148 0 -246 213 24 -222 238 255 -255 255 255 -74 106 139 diff --git a/data/seagallop/ferry_sprite.png b/data/seagallop/ferry_sprite.png deleted file mode 100644 index cc06fbffa..000000000 Binary files a/data/seagallop/ferry_sprite.png and /dev/null differ diff --git a/data/seagallop/wake.png b/data/seagallop/wake.png deleted file mode 100644 index a5ff28c6e..000000000 Binary files a/data/seagallop/wake.png and /dev/null differ diff --git a/data/seagallop/water.png b/data/seagallop/water.png deleted file mode 100644 index ccf64591a..000000000 Binary files a/data/seagallop/water.png and /dev/null differ diff --git a/data/seagallop/wb_tilemap.bin b/data/seagallop/wb_tilemap.bin deleted file mode 100644 index a3c27d319..000000000 Binary files a/data/seagallop/wb_tilemap.bin and /dev/null differ diff --git a/graphics/credits/unk_840C630.pal b/graphics/credits/unk_840C630.pal new file mode 100644 index 000000000..01f113381 --- /dev/null +++ b/graphics/credits/unk_840C630.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/credits/unk_840C650.png b/graphics/credits/unk_840C650.png new file mode 100644 index 000000000..9afadd699 Binary files /dev/null and b/graphics/credits/unk_840C650.png differ diff --git a/graphics/credits/unk_840CA54.bin b/graphics/credits/unk_840CA54.bin new file mode 100644 index 000000000..a127ba9ca Binary files /dev/null and b/graphics/credits/unk_840CA54.bin differ diff --git a/graphics/credits/unk_840CB8C.bin b/graphics/credits/unk_840CB8C.bin new file mode 100644 index 000000000..3dd1c74a0 Binary files /dev/null and b/graphics/credits/unk_840CB8C.bin differ diff --git a/graphics/credits/unk_840D228.bin b/graphics/credits/unk_840D228.bin new file mode 100644 index 000000000..f6c336c01 Binary files /dev/null and b/graphics/credits/unk_840D228.bin differ diff --git a/graphics/credits/unk_840DC0C.bin b/graphics/credits/unk_840DC0C.bin new file mode 100644 index 000000000..a52ea8056 Binary files /dev/null and b/graphics/credits/unk_840DC0C.bin differ diff --git a/graphics/credits/unk_840E158.bin b/graphics/credits/unk_840E158.bin new file mode 100644 index 000000000..2d9128634 Binary files /dev/null and b/graphics/credits/unk_840E158.bin differ diff --git a/graphics/credits/unk_840E904.bin b/graphics/credits/unk_840E904.bin new file mode 100644 index 000000000..4887c1e7e Binary files /dev/null and b/graphics/credits/unk_840E904.bin differ diff --git a/graphics/credits/unk_840F240.bin b/graphics/credits/unk_840F240.bin new file mode 100644 index 000000000..285a468b6 Binary files /dev/null and b/graphics/credits/unk_840F240.bin differ diff --git a/graphics/credits/unk_840F944.bin b/graphics/credits/unk_840F944.bin new file mode 100644 index 000000000..ba2cdab77 Binary files /dev/null and b/graphics/credits/unk_840F944.bin differ diff --git a/graphics/credits/unk_8410198.bin b/graphics/credits/unk_8410198.bin new file mode 100644 index 000000000..f7b3a02a5 Binary files /dev/null and b/graphics/credits/unk_8410198.bin differ diff --git a/graphics/credits/unk_84105B4.bin b/graphics/credits/unk_84105B4.bin new file mode 100644 index 000000000..d173e611e Binary files /dev/null and b/graphics/credits/unk_84105B4.bin differ diff --git a/graphics/credits/unk_8410B20.bin b/graphics/credits/unk_8410B20.bin new file mode 100644 index 000000000..eea1940ee Binary files /dev/null and b/graphics/credits/unk_8410B20.bin differ diff --git a/graphics/credits/unk_8410B20.png b/graphics/credits/unk_8410B20.png new file mode 100644 index 000000000..19ce2f796 Binary files /dev/null and b/graphics/credits/unk_8410B20.png differ diff --git a/graphics/credits/unk_8410E10.pal b/graphics/credits/unk_8410E10.pal new file mode 100644 index 000000000..5667181bd --- /dev/null +++ b/graphics/credits/unk_8410E10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 57 123 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +82 106 156 +57 57 123 +115 164 197 +123 123 131 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +213 180 74 +0 0 0 diff --git a/graphics/credits/unk_8410E30.png b/graphics/credits/unk_8410E30.png new file mode 100644 index 000000000..ec065cdb6 Binary files /dev/null and b/graphics/credits/unk_8410E30.png differ diff --git a/graphics/credits/unk_8411BF8.pal b/graphics/credits/unk_8411BF8.pal new file mode 100644 index 000000000..5667181bd --- /dev/null +++ b/graphics/credits/unk_8411BF8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 57 123 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +82 106 156 +57 57 123 +115 164 197 +123 123 131 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +213 180 74 +0 0 0 diff --git a/graphics/credits/unk_8411C18.png b/graphics/credits/unk_8411C18.png new file mode 100644 index 000000000..341594160 Binary files /dev/null and b/graphics/credits/unk_8411C18.png differ diff --git a/graphics/credits/unk_84129A0.pal b/graphics/credits/unk_84129A0.pal new file mode 100644 index 000000000..ac601cddf --- /dev/null +++ b/graphics/credits/unk_84129A0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 49 49 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +222 164 74 +197 123 8 +49 65 82 +205 139 255 +115 82 131 +156 106 172 +106 123 131 +197 205 180 +238 74 24 +255 255 255 +0 0 0 diff --git a/graphics/credits/unk_84129C0.png b/graphics/credits/unk_84129C0.png new file mode 100644 index 000000000..ea9c61c88 Binary files /dev/null and b/graphics/credits/unk_84129C0.png differ diff --git a/graphics/credits/unk_8413318.pal b/graphics/credits/unk_8413318.pal new file mode 100644 index 000000000..284b70b77 --- /dev/null +++ b/graphics/credits/unk_8413318.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 197 0 +74 139 0 +32 115 0 +0 82 0 +106 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/credits/unk_8413338.png b/graphics/credits/unk_8413338.png new file mode 100644 index 000000000..7fa79c06a Binary files /dev/null and b/graphics/credits/unk_8413338.png differ diff --git a/graphics/credits/unk_8413854.pal b/graphics/credits/unk_8413854.pal new file mode 100644 index 000000000..46d4f48dd --- /dev/null +++ b/graphics/credits/unk_8413854.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 180 98 +172 164 74 +156 148 49 +123 115 24 +222 213 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 255 diff --git a/graphics/credits/unk_8413874.png b/graphics/credits/unk_8413874.png new file mode 100644 index 000000000..18e34725f Binary files /dev/null and b/graphics/credits/unk_8413874.png differ diff --git a/graphics/credits/unk_8413D98.pal b/graphics/credits/unk_8413D98.pal new file mode 100644 index 000000000..a3476d0d4 --- /dev/null +++ b/graphics/credits/unk_8413D98.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 197 0 +74 139 0 +32 115 0 +0 82 0 +106 172 0 +189 180 98 +172 164 74 +156 148 49 +123 115 24 +222 213 131 +222 222 222 +205 205 205 +189 189 189 +238 238 238 +131 131 131 diff --git a/graphics/credits/unk_8413DB8.png b/graphics/credits/unk_8413DB8.png new file mode 100644 index 000000000..5b10bd699 Binary files /dev/null and b/graphics/credits/unk_8413DB8.png differ diff --git a/graphics/fame_checker/bg.pal b/graphics/fame_checker/bg.pal new file mode 100644 index 000000000..9fc41db87 --- /dev/null +++ b/graphics/fame_checker/bg.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +246 222 82 +255 255 156 +246 222 82 +255 238 98 +255 255 213 +255 172 106 +222 148 74 +255 246 222 +156 148 164 +238 230 180 +255 255 213 +123 123 123 +213 213 213 +255 255 255 +106 106 106 +24 98 197 +246 222 82 +172 164 90 +148 156 230 +98 106 180 +123 131 205 +255 255 255 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 0 0 +0 255 0 +205 213 213 +238 238 246 +106 106 106 diff --git a/graphics/fame_checker/bg.png b/graphics/fame_checker/bg.png new file mode 100644 index 000000000..ed1a9a0f8 Binary files /dev/null and b/graphics/fame_checker/bg.png differ diff --git a/graphics/fame_checker/bill.pal b/graphics/fame_checker/bill.pal new file mode 100644 index 000000000..485e27c48 --- /dev/null +++ b/graphics/fame_checker/bill.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +230 189 156 +205 156 115 +106 74 57 +180 139 213 +139 98 172 +98 65 106 +213 189 131 +189 164 98 +139 123 74 +180 139 115 +156 106 82 +90 74 49 +255 255 255 +0 0 0 diff --git a/graphics/fame_checker/bill.png b/graphics/fame_checker/bill.png new file mode 100644 index 000000000..7e3a7b39b Binary files /dev/null and b/graphics/fame_checker/bill.png differ diff --git a/graphics/fame_checker/cursor.pal b/graphics/fame_checker/cursor.pal new file mode 100644 index 000000000..212d9eb69 --- /dev/null +++ b/graphics/fame_checker/cursor.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +246 222 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 148 41 +255 82 0 diff --git a/graphics/fame_checker/cursor.png b/graphics/fame_checker/cursor.png new file mode 100644 index 000000000..4cc3e200d Binary files /dev/null and b/graphics/fame_checker/cursor.png differ diff --git a/graphics/fame_checker/daisy.pal b/graphics/fame_checker/daisy.pal new file mode 100644 index 000000000..adf46bf14 --- /dev/null +++ b/graphics/fame_checker/daisy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +172 123 98 +213 172 115 +156 123 74 +90 82 65 +205 115 98 +164 213 156 +115 172 106 +90 123 82 +222 230 255 +164 172 197 +255 255 255 +0 0 0 diff --git a/graphics/fame_checker/daisy.png b/graphics/fame_checker/daisy.png new file mode 100644 index 000000000..1abf1a63e Binary files /dev/null and b/graphics/fame_checker/daisy.png differ diff --git a/graphics/fame_checker/mr_fuji.pal b/graphics/fame_checker/mr_fuji.pal new file mode 100644 index 000000000..e6dcabf2f --- /dev/null +++ b/graphics/fame_checker/mr_fuji.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +115 90 65 +222 164 82 +180 139 65 +148 106 57 +172 164 189 +255 230 131 +230 205 106 +238 131 90 +90 90 106 +213 205 213 +255 255 255 +0 0 0 diff --git a/graphics/fame_checker/mr_fuji.png b/graphics/fame_checker/mr_fuji.png new file mode 100644 index 000000000..4d23c4c87 Binary files /dev/null and b/graphics/fame_checker/mr_fuji.png differ diff --git a/graphics/fame_checker/pal_845f5a0.pal b/graphics/fame_checker/pal_845f5a0.pal new file mode 100644 index 000000000..25a3ac1d2 --- /dev/null +++ b/graphics/fame_checker/pal_845f5a0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/fame_checker/prof_oak.pal b/graphics/fame_checker/prof_oak.pal new file mode 100644 index 000000000..eb6f2f18b --- /dev/null +++ b/graphics/fame_checker/prof_oak.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 156 164 +205 164 205 +164 123 164 +82 82 57 +213 213 222 +123 123 82 +115 115 115 +197 189 131 +156 156 90 +255 255 255 +0 0 0 diff --git a/graphics/fame_checker/prof_oak.png b/graphics/fame_checker/prof_oak.png new file mode 100644 index 000000000..5e2a19aed Binary files /dev/null and b/graphics/fame_checker/prof_oak.png differ diff --git a/graphics/fame_checker/question_mark.png b/graphics/fame_checker/question_mark.png new file mode 100644 index 000000000..b0a170e09 Binary files /dev/null and b/graphics/fame_checker/question_mark.png differ diff --git a/graphics/fame_checker/silhouette.pal b/graphics/fame_checker/silhouette.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/fame_checker/silhouette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/fame_checker/spinning_pokeball.pal b/graphics/fame_checker/spinning_pokeball.pal new file mode 100644 index 000000000..dac232f78 --- /dev/null +++ b/graphics/fame_checker/spinning_pokeball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 106 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 139 139 +189 189 189 +205 205 205 +238 238 238 +230 230 230 +222 222 222 +180 180 180 +255 255 255 +106 106 106 diff --git a/graphics/fame_checker/spinning_pokeball.png b/graphics/fame_checker/spinning_pokeball.png new file mode 100644 index 000000000..0d692439a Binary files /dev/null and b/graphics/fame_checker/spinning_pokeball.png differ diff --git a/graphics/fame_checker/tilemap1.bin b/graphics/fame_checker/tilemap1.bin new file mode 100644 index 000000000..8ff09b289 Binary files /dev/null and b/graphics/fame_checker/tilemap1.bin differ diff --git a/graphics/fame_checker/tilemap2.bin b/graphics/fame_checker/tilemap2.bin new file mode 100644 index 000000000..6e2eed695 Binary files /dev/null and b/graphics/fame_checker/tilemap2.bin differ diff --git a/graphics/fame_checker/tilemap3.bin b/graphics/fame_checker/tilemap3.bin new file mode 100644 index 000000000..fdf419278 Binary files /dev/null and b/graphics/fame_checker/tilemap3.bin differ diff --git a/graphics/field_specials/unk_83F5F50.pal b/graphics/field_specials/unk_83F5F50.pal new file mode 100644 index 000000000..6528f9f75 --- /dev/null +++ b/graphics/field_specials/unk_83F5F50.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/graphics/field_specials/unk_83F5F70.pal b/graphics/field_specials/unk_83F5F70.pal new file mode 100644 index 000000000..934306488 --- /dev/null +++ b/graphics/field_specials/unk_83F5F70.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +41 115 205 +82 82 106 diff --git a/graphics/field_specials/unk_83F5F90.pal b/graphics/field_specials/unk_83F5F90.pal new file mode 100644 index 000000000..624c69448 --- /dev/null +++ b/graphics/field_specials/unk_83F5F90.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +41 115 205 +131 238 255 +0 41 156 diff --git a/graphics/field_specials/unk_83F5FB0.pal b/graphics/field_specials/unk_83F5FB0.pal new file mode 100644 index 000000000..fb3cdebd0 --- /dev/null +++ b/graphics/field_specials/unk_83F5FB0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +41 115 205 +131 238 255 +82 172 230 +0 65 189 diff --git a/graphics/field_specials/unk_83F5FD0.pal b/graphics/field_specials/unk_83F5FD0.pal new file mode 100644 index 000000000..f2c6c78af --- /dev/null +++ b/graphics/field_specials/unk_83F5FD0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +41 115 205 +131 238 255 +82 172 230 +41 115 205 +41 115 205 diff --git a/graphics/field_specials/unk_83F5FF0.pal b/graphics/field_specials/unk_83F5FF0.pal new file mode 100644 index 000000000..3e2c5757a --- /dev/null +++ b/graphics/field_specials/unk_83F5FF0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +41 115 205 +131 238 255 +82 172 230 +41 115 205 +0 65 189 +82 172 230 diff --git a/graphics/field_specials/unk_83F6010.pal b/graphics/field_specials/unk_83F6010.pal new file mode 100644 index 000000000..84e6e811a --- /dev/null +++ b/graphics/field_specials/unk_83F6010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +131 238 255 +82 172 230 +41 115 205 +0 65 189 +0 41 156 +131 238 255 diff --git a/graphics/field_specials/unk_83F6030.pal b/graphics/field_specials/unk_83F6030.pal new file mode 100644 index 000000000..f49f8ef99 --- /dev/null +++ b/graphics/field_specials/unk_83F6030.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 172 230 +41 115 205 +0 65 189 +0 41 156 +82 82 106 +90 180 238 diff --git a/graphics/field_specials/unk_83F6050.pal b/graphics/field_specials/unk_83F6050.pal new file mode 100644 index 000000000..538ebf789 --- /dev/null +++ b/graphics/field_specials/unk_83F6050.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +41 115 205 +0 65 189 +0 41 156 +82 82 106 +82 82 106 +41 115 205 diff --git a/graphics/field_specials/unk_83F6070.pal b/graphics/field_specials/unk_83F6070.pal new file mode 100644 index 000000000..49b9d85b6 --- /dev/null +++ b/graphics/field_specials/unk_83F6070.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +0 65 189 +0 41 156 +82 82 106 +82 82 106 +82 82 106 +0 65 189 diff --git a/graphics/field_specials/unk_83F6090.pal b/graphics/field_specials/unk_83F6090.pal new file mode 100644 index 000000000..ff81da8b3 --- /dev/null +++ b/graphics/field_specials/unk_83F6090.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +0 41 156 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +0 41 156 diff --git a/graphics/field_specials/unk_83F60B0.pal b/graphics/field_specials/unk_83F60B0.pal new file mode 100644 index 000000000..a0763ff47 --- /dev/null +++ b/graphics/field_specials/unk_83F60B0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +131 238 255 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +172 172 98 +148 148 74 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/graphics/field_specials/unk_83F60D0.pal b/graphics/field_specials/unk_83F60D0.pal new file mode 100644 index 000000000..6528f9f75 --- /dev/null +++ b/graphics/field_specials/unk_83F60D0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/graphics/field_specials/unk_83F60F0.pal b/graphics/field_specials/unk_83F60F0.pal new file mode 100644 index 000000000..75dfaa19a --- /dev/null +++ b/graphics/field_specials/unk_83F60F0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 172 230 +41 115 205 diff --git a/graphics/field_specials/unk_83F6110.pal b/graphics/field_specials/unk_83F6110.pal new file mode 100644 index 000000000..092544dec --- /dev/null +++ b/graphics/field_specials/unk_83F6110.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 172 230 +41 115 205 +131 238 255 +82 172 230 diff --git a/graphics/field_specials/unk_83F6130.pal b/graphics/field_specials/unk_83F6130.pal new file mode 100644 index 000000000..3b93965ad --- /dev/null +++ b/graphics/field_specials/unk_83F6130.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 172 230 +41 115 205 +131 238 255 +82 172 230 +82 172 230 +41 115 205 diff --git a/graphics/field_specials/unk_83F6150.pal b/graphics/field_specials/unk_83F6150.pal new file mode 100644 index 000000000..be23edc23 --- /dev/null +++ b/graphics/field_specials/unk_83F6150.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +131 238 255 +82 172 230 +82 172 230 +41 115 205 +41 115 205 +0 65 189 diff --git a/graphics/field_specials/unk_83F6170.pal b/graphics/field_specials/unk_83F6170.pal new file mode 100644 index 000000000..788d0bd65 --- /dev/null +++ b/graphics/field_specials/unk_83F6170.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 172 230 +41 115 205 +41 115 205 +0 65 189 +0 65 189 +82 82 106 diff --git a/graphics/field_specials/unk_83F6190.pal b/graphics/field_specials/unk_83F6190.pal new file mode 100644 index 000000000..8ca385f0d --- /dev/null +++ b/graphics/field_specials/unk_83F6190.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +41 115 205 +0 65 189 +0 65 189 +82 82 106 +82 82 106 +82 82 106 diff --git a/graphics/field_specials/unk_83F61B0.pal b/graphics/field_specials/unk_83F61B0.pal new file mode 100644 index 000000000..63fe8e97e --- /dev/null +++ b/graphics/field_specials/unk_83F61B0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +0 65 189 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/graphics/field_specials/unk_83F61D0.pal b/graphics/field_specials/unk_83F61D0.pal new file mode 100644 index 000000000..a0763ff47 --- /dev/null +++ b/graphics/field_specials/unk_83F61D0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +131 238 255 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +172 172 98 +148 148 74 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/graphics/field_specials/unk_83F6206.pal b/graphics/field_specials/unk_83F6206.pal new file mode 100644 index 000000000..c20bacb57 --- /dev/null +++ b/graphics/field_specials/unk_83F6206.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 156 197 +32 32 32 +82 82 82 +139 139 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F6226.pal b/graphics/field_specials/unk_83F6226.pal new file mode 100644 index 000000000..2c106a4ae --- /dev/null +++ b/graphics/field_specials/unk_83F6226.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 156 197 +41 32 32 +82 82 82 +139 139 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F6246.pal b/graphics/field_specials/unk_83F6246.pal new file mode 100644 index 000000000..38fe7d084 --- /dev/null +++ b/graphics/field_specials/unk_83F6246.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +49 32 32 +90 82 82 +148 148 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F6266.pal b/graphics/field_specials/unk_83F6266.pal new file mode 100644 index 000000000..7b7fb7c44 --- /dev/null +++ b/graphics/field_specials/unk_83F6266.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 32 32 +115 82 82 +156 148 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F6286.pal b/graphics/field_specials/unk_83F6286.pal new file mode 100644 index 000000000..4eda607b7 --- /dev/null +++ b/graphics/field_specials/unk_83F6286.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 32 32 +123 82 82 +164 156 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F62A6.pal b/graphics/field_specials/unk_83F62A6.pal new file mode 100644 index 000000000..a92bc65fd --- /dev/null +++ b/graphics/field_specials/unk_83F62A6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +98 32 32 +139 82 82 +172 156 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F62C6.pal b/graphics/field_specials/unk_83F62C6.pal new file mode 100644 index 000000000..0de8519c6 --- /dev/null +++ b/graphics/field_specials/unk_83F62C6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +98 32 32 +148 82 82 +180 164 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F62E6.pal b/graphics/field_specials/unk_83F62E6.pal new file mode 100644 index 000000000..ae67047d4 --- /dev/null +++ b/graphics/field_specials/unk_83F62E6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 32 32 +156 82 82 +189 164 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F6306.pal b/graphics/field_specials/unk_83F6306.pal new file mode 100644 index 000000000..27cf345e4 --- /dev/null +++ b/graphics/field_specials/unk_83F6306.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +123 32 32 +172 82 82 +197 172 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F6326.pal b/graphics/field_specials/unk_83F6326.pal new file mode 100644 index 000000000..fcca0b4de --- /dev/null +++ b/graphics/field_specials/unk_83F6326.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 32 32 +180 82 82 +205 172 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_specials/unk_83F6346.pal b/graphics/field_specials/unk_83F6346.pal new file mode 100644 index 000000000..6c7540611 --- /dev/null +++ b/graphics/field_specials/unk_83F6346.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 156 197 +205 32 32 +255 82 82 +255 205 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/fonts/down_arrow.png b/graphics/fonts/down_arrow.png new file mode 100644 index 000000000..e74ed47ef Binary files /dev/null and b/graphics/fonts/down_arrow.png differ diff --git a/graphics/fonts/down_arrow_2.png b/graphics/fonts/down_arrow_2.png new file mode 100644 index 000000000..aefcf4f08 Binary files /dev/null and b/graphics/fonts/down_arrow_2.png differ diff --git a/graphics/fonts/down_arrow_3.png b/graphics/fonts/down_arrow_3.png new file mode 100644 index 000000000..6345eacfb Binary files /dev/null and b/graphics/fonts/down_arrow_3.png differ diff --git a/graphics/fonts/down_arrow_4.png b/graphics/fonts/down_arrow_4.png new file mode 100644 index 000000000..b6cba25f3 Binary files /dev/null and b/graphics/fonts/down_arrow_4.png differ diff --git a/graphics/fonts/down_arrow_RS.png b/graphics/fonts/down_arrow_RS.png new file mode 100644 index 000000000..c0aae894f Binary files /dev/null and b/graphics/fonts/down_arrow_RS.png differ diff --git a/graphics/fonts/down_arrow_RS_2.png b/graphics/fonts/down_arrow_RS_2.png new file mode 100644 index 000000000..de9d9cf47 Binary files /dev/null and b/graphics/fonts/down_arrow_RS_2.png differ diff --git a/graphics/fonts/font0_jap.png b/graphics/fonts/font0_jap.png new file mode 100644 index 000000000..23903f343 Binary files /dev/null and b/graphics/fonts/font0_jap.png differ diff --git a/graphics/fonts/font0_latin.png b/graphics/fonts/font0_latin.png new file mode 100644 index 000000000..7a79f2389 Binary files /dev/null and b/graphics/fonts/font0_latin.png differ diff --git a/graphics/fonts/font1_jap.png b/graphics/fonts/font1_jap.png new file mode 100644 index 000000000..0041b477a Binary files /dev/null and b/graphics/fonts/font1_jap.png differ diff --git a/graphics/fonts/font1_latin.png b/graphics/fonts/font1_latin.png new file mode 100644 index 000000000..42e847faf Binary files /dev/null and b/graphics/fonts/font1_latin.png differ diff --git a/graphics/fonts/font2_jap.png b/graphics/fonts/font2_jap.png new file mode 100644 index 000000000..efdb4b77e Binary files /dev/null and b/graphics/fonts/font2_jap.png differ diff --git a/graphics/fonts/font2_latin.png b/graphics/fonts/font2_latin.png new file mode 100644 index 000000000..42e847faf Binary files /dev/null and b/graphics/fonts/font2_latin.png differ diff --git a/graphics/fonts/font4_jap.png b/graphics/fonts/font4_jap.png new file mode 100644 index 000000000..da4f2beac Binary files /dev/null and b/graphics/fonts/font4_jap.png differ diff --git a/graphics/fonts/font4_latin.png b/graphics/fonts/font4_latin.png new file mode 100644 index 000000000..42e847faf Binary files /dev/null and b/graphics/fonts/font4_latin.png differ diff --git a/graphics/fonts/font5_jap.png b/graphics/fonts/font5_jap.png new file mode 100644 index 000000000..7da59c0eb Binary files /dev/null and b/graphics/fonts/font5_jap.png differ diff --git a/graphics/fonts/font5_latin.png b/graphics/fonts/font5_latin.png new file mode 100644 index 000000000..42e847faf Binary files /dev/null and b/graphics/fonts/font5_latin.png differ diff --git a/graphics/fonts/font6_braille.png b/graphics/fonts/font6_braille.png new file mode 100644 index 000000000..cb4451bc2 Binary files /dev/null and b/graphics/fonts/font6_braille.png differ diff --git a/graphics/fonts/font9_jap.png b/graphics/fonts/font9_jap.png new file mode 100644 index 000000000..14cf6c042 Binary files /dev/null and b/graphics/fonts/font9_jap.png differ diff --git a/graphics/fonts/keypad_icons.png b/graphics/fonts/keypad_icons.png new file mode 100644 index 000000000..f8c162bb9 Binary files /dev/null and b/graphics/fonts/keypad_icons.png differ diff --git a/graphics/item_menu/bag_window_pal.pal b/graphics/item_menu/bag_window_pal.pal new file mode 100644 index 000000000..426ea279e --- /dev/null +++ b/graphics/item_menu/bag_window_pal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +255 156 148 +255 255 255 +189 90 82 diff --git a/graphics/itemfinder/spr_tiles.png b/graphics/itemfinder/spr_tiles.png new file mode 100644 index 000000000..4171f37b4 Binary files /dev/null and b/graphics/itemfinder/spr_tiles.png differ diff --git a/graphics/link_games/unk_847a348.png b/graphics/link_games/unk_847a348.png new file mode 100644 index 000000000..9897a6d36 Binary files /dev/null and b/graphics/link_games/unk_847a348.png differ diff --git a/graphics/main_menu/unk_8234648.pal b/graphics/main_menu/unk_8234648.pal new file mode 100644 index 000000000..7aca54c52 --- /dev/null +++ b/graphics/main_menu/unk_8234648.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 148 255 +255 255 255 +49 57 82 +90 98 115 +8 8 16 +148 156 172 +205 222 238 +180 180 189 +189 205 222 +32 32 49 +123 131 139 +49 82 123 +41 123 197 +57 139 213 +90 164 230 +139 197 246 diff --git a/graphics/main_menu/unk_8234668.pal b/graphics/main_menu/unk_8234668.pal new file mode 100644 index 000000000..022f0051f --- /dev/null +++ b/graphics/main_menu/unk_8234668.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 255 255 +98 98 98 +213 213 205 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/altering_cave_pal.pal b/graphics/map_preview/altering_cave_pal.pal new file mode 100644 index 000000000..f451adce2 --- /dev/null +++ b/graphics/map_preview/altering_cave_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +65 74 90 +139 205 123 +90 164 98 +213 205 172 +189 172 139 +156 205 164 +230 230 205 +148 213 106 +189 222 197 +148 131 90 +238 230 189 +213 246 255 +164 205 255 +205 230 255 +238 246 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/altering_cave_tilemap.bin b/graphics/map_preview/altering_cave_tilemap.bin new file mode 100644 index 000000000..fa907c6e7 Binary files /dev/null and b/graphics/map_preview/altering_cave_tilemap.bin differ diff --git a/graphics/map_preview/altering_cave_tiles.png b/graphics/map_preview/altering_cave_tiles.png new file mode 100644 index 000000000..4ea8496a2 Binary files /dev/null and b/graphics/map_preview/altering_cave_tiles.png differ diff --git a/graphics/map_preview/berry_forest_pal.pal b/graphics/map_preview/berry_forest_pal.pal new file mode 100644 index 000000000..755a6c2ed --- /dev/null +++ b/graphics/map_preview/berry_forest_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 90 +238 238 246 +197 197 98 +180 180 90 +106 115 24 +156 156 49 +197 164 90 +164 131 74 +131 106 65 +213 213 156 +222 238 172 +156 189 115 +131 156 82 +131 123 57 +246 246 246 +189 213 139 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/berry_forest_tilemap.bin b/graphics/map_preview/berry_forest_tilemap.bin new file mode 100644 index 000000000..fe7312a9f Binary files /dev/null and b/graphics/map_preview/berry_forest_tilemap.bin differ diff --git a/graphics/map_preview/berry_forest_tiles.png b/graphics/map_preview/berry_forest_tiles.png new file mode 100644 index 000000000..6f6efd0fe Binary files /dev/null and b/graphics/map_preview/berry_forest_tiles.png differ diff --git a/graphics/map_preview/cerulean_cave_pal.pal b/graphics/map_preview/cerulean_cave_pal.pal new file mode 100644 index 000000000..074a6b6f7 --- /dev/null +++ b/graphics/map_preview/cerulean_cave_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +49 57 106 +222 205 246 +189 164 205 +156 123 164 +238 230 255 +82 106 123 +123 156 172 +222 230 238 +189 197 205 +164 172 180 +139 172 148 +180 205 189 +115 123 131 +213 238 222 +49 57 74 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/cerulean_cave_tilemap.bin b/graphics/map_preview/cerulean_cave_tilemap.bin new file mode 100644 index 000000000..e66ab7ea3 Binary files /dev/null and b/graphics/map_preview/cerulean_cave_tilemap.bin differ diff --git a/graphics/map_preview/cerulean_cave_tiles.png b/graphics/map_preview/cerulean_cave_tiles.png new file mode 100644 index 000000000..e9f7b4e2e Binary files /dev/null and b/graphics/map_preview/cerulean_cave_tiles.png differ diff --git a/graphics/map_preview/digletts_cave_pal.pal b/graphics/map_preview/digletts_cave_pal.pal new file mode 100644 index 000000000..923d83144 --- /dev/null +++ b/graphics/map_preview/digletts_cave_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +49 57 74 +197 197 205 +189 180 172 +148 148 115 +222 238 246 +90 98 90 +106 148 106 +222 222 180 +189 189 148 +164 164 123 +156 197 123 +115 164 82 +106 106 98 +197 222 156 +74 74 65 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/digletts_cave_tilemap.bin b/graphics/map_preview/digletts_cave_tilemap.bin new file mode 100644 index 000000000..2f8bbd665 Binary files /dev/null and b/graphics/map_preview/digletts_cave_tilemap.bin differ diff --git a/graphics/map_preview/digletts_cave_tiles.png b/graphics/map_preview/digletts_cave_tiles.png new file mode 100644 index 000000000..c3e7d2879 Binary files /dev/null and b/graphics/map_preview/digletts_cave_tiles.png differ diff --git a/graphics/map_preview/dotted_hole_pal.pal b/graphics/map_preview/dotted_hole_pal.pal new file mode 100644 index 000000000..fd424fa28 --- /dev/null +++ b/graphics/map_preview/dotted_hole_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +65 74 90 +238 246 246 +74 156 106 +115 197 115 +156 230 148 +180 189 197 +213 222 230 +230 238 246 +115 123 90 +156 164 123 +197 205 156 +213 222 189 +222 230 197 +213 238 255 +255 255 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/dotted_hole_tilemap.bin b/graphics/map_preview/dotted_hole_tilemap.bin new file mode 100644 index 000000000..a83083b38 Binary files /dev/null and b/graphics/map_preview/dotted_hole_tilemap.bin differ diff --git a/graphics/map_preview/dotted_hole_tiles.png b/graphics/map_preview/dotted_hole_tiles.png new file mode 100644 index 000000000..f2d23d46e Binary files /dev/null and b/graphics/map_preview/dotted_hole_tiles.png differ diff --git a/graphics/map_preview/icefall_cave_pal.pal b/graphics/map_preview/icefall_cave_pal.pal new file mode 100644 index 000000000..4e31e5380 --- /dev/null +++ b/graphics/map_preview/icefall_cave_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +65 74 106 +238 246 246 +82 139 115 +131 180 131 +172 213 164 +205 205 189 +222 222 205 +238 238 222 +115 115 115 +156 156 139 +180 180 156 +197 197 189 +213 213 205 +213 238 255 +255 255 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/icefall_cave_tilemap.bin b/graphics/map_preview/icefall_cave_tilemap.bin new file mode 100644 index 000000000..bd1d05d1b Binary files /dev/null and b/graphics/map_preview/icefall_cave_tilemap.bin differ diff --git a/graphics/map_preview/icefall_cave_tiles.png b/graphics/map_preview/icefall_cave_tiles.png new file mode 100644 index 000000000..211f19758 Binary files /dev/null and b/graphics/map_preview/icefall_cave_tiles.png differ diff --git a/graphics/map_preview/kanto_safari_zone_pal.pal b/graphics/map_preview/kanto_safari_zone_pal.pal new file mode 100644 index 000000000..0434848d8 --- /dev/null +++ b/graphics/map_preview/kanto_safari_zone_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +222 230 213 +222 213 148 +197 230 148 +213 238 164 +123 164 90 +230 246 246 +222 238 246 +213 222 255 +180 222 98 +205 180 115 +205 213 197 +180 156 106 +164 197 90 +222 238 197 +222 246 213 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +189 222 98 +172 205 90 +115 172 65 +222 213 148 +139 197 98 +205 180 115 +205 230 246 +180 156 106 +222 238 246 +189 213 255 +197 230 148 diff --git a/graphics/map_preview/kanto_safari_zone_tilemap.bin b/graphics/map_preview/kanto_safari_zone_tilemap.bin new file mode 100644 index 000000000..756de73b6 Binary files /dev/null and b/graphics/map_preview/kanto_safari_zone_tilemap.bin differ diff --git a/graphics/map_preview/kanto_safari_zone_tiles.png b/graphics/map_preview/kanto_safari_zone_tiles.png new file mode 100644 index 000000000..b1da5a41d Binary files /dev/null and b/graphics/map_preview/kanto_safari_zone_tiles.png differ diff --git a/graphics/map_preview/kanto_victory_road_pal.pal b/graphics/map_preview/kanto_victory_road_pal.pal new file mode 100644 index 000000000..828ff7e22 --- /dev/null +++ b/graphics/map_preview/kanto_victory_road_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +74 82 98 +222 238 246 +98 139 106 +131 172 98 +164 205 123 +180 189 197 +205 213 222 +222 230 238 +139 131 74 +172 172 98 +197 197 123 +213 205 148 +222 213 156 +213 230 246 +246 246 246 +0 0 0 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +131 172 98 +164 205 123 +139 131 74 +172 172 98 +197 197 123 +213 205 148 +222 213 156 +148 189 131 +205 213 222 +222 238 246 +98 139 106 diff --git a/graphics/map_preview/kanto_victory_road_tilemap.bin b/graphics/map_preview/kanto_victory_road_tilemap.bin new file mode 100644 index 000000000..03d1cc292 Binary files /dev/null and b/graphics/map_preview/kanto_victory_road_tilemap.bin differ diff --git a/graphics/map_preview/kanto_victory_road_tiles.png b/graphics/map_preview/kanto_victory_road_tiles.png new file mode 100644 index 000000000..b3432b9c9 Binary files /dev/null and b/graphics/map_preview/kanto_victory_road_tiles.png differ diff --git a/graphics/map_preview/lost_cave_pal.pal b/graphics/map_preview/lost_cave_pal.pal new file mode 100644 index 000000000..33b29a07b --- /dev/null +++ b/graphics/map_preview/lost_cave_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +65 74 90 +98 106 123 +123 131 148 +189 189 164 +164 156 131 +238 238 222 +213 213 197 +213 238 238 +189 213 213 +131 123 98 +213 213 180 +197 222 222 +172 189 230 +189 205 222 +230 230 213 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/lost_cave_tilemap.bin b/graphics/map_preview/lost_cave_tilemap.bin new file mode 100644 index 000000000..6c256acc2 Binary files /dev/null and b/graphics/map_preview/lost_cave_tilemap.bin differ diff --git a/graphics/map_preview/lost_cave_tiles.png b/graphics/map_preview/lost_cave_tiles.png new file mode 100644 index 000000000..a2c4c8f38 Binary files /dev/null and b/graphics/map_preview/lost_cave_tiles.png differ diff --git a/graphics/map_preview/monean_chamber_pal.pal b/graphics/map_preview/monean_chamber_pal.pal new file mode 100644 index 000000000..ce72a4891 --- /dev/null +++ b/graphics/map_preview/monean_chamber_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +74 82 98 +205 213 139 +156 164 82 +123 131 82 +213 189 164 +222 230 164 +115 189 106 +172 213 131 +172 148 123 +213 238 238 +230 205 180 +131 106 98 +180 189 123 +197 230 255 +230 246 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/monean_chamber_tilemap.bin b/graphics/map_preview/monean_chamber_tilemap.bin new file mode 100644 index 000000000..f228d3daf Binary files /dev/null and b/graphics/map_preview/monean_chamber_tilemap.bin differ diff --git a/graphics/map_preview/monean_chamber_tiles.png b/graphics/map_preview/monean_chamber_tiles.png new file mode 100644 index 000000000..6426d175f Binary files /dev/null and b/graphics/map_preview/monean_chamber_tiles.png differ diff --git a/graphics/map_preview/mt_ember_pal.pal b/graphics/map_preview/mt_ember_pal.pal new file mode 100644 index 000000000..4f5066e64 --- /dev/null +++ b/graphics/map_preview/mt_ember_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +65 74 90 +238 246 246 +222 246 255 +230 230 255 +156 230 148 +205 189 213 +222 205 230 +238 222 246 +131 106 106 +172 148 148 +197 172 172 +222 197 197 +238 213 213 +213 238 255 +255 255 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/mt_ember_tilemap.bin b/graphics/map_preview/mt_ember_tilemap.bin new file mode 100644 index 000000000..52af71494 Binary files /dev/null and b/graphics/map_preview/mt_ember_tilemap.bin differ diff --git a/graphics/map_preview/mt_ember_tiles.png b/graphics/map_preview/mt_ember_tiles.png new file mode 100644 index 000000000..9145e9d4f Binary files /dev/null and b/graphics/map_preview/mt_ember_tiles.png differ diff --git a/graphics/map_preview/mt_moon_pal.pal b/graphics/map_preview/mt_moon_pal.pal new file mode 100644 index 000000000..9a858a8c6 --- /dev/null +++ b/graphics/map_preview/mt_moon_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +74 82 98 +230 238 255 +65 131 90 +115 180 115 +156 213 148 +205 205 230 +230 222 255 +222 222 180 +115 106 90 +148 139 98 +172 164 115 +205 197 164 +205 197 164 +205 230 255 +238 230 213 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/mt_moon_tilemap.bin b/graphics/map_preview/mt_moon_tilemap.bin new file mode 100644 index 000000000..469efcf77 Binary files /dev/null and b/graphics/map_preview/mt_moon_tilemap.bin differ diff --git a/graphics/map_preview/mt_moon_tiles.png b/graphics/map_preview/mt_moon_tiles.png new file mode 100644 index 000000000..8ede39bdd Binary files /dev/null and b/graphics/map_preview/mt_moon_tiles.png differ diff --git a/graphics/map_preview/pokemon_mansion_pal.pal b/graphics/map_preview/pokemon_mansion_pal.pal new file mode 100644 index 000000000..7f6ef22a5 --- /dev/null +++ b/graphics/map_preview/pokemon_mansion_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +106 115 131 +213 164 180 +180 131 148 +238 189 205 +230 238 213 +115 82 131 +172 180 172 +131 139 139 +205 213 205 +238 213 238 +238 238 205 +230 222 189 +246 238 164 +222 213 139 +246 246 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/pokemon_mansion_tilemap.bin b/graphics/map_preview/pokemon_mansion_tilemap.bin new file mode 100644 index 000000000..a8b1b3d3f Binary files /dev/null and b/graphics/map_preview/pokemon_mansion_tilemap.bin differ diff --git a/graphics/map_preview/pokemon_mansion_tiles.png b/graphics/map_preview/pokemon_mansion_tiles.png new file mode 100644 index 000000000..1fa94ceda Binary files /dev/null and b/graphics/map_preview/pokemon_mansion_tiles.png differ diff --git a/graphics/map_preview/pokemon_tower_pal.pal b/graphics/map_preview/pokemon_tower_pal.pal new file mode 100644 index 000000000..93f4847ae --- /dev/null +++ b/graphics/map_preview/pokemon_tower_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +222 213 246 +213 230 213 +172 180 205 +205 197 156 +180 205 180 +148 164 148 +238 246 238 +238 230 189 +230 238 255 +148 156 180 +255 246 205 +172 164 123 +115 123 148 +197 205 230 +238 246 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/pokemon_tower_tilemap.bin b/graphics/map_preview/pokemon_tower_tilemap.bin new file mode 100644 index 000000000..f12b9bdf8 Binary files /dev/null and b/graphics/map_preview/pokemon_tower_tilemap.bin differ diff --git a/graphics/map_preview/pokemon_tower_tiles.png b/graphics/map_preview/pokemon_tower_tiles.png new file mode 100644 index 000000000..21583f9b3 Binary files /dev/null and b/graphics/map_preview/pokemon_tower_tiles.png differ diff --git a/graphics/map_preview/power_plant_pal.pal b/graphics/map_preview/power_plant_pal.pal new file mode 100644 index 000000000..49e5d6800 --- /dev/null +++ b/graphics/map_preview/power_plant_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +74 82 98 +255 246 205 +189 180 189 +189 189 222 +230 222 123 +222 205 205 +246 230 230 +139 156 189 +222 238 255 +106 123 156 +213 189 164 +164 156 164 +238 246 255 +255 238 238 +255 255 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/power_plant_tilemap.bin b/graphics/map_preview/power_plant_tilemap.bin new file mode 100644 index 000000000..609cbb30d Binary files /dev/null and b/graphics/map_preview/power_plant_tilemap.bin differ diff --git a/graphics/map_preview/power_plant_tiles.png b/graphics/map_preview/power_plant_tiles.png new file mode 100644 index 000000000..6cd334aa9 Binary files /dev/null and b/graphics/map_preview/power_plant_tiles.png differ diff --git a/graphics/map_preview/rock_tunnel_pal.pal b/graphics/map_preview/rock_tunnel_pal.pal new file mode 100644 index 000000000..1412128d0 --- /dev/null +++ b/graphics/map_preview/rock_tunnel_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +65 74 90 +238 246 246 +74 156 106 +115 197 115 +156 230 148 +205 205 189 +222 222 205 +238 238 222 +123 123 90 +164 164 123 +197 197 148 +213 213 180 +230 230 197 +213 238 255 +255 255 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/rock_tunnel_tilemap.bin b/graphics/map_preview/rock_tunnel_tilemap.bin new file mode 100644 index 000000000..9c322e0b1 Binary files /dev/null and b/graphics/map_preview/rock_tunnel_tilemap.bin differ diff --git a/graphics/map_preview/rock_tunnel_tiles.png b/graphics/map_preview/rock_tunnel_tiles.png new file mode 100644 index 000000000..e58ef7fb1 Binary files /dev/null and b/graphics/map_preview/rock_tunnel_tiles.png differ diff --git a/graphics/map_preview/rocket_hideout_pal.pal b/graphics/map_preview/rocket_hideout_pal.pal new file mode 100644 index 000000000..9c969e843 --- /dev/null +++ b/graphics/map_preview/rocket_hideout_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +98 106 123 +156 180 156 +222 213 172 +238 238 246 +246 238 197 +189 156 131 +222 189 164 +213 213 222 +222 238 222 +139 156 139 +197 222 197 +197 230 180 +131 139 156 +238 205 180 +255 255 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/rocket_hideout_tilemap.bin b/graphics/map_preview/rocket_hideout_tilemap.bin new file mode 100644 index 000000000..db9757ebb Binary files /dev/null and b/graphics/map_preview/rocket_hideout_tilemap.bin differ diff --git a/graphics/map_preview/rocket_hideout_tiles.png b/graphics/map_preview/rocket_hideout_tiles.png new file mode 100644 index 000000000..8f57f8afe Binary files /dev/null and b/graphics/map_preview/rocket_hideout_tiles.png differ diff --git a/graphics/map_preview/rocket_warehouse_pal.pal b/graphics/map_preview/rocket_warehouse_pal.pal new file mode 100644 index 000000000..c4fffd171 --- /dev/null +++ b/graphics/map_preview/rocket_warehouse_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +98 106 123 +139 180 172 +222 213 172 +238 238 246 +246 238 197 +189 156 131 +222 189 164 +213 213 222 +222 238 222 +139 156 139 +197 222 197 +197 230 180 +131 139 156 +238 205 180 +255 255 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/rocket_warehouse_tilemap.bin b/graphics/map_preview/rocket_warehouse_tilemap.bin new file mode 100644 index 000000000..7636eea0a Binary files /dev/null and b/graphics/map_preview/rocket_warehouse_tilemap.bin differ diff --git a/graphics/map_preview/rocket_warehouse_tiles.png b/graphics/map_preview/rocket_warehouse_tiles.png new file mode 100644 index 000000000..cc9dae203 Binary files /dev/null and b/graphics/map_preview/rocket_warehouse_tiles.png differ diff --git a/graphics/map_preview/seafoam_islands_pal.pal b/graphics/map_preview/seafoam_islands_pal.pal new file mode 100644 index 000000000..348275aca --- /dev/null +++ b/graphics/map_preview/seafoam_islands_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +65 74 90 +156 222 123 +106 180 98 +197 205 172 +172 172 139 +172 222 164 +222 230 205 +164 230 106 +205 238 197 +131 131 90 +238 230 189 +213 246 255 +164 205 255 +205 230 255 +238 246 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/seafoam_islands_tilemap.bin b/graphics/map_preview/seafoam_islands_tilemap.bin new file mode 100644 index 000000000..05afc22fc Binary files /dev/null and b/graphics/map_preview/seafoam_islands_tilemap.bin differ diff --git a/graphics/map_preview/seafoam_islands_tiles.png b/graphics/map_preview/seafoam_islands_tiles.png new file mode 100644 index 000000000..b76a85053 Binary files /dev/null and b/graphics/map_preview/seafoam_islands_tiles.png differ diff --git a/graphics/map_preview/silph_co_pal.pal b/graphics/map_preview/silph_co_pal.pal new file mode 100644 index 000000000..07acfb986 --- /dev/null +++ b/graphics/map_preview/silph_co_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 0 +238 246 246 +213 238 246 +164 205 197 +131 197 123 +197 230 230 +139 180 172 +180 180 205 +131 131 164 +205 205 230 +172 222 172 +197 213 246 +90 164 90 +123 172 164 +205 238 246 +246 246 255 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/silph_co_tilemap.bin b/graphics/map_preview/silph_co_tilemap.bin new file mode 100644 index 000000000..9449f6cd7 Binary files /dev/null and b/graphics/map_preview/silph_co_tilemap.bin differ diff --git a/graphics/map_preview/silph_co_tiles.png b/graphics/map_preview/silph_co_tiles.png new file mode 100644 index 000000000..c5433bcee Binary files /dev/null and b/graphics/map_preview/silph_co_tiles.png differ diff --git a/graphics/map_preview/viridian_forest_pal.pal b/graphics/map_preview/viridian_forest_pal.pal new file mode 100644 index 000000000..ff1655587 --- /dev/null +++ b/graphics/map_preview/viridian_forest_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 90 +222 246 246 +156 230 148 +115 197 115 +41 106 106 +90 172 123 +197 189 106 +148 139 90 +106 98 74 +205 246 197 +180 213 230 +123 189 205 +90 156 164 +65 131 139 +246 246 255 +32 41 41 +255 255 90 +246 246 255 +74 98 123 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/map_preview/viridian_forest_tilemap.bin b/graphics/map_preview/viridian_forest_tilemap.bin new file mode 100644 index 000000000..37883b634 Binary files /dev/null and b/graphics/map_preview/viridian_forest_tilemap.bin differ diff --git a/graphics/map_preview/viridian_forest_tiles.png b/graphics/map_preview/viridian_forest_tiles.png new file mode 100644 index 000000000..79b70c2e5 Binary files /dev/null and b/graphics/map_preview/viridian_forest_tiles.png differ diff --git a/graphics/mevent/gfx_46718C.png b/graphics/mevent/gfx_46718C.png new file mode 100644 index 000000000..bf52445e6 Binary files /dev/null and b/graphics/mevent/gfx_46718C.png differ diff --git a/graphics/mevent/gfx_46737C.png b/graphics/mevent/gfx_46737C.png new file mode 100644 index 000000000..1a23f8b94 Binary files /dev/null and b/graphics/mevent/gfx_46737C.png differ diff --git a/graphics/mevent/gfx_467558.png b/graphics/mevent/gfx_467558.png new file mode 100644 index 000000000..c28edd891 Binary files /dev/null and b/graphics/mevent/gfx_467558.png differ diff --git a/graphics/mevent/gfx_467700.png b/graphics/mevent/gfx_467700.png new file mode 100644 index 000000000..f31385746 Binary files /dev/null and b/graphics/mevent/gfx_467700.png differ diff --git a/graphics/mevent/gfx_467A7C.png b/graphics/mevent/gfx_467A7C.png new file mode 100644 index 000000000..f94b6c50f Binary files /dev/null and b/graphics/mevent/gfx_467A7C.png differ diff --git a/graphics/mevent/gfx_467EF4.png b/graphics/mevent/gfx_467EF4.png new file mode 100644 index 000000000..51a1aeb0c Binary files /dev/null and b/graphics/mevent/gfx_467EF4.png differ diff --git a/graphics/mevent/gfx_4680C0.png b/graphics/mevent/gfx_4680C0.png new file mode 100644 index 000000000..1a27f3213 Binary files /dev/null and b/graphics/mevent/gfx_4680C0.png differ diff --git a/graphics/mevent/gfx_46821C.png b/graphics/mevent/gfx_46821C.png new file mode 100644 index 000000000..aab27d16c Binary files /dev/null and b/graphics/mevent/gfx_46821C.png differ diff --git a/graphics/mevent/gfx_46830C.png b/graphics/mevent/gfx_46830C.png new file mode 100644 index 000000000..3c2b8e6d1 Binary files /dev/null and b/graphics/mevent/gfx_46830C.png differ diff --git a/graphics/mevent/gfx_468448.png b/graphics/mevent/gfx_468448.png new file mode 100644 index 000000000..137dbe9f3 Binary files /dev/null and b/graphics/mevent/gfx_468448.png differ diff --git a/graphics/mevent/gfx_4685B4.png b/graphics/mevent/gfx_4685B4.png new file mode 100644 index 000000000..137dbe9f3 Binary files /dev/null and b/graphics/mevent/gfx_4685B4.png differ diff --git a/graphics/mevent/pal_46708C.pal b/graphics/mevent/pal_46708C.pal new file mode 100644 index 000000000..9c5ef9b26 --- /dev/null +++ b/graphics/mevent/pal_46708C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 213 +74 74 74 +98 106 106 +213 189 74 +238 213 82 +246 246 213 +255 255 255 +230 230 213 +238 238 213 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_4670AC.pal b/graphics/mevent/pal_4670AC.pal new file mode 100644 index 000000000..18c2be3fd --- /dev/null +++ b/graphics/mevent/pal_4670AC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +197 189 213 +205 230 255 +115 139 197 +49 74 82 +0 0 0 +0 0 0 +222 255 246 +197 255 222 +222 238 255 +156 180 222 +156 106 115 +172 139 164 +255 255 255 diff --git a/graphics/mevent/pal_4670CC.pal b/graphics/mevent/pal_4670CC.pal new file mode 100644 index 000000000..db02d5d4b --- /dev/null +++ b/graphics/mevent/pal_4670CC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 230 230 +255 197 197 +255 164 164 +246 139 139 +238 90 90 +255 255 255 diff --git a/graphics/mevent/pal_4670EC.pal b/graphics/mevent/pal_4670EC.pal new file mode 100644 index 000000000..bfbf036a5 --- /dev/null +++ b/graphics/mevent/pal_4670EC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 255 230 +213 255 189 +189 230 156 +164 213 131 +148 197 106 +255 255 255 diff --git a/graphics/mevent/pal_46710C.pal b/graphics/mevent/pal_46710C.pal new file mode 100644 index 000000000..fa41ee3b0 --- /dev/null +++ b/graphics/mevent/pal_46710C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 246 255 +205 238 246 +180 222 246 +156 197 238 +115 156 197 +255 255 255 diff --git a/graphics/mevent/pal_46712C.pal b/graphics/mevent/pal_46712C.pal new file mode 100644 index 000000000..8a71f5846 --- /dev/null +++ b/graphics/mevent/pal_46712C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 238 197 +230 230 139 +222 222 115 +213 213 90 +189 189 57 +255 255 255 diff --git a/graphics/mevent/pal_46714C.pal b/graphics/mevent/pal_46714C.pal new file mode 100644 index 000000000..01832b5e2 --- /dev/null +++ b/graphics/mevent/pal_46714C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +164 156 90 +164 148 90 +197 197 90 +213 205 90 +222 213 90 +213 213 106 +238 246 98 +230 222 98 +213 205 98 +197 180 98 +238 230 98 +246 238 106 diff --git a/graphics/mevent/pal_46716C.pal b/graphics/mevent/pal_46716C.pal new file mode 100644 index 000000000..28a498b57 --- /dev/null +++ b/graphics/mevent/pal_46716C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +156 156 156 +139 139 148 +180 180 197 +197 189 205 +205 205 222 +189 189 189 +197 230 222 +189 213 213 +180 197 197 +156 164 172 +222 222 230 +230 230 238 diff --git a/graphics/mevent/pal_467DF4.pal b/graphics/mevent/pal_467DF4.pal new file mode 100644 index 000000000..7314ddbc8 --- /dev/null +++ b/graphics/mevent/pal_467DF4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +189 189 164 +205 205 172 +213 213 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_467E14.pal b/graphics/mevent/pal_467E14.pal new file mode 100644 index 000000000..333dd9280 --- /dev/null +++ b/graphics/mevent/pal_467E14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +164 156 180 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_467E34.pal b/graphics/mevent/pal_467E34.pal new file mode 100644 index 000000000..3fca3cdf3 --- /dev/null +++ b/graphics/mevent/pal_467E34.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +246 139 139 +246 180 180 +255 230 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_467E54.pal b/graphics/mevent/pal_467E54.pal new file mode 100644 index 000000000..f5125b4c9 --- /dev/null +++ b/graphics/mevent/pal_467E54.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +164 213 131 +197 230 180 +238 255 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_467E74.pal b/graphics/mevent/pal_467E74.pal new file mode 100644 index 000000000..e8ec07ab5 --- /dev/null +++ b/graphics/mevent/pal_467E74.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +156 197 238 +197 222 246 +238 246 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_467E94.pal b/graphics/mevent/pal_467E94.pal new file mode 100644 index 000000000..783979089 --- /dev/null +++ b/graphics/mevent/pal_467E94.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 90 +222 222 139 +238 238 197 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_467EB4.pal b/graphics/mevent/pal_467EB4.pal new file mode 100644 index 000000000..1c74daace --- /dev/null +++ b/graphics/mevent/pal_467EB4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +205 189 98 +222 205 115 +230 222 98 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_467ED4.pal b/graphics/mevent/pal_467ED4.pal new file mode 100644 index 000000000..d1d92ba57 --- /dev/null +++ b/graphics/mevent/pal_467ED4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +197 197 197 +205 205 205 +213 213 213 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_468060.pal b/graphics/mevent/pal_468060.pal new file mode 100644 index 000000000..970736bbb --- /dev/null +++ b/graphics/mevent/pal_468060.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 213 +74 74 74 +98 106 106 +213 189 74 +238 213 82 +246 246 213 +255 255 255 +230 230 213 +238 238 213 +246 246 238 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/mevent/pal_468080.pal b/graphics/mevent/pal_468080.pal new file mode 100644 index 000000000..01832b5e2 --- /dev/null +++ b/graphics/mevent/pal_468080.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +164 156 90 +164 148 90 +197 197 90 +213 205 90 +222 213 90 +213 213 106 +238 246 98 +230 222 98 +213 205 98 +197 180 98 +238 230 98 +246 238 106 diff --git a/graphics/mevent/pal_4680A0.pal b/graphics/mevent/pal_4680A0.pal new file mode 100644 index 000000000..28a498b57 --- /dev/null +++ b/graphics/mevent/pal_4680A0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +156 156 156 +139 139 148 +180 180 197 +197 189 205 +205 205 222 +189 189 189 +197 230 222 +189 213 213 +180 197 197 +156 164 172 +222 222 230 +230 230 238 diff --git a/graphics/mevent/tilemap_467288.bin b/graphics/mevent/tilemap_467288.bin new file mode 100644 index 000000000..8e4a4717b Binary files /dev/null and b/graphics/mevent/tilemap_467288.bin differ diff --git a/graphics/mevent/tilemap_467470.bin b/graphics/mevent/tilemap_467470.bin new file mode 100644 index 000000000..b59dbabb5 Binary files /dev/null and b/graphics/mevent/tilemap_467470.bin differ diff --git a/graphics/mevent/tilemap_46762C.bin b/graphics/mevent/tilemap_46762C.bin new file mode 100644 index 000000000..aba2b9e92 Binary files /dev/null and b/graphics/mevent/tilemap_46762C.bin differ diff --git a/graphics/mevent/tilemap_467934.bin b/graphics/mevent/tilemap_467934.bin new file mode 100644 index 000000000..1800bff4d Binary files /dev/null and b/graphics/mevent/tilemap_467934.bin differ diff --git a/graphics/mevent/tilemap_467CAC.bin b/graphics/mevent/tilemap_467CAC.bin new file mode 100644 index 000000000..1800bff4d Binary files /dev/null and b/graphics/mevent/tilemap_467CAC.bin differ diff --git a/graphics/mevent/tilemap_468140.bin b/graphics/mevent/tilemap_468140.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/graphics/mevent/tilemap_468140.bin differ diff --git a/graphics/mevent/tilemap_46824C.bin b/graphics/mevent/tilemap_46824C.bin new file mode 100644 index 000000000..72c7ea278 Binary files /dev/null and b/graphics/mevent/tilemap_46824C.bin differ diff --git a/graphics/mevent/tilemap_46837C.bin b/graphics/mevent/tilemap_46837C.bin new file mode 100644 index 000000000..c7b2e3e21 Binary files /dev/null and b/graphics/mevent/tilemap_46837C.bin differ diff --git a/graphics/mevent/tilemap_4684D8.bin b/graphics/mevent/tilemap_4684D8.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/graphics/mevent/tilemap_4684D8.bin differ diff --git a/graphics/mevent/tilemap_468644.bin b/graphics/mevent/tilemap_468644.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/graphics/mevent/tilemap_468644.bin differ diff --git a/graphics/oak_speech/game_start_help_ui.png b/graphics/oak_speech/game_start_help_ui.png new file mode 100644 index 000000000..419858b1b Binary files /dev/null and b/graphics/oak_speech/game_start_help_ui.png differ diff --git a/graphics/oak_speech/grass_platform.png b/graphics/oak_speech/grass_platform.png new file mode 100644 index 000000000..2c8e425d2 Binary files /dev/null and b/graphics/oak_speech/grass_platform.png differ diff --git a/graphics/oak_speech/help_docs_page2_tilemap.bin b/graphics/oak_speech/help_docs_page2_tilemap.bin new file mode 100644 index 000000000..6d3cd42f1 Binary files /dev/null and b/graphics/oak_speech/help_docs_page2_tilemap.bin differ diff --git a/graphics/oak_speech/help_docs_page3_tilemap.bin b/graphics/oak_speech/help_docs_page3_tilemap.bin new file mode 100644 index 000000000..24805c96e Binary files /dev/null and b/graphics/oak_speech/help_docs_page3_tilemap.bin differ diff --git a/graphics/oak_speech/help_docs_palette.pal b/graphics/oak_speech/help_docs_palette.pal new file mode 100644 index 000000000..b6905b913 --- /dev/null +++ b/graphics/oak_speech/help_docs_palette.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +16 115 230 +65 139 131 +82 148 139 +106 164 156 +131 180 172 +156 197 189 +180 213 205 +205 230 222 +230 246 238 +255 0 255 +255 0 255 +0 90 16 +255 0 0 +49 82 205 +255 255 255 +32 32 32 +16 115 230 +255 255 164 +255 255 106 +222 222 90 +189 189 74 +156 156 57 +156 156 57 +123 123 49 +90 90 32 +57 57 16 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +0 0 0 +238 230 172 +115 180 197 +156 213 238 +205 238 246 +246 255 255 +230 246 246 +106 106 106 +74 82 106 +82 98 180 +230 246 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 74 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 255 +123 123 123 +172 172 156 +197 197 197 +222 222 222 +238 238 238 +255 255 255 diff --git a/graphics/oak_speech/leaf_pal.pal b/graphics/oak_speech/leaf_pal.pal new file mode 100644 index 000000000..feb1214a1 --- /dev/null +++ b/graphics/oak_speech/leaf_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +115 197 164 +255 238 205 +246 205 180 +213 164 148 +172 131 106 +106 74 65 +205 164 139 +164 123 98 +115 74 49 +74 41 16 +222 222 222 +180 180 180 +131 131 131 +82 82 90 +41 41 49 +255 255 255 +0 0 0 +131 189 213 +106 156 180 +82 131 156 +49 90 115 +32 65 90 +0 0 255 +255 255 189 +222 222 82 +172 172 57 +98 98 0 +213 131 123 +189 106 98 +164 82 74 +139 57 49 +98 24 16 diff --git a/graphics/oak_speech/leaf_pic.png b/graphics/oak_speech/leaf_pic.png new file mode 100644 index 000000000..1825f9960 Binary files /dev/null and b/graphics/oak_speech/leaf_pic.png differ diff --git a/graphics/oak_speech/new_game_adventure_intro_tilemap.bin b/graphics/oak_speech/new_game_adventure_intro_tilemap.bin new file mode 100644 index 000000000..ad1c8216c --- /dev/null +++ b/graphics/oak_speech/new_game_adventure_intro_tilemap.bin @@ -0,0 +1,2 @@ +^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^                                ` `   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` `   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (`   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (`   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` `   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` ` a b c d e f   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (p q r s t u v   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` g h i j k l m   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (w x y z { | }   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` n o ‚ ƒ „ … †   ` ~  ’ “ ” • –   + \ No newline at end of file diff --git a/graphics/oak_speech/oak_pal.pal b/graphics/oak_speech/oak_pal.pal new file mode 100644 index 000000000..a0b648b2b --- /dev/null +++ b/graphics/oak_speech/oak_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +115 197 164 +255 230 205 +222 189 156 +197 148 115 +106 74 65 +238 222 148 +205 189 115 +172 156 90 +139 123 65 +98 90 49 +255 0 255 +205 205 222 +123 131 156 +57 74 106 +255 255 255 +0 0 0 +0 0 255 +172 148 222 +131 115 172 +82 65 115 +230 222 180 +205 197 156 +180 172 139 +164 156 123 +123 115 90 +82 57 49 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/oak_speech/oak_pic.png b/graphics/oak_speech/oak_pic.png new file mode 100644 index 000000000..9ac602944 Binary files /dev/null and b/graphics/oak_speech/oak_pic.png differ diff --git a/graphics/oak_speech/oak_speech_background_tilemap.bin b/graphics/oak_speech/oak_speech_background_tilemap.bin new file mode 100644 index 000000000..64374cd24 Binary files /dev/null and b/graphics/oak_speech/oak_speech_background_tilemap.bin differ diff --git a/graphics/oak_speech/oak_speech_grass_platform_palette.pal b/graphics/oak_speech/oak_speech_grass_platform_palette.pal new file mode 100644 index 000000000..4fb339128 --- /dev/null +++ b/graphics/oak_speech/oak_speech_grass_platform_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 189 164 +65 139 131 +82 148 139 +106 164 156 +131 180 172 +156 197 189 +180 213 205 +205 230 222 +230 246 238 +0 0 0 +255 0 255 +139 189 164 +156 205 172 +180 222 197 +205 238 222 +115 172 156 diff --git a/graphics/oak_speech/oak_speech_pika_palette.pal b/graphics/oak_speech/oak_speech_pika_palette.pal new file mode 100644 index 000000000..4d2e92c74 --- /dev/null +++ b/graphics/oak_speech/oak_speech_pika_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +255 255 255 +255 246 106 +246 213 0 +238 172 0 +197 139 0 +131 82 0 +255 0 255 +255 0 255 +180 180 180 +255 74 74 +230 0 0 +180 0 0 +106 106 106 +16 16 16 +255 0 255 diff --git a/graphics/oak_speech/pika1.png b/graphics/oak_speech/pika1.png new file mode 100644 index 000000000..71644c355 Binary files /dev/null and b/graphics/oak_speech/pika1.png differ diff --git a/graphics/oak_speech/pika2.png b/graphics/oak_speech/pika2.png new file mode 100644 index 000000000..e85cbfa9c Binary files /dev/null and b/graphics/oak_speech/pika2.png differ diff --git a/graphics/oak_speech/pika_eyes.png b/graphics/oak_speech/pika_eyes.png new file mode 100644 index 000000000..5e2fd80c0 Binary files /dev/null and b/graphics/oak_speech/pika_eyes.png differ diff --git a/graphics/oak_speech/red_pal.pal b/graphics/oak_speech/red_pal.pal new file mode 100644 index 000000000..7eec09831 --- /dev/null +++ b/graphics/oak_speech/red_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +115 197 164 +255 230 205 +222 189 156 +197 148 131 +148 106 90 +106 74 65 +205 164 139 +164 123 98 +115 74 49 +82 65 32 +222 222 222 +180 180 180 +131 131 131 +82 82 90 +57 57 65 +255 255 255 +0 0 0 +131 189 213 +106 156 180 +82 131 156 +49 90 115 +32 65 90 +0 0 255 +238 238 74 +205 205 49 +164 164 32 +98 98 0 +213 131 123 +189 106 98 +164 82 74 +139 57 49 +98 24 16 diff --git a/graphics/oak_speech/red_pic.png b/graphics/oak_speech/red_pic.png new file mode 100644 index 000000000..edf5cf9b1 Binary files /dev/null and b/graphics/oak_speech/red_pic.png differ diff --git a/graphics/oak_speech/rival_pal.pal b/graphics/oak_speech/rival_pal.pal new file mode 100644 index 000000000..8240527a6 --- /dev/null +++ b/graphics/oak_speech/rival_pal.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +115 197 164 +255 230 205 +222 189 156 +197 148 115 +106 74 65 +238 189 74 +213 156 57 +189 123 41 +139 82 41 +164 123 106 +222 222 222 +197 197 197 +139 139 139 +98 98 98 +65 65 65 +255 255 255 +0 0 0 +180 148 180 +139 106 139 +106 74 106 +82 49 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +246 131 131 +205 82 82 diff --git a/graphics/oak_speech/rival_pic.png b/graphics/oak_speech/rival_pic.png new file mode 100644 index 000000000..317cbc038 Binary files /dev/null and b/graphics/oak_speech/rival_pic.png differ diff --git a/graphics/oak_speech/solid_colors.png b/graphics/oak_speech/solid_colors.png new file mode 100644 index 000000000..30066cdd8 Binary files /dev/null and b/graphics/oak_speech/solid_colors.png differ diff --git a/graphics/pokedex/area_markers/marker.pal b/graphics/pokedex/area_markers/marker.pal new file mode 100644 index 000000000..5a7190a3a --- /dev/null +++ b/graphics/pokedex/area_markers/marker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 197 115 +255 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokedex/area_markers/marker_0.png b/graphics/pokedex/area_markers/marker_0.png new file mode 100644 index 000000000..10ef6d24b Binary files /dev/null and b/graphics/pokedex/area_markers/marker_0.png differ diff --git a/graphics/pokedex/area_markers/marker_1.png b/graphics/pokedex/area_markers/marker_1.png new file mode 100644 index 000000000..21db66b29 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_1.png differ diff --git a/graphics/pokedex/area_markers/marker_2.png b/graphics/pokedex/area_markers/marker_2.png new file mode 100644 index 000000000..e25be6f5c Binary files /dev/null and b/graphics/pokedex/area_markers/marker_2.png differ diff --git a/graphics/pokedex/area_markers/marker_3.png b/graphics/pokedex/area_markers/marker_3.png new file mode 100644 index 000000000..1e8fe22d2 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_3.png differ diff --git a/graphics/pokedex/area_markers/marker_4.png b/graphics/pokedex/area_markers/marker_4.png new file mode 100644 index 000000000..193697384 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_4.png differ diff --git a/graphics/pokedex/area_markers/marker_5.png b/graphics/pokedex/area_markers/marker_5.png new file mode 100644 index 000000000..0919682f4 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_5.png differ diff --git a/graphics/pokedex/area_markers/marker_6.png b/graphics/pokedex/area_markers/marker_6.png new file mode 100644 index 000000000..439d858e1 Binary files /dev/null and b/graphics/pokedex/area_markers/marker_6.png differ diff --git a/graphics/script_menu/aerodactyl_fossil.png b/graphics/script_menu/aerodactyl_fossil.png new file mode 100644 index 000000000..067483d6e Binary files /dev/null and b/graphics/script_menu/aerodactyl_fossil.png differ diff --git a/graphics/script_menu/kabutops_fossil.png b/graphics/script_menu/kabutops_fossil.png new file mode 100644 index 000000000..e396b080a Binary files /dev/null and b/graphics/script_menu/kabutops_fossil.png differ diff --git a/graphics/seagallop/eb_tilemap.bin b/graphics/seagallop/eb_tilemap.bin new file mode 100644 index 000000000..2f912fb18 Binary files /dev/null and b/graphics/seagallop/eb_tilemap.bin differ diff --git a/graphics/seagallop/ferry_and_wake.pal b/graphics/seagallop/ferry_and_wake.pal new file mode 100644 index 000000000..c25501332 --- /dev/null +++ b/graphics/seagallop/ferry_and_wake.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 123 180 +238 246 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +57 57 106 +197 98 98 +172 65 106 +32 74 156 +197 148 0 +246 213 24 +222 238 255 +255 255 255 +74 106 139 diff --git a/graphics/seagallop/ferry_sprite.png b/graphics/seagallop/ferry_sprite.png new file mode 100644 index 000000000..cc06fbffa Binary files /dev/null and b/graphics/seagallop/ferry_sprite.png differ diff --git a/graphics/seagallop/wake.png b/graphics/seagallop/wake.png new file mode 100644 index 000000000..a5ff28c6e Binary files /dev/null and b/graphics/seagallop/wake.png differ diff --git a/graphics/seagallop/water.png b/graphics/seagallop/water.png new file mode 100644 index 000000000..ccf64591a Binary files /dev/null and b/graphics/seagallop/water.png differ diff --git a/graphics/seagallop/wb_tilemap.bin b/graphics/seagallop/wb_tilemap.bin new file mode 100644 index 000000000..a3c27d319 Binary files /dev/null and b/graphics/seagallop/wb_tilemap.bin differ diff --git a/graphics/title_screen/lg_border_bg.bin b/graphics/title_screen/lg_border_bg.bin new file mode 100644 index 000000000..108680bc3 --- /dev/null +++ b/graphics/title_screen/lg_border_bg.bin @@ -0,0 +1 @@ +àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààððððàððàààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà \ No newline at end of file diff --git a/graphics/title_screen/unk_83BF58C.png b/graphics/title_screen/unk_83BF58C.png new file mode 100644 index 000000000..895457c3c Binary files /dev/null and b/graphics/title_screen/unk_83BF58C.png differ diff --git a/graphics/title_screen/unk_83BF5A8.bin b/graphics/title_screen/unk_83BF5A8.bin new file mode 100644 index 000000000..375fbeb7a --- /dev/null +++ b/graphics/title_screen/unk_83BF5A8.bin @@ -0,0 +1 @@ +àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà \ No newline at end of file diff --git a/graphics/title_screen/unk_83bf64c.png b/graphics/title_screen/unk_83bf64c.png new file mode 100644 index 000000000..260e00a01 Binary files /dev/null and b/graphics/title_screen/unk_83bf64c.png differ diff --git a/graphics/title_screen/unk_83bf77c.pal b/graphics/title_screen/unk_83bf77c.pal new file mode 100644 index 000000000..815547f37 --- /dev/null +++ b/graphics/title_screen/unk_83bf77c.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 205 180 +0 0 0 +255 255 189 +255 246 139 +255 213 65 +255 172 0 +197 164 49 +115 180 139 +98 189 156 +90 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 205 180 diff --git a/graphics/title_screen/unk_83bf79c.png b/graphics/title_screen/unk_83bf79c.png new file mode 100644 index 000000000..66a57a899 Binary files /dev/null and b/graphics/title_screen/unk_83bf79c.png differ diff --git a/graphics/title_screen/unk_83bfa14.png b/graphics/title_screen/unk_83bfa14.png new file mode 100644 index 000000000..f4f030a5b Binary files /dev/null and b/graphics/title_screen/unk_83bfa14.png differ diff --git a/graphics/title_screen/unk_lg_83bf764.pal b/graphics/title_screen/unk_lg_83bf764.pal new file mode 100644 index 000000000..9a13f7dad --- /dev/null +++ b/graphics/title_screen/unk_lg_83bf764.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 123 90 +16 164 74 +148 255 57 +98 222 57 +57 189 65 +230 255 230 +148 255 205 +82 246 131 +180 180 115 +255 205 148 +246 172 123 +238 148 106 +0 0 0 +0 0 0 +0 0 0 +230 123 90 diff --git a/graphics/title_screen/unk_lg_83bf784.png b/graphics/title_screen/unk_lg_83bf784.png new file mode 100644 index 000000000..d4f7dd622 Binary files /dev/null and b/graphics/title_screen/unk_lg_83bf784.png differ diff --git a/graphics/title_screen/unk_lg_83bf89c.png b/graphics/title_screen/unk_lg_83bf89c.png new file mode 100644 index 000000000..d783c1204 Binary files /dev/null and b/graphics/title_screen/unk_lg_83bf89c.png differ diff --git a/graphics/unknown/unknown_8456638.bin b/graphics/unknown/unknown_8456638.bin new file mode 100644 index 000000000..53ea8cfb8 --- /dev/null +++ b/graphics/unknown/unknown_8456638.bin @@ -0,0 +1 @@ +»»»»ÌÌÌÌÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÌÌÌÌ»»»» \ No newline at end of file diff --git a/graphics/unknown/unknown_84566a8.bin b/graphics/unknown/unknown_84566a8.bin new file mode 100644 index 000000000..2fc4a648a Binary files /dev/null and b/graphics/unknown/unknown_84566a8.bin differ 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 = { -- cgit v1.2.3 From f3919ab5c3b2c1cbb5644c994ac7af88eca13bea Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 6 Apr 2020 10:10:12 -0400 Subject: Drop missed prefixes --- graphics/oak_speech/background_tilemap.bin | Bin 0 -> 1280 bytes graphics/oak_speech/grass_platform_palette.pal | 19 +++++++++++++++++++ .../oak_speech/oak_speech_background_tilemap.bin | Bin 1280 -> 0 bytes .../oak_speech/oak_speech_grass_platform_palette.pal | 19 ------------------- graphics/oak_speech/oak_speech_pika_palette.pal | 19 ------------------- graphics/oak_speech/pika_palette.pal | 19 +++++++++++++++++++ src/oak_speech.c | 6 +++--- 7 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 graphics/oak_speech/background_tilemap.bin create mode 100644 graphics/oak_speech/grass_platform_palette.pal delete mode 100644 graphics/oak_speech/oak_speech_background_tilemap.bin delete mode 100644 graphics/oak_speech/oak_speech_grass_platform_palette.pal delete mode 100644 graphics/oak_speech/oak_speech_pika_palette.pal create mode 100644 graphics/oak_speech/pika_palette.pal diff --git a/graphics/oak_speech/background_tilemap.bin b/graphics/oak_speech/background_tilemap.bin new file mode 100644 index 000000000..64374cd24 Binary files /dev/null and b/graphics/oak_speech/background_tilemap.bin differ diff --git a/graphics/oak_speech/grass_platform_palette.pal b/graphics/oak_speech/grass_platform_palette.pal new file mode 100644 index 000000000..4fb339128 --- /dev/null +++ b/graphics/oak_speech/grass_platform_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 189 164 +65 139 131 +82 148 139 +106 164 156 +131 180 172 +156 197 189 +180 213 205 +205 230 222 +230 246 238 +0 0 0 +255 0 255 +139 189 164 +156 205 172 +180 222 197 +205 238 222 +115 172 156 diff --git a/graphics/oak_speech/oak_speech_background_tilemap.bin b/graphics/oak_speech/oak_speech_background_tilemap.bin deleted file mode 100644 index 64374cd24..000000000 Binary files a/graphics/oak_speech/oak_speech_background_tilemap.bin and /dev/null differ diff --git a/graphics/oak_speech/oak_speech_grass_platform_palette.pal b/graphics/oak_speech/oak_speech_grass_platform_palette.pal deleted file mode 100644 index 4fb339128..000000000 --- a/graphics/oak_speech/oak_speech_grass_platform_palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -189 189 164 -65 139 131 -82 148 139 -106 164 156 -131 180 172 -156 197 189 -180 213 205 -205 230 222 -230 246 238 -0 0 0 -255 0 255 -139 189 164 -156 205 172 -180 222 197 -205 238 222 -115 172 156 diff --git a/graphics/oak_speech/oak_speech_pika_palette.pal b/graphics/oak_speech/oak_speech_pika_palette.pal deleted file mode 100644 index 4d2e92c74..000000000 --- a/graphics/oak_speech/oak_speech_pika_palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 205 180 -255 255 255 -255 246 106 -246 213 0 -238 172 0 -197 139 0 -131 82 0 -255 0 255 -255 0 255 -180 180 180 -255 74 74 -230 0 0 -180 0 0 -106 106 106 -16 16 16 -255 0 255 diff --git a/graphics/oak_speech/pika_palette.pal b/graphics/oak_speech/pika_palette.pal new file mode 100644 index 000000000..4d2e92c74 --- /dev/null +++ b/graphics/oak_speech/pika_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +255 255 255 +255 246 106 +246 213 0 +238 172 0 +197 139 0 +131 82 0 +255 0 255 +255 0 255 +180 180 180 +255 74 74 +230 0 0 +180 0 0 +106 106 106 +16 16 16 +255 0 255 diff --git a/src/oak_speech.c b/src/oak_speech.c index b6a7d0a8e..91fe117f1 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -113,7 +113,7 @@ ALIGNED(4) static const u16 sHelpDocsPalette[] = INCBIN_U16("graphics/oak_speech 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 u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("graphics/oak_speech/background_tilemap.bin.lz"); static const u16 sHelpDocsPage2Tilemap[] = INCBIN_U16("graphics/oak_speech/help_docs_page2_tilemap.bin"); static const u16 sHelpDocsPage3Tilemap[] = INCBIN_U16("graphics/oak_speech/help_docs_page3_tilemap.bin"); static const u16 sOakSpeechGfx_LeafPal[] = INCBIN_U16("graphics/oak_speech/leaf_pal.gbapal"); @@ -124,8 +124,8 @@ static const u16 sOakSpeechGfx_OakPal[] = INCBIN_U16("graphics/oak_speech/oak_pa 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 u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("graphics/oak_speech/grass_platform_palette.gbapal"); +static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("graphics/oak_speech/pika_palette.gbapal"); static const u32 sOakSpeechGfx_GrassPlatform[] = INCBIN_U32("graphics/oak_speech/grass_platform.4bpp.lz"); static const u32 sOakSpeechGfx_Pika1[] = INCBIN_U32("graphics/oak_speech/pika1.4bpp.lz"); static const u32 sOakSpeechGfx_Pika2[] = INCBIN_U32("graphics/oak_speech/pika2.4bpp.lz"); -- cgit v1.2.3 From 1536737da4e1ee764f1520235d5be44dae345825 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 6 Apr 2020 10:51:07 -0400 Subject: Fix some static labels --- graphics/fame_checker/pal_845f5a0.pal | 19 --- graphics/fame_checker/unk.pal | 19 +++ src/fame_checker.c | 2 +- src/map_preview_screen.c | 294 +++++++++++++++++----------------- src/mevent_show_card.c | 48 +++--- src/quest_log.c | 4 +- src/text.c | 174 ++++++++++---------- 7 files changed, 280 insertions(+), 280 deletions(-) delete mode 100644 graphics/fame_checker/pal_845f5a0.pal create mode 100644 graphics/fame_checker/unk.pal diff --git a/graphics/fame_checker/pal_845f5a0.pal b/graphics/fame_checker/pal_845f5a0.pal deleted file mode 100644 index 25a3ac1d2..000000000 --- a/graphics/fame_checker/pal_845f5a0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -98 98 98 -213 213 205 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/fame_checker/unk.pal b/graphics/fame_checker/unk.pal new file mode 100644 index 000000000..25a3ac1d2 --- /dev/null +++ b/graphics/fame_checker/unk.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/src/fame_checker.c b/src/fame_checker.c index 2b6baefe1..dbdb47da8 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -139,7 +139,7 @@ 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 sUnkPalette[] = INCBIN_U16("graphics/fame_checker/unk.gbapal"); // unused? static const u16 sSilhouettePalette[] = INCBIN_U16("graphics/fame_checker/silhouette.gbapal"); static const u8 sTextColor_White[3] = {0, 1, 2}; diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c index fa949fd1e..f3cff7882 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -21,294 +21,294 @@ static EWRAM_DATA bool8 sAllocedBg0TilemapBuffer = FALSE; static void Task_RunMapPreviewScreenForest(u8 taskId); -static const u8 gViridianForestMapPreviewPalette[] = INCBIN_U8("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 u8 sViridianForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/viridian_forest_pal.gbapal"); +static const u8 sViridianForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/viridian_forest_tiles.4bpp.lz"); +static const u8 sViridianForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/viridian_forest_tilemap.bin"); +static const u8 sRockTunnelMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rock_tunnel_pal.gbapal"); +static const u8 sRockTunnelMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rock_tunnel_tiles.4bpp.lz"); +static const u8 sRockTunnelMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rock_tunnel_tilemap.bin"); +static const u8 sRocketHideoutMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_hideout_pal.gbapal"); +static const u8 sRocketHideoutMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_hideout_tiles.4bpp.lz"); +static const u8 sRocketHideoutMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_hideout_tilemap.bin"); +static const u8 sPowerPlantMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/power_plant_pal.gbapal"); +static const u8 sPowerPlantMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/power_plant_tiles.4bpp.lz"); +static const u8 sPowerPlantMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/power_plant_tilemap.bin"); +static const u8 sPokemonMansionMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_pal.gbapal"); +static const u8 sPokemonMansionMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_tiles.4bpp.lz"); +static const u8 sPokemonMansionMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_tilemap.bin"); +static const u8 sPokemonTowerMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_tower_pal.gbapal"); +static const u8 sPokemonTowerMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_tower_tiles.4bpp.lz"); +static const u8 sPokemonTowerMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_tower_tilemap.bin"); +static const u8 sSilphCoMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/silph_co_pal.gbapal"); +static const u8 sSilphCoMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/silph_co_tiles.4bpp.lz"); +static const u8 sSilphCoMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/silph_co_tilemap.bin"); +static const u8 sMtMoonMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_moon_pal.gbapal"); +static const u8 sMtMoonMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_moon_tiles.4bpp.lz"); +static const u8 sMtMoonMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_moon_tilemap.bin"); +static const u8 sSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/seafoam_islands_pal.gbapal"); +static const u8 sSeafoamIslandsMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/seafoam_islands_tiles.4bpp.lz"); +static const u8 sSeafoamIslandsMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/seafoam_islands_tilemap.bin"); +static const u8 sRocketWarehouseMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_pal.gbapal"); +static const u8 sRocketWarehouseMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_tiles.4bpp.lz"); +static const u8 sRocketWarehouseMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_tilemap.bin"); +static const u8 sKantoVictoryRoadMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_pal.gbapal"); +static const u8 sKantoVictoryRoadMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_tiles.4bpp.lz"); +static const u8 sKantoVictoryRoadMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_tilemap.bin"); +static const u8 sMtEmberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_ember_pal.gbapal"); +static const u8 sMtEmberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_ember_tiles.4bpp.lz"); +static const u8 sMtEmberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_ember_tilemap.bin"); +static const u8 sKantoSafariZoneMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_pal.gbapal"); +static const u8 sKantoSafariZoneMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_tiles.4bpp.lz"); +static const u8 sKantoSafariZoneMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_tilemap.bin"); +static const u8 sMoneanChamberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/monean_chamber_pal.gbapal"); +static const u8 sMoneanChamberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/monean_chamber_tiles.4bpp.lz"); +static const u8 sMoneanChamberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/monean_chamber_tilemap.bin"); +static const u8 sDottedHoleMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/dotted_hole_pal.gbapal"); +static const u8 sDottedHoleMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/dotted_hole_tiles.4bpp.lz"); +static const u8 sDottedHoleMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/dotted_hole_tilemap.bin"); +static const u8 sCeruleanCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/cerulean_cave_pal.gbapal"); +static const u8 sCeruleanCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/cerulean_cave_tiles.4bpp.lz"); +static const u8 sCeruleanCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/cerulean_cave_tilemap.bin"); +static const u8 sDiglettsCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/digletts_cave_pal.gbapal"); +static const u8 sDiglettsCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/digletts_cave_tiles.4bpp.lz"); +static const u8 sDiglettsCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/digletts_cave_tilemap.bin"); +static const u8 sLostCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/lost_cave_pal.gbapal"); +static const u8 sLostCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/lost_cave_tiles.4bpp.lz"); +static const u8 sLostCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/lost_cave_tilemap.bin"); +static const u8 sBerryForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/berry_forest_pal.gbapal"); +static const u8 sBerryForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/berry_forest_tiles.4bpp.lz"); +static const u8 sBerryForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/berry_forest_tilemap.bin"); +static const u8 sIcefallCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/icefall_cave_pal.gbapal"); +static const u8 sIcefallCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/icefall_cave_tiles.4bpp.lz"); +static const u8 sIcefallCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/icefall_cave_tilemap.bin"); +static const u8 sAlteringCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/altering_cave_pal.gbapal"); +static const u8 sAlteringCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/altering_cave_tiles.4bpp.lz"); +static const u8 sAlteringCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/altering_cave_tilemap.bin"); static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = { [MPS_VIRIDIAN_FOREST] = { .mapsec = MAPSEC_VIRIDIAN_FOREST, .type = MPS_TYPE_FOREST, .flagId = FLAG_WORLD_MAP_VIRIDIAN_FOREST, - .tilesptr = gViridianForestMapPreviewTiles, - .tilemapptr = gViridianForestMapPreviewTilemap, - .palptr = gViridianForestMapPreviewPalette + .tilesptr = sViridianForestMapPreviewTiles, + .tilemapptr = sViridianForestMapPreviewTilemap, + .palptr = sViridianForestMapPreviewPalette }, [MPS_MT_MOON] = { .mapsec = MAPSEC_MT_MOON, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_MT_MOON_1F, - .tilesptr = gMtMoonMapPreviewTiles, - .tilemapptr = gMtMoonMapPreviewTilemap, - .palptr = gMtMoonMapPreviewPalette + .tilesptr = sMtMoonMapPreviewTiles, + .tilemapptr = sMtMoonMapPreviewTilemap, + .palptr = sMtMoonMapPreviewPalette }, [MPS_DIGLETTS_CAVE] = { .mapsec = MAPSEC_DIGLETTS_CAVE, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F, - .tilesptr = gDiglettsCaveMapPreviewTiles, - .tilemapptr = gDiglettsCaveMapPreviewTilemap, - .palptr = gDiglettsCaveMapPreviewPalette + .tilesptr = sDiglettsCaveMapPreviewTiles, + .tilemapptr = sDiglettsCaveMapPreviewTilemap, + .palptr = sDiglettsCaveMapPreviewPalette }, [MPS_ROCK_TUNNEL] = { .mapsec = MAPSEC_ROCK_TUNNEL, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_ROCK_TUNNEL_1F, - .tilesptr = gRockTunnelMapPreviewTiles, - .tilemapptr = gRockTunnelMapPreviewTilemap, - .palptr = gRockTunnelMapPreviewPalette + .tilesptr = sRockTunnelMapPreviewTiles, + .tilemapptr = sRockTunnelMapPreviewTilemap, + .palptr = sRockTunnelMapPreviewPalette }, [MPS_POKEMON_TOWER] = { .mapsec = MAPSEC_POKEMON_TOWER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_POKEMON_TOWER_1F, - .tilesptr = gPokemonTowerMapPreviewTiles, - .tilemapptr = gPokemonTowerMapPreviewTilemap, - .palptr = gPokemonTowerMapPreviewPalette + .tilesptr = sPokemonTowerMapPreviewTiles, + .tilemapptr = sPokemonTowerMapPreviewTilemap, + .palptr = sPokemonTowerMapPreviewPalette }, [MPS_SAFARI_ZONE] = { .mapsec = MAPSEC_KANTO_SAFARI_ZONE, .type = MPS_TYPE_FOREST, .flagId = FLAG_WORLD_MAP_SAFARI_ZONE_CENTER, - .tilesptr = gKantoSafariZoneMapPreviewTiles, - .tilemapptr = gKantoSafariZoneMapPreviewTilemap, - .palptr = gKantoSafariZoneMapPreviewPalette + .tilesptr = sKantoSafariZoneMapPreviewTiles, + .tilemapptr = sKantoSafariZoneMapPreviewTilemap, + .palptr = sKantoSafariZoneMapPreviewPalette }, [MPS_SEAFOAM_ISLANDS] = { .mapsec = MAPSEC_SEAFOAM_ISLANDS, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F, - .tilesptr = gSeafoamIslandsMapPreviewTiles, - .tilemapptr = gSeafoamIslandsMapPreviewTilemap, - .palptr = gSeafoamIslandsMapPreviewPalette + .tilesptr = sSeafoamIslandsMapPreviewTiles, + .tilemapptr = sSeafoamIslandsMapPreviewTilemap, + .palptr = sSeafoamIslandsMapPreviewPalette }, [MPS_POKEMON_MANSION] = { .mapsec = MAPSEC_POKEMON_MANSION, .type = MPS_TYPE_FOREST, .flagId = FLAG_WORLD_MAP_POKEMON_MANSION_1F, - .tilesptr = gPokemonMansionMapPreviewTiles, - .tilemapptr = gPokemonMansionMapPreviewTilemap, - .palptr = gPokemonMansionMapPreviewPalette + .tilesptr = sPokemonMansionMapPreviewTiles, + .tilemapptr = sPokemonMansionMapPreviewTilemap, + .palptr = sPokemonMansionMapPreviewPalette }, [MPS_ROCKET_HIDEOUT] = { .mapsec = MAPSEC_ROCKET_HIDEOUT, .type = MPS_TYPE_FOREST, .flagId = FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F, - .tilesptr = gRocketHideoutMapPreviewTiles, - .tilemapptr = gRocketHideoutMapPreviewTilemap, - .palptr = gRocketHideoutMapPreviewPalette + .tilesptr = sRocketHideoutMapPreviewTiles, + .tilemapptr = sRocketHideoutMapPreviewTilemap, + .palptr = sRocketHideoutMapPreviewPalette }, [MPS_SILPH_CO] = { .mapsec = MAPSEC_SILPH_CO, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SILPH_CO_1F, - .tilesptr = gSilphCoMapPreviewTiles, - .tilemapptr = gSilphCoMapPreviewTilemap, - .palptr = gSilphCoMapPreviewPalette + .tilesptr = sSilphCoMapPreviewTiles, + .tilemapptr = sSilphCoMapPreviewTilemap, + .palptr = sSilphCoMapPreviewPalette }, [MPS_VICTORY_ROAD] = { .mapsec = MAPSEC_KANTO_VICTORY_ROAD, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_VICTORY_ROAD_1F, - .tilesptr = gKantoVictoryRoadMapPreviewTiles, - .tilemapptr = gKantoVictoryRoadMapPreviewTilemap, - .palptr = gKantoVictoryRoadMapPreviewPalette + .tilesptr = sKantoVictoryRoadMapPreviewTiles, + .tilemapptr = sKantoVictoryRoadMapPreviewTilemap, + .palptr = sKantoVictoryRoadMapPreviewPalette }, [MPS_CERULEAN_CAVE] = { .mapsec = MAPSEC_CERULEAN_CAVE, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_CERULEAN_CAVE_1F, - .tilesptr = gCeruleanCaveMapPreviewTiles, - .tilemapptr = gCeruleanCaveMapPreviewTilemap, - .palptr = gCeruleanCaveMapPreviewPalette + .tilesptr = sCeruleanCaveMapPreviewTiles, + .tilemapptr = sCeruleanCaveMapPreviewTilemap, + .palptr = sCeruleanCaveMapPreviewPalette }, [MPS_POWER_PLANT] = { .mapsec = MAPSEC_POWER_PLANT, .type = MPS_TYPE_FOREST, .flagId = FLAG_WORLD_MAP_POWER_PLANT, - .tilesptr = gPowerPlantMapPreviewTiles, - .tilemapptr = gPowerPlantMapPreviewTilemap, - .palptr = gPowerPlantMapPreviewPalette + .tilesptr = sPowerPlantMapPreviewTiles, + .tilemapptr = sPowerPlantMapPreviewTilemap, + .palptr = sPowerPlantMapPreviewPalette }, [MPS_MT_EMBER] = { .mapsec = MAPSEC_MT_EMBER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_MT_EMBER_EXTERIOR, - .tilesptr = gMtEmberMapPreviewTiles, - .tilemapptr = gMtEmberMapPreviewTilemap, - .palptr = gMtEmberMapPreviewPalette + .tilesptr = sMtEmberMapPreviewTiles, + .tilemapptr = sMtEmberMapPreviewTilemap, + .palptr = sMtEmberMapPreviewPalette }, [MPS_ROCKET_WAREHOUSE] = { .mapsec = MAPSEC_ROCKET_WAREHOUSE, .type = MPS_TYPE_FOREST, .flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST, - .tilesptr = gRocketWarehouseMapPreviewTiles, - .tilemapptr = gRocketWarehouseMapPreviewTilemap, - .palptr = gRocketWarehouseMapPreviewPalette + .tilesptr = sRocketWarehouseMapPreviewTiles, + .tilemapptr = sRocketWarehouseMapPreviewTilemap, + .palptr = sRocketWarehouseMapPreviewPalette }, [MPS_MONEAN_CHAMBER] = { .mapsec = MAPSEC_MONEAN_CHAMBER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, - .tilesptr = gMoneanChamberMapPreviewTiles, - .tilemapptr = gMoneanChamberMapPreviewTilemap, - .palptr = gMoneanChamberMapPreviewPalette + .tilesptr = sMoneanChamberMapPreviewTiles, + .tilemapptr = sMoneanChamberMapPreviewTilemap, + .palptr = sMoneanChamberMapPreviewPalette }, [MPS_DOTTED_HOLE] = { .mapsec = MAPSEC_DOTTED_HOLE, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F, - .tilesptr = gDottedHoleMapPreviewTiles, - .tilemapptr = gDottedHoleMapPreviewTilemap, - .palptr = gDottedHoleMapPreviewPalette + .tilesptr = sDottedHoleMapPreviewTiles, + .tilemapptr = sDottedHoleMapPreviewTilemap, + .palptr = sDottedHoleMapPreviewPalette }, [MPS_BERRY_FOREST] = { .mapsec = MAPSEC_BERRY_FOREST, .type = MPS_TYPE_FOREST, .flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST, - .tilesptr = gBerryForestMapPreviewTiles, - .tilemapptr = gBerryForestMapPreviewTilemap, - .palptr = gBerryForestMapPreviewPalette + .tilesptr = sBerryForestMapPreviewTiles, + .tilemapptr = sBerryForestMapPreviewTilemap, + .palptr = sBerryForestMapPreviewPalette }, [MPS_ICEFALL_CAVE] = { .mapsec = MAPSEC_ICEFALL_CAVE, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE, - .tilesptr = gIcefallCaveMapPreviewTiles, - .tilemapptr = gIcefallCaveMapPreviewTilemap, - .palptr = gIcefallCaveMapPreviewPalette + .tilesptr = sIcefallCaveMapPreviewTiles, + .tilemapptr = sIcefallCaveMapPreviewTilemap, + .palptr = sIcefallCaveMapPreviewPalette }, [MPS_LOST_CAVE] = { .mapsec = MAPSEC_LOST_CAVE, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE, - .tilesptr = gLostCaveMapPreviewTiles, - .tilemapptr = gLostCaveMapPreviewTilemap, - .palptr = gLostCaveMapPreviewPalette + .tilesptr = sLostCaveMapPreviewTiles, + .tilemapptr = sLostCaveMapPreviewTilemap, + .palptr = sLostCaveMapPreviewPalette }, [MPS_ALTERING_CAVE] = { .mapsec = MAPSEC_ALTERING_CAVE, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE, - .tilesptr = gAlteringCaveMapPreviewTiles, - .tilemapptr = gAlteringCaveMapPreviewTilemap, - .palptr = gAlteringCaveMapPreviewPalette + .tilesptr = sAlteringCaveMapPreviewTiles, + .tilemapptr = sAlteringCaveMapPreviewTilemap, + .palptr = sAlteringCaveMapPreviewPalette }, [MPS_PATTERN_BUSH] = { .mapsec = MAPSEC_PATTERN_BUSH, .type = MPS_TYPE_FOREST, .flagId = FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH, - .tilesptr = gViridianForestMapPreviewTiles, - .tilemapptr = gViridianForestMapPreviewTilemap, - .palptr = gViridianForestMapPreviewPalette + .tilesptr = sViridianForestMapPreviewTiles, + .tilemapptr = sViridianForestMapPreviewTilemap, + .palptr = sViridianForestMapPreviewPalette }, [MPS_LIPTOO_CHAMBER] = { .mapsec = MAPSEC_LIPTOO_CHAMBER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, - .tilesptr = gMoneanChamberMapPreviewTiles, - .tilemapptr = gMoneanChamberMapPreviewTilemap, - .palptr = gMoneanChamberMapPreviewPalette + .tilesptr = sMoneanChamberMapPreviewTiles, + .tilemapptr = sMoneanChamberMapPreviewTilemap, + .palptr = sMoneanChamberMapPreviewPalette }, [MPS_WEEPTH_CHAMBER] = { .mapsec = MAPSEC_WEEPTH_CHAMBER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, - .tilesptr = gMoneanChamberMapPreviewTiles, - .tilemapptr = gMoneanChamberMapPreviewTilemap, - .palptr = gMoneanChamberMapPreviewPalette + .tilesptr = sMoneanChamberMapPreviewTiles, + .tilemapptr = sMoneanChamberMapPreviewTilemap, + .palptr = sMoneanChamberMapPreviewPalette }, [MPS_TDILFORD_CHAMBER] = { .mapsec = MAPSEC_DILFORD_CHAMBER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, - .tilesptr = gMoneanChamberMapPreviewTiles, - .tilemapptr = gMoneanChamberMapPreviewTilemap, - .palptr = gMoneanChamberMapPreviewPalette + .tilesptr = sMoneanChamberMapPreviewTiles, + .tilemapptr = sMoneanChamberMapPreviewTilemap, + .palptr = sMoneanChamberMapPreviewPalette }, [MPS_SCUFIB_CHAMBER] = { .mapsec = MAPSEC_SCUFIB_CHAMBER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, - .tilesptr = gMoneanChamberMapPreviewTiles, - .tilemapptr = gMoneanChamberMapPreviewTilemap, - .palptr = gMoneanChamberMapPreviewPalette + .tilesptr = sMoneanChamberMapPreviewTiles, + .tilemapptr = sMoneanChamberMapPreviewTilemap, + .palptr = sMoneanChamberMapPreviewPalette }, [MPS_RIXY_CHAMBER] = { .mapsec = MAPSEC_RIXY_CHAMBER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, - .tilesptr = gMoneanChamberMapPreviewTiles, - .tilemapptr = gMoneanChamberMapPreviewTilemap, - .palptr = gMoneanChamberMapPreviewPalette + .tilesptr = sMoneanChamberMapPreviewTiles, + .tilemapptr = sMoneanChamberMapPreviewTilemap, + .palptr = sMoneanChamberMapPreviewPalette }, [MPS_VIAPOIS_CHAMBER] = { .mapsec = MAPSEC_VIAPOIS_CHAMBER, .type = MPS_TYPE_CAVE, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, - .tilesptr = gMoneanChamberMapPreviewTiles, - .tilemapptr = gMoneanChamberMapPreviewTilemap, - .palptr = gMoneanChamberMapPreviewPalette + .tilesptr = sMoneanChamberMapPreviewTiles, + .tilemapptr = sMoneanChamberMapPreviewTilemap, + .palptr = sMoneanChamberMapPreviewPalette } }; diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c index b4b0b65a6..5f92a36bf 100644 --- a/src/mevent_show_card.c +++ b/src/mevent_show_card.c @@ -80,14 +80,14 @@ static const struct WindowTemplate sWindowTemplates[] = { .baseBlock = 0x130} }; -static const u16 gCard0Pal[] = INCBIN_U16("graphics/mevent/pal_46708C.gbapal"); +static const u16 sCard0Pal[] = INCBIN_U16("graphics/mevent/pal_46708C.gbapal"); const u16 gCard1Pal[] = INCBIN_U16("graphics/mevent/pal_4670AC.gbapal"); const u16 gCard2Pal[] = INCBIN_U16("graphics/mevent/pal_4670CC.gbapal"); const u16 gCard3Pal[] = INCBIN_U16("graphics/mevent/pal_4670EC.gbapal"); const u16 gCard4Pal[] = INCBIN_U16("graphics/mevent/pal_46710C.gbapal"); const u16 gCard5Pal[] = INCBIN_U16("graphics/mevent/pal_46712C.gbapal"); -static const u16 gCard6Pal[] = INCBIN_U16("graphics/mevent/pal_46714C.gbapal"); -static const u16 gCard7Pal[] = INCBIN_U16("graphics/mevent/pal_46716C.gbapal"); +static const u16 sCard6Pal[] = INCBIN_U16("graphics/mevent/pal_46714C.gbapal"); +static const u16 sCard7Pal[] = INCBIN_U16("graphics/mevent/pal_46716C.gbapal"); static const u8 sCard0Gfx[] = INCBIN_U8("graphics/mevent/gfx_46718C.4bpp.lz"); static const u8 sCard0Map[] = INCBIN_U8("graphics/mevent/tilemap_467288.bin.lz"); static const u8 sCard1Gfx[] = INCBIN_U8("graphics/mevent/gfx_46737C.4bpp.lz"); @@ -98,29 +98,29 @@ 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 u16 sUnknown_8467DF4[] = INCBIN_U16("graphics/mevent/pal_467DF4.gbapal"); +static const u16 sUnknown_8467E14[] = INCBIN_U16("graphics/mevent/pal_467E14.gbapal"); +static const u16 sUnknown_8467E34[] = INCBIN_U16("graphics/mevent/pal_467E34.gbapal"); +static const u16 sUnknown_8467E54[] = INCBIN_U16("graphics/mevent/pal_467E54.gbapal"); +static const u16 sUnknown_8467E74[] = INCBIN_U16("graphics/mevent/pal_467E74.gbapal"); +static const u16 sUnknown_8467E94[] = INCBIN_U16("graphics/mevent/pal_467E94.gbapal"); +static const u16 sUnknown_8467EB4[] = INCBIN_U16("graphics/mevent/pal_467EB4.gbapal"); +static const u16 sUnknown_8467ED4[] = INCBIN_U16("graphics/mevent/pal_467ED4.gbapal"); +static const u32 sUnknown_8467EF4[] = INCBIN_U32("graphics/mevent/gfx_467EF4.4bpp.lz"); static const struct CompressedSpriteSheet sShadowSpriteSheet = { - gUnknown_8467EF4, 0x100, 0x8000 + sUnknown_8467EF4, 0x100, 0x8000 }; static const struct SpritePalette sShadowSpritePalettes[] = { - {gUnknown_8467DF4, 0x8000}, - {gUnknown_8467E14, 0x8000}, - {gUnknown_8467E34, 0x8000}, - {gUnknown_8467E54, 0x8000}, - {gUnknown_8467E74, 0x8000}, - {gUnknown_8467E94, 0x8000}, - {gUnknown_8467EB4, 0x8000}, - {gUnknown_8467ED4, 0x8000} + {sUnknown_8467DF4, 0x8000}, + {sUnknown_8467E14, 0x8000}, + {sUnknown_8467E34, 0x8000}, + {sUnknown_8467E54, 0x8000}, + {sUnknown_8467E74, 0x8000}, + {sUnknown_8467E94, 0x8000}, + {sUnknown_8467EB4, 0x8000}, + {sUnknown_8467ED4, 0x8000} }; static const struct SpriteTemplate sShadowSpriteTemplate = { @@ -128,14 +128,14 @@ static const struct SpriteTemplate sShadowSpriteTemplate = { }; static const struct UnkStruct_8467FB8 sCardGfxPtrs[8] = { - {1, 0, 0, 0, sCard0Gfx, sCard0Map, gCard0Pal}, + {1, 0, 0, 0, sCard0Gfx, sCard0Map, sCard0Pal}, {1, 0, 0, 1, sCard1Gfx, sCard1Map, gCard1Pal}, {1, 0, 0, 2, sCard2Gfx, sCard2Map, gCard2Pal}, {1, 0, 0, 3, sCard2Gfx, sCard2Map, gCard3Pal}, {1, 0, 0, 4, sCard2Gfx, sCard2Map, gCard4Pal}, {1, 0, 0, 5, sCard2Gfx, sCard2Map, gCard5Pal}, - {1, 0, 0, 6, sCard6Gfx, sCard6Map, gCard6Pal}, - {1, 0, 0, 7, sCard7Gfx, sCard7Map, gCard7Pal} + {1, 0, 0, 6, sCard6Gfx, sCard6Map, sCard6Pal}, + {1, 0, 0, 7, sCard7Gfx, sCard7Map, sCard7Pal} }; bool32 InitWonderCardResources(struct MEWonderCardData * card, struct MEventBuffer_3430_Sub * b3430sub) diff --git a/src/quest_log.c b/src/quest_log.c index 4bb8c84ec..5dc9f7f11 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("graphics/unknown/unknown_8456638.bin"); +static const u16 sUnknown_8456638[] = INCBIN_U16("graphics/unknown/unknown_8456638.bin"); static const u8 sQuestLogTextLineYCoords[] = {17, 10, 3}; @@ -1134,7 +1134,7 @@ static void DrawQuestLogSceneDescription(void) static void sub_8111D90(u8 a0) { - const u16 *src = gUnknown_8456638; + const u16 *src = sUnknown_8456638; u16 *buffer = Alloc(0x1680); u8 i, j, y; diff --git a/src/text.c b/src/text.c index eb9f6d423..b1a098f53 100644 --- a/src/text.c +++ b/src/text.c @@ -18,17 +18,17 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese); TextFlags gTextFlags; -const u8 gDownArrowTiles[] = INCBIN_U8("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"); +static const u8 sDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow.4bpp"); +static const u8 sDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS.4bpp"); +static const u8 sTinyArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_2.4bpp"); +static const u8 sTinyDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS_2.4bpp"); +static const u8 sDoubleArrowTiles1[] = INCBIN_U8("graphics/fonts/down_arrow_3.4bpp"); +static const u8 sDoubleArrowTiles2[] = INCBIN_U8("graphics/fonts/down_arrow_4.4bpp"); -const u8 gDownArrowYCoords[] = { 0x0, 0x10, 0x20, 0x10 }; -const u8 gWindowVerticalScrollSpeeds[] = { 0x1, 0x2 , 0x4 , 0x0 }; +static const u8 sDownArrowYCoords[] = { 0x0, 0x10, 0x20, 0x10 }; +static const u8 sWindowVerticalScrollSpeeds[] = { 0x1, 0x2 , 0x4 , 0x0 }; -const struct GlyphWidthFunc gGlyphWidthFuncs[] = { +static const struct GlyphWidthFunc sGlyphWidthFuncs[] = { { 0x0, GetGlyphWidthFont0 }, { 0x1, GetGlyphWidthFont1 }, { 0x2, GetGlyphWidthFont2 }, @@ -38,20 +38,20 @@ const struct GlyphWidthFunc gGlyphWidthFuncs[] = { { 0x6, GetGlyphWidthFont6 } }; -const struct SpriteSheet gUnknown_81EA68C[] = +static const struct SpriteSheet sUnknown_81EA68C[] = { - {gDoubleArrowTiles1, sizeof(gDoubleArrowTiles1), 0x8000}, - {gDoubleArrowTiles2, sizeof(gDoubleArrowTiles2), 0x8000}, + {sDoubleArrowTiles1, sizeof(sDoubleArrowTiles1), 0x8000}, + {sDoubleArrowTiles2, sizeof(sDoubleArrowTiles2), 0x8000}, {NULL} }; -const struct SpritePalette gUnknown_81EA6A4[] = +static const struct SpritePalette sUnknown_81EA6A4[] = { {gTMCaseMainWindowPalette, 0x8000}, {NULL} }; -const struct SpriteTemplate gUnknown_81EA6B4 = +static const struct SpriteTemplate sUnknown_81EA6B4 = { .tileTag = 0x8000, .paletteTag = 0x8000, @@ -62,7 +62,7 @@ const struct SpriteTemplate gUnknown_81EA6B4 = .callback = sub_80062B0, }; -const struct KeypadIcon gKeypadIcons[] = { +static const struct KeypadIcon sKeypadIcons[] = { { 0x0, 0x8, 0xC }, { 0x1, 0x8, 0xC }, { 0x2, 0x10, 0xC }, @@ -81,8 +81,8 @@ const struct KeypadIcon gKeypadIcons[] = { const u8 gKeypadIconTiles[] = INCBIN_U8("graphics/fonts/keypad_icons.4bpp"); // Font 0 -const u16 gFont0LatinGlyphs[] = INCBIN_U16("graphics/fonts/font0_latin.latfont"); -const u8 gFont0LatinGlyphWidths[] = +static const u16 sFont0LatinGlyphs[] = INCBIN_U16("graphics/fonts/font0_latin.latfont"); +static const u8 sFont0LatinGlyphWidths[] = { 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x05, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, @@ -122,11 +122,11 @@ const u8 gFont0LatinGlyphWidths[] = 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x05 }; -const u16 gFont0JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font0_jap.fwjpnfont"); +static const u16 sFont0JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font0_jap.fwjpnfont"); // Font 1 -const u16 gFont1LatinGlyphs[] = INCBIN_U16("graphics/fonts/font1_latin.latfont"); -const u8 gFont1LatinGlyphWidths[] = +static const u16 sFont1LatinGlyphs[] = INCBIN_U16("graphics/fonts/font1_latin.latfont"); +static const u8 sFont1LatinGlyphWidths[] = { 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, @@ -166,11 +166,11 @@ const u8 gFont1LatinGlyphWidths[] = 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06 }; -const u16 gFont1JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font1_jap.fwjpnfont"); +static const u16 sFont1JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font1_jap.fwjpnfont"); // Font 2 -const u16 gFont2LatinGlyphs[] = INCBIN_U16("graphics/fonts/font2_latin.latfont"); -const u8 gFont2LatinGlyphWidths[] = +static const u16 sFont2LatinGlyphs[] = INCBIN_U16("graphics/fonts/font2_latin.latfont"); +static const u8 sFont2LatinGlyphWidths[] = { 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, @@ -210,8 +210,8 @@ const u8 gFont2LatinGlyphWidths[] = 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06 }; -const u16 gFont2JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font2_jap.fwjpnfont"); -const u8 gFont2JapaneseGlyphWidths[] = +static const u16 sFont2JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font2_jap.fwjpnfont"); +static const u8 sFont2JapaneseGlyphWidths[] = { 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, @@ -236,8 +236,8 @@ const u8 gFont2JapaneseGlyphWidths[] = }; // Font 4 -const u16 gFont4LatinGlyphs[] = INCBIN_U16("graphics/fonts/font4_latin.latfont"); -const u8 gFont4LatinGlyphWidths[] = +static const u16 sFont4LatinGlyphs[] = INCBIN_U16("graphics/fonts/font4_latin.latfont"); +static const u8 sFont4LatinGlyphWidths[] = { 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, @@ -277,8 +277,8 @@ const u8 gFont4LatinGlyphWidths[] = 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06 }; -const u16 gFont4JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font4_jap.fwjpnfont"); -const u8 gFont4JapaneseGlyphWidths[] = +static const u16 sFont4JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font4_jap.fwjpnfont"); +static const u8 sFont4JapaneseGlyphWidths[] = { 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, @@ -303,8 +303,8 @@ const u8 gFont4JapaneseGlyphWidths[] = }; // Font 5 -const u16 gFont5LatinGlyphs[] = INCBIN_U16("graphics/fonts/font5_latin.latfont"); -const u8 gFont5LatinGlyphWidths[] = +static const u16 sFont5LatinGlyphs[] = INCBIN_U16("graphics/fonts/font5_latin.latfont"); +static const u8 sFont5LatinGlyphWidths[] = { 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, @@ -344,8 +344,8 @@ const u8 gFont5LatinGlyphWidths[] = 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06 }; -const u16 gFont5JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font5_jap.fwjpnfont"); -const u8 gFont5JapaneseGlyphWidths[] = +static const u16 sFont5JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font5_jap.fwjpnfont"); +static const u8 sFont5JapaneseGlyphWidths[] = { 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, @@ -370,7 +370,7 @@ const u8 gFont5JapaneseGlyphWidths[] = }; // Font 9 -const u16 gFont9JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font9_jap.fwjpnfont"); +static const u16 sFont9JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font9_jap.fwjpnfont"); u16 Font0Func(struct TextPrinter *textPrinter) { @@ -482,17 +482,17 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter) { case 0: default: - arrowTiles = gDownArrowTiles; + arrowTiles = sDownArrowTiles; break; case 1: - arrowTiles = gDarkDownArrowTiles; + arrowTiles = sDarkDownArrowTiles; break; } BlitBitmapRectToWindow( textPrinter->printerTemplate.windowId, arrowTiles, - gDownArrowYCoords[*(u32*)subStruct << 17 >> 30], // subStruct->downArrowYPosIdx but again, stupidly retrieved + sDownArrowYCoords[*(u32*)subStruct << 17 >> 30], // subStruct->downArrowYPosIdx but again, stupidly retrieved 0, 0x80, 0x10, @@ -590,17 +590,17 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *c { case 0: default: - arrowTiles = gDownArrowTiles; + arrowTiles = sDownArrowTiles; break; case 1: - arrowTiles = gDarkDownArrowTiles; + arrowTiles = sDarkDownArrowTiles; break; } BlitBitmapRectToWindow( windowId, arrowTiles, - gDownArrowYCoords[*yCoordIndex & 3], + sDownArrowYCoords[*yCoordIndex & 3], 0, 0x80, 0x10, @@ -870,15 +870,15 @@ u16 RenderText(struct TextPrinter *textPrinter) if (textPrinter->scrollDistance) { - if (textPrinter->scrollDistance < gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed]) + if (textPrinter->scrollDistance < sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed]) { ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PIXEL_FILL(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance = 0; } else { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor)); - textPrinter->scrollDistance -= gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed]; + ScrollWindow(textPrinter->printerTemplate.windowId, 0, sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor)); + textPrinter->scrollDistance -= sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed]; } CopyWindowToVram(textPrinter->printerTemplate.windowId, 2); } @@ -999,8 +999,8 @@ s32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese) for (i = 0; i < 7; ++i) { - if (glyphId == gGlyphWidthFuncs[i].fontId) - return *gGlyphWidthFuncs[i].func; + if (glyphId == sGlyphWidthFuncs[i].fontId) + return *sGlyphWidthFuncs[i].func; } return NULL; @@ -1308,9 +1308,9 @@ void sub_80062B0(struct Sprite *sprite) u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority) { u8 spriteId; - LoadSpriteSheet(&gUnknown_81EA68C[sheetId & 1]); - LoadSpritePalette(gUnknown_81EA6A4); - spriteId = CreateSprite(&gUnknown_81EA6B4, x + 3, y + 4, subpriority); + LoadSpriteSheet(&sUnknown_81EA68C[sheetId & 1]); + LoadSpritePalette(sUnknown_81EA6A4); + spriteId = CreateSprite(&sUnknown_81EA6B4, x + 3, y + 4, subpriority); gSprites[spriteId].oam.priority = (priority & 3); gSprites[spriteId].oam.matrixNum = 0; gSprites[spriteId].data[0] = 8; @@ -1328,31 +1328,31 @@ u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y) { BlitBitmapRectToWindow( windowId, - gKeypadIconTiles + (gKeypadIcons[keypadIconId].tileOffset * 0x20), + gKeypadIconTiles + (sKeypadIcons[keypadIconId].tileOffset * 0x20), 0, 0, 0x80, 0x80, x, y, - gKeypadIcons[keypadIconId].width, - gKeypadIcons[keypadIconId].height); - return gKeypadIcons[keypadIconId].width; + sKeypadIcons[keypadIconId].width, + sKeypadIcons[keypadIconId].height); + return sKeypadIcons[keypadIconId].width; } u8 GetKeypadIconTileOffset(u8 keypadIconId) { - return gKeypadIcons[keypadIconId].tileOffset; + return sKeypadIcons[keypadIconId].tileOffset; } u8 GetKeypadIconWidth(u8 keypadIconId) { - return gKeypadIcons[keypadIconId].width; + return sKeypadIcons[keypadIconId].width; } u8 GetKeypadIconHeight(u8 keypadIconId) { - return gKeypadIcons[keypadIconId].height; + return sKeypadIcons[keypadIconId].height; } void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese) @@ -1361,7 +1361,7 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese) if (isJapanese == 1) { - glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); + glyphs = sFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40)); gGlyphInfo[0x80] = 8; @@ -1369,10 +1369,10 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese) } else { - glyphs = gFont0LatinGlyphs + (0x10 * glyphId); + glyphs = sFont0LatinGlyphs + (0x10 * glyphId); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x40)); - gGlyphInfo[0x80] = gFont0LatinGlyphWidths[glyphId]; + gGlyphInfo[0x80] = sFont0LatinGlyphWidths[glyphId]; gGlyphInfo[0x81] = 13; } } @@ -1382,7 +1382,7 @@ s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese) if (isJapanese == TRUE) return 8; else - return gFont0LatinGlyphWidths[glyphId]; + return sFont0LatinGlyphWidths[glyphId]; } void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese) @@ -1392,7 +1392,7 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese) if (isJapanese == TRUE) { int eff; - glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now + glyphs = sFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40)); gGlyphInfo[0x80] = 8; @@ -1400,12 +1400,12 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese) } else { - glyphs = gFont1LatinGlyphs + (0x20 * glyphId); + glyphs = sFont1LatinGlyphs + (0x20 * glyphId); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20)); DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40)); DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60)); - gGlyphInfo[0x80] = gFont1LatinGlyphWidths[glyphId]; + gGlyphInfo[0x80] = sFont1LatinGlyphWidths[glyphId]; gGlyphInfo[0x81] = 14; } } @@ -1415,7 +1415,7 @@ s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese) if (isJapanese == TRUE) return 8; else - return gFont1LatinGlyphWidths[glyphId]; + return sFont1LatinGlyphWidths[glyphId]; } void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese) @@ -1440,12 +1440,12 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese) } else { - glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); + glyphs = sFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40)); DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60)); - gGlyphInfo[0x80] = gFont2JapaneseGlyphWidths[glyphId]; + gGlyphInfo[0x80] = sFont2JapaneseGlyphWidths[glyphId]; gGlyphInfo[0x81] = 12; } } @@ -1459,18 +1459,18 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese) { gGlyphInfo[i] = lastColor | lastColor << 4; // but why - gGlyphInfo[0x80] = gFont2LatinGlyphWidths[0]; + gGlyphInfo[0x80] = sFont2LatinGlyphWidths[0]; gGlyphInfo[0x81] = 14; } } else { - glyphs = gFont2LatinGlyphs + (0x20 * glyphId); + glyphs = sFont2LatinGlyphs + (0x20 * glyphId); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20)); DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40)); DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60)); - gGlyphInfo[0x80] = gFont2LatinGlyphWidths[glyphId]; + gGlyphInfo[0x80] = sFont2LatinGlyphWidths[glyphId]; gGlyphInfo[0x81] = 14; } } @@ -1483,11 +1483,11 @@ s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese) if(glyphId == 0) return 10; - return gFont2JapaneseGlyphWidths[glyphId]; + return sFont2JapaneseGlyphWidths[glyphId]; } else { - return gFont2LatinGlyphWidths[glyphId]; + return sFont2LatinGlyphWidths[glyphId]; } } @@ -1513,7 +1513,7 @@ static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese) } else { - glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); + glyphs = sFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40)); @@ -1531,7 +1531,7 @@ s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese) if(isJapanese == TRUE) return 10; else - return gFont2LatinGlyphWidths[glyphId]; + return sFont2LatinGlyphWidths[glyphId]; } static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese) @@ -1556,12 +1556,12 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese) } else { - glyphs = gFont4JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); + glyphs = sFont4JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40)); DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60)); - gGlyphInfo[0x80] = gFont4JapaneseGlyphWidths[glyphId]; + gGlyphInfo[0x80] = sFont4JapaneseGlyphWidths[glyphId]; gGlyphInfo[0x81] = 12; } } @@ -1575,18 +1575,18 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese) { gGlyphInfo[i] = lastColor | lastColor << 4; // but why - gGlyphInfo[0x80] = gFont4LatinGlyphWidths[0]; + gGlyphInfo[0x80] = sFont4LatinGlyphWidths[0]; gGlyphInfo[0x81] = 14; } } else { - glyphs = gFont4LatinGlyphs + (0x20 * glyphId); + glyphs = sFont4LatinGlyphs + (0x20 * glyphId); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20)); DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40)); DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60)); - gGlyphInfo[0x80] = gFont4LatinGlyphWidths[glyphId]; + gGlyphInfo[0x80] = sFont4LatinGlyphWidths[glyphId]; gGlyphInfo[0x81] = 14; } } @@ -1599,10 +1599,10 @@ s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese) if(glyphId == 0) return 10; - return gFont4JapaneseGlyphWidths[glyphId]; + return sFont4JapaneseGlyphWidths[glyphId]; } else - return gFont4LatinGlyphWidths[glyphId]; + return sFont4LatinGlyphWidths[glyphId]; } void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese) @@ -1627,12 +1627,12 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese) } else { - glyphs = gFont5JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); + glyphs = sFont5JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40)); DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60)); - gGlyphInfo[0x80] = gFont5JapaneseGlyphWidths[glyphId]; + gGlyphInfo[0x80] = sFont5JapaneseGlyphWidths[glyphId]; gGlyphInfo[0x81] = 12; } } @@ -1646,18 +1646,18 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese) { gGlyphInfo[i] = lastColor | lastColor << 4; // but why - gGlyphInfo[0x80] = gFont5LatinGlyphWidths[0]; + gGlyphInfo[0x80] = sFont5LatinGlyphWidths[0]; gGlyphInfo[0x81] = 14; } } else { - glyphs = gFont5LatinGlyphs + (0x20 * glyphId); + glyphs = sFont5LatinGlyphs + (0x20 * glyphId); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20)); DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40)); DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60)); - gGlyphInfo[0x80] = gFont5LatinGlyphWidths[glyphId]; + gGlyphInfo[0x80] = sFont5LatinGlyphWidths[glyphId]; gGlyphInfo[0x81] = 14; } } @@ -1670,15 +1670,15 @@ s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese) if(glyphId == 0) return 10; - return gFont5JapaneseGlyphWidths[glyphId]; + return sFont5JapaneseGlyphWidths[glyphId]; } else - return gFont5LatinGlyphWidths[glyphId]; + return sFont5LatinGlyphWidths[glyphId]; } void DecompressGlyphFont9(u16 glyphId) { - const u16* glyphs = gFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); + const u16* glyphs = sFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40)); gGlyphInfo[0x80] = 8; -- cgit v1.2.3 From 662c8db99e3ef22c611e7ce9a16b628c04972229 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 6 Apr 2020 12:53:53 -0400 Subject: Fix tile encounter name --- include/global.fieldmap.h | 2 +- src/wild_encounter.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 5fa15b95a..fceec9daf 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -28,7 +28,7 @@ enum enum { TILE_ENCOUNTER_NONE, - TILE_ENCOUNTER_GRASS, + TILE_ENCOUNTER_LAND, TILE_ENCOUNTER_WATER, }; diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 40e18e6b4..118df3c8c 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -367,7 +367,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi headerId = GetCurrentMapWildMonHeaderId(); if (headerId != 0xFFFF) { - if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_GRASS) + if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_LAND) { if (gWildMonHeaders[headerId].landMonsInfo == NULL) return FALSE; @@ -474,7 +474,7 @@ bool8 SweetScentWildEncounter(void) headerId = GetCurrentMapWildMonHeaderId(); if (headerId != 0xFFFF) { - if (MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_GRASS) + if (MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_LAND) { if (TryStartRoamerEncounter() == TRUE) { @@ -680,7 +680,7 @@ static u8 GetMapBaseEncounterCooldown(u8 encounterType) u16 headerIdx = GetCurrentMapWildMonHeaderId(); if (headerIdx == 0xFFFF) return 0xFF; - if (encounterType == TILE_ENCOUNTER_GRASS) + if (encounterType == TILE_ENCOUNTER_LAND) { if (gWildMonHeaders[headerIdx].landMonsInfo == NULL) return 0xFF; -- cgit v1.2.3