From f92361d7fc85afd2f1294a5b5652568192724000 Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 14 Mar 2025 13:19:27 +0100 Subject: [PATCH] Fix various symbol problems --- .../rels/d_a_obj_fence_boko2NP/symbols.txt | 2 +- .../rels/d_a_obj_fence_konsaiNP/symbols.txt | 4 +- .../rels/d_a_obj_shrine_afterNP/symbols.txt | 6 +- .../rels/d_a_obj_shrine_beforeNP/symbols.txt | 6 +- config/SOUE01/symbols.txt | 112 +++++++++--------- 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_fence_boko2NP/symbols.txt b/config/SOUE01/rels/d_a_obj_fence_boko2NP/symbols.txt index e280cd7d..166bd65e 100644 --- a/config/SOUE01/rels/d_a_obj_fence_boko2NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fence_boko2NP/symbols.txt @@ -10,7 +10,7 @@ draw__16dAcOfenceBoko2_cFv = .text:0x00000320; // type:function size:0x28 __dt__16dAcOfenceBoko2_cFv = .text:0x00000350; // type:function size:0x74 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_371_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float +lbl_371_rodata_0 = .rodata:0x00000000; // type:object size:0x1C scope:local data:float g_profile_OBJ_FENCE_BOKO2 = .data:0x00000000; // type:object size:0x10 lbl_370_data_10 = .data:0x00000010; // type:object size:0xB scope:local data:string lbl_370_data_1C = .data:0x0000001C; // type:object size:0x13 scope:local data:string diff --git a/config/SOUE01/rels/d_a_obj_fence_konsaiNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fence_konsaiNP/symbols.txt index 89e6381a..6a4480a7 100644 --- a/config/SOUE01/rels/d_a_obj_fence_konsaiNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fence_konsaiNP/symbols.txt @@ -10,7 +10,7 @@ draw__17dAcOfenceKonsai_cFv = .text:0x000002C0; // type:function size:0x28 __dt__17dAcOfenceKonsai_cFv = .text:0x000002F0; // type:function size:0x74 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_381_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float +lbl_381_rodata_0 = .rodata:0x00000000; // type:object size:0x18 scope:local data:float g_profile_OBJ_FENCE_KONSAI = .data:0x00000000; // type:object size:0x44 -lbl_381_data_44 = .data:0x00000044; // type:object size:0x24 +lbl_381_data_44 = .data:0x00000044; // type:object size:0x24 scope:local __vt__17dAcOfenceKonsai_c = .data:0x00000068; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_shrine_afterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_shrine_afterNP/symbols.txt index d89092a6..c40d73d8 100644 --- a/config/SOUE01/rels/d_a_obj_shrine_afterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_shrine_afterNP/symbols.txt @@ -10,8 +10,8 @@ draw__17dAcOshrineAfter_cFv = .text:0x00000240; // type:function size:0x28 __dt__17dAcOshrineAfter_cFv = .text:0x00000270; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_387_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float +lbl_387_rodata_0 = .rodata:0x00000000; // type:object size:0x18 scope:local data:float g_profile_OBJ_SHRINE_AFTER = .data:0x00000000; // type:object size:0x10 -lbl_387_data_10 = .data:0x00000010; // type:object size:0x10 -lbl_387_data_20 = .data:0x00000020; // type:object size:0x20 +lbl_387_data_10 = .data:0x00000010; // type:object size:0x10 scope:local +lbl_387_data_20 = .data:0x00000020; // type:object size:0x20 scope:local __vt__17dAcOshrineAfter_c = .data:0x00000040; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_shrine_beforeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_shrine_beforeNP/symbols.txt index e097667e..d0c90e2d 100644 --- a/config/SOUE01/rels/d_a_obj_shrine_beforeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_shrine_beforeNP/symbols.txt @@ -10,8 +10,8 @@ draw__18dAcOshrineBefore_cFv = .text:0x00000250; // type:function size:0x28 __dt__18dAcOshrineBefore_cFv = .text:0x00000280; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_388_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float +lbl_388_rodata_0 = .rodata:0x00000000; // type:object size:0x1C scope:local data:float g_profile_OBJ_SHRINE_BEFORE = .data:0x00000000; // type:object size:0x10 -lbl_388_data_10 = .data:0x00000010; // type:object size:0x10 -lbl_388_data_20 = .data:0x00000020; // type:object size:0x20 data:string +lbl_388_data_10 = .data:0x00000010; // type:object size:0x10 scope:local +lbl_388_data_20 = .data:0x00000020; // type:object size:0x20 scope:local data:string __vt__18dAcOshrineBefore_c = .data:0x00000040; // type:object size:0x80 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index dc0ceaed..5aed4c7b 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -31326,35 +31326,35 @@ lbl_8051442C = .data:0x8051442C; // type:object size:0x3E4 __vt__34sFStateID_c<19dLytMeterSmallKey_c> = .data:0x80514810; // type:object size:0x34 __vt__33sFStateID_c<18dLytMeterBossKey_c> = .data:0x80514844; // type:object size:0x34 __vt__35sFStateID_c<20dLytMeterKakeraKey_c> = .data:0x80514878; // type:object size:0x34 -lbl_805148B0 = .data:0x805148B0; // type:object size:0xC -lbl_805148BC = .data:0x805148BC; // type:object size:0xC -lbl_805148C8 = .data:0x805148C8; // type:object size:0xC +lbl_805148B0 = .data:0x805148B0; // type:object size:0xB data:string +lbl_805148BC = .data:0x805148BC; // type:object size:0xB data:string +lbl_805148C8 = .data:0x805148C8; // type:object size:0xB data:string lbl_805148D4 = .data:0x805148D4; // type:object size:0xC data:4byte -lbl_805148E0 = .data:0x805148E0; // type:object size:0x18 -lbl_805148F8 = .data:0x805148F8; // type:object size:0x10 -lbl_80514908 = .data:0x80514908; // type:object size:0x14 -lbl_8051491C = .data:0x8051491C; // type:object size:0xC -lbl_80514928 = .data:0x80514928; // type:object size:0xC -lbl_80514934 = .data:0x80514934; // type:object size:0xC -lbl_80514940 = .data:0x80514940; // type:object size:0x18 -lbl_80514958 = .data:0x80514958; // type:object size:0xC -lbl_80514964 = .data:0x80514964; // type:object size:0xC -lbl_80514970 = .data:0x80514970; // type:object size:0xC +lbl_805148E0 = .data:0x805148E0; // type:object size:0x16 data:string +lbl_805148F8 = .data:0x805148F8; // type:object size:0xF data:string +lbl_80514908 = .data:0x80514908; // type:object size:0x12 data:string +lbl_8051491C = .data:0x8051491C; // type:object size:0xB data:string +lbl_80514928 = .data:0x80514928; // type:object size:0xB data:string +lbl_80514934 = .data:0x80514934; // type:object size:0xB data:string +lbl_80514940 = .data:0x80514940; // type:object size:0x15 data:string +lbl_80514958 = .data:0x80514958; // type:object size:0xB data:string +lbl_80514964 = .data:0x80514964; // type:object size:0xB data:string +lbl_80514970 = .data:0x80514970; // type:object size:0xB data:string lbl_8051497C = .data:0x8051497C; // type:object size:0x14 data:string -lbl_80514990 = .data:0x80514990; // type:object size:0xC -lbl_8051499C = .data:0x8051499C; // type:object size:0xC -lbl_805149A8 = .data:0x805149A8; // type:object size:0xC -lbl_805149B4 = .data:0x805149B4; // type:object size:0x18 -lbl_805149CC = .data:0x805149CC; // type:object size:0x10 -lbl_805149DC = .data:0x805149DC; // type:object size:0x10 -lbl_805149EC = .data:0x805149EC; // type:object size:0x10 +lbl_80514990 = .data:0x80514990; // type:object size:0xA data:string +lbl_8051499C = .data:0x8051499C; // type:object size:0xA data:string +lbl_805149A8 = .data:0x805149A8; // type:object size:0xA data:string +lbl_805149B4 = .data:0x805149B4; // type:object size:0x17 data:string +lbl_805149CC = .data:0x805149CC; // type:object size:0xD data:string +lbl_805149DC = .data:0x805149DC; // type:object size:0xD data:string +lbl_805149EC = .data:0x805149EC; // type:object size:0xD data:string lbl_805149FC = .data:0x805149FC; // type:object size:0x14 data:string -lbl_80514A10 = .data:0x80514A10; // type:object size:0xC -lbl_80514A1C = .data:0x80514A1C; // type:object size:0xC -lbl_80514A28 = .data:0x80514A28; // type:object size:0xC -lbl_80514A34 = .data:0x80514A34; // type:object size:0x14 -lbl_80514A48 = .data:0x80514A48; // type:object size:0x18 -lbl_80514A60 = .data:0x80514A60; // type:object size:0x294 +lbl_80514A10 = .data:0x80514A10; // type:object size:0xA data:string +lbl_80514A1C = .data:0x80514A1C; // type:object size:0xA data:string +lbl_80514A28 = .data:0x80514A28; // type:object size:0xA data:string +lbl_80514A34 = .data:0x80514A34; // type:object size:0x13 data:string +lbl_80514A48 = .data:0x80514A48; // type:object size:0x17 data:string +lbl_80514A60 = .data:0x80514A60; // type:object size:0xF data:string __vt__31sFStateID_c<16dLytMeterDrink_c> = .data:0x80514CF4; // type:object size:0x34 __vt__36sFStateID_c<21dLytMeterDrinkParts_c> = .data:0x80514D28; // type:object size:0x34 lbl_80514D60 = .data:0x80514D60; // type:object size:0x10 @@ -32744,17 +32744,17 @@ __vt__35sFStateID_c<20dLytMapFloorBtnMgr_c> = .data:0x80522518; // type:object s __vt__32sFStateID_c<17dLytMapFloorBtn_c> = .data:0x8052254C; // type:object size:0x34 __vt__40sFStateID_c<25dLytMapPinIconAggregate_c> = .data:0x80522580; // type:object size:0x34 __vt__31sFStateID_c<16dLytMapPinIcon_c> = .data:0x805225B4; // type:object size:0x34 -lbl_805225E8 = .data:0x805225E8; // type:object size:0x20 -lbl_80522608 = .data:0x80522608; // type:object size:0xC -lbl_80522614 = .data:0x80522614; // type:object size:0x24 -lbl_80522638 = .data:0x80522638; // type:object size:0x24 -lbl_8052265C = .data:0x8052265C; // type:object size:0x20 -lbl_8052267C = .data:0x8052267C; // type:object size:0x20 -lbl_8052269C = .data:0x8052269C; // type:object size:0x20 -lbl_805226BC = .data:0x805226BC; // type:object size:0xC -lbl_805226C8 = .data:0x805226C8; // type:object size:0x10 -lbl_805226D8 = .data:0x805226D8; // type:object size:0x110 -lbl_805227E8 = .data:0x805227E8; // type:object size:0x38 +lbl_805225E8 = .data:0x805225E8; // type:object size:0x1D data:string +lbl_80522608 = .data:0x80522608; // type:object size:0xA data:string +lbl_80522614 = .data:0x80522614; // type:object size:0x21 data:string +lbl_80522638 = .data:0x80522638; // type:object size:0x22 data:string +lbl_8052265C = .data:0x8052265C; // type:object size:0x1E data:string +lbl_8052267C = .data:0x8052267C; // type:object size:0x1D data:string +lbl_8052269C = .data:0x8052269C; // type:object size:0x1F data:string +lbl_805226BC = .data:0x805226BC; // type:object size:0xB data:string +lbl_805226C8 = .data:0x805226C8; // type:object size:0xE data:string +lbl_805226D8 = .data:0x805226D8; // type:object size:0x15 data:string +__vt__25sFStateID_c<10dLytNote_c> = .data:0x805227E8; // type:object size:0x34 @7519 = .data:0x80522820; // type:object size:0x13 scope:local data:string ...data.0 = .data:0x80522820; // type:label scope:local @7520 = .data:0x80522834; // type:object size:0xB scope:local data:string @@ -34195,13 +34195,13 @@ __vt__18sFPhase<8dStage_c> = .data:0x8052E058; // type:object size:0x24 g_profile_STAGE_SELECT = .data:0x8052E080; // type:object size:0xC AcStageSelect__vtable = .data:0x8052E08C; // type:object size:0x4C g_profile_ROOM = .data:0x8052E0D8; // type:object size:0xC -lbl_8052E11C = .data:0x8052E11C; // type:object size:0x10 -lbl_8052E12C = .data:0x8052E12C; // type:object size:0x10 -lbl_8052E13C = .data:0x8052E13C; // type:object size:0x10 -lbl_8052E14C = .data:0x8052E14C; // type:object size:0x10 -lbl_8052E15C = .data:0x8052E15C; // type:object size:0xC -lbl_8052E168 = .data:0x8052E168; // type:object size:0xC -lbl_8052E174 = .data:0x8052E174; // type:object size:0x14 +lbl_8052E11C = .data:0x8052E11C; // type:object size:0xD data:string +lbl_8052E12C = .data:0x8052E12C; // type:object size:0xD data:string +lbl_8052E13C = .data:0x8052E13C; // type:object size:0xF data:string +lbl_8052E14C = .data:0x8052E14C; // type:object size:0xF data:string +lbl_8052E15C = .data:0x8052E15C; // type:object size:0xB data:string +lbl_8052E168 = .data:0x8052E168; // type:object size:0x9 data:string +lbl_8052E174 = .data:0x8052E174; // type:object size:0x12 data:string __vt__7dRoom_c = .data:0x8052E188; // type:object size:0x4C __vt__Q27dRoom_c12UnkRoomClass = .data:0x8052E1D4; // type:object size:0xC __vt__45sFStateMgr_c<7dRoom_c,20sStateMethodUsr_FI_c> = .data:0x8052E1E0; // type:object size:0x30 @@ -38289,7 +38289,7 @@ lbl_80572848 = .sdata:0x80572848; // type:object size:0x8 lbl_80572850 = .sdata:0x80572850; // type:object size:0x4 lbl_80572854 = .sdata:0x80572854; // type:object size:0x8 lbl_8057285C = .sdata:0x8057285C; // type:object size:0xC -lbl_80572868 = .sdata:0x80572868; // type:object size:0x8 data:4byte +lbl_80572868 = .sdata:0x80572868; // type:object size:0x4 data:4byte @8144 = .sdata:0x80572870; // type:object size:0x1 scope:local data:string lbl_80572878 = .sdata:0x80572878; // type:object size:0x4 lbl_8057287C = .sdata:0x8057287C; // type:object size:0x4 @@ -38660,16 +38660,16 @@ lbl_805732D8 = .sdata:0x805732D8; // type:object size:0x8 lbl_805732E0 = .sdata:0x805732E0; // type:object size:0x8 lbl_805732E8 = .sdata:0x805732E8; // type:object size:0x8 lbl_805732F0 = .sdata:0x805732F0; // type:object size:0x8 data:4byte -lbl_805732F8 = .sdata:0x805732F8; // type:object size:0x8 -lbl_80573300 = .sdata:0x80573300; // type:object size:0x8 -lbl_80573308 = .sdata:0x80573308; // type:object size:0x8 -lbl_80573310 = .sdata:0x80573310; // type:object size:0x8 -lbl_80573318 = .sdata:0x80573318; // type:object size:0x8 -lbl_80573320 = .sdata:0x80573320; // type:object size:0x8 -lbl_80573328 = .sdata:0x80573328; // type:object size:0x8 -lbl_80573330 = .sdata:0x80573330; // type:object size:0x8 +lbl_805732F8 = .sdata:0x805732F8; // type:object size:0x5 data:string +lbl_80573300 = .sdata:0x80573300; // type:object size:0x5 data:string +lbl_80573308 = .sdata:0x80573308; // type:object size:0x5 data:string +lbl_80573310 = .sdata:0x80573310; // type:object size:0x7 data:string +lbl_80573318 = .sdata:0x80573318; // type:object size:0x5 data:string +lbl_80573320 = .sdata:0x80573320; // type:object size:0x5 data:string +lbl_80573328 = .sdata:0x80573328; // type:object size:0x6 data:string +lbl_80573330 = .sdata:0x80573330; // type:object size:0x7 data:string lbl_80573338 = .sdata:0x80573338; // type:object size:0x8 data:string -lbl_80573340 = .sdata:0x80573340; // type:object size:0x8 +lbl_80573340 = .sdata:0x80573340; // type:object size:0x3 data:string lbl_80573348 = .sdata:0x80573348; // type:object size:0x8 lbl_80573350 = .sdata:0x80573350; // type:object size:0x8 lbl_80573358 = .sdata:0x80573358; // type:object size:0x8 @@ -48963,7 +48963,7 @@ StateID_EventSaveObjSelect__13dLytMapMain_c = .bss:0x805B0740; // type:object si StateID_EventSaveObjConfirmMsgWindow__13dLytMapMain_c = .bss:0x805B0780; // type:object size:0x30 data:4byte StateID_EventSaveObjDecide__13dLytMapMain_c = .bss:0x805B07C0; // type:object size:0x30 data:4byte lbl_805B07F0 = .bss:0x805B07F0; // type:object size:0x40 -lbl_805B0830 = .bss:0x805B0830; // type:object size:0x10 +lbl_805B0830 = .bss:0x805B0830; // type:object size:0xC StateID_Wait__10dLytNote_c = .bss:0x805B0840; // type:object size:0x30 data:4byte StateID_In__10dLytNote_c = .bss:0x805B0880; // type:object size:0x30 data:4byte StateID_Move__10dLytNote_c = .bss:0x805B08C0; // type:object size:0x30 data:4byte @@ -49135,7 +49135,7 @@ STRING_SPACE = .bss:0x805B29E0; // type:object size:0x800 lbl_805B31E0 = .bss:0x805B31E0; // type:object size:0x400 MSBT_NAME_IN_ARC = .bss:0x805B35E0; // type:object size:0x80 data:byte lbl_805B3660 = .bss:0x805B3660; // type:object size:0x80 data:byte -lbl_805B36E0 = .bss:0x805B36E0; // type:object size:0x10 +lbl_805B36E0 = .bss:0x805B36E0; // type:object size:0xC StateID_Active__7dRoom_c = .bss:0x805B36F0; // type:object size:0x30 data:4byte StateID_NonActive__7dRoom_c = .bss:0x805B3730; // type:object size:0x30 data:4byte lbl_805B3760 = .bss:0x805B3760; // type:object size:0xC