From 4eeaab47cd35d0920145b84c9f82bf30e715d5ad Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 24 Sep 2024 12:31:56 -0400 Subject: [PATCH] finish first pass of asset bin labeling --- include/sections.h | 4 ++++ linker_scripts/us/symbol_addrs.txt | 10 +++++----- src/2FEA0.c | 32 +++++++++++++++--------------- yamls/us/rom.yaml | 16 +++++++-------- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/include/sections.h b/include/sections.h index c6ee9c7..c5bdd66 100644 --- a/include/sections.h +++ b/include/sections.h @@ -514,6 +514,10 @@ extern u8 battle_ui_ROM_START[]; extern u8 battle_ui_ROM_END[]; extern u8 transfer_pak_error_ui_ROM_START[]; extern u8 transfer_pak_error_ui_ROM_END[]; +extern u8 badge_ui_ROM_START[]; +extern u8 badge_ui_ROM_END[]; +extern u8 gym_leader_castle_ui_ROM_START[]; +extern u8 gym_leader_castle_ui_ROM_END[]; extern u8 D_124570[]; diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 9fca0e3..2268d12 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -221,15 +221,15 @@ battle_ui_ROM_START = 0x6E2FC0; // defined:true transfer_pak_error_ui_ROM_START = 0x6E8910; // defined:true _6EB340_ROM_START = 0x6EB340; // defined:true _6EC4D0_ROM_START = 0x6EC4D0; // defined:true -_6ECE80_ROM_START = 0x6ECE80; // defined:true -_701E50_ROM_START = 0x701E50; // defined:true +badge_ui_ROM_START = 0x6ECE80; // defined:true +gym_leader_castle_ui_ROM_START = 0x701E50; // defined:true _70D3A0_ROM_START = 0x70D3A0; // defined:true _7820E0_ROM_START = 0x7820E0; // defined:true textdata_ROM_START = 0x783760; // defined:true _798CD0_ROM_START = 0x798CD0; // defined:true -_7994B0_ROM_START = 0x7994B0; // defined:true -_79AFB0_ROM_START = 0x79AFB0; // defined:true -_79AFB0_ROM_END = 0x79B8F0; // defined:true +snap_mode_ui_ROM_START = 0x7994B0; // defined:true +copyright_ROM_START = 0x79AFB0; // defined:true +copyright_ROM_END = 0x79B8F0; // defined:true D_86002B84 = 0x86002B84; // size:3 D_86002B88 = 0x86002B88; // size:3 _binary_assets_us_F3DEX2_bin_start = 0x80066090; // defined:true diff --git a/src/2FEA0.c b/src/2FEA0.c index 2a4b631..d8234e6 100644 --- a/src/2FEA0.c +++ b/src/2FEA0.c @@ -31,67 +31,67 @@ void func_8002F2A0(void) { FRAGMENT_LOAD(fragment34); switch (sp60) { - case 1: + case 1: // magikarp minigame FRAGMENT_LOAD(fragment4); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment6, 0, 0); break; - case 2: + case 2: // clefairy minigame FRAGMENT_LOAD(fragment4); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment7, 0, 0); break; - case 3: + case 3: // rattata minigame FRAGMENT_LOAD(fragment4); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment8, 0, 0); break; - case 4: + case 4: // unfinished jigglypuff minigame FRAGMENT_LOAD(fragment4); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment9, 0, 0); break; - case 5: + case 5: // drowzee minigame FRAGMENT_LOAD(fragment5); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment10, 0, 0); break; - case 6: + case 6: // pikachu minigame FRAGMENT_LOAD(fragment5); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment11, 0, 0); break; - case 7: + case 7: // "minigame 7 sample" model viewer. debug placeholder? FRAGMENT_LOAD(fragment5); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment12, 0, 0); break; - case 8: + case 8: // "minigame 8 sample" model viewer. debug placeholder? FRAGMENT_LOAD(fragment5); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment13, 0, 0); break; - case 9: + case 9: // sushi go round FRAGMENT_LOAD(fragment3); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment14, 0, 0); break; - case 10: + case 10: // doesnt seem to load... crashes the game FRAGMENT_LOAD(fragment3); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment15, 0, 0); break; - case 11: + case 11: // credits? why from the kids club? FRAGMENT_LOAD(fragment5); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment16, 0, 0); break; - case 12: + case 12: // also crashes. FRAGMENT_LOAD(fragment3); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment17, 0, 0); break; - case 13: + case 13: // ekans minigame FRAGMENT_LOAD(fragment3); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment18, 0, 0); break; - case 14: + case 14: // crashes... FRAGMENT_LOAD(fragment3); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment19, 0, 0); break; - case 15: + case 15: // FRAGMENT_LOAD(fragment3); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment20, 0, 0); break; - case 16: + case 16: // sandshrew minigame FRAGMENT_LOAD(fragment3); var_s0 = FRAGMENT_LOAD_AND_CALL(fragment21, 0, 0); break; diff --git a/yamls/us/rom.yaml b/yamls/us/rom.yaml index 0b911ec..c6a63a2 100644 --- a/yamls/us/rom.yaml +++ b/yamls/us/rom.yaml @@ -840,7 +840,7 @@ subsegments: - [0x142200, rodatabin, fragments/11/fragment11_reloc] -# transfer pak error code + # debug model viewer/minigame sample - name: fragment12 type: code bss_size: 0x180 @@ -2472,15 +2472,15 @@ - [0x6E2FC0, bin, battle_ui] - [0x6E8910, bin, transfer_pak_error_ui] - [0x6EB340, bin] # pokedex area flags? - - [0x6EC4D0, bin] - - [0x6ECE80, bin] - - [0x701E50, bin] - - [0x70D3A0, bin] - - [0x7820E0, bin] + - [0x6EC4D0, bin] # another UI bin related to GB paks as its loaded whenever there is GB pak elements, however it doesnt seem(?) to be used. + - [0x6ECE80, bin, badge_ui] + - [0x701E50, bin, gym_leader_castle_ui] + - [0x70D3A0, bin] # maybe model animation related? + - [0x7820E0, bin] - [0x783760, bin, textdata] - [0x798CD0, bin] - - [0x7994B0, bin] - - [0x79AFB0, bin] + - [0x7994B0, bin, snap_mode_ui] + - [0x79AFB0, bin, copyright] - [0x79B8F0]