From fa26a11ece302bc088b98f0209fcf84172f3bd26 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Fri, 15 Aug 2025 11:22:45 -0400 Subject: [PATCH] Avoid using linker-generated symbols for `bin`s and assets (#1245) Co-authored-by: Mr-Wiseguy Co-authored-by: Alex <16batesa@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .gitignore | 3 + src/audio/core/system.c | 8 +- src/menu_hud_scripts.c | 248 +++++++++++++++++++- src/os/nusys/nugfxinit.c | 6 +- ver/ique/splat.yaml | 323 +++++++++++++------------- ver/ique/symbol_addrs.txt | 10 +- ver/ique/undefined_syms.txt | 3 - ver/jp/splat.yaml | 304 ++++++++++++------------ ver/jp/symbol_addrs.txt | 6 + ver/pal/splat.yaml | 452 ++++++++++++++++++------------------ ver/pal/symbol_addrs.txt | 6 + ver/us/splat.yaml | 321 ++++++++++++------------- ver/us/symbol_addrs.txt | 6 + 13 files changed, 996 insertions(+), 700 deletions(-) diff --git a/.gitignore b/.gitignore index 1e175d209f..4173e9311e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Python __pycache__/ venv/ +.venv/ .lark_cache* .splat_cache @@ -63,3 +64,5 @@ build/ .cache/clangd/ # compile_commands.json requires hardcoded paths, so it can't be committed compile_commands.json + +/ver/*/asm/data/rsp/*.s diff --git a/src/audio/core/system.c b/src/audio/core/system.c index 8e960f1324..94a83c8526 100644 --- a/src/audio/core/system.c +++ b/src/audio/core/system.c @@ -33,8 +33,8 @@ AuSynDriver auSynDriver; u8 rspbootUcodeBuffer[0x100] ALIGNED(16); #endif -extern u64 n_aspMain_text_bin[]; -extern u64 n_aspMain_data_bin[]; +extern u64 n_aspMainTextStart[]; +extern u64 n_aspMainDataStart[]; extern u8 AuHeapBase[AUDIO_HEAP_SIZE]; @@ -72,8 +72,8 @@ void create_audio_system(void) { nuAuTasks[i].list.t.ucode_boot = (u64*) rspbootUcodeBuffer; nuAuTasks[i].list.t.ucode_boot_size = 0x100; #endif - nuAuTasks[i].list.t.ucode = n_aspMain_text_bin; - nuAuTasks[i].list.t.ucode_data = n_aspMain_data_bin; + nuAuTasks[i].list.t.ucode = n_aspMainTextStart; + nuAuTasks[i].list.t.ucode_data = n_aspMainDataStart; nuAuTasks[i].list.t.ucode_data_size = SP_UCODE_DATA_SIZE; nuAuTasks[i].list.t.dram_stack = nullptr; nuAuTasks[i].list.t.dram_stack_size = 0; diff --git a/src/menu_hud_scripts.c b/src/menu_hud_scripts.c index 2659e6a7ce..2583d1c6d2 100644 --- a/src/menu_hud_scripts.c +++ b/src/menu_hud_scripts.c @@ -1,6 +1,252 @@ -#include"common.h" +#include "common.h" #include "hud_element.h" #include "ld_addrs.h" +#include "include_asset.h" + +INCLUDE_IMG("ui/pause/unused_badge_points.png", ui_pause_unused_badge_points_png); +INCLUDE_PAL("ui/pause/unused_badge_points.pal", ui_pause_unused_badge_points_pal); +INCLUDE_PAL("ui/pause/unused_badge_points.disabled.pal", ui_pause_unused_badge_points_disabled_disabled__pal); +INCLUDE_IMG("ui/pause/unused_compass.png", ui_pause_unused_compass_png); +INCLUDE_PAL("ui/pause/unused_compass.pal", ui_pause_unused_compass_pal); +INCLUDE_PAL("ui/pause/unused_compass.disabled.pal", ui_pause_unused_compass_disabled_disabled__pal); +INCLUDE_IMG("ui/pause/cursor_hand.png", ui_pause_cursor_hand_png); +INCLUDE_PAL("ui/pause/cursor_hand.pal", ui_pause_cursor_hand_pal); +INCLUDE_IMG("ui/files/filename_caret.png", ui_files_filename_caret_png); +INCLUDE_PAL("ui/files/filename_caret.pal", ui_files_filename_caret_pal); +INCLUDE_IMG("ui/files/filename_space.png", ui_files_filename_space_png); +INCLUDE_PAL("ui/files/filename_space.pal", ui_files_filename_space_pal); + +#if !VERSION_JP +INCLUDE_IMG("ui/pause/label_stats.png", ui_pause_label_stats_png); +INCLUDE_PAL("ui/pause/label_stats.pal", ui_pause_label_stats_pal); +INCLUDE_IMG("ui/pause/label_badges.png", ui_pause_label_badges_png); +INCLUDE_PAL("ui/pause/label_badges.pal", ui_pause_label_badges_pal); +INCLUDE_IMG("ui/pause/label_items.png", ui_pause_label_items_png); +INCLUDE_PAL("ui/pause/label_items.pal", ui_pause_label_items_pal); +INCLUDE_IMG("ui/pause/label_party.png", ui_pause_label_party_png); +INCLUDE_PAL("ui/pause/label_party.pal", ui_pause_label_party_pal); +#endif + +INCLUDE_IMG("ui/pause/label_spirits.png", ui_pause_label_spirits_png); +INCLUDE_PAL("ui/pause/label_spirits.pal", ui_pause_label_spirits_pal); +INCLUDE_IMG("ui/pause/label_map.png", ui_pause_label_map_png); +INCLUDE_PAL("ui/pause/label_map.pal", ui_pause_label_map_pal); + +#if VERSION_PAL +INCLUDE_IMG("de/ui/pause/label_stats.png", de_ui_pause_label_stats_png); +INCLUDE_PAL("de/ui/pause/label_stats.pal", de_ui_pause_label_stats_pal); +INCLUDE_IMG("de/ui/pause/label_badges.png", de_ui_pause_label_badges_png); +INCLUDE_PAL("de/ui/pause/label_badges.pal", de_ui_pause_label_badges_pal); +INCLUDE_IMG("de/ui/pause/label_items.png", de_ui_pause_label_items_png); +INCLUDE_PAL("de/ui/pause/label_items.pal", de_ui_pause_label_items_pal); +INCLUDE_IMG("de/ui/pause/label_party.png", de_ui_pause_label_party_png); +INCLUDE_PAL("de/ui/pause/label_party.pal", de_ui_pause_label_party_pal); +INCLUDE_IMG("de/ui/pause/label_spirits.png", de_ui_pause_label_spirits_png); +INCLUDE_PAL("de/ui/pause/label_spirits.pal", de_ui_pause_label_spirits_pal); +INCLUDE_IMG("de/ui/pause/label_map.png", de_ui_pause_label_map_png); +INCLUDE_PAL("de/ui/pause/label_map.pal", de_ui_pause_label_map_pal); + +INCLUDE_IMG("fr/ui/pause/label_stats.png", fr_ui_pause_label_stats_png); +INCLUDE_PAL("fr/ui/pause/label_stats.pal", fr_ui_pause_label_stats_pal); +INCLUDE_IMG("fr/ui/pause/label_badges.png", fr_ui_pause_label_badges_png); +INCLUDE_PAL("fr/ui/pause/label_badges.pal", fr_ui_pause_label_badges_pal); +INCLUDE_IMG("fr/ui/pause/label_items.png", fr_ui_pause_label_items_png); +INCLUDE_PAL("fr/ui/pause/label_items.pal", fr_ui_pause_label_items_pal); +INCLUDE_IMG("fr/ui/pause/label_party.png", fr_ui_pause_label_party_png); +INCLUDE_PAL("fr/ui/pause/label_party.pal", fr_ui_pause_label_party_pal); +INCLUDE_IMG("fr/ui/pause/label_spirits.png", fr_ui_pause_label_spirits_png); +INCLUDE_PAL("fr/ui/pause/label_spirits.pal", fr_ui_pause_label_spirits_pal); +INCLUDE_IMG("fr/ui/pause/label_map.png", fr_ui_pause_label_map_png); +INCLUDE_PAL("fr/ui/pause/label_map.pal", fr_ui_pause_label_map_pal); + +INCLUDE_IMG("es/ui/pause/label_stats.png", es_ui_pause_label_stats_png); +INCLUDE_PAL("es/ui/pause/label_stats.pal", es_ui_pause_label_stats_pal); +INCLUDE_IMG("es/ui/pause/label_badges.png", es_ui_pause_label_badges_png); +INCLUDE_PAL("es/ui/pause/label_badges.pal", es_ui_pause_label_badges_pal); +INCLUDE_IMG("es/ui/pause/label_items.png", es_ui_pause_label_items_png); +INCLUDE_PAL("es/ui/pause/label_items.pal", es_ui_pause_label_items_pal); +INCLUDE_IMG("es/ui/pause/label_party.png", es_ui_pause_label_party_png); +INCLUDE_PAL("es/ui/pause/label_party.pal", es_ui_pause_label_party_pal); +INCLUDE_IMG("es/ui/pause/label_spirits.png", es_ui_pause_label_spirits_png); +INCLUDE_PAL("es/ui/pause/label_spirits.pal", es_ui_pause_label_spirits_pal); +INCLUDE_IMG("es/ui/pause/label_map.png", es_ui_pause_label_map_png); +INCLUDE_PAL("es/ui/pause/label_map.pal", es_ui_pause_label_map_pal); +#endif + +INCLUDE_IMG("ui/pause/small_digit_0.png", ui_pause_small_digit_0_png); +INCLUDE_PAL("ui/pause/small_digit_0.pal", ui_pause_small_digit_0_pal); +INCLUDE_IMG("ui/pause/small_digit_1.png", ui_pause_small_digit_1_png); +INCLUDE_PAL("ui/pause/small_digit_1.pal", ui_pause_small_digit_1_pal); +INCLUDE_IMG("ui/pause/small_digit_2.png", ui_pause_small_digit_2_png); +INCLUDE_PAL("ui/pause/small_digit_2.pal", ui_pause_small_digit_2_pal); +INCLUDE_IMG("ui/pause/small_digit_3.png", ui_pause_small_digit_3_png); +INCLUDE_PAL("ui/pause/small_digit_3.pal", ui_pause_small_digit_3_pal); +INCLUDE_IMG("ui/pause/small_digit_4.png", ui_pause_small_digit_4_png); +INCLUDE_PAL("ui/pause/small_digit_4.pal", ui_pause_small_digit_4_pal); +INCLUDE_IMG("ui/pause/small_digit_5.png", ui_pause_small_digit_5_png); +INCLUDE_PAL("ui/pause/small_digit_5.pal", ui_pause_small_digit_5_pal); +INCLUDE_IMG("ui/pause/small_digit_6.png", ui_pause_small_digit_6_png); +INCLUDE_PAL("ui/pause/small_digit_6.pal", ui_pause_small_digit_6_pal); +INCLUDE_IMG("ui/pause/small_digit_7.png", ui_pause_small_digit_7_png); +INCLUDE_PAL("ui/pause/small_digit_7.pal", ui_pause_small_digit_7_pal); +INCLUDE_IMG("ui/pause/small_digit_8.png", ui_pause_small_digit_8_png); +INCLUDE_PAL("ui/pause/small_digit_8.pal", ui_pause_small_digit_8_pal); +INCLUDE_IMG("ui/pause/small_digit_9.png", ui_pause_small_digit_9_png); +INCLUDE_PAL("ui/pause/small_digit_9.pal", ui_pause_small_digit_9_pal); +INCLUDE_IMG("ui/pause/small_text_bp.png", ui_pause_small_text_bp_png); +INCLUDE_PAL("ui/pause/small_text_bp.pal", ui_pause_small_text_bp_pal); +INCLUDE_IMG("ui/pause/label_jp_file.png", ui_pause_label_jp_file_png); +INCLUDE_PAL("ui/pause/label_jp_file.pal", ui_pause_label_jp_file_pal); +INCLUDE_IMG("ui/pause/label_jp_file_disabled.png", ui_pause_label_jp_file_disabled_png); +INCLUDE_PAL("ui/pause/label_jp_file_disabled.pal", ui_pause_label_jp_file_disabled_pal); + +// English +INCLUDE_IMG("ui/files/option_mono_on.png", ui_files_option_mono_on_png); +INCLUDE_PAL("ui/files/option_mono_on.pal", ui_files_option_mono_on_pal); +INCLUDE_IMG("ui/files/option_mono_off.png", ui_files_option_mono_off_png); +INCLUDE_PAL("ui/files/option_mono_off.pal", ui_files_option_mono_off_pal); +INCLUDE_IMG("ui/files/option_stereo_on.png", ui_files_option_stereo_on_png); +INCLUDE_PAL("ui/files/option_stereo_on.pal", ui_files_option_stereo_on_pal); +INCLUDE_IMG("ui/files/option_stereo_off.png", ui_files_option_stereo_off_png); +INCLUDE_PAL("ui/files/option_stereo_off.pal", ui_files_option_stereo_off_pal); + +#if VERSION_PAL +// German +INCLUDE_IMG("de/ui/files/option_mono_on.png", de_ui_files_option_mono_on_png); +INCLUDE_PAL("de/ui/files/option_mono_on.pal", de_ui_files_option_mono_on_pal); +INCLUDE_IMG("de/ui/files/option_mono_off.png", de_ui_files_option_mono_off_png); +INCLUDE_PAL("de/ui/files/option_mono_off.pal", de_ui_files_option_mono_off_pal); +INCLUDE_IMG("de/ui/files/option_stereo_on.png", de_ui_files_option_stereo_on_png); +INCLUDE_PAL("de/ui/files/option_stereo_on.pal", de_ui_files_option_stereo_on_pal); +INCLUDE_IMG("de/ui/files/option_stereo_off.png", de_ui_files_option_stereo_off_png); +INCLUDE_PAL("de/ui/files/option_stereo_off.pal", de_ui_files_option_stereo_off_pal); + +// French +INCLUDE_IMG("fr/ui/files/option_mono_on.png", fr_ui_files_option_mono_on_png); +INCLUDE_PAL("fr/ui/files/option_mono_on.pal", fr_ui_files_option_mono_on_pal); +INCLUDE_IMG("fr/ui/files/option_mono_off.png", fr_ui_files_option_mono_off_png); +INCLUDE_PAL("fr/ui/files/option_mono_off.pal", fr_ui_files_option_mono_off_pal); +INCLUDE_IMG("fr/ui/files/option_stereo_on.png", fr_ui_files_option_stereo_on_png); +INCLUDE_PAL("fr/ui/files/option_stereo_on.pal", fr_ui_files_option_stereo_on_pal); +INCLUDE_IMG("fr/ui/files/option_stereo_off.png", fr_ui_files_option_stereo_off_png); +INCLUDE_PAL("fr/ui/files/option_stereo_off.pal", fr_ui_files_option_stereo_off_pal); + +// Spanish +INCLUDE_IMG("es/ui/files/option_mono_on.png", es_ui_files_option_mono_on_png); +INCLUDE_PAL("es/ui/files/option_mono_on.pal", es_ui_files_option_mono_on_pal); +INCLUDE_IMG("es/ui/files/option_mono_off.png", es_ui_files_option_mono_off_png); +INCLUDE_PAL("es/ui/files/option_mono_off.pal", es_ui_files_option_mono_off_pal); +INCLUDE_IMG("es/ui/files/option_stereo_on.png", es_ui_files_option_stereo_on_png); +INCLUDE_PAL("es/ui/files/option_stereo_on.pal", es_ui_files_option_stereo_on_pal); +INCLUDE_IMG("es/ui/files/option_stereo_off.png", es_ui_files_option_stereo_off_png); +INCLUDE_PAL("es/ui/files/option_stereo_off.pal", es_ui_files_option_stereo_off_pal); +#endif + +INCLUDE_IMG("ui/files/eldstar.png", ui_files_eldstar_png); +INCLUDE_PAL("ui/files/eldstar.pal", ui_files_eldstar_pal); +INCLUDE_IMG("ui/files/eldstar_silhouette.png", ui_files_eldstar_silhouette_png); +INCLUDE_PAL("ui/files/eldstar_silhouette.pal", ui_files_eldstar_silhouette_pal); +INCLUDE_IMG("ui/files/mamar.png", ui_files_mamar_png); +INCLUDE_PAL("ui/files/mamar.pal", ui_files_mamar_pal); +INCLUDE_IMG("ui/files/mamar_silhouette.png", ui_files_mamar_silhouette_png); +INCLUDE_PAL("ui/files/mamar_silhouette.pal", ui_files_mamar_silhouette_pal); +INCLUDE_IMG("ui/files/skolar.png", ui_files_skolar_png); +INCLUDE_PAL("ui/files/skolar.pal", ui_files_skolar_pal); +INCLUDE_IMG("ui/files/skolar_silhouette.png", ui_files_skolar_silhouette_png); +INCLUDE_PAL("ui/files/skolar_silhouette.pal", ui_files_skolar_silhouette_pal); +INCLUDE_IMG("ui/files/muskular.png", ui_files_muskular_png); +INCLUDE_PAL("ui/files/muskular.pal", ui_files_muskular_pal); +INCLUDE_IMG("ui/files/muskular_silhouette.png", ui_files_muskular_silhouette_png); +INCLUDE_PAL("ui/files/muskular_silhouette.pal", ui_files_muskular_silhouette_pal); +INCLUDE_IMG("ui/files/misstar.png", ui_files_misstar_png); +INCLUDE_PAL("ui/files/misstar.pal", ui_files_misstar_pal); +INCLUDE_IMG("ui/files/misstar_silhouette.png", ui_files_misstar_silhouette_png); +INCLUDE_PAL("ui/files/misstar_silhouette.pal", ui_files_misstar_silhouette_pal); +INCLUDE_IMG("ui/files/klevar.png", ui_files_klevar_png); +INCLUDE_PAL("ui/files/klevar.pal", ui_files_klevar_pal); +INCLUDE_IMG("ui/files/klevar_silhouette.png", ui_files_klevar_silhouette_png); +INCLUDE_PAL("ui/files/klevar_silhouette.pal", ui_files_klevar_silhouette_pal); +INCLUDE_IMG("ui/files/kalmar.png", ui_files_kalmar_png); +INCLUDE_PAL("ui/files/kalmar.pal", ui_files_kalmar_pal); +INCLUDE_IMG("ui/files/kalmar_silhouette.png", ui_files_kalmar_silhouette_png); +INCLUDE_PAL("ui/files/kalmar_silhouette.pal", ui_files_kalmar_silhouette_pal); +INCLUDE_IMG("ui/pause/map_walk0.png", ui_pause_map_walk0_png); +INCLUDE_PAL("ui/pause/map_walk0.pal", ui_pause_map_walk0_pal); +INCLUDE_IMG("ui/pause/map_walk1.png", ui_pause_map_walk1_png); +INCLUDE_PAL("ui/pause/map_walk1.pal", ui_pause_map_walk1_pal); +INCLUDE_IMG("ui/pause/map_walk2.png", ui_pause_map_walk2_png); +INCLUDE_PAL("ui/pause/map_walk2.pal", ui_pause_map_walk2_pal); +INCLUDE_IMG("ui/pause/jp_super.png", ui_pause_jp_super_png); +INCLUDE_PAL("ui/pause/jp_super.pal", ui_pause_jp_super_pal); +INCLUDE_IMG("ui/pause/jp_ultra.png", ui_pause_jp_ultra_png); +INCLUDE_PAL("ui/pause/jp_ultra.pal", ui_pause_jp_ultra_pal); +INCLUDE_IMG("ui/pause/list_prev_page.png", ui_pause_list_prev_page_png); +INCLUDE_PAL("ui/pause/list_prev_page.pal", ui_pause_list_prev_page_pal); +INCLUDE_IMG("ui/pause/list_next_page.png", ui_pause_list_next_page_png); +INCLUDE_PAL("ui/pause/list_next_page.pal", ui_pause_list_next_page_pal); +INCLUDE_IMG("ui/pause/unused_z_up_arrow.png", ui_pause_unused_z_up_arrow_png); +INCLUDE_PAL("ui/pause/unused_z_up_arrow.pal", ui_pause_unused_z_up_arrow_pal); +INCLUDE_IMG("ui/pause/unused_r_down_arrow.png", ui_pause_unused_r_down_arrow_png); +INCLUDE_PAL("ui/pause/unused_r_down_arrow.pal", ui_pause_unused_r_down_arrow_pal); +INCLUDE_IMG("ui/pause/desc_msg_prev.png", ui_pause_desc_msg_prev_png); +INCLUDE_PAL("ui/pause/desc_msg_prev.pal", ui_pause_desc_msg_prev_pal); +INCLUDE_IMG("ui/pause/desc_msg_next.png", ui_pause_desc_msg_next_png); +INCLUDE_PAL("ui/pause/desc_msg_next.pal", ui_pause_desc_msg_next_pal); + +INCLUDE_IMG("ui/pause/bp_needed.png", ui_pause_bp_needed_png); +INCLUDE_PAL("ui/pause/bp_needed.pal", ui_pause_bp_needed_pal); + +#if VERSION_PAL +INCLUDE_IMG("de/ui/pause/bp_needed.png", de_ui_pause_bp_needed_png); +INCLUDE_PAL("de/ui/pause/bp_needed.pal", de_ui_pause_bp_needed_pal); + +INCLUDE_IMG("fr/ui/pause/bp_needed.png", fr_ui_pause_bp_needed_png); +INCLUDE_PAL("fr/ui/pause/bp_needed.pal", fr_ui_pause_bp_needed_pal); + +INCLUDE_IMG("es/ui/pause/bp_needed.png", es_ui_pause_bp_needed_png); +INCLUDE_PAL("es/ui/pause/bp_needed.pal", es_ui_pause_bp_needed_pal); +#endif + +INCLUDE_IMG("ui/pause/mario_large.png", ui_pause_mario_large_png); +INCLUDE_PAL("ui/pause/mario_large.pal", ui_pause_mario_large_pal); +INCLUDE_IMG("ui/pause/dash.png", ui_pause_dash_png); +INCLUDE_PAL("ui/pause/dash.pal", ui_pause_dash_pal); +INCLUDE_IMG("ui/pause/stat_bp.png", ui_pause_stat_bp_png); +INCLUDE_PAL("ui/pause/stat_bp.pal", ui_pause_stat_bp_pal); +INCLUDE_IMG("ui/pause/stat_mario.png", ui_pause_stat_mario_png); +INCLUDE_PAL("ui/pause/stat_mario.pal", ui_pause_stat_mario_pal); +INCLUDE_IMG("ui/pause/stat_time.png", ui_pause_stat_time_png); +INCLUDE_PAL("ui/pause/stat_time.pal", ui_pause_stat_time_pal); +INCLUDE_IMG("ui/pause/stat_star_piece0.png", ui_pause_stat_star_piece0_png); +INCLUDE_PAL("ui/pause/stat_star_piece0.pal", ui_pause_stat_star_piece0_pal); +INCLUDE_IMG("ui/pause/stat_star_piece1.png", ui_pause_stat_star_piece1_png); +INCLUDE_PAL("ui/pause/stat_star_piece1.pal", ui_pause_stat_star_piece1_pal); +INCLUDE_IMG("ui/pause/stat_star_piece2.png", ui_pause_stat_star_piece2_png); +INCLUDE_PAL("ui/pause/stat_star_piece2.pal", ui_pause_stat_star_piece2_pal); +INCLUDE_IMG("ui/pause/stat_fp.png", ui_pause_stat_fp_png); +INCLUDE_PAL("ui/pause/stat_fp.pal", ui_pause_stat_fp_pal); +INCLUDE_IMG("ui/pause/stat_times.png", ui_pause_stat_times_png); +INCLUDE_PAL("ui/pause/stat_times.pal", ui_pause_stat_times_pal); +INCLUDE_IMG("ui/pause/stat_boots0.png", ui_pause_stat_boots0_png); +INCLUDE_PAL("ui/pause/stat_boots0.pal", ui_pause_stat_boots0_pal); +INCLUDE_IMG("ui/pause/stat_boots1.png", ui_pause_stat_boots1_png); +INCLUDE_PAL("ui/pause/stat_boots1.pal", ui_pause_stat_boots1_pal); +INCLUDE_IMG("ui/pause/stat_boots2.png", ui_pause_stat_boots2_png); +INCLUDE_PAL("ui/pause/stat_boots2.pal", ui_pause_stat_boots2_pal); +INCLUDE_IMG("ui/pause/stat_boots3.png", ui_pause_stat_boots3_png); +INCLUDE_PAL("ui/pause/stat_boots3.pal", ui_pause_stat_boots3_pal); +INCLUDE_IMG("ui/pause/stat_hammer0.png", ui_pause_stat_hammer0_png); +INCLUDE_PAL("ui/pause/stat_hammer0.pal", ui_pause_stat_hammer0_pal); +INCLUDE_IMG("ui/pause/stat_hammer1.png", ui_pause_stat_hammer1_png); +INCLUDE_PAL("ui/pause/stat_hammer1.pal", ui_pause_stat_hammer1_pal); +INCLUDE_IMG("ui/pause/stat_hammer2.png", ui_pause_stat_hammer2_png); +INCLUDE_PAL("ui/pause/stat_hammer2.pal", ui_pause_stat_hammer2_pal); +INCLUDE_IMG("ui/pause/stat_hammer3.png", ui_pause_stat_hammer3_png); +INCLUDE_PAL("ui/pause/stat_hammer3.pal", ui_pause_stat_hammer3_pal); +INCLUDE_IMG("ui/pause/partner_rank.png", ui_pause_partner_rank_png); +INCLUDE_PAL("ui/pause/partner_rank.pal", ui_pause_partner_rank_pal); +INCLUDE_IMG("ui/pause/unused_bubble.png", ui_pause_unused_bubble_png); +INCLUDE_PAL("ui/pause/unused_bubble.pal", ui_pause_unused_bubble_pal); HudScript HES_UnusedBadge = HES_TEMPLATE_CI_ENUM_SIZE(ui_pause_unused_badge_points, 24, 24); diff --git a/src/os/nusys/nugfxinit.c b/src/os/nusys/nugfxinit.c index 97906abee1..34020f1c35 100644 --- a/src/os/nusys/nugfxinit.c +++ b/src/os/nusys/nugfxinit.c @@ -1,11 +1,11 @@ #include "common.h" #include "nu/nusys.h" -extern u64 gspF3DEX2kawase_fifo_text_bin[]; -extern u64 gspF3DEX2kawase_fifo_data_bin[]; +extern u64 gspF3DZEX2_NoN_PosLight_fifoTextStart[]; +extern u64 gspF3DZEX2_NoN_PosLight_fifoDataStart[]; NUUcode nugfx_ucode = { - gspF3DEX2kawase_fifo_text_bin, gspF3DEX2kawase_fifo_data_bin, + gspF3DZEX2_NoN_PosLight_fifoTextStart, gspF3DZEX2_NoN_PosLight_fifoDataStart, }; extern u16 gFrameBuf0[]; diff --git a/ver/ique/splat.yaml b/ver/ique/splat.yaml index 27943c0084..1c98a51347 100644 --- a/ver/ique/splat.yaml +++ b/ver/ique/splat.yaml @@ -15,7 +15,7 @@ options: symbol_addrs_path: ver/ique/symbol_addrs.txt ld_script_path: ver/ique/papermario.ld ld_symbol_header_path: ver/ique/build/include/ld_addrs.h - ld_generate_symbol_per_data_segment: True + ld_generate_symbol_per_data_segment: False src_path: src asm_path: ver/ique/asm asset_path: assets/ique @@ -299,8 +299,8 @@ segments: - [auto, c, bss/main_post_bss] - [auto, c, battle/battle] - [auto, c, battle/battle_bss] - - [0x4D140, bin, rspboot] - - [0x4D210, bin, n_aspMain_text] + - [0x4D140, textbin, rsp/rspboot] + - [0x4D210, textbin, rsp/n_aspMain] - start: 0x4DE70 type: .data name: main_pre @@ -328,9 +328,9 @@ segments: - [0x4FED0] - [0x501B0, ia8, ui/no_controller, 128, 32] - [0x511B0] - - [0x700B0, bin, gspF3DEX2kawase_fifo_text] - - [0x716E0, bin, gspF3DEX2kawase_fifo_data] - - [0x71B00, bin, n_aspMain_data] + - { start: 0x700B0, type: textbin, name: rsp/gspF3DEX2_PosLight_fifo, linker_section_order: .data } + - [0x716E0, databin, rsp/gspF3DEX2_PosLight_fifo] + - [0x71B00, databin, rsp/n_aspMain] - [0x71DB0] - name: engine1 @@ -1015,157 +1015,166 @@ segments: start: 0x179FC0 vram: 0x8023E000 subsegments: - - [auto, ci4, ui/pause/unused_badge_points, 24, 24] - - [auto, palette, ui/pause/unused_badge_points] - - [auto, palette, ui/pause/unused_badge_points.disabled] - - [auto, ci4, ui/pause/unused_compass, 24, 24] - - [auto, palette, ui/pause/unused_compass] - - [auto, palette, ui/pause/unused_compass.disabled] - - [auto, ci4, ui/pause/cursor_hand, 16, 16] - - [auto, palette, ui/pause/cursor_hand] - - [auto, ci4, ui/files/filename_caret, 16, 16] - - [auto, palette, ui/files/filename_caret] - - [auto, ci4, ui/files/filename_space, 8, 8] - - [auto, palette, ui/files/filename_space] - - [auto, ci4, ui/pause/label_stats, 48, 16] - - [auto, palette, ui/pause/label_stats] - - [auto, ci4, ui/pause/label_badges, 48, 16] - - [auto, palette, ui/pause/label_badges] - - [auto, ci4, ui/pause/label_items, 48, 16] - - [auto, palette, ui/pause/label_items] - - [auto, ci4, ui/pause/label_party, 48, 16] - - [auto, palette, ui/pause/label_party] - - [auto, ci4, ui/pause/label_spirits, 48, 16] - - [auto, palette, ui/pause/label_spirits] - - [auto, ci4, ui/pause/label_map, 48, 16] - - [auto, palette, ui/pause/label_map] - - [auto, ci4, ui/pause/small_digit_0, 8, 8] - - [auto, palette, ui/pause/small_digit_0] - - [auto, ci4, ui/pause/small_digit_1, 8, 8] - - [auto, palette, ui/pause/small_digit_1] - - [auto, ci4, ui/pause/small_digit_2, 8, 8] - - [auto, palette, ui/pause/small_digit_2] - - [auto, ci4, ui/pause/small_digit_3, 8, 8] - - [auto, palette, ui/pause/small_digit_3] - - [auto, ci4, ui/pause/small_digit_4, 8, 8] - - [auto, palette, ui/pause/small_digit_4] - - [auto, ci4, ui/pause/small_digit_5, 8, 8] - - [auto, palette, ui/pause/small_digit_5] - - [auto, ci4, ui/pause/small_digit_6, 8, 8] - - [auto, palette, ui/pause/small_digit_6] - - [auto, ci4, ui/pause/small_digit_7, 8, 8] - - [auto, palette, ui/pause/small_digit_7] - - [auto, ci4, ui/pause/small_digit_8, 8, 8] - - [auto, palette, ui/pause/small_digit_8] - - [auto, ci4, ui/pause/small_digit_9, 8, 8] - - [auto, palette, ui/pause/small_digit_9] - - [auto, ci4, ui/pause/small_text_bp, 8, 8] - - [auto, palette, ui/pause/small_text_bp] - - [auto, ci4, ui/pause/label_jp_file, 32, 16] - - [auto, palette, ui/pause/label_jp_file] - - [auto, ci4, ui/pause/label_jp_file_disabled, 32, 16] - - [auto, palette, ui/pause/label_jp_file_disabled] - - [auto, ci4, ui/files/option_mono_on, 64, 16] - - [auto, palette, ui/files/option_mono_on] - - [auto, ci4, ui/files/option_mono_off, 64, 16] - - [auto, palette, ui/files/option_mono_off] - - [auto, ci4, ui/files/option_stereo_on, 64, 16] - - [auto, palette, ui/files/option_stereo_on] - - [auto, ci4, ui/files/option_stereo_off, 64, 16] - - [auto, palette, ui/files/option_stereo_off] - - [auto, ci4, ui/files/eldstar, 16, 16] - - [auto, palette, ui/files/eldstar] - - [auto, ci4, ui/files/eldstar_silhouette, 16, 16] - - [auto, palette, ui/files/eldstar_silhouette] - - [auto, ci4, ui/files/mamar, 16, 16] - - [auto, palette, ui/files/mamar] - - [auto, ci4, ui/files/mamar_silhouette, 16, 16] - - [auto, palette, ui/files/mamar_silhouette] - - [auto, ci4, ui/files/skolar, 16, 16] - - [auto, palette, ui/files/skolar] - - [auto, ci4, ui/files/skolar_silhouette, 16, 16] - - [auto, palette, ui/files/skolar_silhouette] - - [auto, ci4, ui/files/muskular, 16, 16] - - [auto, palette, ui/files/muskular] - - [auto, ci4, ui/files/muskular_silhouette, 16, 16] - - [auto, palette, ui/files/muskular_silhouette] - - [auto, ci4, ui/files/misstar, 16, 16] - - [auto, palette, ui/files/misstar] - - [auto, ci4, ui/files/misstar_silhouette, 16, 16] - - [auto, palette, ui/files/misstar_silhouette] - - [auto, ci4, ui/files/klevar, 16, 16] - - [auto, palette, ui/files/klevar] - - [auto, ci4, ui/files/klevar_silhouette, 16, 16] - - [auto, palette, ui/files/klevar_silhouette] - - [auto, ci4, ui/files/kalmar, 16, 16] - - [auto, palette, ui/files/kalmar] - - [auto, ci4, ui/files/kalmar_silhouette, 16, 16] - - [auto, palette, ui/files/kalmar_silhouette] - - [auto, ci4, ui/pause/map_walk0, 24, 24] - - [auto, palette, ui/pause/map_walk0] - - [auto, ci4, ui/pause/map_walk1, 24, 24] - - [auto, palette, ui/pause/map_walk1] - - [auto, ci4, ui/pause/map_walk2, 24, 24] - - [auto, palette, ui/pause/map_walk2] - - [auto, ci4, ui/pause/jp_super, 40, 16] - - [auto, palette, ui/pause/jp_super] - - [auto, ci4, ui/pause/jp_ultra, 40, 16] - - [auto, palette, ui/pause/jp_ultra] - - [auto, ci4, ui/pause/list_prev_page, 16, 16] - - [auto, palette, ui/pause/list_prev_page] - - [auto, ci4, ui/pause/list_next_page, 16, 16] - - [auto, palette, ui/pause/list_next_page] - - [auto, ci4, ui/pause/unused_z_up_arrow, 16, 16] - - [auto, palette, ui/pause/unused_z_up_arrow] - - [auto, ci4, ui/pause/unused_r_down_arrow, 16, 16] - - [auto, palette, ui/pause/unused_r_down_arrow] - - [auto, ci4, ui/pause/desc_msg_prev, 16, 16] - - [auto, palette, ui/pause/desc_msg_prev] - - [auto, ci4, ui/pause/desc_msg_next, 16, 16] - - [auto, palette, ui/pause/desc_msg_next] - - [auto, ci4, ui/pause/bp_needed, 48, 8] - - [auto, palette, ui/pause/bp_needed] - - [auto, ci4, ui/pause/mario_large, 32, 32] - - [auto, palette, ui/pause/mario_large] - - [auto, ci4, ui/pause/dash, 16, 8] - - [auto, palette, ui/pause/dash] - - [auto, ci4, ui/pause/stat_bp, 16, 16] - - [auto, palette, ui/pause/stat_bp] - - [auto, ci4, ui/pause/stat_mario, 16, 16] - - [auto, palette, ui/pause/stat_mario] - - [auto, ci4, ui/pause/stat_time, 16, 16] - - [auto, palette, ui/pause/stat_time] - - [auto, ci4, ui/pause/stat_star_piece0, 16, 16] - - [auto, palette, ui/pause/stat_star_piece0] - - [auto, ci4, ui/pause/stat_star_piece1, 16, 16] - - [auto, palette, ui/pause/stat_star_piece1] - - [auto, ci4, ui/pause/stat_star_piece2, 16, 16] - - [auto, palette, ui/pause/stat_star_piece2] - - [auto, ci4, ui/pause/stat_fp, 16, 16] - - [auto, palette, ui/pause/stat_fp] - - [auto, ci4, ui/pause/stat_times, 8, 8] - - [auto, palette, ui/pause/stat_times] - - [auto, ci4, ui/pause/stat_boots0, 16, 16] - - [auto, palette, ui/pause/stat_boots0] - - [auto, ci4, ui/pause/stat_boots1, 16, 16] - - [auto, palette, ui/pause/stat_boots1] - - [auto, ci4, ui/pause/stat_boots2, 16, 16] - - [auto, palette, ui/pause/stat_boots2] - - [auto, ci4, ui/pause/stat_boots3, 16, 16] - - [auto, palette, ui/pause/stat_boots3] - - [auto, ci4, ui/pause/stat_hammer0, 16, 16] - - [auto, palette, ui/pause/stat_hammer0] - - [auto, ci4, ui/pause/stat_hammer1, 16, 16] - - [auto, palette, ui/pause/stat_hammer1] - - [auto, ci4, ui/pause/stat_hammer2, 16, 16] - - [auto, palette, ui/pause/stat_hammer2] - - [auto, ci4, ui/pause/stat_hammer3, 16, 16] - - [auto, palette, ui/pause/stat_hammer3] - - [auto, ci4, ui/pause/partner_rank, 16, 16] - - [auto, palette, ui/pause/partner_rank] - - [auto, ci4, ui/pause/unused_bubble, 56, 16] - - [auto, palette, ui/pause/unused_bubble] - - [auto, .data, menu_hud_scripts] + - type: .data + name: menu_hud_scripts + subsegments: + - [auto, ci4, ui/pause/unused_badge_points, 24, 24] + - [auto, palette, ui/pause/unused_badge_points] + - [auto, palette, ui/pause/unused_badge_points.disabled] + - [auto, ci4, ui/pause/unused_compass, 24, 24] + - [auto, palette, ui/pause/unused_compass] + - [auto, palette, ui/pause/unused_compass.disabled] + - [auto, ci4, ui/pause/cursor_hand, 16, 16] + - [auto, palette, ui/pause/cursor_hand] + - [auto, ci4, ui/files/filename_caret, 16, 16] + - [auto, palette, ui/files/filename_caret] + - [auto, ci4, ui/files/filename_space, 8, 8] + - [auto, palette, ui/files/filename_space] + + - [auto, ci4, ui/pause/label_stats, 48, 16] + - [auto, palette, ui/pause/label_stats] + - [auto, ci4, ui/pause/label_badges, 48, 16] + - [auto, palette, ui/pause/label_badges] + - [auto, ci4, ui/pause/label_items, 48, 16] + - [auto, palette, ui/pause/label_items] + - [auto, ci4, ui/pause/label_party, 48, 16] + - [auto, palette, ui/pause/label_party] + + - [auto, ci4, ui/pause/label_spirits, 48, 16] + - [auto, palette, ui/pause/label_spirits] + - [auto, ci4, ui/pause/label_map, 48, 16] + - [auto, palette, ui/pause/label_map] + + - [auto, ci4, ui/pause/small_digit_0, 8, 8] + - [auto, palette, ui/pause/small_digit_0] + - [auto, ci4, ui/pause/small_digit_1, 8, 8] + - [auto, palette, ui/pause/small_digit_1] + - [auto, ci4, ui/pause/small_digit_2, 8, 8] + - [auto, palette, ui/pause/small_digit_2] + - [auto, ci4, ui/pause/small_digit_3, 8, 8] + - [auto, palette, ui/pause/small_digit_3] + - [auto, ci4, ui/pause/small_digit_4, 8, 8] + - [auto, palette, ui/pause/small_digit_4] + - [auto, ci4, ui/pause/small_digit_5, 8, 8] + - [auto, palette, ui/pause/small_digit_5] + - [auto, ci4, ui/pause/small_digit_6, 8, 8] + - [auto, palette, ui/pause/small_digit_6] + - [auto, ci4, ui/pause/small_digit_7, 8, 8] + - [auto, palette, ui/pause/small_digit_7] + - [auto, ci4, ui/pause/small_digit_8, 8, 8] + - [auto, palette, ui/pause/small_digit_8] + - [auto, ci4, ui/pause/small_digit_9, 8, 8] + - [auto, palette, ui/pause/small_digit_9] + - [auto, ci4, ui/pause/small_text_bp, 8, 8] + - [auto, palette, ui/pause/small_text_bp] + - [auto, ci4, ui/pause/label_jp_file, 32, 16] + - [auto, palette, ui/pause/label_jp_file] + - [auto, ci4, ui/pause/label_jp_file_disabled, 32, 16] + - [auto, palette, ui/pause/label_jp_file_disabled] + + - [auto, ci4, ui/files/option_mono_on, 64, 16] + - [auto, palette, ui/files/option_mono_on] + - [auto, ci4, ui/files/option_mono_off, 64, 16] + - [auto, palette, ui/files/option_mono_off] + - [auto, ci4, ui/files/option_stereo_on, 64, 16] + - [auto, palette, ui/files/option_stereo_on] + - [auto, ci4, ui/files/option_stereo_off, 64, 16] + - [auto, palette, ui/files/option_stereo_off] + + - [auto, ci4, ui/files/eldstar, 16, 16] + - [auto, palette, ui/files/eldstar] + - [auto, ci4, ui/files/eldstar_silhouette, 16, 16] + - [auto, palette, ui/files/eldstar_silhouette] + - [auto, ci4, ui/files/mamar, 16, 16] + - [auto, palette, ui/files/mamar] + - [auto, ci4, ui/files/mamar_silhouette, 16, 16] + - [auto, palette, ui/files/mamar_silhouette] + - [auto, ci4, ui/files/skolar, 16, 16] + - [auto, palette, ui/files/skolar] + - [auto, ci4, ui/files/skolar_silhouette, 16, 16] + - [auto, palette, ui/files/skolar_silhouette] + - [auto, ci4, ui/files/muskular, 16, 16] + - [auto, palette, ui/files/muskular] + - [auto, ci4, ui/files/muskular_silhouette, 16, 16] + - [auto, palette, ui/files/muskular_silhouette] + - [auto, ci4, ui/files/misstar, 16, 16] + - [auto, palette, ui/files/misstar] + - [auto, ci4, ui/files/misstar_silhouette, 16, 16] + - [auto, palette, ui/files/misstar_silhouette] + - [auto, ci4, ui/files/klevar, 16, 16] + - [auto, palette, ui/files/klevar] + - [auto, ci4, ui/files/klevar_silhouette, 16, 16] + - [auto, palette, ui/files/klevar_silhouette] + - [auto, ci4, ui/files/kalmar, 16, 16] + - [auto, palette, ui/files/kalmar] + - [auto, ci4, ui/files/kalmar_silhouette, 16, 16] + - [auto, palette, ui/files/kalmar_silhouette] + - [auto, ci4, ui/pause/map_walk0, 24, 24] + - [auto, palette, ui/pause/map_walk0] + - [auto, ci4, ui/pause/map_walk1, 24, 24] + - [auto, palette, ui/pause/map_walk1] + - [auto, ci4, ui/pause/map_walk2, 24, 24] + - [auto, palette, ui/pause/map_walk2] + - [auto, ci4, ui/pause/jp_super, 40, 16] + - [auto, palette, ui/pause/jp_super] + - [auto, ci4, ui/pause/jp_ultra, 40, 16] + - [auto, palette, ui/pause/jp_ultra] + - [auto, ci4, ui/pause/list_prev_page, 16, 16] + - [auto, palette, ui/pause/list_prev_page] + - [auto, ci4, ui/pause/list_next_page, 16, 16] + - [auto, palette, ui/pause/list_next_page] + - [auto, ci4, ui/pause/unused_z_up_arrow, 16, 16] + - [auto, palette, ui/pause/unused_z_up_arrow] + - [auto, ci4, ui/pause/unused_r_down_arrow, 16, 16] + - [auto, palette, ui/pause/unused_r_down_arrow] + - [auto, ci4, ui/pause/desc_msg_prev, 16, 16] + - [auto, palette, ui/pause/desc_msg_prev] + - [auto, ci4, ui/pause/desc_msg_next, 16, 16] + - [auto, palette, ui/pause/desc_msg_next] + + - [auto, ci4, ui/pause/bp_needed, 48, 8] + - [auto, palette, ui/pause/bp_needed] + + - [auto, ci4, ui/pause/mario_large, 32, 32] + - [auto, palette, ui/pause/mario_large] + - [auto, ci4, ui/pause/dash, 16, 8] + - [auto, palette, ui/pause/dash] + - [auto, ci4, ui/pause/stat_bp, 16, 16] + - [auto, palette, ui/pause/stat_bp] + - [auto, ci4, ui/pause/stat_mario, 16, 16] + - [auto, palette, ui/pause/stat_mario] + - [auto, ci4, ui/pause/stat_time, 16, 16] + - [auto, palette, ui/pause/stat_time] + - [auto, ci4, ui/pause/stat_star_piece0, 16, 16] + - [auto, palette, ui/pause/stat_star_piece0] + - [auto, ci4, ui/pause/stat_star_piece1, 16, 16] + - [auto, palette, ui/pause/stat_star_piece1] + - [auto, ci4, ui/pause/stat_star_piece2, 16, 16] + - [auto, palette, ui/pause/stat_star_piece2] + - [auto, ci4, ui/pause/stat_fp, 16, 16] + - [auto, palette, ui/pause/stat_fp] + - [auto, ci4, ui/pause/stat_times, 8, 8] + - [auto, palette, ui/pause/stat_times] + - [auto, ci4, ui/pause/stat_boots0, 16, 16] + - [auto, palette, ui/pause/stat_boots0] + - [auto, ci4, ui/pause/stat_boots1, 16, 16] + - [auto, palette, ui/pause/stat_boots1] + - [auto, ci4, ui/pause/stat_boots2, 16, 16] + - [auto, palette, ui/pause/stat_boots2] + - [auto, ci4, ui/pause/stat_boots3, 16, 16] + - [auto, palette, ui/pause/stat_boots3] + - [auto, ci4, ui/pause/stat_hammer0, 16, 16] + - [auto, palette, ui/pause/stat_hammer0] + - [auto, ci4, ui/pause/stat_hammer1, 16, 16] + - [auto, palette, ui/pause/stat_hammer1] + - [auto, ci4, ui/pause/stat_hammer2, 16, 16] + - [auto, palette, ui/pause/stat_hammer2] + - [auto, ci4, ui/pause/stat_hammer3, 16, 16] + - [auto, palette, ui/pause/stat_hammer3] + - [auto, ci4, ui/pause/partner_rank, 16, 16] + - [auto, palette, ui/pause/partner_rank] + - [auto, ci4, ui/pause/unused_bubble, 56, 16] + - [auto, palette, ui/pause/unused_bubble] - type: code dir: pause start: 0x0017EB60 diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index 942d0ef2bc..bddf3d60b4 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -70,8 +70,6 @@ nuAuTaskStop = 0x80076de0; AlFrameSize = 0x800a0044; AlCmdListBuffers = 0x8009ff20; AlMinFrameSize = 0x800a0048; -n_aspMain_text_bin = 0x80071e10; -n_aspMain_data_bin = 0x80096700; nuAuTasks = 0x8009ff30; D_800A3628 = 0x800a0038; nuAuDmaBufList = 0x800a05f0; @@ -113,7 +111,6 @@ __osViNext = 0x80094654; osViModePalLan1 = 0x80094660; AuHeapBase = 0x801aa000; nuAuMgr = 0x8004a4c0; -rspbootTextStart = 0x80071d40; alHeapAlloc = 0x80057650; alLink = 0x8004aaa4; nuAuPreNMIProc = 0x8004a9e0; @@ -4756,3 +4753,10 @@ D_09001518_39A0D8 = 0x09001518; // rom:0x3E2B28 charset_peach_letter_png = 0x00051020; //rom:0x15F140 charset_postcard_png = 0x00054FA8; //rom:0x1630C8 charset_letter_content_1_png = 0x00056E90; //rom:0x164FB0 + +// RSP symbols +rspbootTextStart = 0x80071D40; // size:0xD0 name_end:rspbootTextEnd +n_aspMainTextStart = 0x80071E10; // size:0xC60 name_end:n_aspMainTextEnd +gspF3DZEX2_NoN_PosLight_fifoTextStart = 0x80094CB0; // size:0x1630 name_end:gspF3DZEX2_NoN_PosLight_fifoTextEnd +gspF3DZEX2_NoN_PosLight_fifoDataStart = 0x800962E0; // size:0x420 name_end:gspF3DZEX2_NoN_PosLight_fifoDataEnd +n_aspMainDataStart = 0x80096700; // size:0x2B0 name_end:n_aspMainDataEnd diff --git a/ver/ique/undefined_syms.txt b/ver/ique/undefined_syms.txt index 0d8d955d7d..873f8b6b2d 100644 --- a/ver/ique/undefined_syms.txt +++ b/ver/ique/undefined_syms.txt @@ -35,6 +35,3 @@ D_A6000000 = 0xA6000000; D_B0000000 = 0xB0000000; D_B0000008 = 0xB0000008; D_B0000010 = 0xB0000010; - -rspbootTextStart = rspboot_bin; -rspbootTextEnd = rspboot_bin + 0xd0; diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index fb25b38b17..6731155d39 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -15,7 +15,7 @@ options: symbol_addrs_path: ver/jp/symbol_addrs.txt ld_script_path: ver/jp/papermario.ld ld_symbol_header_path: ver/jp/build/include/ld_addrs.h - ld_generate_symbol_per_data_segment: True + ld_generate_symbol_per_data_segment: False src_path: src asm_path: ver/jp/asm asset_path: assets/jp @@ -305,7 +305,7 @@ segments: - [auto, c, bss/main_post_bss] - [auto, c, battle/battle] - [auto, c, battle/battle_bss] - - [0x4E580, bin, n_aspMain_text] + - [0x4E580, textbin, rsp/n_aspMain] - start: 0x4F1E0 type: .data name: main_pre @@ -333,9 +333,9 @@ segments: - [0x51240] - [0x51520, ia8, ui/no_controller, 128, 32] - - [0x71410, bin, gspF3DEX2kawase_fifo_text] - - [0x72A40, bin, gspF3DEX2kawase_fifo_data] - - [0x72E60, bin, n_aspMain_data] + - { start: 0x71410, type: textbin, name: rsp/gspF3DEX2_PosLight_fifo, linker_section_order: .data } + - [0x72A40, databin, rsp/gspF3DEX2_PosLight_fifo] + - [0x72E60, databin, rsp/n_aspMain] - [0x73110] - name: engine1 @@ -1028,149 +1028,157 @@ segments: start: 0x139DC0 vram: 0x8023E000 subsegments: - - [auto, ci4, ui/pause/unused_badge_points, 24, 24] - - [auto, palette, ui/pause/unused_badge_points] - - [auto, palette, ui/pause/unused_badge_points.disabled] - - [auto, ci4, ui/pause/unused_compass, 24, 24] - - [auto, palette, ui/pause/unused_compass] - - [auto, palette, ui/pause/unused_compass.disabled] - - [auto, ci4, ui/pause/cursor_hand, 16, 16] - - [auto, palette, ui/pause/cursor_hand] - - [auto, ci4, ui/files/filename_caret, 16, 16] - - [auto, palette, ui/files/filename_caret] - - [auto, ci4, ui/files/filename_space, 8, 8] - - [auto, palette, ui/files/filename_space] - - [auto, ci4, ui/pause/label_spirits, 32, 16] - - [auto, palette, ui/pause/label_spirits] - - [auto, ci4, ui/pause/label_map, 32, 16] - - [auto, palette, ui/pause/label_map] - - [auto, ci4, ui/pause/small_digit_0, 8, 8] - - [auto, palette, ui/pause/small_digit_0] - - [auto, ci4, ui/pause/small_digit_1, 8, 8] - - [auto, palette, ui/pause/small_digit_1] - - [auto, ci4, ui/pause/small_digit_2, 8, 8] - - [auto, palette, ui/pause/small_digit_2] - - [auto, ci4, ui/pause/small_digit_3, 8, 8] - - [auto, palette, ui/pause/small_digit_3] - - [auto, ci4, ui/pause/small_digit_4, 8, 8] - - [auto, palette, ui/pause/small_digit_4] - - [auto, ci4, ui/pause/small_digit_5, 8, 8] - - [auto, palette, ui/pause/small_digit_5] - - [auto, ci4, ui/pause/small_digit_6, 8, 8] - - [auto, palette, ui/pause/small_digit_6] - - [auto, ci4, ui/pause/small_digit_7, 8, 8] - - [auto, palette, ui/pause/small_digit_7] - - [auto, ci4, ui/pause/small_digit_8, 8, 8] - - [auto, palette, ui/pause/small_digit_8] - - [auto, ci4, ui/pause/small_digit_9, 8, 8] - - [auto, palette, ui/pause/small_digit_9] - - [auto, ci4, ui/pause/small_text_bp, 8, 8] - - [auto, palette, ui/pause/small_text_bp] - - [auto, ci4, ui/pause/label_jp_file, 32, 16] - - [auto, palette, ui/pause/label_jp_file] - - [auto, ci4, ui/pause/label_jp_file_disabled, 32, 16] - - [auto, palette, ui/pause/label_jp_file_disabled] - - [auto, ci4, ui/files/option_mono_on, 64, 16] - - [auto, palette, ui/files/option_mono_on] - - [auto, ci4, ui/files/option_mono_off, 64, 16] - - [auto, palette, ui/files/option_mono_off] - - [auto, ci4, ui/files/option_stereo_on, 64, 16] - - [auto, palette, ui/files/option_stereo_on] - - [auto, ci4, ui/files/option_stereo_off, 64, 16] - - [auto, palette, ui/files/option_stereo_off] - - [auto, ci4, ui/files/eldstar, 16, 16] - - [auto, palette, ui/files/eldstar] - - [auto, ci4, ui/files/eldstar_silhouette, 16, 16] - - [auto, palette, ui/files/eldstar_silhouette] - - [auto, ci4, ui/files/mamar, 16, 16] - - [auto, palette, ui/files/mamar] - - [auto, ci4, ui/files/mamar_silhouette, 16, 16] - - [auto, palette, ui/files/mamar_silhouette] - - [auto, ci4, ui/files/skolar, 16, 16] - - [auto, palette, ui/files/skolar] - - [auto, ci4, ui/files/skolar_silhouette, 16, 16] - - [auto, palette, ui/files/skolar_silhouette] - - [auto, ci4, ui/files/muskular, 16, 16] - - [auto, palette, ui/files/muskular] - - [auto, ci4, ui/files/muskular_silhouette, 16, 16] - - [auto, palette, ui/files/muskular_silhouette] - - [auto, ci4, ui/files/misstar, 16, 16] - - [auto, palette, ui/files/misstar] - - [auto, ci4, ui/files/misstar_silhouette, 16, 16] - - [auto, palette, ui/files/misstar_silhouette] - - [auto, ci4, ui/files/klevar, 16, 16] - - [auto, palette, ui/files/klevar] - - [auto, ci4, ui/files/klevar_silhouette, 16, 16] - - [auto, palette, ui/files/klevar_silhouette] - - [auto, ci4, ui/files/kalmar, 16, 16] - - [auto, palette, ui/files/kalmar] - - [auto, ci4, ui/files/kalmar_silhouette, 16, 16] - - [auto, palette, ui/files/kalmar_silhouette] - - [auto, ci4, ui/pause/map_walk0, 24, 24] - - [auto, palette, ui/pause/map_walk0] - - [auto, ci4, ui/pause/map_walk1, 24, 24] - - [auto, palette, ui/pause/map_walk1] - - [auto, ci4, ui/pause/map_walk2, 24, 24] - - [auto, palette, ui/pause/map_walk2] - - [auto, ci4, ui/pause/jp_super, 40, 16] - - [auto, palette, ui/pause/jp_super] - - [auto, ci4, ui/pause/jp_ultra, 40, 16] - - [auto, palette, ui/pause/jp_ultra] - - [auto, ci4, ui/pause/list_prev_page, 16, 16] - - [auto, palette, ui/pause/list_prev_page] - - [auto, ci4, ui/pause/list_next_page, 16, 16] - - [auto, palette, ui/pause/list_next_page] - - [auto, ci4, ui/pause/unused_z_up_arrow, 16, 16] - - [auto, palette, ui/pause/unused_z_up_arrow] - - [auto, ci4, ui/pause/unused_r_down_arrow, 16, 16] - - [auto, palette, ui/pause/unused_r_down_arrow] - - [auto, ci4, ui/pause/desc_msg_prev, 16, 16] - - [auto, palette, ui/pause/desc_msg_prev] - - [auto, ci4, ui/pause/desc_msg_next, 16, 16] - - [auto, palette, ui/pause/desc_msg_next] - - [auto, ci4, ui/pause/bp_needed, 48, 8] - - [auto, palette, ui/pause/bp_needed] - - [auto, ci4, ui/pause/mario_large, 32, 32] - - [auto, palette, ui/pause/mario_large] - - [auto, ci4, ui/pause/dash, 16, 8] - - [auto, palette, ui/pause/dash] - - [auto, ci4, ui/pause/stat_bp, 16, 16] - - [auto, palette, ui/pause/stat_bp] - - [auto, ci4, ui/pause/stat_mario, 16, 16] - - [auto, palette, ui/pause/stat_mario] - - [auto, ci4, ui/pause/stat_time, 16, 16] - - [auto, palette, ui/pause/stat_time] - - [auto, ci4, ui/pause/stat_star_piece0, 16, 16] - - [auto, palette, ui/pause/stat_star_piece0] - - [auto, ci4, ui/pause/stat_star_piece1, 16, 16] - - [auto, palette, ui/pause/stat_star_piece1] - - [auto, ci4, ui/pause/stat_star_piece2, 16, 16] - - [auto, palette, ui/pause/stat_star_piece2] - - [auto, ci4, ui/pause/stat_fp, 16, 16] - - [auto, palette, ui/pause/stat_fp] - - [auto, ci4, ui/pause/stat_times, 8, 8] - - [auto, palette, ui/pause/stat_times] - - [auto, ci4, ui/pause/stat_boots0, 16, 16] - - [auto, palette, ui/pause/stat_boots0] - - [auto, ci4, ui/pause/stat_boots1, 16, 16] - - [auto, palette, ui/pause/stat_boots1] - - [auto, ci4, ui/pause/stat_boots2, 16, 16] - - [auto, palette, ui/pause/stat_boots2] - - [auto, ci4, ui/pause/stat_boots3, 16, 16] - - [auto, palette, ui/pause/stat_boots3] - - [auto, ci4, ui/pause/stat_hammer0, 16, 16] - - [auto, palette, ui/pause/stat_hammer0] - - [auto, ci4, ui/pause/stat_hammer1, 16, 16] - - [auto, palette, ui/pause/stat_hammer1] - - [auto, ci4, ui/pause/stat_hammer2, 16, 16] - - [auto, palette, ui/pause/stat_hammer2] - - [auto, ci4, ui/pause/stat_hammer3, 16, 16] - - [auto, palette, ui/pause/stat_hammer3] - - [auto, ci4, ui/pause/partner_rank, 16, 16] - - [auto, palette, ui/pause/partner_rank] - - [auto, ci4, ui/pause/unused_bubble, 56, 16] - - [auto, palette, ui/pause/unused_bubble] - - [auto, .data, menu_hud_scripts] + - type: .data + name: menu_hud_scripts + subsegments: + - [auto, ci4, ui/pause/unused_badge_points, 24, 24] + - [auto, palette, ui/pause/unused_badge_points] + - [auto, palette, ui/pause/unused_badge_points.disabled] + - [auto, ci4, ui/pause/unused_compass, 24, 24] + - [auto, palette, ui/pause/unused_compass] + - [auto, palette, ui/pause/unused_compass.disabled] + - [auto, ci4, ui/pause/cursor_hand, 16, 16] + - [auto, palette, ui/pause/cursor_hand] + - [auto, ci4, ui/files/filename_caret, 16, 16] + - [auto, palette, ui/files/filename_caret] + - [auto, ci4, ui/files/filename_space, 8, 8] + - [auto, palette, ui/files/filename_space] + + - [auto, ci4, ui/pause/label_spirits, 32, 16] + - [auto, palette, ui/pause/label_spirits] + - [auto, ci4, ui/pause/label_map, 32, 16] + - [auto, palette, ui/pause/label_map] + + - [auto, ci4, ui/pause/small_digit_0, 8, 8] + - [auto, palette, ui/pause/small_digit_0] + - [auto, ci4, ui/pause/small_digit_1, 8, 8] + - [auto, palette, ui/pause/small_digit_1] + - [auto, ci4, ui/pause/small_digit_2, 8, 8] + - [auto, palette, ui/pause/small_digit_2] + - [auto, ci4, ui/pause/small_digit_3, 8, 8] + - [auto, palette, ui/pause/small_digit_3] + - [auto, ci4, ui/pause/small_digit_4, 8, 8] + - [auto, palette, ui/pause/small_digit_4] + - [auto, ci4, ui/pause/small_digit_5, 8, 8] + - [auto, palette, ui/pause/small_digit_5] + - [auto, ci4, ui/pause/small_digit_6, 8, 8] + - [auto, palette, ui/pause/small_digit_6] + - [auto, ci4, ui/pause/small_digit_7, 8, 8] + - [auto, palette, ui/pause/small_digit_7] + - [auto, ci4, ui/pause/small_digit_8, 8, 8] + - [auto, palette, ui/pause/small_digit_8] + - [auto, ci4, ui/pause/small_digit_9, 8, 8] + - [auto, palette, ui/pause/small_digit_9] + - [auto, ci4, ui/pause/small_text_bp, 8, 8] + - [auto, palette, ui/pause/small_text_bp] + - [auto, ci4, ui/pause/label_jp_file, 32, 16] + - [auto, palette, ui/pause/label_jp_file] + - [auto, ci4, ui/pause/label_jp_file_disabled, 32, 16] + - [auto, palette, ui/pause/label_jp_file_disabled] + + - [auto, ci4, ui/files/option_mono_on, 64, 16] + - [auto, palette, ui/files/option_mono_on] + - [auto, ci4, ui/files/option_mono_off, 64, 16] + - [auto, palette, ui/files/option_mono_off] + - [auto, ci4, ui/files/option_stereo_on, 64, 16] + - [auto, palette, ui/files/option_stereo_on] + - [auto, ci4, ui/files/option_stereo_off, 64, 16] + - [auto, palette, ui/files/option_stereo_off] + + - [auto, ci4, ui/files/eldstar, 16, 16] + - [auto, palette, ui/files/eldstar] + - [auto, ci4, ui/files/eldstar_silhouette, 16, 16] + - [auto, palette, ui/files/eldstar_silhouette] + - [auto, ci4, ui/files/mamar, 16, 16] + - [auto, palette, ui/files/mamar] + - [auto, ci4, ui/files/mamar_silhouette, 16, 16] + - [auto, palette, ui/files/mamar_silhouette] + - [auto, ci4, ui/files/skolar, 16, 16] + - [auto, palette, ui/files/skolar] + - [auto, ci4, ui/files/skolar_silhouette, 16, 16] + - [auto, palette, ui/files/skolar_silhouette] + - [auto, ci4, ui/files/muskular, 16, 16] + - [auto, palette, ui/files/muskular] + - [auto, ci4, ui/files/muskular_silhouette, 16, 16] + - [auto, palette, ui/files/muskular_silhouette] + - [auto, ci4, ui/files/misstar, 16, 16] + - [auto, palette, ui/files/misstar] + - [auto, ci4, ui/files/misstar_silhouette, 16, 16] + - [auto, palette, ui/files/misstar_silhouette] + - [auto, ci4, ui/files/klevar, 16, 16] + - [auto, palette, ui/files/klevar] + - [auto, ci4, ui/files/klevar_silhouette, 16, 16] + - [auto, palette, ui/files/klevar_silhouette] + - [auto, ci4, ui/files/kalmar, 16, 16] + - [auto, palette, ui/files/kalmar] + - [auto, ci4, ui/files/kalmar_silhouette, 16, 16] + - [auto, palette, ui/files/kalmar_silhouette] + - [auto, ci4, ui/pause/map_walk0, 24, 24] + - [auto, palette, ui/pause/map_walk0] + - [auto, ci4, ui/pause/map_walk1, 24, 24] + - [auto, palette, ui/pause/map_walk1] + - [auto, ci4, ui/pause/map_walk2, 24, 24] + - [auto, palette, ui/pause/map_walk2] + - [auto, ci4, ui/pause/jp_super, 40, 16] + - [auto, palette, ui/pause/jp_super] + - [auto, ci4, ui/pause/jp_ultra, 40, 16] + - [auto, palette, ui/pause/jp_ultra] + - [auto, ci4, ui/pause/list_prev_page, 16, 16] + - [auto, palette, ui/pause/list_prev_page] + - [auto, ci4, ui/pause/list_next_page, 16, 16] + - [auto, palette, ui/pause/list_next_page] + - [auto, ci4, ui/pause/unused_z_up_arrow, 16, 16] + - [auto, palette, ui/pause/unused_z_up_arrow] + - [auto, ci4, ui/pause/unused_r_down_arrow, 16, 16] + - [auto, palette, ui/pause/unused_r_down_arrow] + - [auto, ci4, ui/pause/desc_msg_prev, 16, 16] + - [auto, palette, ui/pause/desc_msg_prev] + - [auto, ci4, ui/pause/desc_msg_next, 16, 16] + - [auto, palette, ui/pause/desc_msg_next] + + - [auto, ci4, ui/pause/bp_needed, 48, 8] + - [auto, palette, ui/pause/bp_needed] + + - [auto, ci4, ui/pause/mario_large, 32, 32] + - [auto, palette, ui/pause/mario_large] + - [auto, ci4, ui/pause/dash, 16, 8] + - [auto, palette, ui/pause/dash] + - [auto, ci4, ui/pause/stat_bp, 16, 16] + - [auto, palette, ui/pause/stat_bp] + - [auto, ci4, ui/pause/stat_mario, 16, 16] + - [auto, palette, ui/pause/stat_mario] + - [auto, ci4, ui/pause/stat_time, 16, 16] + - [auto, palette, ui/pause/stat_time] + - [auto, ci4, ui/pause/stat_star_piece0, 16, 16] + - [auto, palette, ui/pause/stat_star_piece0] + - [auto, ci4, ui/pause/stat_star_piece1, 16, 16] + - [auto, palette, ui/pause/stat_star_piece1] + - [auto, ci4, ui/pause/stat_star_piece2, 16, 16] + - [auto, palette, ui/pause/stat_star_piece2] + - [auto, ci4, ui/pause/stat_fp, 16, 16] + - [auto, palette, ui/pause/stat_fp] + - [auto, ci4, ui/pause/stat_times, 8, 8] + - [auto, palette, ui/pause/stat_times] + - [auto, ci4, ui/pause/stat_boots0, 16, 16] + - [auto, palette, ui/pause/stat_boots0] + - [auto, ci4, ui/pause/stat_boots1, 16, 16] + - [auto, palette, ui/pause/stat_boots1] + - [auto, ci4, ui/pause/stat_boots2, 16, 16] + - [auto, palette, ui/pause/stat_boots2] + - [auto, ci4, ui/pause/stat_boots3, 16, 16] + - [auto, palette, ui/pause/stat_boots3] + - [auto, ci4, ui/pause/stat_hammer0, 16, 16] + - [auto, palette, ui/pause/stat_hammer0] + - [auto, ci4, ui/pause/stat_hammer1, 16, 16] + - [auto, palette, ui/pause/stat_hammer1] + - [auto, ci4, ui/pause/stat_hammer2, 16, 16] + - [auto, palette, ui/pause/stat_hammer2] + - [auto, ci4, ui/pause/stat_hammer3, 16, 16] + - [auto, palette, ui/pause/stat_hammer3] + - [auto, ci4, ui/pause/partner_rank, 16, 16] + - [auto, palette, ui/pause/partner_rank] + - [auto, ci4, ui/pause/unused_bubble, 56, 16] + - [auto, palette, ui/pause/unused_bubble] - type: code dir: pause start: 0x13E130 diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index af148f6c76..e82157f03f 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -5300,3 +5300,9 @@ D_0A000000_E91890 = 0x0A000000; // rom:0xE9A710 charset_peach_letter_png = 0x0000FC10; //rom:0x11EF40 charset_postcard_png = 0x00013B98; //rom:0x122EC8 charset_letter_content_1_png = 0x00015A80; //rom:0x124DB0 + +// RSP symbols +n_aspMainTextStart = 0x80073180; // size:0xC60 name_end:n_aspMainTextEnd +gspF3DZEX2_NoN_PosLight_fifoTextStart = 0x80096010; // size:0x1630 name_end:gspF3DZEX2_NoN_PosLight_fifoTextEnd +gspF3DZEX2_NoN_PosLight_fifoDataStart = 0x80097640; // size:0x420 name_end:gspF3DZEX2_NoN_PosLight_fifoDataEnd +n_aspMainDataStart = 0x80097A60; // size:0x2B0 name_end:n_aspMainDataEnd diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml index 3bba298bbb..03715a1b52 100644 --- a/ver/pal/splat.yaml +++ b/ver/pal/splat.yaml @@ -15,7 +15,7 @@ options: symbol_addrs_path: ver/pal/symbol_addrs.txt ld_script_path: ver/pal/papermario.ld ld_symbol_header_path: ver/pal/build/include/ld_addrs.h - ld_generate_symbol_per_data_segment: True + ld_generate_symbol_per_data_segment: False src_path: src asm_path: ver/pal/asm asset_path: assets/pal @@ -310,7 +310,7 @@ segments: - [auto, c, bss/main_post_bss] - [auto, c, battle/battle] - [auto, c, battle/battle_bss] - - [0x4B8B0, bin, n_aspMain_text] + - [0x4B8B0, textbin, rsp/n_aspMain] - start: 0x4C510 type: .data name: main_pre @@ -336,9 +336,9 @@ segments: - [0x4E300, vtx, theater/curtain_vtx] - [0x4E4F0, vtx, theater/wall_shadows_vtx] - [0x4E570] - - [0x6D820, bin, gspF3DEX2kawase_fifo_text] - - [0x6EE50, bin, gspF3DEX2kawase_fifo_data] - - [0x6F270, bin, n_aspMain_data] + - { start: 0x6D820, type: textbin, name: rsp/gspF3DEX2_PosLight_fifo, linker_section_order: .data } + - [0x6EE50, databin, rsp/gspF3DEX2_PosLight_fifo] + - [0x6F270, databin, rsp/n_aspMain] - [0x6F520] - name: engine1 @@ -1104,241 +1104,243 @@ segments: start: 0x132E40 vram: 0x8023E000 subsegments: - - [0x132E40, ci4, ui/pause/unused_badge_points, 24, 24] - - [0x132F60, palette, ui/pause/unused_badge_points] - - [0x132F80, palette, ui/pause/unused_badge_points.disabled] - - [0x132FA0, ci4, ui/pause/unused_compass, 24, 24] - - [0x1330C0, palette, ui/pause/unused_compass] - - [0x1330E0, palette, ui/pause/unused_compass.disabled] - - [0x133100, ci4, ui/pause/cursor_hand, 16, 16] - - [0x133180, palette, ui/pause/cursor_hand] - - [0x1331A0, ci4, ui/files/filename_caret, 16, 16] - - [0x133220, palette, ui/files/filename_caret] - - [0x133240, ci4, ui/files/filename_space, 8, 8] - - [0x133260, palette, ui/files/filename_space] + - type: .data + name: menu_hud_scripts + subsegments: + - [0x132E40, ci4, ui/pause/unused_badge_points, 24, 24] + - [0x132F60, palette, ui/pause/unused_badge_points] + - [0x132F80, palette, ui/pause/unused_badge_points.disabled] + - [0x132FA0, ci4, ui/pause/unused_compass, 24, 24] + - [0x1330C0, palette, ui/pause/unused_compass] + - [0x1330E0, palette, ui/pause/unused_compass.disabled] + - [0x133100, ci4, ui/pause/cursor_hand, 16, 16] + - [0x133180, palette, ui/pause/cursor_hand] + - [0x1331A0, ci4, ui/files/filename_caret, 16, 16] + - [0x133220, palette, ui/files/filename_caret] + - [0x133240, ci4, ui/files/filename_space, 8, 8] + - [0x133260, palette, ui/files/filename_space] - - [0x133280, ci4, ui/pause/label_stats, 48, 16] - - [0x133400, palette, ui/pause/label_stats] - - [0x133420, ci4, ui/pause/label_badges, 48, 16] - - [0x1335A0, palette, ui/pause/label_badges] - - [0x1335C0, ci4, ui/pause/label_items, 48, 16] - - [0x133740, palette, ui/pause/label_items] - - [0x133760, ci4, ui/pause/label_party, 48, 16] - - [0x1338E0, palette, ui/pause/label_party] - - [0x133900, ci4, ui/pause/label_spirits, 48, 16] - - [0x133A80, palette, ui/pause/label_spirits] - - [0x133AA0, ci4, ui/pause/label_map, 48, 16] - - [0x133C20, palette, ui/pause/label_map] + - [0x133280, ci4, ui/pause/label_stats, 48, 16] + - [0x133400, palette, ui/pause/label_stats] + - [0x133420, ci4, ui/pause/label_badges, 48, 16] + - [0x1335A0, palette, ui/pause/label_badges] + - [0x1335C0, ci4, ui/pause/label_items, 48, 16] + - [0x133740, palette, ui/pause/label_items] + - [0x133760, ci4, ui/pause/label_party, 48, 16] + - [0x1338E0, palette, ui/pause/label_party] + - [0x133900, ci4, ui/pause/label_spirits, 48, 16] + - [0x133A80, palette, ui/pause/label_spirits] + - [0x133AA0, ci4, ui/pause/label_map, 48, 16] + - [0x133C20, palette, ui/pause/label_map] - - [0x133c40, ci4, de/ui/pause/label_stats, 48, 16] - - [0x133dc0, palette, de/ui/pause/label_stats] - - [0x133de0, ci4, de/ui/pause/label_badges, 48, 16] - - [0x133f60, palette, de/ui/pause/label_badges] - - [0x133f80, ci4, de/ui/pause/label_items, 48, 16] - - [0x134100, palette, de/ui/pause/label_items] - - [0x134120, ci4, de/ui/pause/label_party, 48, 16] - - [0x1342a0, palette, de/ui/pause/label_party] - - [0x1342c0, ci4, de/ui/pause/label_spirits, 48, 16] - - [0x134440, palette, de/ui/pause/label_spirits] - - [0x134460, ci4, de/ui/pause/label_map, 48, 16] - - [0x1345e0, palette, de/ui/pause/label_map] + - [0x133c40, ci4, de/ui/pause/label_stats, 48, 16] + - [0x133dc0, palette, de/ui/pause/label_stats] + - [0x133de0, ci4, de/ui/pause/label_badges, 48, 16] + - [0x133f60, palette, de/ui/pause/label_badges] + - [0x133f80, ci4, de/ui/pause/label_items, 48, 16] + - [0x134100, palette, de/ui/pause/label_items] + - [0x134120, ci4, de/ui/pause/label_party, 48, 16] + - [0x1342a0, palette, de/ui/pause/label_party] + - [0x1342c0, ci4, de/ui/pause/label_spirits, 48, 16] + - [0x134440, palette, de/ui/pause/label_spirits] + - [0x134460, ci4, de/ui/pause/label_map, 48, 16] + - [0x1345e0, palette, de/ui/pause/label_map] - - [0x134600, ci4, fr/ui/pause/label_stats, 48, 16] - - [0x134780, palette, fr/ui/pause/label_stats] - - [0x1347a0, ci4, fr/ui/pause/label_badges, 48, 16] - - [0x134920, palette, fr/ui/pause/label_badges] - - [0x134940, ci4, fr/ui/pause/label_items, 48, 16] - - [0x134ac0, palette, fr/ui/pause/label_items] - - [0x134ae0, ci4, fr/ui/pause/label_party, 48, 16] - - [0x134c60, palette, fr/ui/pause/label_party] - - [0x134c80, ci4, fr/ui/pause/label_spirits, 48, 16] - - [0x134e00, palette, fr/ui/pause/label_spirits] - - [0x134e20, ci4, fr/ui/pause/label_map, 48, 16] - - [0x134fa0, palette, fr/ui/pause/label_map] + - [0x134600, ci4, fr/ui/pause/label_stats, 48, 16] + - [0x134780, palette, fr/ui/pause/label_stats] + - [0x1347a0, ci4, fr/ui/pause/label_badges, 48, 16] + - [0x134920, palette, fr/ui/pause/label_badges] + - [0x134940, ci4, fr/ui/pause/label_items, 48, 16] + - [0x134ac0, palette, fr/ui/pause/label_items] + - [0x134ae0, ci4, fr/ui/pause/label_party, 48, 16] + - [0x134c60, palette, fr/ui/pause/label_party] + - [0x134c80, ci4, fr/ui/pause/label_spirits, 48, 16] + - [0x134e00, palette, fr/ui/pause/label_spirits] + - [0x134e20, ci4, fr/ui/pause/label_map, 48, 16] + - [0x134fa0, palette, fr/ui/pause/label_map] - - [0x134fc0, ci4, es/ui/pause/label_stats, 48, 16] - - [0x135140, palette, es/ui/pause/label_stats] - - [0x135160, ci4, es/ui/pause/label_badges, 48, 16] - - [0x1352e0, palette, es/ui/pause/label_badges] - - [0x135300, ci4, es/ui/pause/label_items, 48, 16] - - [0x135480, palette, es/ui/pause/label_items] - - [0x1354a0, ci4, es/ui/pause/label_party, 48, 16] - - [0x135620, palette, es/ui/pause/label_party] - - [0x135640, ci4, es/ui/pause/label_spirits, 48, 16] - - [0x1357c0, palette, es/ui/pause/label_spirits] - - [0x1357e0, ci4, es/ui/pause/label_map, 48, 16] - - [0x135960, palette, es/ui/pause/label_map] + - [0x134fc0, ci4, es/ui/pause/label_stats, 48, 16] + - [0x135140, palette, es/ui/pause/label_stats] + - [0x135160, ci4, es/ui/pause/label_badges, 48, 16] + - [0x1352e0, palette, es/ui/pause/label_badges] + - [0x135300, ci4, es/ui/pause/label_items, 48, 16] + - [0x135480, palette, es/ui/pause/label_items] + - [0x1354a0, ci4, es/ui/pause/label_party, 48, 16] + - [0x135620, palette, es/ui/pause/label_party] + - [0x135640, ci4, es/ui/pause/label_spirits, 48, 16] + - [0x1357c0, palette, es/ui/pause/label_spirits] + - [0x1357e0, ci4, es/ui/pause/label_map, 48, 16] + - [0x135960, palette, es/ui/pause/label_map] - - [0x135980, ci4, ui/pause/small_digit_0, 8, 8] - - [0x1359A0, palette, ui/pause/small_digit_0] - - [0x1359C0, ci4, ui/pause/small_digit_1, 8, 8] - - [0x1359E0, palette, ui/pause/small_digit_1] - - [0x135A00, ci4, ui/pause/small_digit_2, 8, 8] - - [0x135A20, palette, ui/pause/small_digit_2] - - [0x135A40, ci4, ui/pause/small_digit_3, 8, 8] - - [0x135A60, palette, ui/pause/small_digit_3] - - [0x135A80, ci4, ui/pause/small_digit_4, 8, 8] - - [0x135AA0, palette, ui/pause/small_digit_4] - - [0x135AC0, ci4, ui/pause/small_digit_5, 8, 8] - - [0x135AE0, palette, ui/pause/small_digit_5] - - [0x135B00, ci4, ui/pause/small_digit_6, 8, 8] - - [0x135B20, palette, ui/pause/small_digit_6] - - [0x135B40, ci4, ui/pause/small_digit_7, 8, 8] - - [0x135B60, palette, ui/pause/small_digit_7] - - [0x135B80, ci4, ui/pause/small_digit_8, 8, 8] - - [0x135BA0, palette, ui/pause/small_digit_8] - - [0x135BC0, ci4, ui/pause/small_digit_9, 8, 8] - - [0x135BE0, palette, ui/pause/small_digit_9] - - [0x135C00, ci4, ui/pause/small_text_bp, 8, 8] - - [0x135C20, palette, ui/pause/small_text_bp] - - [0x135C40, ci4, ui/pause/label_jp_file, 32, 16] - - [0x135D40, palette, ui/pause/label_jp_file] - - [0x135D60, ci4, ui/pause/label_jp_file_disabled, 32, 16] - - [0x135E60, palette, ui/pause/label_jp_file_disabled] + - [0x135980, ci4, ui/pause/small_digit_0, 8, 8] + - [0x1359A0, palette, ui/pause/small_digit_0] + - [0x1359C0, ci4, ui/pause/small_digit_1, 8, 8] + - [0x1359E0, palette, ui/pause/small_digit_1] + - [0x135A00, ci4, ui/pause/small_digit_2, 8, 8] + - [0x135A20, palette, ui/pause/small_digit_2] + - [0x135A40, ci4, ui/pause/small_digit_3, 8, 8] + - [0x135A60, palette, ui/pause/small_digit_3] + - [0x135A80, ci4, ui/pause/small_digit_4, 8, 8] + - [0x135AA0, palette, ui/pause/small_digit_4] + - [0x135AC0, ci4, ui/pause/small_digit_5, 8, 8] + - [0x135AE0, palette, ui/pause/small_digit_5] + - [0x135B00, ci4, ui/pause/small_digit_6, 8, 8] + - [0x135B20, palette, ui/pause/small_digit_6] + - [0x135B40, ci4, ui/pause/small_digit_7, 8, 8] + - [0x135B60, palette, ui/pause/small_digit_7] + - [0x135B80, ci4, ui/pause/small_digit_8, 8, 8] + - [0x135BA0, palette, ui/pause/small_digit_8] + - [0x135BC0, ci4, ui/pause/small_digit_9, 8, 8] + - [0x135BE0, palette, ui/pause/small_digit_9] + - [0x135C00, ci4, ui/pause/small_text_bp, 8, 8] + - [0x135C20, palette, ui/pause/small_text_bp] + - [0x135C40, ci4, ui/pause/label_jp_file, 32, 16] + - [0x135D40, palette, ui/pause/label_jp_file] + - [0x135D60, ci4, ui/pause/label_jp_file_disabled, 32, 16] + - [0x135E60, palette, ui/pause/label_jp_file_disabled] - # English - - [0x135E80, ci4, ui/files/option_mono_on, 64, 16] - - [0x136080, palette, ui/files/option_mono_on] - - [0x1360A0, ci4, ui/files/option_mono_off, 64, 16] - - [0x1362A0, palette, ui/files/option_mono_off] - - [0x1362C0, ci4, ui/files/option_stereo_on, 64, 16] - - [0x1364C0, palette, ui/files/option_stereo_on] - - [0x1364E0, ci4, ui/files/option_stereo_off, 64, 16] - - [0x1366E0, palette, ui/files/option_stereo_off] + # English + - [0x135E80, ci4, ui/files/option_mono_on, 64, 16] + - [0x136080, palette, ui/files/option_mono_on] + - [0x1360A0, ci4, ui/files/option_mono_off, 64, 16] + - [0x1362A0, palette, ui/files/option_mono_off] + - [0x1362C0, ci4, ui/files/option_stereo_on, 64, 16] + - [0x1364C0, palette, ui/files/option_stereo_on] + - [0x1364E0, ci4, ui/files/option_stereo_off, 64, 16] + - [0x1366E0, palette, ui/files/option_stereo_off] - # German - - [0x136700, ci4, de/ui/files/option_mono_on, 64, 16] - - [0x136900, palette, de/ui/files/option_mono_on] - - [0x136920, ci4, de/ui/files/option_mono_off, 64, 16] - - [0x136b20, palette, de/ui/files/option_mono_off] - - [0x136b40, ci4, de/ui/files/option_stereo_on, 64, 16] - - [0x136d40, palette, de/ui/files/option_stereo_on] - - [0x136d60, ci4, de/ui/files/option_stereo_off, 64, 16] - - [0x136f60, palette, de/ui/files/option_stereo_off] + # German + - [0x136700, ci4, de/ui/files/option_mono_on, 64, 16] + - [0x136900, palette, de/ui/files/option_mono_on] + - [0x136920, ci4, de/ui/files/option_mono_off, 64, 16] + - [0x136b20, palette, de/ui/files/option_mono_off] + - [0x136b40, ci4, de/ui/files/option_stereo_on, 64, 16] + - [0x136d40, palette, de/ui/files/option_stereo_on] + - [0x136d60, ci4, de/ui/files/option_stereo_off, 64, 16] + - [0x136f60, palette, de/ui/files/option_stereo_off] - # French - - [0x136f80, ci4, fr/ui/files/option_mono_on, 64, 16] - - [0x137180, palette, fr/ui/files/option_mono_on] - - [0x1371a0, ci4, fr/ui/files/option_mono_off, 64, 16] - - [0x1373a0, palette, fr/ui/files/option_mono_off] - - [0x1373c0, ci4, fr/ui/files/option_stereo_on, 64, 16] - - [0x1375c0, palette, fr/ui/files/option_stereo_on] - - [0x1375e0, ci4, fr/ui/files/option_stereo_off, 64, 16] - - [0x1377e0, palette, fr/ui/files/option_stereo_off] + # French + - [0x136f80, ci4, fr/ui/files/option_mono_on, 64, 16] + - [0x137180, palette, fr/ui/files/option_mono_on] + - [0x1371a0, ci4, fr/ui/files/option_mono_off, 64, 16] + - [0x1373a0, palette, fr/ui/files/option_mono_off] + - [0x1373c0, ci4, fr/ui/files/option_stereo_on, 64, 16] + - [0x1375c0, palette, fr/ui/files/option_stereo_on] + - [0x1375e0, ci4, fr/ui/files/option_stereo_off, 64, 16] + - [0x1377e0, palette, fr/ui/files/option_stereo_off] - - [0x137800, ci4, es/ui/files/option_mono_on, 64, 16] - - [0x137a00, palette, es/ui/files/option_mono_on] - - [0x137a20, ci4, es/ui/files/option_mono_off, 64, 16] - - [0x137c20, palette, es/ui/files/option_mono_off] - - [0x137c40, ci4, es/ui/files/option_stereo_on, 64, 16] - - [0x137e40, palette, es/ui/files/option_stereo_on] - - [0x137e60, ci4, es/ui/files/option_stereo_off, 64, 16] - - [0x138060, palette, es/ui/files/option_stereo_off] + - [0x137800, ci4, es/ui/files/option_mono_on, 64, 16] + - [0x137a00, palette, es/ui/files/option_mono_on] + - [0x137a20, ci4, es/ui/files/option_mono_off, 64, 16] + - [0x137c20, palette, es/ui/files/option_mono_off] + - [0x137c40, ci4, es/ui/files/option_stereo_on, 64, 16] + - [0x137e40, palette, es/ui/files/option_stereo_on] + - [0x137e60, ci4, es/ui/files/option_stereo_off, 64, 16] + - [0x138060, palette, es/ui/files/option_stereo_off] - - [0x138080, ci4, ui/files/eldstar, 16, 16] - - [0x138100, palette, ui/files/eldstar] - - [0x138120, ci4, ui/files/eldstar_silhouette, 16, 16] - - [0x1381A0, palette, ui/files/eldstar_silhouette] - - [0x1381C0, ci4, ui/files/mamar, 16, 16] - - [0x138240, palette, ui/files/mamar] - - [0x138260, ci4, ui/files/mamar_silhouette, 16, 16] - - [0x1382E0, palette, ui/files/mamar_silhouette] - - [0x138300, ci4, ui/files/skolar, 16, 16] - - [0x138380, palette, ui/files/skolar] - - [0x1383A0, ci4, ui/files/skolar_silhouette, 16, 16] - - [0x138420, palette, ui/files/skolar_silhouette] - - [0x138440, ci4, ui/files/muskular, 16, 16] - - [0x1384C0, palette, ui/files/muskular] - - [0x1384E0, ci4, ui/files/muskular_silhouette, 16, 16] - - [0x138560, palette, ui/files/muskular_silhouette] - - [0x138580, ci4, ui/files/misstar, 16, 16] - - [0x138600, palette, ui/files/misstar] - - [0x138620, ci4, ui/files/misstar_silhouette, 16, 16] - - [0x1386A0, palette, ui/files/misstar_silhouette] - - [0x1386C0, ci4, ui/files/klevar, 16, 16] - - [0x138740, palette, ui/files/klevar] - - [0x138760, ci4, ui/files/klevar_silhouette, 16, 16] - - [0x1387E0, palette, ui/files/klevar_silhouette] - - [0x138800, ci4, ui/files/kalmar, 16, 16] - - [0x138880, palette, ui/files/kalmar] - - [0x1388A0, ci4, ui/files/kalmar_silhouette, 16, 16] - - [0x138920, palette, ui/files/kalmar_silhouette] - - [0x138940, ci4, ui/pause/map_walk0, 24, 24] - - [0x138A60, palette, ui/pause/map_walk0] - - [0x138A80, ci4, ui/pause/map_walk1, 24, 24] - - [0x138BA0, palette, ui/pause/map_walk1] - - [0x138BC0, ci4, ui/pause/map_walk2, 24, 24] - - [0x138CE0, palette, ui/pause/map_walk2] - - [0x138D00, ci4, ui/pause/jp_super, 40, 16] - - [0x138E40, palette, ui/pause/jp_super] - - [0x138E60, ci4, ui/pause/jp_ultra, 40, 16] - - [0x138FA0, palette, ui/pause/jp_ultra] - - [0x138FC0, ci4, ui/pause/list_prev_page, 16, 16] - - [0x139040, palette, ui/pause/list_prev_page] - - [0x139060, ci4, ui/pause/list_next_page, 16, 16] - - [0x1390E0, palette, ui/pause/list_next_page] - - [0x139100, ci4, ui/pause/unused_z_up_arrow, 16, 16] - - [0x139180, palette, ui/pause/unused_z_up_arrow] - - [0x1391A0, ci4, ui/pause/unused_r_down_arrow, 16, 16] - - [0x139220, palette, ui/pause/unused_r_down_arrow] - - [0x139240, ci4, ui/pause/desc_msg_prev, 16, 16] - - [0x1392C0, palette, ui/pause/desc_msg_prev] - - [0x1392E0, ci4, ui/pause/desc_msg_next, 16, 16] - - [0x139360, palette, ui/pause/desc_msg_next] + - [0x138080, ci4, ui/files/eldstar, 16, 16] + - [0x138100, palette, ui/files/eldstar] + - [0x138120, ci4, ui/files/eldstar_silhouette, 16, 16] + - [0x1381A0, palette, ui/files/eldstar_silhouette] + - [0x1381C0, ci4, ui/files/mamar, 16, 16] + - [0x138240, palette, ui/files/mamar] + - [0x138260, ci4, ui/files/mamar_silhouette, 16, 16] + - [0x1382E0, palette, ui/files/mamar_silhouette] + - [0x138300, ci4, ui/files/skolar, 16, 16] + - [0x138380, palette, ui/files/skolar] + - [0x1383A0, ci4, ui/files/skolar_silhouette, 16, 16] + - [0x138420, palette, ui/files/skolar_silhouette] + - [0x138440, ci4, ui/files/muskular, 16, 16] + - [0x1384C0, palette, ui/files/muskular] + - [0x1384E0, ci4, ui/files/muskular_silhouette, 16, 16] + - [0x138560, palette, ui/files/muskular_silhouette] + - [0x138580, ci4, ui/files/misstar, 16, 16] + - [0x138600, palette, ui/files/misstar] + - [0x138620, ci4, ui/files/misstar_silhouette, 16, 16] + - [0x1386A0, palette, ui/files/misstar_silhouette] + - [0x1386C0, ci4, ui/files/klevar, 16, 16] + - [0x138740, palette, ui/files/klevar] + - [0x138760, ci4, ui/files/klevar_silhouette, 16, 16] + - [0x1387E0, palette, ui/files/klevar_silhouette] + - [0x138800, ci4, ui/files/kalmar, 16, 16] + - [0x138880, palette, ui/files/kalmar] + - [0x1388A0, ci4, ui/files/kalmar_silhouette, 16, 16] + - [0x138920, palette, ui/files/kalmar_silhouette] + - [0x138940, ci4, ui/pause/map_walk0, 24, 24] + - [0x138A60, palette, ui/pause/map_walk0] + - [0x138A80, ci4, ui/pause/map_walk1, 24, 24] + - [0x138BA0, palette, ui/pause/map_walk1] + - [0x138BC0, ci4, ui/pause/map_walk2, 24, 24] + - [0x138CE0, palette, ui/pause/map_walk2] + - [0x138D00, ci4, ui/pause/jp_super, 40, 16] + - [0x138E40, palette, ui/pause/jp_super] + - [0x138E60, ci4, ui/pause/jp_ultra, 40, 16] + - [0x138FA0, palette, ui/pause/jp_ultra] + - [0x138FC0, ci4, ui/pause/list_prev_page, 16, 16] + - [0x139040, palette, ui/pause/list_prev_page] + - [0x139060, ci4, ui/pause/list_next_page, 16, 16] + - [0x1390E0, palette, ui/pause/list_next_page] + - [0x139100, ci4, ui/pause/unused_z_up_arrow, 16, 16] + - [0x139180, palette, ui/pause/unused_z_up_arrow] + - [0x1391A0, ci4, ui/pause/unused_r_down_arrow, 16, 16] + - [0x139220, palette, ui/pause/unused_r_down_arrow] + - [0x139240, ci4, ui/pause/desc_msg_prev, 16, 16] + - [0x1392C0, palette, ui/pause/desc_msg_prev] + - [0x1392E0, ci4, ui/pause/desc_msg_next, 16, 16] + - [0x139360, palette, ui/pause/desc_msg_next] - - [0x139380, ci4, ui/pause/bp_needed, 48, 8] - - [0x139440, palette, ui/pause/bp_needed] + - [0x139380, ci4, ui/pause/bp_needed, 48, 8] + - [0x139440, palette, ui/pause/bp_needed] - - [0x139460, ci4, de/ui/pause/bp_needed, 48, 8] - - [0x139520, palette, de/ui/pause/bp_needed] + - [0x139460, ci4, de/ui/pause/bp_needed, 48, 8] + - [0x139520, palette, de/ui/pause/bp_needed] - - [0x139540, ci4, fr/ui/pause/bp_needed, 48, 8] - - [0x139600, palette, fr/ui/pause/bp_needed] + - [0x139540, ci4, fr/ui/pause/bp_needed, 48, 8] + - [0x139600, palette, fr/ui/pause/bp_needed] - - [0x139620, ci4, es/ui/pause/bp_needed, 48, 8] - - [0x1396e0, palette, es/ui/pause/bp_needed] + - [0x139620, ci4, es/ui/pause/bp_needed, 48, 8] + - [0x1396e0, palette, es/ui/pause/bp_needed] - - [0x139700, ci4, ui/pause/mario_large, 32, 32] - - [0x139900, palette, ui/pause/mario_large] - - [0x139920, ci4, ui/pause/dash, 16, 8] - - [0x139960, palette, ui/pause/dash] - - [0x139980, ci4, ui/pause/stat_bp, 16, 16] - - [0x139A00, palette, ui/pause/stat_bp] - - [0x139A20, ci4, ui/pause/stat_mario, 16, 16] - - [0x139AA0, palette, ui/pause/stat_mario] - - [0x139AC0, ci4, ui/pause/stat_time, 16, 16] - - [0x139B40, palette, ui/pause/stat_time] - - [0x139B60, ci4, ui/pause/stat_star_piece0, 16, 16] - - [0x139BE0, palette, ui/pause/stat_star_piece0] - - [0x139C00, ci4, ui/pause/stat_star_piece1, 16, 16] - - [0x139C80, palette, ui/pause/stat_star_piece1] - - [0x139CA0, ci4, ui/pause/stat_star_piece2, 16, 16] - - [0x139D20, palette, ui/pause/stat_star_piece2] - - [0x139D40, ci4, ui/pause/stat_fp, 16, 16] - - [0x139DC0, palette, ui/pause/stat_fp] - - [0x139DE0, ci4, ui/pause/stat_times, 8, 8] - - [0x139E00, palette, ui/pause/stat_times] - - [0x139E20, ci4, ui/pause/stat_boots0, 16, 16] - - [0x139EA0, palette, ui/pause/stat_boots0] - - [0x139EC0, ci4, ui/pause/stat_boots1, 16, 16] - - [0x139F40, palette, ui/pause/stat_boots1] - - [0x139F60, ci4, ui/pause/stat_boots2, 16, 16] - - [0x139FE0, palette, ui/pause/stat_boots2] - - [0x13A000, ci4, ui/pause/stat_boots3, 16, 16] - - [0x13A080, palette, ui/pause/stat_boots3] - - [0x13A0A0, ci4, ui/pause/stat_hammer0, 16, 16] - - [0x13A120, palette, ui/pause/stat_hammer0] - - [0x13A140, ci4, ui/pause/stat_hammer1, 16, 16] - - [0x13A1C0, palette, ui/pause/stat_hammer1] - - [0x13A1E0, ci4, ui/pause/stat_hammer2, 16, 16] - - [0x13A260, palette, ui/pause/stat_hammer2] - - [0x13A280, ci4, ui/pause/stat_hammer3, 16, 16] - - [0x13A300, palette, ui/pause/stat_hammer3] - - [0x13A320, ci4, ui/pause/partner_rank, 16, 16] - - [0x13A3A0, palette, ui/pause/partner_rank] - - [0x13A3C0, ci4, ui/pause/unused_bubble, 56, 16] - - [0x13A580, palette, ui/pause/unused_bubble] - - [0x13A5A0, .data, menu_hud_scripts] + - [0x139700, ci4, ui/pause/mario_large, 32, 32] + - [0x139900, palette, ui/pause/mario_large] + - [0x139920, ci4, ui/pause/dash, 16, 8] + - [0x139960, palette, ui/pause/dash] + - [0x139980, ci4, ui/pause/stat_bp, 16, 16] + - [0x139A00, palette, ui/pause/stat_bp] + - [0x139A20, ci4, ui/pause/stat_mario, 16, 16] + - [0x139AA0, palette, ui/pause/stat_mario] + - [0x139AC0, ci4, ui/pause/stat_time, 16, 16] + - [0x139B40, palette, ui/pause/stat_time] + - [0x139B60, ci4, ui/pause/stat_star_piece0, 16, 16] + - [0x139BE0, palette, ui/pause/stat_star_piece0] + - [0x139C00, ci4, ui/pause/stat_star_piece1, 16, 16] + - [0x139C80, palette, ui/pause/stat_star_piece1] + - [0x139CA0, ci4, ui/pause/stat_star_piece2, 16, 16] + - [0x139D20, palette, ui/pause/stat_star_piece2] + - [0x139D40, ci4, ui/pause/stat_fp, 16, 16] + - [0x139DC0, palette, ui/pause/stat_fp] + - [0x139DE0, ci4, ui/pause/stat_times, 8, 8] + - [0x139E00, palette, ui/pause/stat_times] + - [0x139E20, ci4, ui/pause/stat_boots0, 16, 16] + - [0x139EA0, palette, ui/pause/stat_boots0] + - [0x139EC0, ci4, ui/pause/stat_boots1, 16, 16] + - [0x139F40, palette, ui/pause/stat_boots1] + - [0x139F60, ci4, ui/pause/stat_boots2, 16, 16] + - [0x139FE0, palette, ui/pause/stat_boots2] + - [0x13A000, ci4, ui/pause/stat_boots3, 16, 16] + - [0x13A080, palette, ui/pause/stat_boots3] + - [0x13A0A0, ci4, ui/pause/stat_hammer0, 16, 16] + - [0x13A120, palette, ui/pause/stat_hammer0] + - [0x13A140, ci4, ui/pause/stat_hammer1, 16, 16] + - [0x13A1C0, palette, ui/pause/stat_hammer1] + - [0x13A1E0, ci4, ui/pause/stat_hammer2, 16, 16] + - [0x13A260, palette, ui/pause/stat_hammer2] + - [0x13A280, ci4, ui/pause/stat_hammer3, 16, 16] + - [0x13A300, palette, ui/pause/stat_hammer3] + - [0x13A320, ci4, ui/pause/partner_rank, 16, 16] + - [0x13A3A0, palette, ui/pause/partner_rank] + - [0x13A3C0, ci4, ui/pause/unused_bubble, 56, 16] + - [0x13A580, palette, ui/pause/unused_bubble] - type: code dir: pause start: 0x13B8F0 diff --git a/ver/pal/symbol_addrs.txt b/ver/pal/symbol_addrs.txt index c6a52a8409..6dd1c2b0dc 100644 --- a/ver/pal/symbol_addrs.txt +++ b/ver/pal/symbol_addrs.txt @@ -3149,3 +3149,9 @@ D_802A31D8_7AAB78 = 0x802ADE58; // rom:0x81AEC8 D_802A3250_7AABF0 = 0x802ADED0; // rom:0x81AF40 D_802A32B0_7AAC50 = 0x802ADF30; // rom:0x81AFA0 D_802A32D8_7AAC78 = 0x802ADF58; // rom:0x81AFC8 + +// RSP symbols +n_aspMainTextStart = 0x800704B0; // size:0xC60 name_end:n_aspMainTextEnd +gspF3DZEX2_NoN_PosLight_fifoTextStart = 0x80092420; // size:0x1630 name_end:gspF3DZEX2_NoN_PosLight_fifoTextEnd +gspF3DZEX2_NoN_PosLight_fifoDataStart = 0x80093A50; // size:0x420 name_end:gspF3DZEX2_NoN_PosLight_fifoDataEnd +n_aspMainDataStart = 0x80093E70; // size:0x2B0 name_end:n_aspMainDataEnd diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 8e4a7d2d48..a3bdcbe5e8 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -15,7 +15,7 @@ options: symbol_addrs_path: ver/us/symbol_addrs.txt ld_script_path: ver/us/papermario.ld ld_symbol_header_path: ver/us/build/include/ld_addrs.h - ld_generate_symbol_per_data_segment: True + ld_generate_symbol_per_data_segment: False src_path: src asm_path: ver/us/asm asset_path: assets/us @@ -343,7 +343,7 @@ segments: - [auto, c, bss/main_post_bss] - [auto, c, battle/battle] - [auto, c, battle/battle_bss] - - [0x4E5A0, bin, n_aspMain_text] + - [0x4E5A0, textbin, rsp/n_aspMain] - start: 0x4F200 type: .data name: main_pre @@ -376,9 +376,9 @@ segments: subsegments: - [0x52690, i1, crash_screen/font, 32, 64] - [0x52790] - - [0x71430, bin, gspF3DEX2kawase_fifo_text] - - [0x72A60, bin, gspF3DEX2kawase_fifo_data] - - [0x72E80, bin, n_aspMain_data] + - { start: 0x71430, type: textbin, name: rsp/gspF3DEX2_PosLight_fifo, linker_section_order: .data } + - [0x72A60, databin, rsp/gspF3DEX2_PosLight_fifo] + - [0x72E80, databin, rsp/n_aspMain] - [0x73130] - name: engine1 type: code @@ -1061,157 +1061,166 @@ segments: start: 0x131340 vram_class: ui_images_filemenu_pause subsegments: - - [auto, ci4, ui/pause/unused_badge_points, 24, 24] - - [auto, palette, ui/pause/unused_badge_points] - - [auto, palette, ui/pause/unused_badge_points.disabled] - - [auto, ci4, ui/pause/unused_compass, 24, 24] - - [auto, palette, ui/pause/unused_compass] - - [auto, palette, ui/pause/unused_compass.disabled] - - [auto, ci4, ui/pause/cursor_hand, 16, 16] - - [auto, palette, ui/pause/cursor_hand] - - [auto, ci4, ui/files/filename_caret, 16, 16] - - [auto, palette, ui/files/filename_caret] - - [auto, ci4, ui/files/filename_space, 8, 8] - - [auto, palette, ui/files/filename_space] - - [auto, ci4, ui/pause/label_stats, 48, 16] - - [auto, palette, ui/pause/label_stats] - - [auto, ci4, ui/pause/label_badges, 48, 16] - - [auto, palette, ui/pause/label_badges] - - [auto, ci4, ui/pause/label_items, 48, 16] - - [auto, palette, ui/pause/label_items] - - [auto, ci4, ui/pause/label_party, 48, 16] - - [auto, palette, ui/pause/label_party] - - [auto, ci4, ui/pause/label_spirits, 48, 16] - - [auto, palette, ui/pause/label_spirits] - - [auto, ci4, ui/pause/label_map, 48, 16] - - [auto, palette, ui/pause/label_map] - - [auto, ci4, ui/pause/small_digit_0, 8, 8] - - [auto, palette, ui/pause/small_digit_0] - - [auto, ci4, ui/pause/small_digit_1, 8, 8] - - [auto, palette, ui/pause/small_digit_1] - - [auto, ci4, ui/pause/small_digit_2, 8, 8] - - [auto, palette, ui/pause/small_digit_2] - - [auto, ci4, ui/pause/small_digit_3, 8, 8] - - [auto, palette, ui/pause/small_digit_3] - - [auto, ci4, ui/pause/small_digit_4, 8, 8] - - [auto, palette, ui/pause/small_digit_4] - - [auto, ci4, ui/pause/small_digit_5, 8, 8] - - [auto, palette, ui/pause/small_digit_5] - - [auto, ci4, ui/pause/small_digit_6, 8, 8] - - [auto, palette, ui/pause/small_digit_6] - - [auto, ci4, ui/pause/small_digit_7, 8, 8] - - [auto, palette, ui/pause/small_digit_7] - - [auto, ci4, ui/pause/small_digit_8, 8, 8] - - [auto, palette, ui/pause/small_digit_8] - - [auto, ci4, ui/pause/small_digit_9, 8, 8] - - [auto, palette, ui/pause/small_digit_9] - - [auto, ci4, ui/pause/small_text_bp, 8, 8] - - [auto, palette, ui/pause/small_text_bp] - - [auto, ci4, ui/pause/label_jp_file, 32, 16] - - [auto, palette, ui/pause/label_jp_file] - - [auto, ci4, ui/pause/label_jp_file_disabled, 32, 16] - - [auto, palette, ui/pause/label_jp_file_disabled] - - [auto, ci4, ui/files/option_mono_on, 64, 16] - - [auto, palette, ui/files/option_mono_on] - - [auto, ci4, ui/files/option_mono_off, 64, 16] - - [auto, palette, ui/files/option_mono_off] - - [auto, ci4, ui/files/option_stereo_on, 64, 16] - - [auto, palette, ui/files/option_stereo_on] - - [auto, ci4, ui/files/option_stereo_off, 64, 16] - - [auto, palette, ui/files/option_stereo_off] - - [auto, ci4, ui/files/eldstar, 16, 16] - - [auto, palette, ui/files/eldstar] - - [auto, ci4, ui/files/eldstar_silhouette, 16, 16] - - [auto, palette, ui/files/eldstar_silhouette] - - [auto, ci4, ui/files/mamar, 16, 16] - - [auto, palette, ui/files/mamar] - - [auto, ci4, ui/files/mamar_silhouette, 16, 16] - - [auto, palette, ui/files/mamar_silhouette] - - [auto, ci4, ui/files/skolar, 16, 16] - - [auto, palette, ui/files/skolar] - - [auto, ci4, ui/files/skolar_silhouette, 16, 16] - - [auto, palette, ui/files/skolar_silhouette] - - [auto, ci4, ui/files/muskular, 16, 16] - - [auto, palette, ui/files/muskular] - - [auto, ci4, ui/files/muskular_silhouette, 16, 16] - - [auto, palette, ui/files/muskular_silhouette] - - [auto, ci4, ui/files/misstar, 16, 16] - - [auto, palette, ui/files/misstar] - - [auto, ci4, ui/files/misstar_silhouette, 16, 16] - - [auto, palette, ui/files/misstar_silhouette] - - [auto, ci4, ui/files/klevar, 16, 16] - - [auto, palette, ui/files/klevar] - - [auto, ci4, ui/files/klevar_silhouette, 16, 16] - - [auto, palette, ui/files/klevar_silhouette] - - [auto, ci4, ui/files/kalmar, 16, 16] - - [auto, palette, ui/files/kalmar] - - [auto, ci4, ui/files/kalmar_silhouette, 16, 16] - - [auto, palette, ui/files/kalmar_silhouette] - - [auto, ci4, ui/pause/map_walk0, 24, 24] - - [auto, palette, ui/pause/map_walk0] - - [auto, ci4, ui/pause/map_walk1, 24, 24] - - [auto, palette, ui/pause/map_walk1] - - [auto, ci4, ui/pause/map_walk2, 24, 24] - - [auto, palette, ui/pause/map_walk2] - - [auto, ci4, ui/pause/jp_super, 40, 16] - - [auto, palette, ui/pause/jp_super] - - [auto, ci4, ui/pause/jp_ultra, 40, 16] - - [auto, palette, ui/pause/jp_ultra] - - [auto, ci4, ui/pause/list_prev_page, 16, 16] - - [auto, palette, ui/pause/list_prev_page] - - [auto, ci4, ui/pause/list_next_page, 16, 16] - - [auto, palette, ui/pause/list_next_page] - - [auto, ci4, ui/pause/unused_z_up_arrow, 16, 16] - - [auto, palette, ui/pause/unused_z_up_arrow] - - [auto, ci4, ui/pause/unused_r_down_arrow, 16, 16] - - [auto, palette, ui/pause/unused_r_down_arrow] - - [auto, ci4, ui/pause/desc_msg_prev, 16, 16] - - [auto, palette, ui/pause/desc_msg_prev] - - [auto, ci4, ui/pause/desc_msg_next, 16, 16] - - [auto, palette, ui/pause/desc_msg_next] - - [auto, ci4, ui/pause/bp_needed, 48, 8] - - [auto, palette, ui/pause/bp_needed] - - [auto, ci4, ui/pause/mario_large, 32, 32] - - [auto, palette, ui/pause/mario_large] - - [auto, ci4, ui/pause/dash, 16, 8] - - [auto, palette, ui/pause/dash] - - [auto, ci4, ui/pause/stat_bp, 16, 16] - - [auto, palette, ui/pause/stat_bp] - - [auto, ci4, ui/pause/stat_mario, 16, 16] - - [auto, palette, ui/pause/stat_mario] - - [auto, ci4, ui/pause/stat_time, 16, 16] - - [auto, palette, ui/pause/stat_time] - - [auto, ci4, ui/pause/stat_star_piece0, 16, 16] - - [auto, palette, ui/pause/stat_star_piece0] - - [auto, ci4, ui/pause/stat_star_piece1, 16, 16] - - [auto, palette, ui/pause/stat_star_piece1] - - [auto, ci4, ui/pause/stat_star_piece2, 16, 16] - - [auto, palette, ui/pause/stat_star_piece2] - - [auto, ci4, ui/pause/stat_fp, 16, 16] - - [auto, palette, ui/pause/stat_fp] - - [auto, ci4, ui/pause/stat_times, 8, 8] - - [auto, palette, ui/pause/stat_times] - - [auto, ci4, ui/pause/stat_boots0, 16, 16] - - [auto, palette, ui/pause/stat_boots0] - - [auto, ci4, ui/pause/stat_boots1, 16, 16] - - [auto, palette, ui/pause/stat_boots1] - - [auto, ci4, ui/pause/stat_boots2, 16, 16] - - [auto, palette, ui/pause/stat_boots2] - - [auto, ci4, ui/pause/stat_boots3, 16, 16] - - [auto, palette, ui/pause/stat_boots3] - - [auto, ci4, ui/pause/stat_hammer0, 16, 16] - - [auto, palette, ui/pause/stat_hammer0] - - [auto, ci4, ui/pause/stat_hammer1, 16, 16] - - [auto, palette, ui/pause/stat_hammer1] - - [auto, ci4, ui/pause/stat_hammer2, 16, 16] - - [auto, palette, ui/pause/stat_hammer2] - - [auto, ci4, ui/pause/stat_hammer3, 16, 16] - - [auto, palette, ui/pause/stat_hammer3] - - [auto, ci4, ui/pause/partner_rank, 16, 16] - - [auto, palette, ui/pause/partner_rank] - - [auto, ci4, ui/pause/unused_bubble, 56, 16] - - [auto, palette, ui/pause/unused_bubble] - - [auto, .data, menu_hud_scripts] + - type: .data + name: menu_hud_scripts + subsegments: + - [auto, ci4, ui/pause/unused_badge_points, 24, 24] + - [auto, palette, ui/pause/unused_badge_points] + - [auto, palette, ui/pause/unused_badge_points.disabled] + - [auto, ci4, ui/pause/unused_compass, 24, 24] + - [auto, palette, ui/pause/unused_compass] + - [auto, palette, ui/pause/unused_compass.disabled] + - [auto, ci4, ui/pause/cursor_hand, 16, 16] + - [auto, palette, ui/pause/cursor_hand] + - [auto, ci4, ui/files/filename_caret, 16, 16] + - [auto, palette, ui/files/filename_caret] + - [auto, ci4, ui/files/filename_space, 8, 8] + - [auto, palette, ui/files/filename_space] + + - [auto, ci4, ui/pause/label_stats, 48, 16] + - [auto, palette, ui/pause/label_stats] + - [auto, ci4, ui/pause/label_badges, 48, 16] + - [auto, palette, ui/pause/label_badges] + - [auto, ci4, ui/pause/label_items, 48, 16] + - [auto, palette, ui/pause/label_items] + - [auto, ci4, ui/pause/label_party, 48, 16] + - [auto, palette, ui/pause/label_party] + + - [auto, ci4, ui/pause/label_spirits, 48, 16] + - [auto, palette, ui/pause/label_spirits] + - [auto, ci4, ui/pause/label_map, 48, 16] + - [auto, palette, ui/pause/label_map] + + - [auto, ci4, ui/pause/small_digit_0, 8, 8] + - [auto, palette, ui/pause/small_digit_0] + - [auto, ci4, ui/pause/small_digit_1, 8, 8] + - [auto, palette, ui/pause/small_digit_1] + - [auto, ci4, ui/pause/small_digit_2, 8, 8] + - [auto, palette, ui/pause/small_digit_2] + - [auto, ci4, ui/pause/small_digit_3, 8, 8] + - [auto, palette, ui/pause/small_digit_3] + - [auto, ci4, ui/pause/small_digit_4, 8, 8] + - [auto, palette, ui/pause/small_digit_4] + - [auto, ci4, ui/pause/small_digit_5, 8, 8] + - [auto, palette, ui/pause/small_digit_5] + - [auto, ci4, ui/pause/small_digit_6, 8, 8] + - [auto, palette, ui/pause/small_digit_6] + - [auto, ci4, ui/pause/small_digit_7, 8, 8] + - [auto, palette, ui/pause/small_digit_7] + - [auto, ci4, ui/pause/small_digit_8, 8, 8] + - [auto, palette, ui/pause/small_digit_8] + - [auto, ci4, ui/pause/small_digit_9, 8, 8] + - [auto, palette, ui/pause/small_digit_9] + - [auto, ci4, ui/pause/small_text_bp, 8, 8] + - [auto, palette, ui/pause/small_text_bp] + - [auto, ci4, ui/pause/label_jp_file, 32, 16] + - [auto, palette, ui/pause/label_jp_file] + - [auto, ci4, ui/pause/label_jp_file_disabled, 32, 16] + - [auto, palette, ui/pause/label_jp_file_disabled] + + - [auto, ci4, ui/files/option_mono_on, 64, 16] + - [auto, palette, ui/files/option_mono_on] + - [auto, ci4, ui/files/option_mono_off, 64, 16] + - [auto, palette, ui/files/option_mono_off] + - [auto, ci4, ui/files/option_stereo_on, 64, 16] + - [auto, palette, ui/files/option_stereo_on] + - [auto, ci4, ui/files/option_stereo_off, 64, 16] + - [auto, palette, ui/files/option_stereo_off] + + - [auto, ci4, ui/files/eldstar, 16, 16] + - [auto, palette, ui/files/eldstar] + - [auto, ci4, ui/files/eldstar_silhouette, 16, 16] + - [auto, palette, ui/files/eldstar_silhouette] + - [auto, ci4, ui/files/mamar, 16, 16] + - [auto, palette, ui/files/mamar] + - [auto, ci4, ui/files/mamar_silhouette, 16, 16] + - [auto, palette, ui/files/mamar_silhouette] + - [auto, ci4, ui/files/skolar, 16, 16] + - [auto, palette, ui/files/skolar] + - [auto, ci4, ui/files/skolar_silhouette, 16, 16] + - [auto, palette, ui/files/skolar_silhouette] + - [auto, ci4, ui/files/muskular, 16, 16] + - [auto, palette, ui/files/muskular] + - [auto, ci4, ui/files/muskular_silhouette, 16, 16] + - [auto, palette, ui/files/muskular_silhouette] + - [auto, ci4, ui/files/misstar, 16, 16] + - [auto, palette, ui/files/misstar] + - [auto, ci4, ui/files/misstar_silhouette, 16, 16] + - [auto, palette, ui/files/misstar_silhouette] + - [auto, ci4, ui/files/klevar, 16, 16] + - [auto, palette, ui/files/klevar] + - [auto, ci4, ui/files/klevar_silhouette, 16, 16] + - [auto, palette, ui/files/klevar_silhouette] + - [auto, ci4, ui/files/kalmar, 16, 16] + - [auto, palette, ui/files/kalmar] + - [auto, ci4, ui/files/kalmar_silhouette, 16, 16] + - [auto, palette, ui/files/kalmar_silhouette] + - [auto, ci4, ui/pause/map_walk0, 24, 24] + - [auto, palette, ui/pause/map_walk0] + - [auto, ci4, ui/pause/map_walk1, 24, 24] + - [auto, palette, ui/pause/map_walk1] + - [auto, ci4, ui/pause/map_walk2, 24, 24] + - [auto, palette, ui/pause/map_walk2] + - [auto, ci4, ui/pause/jp_super, 40, 16] + - [auto, palette, ui/pause/jp_super] + - [auto, ci4, ui/pause/jp_ultra, 40, 16] + - [auto, palette, ui/pause/jp_ultra] + - [auto, ci4, ui/pause/list_prev_page, 16, 16] + - [auto, palette, ui/pause/list_prev_page] + - [auto, ci4, ui/pause/list_next_page, 16, 16] + - [auto, palette, ui/pause/list_next_page] + - [auto, ci4, ui/pause/unused_z_up_arrow, 16, 16] + - [auto, palette, ui/pause/unused_z_up_arrow] + - [auto, ci4, ui/pause/unused_r_down_arrow, 16, 16] + - [auto, palette, ui/pause/unused_r_down_arrow] + - [auto, ci4, ui/pause/desc_msg_prev, 16, 16] + - [auto, palette, ui/pause/desc_msg_prev] + - [auto, ci4, ui/pause/desc_msg_next, 16, 16] + - [auto, palette, ui/pause/desc_msg_next] + + - [auto, ci4, ui/pause/bp_needed, 48, 8] + - [auto, palette, ui/pause/bp_needed] + + - [auto, ci4, ui/pause/mario_large, 32, 32] + - [auto, palette, ui/pause/mario_large] + - [auto, ci4, ui/pause/dash, 16, 8] + - [auto, palette, ui/pause/dash] + - [auto, ci4, ui/pause/stat_bp, 16, 16] + - [auto, palette, ui/pause/stat_bp] + - [auto, ci4, ui/pause/stat_mario, 16, 16] + - [auto, palette, ui/pause/stat_mario] + - [auto, ci4, ui/pause/stat_time, 16, 16] + - [auto, palette, ui/pause/stat_time] + - [auto, ci4, ui/pause/stat_star_piece0, 16, 16] + - [auto, palette, ui/pause/stat_star_piece0] + - [auto, ci4, ui/pause/stat_star_piece1, 16, 16] + - [auto, palette, ui/pause/stat_star_piece1] + - [auto, ci4, ui/pause/stat_star_piece2, 16, 16] + - [auto, palette, ui/pause/stat_star_piece2] + - [auto, ci4, ui/pause/stat_fp, 16, 16] + - [auto, palette, ui/pause/stat_fp] + - [auto, ci4, ui/pause/stat_times, 8, 8] + - [auto, palette, ui/pause/stat_times] + - [auto, ci4, ui/pause/stat_boots0, 16, 16] + - [auto, palette, ui/pause/stat_boots0] + - [auto, ci4, ui/pause/stat_boots1, 16, 16] + - [auto, palette, ui/pause/stat_boots1] + - [auto, ci4, ui/pause/stat_boots2, 16, 16] + - [auto, palette, ui/pause/stat_boots2] + - [auto, ci4, ui/pause/stat_boots3, 16, 16] + - [auto, palette, ui/pause/stat_boots3] + - [auto, ci4, ui/pause/stat_hammer0, 16, 16] + - [auto, palette, ui/pause/stat_hammer0] + - [auto, ci4, ui/pause/stat_hammer1, 16, 16] + - [auto, palette, ui/pause/stat_hammer1] + - [auto, ci4, ui/pause/stat_hammer2, 16, 16] + - [auto, palette, ui/pause/stat_hammer2] + - [auto, ci4, ui/pause/stat_hammer3, 16, 16] + - [auto, palette, ui/pause/stat_hammer3] + - [auto, ci4, ui/pause/partner_rank, 16, 16] + - [auto, palette, ui/pause/partner_rank] + - [auto, ci4, ui/pause/unused_bubble, 56, 16] + - [auto, palette, ui/pause/unused_bubble] - type: code dir: pause start: 0x135EE0 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index f1623912fc..6a07f179c4 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -26305,3 +26305,9 @@ battle_move_hammer_throw_ultra_hammer_gfx = 0x802A3BD8; // rom:0x755028 charset_peach_letter_png = 0x00007308; //rom:0x1164B8 charset_postcard_png = 0x0000B290; //rom:0x11A440 charset_letter_content_1_png = 0x0000D178; //rom:0x11C328 + +// RSP symbols +n_aspMainTextStart = 0x800731A0; // size:0xC60 name_end:n_aspMainTextEnd +gspF3DZEX2_NoN_PosLight_fifoTextStart = 0x80096030; // size:0x1630 name_end:gspF3DZEX2_NoN_PosLight_fifoTextEnd +gspF3DZEX2_NoN_PosLight_fifoDataStart = 0x80097660; // size:0x420 name_end:gspF3DZEX2_NoN_PosLight_fifoDataEnd +n_aspMainDataStart = 0x80097A80; // size:0x2B0 name_end:n_aspMainDataEnd