Miscellaneous data fixes (#2983)

* Replace bss lbl_ with init$0000

* Rename l_HIOInit to hio_set

The name is excluded from TP's weird maps, but hio_set is the name they used in TWW's maps.

* Fix a couple more init$ names

* Fix nbomb missing some bss

* Fix camera localstatics having wrong name

* Rename l_initHIO to hio_set

* A couple manual fixes

* Rename hioInit to hio_set

* Couple more manual fixes

* Fix d_a_npc_cd2 data and function order

* More data fixes

* Fix inconsistent hex vs decimal
This commit is contained in:
LagoLunatic
2025-12-21 16:43:06 -08:00
committed by GitHub
parent c69e31bd0f
commit b4f931f75f
419 changed files with 1789 additions and 2004 deletions
+1 -1
View File
@@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_138_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
@3759 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte
bh = .bss:0x0000006C; // type:object size:0x8 scope:global
+2 -2
View File
@@ -292,7 +292,7 @@ __vt__8cM3dGAab = .data:0x000004AC; // type:object size:0xC scope:global
__vt__12J3DFrameCtrl = .data:0x000004B8; // type:object size:0xC scope:global
__vt__12daB_BQ_HIO_c = .data:0x000004C4; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_139_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
data_805BAD50 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte
@3811 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte
lbl_139_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte
data_805BAD70 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte
+2 -2
View File
@@ -279,10 +279,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_140_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
@3795 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x68 scope:global data:byte
lbl_140_bss_BC = .bss:0x000000BC; // type:object size:0x1 data:byte
data_805C7974 = .bss:0x000000BC; // type:object size:0x1 scope:local align:1 data:byte
@6782 = .bss:0x000000C0; // type:object size:0xC scope:local
@6785 = .bss:0x000000D0; // type:object size:0xC scope:local
@6786 = .bss:0x000000DC; // type:object size:0xC scope:local
+1 -1
View File
@@ -166,7 +166,7 @@ s_HeadPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000060; // type:object size:0xC
s_BodyPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000078; // type:object size:0xC scope:global
@3770 = .bss:0x00000084; // type:object size:0xC scope:local
s_TalePos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000090; // type:object size:0xC scope:global
lbl_141_bss_9C = .bss:0x0000009C; // type:object size:0x1 data:byte
init$0000 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global
sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000A8; // type:object size:0x4 scope:global
+2 -2
View File
@@ -522,13 +522,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_142_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
@3948 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x50 scope:global data:byte
handL_ang = .bss:0x000000A4; // type:object size:0x2 scope:global
handR_ang = .bss:0x000000A6; // type:object size:0x2 scope:global
handX_ang = .bss:0x000000A8; // type:object size:0x2 scope:global
lbl_142_bss_AA = .bss:0x000000AA; // type:object size:0x1 data:byte
breathTimerBase = .bss:0x000000AA; // type:object size:0x1 scope:local align:1 data:byte
@5249 = .bss:0x000000AC; // type:object size:0xC scope:local
init$3146 = .bss:0x000000B8; // type:object size:0x1 scope:local data:byte
@5252 = .bss:0x000000BC; // type:object size:0xC scope:local
+1 -1
View File
@@ -306,7 +306,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_143_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
@3927 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte
s_dis__22@unnamed@d_a_b_gg_cpp@ = .bss:0x00000070; // type:object size:0x4 scope:global align:4 data:float
+1 -1
View File
@@ -362,7 +362,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_145_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
@3810 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte
@4187 = .bss:0x00000070; // type:object size:0xC scope:local
+1 -1
View File
@@ -56,6 +56,6 @@ __vt__8cM3dGAab = .data:0x00000068; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x00000074; // type:object size:0x24 scope:global
__vt__12daB_GO_HIO_c = .data:0x00000098; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_146_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte
@3641 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
+1 -1
View File
@@ -61,6 +61,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global
__vt__13daB_GOS_HIO_c = .data:0x000001D4; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
boss = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte
lbl_147_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte
init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte
@3641 = .bss:0x00000010; // type:object size:0xC scope:local
l_HIO = .bss:0x0000001C; // type:object size:0x10 scope:global data:byte
+1 -1
View File
@@ -255,6 +255,6 @@ __vt__12J3DFrameCtrl = .data:0x00000380; // type:object size:0xC scope:global
__vt__8cM3dGPla = .data:0x0000038C; // type:object size:0xC scope:global
__vt__13daB_MGN_HIO_c = .data:0x00000398; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_148_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte
@3944 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte
+1 -1
View File
@@ -342,7 +342,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_149_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
data_8061B4FD = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
moveSW = .bss:0x00000048; // type:object size:0x4 scope:global
moveSW2 = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte
@3767 = .bss:0x00000050; // type:object size:0xC scope:local
+1 -1
View File
@@ -100,7 +100,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_150_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
@3645 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte
boss = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte
+1 -1
View File
@@ -327,7 +327,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_152_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
@3936 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x30 scope:global data:byte
@3949 = .bss:0x00000084; // type:object size:0xC scope:local
+1 -1
View File
@@ -280,7 +280,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_153_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
@3783 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x5C scope:global data:byte
@3802 = .bss:0x000000B0; // type:object size:0xC scope:local
+1 -1
View File
@@ -130,6 +130,6 @@ __vt__8cM3dGCyl = .data:0x00000214; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x00000220; // type:object size:0xC scope:global
__vt__13daB_YOI_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_154_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte
@3771 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte
+1 -1
View File
@@ -345,7 +345,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_155_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte
@4164 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x44 scope:global data:byte
@4182 = .bss:0x00000098; // type:object size:0xC scope:local
+1 -1
View File
@@ -131,7 +131,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte
hio_set = .bss:0x00000045; // type:object size:0x1 data:byte
@3937 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte
@3946 = .bss:0x00000074; // type:object size:0xC scope:local
+1 -1
View File
@@ -123,4 +123,4 @@ l_bmdName$3644 = .bss:0x00000000; // type:object size:0x10 scope:local
l_btkName$3652 = .bss:0x00000010; // type:object size:0x10 scope:local
l_brkName$3660 = .bss:0x00000020; // type:object size:0x10 scope:local
l_dzbName$3668 = .bss:0x00000030; // type:object size:0x10 scope:local
lbl_4_bss_40 = .bss:0x00000040; // type:object size:0x1 data:byte
init$0000 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte
+1 -1
View File
@@ -44,4 +44,4 @@ __vt__10cCcD_GStts = .data:0x000000A8; // type:object size:0xC scope:global
__vt__10dCcD_GStts = .data:0x000000B4; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x000000C0; // type:object size:0xC scope:global
__vt__12J3DFrameCtrl = .data:0x000000CC; // type:object size:0xC scope:global
lbl_47_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1
@@ -165,6 +165,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
@5356 = .bss:0x00000048; // type:object size:0xC scope:local
init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte
effScale$5355 = .bss:0x00000058; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global

Some files were not shown because too many files have changed in this diff Show More