mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
Various small matches (#2879)
* Misc debug matches * Fix JASBasicWaveBank weak func order * Remove more dol2asm stuff, fix missing includes * Some data fixes * Update comments * d_file_sel_warning is already OK * Fix Z2 splits * Fix movebox namespace * Fix inlining issue in m_Do_ext * Fix Z2 splits for P and J
This commit is contained in:
LagoLunatic
@@ -530,10 +530,12 @@ 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
|
||||
@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
|
||||
@5253 = .bss:0x000000C8; // type:object size:0xC scope:local
|
||||
mOpPlayerDt$5248 = .bss:0x000000D4; // type:object size:0x24 scope:local
|
||||
@5255 = .bss:0x000000F8; // type:object size:0xC scope:local
|
||||
init$3152 = .bss:0x00000104; // type:object size:0x1 scope:local data:byte
|
||||
@5258 = .bss:0x00000108; // type:object size:0xC scope:local
|
||||
@5259 = .bss:0x00000114; // type:object size:0xC scope:local
|
||||
@5260 = .bss:0x00000120; // type:object size:0xC scope:local
|
||||
@@ -550,9 +552,11 @@ mOpPlayerDt$5248 = .bss:0x000000D4; // type:object size:0x24 scope:local
|
||||
@5271 = .bss:0x000001A4; // type:object size:0xC scope:local
|
||||
mOpCenterDt$5254 = .bss:0x000001B0; // type:object size:0xB4 scope:local
|
||||
@5273 = .bss:0x00000264; // type:object size:0xC scope:local
|
||||
init$3170 = .bss:0x00000270; // type:object size:0x1 scope:local data:byte
|
||||
@5276 = .bss:0x00000274; // type:object size:0xC scope:local
|
||||
mOpCenterBodyDt$5272 = .bss:0x00000280; // type:object size:0x18 scope:local
|
||||
@5278 = .bss:0x00000298; // type:object size:0xC scope:local
|
||||
init$3175 = .bss:0x000002A4; // type:object size:0x1 scope:local data:byte
|
||||
@5281 = .bss:0x000002A8; // type:object size:0xC scope:local
|
||||
@5282 = .bss:0x000002B4; // type:object size:0xC scope:local
|
||||
@5283 = .bss:0x000002C0; // type:object size:0xC scope:local
|
||||
@@ -569,25 +573,30 @@ mOpCenterBodyDt$5272 = .bss:0x00000280; // type:object size:0x18 scope:local
|
||||
@5294 = .bss:0x00000344; // type:object size:0xC scope:local
|
||||
mOpEyeDt$5277 = .bss:0x00000350; // type:object size:0xB4 scope:local
|
||||
@5296 = .bss:0x00000404; // type:object size:0xC scope:local
|
||||
init$3193 = .bss:0x00000410; // type:object size:0x1 scope:local data:byte
|
||||
@5299 = .bss:0x00000414; // type:object size:0xC scope:local
|
||||
mOpEyeBodyDt$5295 = .bss:0x00000420; // type:object size:0x18 scope:local
|
||||
@6354 = .bss:0x00000438; // type:object size:0xC scope:local
|
||||
init$4244 = .bss:0x00000444; // type:object size:0x1 scope:local data:byte
|
||||
@6357 = .bss:0x00000448; // type:object size:0xC scope:local
|
||||
@6358 = .bss:0x00000454; // type:object size:0xC scope:local
|
||||
@6359 = .bss:0x00000460; // type:object size:0xC scope:local
|
||||
@6360 = .bss:0x0000046C; // type:object size:0xC scope:local
|
||||
down_center_dt$6353 = .bss:0x00000478; // type:object size:0x3C scope:local
|
||||
@6362 = .bss:0x000004B4; // type:object size:0xC scope:local
|
||||
init$4252 = .bss:0x000004C0; // type:object size:0x1 scope:local data:byte
|
||||
@6365 = .bss:0x000004C4; // type:object size:0xC scope:local
|
||||
@6366 = .bss:0x000004D0; // type:object size:0xC scope:local
|
||||
@6367 = .bss:0x000004DC; // type:object size:0xC scope:local
|
||||
@6368 = .bss:0x000004E8; // type:object size:0xC scope:local
|
||||
down_eye_dt$6361 = .bss:0x000004F4; // type:object size:0x3C scope:local
|
||||
@7447 = .bss:0x00000530; // type:object size:0xC scope:local
|
||||
init$5330 = .bss:0x0000053C; // type:object size:0x1 scope:local data:byte
|
||||
@7450 = .bss:0x00000540; // type:object size:0xC scope:local
|
||||
@7451 = .bss:0x0000054C; // type:object size:0xC scope:local
|
||||
mOp2PlayerDt$7446 = .bss:0x00000558; // type:object size:0x24 scope:local
|
||||
@7453 = .bss:0x0000057C; // type:object size:0xC scope:local
|
||||
init$5336 = .bss:0x00000588; // type:object size:0x1 scope:local data:byte
|
||||
@7456 = .bss:0x0000058C; // type:object size:0xC scope:local
|
||||
@7457 = .bss:0x00000598; // type:object size:0xC scope:local
|
||||
@7458 = .bss:0x000005A4; // type:object size:0xC scope:local
|
||||
@@ -596,6 +605,7 @@ mOp2PlayerDt$7446 = .bss:0x00000558; // type:object size:0x24 scope:local
|
||||
@7461 = .bss:0x000005C8; // type:object size:0xC scope:local
|
||||
mOp2CenterDt$7452 = .bss:0x000005D4; // type:object size:0x54 scope:local
|
||||
@7463 = .bss:0x00000628; // type:object size:0xC scope:local
|
||||
init$5346 = .bss:0x00000634; // type:object size:0x1 scope:local data:byte
|
||||
@7466 = .bss:0x00000638; // type:object size:0xC scope:local
|
||||
@7467 = .bss:0x00000644; // type:object size:0xC scope:local
|
||||
@7468 = .bss:0x00000650; // type:object size:0xC scope:local
|
||||
@@ -604,20 +614,24 @@ mOp2CenterDt$7452 = .bss:0x000005D4; // type:object size:0x54 scope:local
|
||||
@7471 = .bss:0x00000674; // type:object size:0xC scope:local
|
||||
mOp2EyeDt$7462 = .bss:0x00000680; // type:object size:0x54 scope:local
|
||||
@9091 = .bss:0x000006D4; // type:object size:0xC scope:local
|
||||
init$6933 = .bss:0x000006E0; // type:object size:0x1 scope:local data:byte
|
||||
@9094 = .bss:0x000006E4; // type:object size:0xC scope:local
|
||||
mEd2CenterDt$9090 = .bss:0x000006F0; // type:object size:0x18 scope:local
|
||||
@9096 = .bss:0x00000708; // type:object size:0xC scope:local
|
||||
init$6938 = .bss:0x00000714; // type:object size:0x1 scope:local data:byte
|
||||
@9099 = .bss:0x00000718; // type:object size:0xC scope:local
|
||||
mEd22EyeDt$9095 = .bss:0x00000724; // type:object size:0x18 scope:local
|
||||
lbl_142_bss_73C = .bss:0x0000073C; // type:object size:0x1 data:byte
|
||||
init$7517 = .bss:0x0000073C; // type:object size:0x1 scope:local data:byte
|
||||
mWaitDt$9733 = .bss:0x00000740; // type:object size:0xC scope:local data:4byte
|
||||
@10210 = .bss:0x0000074C; // type:object size:0xC scope:local
|
||||
init$8022 = .bss:0x00000758; // type:object size:0x1 scope:local data:byte
|
||||
@10213 = .bss:0x0000075C; // type:object size:0xC scope:local
|
||||
@10214 = .bss:0x00000768; // type:object size:0xC scope:local
|
||||
@10215 = .bss:0x00000774; // type:object size:0xC scope:local
|
||||
@10216 = .bss:0x00000780; // type:object size:0xC scope:local
|
||||
head_cc_dt$10209 = .bss:0x0000078C; // type:object size:0x3C scope:local
|
||||
@10829 = .bss:0x000007C8; // type:object size:0xC scope:local
|
||||
init$8634 = .bss:0x000007D4; // type:object size:0x1 scope:local data:byte
|
||||
@10832 = .bss:0x000007D8; // type:object size:0xC scope:local
|
||||
@10833 = .bss:0x000007E4; // type:object size:0xC scope:local
|
||||
@10834 = .bss:0x000007F0; // type:object size:0xC scope:local
|
||||
|
||||
@@ -249,5 +249,5 @@ sInstance__32JASGlobalInstance<11Z2FxLineMgr> = .bss:0x000000D0; // type:object
|
||||
sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .bss:0x000000D4; // type:object size:0x4 scope:global
|
||||
sInstance__32JASGlobalInstance<11Z2SpeechMgr> = .bss:0x000000D8; // type:object size:0x4 scope:global
|
||||
sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .bss:0x000000DC; // type:object size:0x4 scope:global
|
||||
lbl_289_bss_E0 = .bss:0x000000E0; // type:object size:0x1 data:byte
|
||||
init$localstatic4$setAttnPos__11daNpcBouS_cFv = .bss:0x000000E0; // type:object size:0x1 data:byte
|
||||
eyeOffset$localstatic3$setAttnPos__11daNpcBouS_cFv = .bss:0x000000E4; // type:object size:0xC scope:local align:4 data:float
|
||||
|
||||
@@ -446,5 +446,5 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
|
||||
@3974 = .bss:0x00000008; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x00000014; // type:object size:0x4 scope:global data:4byte
|
||||
@4628 = .bss:0x00000018; // type:object size:0xC scope:local
|
||||
lbl_378_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte
|
||||
init$localstatic4$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000024; // type:object size:0x1 data:byte
|
||||
eyeOffset$localstatic3$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000028; // type:object size:0xC scope:local align:4 data:float
|
||||
|
||||
@@ -189,22 +189,22 @@ __vt__14dBgS_ObjGndChk = .data:0x0000040C; // type:object size:0x30 scope:global
|
||||
__vt__11dBgS_WtrChk = .data:0x0000043C; // type:object size:0x30 scope:global
|
||||
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
...bss.0 = .bss:0x00000008; // type:label scope:local
|
||||
lit_1109 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
|
||||
lit_1107 = .bss:0x0000000C; // type:object size:0x1 scope:local
|
||||
lit_1105 = .bss:0x00000010; // type:object size:0x1 scope:local
|
||||
lit_1104 = .bss:0x00000014; // type:object size:0x1 scope:local
|
||||
lit_1099 = .bss:0x00000018; // type:object size:0x1 scope:local
|
||||
lit_1097 = .bss:0x0000001C; // type:object size:0x1 scope:local
|
||||
lit_1095 = .bss:0x00000020; // type:object size:0x1 scope:local
|
||||
lit_1094 = .bss:0x00000024; // type:object size:0x1 scope:local
|
||||
lit_1057 = .bss:0x00000028; // type:object size:0x1 scope:local
|
||||
lit_1055 = .bss:0x0000002C; // type:object size:0x1 scope:local
|
||||
lit_1053 = .bss:0x00000030; // type:object size:0x1 scope:local
|
||||
lit_1052 = .bss:0x00000034; // type:object size:0x1 scope:local
|
||||
lit_1014 = .bss:0x00000038; // type:object size:0x1 scope:local
|
||||
lit_1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
|
||||
lit_1010 = .bss:0x00000040; // type:object size:0x1 scope:local
|
||||
lit_1009 = .bss:0x00000044; // type:object size:0x1 scope:local
|
||||
@1109 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
|
||||
@1107 = .bss:0x0000000C; // type:object size:0x1 scope:local
|
||||
@1105 = .bss:0x00000010; // type:object size:0x1 scope:local
|
||||
@1104 = .bss:0x00000014; // type:object size:0x1 scope:local
|
||||
@1099 = .bss:0x00000018; // type:object size:0x1 scope:local
|
||||
@1097 = .bss:0x0000001C; // type:object size:0x1 scope:local
|
||||
@1095 = .bss:0x00000020; // type:object size:0x1 scope:local
|
||||
@1094 = .bss:0x00000024; // type:object size:0x1 scope:local
|
||||
@1057 = .bss:0x00000028; // type:object size:0x1 scope:local
|
||||
@1055 = .bss:0x0000002C; // type:object size:0x1 scope:local
|
||||
@1053 = .bss:0x00000030; // type:object size:0x1 scope:local
|
||||
@1052 = .bss:0x00000034; // type:object size:0x1 scope:local
|
||||
@1014 = .bss:0x00000038; // type:object size:0x1 scope:local
|
||||
@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
|
||||
init$2123 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
|
||||
init$2180 = .bss:0x00000046; // type:object size:0x1 scope:local data:byte
|
||||
init$2232 = .bss:0x00000047; // type:object size:0x1 scope:local data:byte
|
||||
|
||||
@@ -74,4 +74,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global
|
||||
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
@3647 = .bss:0x00000008; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global align:4 data:float
|
||||
lbl_698_bss_34 = .bss:0x00000034; // type:object size:0x1 data:byte
|
||||
init$1850 = .bss:0x00000034; // type:object size:0x1 data:byte
|
||||
|
||||
@@ -68,7 +68,7 @@ sRoot$4500 = .rodata:0x00000104; // type:object size:0xE0 scope:local
|
||||
@4571 = .rodata:0x00000204; // type:object size:0x4 scope:local align:4 data:float
|
||||
@4658 = .rodata:0x00000208; // type:object size:0x8 scope:local align:8 data:double
|
||||
@stringBase0 = .rodata:0x00000210; // type:object size:0x5 scope:local data:string_table
|
||||
lbl_699_data_0 = .data:0x00000000; // type:object size:0x1 data:byte
|
||||
@1738 = .data:0x00000000; // type:object size:0x1 data:byte
|
||||
l_arcName = .data:0x00000004; // type:object size:0x4 scope:global data:4byte
|
||||
l_daObjZraMark_Method = .data:0x00000008; // type:object size:0x20 scope:global
|
||||
g_profile_ZRA_MARK = .data:0x00000028; // type:object size:0x30 scope:global
|
||||
@@ -76,4 +76,4 @@ __vt__18daNpcF_ActorMngr_c = .data:0x00000058; // type:object size:0xC scope:glo
|
||||
__vt__8cM3dGCyl = .data:0x00000064; // type:object size:0xC scope:global
|
||||
__vt__8cM3dGAab = .data:0x00000070; // type:object size:0xC scope:global
|
||||
roottype$4501 = .bss:0x00000000; // type:object size:0x4 scope:local
|
||||
lbl_699_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte
|
||||
init$2350 = .bss:0x00000004; // type:object size:0x1 data:byte
|
||||
|
||||
@@ -37,4 +37,4 @@ l_func$3711 = .data:0x0000005C; // type:object size:0x30 scope:local
|
||||
action_table$3769 = .data:0x0000008C; // type:object size:0x8 scope:local
|
||||
l_daTagRiverBack_Method = .data:0x00000094; // type:object size:0x20 scope:global
|
||||
g_profile_Tag_RiverBack = .data:0x000000B4; // type:object size:0x30 scope:global
|
||||
lbl_736_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
|
||||
init$1712 = .bss:0x00000000; // type:object size:0x1 data:byte
|
||||
|
||||
@@ -2280,7 +2280,7 @@ Z2AudioLib/Z2Audience.cpp:
|
||||
.rodata start:0x8039C220 end:0x8039C230
|
||||
.data start:0x803CAC98 end:0x803CACD0
|
||||
.bss start:0x804341D8 end:0x804341F8
|
||||
.sbss start:0x80451350 end:0x80451360
|
||||
.sbss start:0x80451350 end:0x80451358
|
||||
.sdata2 start:0x80455AA0 end:0x80455B38
|
||||
|
||||
Z2AudioLib/Z2SoundObject.cpp:
|
||||
@@ -2300,6 +2300,7 @@ Z2AudioLib/Z2Creature.cpp:
|
||||
.text start:0x802C03C8 end:0x802C321C
|
||||
.ctors start:0x80373924 end:0x80373928
|
||||
.data start:0x803CB230 end:0x803CB8F0
|
||||
.sbss start:0x80451358 end:0x80451360
|
||||
.sdata2 start:0x80455BD8 end:0x80455C98
|
||||
|
||||
Z2AudioLib/Z2LinkMgr.cpp:
|
||||
|
||||
+18
-18
@@ -21907,20 +21907,20 @@ init$33110 = .sbss:0x80450FBC; // type:object size:0x1 scope:local align:1 data:
|
||||
init$33113 = .sbss:0x80450FBD; // type:object size:0x1 scope:local align:1 data:byte
|
||||
it$36766 = .sbss:0x80450FC0; // type:object size:0x4 scope:local align:4 data:4byte
|
||||
init$37466 = .sbss:0x80450FC4; // type:object size:0x1 scope:local align:4 data:byte
|
||||
lbl_80450FC5 = .sbss:0x80450FC5; // type:object size:0x1 data:byte
|
||||
lbl_80450FC6 = .sbss:0x80450FC6; // type:object size:0x1 data:byte
|
||||
lbl_80450FC7 = .sbss:0x80450FC7; // type:object size:0x1 data:byte
|
||||
m_eye_move_flg = .sbss:0x80450FC8; // type:object size:0x1 scope:local align:1 data:byte
|
||||
init$37209 = .sbss:0x80450FC5; // type:object size:0x1 data:byte
|
||||
init$37212 = .sbss:0x80450FC6; // type:object size:0x1 data:byte
|
||||
init$37215 = .sbss:0x80450FC7; // type:object size:0x1 data:byte
|
||||
m_eye_move_flg__16daAlink_matAnm_c = .sbss:0x80450FC8; // type:object size:0x1 scope:local align:1 data:byte
|
||||
m_morf_frame__16daAlink_matAnm_c = .sbss:0x80450FC9; // type:object size:0x1 scope:global align:1 data:byte
|
||||
bgWaitFlg = .sbss:0x80450FCC; // type:object size:0x4 scope:local align:4 data:4byte
|
||||
struct_80450FD0 = .sbss:0x80450FD0; // type:object size:0x1 scope:local align:1 data:byte
|
||||
data_80450FD1 = .sbss:0x80450FD1; // type:object size:0x1 scope:local align:1 data:byte
|
||||
bgWaitFlg$58404 = .sbss:0x80450FCC; // type:object size:0x4 scope:local align:4 data:4byte
|
||||
init$53406 = .sbss:0x80450FD0; // type:object size:0x1 scope:local align:1 data:byte
|
||||
init$55897 = .sbss:0x80450FD1; // type:object size:0x1 scope:local align:1 data:byte
|
||||
mSrchName__8daNpcT_c = .sbss:0x80450FD8; // type:object size:0x2 scope:global align:2 data:2byte
|
||||
mFindCount__8daNpcT_c = .sbss:0x80450FDC; // type:object size:0x4 scope:global align:4 data:4byte
|
||||
m_name__23daBaseNpc_moveBgActor_c = .sbss:0x80450FE0; // type:object size:0x4 scope:global align:4 data:4byte
|
||||
m_dzb_id__23daBaseNpc_moveBgActor_c = .sbss:0x80450FE4; // type:object size:0x4 scope:global align:4 data:4byte
|
||||
m_set_func__23daBaseNpc_moveBgActor_c = .sbss:0x80450FE8; // type:object size:0x4 scope:global align:4 data:4byte
|
||||
data_80450FEC = .sbss:0x80450FEC; // type:object size:0x1 scope:local align:4 data:byte
|
||||
init$7237 = .sbss:0x80450FEC; // type:object size:0x1 scope:local align:4 data:byte
|
||||
mFindCount__8daNpcF_c = .sbss:0x80450FF0; // type:object size:0x4 scope:global align:4 data:4byte
|
||||
mSrchActorName__8daNpcF_c = .sbss:0x80450FF4; // type:object size:0x2 scope:global align:2 data:2byte
|
||||
init$1719 = .sbss:0x80450FF8; // type:object size:0x1 scope:global align:1 data:byte
|
||||
@@ -21934,20 +21934,20 @@ m_dropAngleY__20daPy_boomerangMove_c = .sbss:0x8045101C; // type:object size:0x2
|
||||
m_eventKeepFlg__20daPy_boomerangMove_c = .sbss:0x8045101E; // type:object size:0x2 scope:global align:2 data:2byte
|
||||
Stage__22@unnamed@d_camera_cpp@ = .sbss:0x80451020; // type:object size:0x4 scope:global align:4 data:4byte
|
||||
prev_plat1$8536 = .sbss:0x80451024; // type:object size:0x4 scope:local align:4 data:4byte
|
||||
data_80451028 = .sbss:0x80451028; // type:object size:0x1 scope:local align:4 data:byte
|
||||
init$6037 = .sbss:0x80451028; // type:object size:0x1 scope:local align:4 data:byte
|
||||
prev_plat2$8539 = .sbss:0x8045102C; // type:object size:0x4 scope:local align:4 data:4byte
|
||||
data_80451030 = .sbss:0x80451030; // type:object size:0x1 scope:local align:4 data:byte
|
||||
init$6040 = .sbss:0x80451030; // type:object size:0x1 scope:local align:4 data:byte
|
||||
JumpCushion$9801 = .sbss:0x80451034; // type:object size:0x4 scope:local align:4 data:float
|
||||
data_80451038 = .sbss:0x80451038; // type:object size:0x1 scope:local align:4 data:byte
|
||||
data_80451039 = .sbss:0x80451039; // type:object size:0x1 data:byte
|
||||
init$7253 = .sbss:0x80451038; // type:object size:0x1 scope:local align:4 data:byte
|
||||
init$7257 = .sbss:0x80451039; // type:object size:0x1 data:byte
|
||||
LatitudeLimitMax$9807 = .sbss:0x8045103C; // type:object size:0x2 scope:local align:4
|
||||
data_8045103E = .sbss:0x8045103E; // type:object size:0x1 data:byte
|
||||
init$11469 = .sbss:0x8045103E; // type:object size:0x1 data:byte
|
||||
_120$14158 = .sbss:0x80451040; // type:object size:0x2 scope:local align:4 data:2byte
|
||||
data_80451042 = .sbss:0x80451042; // type:object size:0x1 data:byte
|
||||
init$11919 = .sbss:0x80451042; // type:object size:0x1 data:byte
|
||||
_120$14614 = .sbss:0x80451044; // type:object size:0x2 scope:local align:4 data:2byte
|
||||
data_80451046 = .sbss:0x80451046; // type:object size:0x1 data:byte
|
||||
init$12264 = .sbss:0x80451046; // type:object size:0x1 data:byte
|
||||
LatMin$14963 = .sbss:0x80451048; // type:object size:0x2 scope:local align:4 data:2byte
|
||||
data_8045104A = .sbss:0x8045104A; // type:object size:0x1 data:byte
|
||||
init$12268 = .sbss:0x8045104A; // type:object size:0x1 data:byte
|
||||
LatMax$14967 = .sbss:0x8045104C; // type:object size:0x2 scope:local align:4 data:2byte
|
||||
g_siHIO = .sbss:0x80451050; // type:object size:0x8 scope:global align:4
|
||||
dShopSystem_sellItemMax = .sbss:0x80451058; // type:object size:0x1 scope:local align:1 data:byte
|
||||
@@ -23641,8 +23641,8 @@ l_arcName = .sdata2:0x80452C90; // type:object size:0x6 scope:local align:4 data
|
||||
@21680 = .sdata2:0x80452F2C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@21736 = .sdata2:0x80452F30; // type:object size:0x4 scope:local align:4 data:float
|
||||
@22146 = .sdata2:0x80452F34; // type:object size:0x4 scope:local align:4 data:float
|
||||
data_80452F38 = .sdata2:0x80452F38; // type:object size:0x1 scope:local align:1 data:byte
|
||||
data_80452F39 = .sdata2:0x80452F39; // type:object size:0x1 scope:local align:1 data:byte
|
||||
data_80452F38$18852 = .sdata2:0x80452F38; // type:object size:0x1 scope:local align:1 data:byte
|
||||
data_80452F39$18853 = .sdata2:0x80452F39; // type:object size:0x1 scope:local align:1 data:byte
|
||||
@22608 = .sdata2:0x80452F3C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@22609 = .sdata2:0x80452F40; // type:object size:0x4 scope:local align:4 data:float
|
||||
@23155 = .sdata2:0x80452F44; // type:object size:0x4 scope:local align:4 data:float
|
||||
|
||||
@@ -2216,7 +2216,7 @@ Z2AudioLib/Z2Audience.cpp:
|
||||
.rodata start:0x80396380 end:0x80396390
|
||||
.data start:0x803C4DD8 end:0x803C4E10
|
||||
.bss start:0x8042E318 end:0x8042E338
|
||||
.sbss start:0x8044B490 end:0x8044B4A0
|
||||
.sbss start:0x8044B490 end:0x8044B498
|
||||
.sdata2 start:0x8044FBC0 end:0x8044FC58
|
||||
|
||||
Z2AudioLib/Z2SoundObject.cpp:
|
||||
@@ -2236,6 +2236,7 @@ Z2AudioLib/Z2Creature.cpp:
|
||||
.text start:0x802C2864 end:0x802C56B8
|
||||
.ctors start:0x80375DC4 end:0x80375DC8
|
||||
.data start:0x803C5370 end:0x803C5A30
|
||||
.sbss start:0x8044B498 end:0x8044B4A0
|
||||
.sdata2 start:0x8044FCF8 end:0x8044FDB8
|
||||
|
||||
Z2AudioLib/Z2LinkMgr.cpp:
|
||||
|
||||
@@ -2215,7 +2215,7 @@ Z2AudioLib/Z2Audience.cpp:
|
||||
.rodata start:0x8039DF00 end:0x8039DF10
|
||||
.data start:0x803CCC38 end:0x803CCC70
|
||||
.bss start:0x80436198 end:0x804361B8
|
||||
.sbss start:0x80453318 end:0x80453328
|
||||
.sbss start:0x80453318 end:0x80453320
|
||||
.sdata2 start:0x80457A78 end:0x80457B10
|
||||
|
||||
Z2AudioLib/Z2SoundObject.cpp:
|
||||
@@ -2235,6 +2235,7 @@ Z2AudioLib/Z2Creature.cpp:
|
||||
.text start:0x802C11C8 end:0x802C401C
|
||||
.ctors start:0x80374764 end:0x80374768
|
||||
.data start:0x803CD1D0 end:0x803CD890
|
||||
.sbss start:0x80453320 end:0x80453328
|
||||
.sdata2 start:0x80457BB0 end:0x80457C70
|
||||
|
||||
Z2AudioLib/Z2LinkMgr.cpp:
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
|
||||
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
|
||||
_unresolved = .text:0x00000060; // type:function size:0x20 scope:global
|
||||
daNpc_P2Create__FPv = .text:0x00000080; // type:function size:0x8 scope:global
|
||||
daNpc_P2Delete__FPv = .text:0x00000090; // type:function size:0x8 scope:global
|
||||
daNpc_P2Execute__FPv = .text:0x000000A0; // type:function size:0x8 scope:global
|
||||
daNpc_P2Draw__FPv = .text:0x000000B0; // type:function size:0x8 scope:global
|
||||
daNpc_P2IsDelete__FPv = .text:0x000000C0; // type:function size:0x8 scope:global
|
||||
daNpc_P2Create__FPv = .text:0x00000080; // type:function size:0x8 scope:local
|
||||
daNpc_P2Delete__FPv = .text:0x00000090; // type:function size:0x8 scope:local
|
||||
daNpc_P2Execute__FPv = .text:0x000000A0; // type:function size:0x8 scope:local
|
||||
daNpc_P2Draw__FPv = .text:0x000000B0; // type:function size:0x8 scope:local
|
||||
daNpc_P2IsDelete__FPv = .text:0x000000C0; // type:function size:0x8 scope:local
|
||||
_ctors = .ctors:0x00000000; // type:label scope:global
|
||||
_dtors = .dtors:0x00000000; // type:label scope:global
|
||||
daNpc_P2MethodTable = .data:0x00000000; // type:object size:0x20 scope:global
|
||||
daNpc_P2MethodTable = .data:0x00000000; // type:object size:0x20 scope:local
|
||||
g_profile_NPC_P2 = .data:0x00000020; // type:object size:0x30 scope:global
|
||||
|
||||
+13
-13
@@ -506,7 +506,7 @@ config.libs = [
|
||||
Object(MatchingFor(ALL_GCN), "m_Do/m_Do_graphic.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "m_Do/m_Do_machine.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "m_Do/m_Do_mtx.cpp"),
|
||||
Object(NonMatching, "m_Do/m_Do_ext.cpp"), # weak func order; unused weak func inlining issues
|
||||
Object(Equivalent, "m_Do/m_Do_ext.cpp"), # weak func order
|
||||
Object(MatchingFor(ALL_GCN), "m_Do/m_Do_lib.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "m_Do/m_Do_Reset.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "m_Do/m_Do_dvd_thread.cpp"),
|
||||
@@ -610,7 +610,7 @@ config.libs = [
|
||||
Object(MatchingFor(ALL_GCN), "d/d_com_inf_game.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_com_static.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_com_inf_actor.cpp"),
|
||||
Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bomb.cpp"),
|
||||
Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bomb.cpp"), # debug weak func order
|
||||
Object(MatchingFor(ALL_GCN), "d/d_lib.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_save.cpp"),
|
||||
Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_save_init.cpp"),
|
||||
@@ -692,7 +692,7 @@ config.libs = [
|
||||
Object(NonMatching, "d/d_camera.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_envse.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_file_select.cpp"),
|
||||
Object(NonMatching, "d/d_file_sel_warning.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_file_sel_warning.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_file_sel_info.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_bright_check.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_scope.cpp"),
|
||||
@@ -708,7 +708,7 @@ config.libs = [
|
||||
Object(MatchingFor(ALL_GCN), "d/d_ky_thunder.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_kantera_icon_meter.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_menu_calibration.cpp"),
|
||||
Object(NonMatching, "d/d_menu_collect.cpp"),
|
||||
Object(NonMatching, "d/d_menu_collect.cpp"), # weak func order (dMenu_Collect2D_c::draw())
|
||||
Object(MatchingFor(ALL_GCN), "d/d_menu_dmap.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_menu_dmap_map.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_menu_map_common.cpp"),
|
||||
@@ -724,7 +724,7 @@ config.libs = [
|
||||
Object(MatchingFor(ALL_GCN), "d/d_menu_save.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_menu_skill.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_menu_window_HIO.cpp"),
|
||||
Object(Equivalent, "d/d_menu_window.cpp"), # weak func order
|
||||
Object(Equivalent, "d/d_menu_window.cpp"), # weak func order (dDlst_MENU_CAPTURE_c::draw)
|
||||
Object(MatchingFor(ALL_GCN), "d/d_meter_HIO.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_meter_button.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "d/d_meter_haihai.cpp"),
|
||||
@@ -959,10 +959,10 @@ config.libs = [
|
||||
Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JASVoiceBank.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBasicInst.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDrumSet.cpp"),
|
||||
Object(Equivalent, "JSystem/JAudio2/JASBasicWaveBank.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBasicWaveBank.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASSimpleWaveBank.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASWSParser.cpp"),
|
||||
Object(NonMatching, "JSystem/JAudio2/JASBNKParser.cpp"),
|
||||
Object(NonMatching, "JSystem/JAudio2/JASBNKParser.cpp"), # missing bss var
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASWaveArcLoader.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASChannel.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASLfo.cpp"),
|
||||
@@ -1000,7 +1000,7 @@ config.libs = [
|
||||
Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JAUBankTable.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUClusterSound.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUInitializer.cpp"),
|
||||
Object(Equivalent, "JSystem/JAudio2/JAUSectionHeap.cpp"), #weak function order
|
||||
Object(Equivalent, "JSystem/JAudio2/JAUSectionHeap.cpp"), # weak function order
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSeqCollection.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSeqDataBlockMgr.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSoundAnimator.cpp"),
|
||||
@@ -1140,7 +1140,7 @@ config.libs = [
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DOrthoGraph.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DTevs.cpp"),
|
||||
Object(Equivalent, "JSystem/J2DGraph/J2DMaterial.cpp"), # weak func order
|
||||
Object(NonMatching, "JSystem/J2DGraph/J2DMatBlock.cpp"),
|
||||
Object(NonMatching, "JSystem/J2DGraph/J2DMatBlock.cpp"), # weak func order (J3DTevBlock)
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DMaterialFactory.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DPrint.cpp"),
|
||||
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DPane.cpp"),
|
||||
@@ -1855,13 +1855,13 @@ config.libs = [
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_myna"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_ni"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_aru"),
|
||||
ActorRel(Equivalent, "d_a_npc_ash"), # weak func order
|
||||
ActorRel(Equivalent, "d_a_npc_ashB"), # weak func order
|
||||
ActorRel(Equivalent, "d_a_npc_ash"), # weak func order (sinShort)
|
||||
ActorRel(Equivalent, "d_a_npc_ashB"), # weak func order (sinShort)
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_bans"),
|
||||
ActorRel(NonMatching, "d_a_npc_blue_ns"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_bou"),
|
||||
ActorRel(Equivalent, "d_a_npc_bouS"), # weak func order
|
||||
ActorRel(Equivalent, "d_a_npc_cdn3"), # weak func order
|
||||
ActorRel(Equivalent, "d_a_npc_bouS"), # weak func order (sinShort)
|
||||
ActorRel(Equivalent, "d_a_npc_cdn3"), # weak func order (~csXyz); vtable order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_chat"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_chin"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_clerka"),
|
||||
|
||||
@@ -929,6 +929,7 @@ public:
|
||||
|
||||
J3DFrameCtrl() { this->init(0); }
|
||||
void init(s16);
|
||||
void init(int endFrame) { init((s16)endFrame); }
|
||||
BOOL checkPass(f32);
|
||||
void update();
|
||||
virtual ~J3DFrameCtrl() {}
|
||||
@@ -987,8 +988,7 @@ struct J3DMtxCalcAnimationAdaptorDefault : public J3DMtxCalcAnimationAdaptorBase
|
||||
J3DTransformInfo transform;
|
||||
J3DTransformInfo* transform_p;
|
||||
if (pMtxCalc->getAnmTransform() != NULL) {
|
||||
u16 jnt_no = J3DMtxCalc::getJoint()->getJntNo();
|
||||
pMtxCalc->getAnmTransform()->getTransform(jnt_no, &transform);
|
||||
pMtxCalc->getAnmTransform()->getTransform(J3DMtxCalc::getJoint()->getJntNo(), &transform);
|
||||
transform_p = &transform;
|
||||
} else {
|
||||
transform_p = &J3DMtxCalc::getJoint()->getTransformInfo();
|
||||
|
||||
@@ -19,12 +19,27 @@ public:
|
||||
/* 80325D1C */ static void setMtxBuffer(J3DMtxBuffer*);
|
||||
|
||||
/* 8000D948 */ virtual ~J3DMtxCalc() {}
|
||||
/* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*) {}
|
||||
/* 80014E9C */ virtual J3DAnmTransform* getAnmTransform() { return NULL; }
|
||||
/* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*) {}
|
||||
/* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8) { return NULL; }
|
||||
/* 80014EA4 */ virtual void setWeight(u8, f32) {}
|
||||
/* 80014EA8 */ virtual f32 getWeight(u8) const { return 0.0f; }
|
||||
/* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*) {
|
||||
JUT_ASSERT_MSG(127, FALSE, "You cannot use this method");
|
||||
}
|
||||
/* 80014E9C */ virtual J3DAnmTransform* getAnmTransform() {
|
||||
JUT_ASSERT_MSG(131, FALSE, "You cannot use this method");
|
||||
return NULL;
|
||||
}
|
||||
/* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*) {
|
||||
JUT_ASSERT_MSG(137, FALSE, "You cannot use this method");
|
||||
}
|
||||
/* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8) {
|
||||
JUT_ASSERT_MSG(141, FALSE, "You cannot use this method");
|
||||
return NULL;
|
||||
}
|
||||
/* 80014EA4 */ virtual void setWeight(u8, f32) {
|
||||
JUT_ASSERT_MSG(147, FALSE, "You cannot use this method");
|
||||
}
|
||||
/* 80014EA8 */ virtual f32 getWeight(u8) const {
|
||||
JUT_ASSERT_MSG(152, FALSE, "You cannot use this method");
|
||||
return 0.0f;
|
||||
}
|
||||
virtual void init(const Vec& param_0, const Mtx&) = 0;
|
||||
virtual void calc() = 0;
|
||||
|
||||
@@ -125,7 +140,10 @@ public:
|
||||
J3DMtxCalcNoAnm() {}
|
||||
virtual ~J3DMtxCalcNoAnm() {}
|
||||
virtual void init(const Vec& param_0, const Mtx& param_1) { B::init(param_0, param_1); }
|
||||
virtual void calc() { A::calcTransform(mJoint->getTransformInfo()); }
|
||||
virtual void calc() {
|
||||
J3DTransformInfo& transInfo = getJoint()->getTransformInfo();
|
||||
A::calcTransform(transInfo);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -1641,7 +1641,7 @@ struct J3DIndTexMtx : public J3DIndTexMtxInfo {
|
||||
J3DIndTexMtx(J3DIndTexMtxInfo const& info) { *(J3DIndTexMtxInfo*)this = info; }
|
||||
/* 8000E064 */ ~J3DIndTexMtx() {}
|
||||
void load(u32 param_1) const {
|
||||
J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + 1), (Mtx3P)field_0x0, field_0x18);
|
||||
J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + GX_ITM_0), (Mtx3P)field_0x0, field_0x18);
|
||||
}
|
||||
}; // Size: 0x1C
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ public:
|
||||
|
||||
void onFlag(u32 flag) { mFlags |= flag; }
|
||||
void offFlag(u32 flag) { mFlags &= ~flag; }
|
||||
bool checkFlag(u32 flag) const { return (mFlags & flag) != 0; }
|
||||
bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; }
|
||||
|
||||
void setMaterial(J3DMaterial* pMaterial) {
|
||||
J3D_ASSERT_NULLPTR(509, pMaterial != NULL);
|
||||
|
||||
@@ -4,29 +4,6 @@
|
||||
#include "JSystem/JAudio2/JASWaveArcLoader.h"
|
||||
#include "JSystem/JAudio2/JASWaveInfo.h"
|
||||
|
||||
/**
|
||||
* @ingroup jsystem-jaudio
|
||||
*
|
||||
*/
|
||||
class JASWaveHandle {
|
||||
public:
|
||||
virtual ~JASWaveHandle() {};
|
||||
virtual const JASWaveInfo* getWaveInfo() const = 0;
|
||||
virtual int getWavePtr() const = 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* @ingroup jsystem-jaudio
|
||||
*
|
||||
*/
|
||||
class JASWaveBank {
|
||||
public:
|
||||
/* 80298B88 */ virtual ~JASWaveBank() {};
|
||||
virtual JASWaveHandle* getWaveHandle(u32) const = 0;
|
||||
virtual JASWaveArc* getWaveArc(u32) = 0;
|
||||
virtual u32 getArcCount() const = 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* @ingroup jsystem-jaudio
|
||||
*
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
#include "dolphin/types.h"
|
||||
|
||||
class JASWaveArc;
|
||||
|
||||
/**
|
||||
* @ingroup jsystem-jaudio
|
||||
*
|
||||
@@ -29,4 +31,27 @@ struct JASWaveInfo {
|
||||
static u32 one;
|
||||
};
|
||||
|
||||
/**
|
||||
* @ingroup jsystem-jaudio
|
||||
*
|
||||
*/
|
||||
class JASWaveHandle {
|
||||
public:
|
||||
virtual ~JASWaveHandle() {}
|
||||
virtual const JASWaveInfo* getWaveInfo() const = 0;
|
||||
virtual int getWavePtr() const = 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* @ingroup jsystem-jaudio
|
||||
*
|
||||
*/
|
||||
class JASWaveBank {
|
||||
public:
|
||||
/* 80298B88 */ virtual ~JASWaveBank() {}
|
||||
virtual JASWaveHandle* getWaveHandle(u32) const = 0;
|
||||
virtual JASWaveArc* getWaveArc(u32) = 0;
|
||||
virtual u32 getArcCount() const = 0;
|
||||
};
|
||||
|
||||
#endif /* JASWAVEINFO_H */
|
||||
|
||||
@@ -127,7 +127,6 @@ protected:
|
||||
/* 0x5C */ JSUList<JKRDisposer> mDisposerList;
|
||||
/* 0x68 */ bool mErrorFlag;
|
||||
/* 0x69 */ bool mInitFlag;
|
||||
/* 0x6A */ u8 padding_0x6a[2];
|
||||
|
||||
public:
|
||||
static bool initArena(char** memory, u32* size, int maxHeaps);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user