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/interface/pokesummary_unk_8463B00.pal b/graphics/interface/pokesummary_unk_8463B00.pal deleted file mode 100644 index 61af05b25..000000000 --- a/graphics/interface/pokesummary_unk_8463B00.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 164 164 -106 106 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -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/interface/pokesummary_unk_8463B44.pal b/graphics/interface/pokesummary_unk_8463B44.pal deleted file mode 100644 index 37aafef66..000000000 --- a/graphics/interface/pokesummary_unk_8463B44.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 213 82 -189 148 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 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/graphics/pokemon_special_anim/unk_845973C.bin b/graphics/pokemon_special_anim/bg.bin similarity index 100% rename from graphics/pokemon_special_anim/unk_845973C.bin rename to graphics/pokemon_special_anim/bg.bin diff --git a/graphics/pokemon_special_anim/unk_845963C.pal b/graphics/pokemon_special_anim/bg.pal similarity index 100% rename from graphics/pokemon_special_anim/unk_845963C.pal rename to graphics/pokemon_special_anim/bg.pal diff --git a/graphics/pokemon_special_anim/unk_845967C.png b/graphics/pokemon_special_anim/bg.png similarity index 100% rename from graphics/pokemon_special_anim/unk_845967C.png rename to graphics/pokemon_special_anim/bg.png diff --git a/graphics/pokemon_special_anim/unk_845965C.pal b/graphics/pokemon_special_anim/bg_tm_hm.pal similarity index 100% rename from graphics/pokemon_special_anim/unk_845965C.pal rename to graphics/pokemon_special_anim/bg_tm_hm.pal diff --git a/graphics/pokemon_special_anim/unk_8459888.png b/graphics/pokemon_special_anim/level_up.png similarity index 100% rename from graphics/pokemon_special_anim/unk_8459888.png rename to graphics/pokemon_special_anim/level_up.png diff --git a/graphics/pokemon_special_anim/unk_8459960.png b/graphics/pokemon_special_anim/outward_spiral_dots.png similarity index 100% rename from graphics/pokemon_special_anim/unk_8459960.png rename to graphics/pokemon_special_anim/outward_spiral_dots.png diff --git a/graphics/pokemon_special_anim/unk_84598C4.png b/graphics/pokemon_special_anim/star.png similarity index 100% rename from graphics/pokemon_special_anim/unk_84598C4.png rename to graphics/pokemon_special_anim/star.png diff --git a/graphics/pokemon_special_anim/unk_8459868.pal b/graphics/pokemon_special_anim/unk_8459868.pal deleted file mode 100644 index 9448351d8..000000000 --- a/graphics/pokemon_special_anim/unk_8459868.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -230 230 255 -213 213 255 -197 197 255 -180 180 255 -164 164 255 -148 148 255 -131 131 255 -115 115 255 -98 98 255 -82 82 255 -65 65 255 -49 49 255 -32 32 255 -16 16 255 diff --git a/graphics/pokemon_special_anim/unk_84598A4.pal b/graphics/pokemon_special_anim/unk_84598A4.pal deleted file mode 100644 index a13a09ed3..000000000 --- a/graphics/pokemon_special_anim/unk_84598A4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -98 90 8 -197 189 24 -246 246 0 -148 139 16 -246 238 32 -222 213 0 -213 197 0 -180 164 0 -49 41 0 -172 148 32 -189 164 49 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon_special_anim/unk_8459940.pal b/graphics/pokemon_special_anim/unk_8459940.pal deleted file mode 100644 index 7354e267b..000000000 --- a/graphics/pokemon_special_anim/unk_8459940.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 106 255 -255 255 255 -230 230 230 -213 213 213 -197 197 197 -180 180 180 -164 164 164 -148 148 148 -131 131 131 -115 115 115 -98 98 98 -82 82 82 -65 65 65 -49 49 49 -32 32 32 -16 16 16 diff --git a/graphics/interface/trainer_memo_pal.pal b/graphics/summary_screen/bg.pal similarity index 100% rename from graphics/interface/trainer_memo_pal.pal rename to graphics/summary_screen/bg.pal diff --git a/graphics/interface/trainer_memo.png b/graphics/summary_screen/bg.png similarity index 100% rename from graphics/interface/trainer_memo.png rename to graphics/summary_screen/bg.png diff --git a/graphics/interface/summary_exp_bar.png b/graphics/summary_screen/exp_bar.png similarity index 100% rename from graphics/interface/summary_exp_bar.png rename to graphics/summary_screen/exp_bar.png diff --git a/graphics/interface/summary_hp_bar.png b/graphics/summary_screen/hp_bar.png similarity index 100% rename from graphics/interface/summary_hp_bar.png rename to graphics/summary_screen/hp_bar.png diff --git a/graphics/interface/pokesummary_unk_8463ACC.pal b/graphics/summary_screen/hp_bar_red.pal similarity index 100% rename from graphics/interface/pokesummary_unk_8463ACC.pal rename to graphics/summary_screen/hp_bar_red.pal diff --git a/graphics/interface/pokesummary_unk_8463AAC.pal b/graphics/summary_screen/hp_bar_yellow.pal similarity index 100% rename from graphics/interface/pokesummary_unk_8463AAC.pal rename to graphics/summary_screen/hp_bar_yellow.pal diff --git a/graphics/interface/pokesummary_unk_84636E0.pal b/graphics/summary_screen/marking.pal similarity index 100% rename from graphics/interface/pokesummary_unk_84636E0.pal rename to graphics/summary_screen/marking.pal diff --git a/graphics/interface/pokesummary_unk_8463720.pal b/graphics/summary_screen/move_selection_cursor.pal similarity index 100% rename from graphics/interface/pokesummary_unk_8463720.pal rename to graphics/summary_screen/move_selection_cursor.pal diff --git a/graphics/interface/pokesummary_unk_8463740.png b/graphics/summary_screen/move_selection_cursor_left.png similarity index 100% rename from graphics/interface/pokesummary_unk_8463740.png rename to graphics/summary_screen/move_selection_cursor_left.png diff --git a/graphics/interface/pokesummary_unk_846386C.png b/graphics/summary_screen/move_selection_cursor_right.png similarity index 100% rename from graphics/interface/pokesummary_unk_846386C.png rename to graphics/summary_screen/move_selection_cursor_right.png diff --git a/graphics/interface/pokesummary_unk_8463B88.bin b/graphics/summary_screen/moves_info_page.bin similarity index 100% rename from graphics/interface/pokesummary_unk_8463B88.bin rename to graphics/summary_screen/moves_info_page.bin diff --git a/graphics/interface/pokesummary_unk_8463C80.bin b/graphics/summary_screen/moves_page.bin similarity index 100% rename from graphics/interface/pokesummary_unk_8463C80.bin rename to graphics/summary_screen/moves_page.bin diff --git a/graphics/interface/trainer_memo_5.bin b/graphics/summary_screen/page_egg.bin similarity index 100% rename from graphics/interface/trainer_memo_5.bin rename to graphics/summary_screen/page_egg.bin diff --git a/graphics/interface/trainer_memo.bin b/graphics/summary_screen/page_info.bin similarity index 100% rename from graphics/interface/trainer_memo.bin rename to graphics/summary_screen/page_info.bin diff --git a/graphics/interface/trainer_memo_3.bin b/graphics/summary_screen/page_moves.bin similarity index 100% rename from graphics/interface/trainer_memo_3.bin rename to graphics/summary_screen/page_moves.bin diff --git a/graphics/interface/trainer_memo_4.bin b/graphics/summary_screen/page_moves_info.bin similarity index 100% rename from graphics/interface/trainer_memo_4.bin rename to graphics/summary_screen/page_moves_info.bin diff --git a/graphics/interface/trainer_memo_2.bin b/graphics/summary_screen/page_skills.bin similarity index 100% rename from graphics/interface/trainer_memo_2.bin rename to graphics/summary_screen/page_skills.bin diff --git a/graphics/interface/pokesummary_unk_8463B20.png b/graphics/summary_screen/pokerus_cured.png similarity index 100% rename from graphics/interface/pokesummary_unk_8463B20.png rename to graphics/summary_screen/pokerus_cured.png diff --git a/graphics/interface/pokesummary_unk_8463B64.png b/graphics/summary_screen/shiny_star.png similarity index 100% rename from graphics/interface/pokesummary_unk_8463B64.png rename to graphics/summary_screen/shiny_star.png diff --git a/graphics/interface/status_ailment_icons.png b/graphics/summary_screen/status_ailment_icons.png similarity index 100% rename from graphics/interface/status_ailment_icons.png rename to graphics/summary_screen/status_ailment_icons.png diff --git a/graphics/interface/pokesummary_unk_84636C0.pal b/graphics/summary_screen/text_header.pal similarity index 100% rename from graphics/interface/pokesummary_unk_84636C0.pal rename to graphics/summary_screen/text_header.pal diff --git a/graphics/interface/pokesummary_unk_8463700.pal b/graphics/summary_screen/text_moves.pal similarity index 100% rename from graphics/interface/pokesummary_unk_8463700.pal rename to graphics/summary_screen/text_moves.pal diff --git a/graphics/interface/union_room_chat.bin b/graphics/union_room_chat/bg.bin similarity index 100% rename from graphics/interface/union_room_chat.bin rename to graphics/union_room_chat/bg.bin diff --git a/graphics/interface/union_room_chat.png b/graphics/union_room_chat/bg.png similarity index 100% rename from graphics/interface/union_room_chat.png rename to graphics/union_room_chat/bg.png diff --git a/graphics/union_room_chat/unk_845AED8.png b/graphics/union_room_chat/character_select_cursor.png similarity index 100% rename from graphics/union_room_chat/unk_845AED8.png rename to graphics/union_room_chat/character_select_cursor.png diff --git a/graphics/interface/union_room_chat_icons.png b/graphics/union_room_chat/icons.png similarity index 100% rename from graphics/interface/union_room_chat_icons.png rename to graphics/union_room_chat/icons.png diff --git a/graphics/union_room_chat/unk_845AA64.pal b/graphics/union_room_chat/messages.pal similarity index 100% rename from graphics/union_room_chat/unk_845AA64.pal rename to graphics/union_room_chat/messages.pal diff --git a/graphics/union_room_chat/unk_845AC14.pal b/graphics/union_room_chat/objects.pal similarity index 100% rename from graphics/union_room_chat/unk_845AC14.pal rename to graphics/union_room_chat/objects.pal diff --git a/graphics/interface/union_room_chat_panel.bin b/graphics/union_room_chat/panel.bin similarity index 100% rename from graphics/interface/union_room_chat_panel.bin rename to graphics/union_room_chat/panel.bin diff --git a/graphics/interface/union_room_chat_panel.png b/graphics/union_room_chat/panel.png similarity index 100% rename from graphics/interface/union_room_chat_panel.png rename to graphics/union_room_chat/panel.png diff --git a/graphics/union_room_chat/unk_845AF04.png b/graphics/union_room_chat/r_button.png similarity index 100% rename from graphics/union_room_chat/unk_845AF04.png rename to graphics/union_room_chat/r_button.png diff --git a/graphics/union_room_chat/unk_845AC34.png b/graphics/union_room_chat/selector_cursor.png similarity index 100% rename from graphics/union_room_chat/unk_845AC34.png rename to graphics/union_room_chat/selector_cursor.png diff --git a/graphics/union_room_chat/unk_845AA24.pal b/graphics/union_room_chat/text_entry.pal similarity index 100% rename from graphics/union_room_chat/unk_845AA24.pal rename to graphics/union_room_chat/text_entry.pal diff --git a/graphics/union_room_chat/unk_845AEB8.png b/graphics/union_room_chat/text_entry_cursor.png similarity index 100% rename from graphics/union_room_chat/unk_845AEB8.png rename to graphics/union_room_chat/text_entry_cursor.png diff --git a/graphics/union_room_chat/unk_845AA44.pal b/graphics/union_room_chat/unused.pal similarity index 100% rename from graphics/union_room_chat/unk_845AA44.pal rename to graphics/union_room_chat/unused.pal diff --git a/include/graphics.h b/include/graphics.h index 15b4ce3cc..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]; @@ -4873,15 +4766,15 @@ extern const u32 gBagBgPalette[]; extern const u32 gBagBgPalette_FemaleOverride[]; // union_room_chat_display -extern const u16 gUnionRoomChatPanelBgPal_7[]; -extern const u32 gUnionRoomChatPanelBgTiles[]; -extern const u32 gUnionRoomChatPanelBgMap[]; -extern const u16 gLinkMiscMenu_Pal[]; -extern const u32 gLinkMiscMenu_Gfx[]; -extern const u32 gLinkMiscMenu_Tilemap[]; +extern const u16 gUnionRoomChat_Panel_Pal[]; +extern const u32 gUnionRoomChat_Panel_Gfx[]; +extern const u32 gUnionRoomChat_Panel_Tilemap[]; +extern const u16 gUnionRoomChat_Bg_Pal[]; +extern const u32 gUnionRoomChat_Bg_Gfx[]; +extern const u32 gUnionRoomChat_Bg_Tilemap[]; // union_room_chat_objects -extern const u32 gUnionRoomChatIcons[]; +extern const u32 gUnionRoomChat_Icons_Gfx[]; // battle_bg extern const u32 gFile_graphics_battle_transitions_vs_frame_sheet[]; 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/graphics.c b/src/graphics.c index 31d3a8e2c..04f431469 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1191,24 +1191,22 @@ const u16 gEasyChatButtonWindow_Pal[] = INCBIN_U16("graphics/easy_chat/button_wi const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/button_window.4bpp.lz"); const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/mode.4bpp.lz"); -const u32 gPokeSumBgTiles[] = INCBIN_U32("graphics/interface/trainer_memo.4bpp.lz"); -const u32 gTrainerMemoPal[] = INCBIN_U32("graphics/interface/trainer_memo_pal.gbapal"); - -const u32 gPokeSummary_ExpBarTiles[] = INCBIN_U32("graphics/interface/summary_exp_bar.4bpp.lz"); -const u32 gPokeSummary_HpBarTiles[] = INCBIN_U32("graphics/interface/summary_hp_bar.4bpp.lz"); -const u16 gPokeSummary_ExpBarPals[] = INCBIN_U16("graphics/interface/summary_exp_bar.gbapal"); // hp bar uses this too - -const u32 gBgTilemap_TrainerMemo_Details[] = INCBIN_U32("graphics/interface/trainer_memo.bin.lz"); -const u32 gBgTilemap_TrainerMemo_Stats[] = INCBIN_U32("graphics/interface/trainer_memo_2.bin.lz"); -const u32 gBgTilemap_PokeSum_MovesListForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_3.bin.lz"); -const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_4.bin.lz"); -const u32 gBgTilemap_TrainerMemo_Egg[] = INCBIN_U32("graphics/interface/trainer_memo_5.bin.lz"); +const u32 gSummaryScreen_Bg_Gfx[] = INCBIN_U32("graphics/summary_screen/bg.4bpp.lz"); +const u32 gSummaryScreen_Bg_Pal[] = INCBIN_U32("graphics/summary_screen/bg.gbapal"); +const u32 gSummaryScreen_ExpBar_Gfx[] = INCBIN_U32("graphics/summary_screen/exp_bar.4bpp.lz"); +const u32 gSummaryScreen_HpBar_Gfx[] = INCBIN_U32("graphics/summary_screen/hp_bar.4bpp.lz"); +const u16 gSummaryScreen_HpExpBar_Pal[] = INCBIN_U16("graphics/summary_screen/exp_bar.gbapal"); // hp bar uses this too +const u32 gSummaryScreen_PageInfo_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_info.bin.lz"); +const u32 gSummaryScreen_PageSkills_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_skills.bin.lz"); +const u32 gSummaryScreen_PageMoves_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_moves.bin.lz"); +const u32 gSummaryScreen_PageMovesInfo_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_moves_info.bin.lz"); +const u32 gSummaryScreen_PageEgg_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_egg.bin.lz"); const u16 gUnusedRedPalette[] = INCBIN_U16("graphics/unused/red_palette.gbapal"); const u32 gEasyChatRectangleCursor_Gfx[] = INCBIN_U32("graphics/easy_chat/rectangle_cursor.4bpp.lz"); -const u16 gPokeSummary_StatusAilmentIconPals[] = INCBIN_U16("graphics/interface/status_ailment_icons.gbapal"); -const u32 gPokeSummary_StatusAilmentIconTiles[] = INCBIN_U32("graphics/interface/status_ailment_icons.4bpp.lz"); +const u16 gSummaryScreen_StatusAilmentIcon_Pal[] = INCBIN_U16("graphics/summary_screen/status_ailment_icons.gbapal"); +const u32 gSummaryScreen_StatusAilmentIcon_Gfx[] = INCBIN_U32("graphics/summary_screen/status_ailment_icons.4bpp.lz"); const u16 gDexScreen_TopMenuIconPals_AtoZ[] = INCBIN_U16("graphics/pokedex/cat_icon_abc.gbapal"); const u32 gDexScreen_TopMenuIconTiles_AtoZ[] = INCBIN_U32("graphics/pokedex/cat_icon_abc.4bpp.lz"); @@ -1234,10 +1232,10 @@ 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"); -const u32 gLinkMiscMenu_Tilemap[] = INCBIN_U32("graphics/interface/union_room_chat.bin.lz"); -const u32 gUnionRoomChatIcons[] = INCBIN_U32("graphics/interface/union_room_chat_icons.4bpp.lz"); +const u16 gUnionRoomChat_Bg_Pal[] = INCBIN_U16("graphics/union_room_chat/bg.gbapal"); +const u32 gUnionRoomChat_Bg_Gfx[] = INCBIN_U32("graphics/union_room_chat/bg.4bpp.lz"); +const u32 gUnionRoomChat_Bg_Tilemap[] = INCBIN_U32("graphics/union_room_chat/bg.bin.lz"); +const u32 gUnionRoomChat_Icons_Gfx[] = INCBIN_U32("graphics/union_room_chat/icons.4bpp.lz"); const u16 gTilesetPalettes_General[][16] = { @@ -1324,9 +1322,9 @@ const u16 gTilesetPalettes_DepartmentStore[][16] = const u32 gTilesetTiles_DepartmentStore[] = INCBIN_U32("data/tilesets/secondary/department_store/tiles.4bpp.lz"); -const u16 gUnionRoomChatPanelBgPal_7[] = INCBIN_U16("graphics/interface/union_room_chat_panel.gbapal"); -const u32 gUnionRoomChatPanelBgTiles[] = INCBIN_U32("graphics/interface/union_room_chat_panel.4bpp.lz"); -const u32 gUnionRoomChatPanelBgMap[] = INCBIN_U32("graphics/interface/union_room_chat_panel.bin.lz"); +const u16 gUnionRoomChat_Panel_Pal[] = INCBIN_U16("graphics/union_room_chat/panel.gbapal"); +const u32 gUnionRoomChat_Panel_Gfx[] = INCBIN_U32("graphics/union_room_chat/panel.4bpp.lz"); +const u32 gUnionRoomChat_Panel_Tilemap[] = INCBIN_U32("graphics/union_room_chat/panel.bin.lz"); const u16 gCreditsMonPokeball_Pals[][16] = { 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] = diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index e88399ea2..216966921 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -49,16 +49,16 @@ static void Task_LevelUpVerticalSprites(u8 taskId); static void CreateLevelUpVerticalSprite(u8 taskId, s16 *data); static void SpriteCB_LevelUpVertical(struct Sprite *sprite); -static const u16 sBgPals_PSA_Any[] = INCBIN_U16("graphics/pokemon_special_anim/unk_845963C.gbapal"); -static const u16 sBgPals_PSA_Anim4[] = INCBIN_U16("graphics/pokemon_special_anim/unk_845965C.gbapal"); -static const u32 sBg3Tiles_PSA[] = INCBIN_U32("graphics/pokemon_special_anim/unk_845967C.4bpp.lz"); -static const u32 sBg3Map_PSA[] = INCBIN_U32("graphics/pokemon_special_anim/unk_845973C.bin.lz"); -static const u16 sSpritePals_LevelUpVertical[] = INCBIN_U16("graphics/pokemon_special_anim/unk_8459868.gbapal"); -static const u32 sSpriteTiles_LevelUpVertical[] = INCBIN_U32("graphics/pokemon_special_anim/unk_8459888.4bpp.lz"); -static const u16 sSpritePals_Star[] = INCBIN_U16("graphics/pokemon_special_anim/unk_84598A4.gbapal"); -static const u32 sSpriteTiles_Star[] = INCBIN_U32("graphics/pokemon_special_anim/unk_84598C4.4bpp.lz"); -static const u16 sSpritePals_UseItem_OutwardSpiralDots[] = INCBIN_U16("graphics/pokemon_special_anim/unk_8459940.gbapal"); -static const u32 sSpriteTiles_UseItem_OutwardSpiralDots[] = INCBIN_U32("graphics/pokemon_special_anim/unk_8459960.4bpp.lz"); +static const u16 sBg_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/bg.gbapal"); +static const u16 sBg_TmHm_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/bg_tm_hm.gbapal"); +static const u32 sBg_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/bg.4bpp.lz"); +static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/pokemon_special_anim/bg.bin.lz"); +static const u16 sLevelUp_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/level_up.gbapal"); +static const u32 sLevelUp_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/level_up.4bpp.lz"); +static const u16 sStar_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/star.gbapal"); +static const u32 sStar_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/star.4bpp.lz"); +static const u16 sOutwardSpiralDots_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/outward_spiral_dots.gbapal"); +static const u32 sOutwardSpiralDots_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/outward_spiral_dots.4bpp.lz"); static const struct BgTemplate sBgTemplates[] = { { @@ -116,24 +116,24 @@ static const s8 sStarCoordOffsets[][2] = { }; static const struct CompressedSpriteSheet sSpriteSheet_Star = { - sSpriteTiles_Star, + sStar_Gfx, 0x80, 2 }; static const struct SpritePalette sSpritePalette_Star = { - sSpritePals_Star, + sStar_Pal, 2 }; static const struct CompressedSpriteSheet sSpriteSheet_UseItem_OutwardSpiralDots = { - sSpriteTiles_UseItem_OutwardSpiralDots, + sOutwardSpiralDots_Gfx, 0x60, 5 }; static const struct SpritePalette sSpritePalette_UseItem_OutwardSpiralDots = { - sSpritePals_UseItem_OutwardSpiralDots, + sOutwardSpiralDots_Pal, 5 }; @@ -633,12 +633,12 @@ bool8 PSA_IsCopyingLevelUpWindowToVram(void) static void LoadBgGfxByAnimType(u16 animType) { - CopyToBgTilemapBuffer(3, sBg3Map_PSA, 0, 0x000); - DecompressAndCopyTileDataToVram(3, sBg3Tiles_PSA, 0, 0x000, 0); + CopyToBgTilemapBuffer(3, sBg_Tilemap, 0, 0x000); + DecompressAndCopyTileDataToVram(3, sBg_Gfx, 0, 0x000, 0); if (animType != 4) - LoadPalette(sBgPals_PSA_Any, 0x00, 0x20); + LoadPalette(sBg_Pal, 0x00, 0x20); else - LoadPalette(sBgPals_PSA_Anim4, 0x00, 0x20); + LoadPalette(sBg_TmHm_Pal, 0x00, 0x20); } void PSA_CreateMonSpriteAtCloseness(u8 closeness) @@ -1382,9 +1382,9 @@ void CreateLevelUpVerticalSpritesTask(u16 x, u16 y, u16 tileTag, u16 paletteTag, static struct SpritePalette spritePalette; u8 taskId; spriteSheet.tag = tileTag; - spriteSheet.data = sSpriteTiles_LevelUpVertical; - spriteSheet.size = sSpriteTiles_LevelUpVertical[0] >> 8; - spritePalette.data = sSpritePals_LevelUpVertical; + spriteSheet.data = sLevelUp_Gfx; + spriteSheet.size = sLevelUp_Gfx[0] >> 8; + spritePalette.data = sLevelUp_Pal; spritePalette.tag = paletteTag; LoadCompressedSpriteSheet(&spriteSheet); LoadSpritePalette(&spritePalette); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 01518a96f..bba8c7d5a 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -58,7 +58,7 @@ static void PokeSum_SetHelpContext(void); static void Task_HandleInput_SelectMove(u8 id); static void PokeSum_CopyNewBgTilemapBeforePageFlip_2(void); static void PokeSum_CopyNewBgTilemapBeforePageFlip(void); -static void PokeSum_DrawBg3Tilemap(void); +static void PokeSum_DrawPageProgressTiles(void); static void PokeSum_PrintRightPaneText(void); static void PokeSum_PrintBottomPaneText(void); static void PokeSum_PrintAbilityDataOrMoveTypes(void); @@ -327,26 +327,25 @@ static EWRAM_DATA u8 sMoveSelectionCursorPos = 0; static EWRAM_DATA u8 sMoveSwapCursorPos = 0; static EWRAM_DATA struct MonPicBounceState * sMonPicBounceState = NULL; -extern const u32 gBgTilemap_TrainerMemo_Stats[]; -extern const u32 gBgTilemap_PokeSum_MovesListForDelete[]; -extern const u32 gBgTilemap_TrainerMemo_Details[]; -extern const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[]; -extern const u32 gBgTilemap_TrainerMemo_Egg[]; -extern const u16 gTrainerMemoPal[]; -extern const u32 gPokeSumBgTiles[]; -extern const u16 gPokeSummary_ExpBarPals[]; -extern const u32 gPokeSummary_StatusAilmentIconTiles[]; -extern const u16 gPokeSummary_StatusAilmentIconPals[]; -extern const u32 gPokeSummary_HpBarTiles[]; -extern const u32 gPokeSummary_ExpBarTiles[]; -extern const u16 gPokeSummary_ExpBarPals[]; +extern const u32 gSummaryScreen_PageSkills_Tilemap[]; +extern const u32 gSummaryScreen_PageMoves_Tilemap[]; +extern const u32 gSummaryScreen_PageInfo_Tilemap[]; +extern const u32 gSummaryScreen_PageMovesInfo_Tilemap[]; +extern const u32 gSummaryScreen_PageEgg_Tilemap[]; +extern const u16 gSummaryScreen_Bg_Pal[]; +extern const u32 gSummaryScreen_Bg_Gfx[]; +extern const u16 gSummaryScreen_HpExpBar_Pal[]; +extern const u32 gSummaryScreen_StatusAilmentIcon_Gfx[]; +extern const u16 gSummaryScreen_StatusAilmentIcon_Pal[]; +extern const u32 gSummaryScreen_HpBar_Gfx[]; +extern const u32 gSummaryScreen_ExpBar_Gfx[]; -static const u32 sBgPal7[] = INCBIN_U32("graphics/interface/pokesummary_unk_84636C0.gbapal"); -static const u16 sMonMarkingSpritePalette[] = INCBIN_U16("graphics/interface/pokesummary_unk_84636E0.gbapal"); -static const u32 sBgPal8[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463700.gbapal"); -static const u16 sMoveSelectionCursorPals[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463720.gbapal"); -static const u32 sMoveSelectionCursorTiles_Left[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463740.4bpp.lz"); -static const u32 sMoveSelectionCursorTiles_Right[] = INCBIN_U32("graphics/interface/pokesummary_unk_846386C.4bpp.lz"); +static const u32 sTextHeaderPalette[] = INCBIN_U32("graphics/summary_screen/text_header.gbapal"); +static const u16 sMonMarkingSpritePalette[] = INCBIN_U16("graphics/summary_screen/marking.gbapal"); +static const u32 sTextMovesPalette[] = INCBIN_U32("graphics/summary_screen/text_moves.gbapal"); +static const u16 sMoveSelectionCursorPals[] = INCBIN_U16("graphics/summary_screen/move_selection_cursor.gbapal"); +static const u32 sMoveSelectionCursorTiles_Left[] = INCBIN_U32("graphics/summary_screen/move_selection_cursor_left.4bpp.lz"); +static const u32 sMoveSelectionCursorTiles_Right[] = INCBIN_U32("graphics/summary_screen/move_selection_cursor_right.4bpp.lz"); static const struct OamData sMoveSelectionCursorOamData = { @@ -560,8 +559,8 @@ static const union AnimCmd * const sHpOrExpBarAnimTable[] = sHpOrExpAnim_11 }; -static const u16 sPokeSummary_HpBarPalYellow[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463AAC.gbapal"); -static const u16 sPokeSummary_HpBarPalRed[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463ACC.gbapal"); +static const u16 sPokeSummary_HpBarPalYellow[] = INCBIN_U16("graphics/summary_screen/hp_bar_yellow.gbapal"); +static const u16 sPokeSummary_HpBarPalRed[] = INCBIN_U16("graphics/summary_screen/hp_bar_red.gbapal"); static const struct OamData sPokerusIconObjOamData = { .y = 0, @@ -589,8 +588,8 @@ static const union AnimCmd * const sPokerusIconObjAnimTable[] = sPokerusIconObjAnim0 }; -static const u16 sPokerusIconObjPal[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463B00.gbapal"); -static const u32 sPokerusIconObjTiles[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463B20.4bpp.lz"); +static const u16 sPokerusIconObjPal[] = INCBIN_U16("graphics/summary_screen/pokerus_cured.gbapal"); +static const u32 sPokerusIconObjTiles[] = INCBIN_U32("graphics/summary_screen/pokerus_cured.4bpp.lz"); static const struct OamData sStarObjOamData = { @@ -619,10 +618,10 @@ static const union AnimCmd * const sStarObjAnimTable[] = sStarObjAnim0 }; -static const u16 sStarObjPal[] = INCBIN_U16( "graphics/interface/pokesummary_unk_8463B44.gbapal"); -static const u32 sStarObjTiles[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463B64.4bpp.lz"); -static const u32 sBgTilemap_MovesInfoPage[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463B88.bin.lz"); -static const u32 sBgTilemap_MovesPage[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463C80.bin.lz"); +static const u16 sStarObjPal[] = INCBIN_U16( "graphics/summary_screen/shiny_star.gbapal"); +static const u32 sStarObjTiles[] = INCBIN_U32( "graphics/summary_screen/shiny_star.4bpp.lz"); +static const u32 sBgTilemap_MovesInfoPage[] = INCBIN_U32( "graphics/summary_screen/moves_info_page.bin.lz"); +static const u32 sBgTilemap_MovesPage[] = INCBIN_U32( "graphics/summary_screen/moves_page.bin.lz"); #include "data/text/nature_names.h" @@ -959,7 +958,7 @@ static const s8 sEggPicShakeXDelta_AlmostReadyToHatch[] = static const u16 * const sHpBarPals[] = { - gPokeSummary_ExpBarPals, + gSummaryScreen_HpExpBar_Pal, sPokeSummary_HpBarPalYellow, sPokeSummary_HpBarPalRed, }; @@ -1262,7 +1261,7 @@ static void Task_PokeSum_FlipPages(u8 taskId) case 2: PokeSum_CopyNewBgTilemapBeforePageFlip_2(); PokeSum_CopyNewBgTilemapBeforePageFlip(); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); PokeSum_PrintPageHeaderText(sMonSummaryScreen->curPageIndex); break; case 3: @@ -1358,7 +1357,7 @@ static void Task_FlipPages_FromInfo(u8 taskId) PokeSum_HideSpritesBeforePageFlip(); PokeSum_UpdateWin1ActiveFlag(sMonSummaryScreen->curPageIndex); PokeSum_CopyNewBgTilemapBeforePageFlip(); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); PokeSum_CopyNewBgTilemapBeforePageFlip_2(); break; case 3: @@ -1510,7 +1509,7 @@ static void Task_BackOutOfSelectMove(u8 taskId) break; case 10: PokeSum_CopyNewBgTilemapBeforePageFlip(); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); CopyBgTilemapBufferToVram(3); PokeSum_ShowSpritesBeforePageFlip(); break; @@ -1838,24 +1837,24 @@ static void PokeSum_CopyNewBgTilemapBeforePageFlip_2(void) switch (newPage) { case PSS_PAGE_INFO: - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); break; case PSS_PAGE_SKILLS: if (sMonSummaryScreen->pageFlipDirection == 1) - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_PokeSum_MovesListForDelete, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageMoves_Tilemap, 0, 0); else - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Details, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageInfo_Tilemap, 0, 0); break; case PSS_PAGE_MOVES: if (sMonSummaryScreen->pageFlipDirection == 1) - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_PokeSum_MoveDetailsForDelete, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageMovesInfo_Tilemap, 0, 0); else - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); break; case PSS_PAGE_MOVES_INFO: - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_PokeSum_MovesListForDelete, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageMoves_Tilemap, 0, 0); break; } } @@ -1872,7 +1871,7 @@ static void PokeSum_CopyNewBgTilemapBeforePageFlip(void) switch (newPage) { case PSS_PAGE_INFO: - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); break; case PSS_PAGE_SKILLS: break; @@ -1933,22 +1932,22 @@ static void CB2_SetUpPSS(void) else CopyToBgTilemapBuffer(3, sBgTilemap_MovesInfoPage, 0, 0); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); break; case 11: if (sMonSummaryScreen->isEgg) - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Egg, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageEgg_Tilemap, 0, 0); else { if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE || sMonSummaryScreen->mode == PSS_MODE_FORGET_MOVE) { - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_PokeSum_MovesListForDelete, 0, 0); - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_PokeSum_MoveDetailsForDelete, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageMoves_Tilemap, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageMovesInfo_Tilemap, 0, 0); } else { - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Details, 0, 0); - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageInfo_Tilemap, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); } } @@ -2007,28 +2006,28 @@ static u8 PokeSum_HandleLoadBgGfx(void) switch (sMonSummaryScreen->loadBgGfxStep) { case 0: - LoadPalette(gTrainerMemoPal, 0, 0x20 * 5); + LoadPalette(gSummaryScreen_Bg_Pal, 0, 0x20 * 5); if (IsMonShiny(&sMonSummaryScreen->currentMon) == TRUE && !sMonSummaryScreen->isEgg) { - LoadPalette(&gTrainerMemoPal[16 * 6], 0, 0x20); - LoadPalette(&gTrainerMemoPal[16 * 5], 0x10, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 6], 0, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 5], 0x10, 0x20); } else { - LoadPalette(&gTrainerMemoPal[16 * 0], 0, 0x20); - LoadPalette(&gTrainerMemoPal[16 * 1], 0x10, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 0], 0, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 1], 0x10, 0x20); } break; case 1: ListMenuLoadStdPalAt(0x60, 1); - LoadPalette(sBgPal7, 0x70, 0x20); + LoadPalette(sTextHeaderPalette, 0x70, 0x20); break; case 2: ResetTempTileDataBuffers(); break; case 3: - DecompressAndCopyTileDataToVram(2, gPokeSumBgTiles, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, gSummaryScreen_Bg_Gfx, 0, 0, 0); break; case 4: if (FreeTempTileDataBuffersIfPossible() == TRUE) @@ -2040,7 +2039,7 @@ static u8 PokeSum_HandleLoadBgGfx(void) break; default: - LoadPalette(sBgPal8, 0x80, 0x20); + LoadPalette(sTextMovesPalette, 0x80, 0x20); return TRUE; } @@ -3272,86 +3271,86 @@ static u8 PokeSum_BufferOtName_IsEqualToCurrentOwner(struct Pokemon * mon) return TRUE; } -#define SUB_8138538_BASE_TILE_NUM (345) +#define PAGE_PROGRESS_BASE_TILE_NUM (345) -static void PokeSum_DrawBg3Tilemap(void) +static void PokeSum_DrawPageProgressTiles(void) { switch (sMonSummaryScreen->curPageIndex) { case PSS_PAGE_INFO: if (!sMonSummaryScreen->isEgg) { - FillBgTilemapBufferRect(3, 17 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 33 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 16 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 32 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 18 + SUB_8138538_BASE_TILE_NUM, 15, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 34 + SUB_8138538_BASE_TILE_NUM, 15, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 20 + SUB_8138538_BASE_TILE_NUM, 16, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 36 + SUB_8138538_BASE_TILE_NUM, 16, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 18 + SUB_8138538_BASE_TILE_NUM, 17, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 34 + SUB_8138538_BASE_TILE_NUM, 17, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 21 + SUB_8138538_BASE_TILE_NUM, 18, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 37 + SUB_8138538_BASE_TILE_NUM, 18, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 17 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 33 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 16 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 32 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 18 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 34 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 20 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 36 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 18 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 34 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 21 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 37 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 1, 1, 1, 0); } else { - FillBgTilemapBufferRect(3, 17 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 33 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 48 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 64 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 2 + SUB_8138538_BASE_TILE_NUM, 15, 0, 4, 2, 0); + FillBgTilemapBufferRect(3, 17 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 33 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 48 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 64 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 2 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 4, 2, 0); } break; case PSS_PAGE_SKILLS: - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 17 + SUB_8138538_BASE_TILE_NUM, 15, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 33 + SUB_8138538_BASE_TILE_NUM, 15, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 16 + SUB_8138538_BASE_TILE_NUM, 16, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 32 + SUB_8138538_BASE_TILE_NUM, 16, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 18 + SUB_8138538_BASE_TILE_NUM, 17, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 34 + SUB_8138538_BASE_TILE_NUM, 17, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 21 + SUB_8138538_BASE_TILE_NUM, 18, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 37 + SUB_8138538_BASE_TILE_NUM, 18, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 17 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 33 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 16 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 32 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 18 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 34 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 21 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 37 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 1, 1, 1, 0); break; case PSS_PAGE_MOVES: - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 15, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 15, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 16, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 16, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 17 + SUB_8138538_BASE_TILE_NUM, 17, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 33 + SUB_8138538_BASE_TILE_NUM, 17, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 48 + SUB_8138538_BASE_TILE_NUM, 18, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 64 + SUB_8138538_BASE_TILE_NUM, 18, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 17 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 33 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 48 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 64 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 1, 1, 1, 0); break; case PSS_PAGE_MOVES_INFO: if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 13, 0, 4, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 13, 1, 4, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 4, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 4, 1, 0); } else { - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 15, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 15, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 16, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 16, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 1, 1, 1, 0); } - FillBgTilemapBufferRect(3, 50 + SUB_8138538_BASE_TILE_NUM, 17, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 66 + SUB_8138538_BASE_TILE_NUM, 17, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 48 + SUB_8138538_BASE_TILE_NUM, 18, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 64 + SUB_8138538_BASE_TILE_NUM, 18, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 50 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 66 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 48 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 64 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 1, 1, 1, 0); break; } } @@ -4309,7 +4308,7 @@ static void CreateMonStatusIconObj(u16 tileTag, u16 palTag) sStatusIcon = AllocZeroed(sizeof(struct MonStatusIconObj)); gfxBufferPtr = AllocZeroed(0x20 * 32); - LZ77UnCompWram(gPokeSummary_StatusAilmentIconTiles, gfxBufferPtr); + LZ77UnCompWram(gSummaryScreen_StatusAilmentIcon_Gfx, gfxBufferPtr); if (sStatusIcon != NULL) { @@ -4319,7 +4318,7 @@ static void CreateMonStatusIconObj(u16 tileTag, u16 palTag) .tag = tileTag }; - struct SpritePalette palette = {.data = gPokeSummary_StatusAilmentIconPals, .tag = palTag}; + struct SpritePalette palette = {.data = gSummaryScreen_StatusAilmentIcon_Pal, .tag = palTag}; struct SpriteTemplate template = { .tileTag = tileTag, .paletteTag = palTag, @@ -4401,7 +4400,7 @@ static void CreateHpBarObjs(u16 tileTag, u16 palTag) sHpBarObjs = AllocZeroed(sizeof(struct HpBarObjs)); gfxBufferPtr = AllocZeroed(0x20 * 12); - LZ77UnCompWram(gPokeSummary_HpBarTiles, gfxBufferPtr); + LZ77UnCompWram(gSummaryScreen_HpBar_Gfx, gfxBufferPtr); curHp = GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_HP); maxHp = GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_MAX_HP); @@ -4559,7 +4558,7 @@ static void CreateExpBarObjs(u16 tileTag, u16 palTag) sExpBarObjs = AllocZeroed(sizeof(struct ExpBarObjs)); gfxBufferPtr = AllocZeroed(0x20 * 12); - LZ77UnCompWram(gPokeSummary_ExpBarTiles, gfxBufferPtr); + LZ77UnCompWram(gSummaryScreen_ExpBar_Gfx, gfxBufferPtr); if (gfxBufferPtr != NULL) { struct SpriteSheet sheet = { @@ -4568,7 +4567,7 @@ static void CreateExpBarObjs(u16 tileTag, u16 palTag) .tag = tileTag }; - struct SpritePalette palette = {.data = gPokeSummary_ExpBarPals, .tag = palTag}; + struct SpritePalette palette = {.data = gSummaryScreen_HpExpBar_Pal, .tag = palTag}; LoadSpriteSheet(&sheet); LoadSpritePalette(&palette); } @@ -5079,13 +5078,13 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId) if (IsMonShiny(&sMonSummaryScreen->currentMon) == TRUE && !sMonSummaryScreen->isEgg) { - LoadPalette(&gTrainerMemoPal[16 * 6], 0, 0x20); - LoadPalette(&gTrainerMemoPal[16 * 5], 0x10, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 6], 0, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 5], 0x10, 0x20); } else { - LoadPalette(&gTrainerMemoPal[16 * 0], 0, 0x20); - LoadPalette(&gTrainerMemoPal[16 * 1], 0x10, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 0], 0, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 1], 0x10, 0x20); } sMonSummaryScreen->switchMonTaskState++; @@ -5095,13 +5094,13 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId) { if (sMonSummaryScreen->isEgg) { - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Egg, 0, 0); - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageEgg_Tilemap, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); } else { - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Details, 0, 0); - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageInfo_Tilemap, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); } } sMonSummaryScreen->switchMonTaskState++; @@ -5130,7 +5129,7 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId) break; case 9: PokeSum_PrintMonTypeIcons(); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); PokeSum_PrintPageHeaderText(sMonSummaryScreen->curPageIndex); sMonSummaryScreen->switchMonTaskState++; break; diff --git a/src/union_room_chat_display.c b/src/union_room_chat_display.c index ab789ca83..6ded7d3af 100644 --- a/src/union_room_chat_display.c +++ b/src/union_room_chat_display.c @@ -119,9 +119,9 @@ static void InitScanlineEffect(void); static void FillScanlineEffectWithValue1col(s16 a0); static void FillScanlineEffectWithValue2col(s16 a0); -static const u16 sUnionRoomChatPanelBgPal_C[] = INCBIN_U16("graphics/union_room_chat/unk_845AA24.gbapal"); -static const u16 sBg1Pal8[] = INCBIN_U16("graphics/union_room_chat/unk_845AA44.gbapal"); -static const u16 sWin0PalF[] = INCBIN_U16("graphics/union_room_chat/unk_845AA64.gbapal"); +static const u16 sUnionRoomChat_TextEntry_Pal[] = INCBIN_U16("graphics/union_room_chat/text_entry.gbapal"); +static const u16 gUnionRoomChat_Unused_Pal[] = INCBIN_U16("graphics/union_room_chat/unused.gbapal"); // Loaded, but nothing uses it +static const u16 sUnionRoomChat_Messages_Pal[] = INCBIN_U16("graphics/union_room_chat/messages.gbapal"); static const struct BgTemplate sBgTemplates[] = { { @@ -1259,10 +1259,10 @@ static void ClearBg0(void) static void LoadUnionRoomChatPanelGfx(void) { - LoadPalette(gUnionRoomChatPanelBgPal_7, 0x70, 0x20); - LoadPalette(sUnionRoomChatPanelBgPal_C, 0xC0, 0x20); - DecompressAndCopyTileDataToVram(1, gUnionRoomChatPanelBgTiles, 0, 0, 0); - CopyToBgTilemapBuffer(1, gUnionRoomChatPanelBgMap, 0, 0); + LoadPalette(gUnionRoomChat_Panel_Pal, 0x70, 0x20); + LoadPalette(sUnionRoomChat_TextEntry_Pal, 0xC0, 0x20); + DecompressAndCopyTileDataToVram(1, gUnionRoomChat_Panel_Gfx, 0, 0, 0); + CopyToBgTilemapBuffer(1, gUnionRoomChat_Panel_Tilemap, 0, 0); CopyBgTilemapBufferToVram(1); } @@ -1270,21 +1270,21 @@ static void LoadLinkMiscMenuGfx(void) { u8 *ptr; - LoadPalette(gLinkMiscMenu_Pal, 0, 0x20); - ptr = DecompressAndCopyTileDataToVram(2, gLinkMiscMenu_Gfx, 0, 0, 0); - CopyToBgTilemapBuffer(2, gLinkMiscMenu_Tilemap, 0, 0); + LoadPalette(gUnionRoomChat_Bg_Pal, 0, 0x20); + ptr = DecompressAndCopyTileDataToVram(2, gUnionRoomChat_Bg_Gfx, 0, 0, 0); + CopyToBgTilemapBuffer(2, gUnionRoomChat_Bg_Tilemap, 0, 0); CopyBgTilemapBufferToVram(2); } static void LoadBg1Pal8(void) { - LoadPalette(sBg1Pal8, 0x80, 0x20); + LoadPalette(gUnionRoomChat_Unused_Pal, 0x80, 0x20); RequestDma3Fill(0, (void *)BG_CHAR_ADDR(1) + 0x20, 0x20, DMA3_32BIT); } static void LoadWin0(void) { - LoadPalette(sWin0PalF, 0xF0, 0x20); + LoadPalette(sUnionRoomChat_Messages_Pal, 0xF0, 0x20); PutWindowTilemap(0); FillWindowPixelBuffer(0, PIXEL_FILL(1)); CopyWindowToVram(0, COPYWIN_FULL); diff --git a/src/union_room_chat_objects.c b/src/union_room_chat_objects.c index 24590c67a..23837d2e3 100644 --- a/src/union_room_chat_objects.c +++ b/src/union_room_chat_objects.c @@ -4,6 +4,14 @@ #include "graphics.h" #include "union_room_chat.h" +enum { + GFXTAG_SELECTOR_CURSOR, + GFXTAG_CHAR_SELECT_CURSOR, + GFXTAG_TEXT_ENTRY_CURSOR, + GFXTAG_R_BUTTON, + GFXTAG_ICONS, +}; + struct UnionRoomChat3 { struct Sprite *selectorCursorSprite; @@ -19,18 +27,38 @@ static EWRAM_DATA struct UnionRoomChat3 *sWork = NULL; static void SpriteCB_TextEntryCursor(struct Sprite *sprite); static void SpriteCB_CharacterSelectCursor(struct Sprite *sprite); -static const u16 sUnionRoomChatInterfacePal[] = INCBIN_U16("graphics/union_room_chat/unk_845AC14.gbapal"); -static const u32 sSelectorCursorGfxTiles[] = INCBIN_U32("graphics/union_room_chat/unk_845AC34.4bpp.lz"); -static const u32 sHorizontalBarGfxTiles[] = INCBIN_U32("graphics/union_room_chat/unk_845AEB8.4bpp.lz"); -static const u32 sMenuCursorGfxTiles[] = INCBIN_U32("graphics/union_room_chat/unk_845AED8.4bpp.lz"); -static const u32 sRButtonGfxTiles[] = INCBIN_U32("graphics/union_room_chat/unk_845AF04.4bpp.lz"); +static const u16 sUnionRoomChatInterfacePal[] = INCBIN_U16("graphics/union_room_chat/objects.gbapal"); +static const u32 sSelectorCursor_Gfx[] = INCBIN_U32("graphics/union_room_chat/selector_cursor.4bpp.lz"); +static const u32 sTextEntryCursor_Gfx[] = INCBIN_U32("graphics/union_room_chat/text_entry_cursor.4bpp.lz"); +static const u32 sCharacterSelectCursor_Gfx[] = INCBIN_U32("graphics/union_room_chat/character_select_cursor.4bpp.lz"); +static const u32 sRButton_Gfx[] = INCBIN_U32("graphics/union_room_chat/r_button.4bpp.lz"); static const struct CompressedSpriteSheet sSpriteSheets[] = { - {sSelectorCursorGfxTiles, 0x1000, 0}, - {sMenuCursorGfxTiles, 0x0040, 1}, - {sHorizontalBarGfxTiles, 0x0040, 2}, - {sRButtonGfxTiles, 0x0080, 3}, - {gUnionRoomChatIcons, 0x0400, 4} + { + .data = sSelectorCursor_Gfx, + .size = 128 * TILE_SIZE_4BPP, + .tag = GFXTAG_SELECTOR_CURSOR + }, + { + .data = sCharacterSelectCursor_Gfx, + .size = 2 * TILE_SIZE_4BPP, + .tag = GFXTAG_CHAR_SELECT_CURSOR + }, + { + .data = sTextEntryCursor_Gfx, + .size = 2 * TILE_SIZE_4BPP, + .tag = GFXTAG_TEXT_ENTRY_CURSOR + }, + { + .data = sRButton_Gfx, + .size = 4 * TILE_SIZE_4BPP, + .tag = GFXTAG_R_BUTTON + }, + { + .data = gUnionRoomChat_Icons_Gfx, + .size = 32 * TILE_SIZE_4BPP, + .tag = GFXTAG_ICONS + }, }; static const struct SpritePalette sSpritePalette = { @@ -71,7 +99,7 @@ static const union AnimCmd *const sSpriteAnims_SelectorCursor[] = { }; static const struct SpriteTemplate sSpriteTemplate_SelectorCursor = { - .tileTag = 0, + .tileTag = GFXTAG_SELECTOR_CURSOR, .paletteTag = 0, .oam = &sOamData_64x32_1, .anims = sSpriteAnims_SelectorCursor, @@ -86,7 +114,7 @@ static const struct OamData sOamData_8x16_2 = { }; static const struct SpriteTemplate sSpriteTemplate_TextEntryCursor = { - .tileTag = 2, + .tileTag = GFXTAG_TEXT_ENTRY_CURSOR, .paletteTag = 0, .oam = &sOamData_8x16_2, .anims = gDummySpriteAnimTable, @@ -95,7 +123,7 @@ static const struct SpriteTemplate sSpriteTemplate_TextEntryCursor = { }; static const struct SpriteTemplate sSpriteTemplate_CharacterSelectCursor = { - .tileTag = 1, + .tileTag = GFXTAG_CHAR_SELECT_CURSOR, .paletteTag = 0, .oam = &sOamData_8x16_2, .anims = gDummySpriteAnimTable, @@ -143,7 +171,7 @@ static const union AnimCmd *const sSpriteAnimTable_UnionRoomChatIcons[] = { }; static const struct SpriteTemplate sSpriteTemplate_RButton = { - .tileTag = 3, + .tileTag = GFXTAG_R_BUTTON, .paletteTag = 0, .oam = &sOamData_16x16_2, .anims = gDummySpriteAnimTable, @@ -152,7 +180,7 @@ static const struct SpriteTemplate sSpriteTemplate_RButton = { }; static const struct SpriteTemplate sSpriteTemplate_UnionRoomChatIcons = { - .tileTag = 4, + .tileTag = GFXTAG_ICONS, .paletteTag = 0, .oam = &sOamData_32x16_2, .anims = sSpriteAnimTable_UnionRoomChatIcons,