diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index a3851a66..8956dad8 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -60,10 +60,11 @@ src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp: .ctor start:0x021127bc end:0x021127c0 .bss start:0x0211672c end:0x02116858 -src/031_Land/Actor/ActorUnkHERT.cpp: +src/031_Land/Actor/ActorHeart.cpp: .text start:0x020eecf4 end:0x020ef81c .init start:0x0211139c end:0x02111408 .ctor start:0x021127c0 end:0x021127c4 + .data start:0x02113d64 end:0x02113e6c .bss start:0x02116858 end:0x021168a4 src/031_Land/Actor/ActorUnkRMTG.cpp: diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index 1496fecb..6360d0e7 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -2492,7 +2492,7 @@ from:0x020ef650 kind:arm_call to:0x0205c1f0 module:overlay(0) from:0x020ef688 kind:arm_call to:0x0205c204 module:overlay(0) from:0x020ef6d4 kind:arm_call to:0x020ef570 module:overlay(31) from:0x020ef70c kind:arm_call to:0x020f6284 module:overlay(31) -from:0x020ef72c kind:load to:0x02113ddc module:overlay(31) +from:0x020ef72c kind:load to:0x02113dd4 add:0x8 module:overlay(31) from:0x020ef754 kind:arm_call to:0x020ef1b4 module:overlay(31) from:0x020ef764 kind:arm_call to:0x020f62e4 module:overlay(31) from:0x020ef784 kind:arm_call to:0x020ef1b4 module:overlay(31) diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 1b9a1b06..eeb18db5 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -728,40 +728,40 @@ func_ov031_020eeb18 kind:function(arm,size=0x40) addr:0x020eeb18 func_ov031_020eeb58 kind:function(arm,size=0x150) addr:0x020eeb58 func_ov031_020eeca8 kind:function(arm,size=0x40) addr:0x020eeca8 func_ov031_020eece8 kind:function(arm,size=0xc) addr:0x020eece8 -_ZN19ActorProfileUnkHERT10GetProfileEv kind:function(arm,size=0xc) addr:0x020eecf4 -_ZN19ActorProfileUnkHERT6CreateEv kind:function(arm,size=0x24) addr:0x020eed00 -_ZN19ActorProfileUnkHERTC1Ev kind:function(arm,size=0x40) addr:0x020eed24 -_ZN12ActorUnkHERT19func_ov031_020eed64Ev kind:function(arm,size=0x7c) addr:0x020eed64 -_ZN12ActorUnkHERTC1Ev kind:function(arm,size=0xf8) addr:0x020eede0 -_ZN12ActorUnkHERT19func_ov031_020eeed8Ev kind:function(arm,size=0x10) addr:0x020eeed8 -_ZN12ActorUnkHERT19func_ov031_020eeee8Ev kind:function(arm,size=0x2cc) addr:0x020eeee8 -_ZN12ActorUnkHERT19func_ov031_020ef1b4Ev kind:function(arm,size=0x54) addr:0x020ef1b4 -_ZN12ActorUnkHERT19func_ov031_020ef208Ev kind:function(arm,size=0xe4) addr:0x020ef208 -_ZN12ActorUnkHERT19func_ov031_020ef2ecEv kind:function(arm,size=0xc) addr:0x020ef2ec -_ZN12ActorUnkHERT19func_ov031_020ef2f8Ev kind:function(arm,size=0x28) addr:0x020ef2f8 -_ZN12ActorUnkHERT19func_ov031_020ef320Ev kind:function(arm,size=0x14) addr:0x020ef320 -_ZN12ActorUnkHERT19func_ov031_020ef334Ev kind:function(arm,size=0x28) addr:0x020ef334 -_ZN12ActorUnkHERT19func_ov031_020ef35cEv kind:function(arm,size=0x44) addr:0x020ef35c -_ZN12ActorUnkHERT19func_ov031_020ef3a0Ev kind:function(arm,size=0x18) addr:0x020ef3a0 -_ZN12ActorUnkHERT19func_ov031_020ef3b8Ev kind:function(arm,size=0x18) addr:0x020ef3b8 -_ZN12ActorUnkHERT19func_ov031_020ef3d0Ev kind:function(arm,size=0x60) addr:0x020ef3d0 -_ZN12ActorUnkHERT19func_ov031_020ef430Ev kind:function(arm,size=0x14) addr:0x020ef430 -_ZN12ActorUnkHERT19func_ov031_020ef444Ev kind:function(arm,size=0x4) addr:0x020ef444 -_ZN12ActorUnkHERT19func_ov031_020ef448Ev kind:function(arm,size=0x10) addr:0x020ef448 -_ZN12ActorUnkHERT19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020ef458 -_ZN12ActorUnkHERT19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020ef4a8 -_ZN12ActorUnkHERT19func_ov031_020ef528Ev kind:function(arm,size=0x48) addr:0x020ef528 -_ZN12ActorUnkHERT19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef570 -_ZN12ActorUnkHERT19func_ov031_020ef5e8Ev kind:function(arm,size=0xb0) addr:0x020ef5e8 -_ZN12ActorUnkHERT19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef698 -_ZN12ActorUnkHERT19func_ov031_020ef6f8Ev kind:function(arm,size=0x38) addr:0x020ef6f8 -_ZN12ActorUnkHERT19func_ov031_020ef730Ev kind:function(arm,size=0x44) addr:0x020ef730 -_ZN12ActorUnkHERT19func_ov031_020ef774Ev kind:function(arm,size=0x20) addr:0x020ef774 -_ZN12ActorUnkHERT19func_ov031_020ef794Ev kind:function(arm,size=0x28) addr:0x020ef794 -_ZN12ActorUnkHERT19func_ov031_020ef7bcEv kind:function(arm,size=0x1c) addr:0x020ef7bc -_ZN12ActorUnkHERTD0Ev kind:function(arm,size=0x1c) addr:0x020ef7d8 -_ZN12ActorUnkHERTD2Ev kind:function(arm,size=0x14) addr:0x020ef7f4 -_ZN19ActorProfileUnkHERTD1Ev kind:function(arm,size=0x14) addr:0x020ef808 +_ZN17ActorProfileHeart10GetProfileEv kind:function(arm,size=0xc) addr:0x020eecf4 +_ZN17ActorProfileHeart6CreateEv kind:function(arm,size=0x24) addr:0x020eed00 +_ZN17ActorProfileHeartC1Ev kind:function(arm,size=0x40) addr:0x020eed24 +_ZN10ActorHeart19func_ov031_020eed64EPiii kind:function(arm,size=0x7c) addr:0x020eed64 +_ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020eede0 +_ZN10ActorHeart8vfunc_18Ei kind:function(arm,size=0x10) addr:0x020eeed8 +_ZN10ActorHeart8vfunc_20Ev kind:function(arm,size=0x2cc) addr:0x020eeee8 +_ZN10ActorHeart19func_ov031_020ef1b4Es kind:function(arm,size=0x54) addr:0x020ef1b4 +_ZN10ActorHeart19func_ov031_020ef208Ev kind:function(arm,size=0xe4) addr:0x020ef208 +_ZN10ActorHeart19func_ov031_020ef2ecEv kind:function(arm,size=0xc) addr:0x020ef2ec +_ZN10ActorHeart19func_ov031_020ef2f8Ev kind:function(arm,size=0x28) addr:0x020ef2f8 +_ZN10ActorHeart19func_ov031_020ef320Ev kind:function(arm,size=0x14) addr:0x020ef320 +_ZN10ActorHeart19func_ov031_020ef334Ev kind:function(arm,size=0x28) addr:0x020ef334 +_ZN10ActorHeart19func_ov031_020ef35cEv kind:function(arm,size=0x44) addr:0x020ef35c +_ZN10ActorHeart19func_ov031_020ef3a0Ev kind:function(arm,size=0x18) addr:0x020ef3a0 +_ZN10ActorHeart19func_ov031_020ef3b8Ev kind:function(arm,size=0x18) addr:0x020ef3b8 +_ZN10ActorHeart19func_ov031_020ef3d0Ev kind:function(arm,size=0x60) addr:0x020ef3d0 +_ZN10ActorHeart19func_ov031_020ef430Ev kind:function(arm,size=0x14) addr:0x020ef430 +_ZN10ActorHeart19func_ov031_020ef444Ev kind:function(arm,size=0x4) addr:0x020ef444 +_ZN10ActorHeart19func_ov031_020ef448Ev kind:function(arm,size=0x10) addr:0x020ef448 +_ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020ef458 +_ZN10ActorHeart19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020ef4a8 +_ZN10ActorHeart19func_ov031_020ef528Ev kind:function(arm,size=0x48) addr:0x020ef528 +_ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef570 +_ZN10ActorHeart8vfunc_2cEi kind:function(arm,size=0xb0) addr:0x020ef5e8 +_ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef698 +_ZN13ActorHeart_c4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef6f8 +_ZN13ActorHeart_c48vfunc_00E14Actor_c4_stacki kind:function(arm,size=0x44) addr:0x020ef730 +_ZN13ActorHeart_c48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020ef774 +_ZN13ActorHeart_c48vfunc_0cEi kind:function(arm,size=0x28) addr:0x020ef794 +_ZN13ActorHeart_c48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020ef7bc +_ZN10ActorHeartD0Ev kind:function(arm,size=0x1c) addr:0x020ef7d8 +_ZN10ActorHeartD1Ev kind:function(arm,size=0x14) addr:0x020ef7f4 +_ZN17ActorProfileHeartD1Ev kind:function(arm,size=0x14) addr:0x020ef808 _ZN19ActorProfileUnkRMTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020ef81c _ZN19ActorProfileUnkRMTG6CreateEv kind:function(arm,size=0x24) addr:0x020ef828 _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef84c @@ -2079,7 +2079,7 @@ __sinit_ActorUnkSWBM.cpp kind:function(arm,size=0x74) addr:0x021111ac __sinit_ActorUnkROCK.cpp kind:function(arm,size=0x50) addr:0x02111220 __sinit_ActorRupee.cpp kind:function(arm,size=0x98) addr:0x02111270 __sinit_ActorUnkZLSL_ZSRS.cpp kind:function(arm,size=0x94) addr:0x02111308 -__sinit_ActorUnkHERT.cpp kind:function(arm,size=0x6c) addr:0x0211139c +__sinit_ActorHeart.cpp kind:function(arm,size=0x6c) addr:0x0211139c __sinit_ActorUnkRMTG.cpp kind:function(arm,size=0x50) addr:0x02111408 __sinit_ActorUnkSCCN.cpp kind:function(arm,size=0x50) addr:0x02111458 __sinit_ActorUnkNTUB.cpp kind:function(arm,size=0x50) addr:0x021114a8 @@ -2143,7 +2143,7 @@ __sinit_MapObjectUnkSWFS.cpp kind:function(arm,size=0x70) addr:0x02112724 .p__sinit_ActorUnkROCK.cpp kind:data(word) addr:0x021127b4 .p__sinit_ActorRupee.cpp kind:data(word) addr:0x021127b8 .p__sinit_ActorUnkZLSL_ZSRS.cpp kind:data(word) addr:0x021127bc -.p__sinit_ActorUnkHERT.cpp kind:data(word) addr:0x021127c0 +.p__sinit_ActorHeart.cpp kind:data(word) addr:0x021127c0 .p__sinit_ActorUnkRMTG.cpp kind:data(word) addr:0x021127c4 .p__sinit_ActorUnkSCCN.cpp kind:data(word) addr:0x021127c8 .p__sinit_ActorUnkNTUB.cpp kind:data(word) addr:0x021127cc @@ -2328,9 +2328,9 @@ data_ov031_02113d58 kind:data(any) addr:0x02113d58 data_ov031_02113d64 kind:data(any) addr:0x02113d64 data_ov031_02113d74 kind:data(any) addr:0x02113d74 data_ov031_02113da4 kind:data(any) addr:0x02113da4 -data_ov031_02113ddc kind:data(any) addr:0x02113ddc -_ZTV19data_ov031_02113dec kind:data(any) addr:0x02113dec -_ZTV19data_ov031_02113e10 kind:data(any) addr:0x02113e10 +_ZTV13ActorHeart_c4 kind:data(any) addr:0x02113dd4 +_ZTV17ActorProfileHeart kind:data(any) addr:0x02113dec +_ZTV10ActorHeart kind:data(any) addr:0x02113e10 _ZTV19data_ov031_02113e6c kind:data(any) addr:0x02113e6c _ZTV19data_ov031_02113e90 kind:data(any) addr:0x02113e90 _ZTV19data_ov031_02113eec kind:data(any) addr:0x02113eec @@ -2558,9 +2558,9 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x0211672c @10824 kind:bss addr:0x02116738 _ZN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x02116744 _ZN15ProfileInstanceI19ActorProfileUnkZSRSE8sProfileE kind:bss addr:0x02116780 -_ZGVN15ProfileInstanceI19ActorProfileUnkHERTE8sProfileE kind:bss addr:0x02116858 +_ZGVN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x02116858 @10830 kind:bss addr:0x0211685c -_ZN15ProfileInstanceI19ActorProfileUnkHERTE8sProfileE kind:bss addr:0x02116868 +_ZN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x02116868 _ZGVN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x021168a4 @10836 kind:bss addr:0x021168a8 _ZN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x021168b4 diff --git a/config/jp/arm9/overlays/ov031/delinks.txt b/config/jp/arm9/overlays/ov031/delinks.txt index 55eeb668..72916770 100644 --- a/config/jp/arm9/overlays/ov031/delinks.txt +++ b/config/jp/arm9/overlays/ov031/delinks.txt @@ -60,10 +60,11 @@ src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp: .ctor start:0x02114548 end:0x0211454c .bss start:0x021184cc end:0x021185f8 -src/031_Land/Actor/ActorUnkHERT.cpp: +src/031_Land/Actor/ActorHeart.cpp: .text start:0x020f06e0 end:0x020f1218 .init start:0x0211310c end:0x02113178 .ctor start:0x0211454c end:0x02114550 + .data start:0x02115b04 end:0x02115c0c .bss start:0x021185f8 end:0x02118644 src/031_Land/Actor/ActorUnkRMTG.cpp: diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index f0fa48c1..325c95fc 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -728,40 +728,40 @@ func_ov031_020f0504 kind:function(arm,size=0x40) addr:0x020f0504 func_ov031_020f0544 kind:function(arm,size=0x150) addr:0x020f0544 func_ov031_020f0694 kind:function(arm,size=0x40) addr:0x020f0694 func_ov031_020f06d4 kind:function(arm,size=0xc) addr:0x020f06d4 -_ZN19ActorProfileUnkHERT10GetProfileEv kind:function(arm,size=0xc) addr:0x020f06e0 -_ZN19ActorProfileUnkHERT6CreateEv kind:function(arm,size=0x24) addr:0x020f06ec -_ZN19ActorProfileUnkHERTC1Ev kind:function(arm,size=0x40) addr:0x020f0710 -_ZN12ActorUnkHERT19func_ov031_020f0750Ev kind:function(arm,size=0x7c) addr:0x020f0750 -_ZN12ActorUnkHERTC1Ev kind:function(arm,size=0xf8) addr:0x020f07cc -_ZN12ActorUnkHERT19func_ov031_020eeed8Ev kind:function(arm,size=0x10) addr:0x020f08c4 -_ZN12ActorUnkHERT19func_ov031_020eeee8Ev kind:function(arm,size=0x2cc) addr:0x020f08d4 -_ZN12ActorUnkHERT19func_ov031_020ef1b4Ev kind:function(arm,size=0x54) addr:0x020f0ba0 -_ZN12ActorUnkHERT19func_ov031_020ef208Ev kind:function(arm,size=0xe4) addr:0x020f0bf4 -_ZN12ActorUnkHERT19func_ov031_020ef2ecEv kind:function(arm,size=0xc) addr:0x020f0cd8 -_ZN12ActorUnkHERT19func_ov031_020ef2f8Ev kind:function(arm,size=0x28) addr:0x020f0ce4 -_ZN12ActorUnkHERT19func_ov031_020ef320Ev kind:function(arm,size=0x14) addr:0x020f0d0c -_ZN12ActorUnkHERT19func_ov031_020ef334Ev kind:function(arm,size=0x28) addr:0x020f0d20 -_ZN12ActorUnkHERT19func_ov031_020ef35cEv kind:function(arm,size=0x44) addr:0x020f0d48 -_ZN12ActorUnkHERT19func_ov031_020ef3a0Ev kind:function(arm,size=0x18) addr:0x020f0d8c -_ZN12ActorUnkHERT19func_ov031_020ef3b8Ev kind:function(arm,size=0x18) addr:0x020f0da4 -_ZN12ActorUnkHERT19func_ov031_020ef3d0Ev kind:function(arm,size=0x60) addr:0x020f0dbc -_ZN12ActorUnkHERT19func_ov031_020ef430Ev kind:function(arm,size=0x14) addr:0x020f0e1c -_ZN12ActorUnkHERT19func_ov031_020ef444Ev kind:function(arm,size=0x4) addr:0x020f0e30 -_ZN12ActorUnkHERT19func_ov031_020ef448Ev kind:function(arm,size=0x10) addr:0x020f0e34 -_ZN12ActorUnkHERT19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020f0e44 -_ZN12ActorUnkHERT19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020f0e94 -_ZN12ActorUnkHERT19func_ov031_020ef528Ev kind:function(arm,size=0x58) addr:0x020f0f14 -_ZN12ActorUnkHERT19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020f0f6c -_ZN12ActorUnkHERT19func_ov031_020ef5e8Ev kind:function(arm,size=0xb0) addr:0x020f0fe4 -_ZN12ActorUnkHERT19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020f1094 -_ZN12ActorUnkHERT19func_ov031_020ef6f8Ev kind:function(arm,size=0x38) addr:0x020f10f4 -_ZN12ActorUnkHERT19func_ov031_020ef730Ev kind:function(arm,size=0x44) addr:0x020f112c -_ZN12ActorUnkHERT19func_ov031_020ef774Ev kind:function(arm,size=0x20) addr:0x020f1170 -_ZN12ActorUnkHERT19func_ov031_020ef794Ev kind:function(arm,size=0x28) addr:0x020f1190 -_ZN12ActorUnkHERT19func_ov031_020ef7bcEv kind:function(arm,size=0x1c) addr:0x020f11b8 -_ZN12ActorUnkHERTD0Ev kind:function(arm,size=0x1c) addr:0x020f11d4 -_ZN12ActorUnkHERTD2Ev kind:function(arm,size=0x14) addr:0x020f11f0 -_ZN19ActorProfileUnkHERTD1Ev kind:function(arm,size=0x14) addr:0x020f1204 +_ZN17ActorProfileHeart10GetProfileEv kind:function(arm,size=0xc) addr:0x020f06e0 +_ZN17ActorProfileHeart6CreateEv kind:function(arm,size=0x24) addr:0x020f06ec +_ZN17ActorProfileHeartC1Ev kind:function(arm,size=0x40) addr:0x020f0710 +_ZN10ActorHeart19func_ov031_020f0750Ev kind:function(arm,size=0x7c) addr:0x020f0750 +_ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020f07cc +_ZN10ActorHeart8vfunc_18Ei kind:function(arm,size=0x10) addr:0x020f08c4 +_ZN10ActorHeart8vfunc_20Ev kind:function(arm,size=0x2cc) addr:0x020f08d4 +_ZN10ActorHeart19func_ov031_020ef1b4Es kind:function(arm,size=0x54) addr:0x020f0ba0 +_ZN10ActorHeart19func_ov031_020ef208Ev kind:function(arm,size=0xe4) addr:0x020f0bf4 +_ZN10ActorHeart19func_ov031_020ef2ecEv kind:function(arm,size=0xc) addr:0x020f0cd8 +_ZN10ActorHeart19func_ov031_020ef2f8Ev kind:function(arm,size=0x28) addr:0x020f0ce4 +_ZN10ActorHeart19func_ov031_020ef320Ev kind:function(arm,size=0x14) addr:0x020f0d0c +_ZN10ActorHeart19func_ov031_020ef334Ev kind:function(arm,size=0x28) addr:0x020f0d20 +_ZN10ActorHeart19func_ov031_020ef35cEv kind:function(arm,size=0x44) addr:0x020f0d48 +_ZN10ActorHeart19func_ov031_020ef3a0Ev kind:function(arm,size=0x18) addr:0x020f0d8c +_ZN10ActorHeart19func_ov031_020ef3b8Ev kind:function(arm,size=0x18) addr:0x020f0da4 +_ZN10ActorHeart19func_ov031_020ef3d0Ev kind:function(arm,size=0x60) addr:0x020f0dbc +_ZN10ActorHeart19func_ov031_020ef430Ev kind:function(arm,size=0x14) addr:0x020f0e1c +_ZN10ActorHeart19func_ov031_020ef444Ev kind:function(arm,size=0x4) addr:0x020f0e30 +_ZN10ActorHeart19func_ov031_020ef448Ev kind:function(arm,size=0x10) addr:0x020f0e34 +_ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020f0e44 +_ZN10ActorHeart19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020f0e94 +_ZN10ActorHeart19func_ov031_020ef528Ev kind:function(arm,size=0x58) addr:0x020f0f14 +_ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020f0f6c +_ZN10ActorHeart8vfunc_2cEi kind:function(arm,size=0xb0) addr:0x020f0fe4 +_ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020f1094 +_ZN13ActorHeart_c4C1EP5Actor kind:function(arm,size=0x38) addr:0x020f10f4 +_ZN13ActorHeart_c48vfunc_00E14Actor_c4_stacki kind:function(arm,size=0x44) addr:0x020f112c +_ZN13ActorHeart_c48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020f1170 +_ZN13ActorHeart_c48vfunc_0cEi kind:function(arm,size=0x28) addr:0x020f1190 +_ZN13ActorHeart_c48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020f11b8 +_ZN10ActorHeartD0Ev kind:function(arm,size=0x1c) addr:0x020f11d4 +_ZN10ActorHeartD1Ev kind:function(arm,size=0x14) addr:0x020f11f0 +_ZN17ActorProfileHeartD1Ev kind:function(arm,size=0x14) addr:0x020f1204 _ZN19ActorProfileUnkRMTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020f1218 _ZN19ActorProfileUnkRMTG6CreateEv kind:function(arm,size=0x24) addr:0x020f1224 _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020f1248 @@ -2076,7 +2076,7 @@ __sinit_ActorUnkSWBM.cpp kind:function(arm,size=0x74) addr:0x02112f1c __sinit_ActorUnkROCK.cpp kind:function(arm,size=0x50) addr:0x02112f90 __sinit_ActorRupee.cpp kind:function(arm,size=0x98) addr:0x02112fe0 __sinit_ActorUnkZLSL_ZSRS.cpp kind:function(arm,size=0x94) addr:0x02113078 -__sinit_ActorUnkHERT.cpp kind:function(arm,size=0x6c) addr:0x0211310c +__sinit_ActorHeart.cpp kind:function(arm,size=0x6c) addr:0x0211310c __sinit_ActorUnkRMTG.cpp kind:function(arm,size=0x50) addr:0x02113178 __sinit_ActorUnkSCCN.cpp kind:function(arm,size=0x50) addr:0x021131c8 __sinit_ActorUnkNTUB.cpp kind:function(arm,size=0x50) addr:0x02113218 @@ -2140,7 +2140,7 @@ __sinit_MapObjectUnkSWFS.cpp kind:function(arm,size=0x70) addr:0x021144b0 .p__sinit_ActorUnkROCK.cpp kind:data(word) addr:0x02114540 .p__sinit_ActorRupee.cpp kind:data(word) addr:0x02114544 .p__sinit_ActorUnkZLSL_ZSRS.cpp kind:data(word) addr:0x02114548 -.p__sinit_ActorUnkHERT.cpp kind:data(word) addr:0x0211454c +.p__sinit_ActorHeart.cpp kind:data(word) addr:0x0211454c .p__sinit_ActorUnkRMTG.cpp kind:data(word) addr:0x02114550 .p__sinit_ActorUnkSCCN.cpp kind:data(word) addr:0x02114554 .p__sinit_ActorUnkNTUB.cpp kind:data(word) addr:0x02114558 @@ -2321,12 +2321,12 @@ data_ov031_021158f8 kind:data(any) addr:0x021158f8 data_ov031_02115aa8 kind:data(any) addr:0x02115aa8 data_ov031_02115ab4 kind:data(any) addr:0x02115ab4 data_ov031_02115af8 kind:data(any) addr:0x02115af8 -data_ov031_02115b04 kind:data(any) addr:0x02115b04 -data_ov031_02115b14 kind:data(any) addr:0x02115b14 -data_ov031_02115b44 kind:data(any) addr:0x02115b44 -data_ov031_02115b7c kind:data(any) addr:0x02115b74 -_ZTV19data_ov031_02115b8c kind:data(any) addr:0x02115b8c -_ZTV19data_ov031_02115bb0 kind:data(any) addr:0x02115bb0 +data_ov031_02113d64 kind:data(any) addr:0x02115b04 +data_ov031_02113d74 kind:data(any) addr:0x02115b14 +data_ov031_02113da4 kind:data(any) addr:0x02115b44 +_ZTV13ActorHeart_c4 kind:data(any) addr:0x02115b74 +_ZTV17ActorProfileHeart kind:data(any) addr:0x02115b8c +_ZTV10ActorHeart kind:data(any) addr:0x02115bb0 _ZTV19data_ov031_02115c0c kind:data(any) addr:0x02115c0c _ZTV19data_ov031_02115c30 kind:data(any) addr:0x02115c30 _ZTV19data_ov031_02115c8c kind:data(any) addr:0x02115c8c @@ -2553,9 +2553,9 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x021184cc @30824 kind:bss addr:0x021184d8 _ZN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x021184e4 _ZN15ProfileInstanceI19ActorProfileUnkZSRSE8sProfileE kind:bss addr:0x02118520 -_ZGVN15ProfileInstanceI19ActorProfileUnkHERTE8sProfileE kind:bss addr:0x021185f8 +_ZGVN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x021185f8 @30830 kind:bss addr:0x021185fc -_ZN15ProfileInstanceI19ActorProfileUnkHERTE8sProfileE kind:bss addr:0x02118608 +_ZN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x02118608 _ZGVN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x02118644 @30836 kind:bss addr:0x02118648 _ZN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x02118654 diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 7128bbf9..8bcb789f 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -47,6 +47,8 @@ class UnkStruct_ov000_020b539c { ActorProfile *func_ov000_020974dc(u32 id); }; +class Actor_c4; + typedef u32 ActorFlags; enum ActorFlag_ { ActorFlag_Alive = FLAG(0, 0), diff --git a/include/Actor/ActorHeart.hpp b/include/Actor/ActorHeart.hpp new file mode 100644 index 00000000..f8d173d6 --- /dev/null +++ b/include/Actor/ActorHeart.hpp @@ -0,0 +1,74 @@ +#pragma once + +#include "Actor/Actor.hpp" +#include "Actor/ActorProfile.hpp" +#include "types.h" + +class ActorHeart_c4 : public Actor_c4 { + ActorHeart_c4(Actor *param1); + + /* 00 */ virtual unk32 vfunc_00(Actor_c4_stack param1, unk32 param2) override; + /* 04 */ virtual void vfunc_04() override; + /* 08 */ virtual void vfunc_08() override; + /* 0C */ virtual void vfunc_0c(unk32 param1) override; +}; + +class ActorHeart : public Actor { +public: + /* 00 (base) */ + /* 94 */ STRUCT_PAD(0x94, 0x98); + /* 98 */ unk32 mUnk_98; + /* 9C */ unk32 mUnk_9c; + /* A0 */ STRUCT_PAD(0xA0, 0xB8); + /* B8 */ u16 mUnk_b8; + /* BA */ STRUCT_PAD(0xBA, 0xBC); + /* BC */ u16 mUnk_bc; + /* BE */ u8 mUnk_be; + /* BF */ STRUCT_PAD(0xBF, 0xC0); + /* C0 */ unk32 mUnk_c0; + /* C4 */ unk32 mUnk_c4; + + ActorHeart(); + + /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 20 */ virtual void vfunc_20() override; + /* 2C */ virtual void vfunc_2c(unk32 param1) override; + /* 4C */ virtual ~ActorHeart() override {}; + + void func_ov031_020f0750(); + void func_ov031_020eed64(unk32 *param_2, unk32 param_3, unk32 param_4); + void func_ov031_020ef1b4(unk16 param_2); + void func_ov031_020ef208(); + void func_ov031_020ef4a8(); + void func_ov031_020ef528(); + void func_ov031_020ef570(); + void func_ov031_020ef698(); + + // data_ov031_02113d74 + void func_ov031_020ef2f8(); + void func_ov031_020ef334(); + void func_ov031_020ef3a0(); + void func_ov031_020ef3d0(); + void func_ov031_020ef444(); + void func_ov031_020ef458(); + + // data_ov031_02113da4 + void func_ov031_020ef2ec(); + void func_ov031_020ef320(); + void func_ov031_020ef35c(); + void func_ov031_020ef3b8(); + void func_ov031_020ef430(); + void func_ov031_020ef448(); +}; + +class ActorProfileHeart : public ActorProfile { +public: + /* 00 (base) */ + + ActorProfileHeart(); + ~ActorProfileHeart() {} + + /* 0C */ virtual Actor *Create(); + + static ActorProfileHeart *GetProfile(); +}; diff --git a/include/Actor/ActorUnkHERT.hpp b/include/Actor/ActorUnkHERT.hpp deleted file mode 100644 index 2076e8b0..00000000 --- a/include/Actor/ActorUnkHERT.hpp +++ /dev/null @@ -1,68 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#pragma once - -#include "Actor/Actor.hpp" -#include "Actor/ActorProfile.hpp" -#include "global.h" -#include "types.h" - -class ActorUnkHERT_c4 : public Actor_c4 { -public: - ActorUnkHERT_c4(Actor *param1); - - /* 00 */ virtual unk32 vfunc_00(Actor_c4_stack param1, unk32 param2) override; - /* 04 */ virtual void vfunc_04() override; - /* 08 */ virtual void vfunc_08() override; - /* 0C */ virtual void vfunc_0c(unk32 param1) override; -}; - -class ActorUnkHERT : public Actor { -public: - /* 00 (base) */ - /* 94 */ - - ActorUnkHERT(); - - /* 4C */ virtual ~ActorUnkHERT() override; - - void func_ov031_020eed64(void); - void func_ov031_020eeed8(void); - void func_ov031_020eeee8(void); - void func_ov031_020ef1b4(void); - void func_ov031_020ef208(void); - void func_ov031_020ef2ec(void); - void func_ov031_020ef2f8(void); - void func_ov031_020ef320(void); - void func_ov031_020ef334(void); - void func_ov031_020ef35c(void); - void func_ov031_020ef3a0(void); - void func_ov031_020ef3b8(void); - void func_ov031_020ef3d0(void); - void func_ov031_020ef430(void); - void func_ov031_020ef444(void); - void func_ov031_020ef448(void); - void func_ov031_020ef458(void); - void func_ov031_020ef4a8(void); - void func_ov031_020ef528(void); - void func_ov031_020ef570(void); - void func_ov031_020ef5e8(void); - void func_ov031_020ef698(void); - void func_ov031_020ef6f8(void); - void func_ov031_020ef730(void); - void func_ov031_020ef774(void); - void func_ov031_020ef794(void); - void func_ov031_020ef7bc(void); -}; - -class ActorProfileUnkHERT : public ActorProfile { -public: - /* 00 (base) */ - - ActorProfileUnkHERT(); - ~ActorProfileUnkHERT(); - - /* 0C */ virtual Actor *Create(); - - static ActorProfileUnkHERT *GetProfile(); -}; diff --git a/include/Unknown/UnkStruct_027e0ce0.hpp b/include/Unknown/UnkStruct_027e0ce0.hpp index a8ee22b5..0099ea5a 100644 --- a/include/Unknown/UnkStruct_027e0ce0.hpp +++ b/include/Unknown/UnkStruct_027e0ce0.hpp @@ -56,6 +56,7 @@ class UnkStruct_027e0ce0 { void func_01fff148(); void func_ov000_0208a318(unk32 param1, unk32 param2, unk32 param3); + void func_0208bc9c(unk32 param1, unk32 param2); }; extern UnkStruct_027e0ce0 *data_027e0ce0; diff --git a/src/031_Land/Actor/ActorHeart.cpp b/src/031_Land/Actor/ActorHeart.cpp new file mode 100644 index 00000000..e3ed9fc8 --- /dev/null +++ b/src/031_Land/Actor/ActorHeart.cpp @@ -0,0 +1,356 @@ +#include "Actor/ActorHeart.hpp" +#include "Actor/ActorRupee.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" + +#include + +class UnkStruct_ov031_02113d64 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ Vec3p mUnk_04; + + UnkStruct_ov031_02113d64(unk32 param1, q20 x, q20 y, q20 z) { + mUnk_00 = param1; + mUnk_04.x = x; + mUnk_04.y = y; + mUnk_04.z = z; + } +}; +const UnkStruct_ov031_02113d64 data_ov031_02113d64(0, 0x800, 0, 0x800); + +ARM DECL_PROFILE(ActorProfileHeart); + +// func_ov031_020eed00 +ARM Actor *ActorProfileHeart::Create() { + return new(HeapIndex_2) ActorHeart(); +} + +// func_ov031_020eed24 +ARM ActorProfileHeart::ActorProfileHeart() : + ActorProfile(ActorId_Heart) { + this->mUnk_04.pos.x = 0; + this->mUnk_04.pos.y = 0x400; + this->mUnk_04.pos.z = 0; + this->mUnk_04.size = 0x400; +} + +extern "C" void func_02098388(void); +extern "C" void func_02097bb8(void); + +extern UnkStruct_ov000_020b539c UnkStruct_020b539c; + +ARM void ActorHeart::func_ov031_020eed64(unk32 *param_2, unk32 param_3, unk32 param_4) { + unk32 local_5c; + unk32 local_58; + unk32 local_54; + // ?? + unk32 local_34; + unk32 local_30; + unk32 local_2c; + + local_30 = 0; + local_2c = param_4; + + this->mUnk_5c.func_ov000_020975f8(); + local_58 = param_2[1]; + local_58 = param_2[2]; + local_5c = param_2[0]; + local_34 = param_4; + local_30 = param_3; + + this->func_ov000_020973f4(&UnkStruct_020b539c, ActorId_Heart, this->mUnk_5c); +} + +ARM void ActorHeart::func_ov031_020f0750() {} + +// func_ov031_020eede0 +ARM ActorHeart::ActorHeart() { + func_02098388(); +} + +// func_ov031_020eeed8 +ARM bool ActorHeart::vfunc_18(unk32 param1) { + this->func_ov031_020ef4a8(); + return true; +} + +extern "C" void func_01fff17c(unk16 *, UnkStruct_027e0ce0 *, unk32); +extern "C" void func_02018114(unk16 *, unk32); + +static PTMF data_ov031_02113d74[] = { + ActorHeart::func_ov031_020ef2f8, ActorHeart::func_ov031_020ef334, ActorHeart::func_ov031_020ef3a0, + ActorHeart::func_ov031_020ef3d0, ActorHeart::func_ov031_020ef444, ActorHeart::func_ov031_020ef458, +}; + +void ActorHeart::vfunc_20() { + + short local_58; + + func_01fff17c(&local_58, nullptr, 0); + CALL_PTMF(PTMF, data_ov031_02113d74[this->mUnk_4c]); + +} // func_ov031_020eeee8 + +extern unk32 data_ov000_020aecf8; + +static PTMF data_ov031_02113da4[] = { + ActorHeart::func_ov031_020ef2ec, ActorHeart::func_ov031_020ef320, ActorHeart::func_ov031_020ef35c, + ActorHeart::func_ov031_020ef3b8, ActorHeart::func_ov031_020ef430, ActorHeart::func_ov031_020ef448, +}; + +ARM void ActorHeart::func_ov031_020ef1b4(unk16 param_2) { + this->mUnk_4c = param_2; + this->mUnk_2c = data_ov000_020aecf8; + this->mUnk_44 = 0x9C; + CALL_PTMF(PTMF, data_ov031_02113da4[this->mUnk_4c]); +} + +ARM void ActorHeart::func_ov031_020ef208() { + if (this->mUnk_4c == 3 || this->mUnk_4c == 4 || this->mUnk_4c == 5) { + this->mFlags[0] |= 0b10; + return; + } + if (this->mUnk_be == 0) { + if (this->mUnk_52 <= this->mUnk_50) { + this->mUnk_52 = 0x3C; + this->mUnk_50 = 0x00; + this->mUnk_be = 0x01; + return; + } + this->mUnk_50++; + return; + } + + if ((this->mUnk_50 & 0b111) < 4) { + this->mFlags[0] &= 0xFFFFFFFD; + } else { + this->mFlags[0] |= 0b10; + } + + if (this->mUnk_52 <= this->mUnk_50) { + this->func_ov000_020984d0(); + return; + } + this->mUnk_50++; +} + +ARM void ActorHeart::func_ov031_020ef2ec() { + this->mVel.y = 0x400; +} + +extern "C" void func_ov000_02098838(); + +ARM void ActorHeart::func_ov031_020ef2f8() { + func_ov000_02098838(); + if (this->mVel.y > 0) { + return; + } + this->func_ov031_020ef1b4(0x01); +} + +ARM void ActorHeart::func_ov031_020ef320() { + this->mUnk_2c = 0x06; + this->mUnk_44 = 0x9F; +} + +ARM void ActorHeart::func_ov031_020ef334() { + this->func_ov031_020ef570(); + if ((this->mUnk_46 & 0b11) == 0) { + return; + } + this->func_ov031_020ef1b4(0x02); +} + +ARM void ActorHeart::func_ov031_020ef35c() { + this->mVel.x = 0; + this->mVel.y = 0; + this->mVel.z = 0; + if (this->mUnk_be == 0 && (this->mUnk_52 - this->mUnk_50) > 0xB4) { + this->mUnk_52 = 0xB4; + this->mUnk_50 = 0x00; + } + this->mUnk_44 = 0x9F; +} + +ARM void ActorHeart::func_ov031_020ef3a0() { + if (this->mUnk_80 >= 0) { + return; + } + this->func_ov031_020ef698(); +} + +extern "C" void func_ov017_020bf99c(void); +// Actor_9c::func_ov000_02097bec() ? +extern "C" void func_ov017_02097bec(int); + +ARM void ActorHeart::func_ov031_020ef3b8() { + func_ov017_020bf99c(); + func_ov017_02097bec(this->mUnk_98); +} + +extern "C" void func_ov017_020bf9c8(ActorUnk_ov000_020a8bb0 *param1); + +ARM void ActorHeart::func_ov031_020ef3d0() { + ActorUnk_ov000_020a8bb0 *actor = gActorManager->func_01fff3b4(this->mUnk_c0); + func_ov017_020bf9c8(actor); + if ((this->mFlags[0] & 0x20) == 0) { + return; + } + this->mVel.x = 0; + this->mVel.y = 0; + this->mVel.z = 0; + + this->mUnk_9c |= 0x1000; + this->func_ov031_020ef1b4(0x01); +} + +ARM void ActorHeart::func_ov031_020ef430() { + this->mVel.x = 0; + this->mVel.y = 0; + this->mVel.z = 0; +} + +// ¯\_(ツ)_/¯ +ARM void ActorHeart::func_ov031_020ef444() { + return; +} + +ARM void ActorHeart::func_ov031_020ef448() { + this->mVel.x = 0; + this->mVel.z = 0; +} + +ARM void ActorHeart::func_ov031_020ef458() { + ActorUnk_ov000_020a8bb0 *actorUnk = gActorManager->func_01fff3b4(this->mUnk_c4); + if (actorUnk == nullptr) { + this->func_ov031_020ef1b4(0x01); + return; + } + this->mPos.x = actorUnk->mUnk_0e8; + this->mPos.y = *reinterpret_cast(&actorUnk->mUnk_0ec); + this->mPos.z = actorUnk->mUnk_0f0; +} + +ARM void ActorHeart::func_ov031_020ef4a8() { + if (this->mUnk_80 >= 0) { + this->func_ov031_020ef1b4(2); + return; + } + + if (this->mUnk_88 != 0) { + if (this->mUnk_88 != 1) { + this->mUnk_52 = 0x1E0; + this->mUnk_50 = 0x000; + this->func_ov031_020ef1b4(2); + return; + } + this->mUnk_52 = 0x1E0; + this->mUnk_50 = 0x000; + this->func_ov031_020ef1b4(2); + return; + } + this->mUnk_52 = 0xB4; + this->mUnk_50 = 0x00; + this->func_ov031_020ef1b4(2); +} + +ARM void ActorHeart::func_ov031_020ef528() { + data_027e0ce0->func_0208bc9c(4, 1); + data_027e09a8->func_ov000_02071b30(0x76, &this->mPos, 0); + this->func_ov000_020984d0(); +} + +ARM void ActorHeart::func_ov031_020ef570() { + int value; + int newVelY; + u32 sine; + + func_ov000_02098838(); + this->mUnk_b8 += 0x666; + sine = SIN(this->mUnk_b8); + this->mVel.z = 0x0; + value = ((unk32) sine >> 0x1F) << 6 | (sine >> 0x1A) + (0xFFFFF7FF < sine * 0x40); + newVelY = value; + if (this->mVel.y < -0x13) { + newVelY = -0x14; + } + *((u32 *) &this->mVel.x) = (sine * 0x40 + 0x800) >> 0xc | value * 0x100000; + if (this->mVel.y < -0x13) { + this->mVel.y = newVelY; + } +} + +// func_ov031_020ef5e8 +ARM void ActorHeart::vfunc_2c(unk32 param1) { + Vec3p uStack_20; + Vec3p uStack_2c; + + // TODO : auStack30 + + if (this->func_01fff5d0(param1, 0) == 0) { + return; + } + + uStack_20.x = this->mPos.x; + uStack_20.z = this->mPos.z; + uStack_20.y = this->mPos.y + 0x80; + this->func_ov017_020bf5c4(&uStack_20, 0x400, 0x400, 0x1F, 0x00); + + uStack_20.x = this->mPos.x; + uStack_20.z = this->mPos.z; + uStack_20.y = this->mPos.y + 0x80; + this->func_ov017_020bf5c4(&uStack_2c, 0xCCD, 0xCCD, 0x1F, 0x00); +} + +ARM void ActorHeart::func_ov031_020ef698() { + if (this->mUnk_bc == 0x00) { + if ((this->mUnk_46 & 3) == 0) { + this->mUnk_bc = 0x01; + this->mUnk_2c = 0x06; + } + return; + } + if (this->mUnk_bc == 0x01) { + this->func_ov031_020ef570(); + if ((this->mUnk_46 & 3) != 0) { + this->mVel.x = 0; + this->mVel.y = 0; + this->mVel.z = 0; + this->mUnk_bc = 0; + } + } +} + +#define GET_ACTORHEART(this) reinterpret_cast((this)->mUnk_20) + +ARM ActorHeart_c4::ActorHeart_c4(Actor *param1) : + Actor_c4(param1) { + this->mUnk_20 = param1; + this->mUnk_04 = 1; +} + +// non-matching +ARM unk32 ActorHeart_c4::vfunc_00(Actor_c4_stack param_2, unk32 param_3) { + if (param_3 != 0) { + ActorHeart *pHeart = GET_ACTORHEART(this); + pHeart->mUnk_c4 = param_2.param1; + pHeart->func_ov031_020ef1b4(0x04); + } + + return this->Actor_c4::vfunc_00(param_2, param_3); +} + +ARM void ActorHeart_c4::vfunc_04() { + GET_ACTORHEART(this)->func_ov031_020ef1b4(0x05); + this->Actor_c4::vfunc_04(); +} + +ARM void ActorHeart_c4::vfunc_0c(unk32 param1) { + GET_ACTORHEART(this)->func_ov031_020ef1b4(0x01); + this->Actor_c4::vfunc_0c(param1); +} + +ARM void ActorHeart_c4::vfunc_08() { + GET_ACTORHEART(this)->func_ov031_020ef528(); + this->Actor_c4::vfunc_08(); +} diff --git a/src/031_Land/Actor/ActorUnkHERT.cpp b/src/031_Land/Actor/ActorUnkHERT.cpp deleted file mode 100644 index a8e95079..00000000 --- a/src/031_Land/Actor/ActorUnkHERT.cpp +++ /dev/null @@ -1,46 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#include "Actor/ActorUnkHERT.hpp" -#include "System/SysNew.hpp" - -ARM DECL_PROFILE(ActorProfileUnkHERT); - -ARM Actor *ActorProfileUnkHERT::Create() { - return new(HeapIndex_2) ActorUnkHERT(); -} - -ARM ActorProfileUnkHERT::ActorProfileUnkHERT() : - ActorProfile(ActorId_Heart) {} - -ARM ActorUnkHERT::ActorUnkHERT() {} - -ARM void ActorUnkHERT::func_ov031_020eed64(void) {} -ARM void ActorUnkHERT::func_ov031_020eeed8(void) {} -ARM void ActorUnkHERT::func_ov031_020eeee8(void) {} -ARM void ActorUnkHERT::func_ov031_020ef1b4(void) {} -ARM void ActorUnkHERT::func_ov031_020ef208(void) {} -ARM void ActorUnkHERT::func_ov031_020ef2ec(void) {} -ARM void ActorUnkHERT::func_ov031_020ef2f8(void) {} -ARM void ActorUnkHERT::func_ov031_020ef320(void) {} -ARM void ActorUnkHERT::func_ov031_020ef334(void) {} -ARM void ActorUnkHERT::func_ov031_020ef35c(void) {} -ARM void ActorUnkHERT::func_ov031_020ef3a0(void) {} -ARM void ActorUnkHERT::func_ov031_020ef3b8(void) {} -ARM void ActorUnkHERT::func_ov031_020ef3d0(void) {} -ARM void ActorUnkHERT::func_ov031_020ef430(void) {} -ARM void ActorUnkHERT::func_ov031_020ef444(void) {} -ARM void ActorUnkHERT::func_ov031_020ef448(void) {} -ARM void ActorUnkHERT::func_ov031_020ef458(void) {} -ARM void ActorUnkHERT::func_ov031_020ef4a8(void) {} -ARM void ActorUnkHERT::func_ov031_020ef528(void) {} -ARM void ActorUnkHERT::func_ov031_020ef570(void) {} -ARM void ActorUnkHERT::func_ov031_020ef5e8(void) {} -ARM void ActorUnkHERT::func_ov031_020ef698(void) {} -ARM void ActorUnkHERT::func_ov031_020ef6f8(void) {} -ARM void ActorUnkHERT::func_ov031_020ef730(void) {} -ARM void ActorUnkHERT::func_ov031_020ef774(void) {} -ARM void ActorUnkHERT::func_ov031_020ef794(void) {} -ARM void ActorUnkHERT::func_ov031_020ef7bc(void) {} - -ARM ActorUnkHERT::~ActorUnkHERT() {} -ARM ActorProfileUnkHERT::~ActorProfileUnkHERT() {} diff --git a/tools/configure.py b/tools/configure.py index 48c0c078..7edcf85e 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -352,7 +352,7 @@ def GameLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: Object("031_Land/Actor/ActorUnkCLLT.cpp"), Object("031_Land/Actor/ActorUnkEFSB.cpp"), Object("031_Land/Actor/ActorUnkFLEN.cpp"), - Object("031_Land/Actor/ActorUnkHERT.cpp"), + Object("031_Land/Actor/ActorHeart.cpp"), Object("031_Land/Actor/ActorUnkITBM.cpp"), Object("031_Land/Actor/ActorUnkITTD.cpp"), Object("031_Land/Actor/ActorUnkMLCK.cpp"),