From dd7ff3194c73d7a059e9b6d67e445d1edb24a67d Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Thu, 16 Mar 2023 22:15:44 +0800 Subject: [PATCH] Rename all other graphics --- .../{unk_83E6C18.pal => unused/flying.pal} | 0 .../{unk_83FF33C.pal => unused/unknown.pal} | 0 .../{unk_83E4874.bin => unused/water.bin} | Bin .../{unk_83E44F4.png => unused/water.png} | Bin .../sparkle.png} | Bin ...F5F50.pal => champion_room_lighting_0.pal} | 0 ...F60F0.pal => champion_room_lighting_1.pal} | 0 ...F6110.pal => champion_room_lighting_2.pal} | 0 ...F6130.pal => champion_room_lighting_3.pal} | 0 ...F6150.pal => champion_room_lighting_4.pal} | 0 ...F6170.pal => champion_room_lighting_5.pal} | 0 ...F6190.pal => champion_room_lighting_6.pal} | 0 ...F61B0.pal => champion_room_lighting_7.pal} | 0 ...F60B0.pal => champion_room_lighting_8.pal} | 0 .../{unk_83F6206.pal => deoxys_rock_0.pal} | 0 .../{unk_83F6226.pal => deoxys_rock_1.pal} | 0 .../{unk_83F6346.pal => deoxys_rock_10.pal} | 0 .../{unk_83F6246.pal => deoxys_rock_2.pal} | 0 .../{unk_83F6266.pal => deoxys_rock_3.pal} | 0 .../{unk_83F6286.pal => deoxys_rock_4.pal} | 0 .../{unk_83F62A6.pal => deoxys_rock_5.pal} | 0 .../{unk_83F62C6.pal => deoxys_rock_6.pal} | 0 .../{unk_83F62E6.pal => deoxys_rock_7.pal} | 0 .../{unk_83F6306.pal => deoxys_rock_8.pal} | 0 .../{unk_83F6326.pal => deoxys_rock_9.pal} | 0 ..._83F60D0.pal => elite_four_lighting_0.pal} | 0 ..._83F5F70.pal => elite_four_lighting_1.pal} | 0 ...83F6090.pal => elite_four_lighting_10.pal} | 0 ...83F61D0.pal => elite_four_lighting_11.pal} | 0 ..._83F5F90.pal => elite_four_lighting_2.pal} | 0 ..._83F5FB0.pal => elite_four_lighting_3.pal} | 0 ..._83F5FD0.pal => elite_four_lighting_4.pal} | 0 ..._83F5FF0.pal => elite_four_lighting_5.pal} | 0 ..._83F6010.pal => elite_four_lighting_6.pal} | 0 ..._83F6030.pal => elite_four_lighting_7.pal} | 0 ..._83F6050.pal => elite_four_lighting_8.pal} | 0 ..._83F6070.pal => elite_four_lighting_9.pal} | 0 .../main_menu/{unk_8234648.pal => bg.pal} | 0 .../{unk_8234668.pal => textbox.pal} | 0 .../minigame_countdown.png} | Bin .../misc/{unk_83cc2e4.pal => option_menu.pal} | 0 graphics/misc/unk_8.pal | 19 ---- include/graphics.h | 107 ------------------ src/battle_anim_effects_3.c | 2 +- src/battle_anim_flying.c | 2 +- src/battle_anim_water.c | 4 +- src/evolution_graphics.c | 4 +- src/field_specials.c | 64 +++++------ src/main_menu.c | 8 +- src/minigame_countdown.c | 4 +- src/option_menu.c | 2 +- 51 files changed, 45 insertions(+), 171 deletions(-) rename graphics/battle_anims/{unk_83E6C18.pal => unused/flying.pal} (100%) rename graphics/battle_anims/{unk_83FF33C.pal => unused/unknown.pal} (100%) rename graphics/battle_anims/{unk_83E4874.bin => unused/water.bin} (100%) rename graphics/battle_anims/{unk_83E44F4.png => unused/water.png} (100%) rename graphics/{misc/evolution_sprite_841EEA4.png => evolution_scene/sparkle.png} (100%) rename graphics/field_specials/{unk_83F5F50.pal => champion_room_lighting_0.pal} (100%) rename graphics/field_specials/{unk_83F60F0.pal => champion_room_lighting_1.pal} (100%) rename graphics/field_specials/{unk_83F6110.pal => champion_room_lighting_2.pal} (100%) rename graphics/field_specials/{unk_83F6130.pal => champion_room_lighting_3.pal} (100%) rename graphics/field_specials/{unk_83F6150.pal => champion_room_lighting_4.pal} (100%) rename graphics/field_specials/{unk_83F6170.pal => champion_room_lighting_5.pal} (100%) rename graphics/field_specials/{unk_83F6190.pal => champion_room_lighting_6.pal} (100%) rename graphics/field_specials/{unk_83F61B0.pal => champion_room_lighting_7.pal} (100%) rename graphics/field_specials/{unk_83F60B0.pal => champion_room_lighting_8.pal} (100%) rename graphics/field_specials/{unk_83F6206.pal => deoxys_rock_0.pal} (100%) rename graphics/field_specials/{unk_83F6226.pal => deoxys_rock_1.pal} (100%) rename graphics/field_specials/{unk_83F6346.pal => deoxys_rock_10.pal} (100%) rename graphics/field_specials/{unk_83F6246.pal => deoxys_rock_2.pal} (100%) rename graphics/field_specials/{unk_83F6266.pal => deoxys_rock_3.pal} (100%) rename graphics/field_specials/{unk_83F6286.pal => deoxys_rock_4.pal} (100%) rename graphics/field_specials/{unk_83F62A6.pal => deoxys_rock_5.pal} (100%) rename graphics/field_specials/{unk_83F62C6.pal => deoxys_rock_6.pal} (100%) rename graphics/field_specials/{unk_83F62E6.pal => deoxys_rock_7.pal} (100%) rename graphics/field_specials/{unk_83F6306.pal => deoxys_rock_8.pal} (100%) rename graphics/field_specials/{unk_83F6326.pal => deoxys_rock_9.pal} (100%) rename graphics/field_specials/{unk_83F60D0.pal => elite_four_lighting_0.pal} (100%) rename graphics/field_specials/{unk_83F5F70.pal => elite_four_lighting_1.pal} (100%) rename graphics/field_specials/{unk_83F6090.pal => elite_four_lighting_10.pal} (100%) rename graphics/field_specials/{unk_83F61D0.pal => elite_four_lighting_11.pal} (100%) rename graphics/field_specials/{unk_83F5F90.pal => elite_four_lighting_2.pal} (100%) rename graphics/field_specials/{unk_83F5FB0.pal => elite_four_lighting_3.pal} (100%) rename graphics/field_specials/{unk_83F5FD0.pal => elite_four_lighting_4.pal} (100%) rename graphics/field_specials/{unk_83F5FF0.pal => elite_four_lighting_5.pal} (100%) rename graphics/field_specials/{unk_83F6010.pal => elite_four_lighting_6.pal} (100%) rename graphics/field_specials/{unk_83F6030.pal => elite_four_lighting_7.pal} (100%) rename graphics/field_specials/{unk_83F6050.pal => elite_four_lighting_8.pal} (100%) rename graphics/field_specials/{unk_83F6070.pal => elite_four_lighting_9.pal} (100%) rename graphics/main_menu/{unk_8234648.pal => bg.pal} (100%) rename graphics/main_menu/{unk_8234668.pal => textbox.pal} (100%) rename graphics/{link_games/unk_847a348.png => misc/minigame_countdown.png} (100%) rename graphics/misc/{unk_83cc2e4.pal => option_menu.pal} (100%) delete mode 100644 graphics/misc/unk_8.pal diff --git a/graphics/battle_anims/unk_83E6C18.pal b/graphics/battle_anims/unused/flying.pal similarity index 100% rename from graphics/battle_anims/unk_83E6C18.pal rename to graphics/battle_anims/unused/flying.pal diff --git a/graphics/battle_anims/unk_83FF33C.pal b/graphics/battle_anims/unused/unknown.pal similarity index 100% rename from graphics/battle_anims/unk_83FF33C.pal rename to graphics/battle_anims/unused/unknown.pal diff --git a/graphics/battle_anims/unk_83E4874.bin b/graphics/battle_anims/unused/water.bin similarity index 100% rename from graphics/battle_anims/unk_83E4874.bin rename to graphics/battle_anims/unused/water.bin diff --git a/graphics/battle_anims/unk_83E44F4.png b/graphics/battle_anims/unused/water.png similarity index 100% rename from graphics/battle_anims/unk_83E44F4.png rename to graphics/battle_anims/unused/water.png diff --git a/graphics/misc/evolution_sprite_841EEA4.png b/graphics/evolution_scene/sparkle.png similarity index 100% rename from graphics/misc/evolution_sprite_841EEA4.png rename to graphics/evolution_scene/sparkle.png diff --git a/graphics/field_specials/unk_83F5F50.pal b/graphics/field_specials/champion_room_lighting_0.pal similarity index 100% rename from graphics/field_specials/unk_83F5F50.pal rename to graphics/field_specials/champion_room_lighting_0.pal diff --git a/graphics/field_specials/unk_83F60F0.pal b/graphics/field_specials/champion_room_lighting_1.pal similarity index 100% rename from graphics/field_specials/unk_83F60F0.pal rename to graphics/field_specials/champion_room_lighting_1.pal diff --git a/graphics/field_specials/unk_83F6110.pal b/graphics/field_specials/champion_room_lighting_2.pal similarity index 100% rename from graphics/field_specials/unk_83F6110.pal rename to graphics/field_specials/champion_room_lighting_2.pal diff --git a/graphics/field_specials/unk_83F6130.pal b/graphics/field_specials/champion_room_lighting_3.pal similarity index 100% rename from graphics/field_specials/unk_83F6130.pal rename to graphics/field_specials/champion_room_lighting_3.pal diff --git a/graphics/field_specials/unk_83F6150.pal b/graphics/field_specials/champion_room_lighting_4.pal similarity index 100% rename from graphics/field_specials/unk_83F6150.pal rename to graphics/field_specials/champion_room_lighting_4.pal diff --git a/graphics/field_specials/unk_83F6170.pal b/graphics/field_specials/champion_room_lighting_5.pal similarity index 100% rename from graphics/field_specials/unk_83F6170.pal rename to graphics/field_specials/champion_room_lighting_5.pal diff --git a/graphics/field_specials/unk_83F6190.pal b/graphics/field_specials/champion_room_lighting_6.pal similarity index 100% rename from graphics/field_specials/unk_83F6190.pal rename to graphics/field_specials/champion_room_lighting_6.pal diff --git a/graphics/field_specials/unk_83F61B0.pal b/graphics/field_specials/champion_room_lighting_7.pal similarity index 100% rename from graphics/field_specials/unk_83F61B0.pal rename to graphics/field_specials/champion_room_lighting_7.pal diff --git a/graphics/field_specials/unk_83F60B0.pal b/graphics/field_specials/champion_room_lighting_8.pal similarity index 100% rename from graphics/field_specials/unk_83F60B0.pal rename to graphics/field_specials/champion_room_lighting_8.pal diff --git a/graphics/field_specials/unk_83F6206.pal b/graphics/field_specials/deoxys_rock_0.pal similarity index 100% rename from graphics/field_specials/unk_83F6206.pal rename to graphics/field_specials/deoxys_rock_0.pal diff --git a/graphics/field_specials/unk_83F6226.pal b/graphics/field_specials/deoxys_rock_1.pal similarity index 100% rename from graphics/field_specials/unk_83F6226.pal rename to graphics/field_specials/deoxys_rock_1.pal diff --git a/graphics/field_specials/unk_83F6346.pal b/graphics/field_specials/deoxys_rock_10.pal similarity index 100% rename from graphics/field_specials/unk_83F6346.pal rename to graphics/field_specials/deoxys_rock_10.pal diff --git a/graphics/field_specials/unk_83F6246.pal b/graphics/field_specials/deoxys_rock_2.pal similarity index 100% rename from graphics/field_specials/unk_83F6246.pal rename to graphics/field_specials/deoxys_rock_2.pal diff --git a/graphics/field_specials/unk_83F6266.pal b/graphics/field_specials/deoxys_rock_3.pal similarity index 100% rename from graphics/field_specials/unk_83F6266.pal rename to graphics/field_specials/deoxys_rock_3.pal diff --git a/graphics/field_specials/unk_83F6286.pal b/graphics/field_specials/deoxys_rock_4.pal similarity index 100% rename from graphics/field_specials/unk_83F6286.pal rename to graphics/field_specials/deoxys_rock_4.pal diff --git a/graphics/field_specials/unk_83F62A6.pal b/graphics/field_specials/deoxys_rock_5.pal similarity index 100% rename from graphics/field_specials/unk_83F62A6.pal rename to graphics/field_specials/deoxys_rock_5.pal diff --git a/graphics/field_specials/unk_83F62C6.pal b/graphics/field_specials/deoxys_rock_6.pal similarity index 100% rename from graphics/field_specials/unk_83F62C6.pal rename to graphics/field_specials/deoxys_rock_6.pal diff --git a/graphics/field_specials/unk_83F62E6.pal b/graphics/field_specials/deoxys_rock_7.pal similarity index 100% rename from graphics/field_specials/unk_83F62E6.pal rename to graphics/field_specials/deoxys_rock_7.pal diff --git a/graphics/field_specials/unk_83F6306.pal b/graphics/field_specials/deoxys_rock_8.pal similarity index 100% rename from graphics/field_specials/unk_83F6306.pal rename to graphics/field_specials/deoxys_rock_8.pal diff --git a/graphics/field_specials/unk_83F6326.pal b/graphics/field_specials/deoxys_rock_9.pal similarity index 100% rename from graphics/field_specials/unk_83F6326.pal rename to graphics/field_specials/deoxys_rock_9.pal diff --git a/graphics/field_specials/unk_83F60D0.pal b/graphics/field_specials/elite_four_lighting_0.pal similarity index 100% rename from graphics/field_specials/unk_83F60D0.pal rename to graphics/field_specials/elite_four_lighting_0.pal diff --git a/graphics/field_specials/unk_83F5F70.pal b/graphics/field_specials/elite_four_lighting_1.pal similarity index 100% rename from graphics/field_specials/unk_83F5F70.pal rename to graphics/field_specials/elite_four_lighting_1.pal diff --git a/graphics/field_specials/unk_83F6090.pal b/graphics/field_specials/elite_four_lighting_10.pal similarity index 100% rename from graphics/field_specials/unk_83F6090.pal rename to graphics/field_specials/elite_four_lighting_10.pal diff --git a/graphics/field_specials/unk_83F61D0.pal b/graphics/field_specials/elite_four_lighting_11.pal similarity index 100% rename from graphics/field_specials/unk_83F61D0.pal rename to graphics/field_specials/elite_four_lighting_11.pal diff --git a/graphics/field_specials/unk_83F5F90.pal b/graphics/field_specials/elite_four_lighting_2.pal similarity index 100% rename from graphics/field_specials/unk_83F5F90.pal rename to graphics/field_specials/elite_four_lighting_2.pal diff --git a/graphics/field_specials/unk_83F5FB0.pal b/graphics/field_specials/elite_four_lighting_3.pal similarity index 100% rename from graphics/field_specials/unk_83F5FB0.pal rename to graphics/field_specials/elite_four_lighting_3.pal diff --git a/graphics/field_specials/unk_83F5FD0.pal b/graphics/field_specials/elite_four_lighting_4.pal similarity index 100% rename from graphics/field_specials/unk_83F5FD0.pal rename to graphics/field_specials/elite_four_lighting_4.pal diff --git a/graphics/field_specials/unk_83F5FF0.pal b/graphics/field_specials/elite_four_lighting_5.pal similarity index 100% rename from graphics/field_specials/unk_83F5FF0.pal rename to graphics/field_specials/elite_four_lighting_5.pal diff --git a/graphics/field_specials/unk_83F6010.pal b/graphics/field_specials/elite_four_lighting_6.pal similarity index 100% rename from graphics/field_specials/unk_83F6010.pal rename to graphics/field_specials/elite_four_lighting_6.pal diff --git a/graphics/field_specials/unk_83F6030.pal b/graphics/field_specials/elite_four_lighting_7.pal similarity index 100% rename from graphics/field_specials/unk_83F6030.pal rename to graphics/field_specials/elite_four_lighting_7.pal diff --git a/graphics/field_specials/unk_83F6050.pal b/graphics/field_specials/elite_four_lighting_8.pal similarity index 100% rename from graphics/field_specials/unk_83F6050.pal rename to graphics/field_specials/elite_four_lighting_8.pal diff --git a/graphics/field_specials/unk_83F6070.pal b/graphics/field_specials/elite_four_lighting_9.pal similarity index 100% rename from graphics/field_specials/unk_83F6070.pal rename to graphics/field_specials/elite_four_lighting_9.pal diff --git a/graphics/main_menu/unk_8234648.pal b/graphics/main_menu/bg.pal similarity index 100% rename from graphics/main_menu/unk_8234648.pal rename to graphics/main_menu/bg.pal diff --git a/graphics/main_menu/unk_8234668.pal b/graphics/main_menu/textbox.pal similarity index 100% rename from graphics/main_menu/unk_8234668.pal rename to graphics/main_menu/textbox.pal diff --git a/graphics/link_games/unk_847a348.png b/graphics/misc/minigame_countdown.png similarity index 100% rename from graphics/link_games/unk_847a348.png rename to graphics/misc/minigame_countdown.png diff --git a/graphics/misc/unk_83cc2e4.pal b/graphics/misc/option_menu.pal similarity index 100% rename from graphics/misc/unk_83cc2e4.pal rename to graphics/misc/option_menu.pal diff --git a/graphics/misc/unk_8.pal b/graphics/misc/unk_8.pal deleted file mode 100644 index d7d8f43b7..000000000 --- a/graphics/misc/unk_8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 24 0 -0 131 213 -32 205 255 -115 106 164 -74 156 49 -16 106 65 -238 8 8 -16 164 16 -32 32 205 -74 65 90 -139 0 74 -90 32 49 -0 115 0 -255 90 65 -24 172 164 -246 106 49 diff --git a/include/graphics.h b/include/graphics.h index 9c0330215..eceb39598 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2751,113 +2751,6 @@ extern const u16 gFireRedMenuElements2_Pal[]; extern const u8 gItemIcon_QuestionMark[]; extern const u8 gItemIconPalette_QuestionMark[]; -extern const u8 gUnknown_08DB7AA0[]; -extern const u8 gUnknown_08DB7B34[]; -extern const u8 gUnknown_08DB7B5C[]; -extern const u8 gUnknown_08DB7BEC[]; -extern const u8 gUnknown_08DB7C08[]; -extern const u8 gUnknown_08DB7CE8[]; -extern const u8 gUnknown_08DB7D08[]; -extern const u8 gUnknown_08DB7DCC[]; -extern const u8 gUnknown_08DB7DF4[]; -extern const u8 gUnknown_08DB7EA0[]; -extern const u8 gUnknown_08DB7EC4[]; -extern const u8 gUnknown_08DB7F60[]; -extern const u8 gUnknown_08DB7F7C[]; -extern const u8 gUnknown_08DB8070[]; -extern const u8 gUnknown_08DB808C[]; -extern const u8 gUnknown_08DB8138[]; -extern const u8 gUnknown_08DB8160[]; -extern const u8 gUnknown_08DB8218[]; -extern const u8 gUnknown_08DB823C[]; -extern const u8 gUnknown_08DB8300[]; -extern const u8 gUnknown_08DB8328[]; -extern const u8 gUnknown_08DB8430[]; -extern const u8 gUnknown_08DB8458[]; -extern const u8 gUnknown_08DB8528[]; -extern const u8 gUnknown_08DB854C[]; -extern const u8 gUnknown_08DB862C[]; -extern const u8 gUnknown_08DB8654[]; -extern const u8 gUnknown_08DB86C4[]; -extern const u8 gUnknown_08DB86E0[]; -extern const u8 gUnknown_08DB8750[]; -extern const u8 gUnknown_08DB876C[]; -extern const u8 gUnknown_08DB87DC[]; -extern const u8 gUnknown_08DB87F8[]; -extern const u8 gUnknown_08DB88D8[]; -extern const u8 gUnknown_08DB8900[]; -extern const u8 gUnknown_08DB89E0[]; -extern const u8 gUnknown_08DB8A08[]; -extern const u8 gUnknown_08DB8A68[]; -extern const u8 gUnknown_08DB8A84[]; -extern const u8 gUnknown_08DB8B40[]; -extern const u8 gUnknown_08DB8B68[]; -extern const u8 gUnknown_08DB8C40[]; -extern const u8 gUnknown_08DB8C5C[]; -extern const u8 gUnknown_08DB8CF4[]; -extern const u8 gUnknown_08DB8D18[]; -extern const u8 gUnknown_08DB8DB0[]; -extern const u8 gUnknown_08DB8DD4[]; -extern const u8 gUnknown_08DB8E80[]; -extern const u8 gUnknown_08DB8EA0[]; -extern const u8 gUnknown_08DB8F58[]; -extern const u8 gUnknown_08DB8F7C[]; -extern const u8 gUnknown_08DB9038[]; -extern const u8 gUnknown_08DB9058[]; -extern const u8 gUnknown_08DB9130[]; -extern const u8 gUnknown_08DB9154[]; -extern const u8 gUnknown_08DB9218[]; -extern const u8 gUnknown_08DB9234[]; -extern const u8 gUnknown_08DB92FC[]; -extern const u8 gUnknown_08DB931C[]; -extern const u8 gUnknown_08DB93E8[]; -extern const u8 gUnknown_08DB940C[]; -extern const u8 gUnknown_08DB94CC[]; -extern const u8 gUnknown_08DB94E8[]; -extern const u8 gUnknown_08DB95AC[]; -extern const u8 gUnknown_08DB95D0[]; -extern const u8 gUnknown_08DB96C4[]; -extern const u8 gUnknown_08DB96EC[]; -extern const u8 gUnknown_08DB97F4[]; -extern const u8 gUnknown_08DB981C[]; -extern const u8 gUnknown_08DB9908[]; -extern const u8 gUnknown_08DB9930[]; -extern const u8 gUnknown_08DB9A54[]; -extern const u8 gUnknown_08DB9A7C[]; -extern const u8 gUnknown_08DB9B7C[]; -extern const u8 gUnknown_08DB9BA4[]; -extern const u8 gUnknown_08DB9CB0[]; -extern const u8 gUnknown_08DB9CD8[]; -extern const u8 gUnknown_08DB9DAC[]; -extern const u8 gUnknown_08DB9DD4[]; -extern const u8 gUnknown_08DB9EE4[]; -extern const u8 gUnknown_08DB9F08[]; -extern const u8 gUnknown_08DB9FFC[]; -extern const u8 gUnknown_08DBA020[]; -extern const u8 gUnknown_08DBA12C[]; -extern const u8 gUnknown_08DCC05C[]; -extern const u16 gUnknown_08DCC01C[]; -extern const u16 gUnknown_08DCC03C[]; -extern const u8 gUnknown_08DCC648[]; -extern const u8 gUnknown_08DCC908[]; -extern const u8 gUnknown_08DD87C0[]; -extern const u8 gUnknown_08DD8EE0[]; -extern const u16 gUnknown_08DD8780[]; -extern const u8 gUnknown_08DD90E0[]; -extern const u8 gUnknown_08DD9718[]; -extern const u16 gUnknown_08DD9080[]; -extern const u8 gUnknown_08DD98B4[]; -extern const u8 gUnknown_08DD9E58[]; -extern const u16 gUnknown_08DD9874[]; -extern const u8 gUnknown_08DDA02C[]; -extern const u8 gUnknown_08DDA63C[]; -extern const u16 gUnknown_08DD9FEC[]; -extern const u8 gUnknown_08DDA840[]; -extern const u8 gUnknown_08DDAE40[]; -extern const u16 gUnknown_08DDA800[]; -extern const u8 gUnknown_08DDB020[]; -extern const u8 gUnknown_08DDB2C4[]; -extern const u16 gUnknown_08DDAFE0[]; // fame_checker extern const u16 gFameCheckerBgPals[0x30]; diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index d0493ef96..9ae958193 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -706,7 +706,7 @@ const struct SpriteTemplate gSweetScentPetalSpriteTemplate = .callback = AnimSweetScentPetal, }; -static const u16 sUnusedPalette[] = INCBIN_U16("graphics/battle_anims/unk_83FF33C.gbapal"); //Unused +static const u16 sUnusedPalette[] = INCBIN_U16("graphics/battle_anims/unused/unknown.gbapal"); static const union AnimCmd sPainSplitAnimCmds[] = { diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c index 0bc84e523..371aa631e 100644 --- a/src/battle_anim_flying.c +++ b/src/battle_anim_flying.c @@ -177,7 +177,7 @@ const struct SpriteTemplate gFallingFeatherSpriteTemplate = .callback = AnimFallingFeather, }; -static const u16 sUnusedPal[] = INCBIN_U16("graphics/battle_anims/unk_83E6C18.gbapal"); +static const u16 sUnusedPal[] = INCBIN_U16("graphics/battle_anims/unused/flying.gbapal"); static const struct SpriteTemplate sUnusedBubbleThrowSpriteTemplate = { diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c index 03d65358d..390ab38f3 100644 --- a/src/battle_anim_water.c +++ b/src/battle_anim_water.c @@ -53,8 +53,8 @@ static void AnimTask_WaterSport_Step(u8); static void CreateWaterSportDroplet(struct Task *); static void CreateWaterPulseRingBubbles(struct Sprite *, s32, s32); -static const u8 sUnusedWater_Gfx[] = INCBIN_U8("graphics/battle_anims/unk_83E44F4.4bpp"); -static const u8 sUnusedWater[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.bin"); +static const u8 sUnusedWater_Gfx[] = INCBIN_U8("graphics/battle_anims/unused/water.4bpp"); +static const u8 sUnusedWater[] = INCBIN_U8("graphics/battle_anims/unused/water.bin"); static const union AnimCmd sAnim_RainDrop[] = { diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index 3b52e06d1..5bb28ed28 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -29,8 +29,8 @@ static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId); static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskId); static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskId); -static const u16 sEvolutionSparklesPalData[] = INCBIN_U16("graphics/misc/evolution_sprite_841EEA4.gbapal"); -static const u32 sEvolutionSparklesTileData[] = INCBIN_U32("graphics/misc/evolution_sprite_841EEA4.4bpp.lz"); +static const u16 sEvolutionSparklesPalData[] = INCBIN_U16("graphics/evolution_scene/sparkle.gbapal"); +static const u32 sEvolutionSparklesTileData[] = INCBIN_U32("graphics/evolution_scene/sparkle.4bpp.lz"); static const struct CompressedSpriteSheet sSpriteSheet_EvolutionSparkles[] = { { sEvolutionSparklesTileData, 0x20, 1001 }, diff --git a/src/field_specials.c b/src/field_specials.c index ba8d70cd3..b2a45b715 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2077,30 +2077,30 @@ void DaisyMassageServices(void) } static const u16 sEliteFourLightingPalettes[][16] = { - 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") + INCBIN_U16("graphics/field_specials/elite_four_lighting_0.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_1.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_2.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_3.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_4.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_5.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_6.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_7.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_8.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_9.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_10.gbapal"), + INCBIN_U16("graphics/field_specials/elite_four_lighting_11.gbapal") }; static const u16 sChampionRoomLightingPalettes[][16] = { - 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") + INCBIN_U16("graphics/field_specials/champion_room_lighting_0.gbapal"), + INCBIN_U16("graphics/field_specials/champion_room_lighting_1.gbapal"), + INCBIN_U16("graphics/field_specials/champion_room_lighting_2.gbapal"), + INCBIN_U16("graphics/field_specials/champion_room_lighting_3.gbapal"), + INCBIN_U16("graphics/field_specials/champion_room_lighting_4.gbapal"), + INCBIN_U16("graphics/field_specials/champion_room_lighting_5.gbapal"), + INCBIN_U16("graphics/field_specials/champion_room_lighting_6.gbapal"), + INCBIN_U16("graphics/field_specials/champion_room_lighting_7.gbapal"), + INCBIN_U16("graphics/field_specials/champion_room_lighting_8.gbapal") }; static const u8 sEliteFourLightingTimers[] = { @@ -2319,17 +2319,17 @@ void CutMoveOpenDottedHoleDoor(void) } static const u16 sDeoxysObjectPals[][16] = { - 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") + INCBIN_U16("graphics/field_specials/deoxys_rock_0.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_1.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_2.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_3.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_4.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_5.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_6.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_7.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_8.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_9.gbapal"), + INCBIN_U16("graphics/field_specials/deoxys_rock_10.gbapal") }; static const u8 sDeoxysCoords[][2] = { diff --git a/src/main_menu.c b/src/main_menu.c index d3a7619a5..057553a2e 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -120,8 +120,8 @@ static const struct WindowTemplate sWindowTemplate[] = { [MAIN_MENU_WINDOW_COUNT] = DUMMY_WIN_TEMPLATE }; -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 u16 sBg_Pal[] = INCBIN_U16("graphics/main_menu/bg.gbapal"); +static const u16 sTextbox_Pal[] = INCBIN_U16("graphics/main_menu/textbox.gbapal"); static const u8 sTextColor1[] = { 10, 11, 12 }; @@ -196,8 +196,8 @@ static bool32 MainMenuGpuInit(u8 a0) ChangeBgY(2, 0, 0); InitWindows(sWindowTemplate); DeactivateAllTextPrinters(); - LoadPalette(sBgPal00, 0x00, 0x20); - LoadPalette(sBgPal15, 0xF0, 0x20); + LoadPalette(sBg_Pal, 0x00, 0x20); + LoadPalette(sTextbox_Pal, 0xF0, 0x20); SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0V, 0); SetGpuReg(REG_OFFSET_WININ, 0); diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c index b7495c328..e6fd9705c 100644 --- a/src/minigame_countdown.c +++ b/src/minigame_countdown.c @@ -210,8 +210,8 @@ static void SpriteCB_Start(struct Sprite *sprite) } } -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 const u16 sSpritePal_321Start[] = INCBIN_U16("graphics/misc/minigame_countdown.gbapal"); +static const u16 sSpriteSheet_321Start[] = INCBIN_U16("graphics/misc/minigame_countdown.4bpp.lz"); static void Load321StartGfx(u16 tilesTag, u16 palTag) { diff --git a/src/option_menu.c b/src/option_menu.c index 7921a1212..9a70614aa 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -130,7 +130,7 @@ static const struct BgTemplate sOptionMenuBgTemplates[] = }, }; -static const u16 sOptionMenuPalette[] = INCBIN_U16("graphics/misc/unk_83cc2e4.gbapal"); +static const u16 sOptionMenuPalette[] = INCBIN_U16("graphics/misc/option_menu.gbapal"); static const u16 sOptionMenuItemCounts[MENUITEM_COUNT] = {3, 2, 2, 2, 3, 10, 0}; static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] =