Misc fixes (#2830)

* Replace DANPCF_C_HACK with a better fakematch

* d_a_obj_item OK

* Fix ninja diff

* Misc debug/nonmatching fixes

* Fix ninja diff for PAL

* Fix bad PAL split
This commit is contained in:
LagoLunatic
2025-11-19 14:10:03 -08:00
committed by GitHub
parent 8956be538e
commit 4cf2c7e37d
35 changed files with 187 additions and 233 deletions
@@ -463,8 +463,10 @@ mFindCount__10daNpc_Kn_c = .bss:0x00000110; // type:object size:0x4 scope:global
@5904 = .bss:0x00000114; // type:object size:0xC scope:local
l_HIO = .bss:0x00000120; // type:object size:0x4 scope:global data:4byte
@12316 = .bss:0x00000124; // type:object size:0xC scope:local
init$9794 = .bss:0x00000130; // type:object size:0x1 scope:local align:1
lightAParticleScale$12315 = .bss:0x00000134; // type:object size:0xC scope:local
@12320 = .bss:0x00000140; // type:object size:0xC scope:local
init$9798 = .bss:0x0000014C; // type:object size:0x1 scope:local align:1
lightALocalTrans$12319 = .bss:0x00000150; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000015C; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000160; // type:object size:0x4 scope:global
@@ -111,4 +111,4 @@ __vt__12dBgS_ObjAcch = .data:0x0000021C; // type:object size:0x24 scope:global
__vt__8cM3dGAab = .data:0x00000240; // type:object size:0xC scope:global
__vt__8cM3dGSph = .data:0x0000024C; // type:object size:0xC scope:global
__vt__17dEvLib_callback_c = .data:0x00000258; // type:object size:0x18 scope:global
lbl_675_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
init$1953 = .bss:0x00000000; // type:object size:0x1 scope:local align:1
-10
View File
@@ -21705,18 +21705,8 @@ aram_cache_size = .sbss:0x80450C68; // type:object size:0x4 scope:global align:4
mSystemFar__14mDoLib_clipper = .sbss:0x80450C70; // type:object size:0x4 scope:global align:4 data:float
mFovyRate__14mDoLib_clipper = .sbss:0x80450C74; // type:object size:0x4 scope:global align:4 data:float
mResetData__6mDoRst = .sbss:0x80450C78; // type:object size:0x4 scope:global align:4 data:4byte
struct_80450C7C = .sbss:0x80450C7C; // type:object size:0x1 scope:global align:1
struct_80450C7D = .sbss:0x80450C7D; // type:object size:0x1 scope:global align:1
struct_80450C7E = .sbss:0x80450C7E; // type:object size:0x1 scope:global align:1
struct_80450C7F = .sbss:0x80450C7F; // type:object size:0x1 scope:global align:1
SyncWidthSound__9mDoDvdThd = .sbss:0x80450C80; // type:object size:0x1 scope:global align:1 data:byte
sDefaultDirection = .sbss:0x80450C81; // type:object size:0x1 scope:global align:1 data:byte
struct_80450C82 = .sbss:0x80450C82; // type:object size:0x1 scope:global align:1
struct_80450C83 = .sbss:0x80450C83; // type:object size:0x1 scope:global align:1
struct_80450C84 = .sbss:0x80450C84; // type:object size:0x1 scope:global align:1
struct_80450C85 = .sbss:0x80450C85; // type:object size:0x1 scope:global align:1
struct_80450C86 = .sbss:0x80450C86; // type:object size:0x1 scope:global align:1
struct_80450C87 = .sbss:0x80450C87; // type:object size:0x1 scope:global align:1
mDoDvdErr_initialized = .sbss:0x80450C88; // type:object size:0x1 scope:global align:1 data:byte
sConsole = .sbss:0x80450C90; // type:object size:0x4 scope:local align:4 data:4byte
cDmr_SkipInfo = .sbss:0x80450C98; // type:object size:0x1 scope:global align:1
+1 -1
View File
@@ -114,7 +114,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 scope:local
l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
@3657 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte
mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte
+2 -1
View File
@@ -788,7 +788,7 @@ d/actor/d_a_npc_cd2.cpp:
.rodata start:0x80394A50 end:0x80395588
.data start:0x803B7EA0 end:0x803BBA80
.bss start:0x8042A5B0 end:0x8042E898
.sbss start:0x80452FC0 end:0x80452FD8
.sbss start:0x80452FC0 end:0x80452FD0
.sdata2 start:0x804554A0 end:0x80455510
d/actor/d_a_obj_item.cpp:
@@ -797,6 +797,7 @@ d/actor/d_a_obj_item.cpp:
.rodata start:0x80395588 end:0x80395598
.data start:0x803BBA80 end:0x803BBD58
.sdata start:0x80452668 end:0x80452670
.sbss start:0x80452FD0 end:0x80452FD8
.sdata2 start:0x80455510 end:0x804555A0
d/d_insect.cpp:
+2 -2
View File
@@ -17486,7 +17486,7 @@ j2dDefaultIndTevStageInfo = .rodata:0x803A38D4; // type:object size:0xC scope:gl
@1849 = .rodata:0x803A3900; // type:object size:0x10 scope:local align:4 data:4byte
@3028 = .rodata:0x803A3910; // type:object size:0x10 scope:local align:4 data:4byte
@3037 = .rodata:0x803A3920; // type:object size:0x14 scope:local align:4 data:4byte
@stringBase0 = .rodata:0x803A3938; // type:object size:0x4 scope:local align:4 data:string_table
@stringBase0 = .rodata:0x803A3938; // type:object size:0x3 scope:local align:4 data:string_table
...rodata.0 = .rodata:0x803A3940; // type:label scope:local align:4
@1508 = .rodata:0x803A3940; // type:object size:0x10 scope:local align:4 data:4byte
@1557 = .rodata:0x803A3950; // type:object size:0x10 scope:local align:4
@@ -21954,7 +21954,7 @@ lbl_80452FC0 = .sbss:0x80452FC0; // type:object size:0x1 data:byte
target = .sbss:0x80452FC4; // type:object size:0x4 scope:global align:4 data:4byte
targetWay = .sbss:0x80452FC8; // type:object size:0x4 scope:global align:4 data:float
wolfAngle = .sbss:0x80452FCC; // type:object size:0x2 scope:global align:4 data:2byte
lbl_80452FD0 = .sbss:0x80452FD0; // type:object size:0x1 data:byte
init$2639 = .sbss:0x80452FD0; // type:object size:0x1 scope:local align:1 data:byte
m_midnaActor__9daPy_py_c = .sbss:0x80452FD8; // type:object size:0x4 scope:global align:4 data:4byte
m_dropAngleY__20daPy_boomerangMove_c = .sbss:0x80452FDC; // type:object size:0x2 scope:global align:2 data:2byte
m_eventKeepFlg__20daPy_boomerangMove_c = .sbss:0x80452FDE; // type:object size:0x2 scope:global align:2 data:2byte
@@ -582,5 +582,7 @@ mFindActorPtrs__10daNpc_Kn_c = .bss:0x00000098; // type:object size:0xC8 scope:g
mFindCount__10daNpc_Kn_c = .bss:0x00000160; // type:object size:0x4 scope:global
@126080 = .bss:0x00000164; // type:object size:0xC scope:local
l_HIO = .bss:0x00000170; // type:object size:0xBC scope:global
@GUARD@setSwordChargePtcl__10daNpc_Kn_cFv@lightAParticleScale = .bss:0x0000022C; // type:object size:0x1 scope:local align:1
@LOCAL@setSwordChargePtcl__10daNpc_Kn_cFv@lightAParticleScale = .bss:0x00000230; // type:object size:0xC scope:local
@GUARD@setSwordChargePtcl__10daNpc_Kn_cFv@lightALocalTrans@0 = .bss:0x0000023C; // type:object size:0x1 scope:local align:1
@LOCAL@setSwordChargePtcl__10daNpc_Kn_cFv@lightALocalTrans@0 = .bss:0x00000240; // type:object size:0xC scope:local