From 4fca7f3d562d746026acf9a641904e8121b6443d Mon Sep 17 00:00:00 2001 From: Yanis <35189056+Yanis002@users.noreply.github.com> Date: Tue, 13 Oct 2026 04:35:09 +0200 Subject: [PATCH] Match actors 4 (#163) * ActorHeart OK * ActorUnkSCCN OK * ActorShotArrow OK --- config/eur/arm9/itcm/symbols.txt | 4 +- config/eur/arm9/overlays/ov000/symbols.txt | 10 +- config/eur/arm9/overlays/ov031/delinks.txt | 4 + config/eur/arm9/overlays/ov031/relocs.txt | 14 +- config/eur/arm9/overlays/ov031/symbols.txt | 80 +- config/eur/arm9/overlays/ov032/symbols.txt | 10 +- config/eur/arm9/overlays/ov063/symbols.txt | 10 +- config/eur/arm9/overlays/ov071/symbols.txt | 2 +- config/eur/arm9/overlays/ov075/symbols.txt | 2 +- config/eur1/arm9/itcm/symbols.txt | 4 +- config/eur1/arm9/overlays/ov000/relocs.txt | 6 +- config/eur1/arm9/overlays/ov000/symbols.txt | 26 +- config/eur1/arm9/overlays/ov031/delinks.txt | 4 + config/eur1/arm9/overlays/ov031/relocs.txt | 60 +- config/eur1/arm9/overlays/ov031/symbols.txt | 78 +- config/eur1/arm9/overlays/ov032/symbols.txt | 10 +- config/eur1/arm9/overlays/ov063/symbols.txt | 10 +- config/eur1/arm9/overlays/ov071/symbols.txt | 2 +- config/eur1/arm9/overlays/ov073/symbols.txt | 4 +- config/eur1/arm9/overlays/ov075/symbols.txt | 4 +- config/jp/arm9/itcm/symbols.txt | 4 +- config/jp/arm9/overlays/ov000/symbols.txt | 10 +- config/jp/arm9/overlays/ov031/delinks.txt | 4 + config/jp/arm9/overlays/ov031/relocs.txt | 16 +- config/jp/arm9/overlays/ov031/symbols.txt | 86 +- config/jp/arm9/overlays/ov032/symbols.txt | 10 +- config/jp/arm9/overlays/ov063/symbols.txt | 10 +- config/jp/arm9/overlays/ov071/symbols.txt | 2 +- config/jp/arm9/overlays/ov073/symbols.txt | 4 +- config/jp/arm9/overlays/ov075/symbols.txt | 4 +- config/jp/arm9/symbols.txt | 2 +- config/usa/arm9/itcm/symbols.txt | 4 +- config/usa/arm9/overlays/ov000/relocs.txt | 6 +- config/usa/arm9/overlays/ov000/symbols.txt | 26 +- config/usa/arm9/overlays/ov031/delinks.txt | 4 + config/usa/arm9/overlays/ov031/relocs.txt | 20 +- config/usa/arm9/overlays/ov031/symbols.txt | 92 +- config/usa/arm9/overlays/ov032/symbols.txt | 10 +- config/usa/arm9/overlays/ov063/symbols.txt | 10 +- config/usa/arm9/overlays/ov071/symbols.txt | 2 +- config/usa/arm9/overlays/ov073/symbols.txt | 4 +- config/usa/arm9/overlays/ov075/symbols.txt | 4 +- include/Actor/Actor.hpp | 25 +- include/Actor/ActorBomb.hpp | 4 +- include/Actor/ActorFleeingSpinut.hpp | 2 +- include/Actor/ActorHeart.hpp | 5 +- include/Actor/ActorItemBoomerang.hpp | 6 +- include/Actor/ActorItemDrop.hpp | 2 +- include/Actor/ActorItemFlower.hpp | 2 +- include/Actor/ActorItemTornado.hpp | 2 +- include/Actor/ActorKeese.hpp | 2 +- include/Actor/ActorPot.hpp | 2 +- include/Actor/ActorRollingStone.hpp | 8 +- include/Actor/ActorRupee.hpp | 2 +- include/Actor/ActorShotArrow.hpp | 10 +- include/Actor/ActorSpinut.hpp | 2 +- include/Actor/ActorTearLight.hpp | 2 +- include/Actor/ActorUnkCANS.hpp | 2 +- include/Actor/ActorUnkCASE.hpp | 4 +- include/Actor/ActorUnkEFSB.hpp | 2 +- include/Actor/ActorUnkNFSP.hpp | 2 +- include/Actor/ActorUnkNSSW.hpp | 4 +- include/Actor/ActorUnkNTTZ.hpp | 2 +- include/Actor/ActorUnkRBLS.hpp | 2 +- include/Actor/ActorUnkRMSBase.hpp | 2 +- include/Actor/ActorUnkRMTG.hpp | 2 +- include/Actor/ActorUnkROCK.hpp | 2 +- include/Actor/ActorUnkSWBM.hpp | 4 +- include/Actor/ActorUnkSWCH.hpp | 2 +- include/Actor/ActorUnkTGTZ.hpp | 2 +- include/Actor/ActorUnkZLSL_ZSRS.hpp | 2 +- include/Actor/Actor_Derived1.hpp | 2 +- include/CommonFuncs.hpp | 11 +- include/MapObject/MapObject.hpp | 2 +- include/Render/ModelRender.hpp | 15 +- include/Unknown/UnkStruct_027e09bc.hpp | 2 +- include/Unknown/UnkStruct_027e0cd8.hpp | 18 +- include/Unknown/UnkStruct_027e0ce0.hpp | 1 + include/Unknown/UnkStruct_ov031_02114664.hpp | 2 +- include/Unknown/UnkStruct_ov031_02114870.hpp | 2 +- include/Unknown/UnkStruct_ov031_Items.hpp | 2 +- include/math.hpp | 13 + libs/nitro/include/nitro/reg.h | 1 + src/000_Second/Actor/Actor.cpp | 2 +- src/000_Second/Actor/Actor_Derived1.cpp | 2 +- src/017_CourseExec/Actor/ActorManager_017.cpp | 4 +- .../UnkStackStruct_ov017_020c1104_017.cpp | 2 - src/031_Land/Actor/ActorBomb.cpp | 8 +- src/031_Land/Actor/ActorHeart.cpp | 153 ++-- src/031_Land/Actor/ActorItemBoomerang.cpp | 6 +- src/031_Land/Actor/ActorItemDrop.cpp | 2 +- src/031_Land/Actor/ActorItemFlower.cpp | 2 +- src/031_Land/Actor/ActorItemTornado.cpp | 4 +- src/031_Land/Actor/ActorPot.cpp | 3 +- src/031_Land/Actor/ActorRollingStone.cpp | 28 +- src/031_Land/Actor/ActorRupee.cpp | 23 +- src/031_Land/Actor/ActorShotArrow.cpp | 793 +++++++++++------- src/031_Land/Actor/ActorUnkEFSB.cpp | 2 +- src/031_Land/Actor/ActorUnkNFSP.cpp | 15 +- src/031_Land/Actor/ActorUnkNTTZ.cpp | 2 +- src/031_Land/Actor/ActorUnkRMTG.cpp | 2 +- src/031_Land/Actor/ActorUnkROCK.cpp | 2 +- src/031_Land/Actor/ActorUnkSCCN.cpp | 63 +- src/031_Land/Actor/ActorUnkSWBM.cpp | 4 +- src/031_Land/Actor/ActorUnkSWCH.cpp | 2 +- src/031_Land/Actor/ActorUnkTGTZ.cpp | 2 +- src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp | 2 +- src/032_MapA1/Actor/ActorFleeingSpinut.cpp | 2 +- src/032_MapA1/Actor/ActorKeese.cpp | 2 +- src/032_MapA1/Actor/ActorSpinut.cpp | 2 +- src/032_MapA1/Actor/ActorUnkNSSW.cpp | 6 +- src/063_Shrine/Actor/ActorUnkCANS.cpp | 2 +- src/063_Shrine/Actor/ActorUnkCASE.cpp | 6 +- src/063_Shrine/Actor/ActorUnkRBLS.cpp | 2 +- src/063_Shrine/Actor/ActorUnkRMSBase.cpp | 2 +- src/071_Tower/Actor/ActorTearLight.cpp | 2 +- .../UnkStruct_027e0ce0_40_101.cpp | 7 +- 117 files changed, 1128 insertions(+), 892 deletions(-) diff --git a/config/eur/arm9/itcm/symbols.txt b/config/eur/arm9/itcm/symbols.txt index 46a22912..a03947bf 100644 --- a/config/eur/arm9/itcm/symbols.txt +++ b/config/eur/arm9/itcm/symbols.txt @@ -159,7 +159,7 @@ _ZNK18UnkStruct_027e09a421GetCurrentCourseEntryEv kind:function(arm,size=0x20) a _ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420 _ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sP7VecFx32i kind:function(arm,size=0x60) addr:0x01ffd43c func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c -_ZN21UnkStruct_027e09bc_0C13func_01ffd640EP7VecFx32 kind:function(arm,size=0x128) addr:0x01ffd640 +_ZN21UnkStruct_027e09bc_0C13func_01ffd640EP16UnkVecFx32Struct kind:function(arm,size=0x128) addr:0x01ffd640 _ZN21UnkStruct_027e09bc_0C13func_01ffd768EPvP5Vec2sc kind:function(arm,size=0x138) addr:0x01ffd768 func_01ffd8a0 kind:function(arm,size=0x190) addr:0x01ffd8a0 func_01ffda30 kind:function(arm,size=0x2ec) addr:0x01ffda30 @@ -209,7 +209,7 @@ _ZN16MapObjectManager13func_01fff4ccEPFvPvS0_ES0_ kind:function(arm,size=0x54) a _ZN16MapObjectManager13func_01fff520EP24UnkStruct_ov000_020b34c4PP9MapObject kind:function(arm,size=0x64) addr:0x01fff520 _ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 _ZN9MapObject13func_01fff590Ei kind:function(arm,size=0x40) addr:0x01fff590 -_ZN5Actor13func_01fff5d0EP14Actor_vfunc_30i kind:function(arm,size=0x3c) addr:0x01fff5d0 +_ZN5Actor13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 _ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iiiii kind:function(arm,size=0x8c) addr:0x01fff60c func_01fff698 kind:function(arm,size=0x38) addr:0x01fff698 func_01fff6d0 kind:function(arm,size=0x74) addr:0x01fff6d0 diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 709914cf..81184e72 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -350,7 +350,7 @@ func_ov000_0205ca34 kind:function(arm,size=0x40) addr:0x0205ca34 func_ov000_0205ca74 kind:function(arm,size=0x40) addr:0x0205ca74 func_ov000_0205cab4 kind:function(arm,size=0x28) addr:0x0205cab4 func_ov000_0205cadc kind:function(arm,size=0xe8) addr:0x0205cadc -_ZN5Actor19func_ov000_0205cbc4EjP7VecFx32 kind:function(arm,size=0x17c) addr:0x0205cbc4 +func_ov000_0205cbc4 kind:function(arm,size=0x17c) addr:0x0205cbc4 func_ov000_0205cd40 kind:function(arm,size=0x11c) addr:0x0205cd40 func_ov000_0205ce5c kind:function(arm,size=0x128) addr:0x0205ce5c func_ov000_0205cf84 kind:function(arm,size=0x178) addr:0x0205cf84 @@ -1564,7 +1564,7 @@ _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_020802ecEtP7VecFx32 kind:function(ar func_ov000_02080364 kind:function(arm,size=0x88) addr:0x02080364 _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_020803ecEt kind:function(arm,size=0x150) addr:0x020803ec _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_0208053cEt kind:function(arm,size=0xe4) addr:0x0208053c -_ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_02080620Ev kind:function(arm,size=0x38) addr:0x02080620 +_ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_02080620Ei kind:function(arm,size=0x38) addr:0x02080620 func_ov000_02080658 kind:function(arm,size=0xd8) addr:0x02080658 func_ov000_02080730 kind:function(arm,size=0x64) addr:0x02080730 func_ov000_02080794 kind:function(arm,size=0xac) addr:0x02080794 @@ -1948,7 +1948,7 @@ func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be48 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208be70 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208be9c func_ov000_0208bec8 kind:function(arm,size=0x20) addr:0x0208bec8 -func_ov000_0208bee8 kind:function(arm,size=0x20) addr:0x0208bee8 +_ZN18UnkStruct_027e0ce019func_ov000_0208bee8Ev kind:function(arm,size=0x20) addr:0x0208bee8 func_ov000_0208bf08 kind:function(arm,size=0x2c) addr:0x0208bf08 func_ov000_0208bf34 kind:function(arm,size=0x34) addr:0x0208bf34 func_ov000_0208bf68 kind:function(arm,size=0x20) addr:0x0208bf68 @@ -2321,7 +2321,7 @@ _ZN5Actor5SetupEv kind:function(arm,size=0x4) addr:0x020984b0 _ZN5Actor6UpdateEv kind:function(arm,size=0x4) addr:0x020984b4 _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x020984b8 _ZN5Actor8vfunc_28EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984bc -_ZN5Actor8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984c0 +_ZN5Actor8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020984c0 _ZN5Actor8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984c4 _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x020984c8 _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x020984d0 @@ -3067,7 +3067,7 @@ _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a97fc _ZN14Actor_Derived119func_ov000_020a9804EP5ActorP16G3d_RenderState_ kind:function(arm,size=0xec) addr:0x020a9804 _ZN14Actor_Derived16UpdateEv kind:function(arm,size=0x4) addr:0x020a98f0 _ZN14Actor_Derived18vfunc_24Ev kind:function(arm,size=0x68) addr:0x020a98f4 -_ZN14Actor_Derived18vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x48) addr:0x020a995c +_ZN14Actor_Derived18vfunc_2CEi kind:function(arm,size=0x48) addr:0x020a995c _ZN14Actor_Derived18vfunc_B8Ev kind:function(arm,size=0x34) addr:0x020a99a4 _ZN14Actor_Derived18vfunc_14EP8Cylinder kind:function(arm,size=0x48) addr:0x020a99d8 _ZN19func_ov000_020a9a20D1Ev kind:function(arm,size=0x14) addr:0x020a9a20 diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index e6a83467..1c28bb4d 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -78,6 +78,7 @@ src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp: .bss start:0x0211672c end:0x02116858 src/031_Land/Actor/ActorHeart.cpp: + complete .text start:0x020eecf4 end:0x020ef81c .init start:0x0211139c end:0x02111408 .ctor start:0x021127c0 end:0x021127c4 @@ -93,6 +94,7 @@ src/031_Land/Actor/ActorUnkRMTG.cpp: .bss start:0x021168a4 end:0x0211698c src/031_Land/Actor/ActorUnkSCCN.cpp: + complete .text start:0x020efa0c end:0x020efcd4 .init start:0x02111458 end:0x021114a8 .ctor start:0x021127c8 end:0x021127cc @@ -116,11 +118,13 @@ src/031_Land/Actor/ActorItemFlower.cpp: .bss start:0x02116a24 end:0x02116a70 src/031_Land/Actor/ActorShotArrow.cpp: + complete .text start:0x020f1390 end:0x020f3d7c .init start:0x02111548 end:0x02111598 .ctor start:0x021127d4 end:0x021127d8 .data start:0x02114264 end:0x0211439c .bss start:0x02116a70 end:0x02116abc + .rodata start:0x02110b00 end:0x02110b08 src/031_Land/Actor/ActorUnkATTG.cpp: complete diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index a6f30fce..ebab2e08 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -2155,7 +2155,7 @@ from:0x020ec38c kind:arm_call to:0x0206c9a8 module:overlay(0) from:0x020ec394 kind:arm_call to:0x020ec3d0 module:overlay(31) from:0x020ec3b0 kind:arm_call to:0x020809d8 module:overlay(0) from:0x020ec3bc kind:load to:0x020d8660 module:overlay(24) -from:0x020ec3c0 kind:load to:0x02163ff4 module:overlays(60,63,68,73,84) +from:0x020ec3c0 kind:load to:0x02163ff4 module:overlay(73) from:0x020ec3c4 kind:load to:0x020b51b8 module:overlay(0) from:0x020ec3cc kind:load to:0x027e0cd8 module:dtcm from:0x020ec400 kind:arm_call to:0x0206d0bc module:overlay(0) @@ -2757,7 +2757,7 @@ from:0x020f15f0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020f15f4 kind:load to:0x02110b5c module:overlay(31) from:0x020f15f8 kind:load to:0x02110b08 module:overlay(31) from:0x020f1600 kind:load to:0x02043e50 module:main -from:0x020f1604 kind:load to:0x02163fe0 module:overlays(60,63,68,73,84) +from:0x020f1604 kind:load to:0x02163fe0 module:overlay(73) from:0x020f1610 kind:arm_call to:0x0207b6c0 module:overlay(0) from:0x020f162c kind:arm_call to:0x0205aeac module:overlay(0) from:0x020f1664 kind:arm_call to:0x02080a78 module:overlay(0) @@ -2845,13 +2845,13 @@ from:0x020f1fa0 kind:arm_call to:0x0205aeac module:overlay(0) from:0x020f1fd4 kind:arm_call to:0x02080a78 module:overlay(0) from:0x020f2000 kind:load to:0x027e09a8 module:dtcm from:0x020f2008 kind:load to:0x027e0cd8 module:dtcm -from:0x020f200c kind:load to:0x02163ff4 module:overlays(60,63,68,73,84) +from:0x020f200c kind:load to:0x02163ff4 module:overlay(73) from:0x020f201c kind:arm_call to:0x020f3210 module:overlay(31) from:0x020f2034 kind:arm_call to:0x020f2280 module:overlay(31) from:0x020f203c kind:arm_call to:0x02098838 module:overlay(0) from:0x020f2064 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f207c kind:arm_call to:0x020f2794 module:overlay(31) -from:0x020f20b8 kind:load to:0x02163ff4 module:overlays(60,63,68,73,84) +from:0x020f20b8 kind:load to:0x02163ff4 module:overlay(73) from:0x020f20c8 kind:arm_call to:0x020f3210 module:overlay(31) from:0x020f2100 kind:arm_call to:0x02098838 module:overlay(0) from:0x020f2128 kind:arm_call to:0x01ffb6e4 module:itcm @@ -2863,7 +2863,7 @@ from:0x020f21b8 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f21c0 kind:arm_call to:0x01ffb800 module:itcm from:0x020f21cc kind:arm_call to:0x020f2f9c module:overlay(31) from:0x020f21d4 kind:arm_call to:0x020f2ef0 module:overlay(31) -from:0x020f2210 kind:load to:0x02163ff4 module:overlays(60,63,68,73,84) +from:0x020f2210 kind:load to:0x02163ff4 module:overlay(73) from:0x020f2240 kind:arm_call to:0x02098838 module:overlay(0) from:0x020f2268 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f22f0 kind:arm_call to:0x0200eab0 module:main @@ -2917,7 +2917,7 @@ from:0x020f2b2c kind:arm_call to:0x020f2f9c module:overlay(31) from:0x020f2b60 kind:arm_call to:0x02098ab4 module:overlay(0) from:0x020f2b80 kind:load to:0x027e0ce4 module:dtcm from:0x020f2b84 kind:load to:0x027e0ce0 module:dtcm -from:0x020f2b88 kind:load to:0x02110b01 module:overlay(31) +from:0x020f2b88 kind:load to:0x02110b00 add:1 module:overlay(31) from:0x020f2bb4 kind:arm_call to:0x020f1878 module:overlay(31) from:0x020f2be4 kind:arm_call to:0x020f1878 module:overlay(31) from:0x020f2c00 kind:arm_call to:0x020f1878 module:overlay(31) @@ -2943,7 +2943,7 @@ from:0x020f2f84 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f2f94 kind:arm_call to:0x01ffb714 module:itcm from:0x020f2fe8 kind:arm_call to:0x0207e58c module:overlay(0) from:0x020f2ff8 kind:load to:0x027e09c0 module:dtcm -from:0x020f2ffc kind:load to:0x02110b01 module:overlay(31) +from:0x020f2ffc kind:load to:0x02110b00 add:1 module:overlay(31) from:0x020f304c kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x020f3094 kind:arm_call_thumb to:0x01ffa184 module:itcm from:0x020f30a4 kind:arm_call to:0x01ffa60c module:itcm diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 0fe69dd8..35d2fab0 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -342,7 +342,7 @@ _ZN9ActorBomb19func_ov031_020e20fcEv kind:function(arm,size=0x4) addr:0x020e20fc _ZN9ActorBomb19func_ov031_020e2100Ev kind:function(arm,size=0x34) addr:0x020e2100 _ZN9ActorBomb19func_ov031_020e2134Ev kind:function(arm,size=0xec) addr:0x020e2134 _ZN24ActorBomb_ov031_020e2134D1Ev kind:function(arm,size=0x14) addr:0x020e2220 -_ZN9ActorBomb8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x158) addr:0x020e2234 +_ZN9ActorBomb8vfunc_2CEi kind:function(arm,size=0x158) addr:0x020e2234 _ZN9ActorBomb19func_ov031_020e238cEv kind:function(arm,size=0xe0) addr:0x020e238c _ZN9ActorBomb4GrabE15ActorGrabParams kind:function(arm,size=0x40) addr:0x020e246c _ZN9ActorBomb4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x110) addr:0x020e24ac @@ -363,7 +363,7 @@ _ZN13ActorBomb_1808vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ k _ZN13ActorBomb_1808vfunc_10E9RefStructi kind:function(arm,size=0x84) addr:0x020e328c _ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e3310 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3340 -_ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e337c +_ZN13ActorBomb_19C8vfunc_10EPK5Actor kind:function(arm,size=0x30) addr:0x020e337c _ZN13ActorBomb_unkC1Ev kind:function(arm,size=0x14) addr:0x020e33ac _ZN24ActorBomb_ov031_020e2134D0Ev kind:function(arm,size=0x1c) addr:0x020e33c0 _ZN13ActorBomb_19CD0Ev kind:function(arm,size=0x1c) addr:0x020e33dc @@ -436,9 +436,9 @@ _ZN18ActorItemBoomerang6UpdateEv kind:function(arm,size=0x614) addr:0x020e4a20 _ZN18ActorItemBoomerang19func_ov031_020e5034Ei kind:function(arm,size=0x1ec) addr:0x020e5034 _ZN18ActorItemBoomerang19func_ov031_020e5220Ev kind:function(arm,size=0x80) addr:0x020e5220 _ZN18ActorItemBoomerang19func_ov031_020e52a0Ev kind:function(arm,size=0xb4) addr:0x020e52a0 -_ZN18ActorItemBoomerang8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x74) addr:0x020e5354 -_ZN21ActorItemBoomerang_A08vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e53c8 -_ZN21ActorItemBoomerang_CC8vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e53e4 +_ZN18ActorItemBoomerang8vfunc_2CEi kind:function(arm,size=0x74) addr:0x020e5354 +_ZN21ActorItemBoomerang_A08vfunc_10EPK5Actor kind:function(arm,size=0x1c) addr:0x020e53c8 +_ZN21ActorItemBoomerang_CC8vfunc_10EPK5Actor kind:function(arm,size=0x1c) addr:0x020e53e4 _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c) addr:0x020e5400 _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) addr:0x020e544c _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5474 @@ -462,7 +462,7 @@ _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5c00 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5d18 _ZN16ActorItemTornado6UpdateEv kind:function(arm,size=0x10) addr:0x020e6148 _ZN16ActorItemTornado8vfunc_24Ev kind:function(arm,size=0x44) addr:0x020e6158 -_ZN16ActorItemTornado8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x124) addr:0x020e619c +_ZN16ActorItemTornado8vfunc_2CEi kind:function(arm,size=0x124) addr:0x020e619c _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e62c0 _ZN16ActorItemTornado19func_ov031_020e6314Et kind:function(arm,size=0x2c) addr:0x020e6314 _ZN16ActorItemTornado19func_ov031_020e6340EPK7VecFx32ss kind:function(arm,size=0x58) addr:0x020e6340 @@ -484,7 +484,7 @@ _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e68bc _ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e68d8 _ZN15ActorUnkSWBM_948vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e6900 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e691c -_ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6974 +_ZN15ActorUnkSWBM_988vfunc_10EPK5Actor kind:function(arm,size=0x58) addr:0x020e6974 _ZN15ActorUnkSWBM_C88vfunc_00Eii kind:function(arm,size=0x168) addr:0x020e69cc _ZN19ActorProfileUnkSWBM10GetProfileEv kind:function(arm,size=0xc) addr:0x020e6b34 _ZN19ActorProfileUnkSWBM6CreateEv kind:function(arm,size=0x24) addr:0x020e6b40 @@ -499,7 +499,7 @@ _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020 _ZN12ActorUnkSWBM6UpdateEv kind:function(arm,size=0x268) addr:0x020e6ef8 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7160 _ZN12ActorUnkSWBM19func_ov031_020e718cEPK7VecFx32P7MtxFx33isss kind:function(arm,size=0x108) addr:0x020e718c -_ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e7294 +_ZN12ActorUnkSWBM8vfunc_2CEi kind:function(arm,size=0x40) addr:0x020e7294 _ZN15ActorUnkSWBM_94D0Ev kind:function(arm,size=0x1c) addr:0x020e72d4 _ZN15ActorUnkSWBM_98D0Ev kind:function(arm,size=0x1c) addr:0x020e72f0 _ZN12ActorUnkSWBMD1Ev kind:function(arm,size=0x28) addr:0x020e730c @@ -550,7 +550,7 @@ _ZN12ActorUnkROCK4InitEi kind:function(arm,size=0x30) addr:0x020e897c _ZN12ActorUnkROCK6UpdateEv kind:function(arm,size=0x9c) addr:0x020e89ac _ZN12ActorUnkROCK19func_ov031_020e8a48Es kind:function(arm,size=0x84) addr:0x020e8a48 _ZN12ActorUnkROCK19func_ov031_020e8accEv kind:function(arm,size=0x30) addr:0x020e8acc -_ZN12ActorUnkROCK8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x020e8afc +_ZN12ActorUnkROCK8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x020e8afc _ZN12ActorUnkROCK4GrabE15ActorGrabParams kind:function(arm,size=0x68) addr:0x020e8ba0 _ZN12ActorUnkROCK4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x44) addr:0x020e8c08 _ZN12ActorUnkROCKD1Ev kind:function(arm,size=0x28) addr:0x020e8c4c @@ -594,7 +594,7 @@ _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e9904 _ZN10ActorRupee6UpdateEv kind:function(arm,size=0x230) addr:0x020e9958 _ZN10ActorRupee19func_ov031_020e9b88Ev kind:function(arm,size=0x60) addr:0x020e9b88 _ZN10ActorRupee19func_ov031_020e9be8Ev kind:function(arm,size=0x44) addr:0x020e9be8 -_ZN10ActorRupee8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x128) addr:0x020e9c2c +_ZN10ActorRupee8vfunc_2CEi kind:function(arm,size=0x128) addr:0x020e9c2c _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9d54 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9d94 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9e5c @@ -665,7 +665,7 @@ _ZN12ActorUnkZLSL19func_ov031_020ec0d4Ev kind:function(arm,size=0x58) addr:0x020 _ZN12ActorUnkZLSL19func_ov031_020ec12cEv kind:function(arm,size=0x38) addr:0x020ec12c _ZN12ActorUnkZLSL19func_ov031_020ec164Ev kind:function(arm,size=0xc) addr:0x020ec164 _ZN12ActorUnkZLSL19func_ov031_020ec170Ev kind:function(arm,size=0x64) addr:0x020ec170 -_ZN12ActorUnkZLSL8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xfc) addr:0x020ec1d4 +_ZN12ActorUnkZLSL8vfunc_2CEi kind:function(arm,size=0xfc) addr:0x020ec1d4 _ZN12ActorUnkZLSL8vfunc_7CEi kind:function(arm,size=0x100) addr:0x020ec2d0 _ZN12ActorUnkZLSL19func_ov031_020ec3d0Ev kind:function(arm,size=0xcc) addr:0x020ec3d0 _ZN12ActorUnkZLSL19func_ov031_020ec49cEv kind:function(arm,size=0xb0) addr:0x020ec49c @@ -752,7 +752,7 @@ _ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020ef _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_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef5e8 +_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_00E9RefStructi kind:function(arm,size=0x44) addr:0x020ef730 @@ -768,7 +768,7 @@ _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef84c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef874 _ZN12ActorUnkRMTG4InitEi kind:function(arm,size=0xb8) addr:0x020ef8a0 _ZN12ActorUnkRMTG5SetupEv kind:function(arm,size=0x38) addr:0x020ef958 -_ZN12ActorUnkRMTG8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020ef990 +_ZN12ActorUnkRMTG8vfunc_2CEi kind:function(arm,size=0x20) addr:0x020ef990 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020ef9b0 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020ef9d0 _ZN19ActorProfileUnkRMTGD1Ev kind:function(arm,size=0x14) addr:0x020ef9f8 @@ -830,7 +830,7 @@ _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0cf0 _ZN8ActorPot4InitEi kind:function(arm,size=0x28) addr:0x020f0d04 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0d2c _ZN8ActorPot6UpdateEv kind:function(arm,size=0x38) addr:0x020f0d80 -_ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f0db8 +_ZN8ActorPot8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f0db8 _ZN8ActorPot19func_ov031_020f0de8Ev kind:function(arm,size=0xc) addr:0x020f0de8 _ZN8ActorPot19func_ov031_020f0df4Ev kind:function(arm,size=0xc) addr:0x020f0df4 _ZN8ActorPot19func_ov031_020f0e00Ev kind:function(arm,size=0xc) addr:0x020f0e00 @@ -854,7 +854,7 @@ _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f10c0 _ZN15ActorItemFlower4InitEi kind:function(arm,size=0x28) addr:0x020f10d4 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f10fc _ZN15ActorItemFlower6UpdateEv kind:function(arm,size=0x38) addr:0x020f1140 -_ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f1178 +_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f1178 _ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f11a8 _ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f11b4 _ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f11c0 @@ -903,7 +903,7 @@ _ZN14ActorShotArrow19func_ov031_020f2270Ev kind:function(arm,size=0x10) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2280Ev kind:function(arm,size=0x1c) addr:0x020f2280 _ZN14ActorShotArrow19func_ov031_020f229cEv kind:function(arm,size=0x38) addr:0x020f229c _ZN14ActorShotArrow19func_ov031_020f22d4EP7MtxFx33P7VecFx32 kind:function(arm,size=0x3c) addr:0x020f22d4 -_ZN14ActorShotArrow8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x344) addr:0x020f2310 +_ZN14ActorShotArrow8vfunc_2CEi kind:function(arm,size=0x344) addr:0x020f2310 _ZN14ActorShotArrow19func_ov031_020f2654EP7MtxFx33 kind:function(arm,size=0x140) addr:0x020f2654 _ZN14ActorShotArrow19func_ov031_020f2794Es kind:function(arm,size=0x118) addr:0x020f2794 _ZN14ActorShotArrow19func_ov031_020f28acEv kind:function(arm,size=0x2e0) addr:0x020f28ac @@ -911,7 +911,7 @@ _ZN14ActorShotArrow19func_ov031_020f2b8cEv kind:function(arm,size=0x30) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2bbcEv kind:function(arm,size=0x30) addr:0x020f2bbc _ZN14ActorShotArrow19func_ov031_020f2becEv kind:function(arm,size=0x1c) addr:0x020f2bec _ZN14ActorShotArrow19func_ov031_020f2c08Es kind:function(arm,size=0xa4) addr:0x020f2c08 -_ZN14ActorShotArrow19func_ov031_020f2cacEP7VecFx32b kind:function(arm,size=0x244) addr:0x020f2cac +_ZN14ActorShotArrow19func_ov031_020f2cacEPK7VecFx32b kind:function(arm,size=0x244) addr:0x020f2cac _ZN14ActorShotArrow19func_ov031_020f2ef0Ev kind:function(arm,size=0x6c) addr:0x020f2ef0 _ZN14ActorShotArrow19func_ov031_020f2f5cEP7VecFx32 kind:function(arm,size=0x40) addr:0x020f2f5c _ZN14ActorShotArrow19func_ov031_020f2f9cEv kind:function(arm,size=0x64) addr:0x020f2f9c @@ -927,7 +927,7 @@ _ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm _ZN18ActorShotArrow_1788vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f33bc _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f370c _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f374c -_ZN18ActorShotArrow_1948vfunc_10EP5Actor kind:function(arm,size=0x388) addr:0x020f38b0 +_ZN18ActorShotArrow_1948vfunc_10EPK5Actor kind:function(arm,size=0x388) addr:0x020f38b0 _ZN18ActorShotArrow_1948vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0xcc) addr:0x020f3c38 _ZN14ActorShotArrow19func_ov031_020f3d04Es kind:function(arm,size=0x48) addr:0x020f3d04 _ZN18ActorShotArrow_194D0Ev kind:function(arm,size=0x1c) addr:0x020f3d4c @@ -997,7 +997,7 @@ _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6138 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6160 _ZN12ActorUnkNTTZ4InitEi kind:function(arm,size=0x8) addr:0x020f6190 _ZN12ActorUnkNTTZ6UpdateEv kind:function(arm,size=0x4) addr:0x020f6198 -_ZN12ActorUnkNTTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020f619c +_ZN12ActorUnkNTTZ8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020f619c _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f61a0 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f61f0 _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6240 @@ -1029,7 +1029,7 @@ _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE9RefStruct kind:function(arm,size=0x4c) a _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP9RefStructtPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6ea8 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f6f20 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f7170 -_ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f72a8 +_ZN12ActorUnkTGTZ8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f72a8 _ZN12ActorUnkTGTZ19func_ov031_020f7358Ev kind:function(arm,size=0x8c) addr:0x020f7358 _ZN12ActorUnkTGTZ19func_ov031_020f73e4Ev kind:function(arm,size=0xc) addr:0x020f73e4 _ZN12ActorUnkTGTZ19func_ov031_020f73f0Ev kind:function(arm,size=0xc) addr:0x020f73f0 @@ -1042,7 +1042,7 @@ func_ov031_020f7494 kind:function(arm,size=0x40) addr:0x020f7494 func_ov031_020f74d4 kind:function(arm,size=0x38) addr:0x020f74d4 _ZN24UnkStruct_ov031_02114870C2Ev kind:function(arm,size=0x2c) addr:0x020f750c _ZN24UnkStruct_ov031_021148704InitEi kind:function(arm,size=0x3c) addr:0x020f7538 -_ZN24UnkStruct_ov031_021148708vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f7574 +_ZN24UnkStruct_ov031_021148708vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f7574 _ZN24UnkStruct_ov031_021148708vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f7594 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f759c func_ov031_020f75ec kind:function(arm,size=0x8) addr:0x020f75ec @@ -1072,7 +1072,7 @@ _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7ab4 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7adc _ZN12ActorUnkSWCH4InitEi kind:function(arm,size=0x14) addr:0x020f7b0c _ZN12ActorUnkSWCH6UpdateEv kind:function(arm,size=0x68) addr:0x020f7b20 -_ZN12ActorUnkSWCH8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x10) addr:0x020f7b88 +_ZN12ActorUnkSWCH8vfunc_2CEi kind:function(arm,size=0x10) addr:0x020f7b88 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7b98 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7bac _ZN19ActorProfileUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7bc8 @@ -1112,7 +1112,7 @@ _ZN24ActorProfileRollingStone6CreateEv kind:function(arm,size=0x24) addr:0x020f8 _ZN24ActorProfileRollingStoneC1Ev kind:function(arm,size=0x44) addr:0x020f8310 _ZN21ActorRollingStone_1048vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8354 _ZN21ActorRollingStone_1048vfunc_10E9RefStructi kind:function(arm,size=0xb8) addr:0x020f83e4 -_ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x020f849c +_ZN20ActorRollingStone_D48vfunc_10EPK5Actor kind:function(arm,size=0x44) addr:0x020f849c _ZN17ActorRollingStoneC1Ev kind:function(arm,size=0x194) addr:0x020f84e0 _ZN20ActorRollingStone_D4D1Ev kind:function(arm,size=0x14) addr:0x020f8674 _ZN21ActorRollingStone_104D1Ev kind:function(arm,size=0x14) addr:0x020f8688 @@ -1120,7 +1120,7 @@ _ZN17ActorRollingStone4InitEi kind:function(arm,size=0xf0) addr:0x020f869c _ZN17ActorRollingStone6UpdateEv kind:function(arm,size=0x98) addr:0x020f878c _ZN17ActorRollingStone8SetStateEs kind:function(arm,size=0x5c) addr:0x020f8824 _ZN17ActorRollingStone19func_ov031_020f8880Ev kind:function(arm,size=0xc8) addr:0x020f8880 -_ZN17ActorRollingStone8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xac) addr:0x020f8948 +_ZN17ActorRollingStone8vfunc_2CEi kind:function(arm,size=0xac) addr:0x020f8948 _ZN17ActorRollingStone19func_ov031_020f89f4Ev kind:function(arm,size=0x10) addr:0x020f89f4 _ZN17ActorRollingStone19func_ov031_020f8a04Ev kind:function(arm,size=0x28) addr:0x020f8a04 _ZN17ActorRollingStone19func_ov031_020f8a2cEv kind:function(arm,size=0xc) addr:0x020f8a2c @@ -1188,7 +1188,7 @@ _ZN13ActorItemDrop19func_ov031_020fa668Ev kind:function(arm,size=0x10) addr:0x02 _ZN13ActorItemDrop19func_ov031_020fa678Ev kind:function(arm,size=0x50) addr:0x020fa678 _ZN13ActorItemDrop19func_ov031_020fa6c8Ev kind:function(arm,size=0x64) addr:0x020fa6c8 _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x020fa72c -_ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa83c +_ZN13ActorItemDrop8vfunc_2CEi kind:function(arm,size=0xc4) addr:0x020fa83c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fa900 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fa9f8 _ZN16ActorItemDrop_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020faa30 @@ -1250,7 +1250,7 @@ _ZN12ActorUnkEFSB4InitEi kind:function(arm,size=0xb8) addr:0x020fb614 _ZN12ActorUnkEFSB6UpdateEv kind:function(arm,size=0x38) addr:0x020fb6cc _ZN12ActorUnkEFSB8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020fb704 _ZN12ActorUnkEFSB8vfunc_54Ei kind:function(arm,size=0x8) addr:0x020fb718 -_ZN12ActorUnkEFSB8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x70) addr:0x020fb720 +_ZN12ActorUnkEFSB8vfunc_2CEi kind:function(arm,size=0x70) addr:0x020fb720 _ZN12ActorUnkEFSBD1Ev kind:function(arm,size=0x30) addr:0x020fb790 _ZN12ActorUnkEFSBD0Ev kind:function(arm,size=0x38) addr:0x020fb7c0 _ZN19ActorProfileUnkEFSBD1Ev kind:function(arm,size=0x14) addr:0x020fb7f8 @@ -1265,7 +1265,7 @@ _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fb9b4 _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020fba60 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbaec -_ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbb88 +_ZN12ActorUnkNFSP8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020fbb88 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbb8c _ZN12ActorUnkNFSP19func_ov031_020fbba0E9RefStruct kind:function(arm,size=0x40) addr:0x020fbba0 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbbe0 @@ -2010,7 +2010,7 @@ data_ov031_02110ac0 kind:data(any) addr:0x02110ac0 data_ov031_02110ac4 kind:data(any) addr:0x02110ac4 data_ov031_02110acc kind:data(any) addr:0x02110acc data_ov031_02110ad0 kind:data(any) addr:0x02110ad0 -data_ov031_02110b01 kind:data(any) addr:0x02110b01 +data_ov031_02110b00 kind:data(any) addr:0x02110b00 local data_ov031_02110b08 kind:data(any) addr:0x02110b08 data_ov031_02110b3c kind:data(any) addr:0x02110b3c data_ov031_02110b4c kind:data(any) addr:0x02110b4c @@ -2312,9 +2312,9 @@ data_ov031_02113d08 kind:data(any) addr:0x02113d08 _ZTV19data_ov031_02113d14 kind:data(any) addr:0x02113d0c data_ov031_02113d3c kind:data(any) addr:0x02113d3c ambiguous 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_02113d64 kind:data(any) addr:0x02113d64 local +data_ov031_02113d74 kind:data(any) addr:0x02113d74 local +data_ov031_02113da4 kind:data(any) addr:0x02113da4 local _ZTV13ActorHeart_C4 kind:data(any) addr:0x02113dd4 _ZTV17ActorProfileHeart kind:data(any) addr:0x02113dec _ZTV10ActorHeart kind:data(any) addr:0x02113e10 @@ -2337,8 +2337,8 @@ _ZTV15ActorItemFlower kind:data(any) addr:0x021141f4 _ZTV18ActorShotArrow_194 kind:data(any) addr:0x02114264 _ZTV18ActorShotArrow_178 kind:data(any) addr:0x02114280 _ZTV21ActorProfileShotArrow kind:data(any) addr:0x0211429c -data_ov031_021142c0 kind:data(any) addr:0x021142c0 -data_ov031_02114300 kind:data(any) addr:0x02114300 +data_ov031_021142c0 kind:data(any) addr:0x021142c0 local +data_ov031_02114300 kind:data(any) addr:0x02114300 local _ZTV14ActorShotArrow kind:data(any) addr:0x02114340 _ZTV19ActorProfileUnkATTG kind:data(any) addr:0x0211439c _ZTV12ActorUnkATTG kind:data(any) addr:0x021143c0 @@ -2516,34 +2516,34 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkTLKTE8sProfileE kind:bss addr:0x0211649c @10787 kind:bss addr:0x021164a0 local _ZN15ProfileInstanceI19ActorProfileUnkTLKTE8sProfileE kind:bss addr:0x021164ac _ZGVN15ProfileInstanceI25ActorProfileItemBoomerangE8sProfileE kind:bss addr:0x021164e8 -@10793 kind:bss addr:0x021164ec +@10793 kind:bss addr:0x021164ec local _ZN15ProfileInstanceI25ActorProfileItemBoomerangE8sProfileE kind:bss addr:0x021164f8 _ZGVN15ProfileInstanceI23ActorProfileItemTornadoE8sProfileE kind:bss addr:0x02116534 -@10799 kind:bss addr:0x02116538 +@10799 kind:bss addr:0x02116538 local _ZN15ProfileInstanceI23ActorProfileItemTornadoE8sProfileE kind:bss addr:0x02116544 _ZGVN15ProfileInstanceI19ActorProfileUnkSWBME8sProfileE kind:bss addr:0x02116580 @10805 kind:bss addr:0x02116584 local _ZN15ProfileInstanceI19ActorProfileUnkSWBME8sProfileE kind:bss addr:0x02116590 data_ov031_021165cc kind:bss addr:0x021165cc _ZGVN15ProfileInstanceI19ActorProfileUnkROCKE8sProfileE kind:bss addr:0x021165d0 -@10811 kind:bss addr:0x021165d4 +@10811 kind:bss addr:0x021165d4 local _ZN15ProfileInstanceI19ActorProfileUnkROCKE8sProfileE kind:bss addr:0x021165e0 data_ov031_021166d8 kind:bss addr:0x021166d8 data_ov031_021166dc kind:bss addr:0x021166dc _ZN15ProfileInstanceI17ActorProfileRupeeE8sProfileE kind:bss addr:0x021166e8 data_ov031_02116724 kind:bss addr:0x02116724 _ZGVN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x0211672c -@10824 kind:bss addr:0x02116738 +@10824 kind:bss addr:0x02116738 local _ZN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x02116744 _ZN15ProfileInstanceI19ActorProfileUnkZSRSE8sProfileE kind:bss addr:0x02116780 _ZGVN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x02116858 -@10830 kind:bss addr:0x0211685c +@10830 kind:bss addr:0x0211685c local _ZN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x02116868 _ZGVN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x021168a4 @10836 kind:bss addr:0x021168a8 local _ZN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x021168b4 _ZGVN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211698c -@10842 kind:bss addr:0x02116990 +@10842 kind:bss addr:0x02116990 local _ZN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211699c _ZGVN15ProfileInstanceI15ActorProfilePotE8sProfileE kind:bss addr:0x021169d8 @10848 kind:bss addr:0x021169dc local @@ -2552,7 +2552,7 @@ _ZGVN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x02116 @10854 kind:bss addr:0x02116a28 local _ZN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x02116a34 _ZGVN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02116a70 -@10860 kind:bss addr:0x02116a74 +@10860 kind:bss addr:0x02116a74 local _ZN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02116a80 _ZGVN15ProfileInstanceI19ActorProfileUnkATTGE8sProfileE kind:bss addr:0x02116abc @10866 kind:bss addr:0x02116ac0 local diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt index f091a15d..695f8870 100644 --- a/config/eur/arm9/overlays/ov032/symbols.txt +++ b/config/eur/arm9/overlays/ov032/symbols.txt @@ -11,7 +11,7 @@ _ZN11ActorSpinut5SetupEv kind:function(arm,size=0x84) addr:0x02119458 _ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x021194dc _ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211953c _ZN11ActorSpinut6UpdateEv kind:function(arm,size=0x358) addr:0x02119584 -_ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb4) addr:0x021198dc +_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x021198dc _ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x02119990 _ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x02119a0c _ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x02119be8 @@ -68,7 +68,7 @@ _ZN18ActorFleeingSpinut4InitEi kind:function(arm,size=0x1c) addr:0x0211b988 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211b9a4 _ZN18ActorFleeingSpinut6UpdateEv kind:function(arm,size=0x268) addr:0x0211ba0c _ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bc74 -_ZN18ActorFleeingSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x8c) addr:0x0211bd78 +_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211bd78 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211be04 _ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211be30 _ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211bea8 @@ -133,7 +133,7 @@ _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e420 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e468 _ZN10ActorKeese6UpdateEv kind:function(arm,size=0x1b8) addr:0x0211e778 -_ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xbc) addr:0x0211e930 +_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211e930 _ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211e9ec _ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eb60 _ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ece8 @@ -177,7 +177,7 @@ _ZN12ActorUnkNSSW19func_ov032_02120190Ev kind:function(arm,size=0xcc) addr:0x021 _ZN12ActorUnkNSSW19func_ov032_0212025cEv kind:function(arm,size=0x7c) addr:0x0212025c _ZN12ActorUnkNSSW19func_ov032_021202d8Ev kind:function(arm,size=0x124) addr:0x021202d8 _ZN12ActorUnkNSSW19func_ov032_021203fcEv kind:function(arm,size=0x350) addr:0x021203fc -_ZN12ActorUnkNSSW8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x134) addr:0x0212074c +_ZN12ActorUnkNSSW8vfunc_2CEi kind:function(arm,size=0x134) addr:0x0212074c _ZN12ActorUnkNSSW19func_ov032_02120880Ev kind:function(arm,size=0x14) addr:0x02120880 _ZN12ActorUnkNSSW19func_ov032_02120894Ei kind:function(arm,size=0x2a0) addr:0x02120894 _ZN12ActorUnkNSSW19func_ov032_02120b34E9RefStruct kind:function(arm,size=0x38) addr:0x02120b34 @@ -191,7 +191,7 @@ _ZN16ActorUnkNSSW_0E08vfunc_00E9RefStructi kind:function(arm,size=0x3c) addr:0x0 _ZN16ActorUnkNSSW_0E08vfunc_04Ev kind:function(arm,size=0x1c) addr:0x02120d60 _ZN16ActorUnkNSSW_0E08vfunc_0CEP7VecFx32 kind:function(arm,size=0x40) addr:0x02120d7c _ZN16ActorUnkNSSW_104C1EP12ActorUnkNSSW kind:function(arm,size=0x3c) addr:0x02120dbc -_ZN16ActorUnkNSSW_1048vfunc_10EP5Actor kind:function(arm,size=0x10) addr:0x02120df8 +_ZN16ActorUnkNSSW_1048vfunc_10EPK5Actor kind:function(arm,size=0x10) addr:0x02120df8 _ZN16ActorUnkNSSW_104D0Ev kind:function(arm,size=0x1c) addr:0x02120e08 _ZN12ActorUnkNSSWD1Ev kind:function(arm,size=0x28) addr:0x02120e24 _ZN12ActorUnkNSSWD0Ev kind:function(arm,size=0x30) addr:0x02120e4c diff --git a/config/eur/arm9/overlays/ov063/symbols.txt b/config/eur/arm9/overlays/ov063/symbols.txt index 6d3d935b..39363fa3 100644 --- a/config/eur/arm9/overlays/ov063/symbols.txt +++ b/config/eur/arm9/overlays/ov063/symbols.txt @@ -14,7 +14,7 @@ _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x021 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158490 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584c4 _ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x021584f0 -_ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xe0) addr:0x02158a2c +_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158a2c _ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158b0c _ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158b34 _ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158b98 @@ -71,7 +71,7 @@ _ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0 _ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ac4c _ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ac68 _ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ac8c -_ZN16ActorUnkCASE_1748vfunc_10EP5Actor kind:function(arm,size=0x24) addr:0x0215acc8 +_ZN16ActorUnkCASE_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215acc8 _ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215acec _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ad48 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215ae6c @@ -92,7 +92,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2c4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2c8 _ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b2ec -_ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x0215b624 +_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b624 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6c8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b724 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7cc @@ -110,7 +110,7 @@ _ZN15ActorUnkRMSBase4InitEi kind:function(arm,size=0x54) addr:0x0215bb34 _ZN15ActorUnkRMSBase5SetupEv kind:function(arm,size=0x4) addr:0x0215bb88 _ZN15ActorUnkRMSBase6UpdateEv kind:function(arm,size=0x4) addr:0x0215bb8c _ZN15ActorUnkRMSBase8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215bb90 -_ZN15ActorUnkRMSBase8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x0215bba4 +_ZN15ActorUnkRMSBase8vfunc_2CEi kind:function(arm,size=0x30) addr:0x0215bba4 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bbd4 _ZN15ActorUnkRMSBaseD0Ev kind:function(arm,size=0x30) addr:0x0215bbfc _ZN19ActorProfileUnkRMSV10GetProfileEv kind:function(arm,size=0xc) addr:0x0215bc2c @@ -255,7 +255,7 @@ _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f3d4 _ZN12ActorUnkRBLS4InitEi kind:function(arm,size=0x8c) addr:0x0215f3e8 _ZN12ActorUnkRBLS6UpdateEv kind:function(arm,size=0x14) addr:0x0215f474 _ZN12ActorUnkRBLS8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215f488 -_ZN12ActorUnkRBLS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x0215f49c +_ZN12ActorUnkRBLS8vfunc_2CEi kind:function(arm,size=0x20) addr:0x0215f49c _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f4bc _ZN12ActorUnkRBLSD1Ev kind:function(arm,size=0x28) addr:0x0215f4d8 _ZN12ActorUnkRBLSD0Ev kind:function(arm,size=0x30) addr:0x0215f500 diff --git a/config/eur/arm9/overlays/ov071/symbols.txt b/config/eur/arm9/overlays/ov071/symbols.txt index d0143274..744779e1 100644 --- a/config/eur/arm9/overlays/ov071/symbols.txt +++ b/config/eur/arm9/overlays/ov071/symbols.txt @@ -299,7 +299,7 @@ _ZN14ActorTearLight4InitEi kind:function(arm,size=0xac) addr:0x0215f530 _ZN14ActorTearLight5SetupEv kind:function(arm,size=0x2c) addr:0x0215f5dc _ZN14ActorTearLight6UpdateEv kind:function(arm,size=0x4c) addr:0x0215f608 _ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x0215f654 -_ZN14ActorTearLight8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc8) addr:0x0215f714 +_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x0215f714 _ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f7dc _ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x0215f7f4 _ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x0215f80c diff --git a/config/eur/arm9/overlays/ov075/symbols.txt b/config/eur/arm9/overlays/ov075/symbols.txt index f820c897..81c40555 100644 --- a/config/eur/arm9/overlays/ov075/symbols.txt +++ b/config/eur/arm9/overlays/ov075/symbols.txt @@ -250,7 +250,7 @@ _ZN12ActorUnkMABL19func_ov075_02160714Ev kind:function(arm,size=0x8) addr:0x0216 _ZN12ActorUnkMABL19func_ov075_0216071cEv kind:function(arm,size=0x1c) addr:0x0216071c _ZN19ActorProfileUnkMABLD1Ev kind:function(arm,size=0x14) addr:0x02160738 func_ov075_0216074c kind:function(arm,size=0x118) addr:0x0216074c -func_ov075_02160864 kind:function(arm,size=0xa0) addr:0x02160864 +_ZN14ActorShotArrow19func_ov075_02160864Ei kind:function(arm,size=0xa0) addr:0x02160864 func_ov075_02160904 kind:function(arm,size=0xec) addr:0x02160904 func_ov075_021609f0 kind:function(arm,size=0x44) addr:0x021609f0 func_ov075_02160a34 kind:function(arm,size=0x8) addr:0x02160a34 diff --git a/config/eur1/arm9/itcm/symbols.txt b/config/eur1/arm9/itcm/symbols.txt index 46a22912..a03947bf 100644 --- a/config/eur1/arm9/itcm/symbols.txt +++ b/config/eur1/arm9/itcm/symbols.txt @@ -159,7 +159,7 @@ _ZNK18UnkStruct_027e09a421GetCurrentCourseEntryEv kind:function(arm,size=0x20) a _ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420 _ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sP7VecFx32i kind:function(arm,size=0x60) addr:0x01ffd43c func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c -_ZN21UnkStruct_027e09bc_0C13func_01ffd640EP7VecFx32 kind:function(arm,size=0x128) addr:0x01ffd640 +_ZN21UnkStruct_027e09bc_0C13func_01ffd640EP16UnkVecFx32Struct kind:function(arm,size=0x128) addr:0x01ffd640 _ZN21UnkStruct_027e09bc_0C13func_01ffd768EPvP5Vec2sc kind:function(arm,size=0x138) addr:0x01ffd768 func_01ffd8a0 kind:function(arm,size=0x190) addr:0x01ffd8a0 func_01ffda30 kind:function(arm,size=0x2ec) addr:0x01ffda30 @@ -209,7 +209,7 @@ _ZN16MapObjectManager13func_01fff4ccEPFvPvS0_ES0_ kind:function(arm,size=0x54) a _ZN16MapObjectManager13func_01fff520EP24UnkStruct_ov000_020b34c4PP9MapObject kind:function(arm,size=0x64) addr:0x01fff520 _ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 _ZN9MapObject13func_01fff590Ei kind:function(arm,size=0x40) addr:0x01fff590 -_ZN5Actor13func_01fff5d0EP14Actor_vfunc_30i kind:function(arm,size=0x3c) addr:0x01fff5d0 +_ZN5Actor13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 _ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iiiii kind:function(arm,size=0x8c) addr:0x01fff60c func_01fff698 kind:function(arm,size=0x38) addr:0x01fff698 func_01fff6d0 kind:function(arm,size=0x74) addr:0x01fff6d0 diff --git a/config/eur1/arm9/overlays/ov000/relocs.txt b/config/eur1/arm9/overlays/ov000/relocs.txt index 9bb544cf..49e12be3 100644 --- a/config/eur1/arm9/overlays/ov000/relocs.txt +++ b/config/eur1/arm9/overlays/ov000/relocs.txt @@ -8592,7 +8592,7 @@ from:0x020ae528 kind:load to:0x0215d1f1 module:overlays(67,68) from:0x020ae52c kind:load to:0x02160bbc module:overlays(62,66,68,86) from:0x020ae530 kind:load to:0x0215c2a4 module:overlays(68,77) from:0x020ae534 kind:load to:0x0213f8b4 module:overlays(26,70) -from:0x020ae538 kind:load to:0x020f14c0 module:overlays(22,31) +from:0x020ae538 kind:load to:0x020f14c0 module:overlay(31) from:0x020ae53c kind:load to:0x021570fc module:overlays(58,77) from:0x020ae540 kind:load to:0x02153088 module:overlays(29,58,77) from:0x020ae544 kind:load to:0x020f3eac module:overlay(31) @@ -8755,7 +8755,7 @@ from:0x020ae7b4 kind:load to:0x0213a918 module:overlays(26,57) from:0x020ae7b8 kind:load to:0x021305e0 module:overlays(47,48,49,50,51,52) from:0x020ae7bc kind:load to:0x021546e4 module:overlays(58,86) from:0x020ae7c0 kind:load to:0x02143bdc module:overlay(30) -from:0x020ae7c4 kind:load to:0x020eee14 module:overlays(22,31) +from:0x020ae7c4 kind:load to:0x020eee14 module:overlay(31) from:0x020ae7c8 kind:load to:0x0214b1ec module:overlay(30) from:0x020ae7cc kind:load to:0x0213ab1c module:overlays(26,57) from:0x020ae7d0 kind:load to:0x0212a5b4 module:overlays(44,45,46) @@ -8959,7 +8959,7 @@ from:0x020aeae4 kind:load to:0x020e8944 module:overlays(20,31) from:0x020aeae8 kind:load to:0x0212a988 module:overlays(41,44,46) from:0x020aeaec kind:load to:0x020e8dd8 module:overlays(20,31) from:0x020aeaf0 kind:load to:0x0214c144 module:overlay(70) -from:0x020aeaf4 kind:load to:0x020efb3c module:overlays(22,31) +from:0x020aeaf4 kind:load to:0x020efb3c module:overlay(31) from:0x020aeaf8 kind:load to:0x02182170 module:overlay(98) from:0x020aeafc kind:load to:0x0216c198 module:overlay(91) from:0x020aeb00 kind:load to:0x0214d8f0 module:overlays(30,58) diff --git a/config/eur1/arm9/overlays/ov000/symbols.txt b/config/eur1/arm9/overlays/ov000/symbols.txt index a7f2f3cd..2684313c 100644 --- a/config/eur1/arm9/overlays/ov000/symbols.txt +++ b/config/eur1/arm9/overlays/ov000/symbols.txt @@ -350,7 +350,7 @@ func_ov000_0205ca34 kind:function(arm,size=0x40) addr:0x0205ca34 func_ov000_0205ca74 kind:function(arm,size=0x40) addr:0x0205ca74 func_ov000_0205cab4 kind:function(arm,size=0x28) addr:0x0205cab4 func_ov000_0205cadc kind:function(arm,size=0xe8) addr:0x0205cadc -_ZN5Actor19func_ov000_0205cbc4EjP7VecFx32 kind:function(arm,size=0x17c) addr:0x0205cbc4 +func_ov000_0205cbc4 kind:function(arm,size=0x17c) addr:0x0205cbc4 func_ov000_0205cd40 kind:function(arm,size=0x11c) addr:0x0205cd40 func_ov000_0205ce5c kind:function(arm,size=0x128) addr:0x0205ce5c func_ov000_0205cf84 kind:function(arm,size=0x178) addr:0x0205cf84 @@ -1430,14 +1430,14 @@ func_ov000_0207c3ec kind:function(arm,size=0x20) addr:0x0207c420 func_ov000_0207c40c kind:function(arm,size=0x44) addr:0x0207c440 func_ov000_0207c450 kind:function(arm,size=0x30) addr:0x0207c484 func_ov000_0207c480 kind:function(arm,size=0x1c) addr:0x0207c4b4 -func_ov000_0207c49c kind:function(arm,size=0x8) addr:0x0207c4d0 -func_ov000_0207c4a4 kind:function(arm,size=0x4b8) addr:0x0207c4d8 -func_ov000_0207c95c kind:function(arm,size=0x10) addr:0x0207c990 -func_ov000_0207c96c kind:function(arm,size=0x34) addr:0x0207c9a0 -func_ov000_0207c9a0 kind:function(arm,size=0x70) addr:0x0207c9d4 -func_ov000_0207ca10 kind:function(arm,size=0x28) addr:0x0207ca44 -func_ov000_0207ca38 kind:function(arm,size=0x78) addr:0x0207ca6c -func_ov000_0207cab0 kind:function(arm,size=0x10) addr:0x0207cae4 +_ZN12MapObject_108vfunc_00Ev kind:function(arm,size=0x8) addr:0x0207c4d0 +_ZN12MapObject_108vfunc_04Ev kind:function(arm,size=0x4b8) addr:0x0207c4d8 +_ZN12MapObject_108vfunc_0CEv kind:function(arm,size=0x10) addr:0x0207c990 +_ZN12MapObject_108vfunc_08Ev kind:function(arm,size=0x34) addr:0x0207c9a0 +_ZN12MapObject_108vfunc_10EP8Cylinder kind:function(arm,size=0x70) addr:0x0207c9d4 +_ZN12MapObject_108vfunc_14Ev kind:function(arm,size=0x28) addr:0x0207ca44 +_ZN12MapObject_108vfunc_18EP7VecFx32 kind:function(arm,size=0x78) addr:0x0207ca6c +_ZN12MapObject_108vfunc_1CEP7VecFx32 kind:function(arm,size=0x10) addr:0x0207cae4 func_ov000_0207cac0 kind:function(arm,size=0x8) addr:0x0207caf4 func_ov000_0207cac8 kind:function(arm,size=0x804) addr:0x0207cafc func_ov000_0207d2cc kind:function(arm,size=0x10) addr:0x0207d300 @@ -1564,7 +1564,7 @@ _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_020802ecEtP7VecFx32 kind:function(ar func_ov000_02080364 kind:function(arm,size=0x88) addr:0x02080398 _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_020803ecEt kind:function(arm,size=0x150) addr:0x02080420 _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_0208053cEt kind:function(arm,size=0xe4) addr:0x02080570 -_ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_02080620Ev kind:function(arm,size=0x38) addr:0x02080654 +_ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_02080620Ei kind:function(arm,size=0x38) addr:0x02080654 func_ov000_02080658 kind:function(arm,size=0xd8) addr:0x0208068c func_ov000_02080730 kind:function(arm,size=0x64) addr:0x02080764 func_ov000_02080794 kind:function(arm,size=0xac) addr:0x020807c8 @@ -1948,7 +1948,7 @@ func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be98 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208bec0 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208beec func_ov000_0208bec8 kind:function(arm,size=0x20) addr:0x0208bf18 -func_ov000_0208bee8 kind:function(arm,size=0x20) addr:0x0208bf38 +_ZN18UnkStruct_027e0ce019func_ov000_0208bee8Ev kind:function(arm,size=0x20) addr:0x0208bf38 func_ov000_0208bf08 kind:function(arm,size=0x2c) addr:0x0208bf58 func_ov000_0208bf34 kind:function(arm,size=0x34) addr:0x0208bf84 func_ov000_0208bf68 kind:function(arm,size=0x20) addr:0x0208bfb8 @@ -2321,7 +2321,7 @@ _ZN5Actor5SetupEv kind:function(arm,size=0x4) addr:0x02098504 _ZN5Actor6UpdateEv kind:function(arm,size=0x4) addr:0x02098508 _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x0209850c _ZN5Actor8vfunc_28EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02098510 -_ZN5Actor8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02098514 +_ZN5Actor8vfunc_2CEi kind:function(arm,size=0x4) addr:0x02098514 _ZN5Actor8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02098518 _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x0209851c _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x02098524 @@ -3067,7 +3067,7 @@ _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a9850 _ZN14Actor_Derived119func_ov000_020a9804EP5ActorP16G3d_RenderState_ kind:function(arm,size=0xec) addr:0x020a9858 _ZN14Actor_Derived16UpdateEv kind:function(arm,size=0x4) addr:0x020a9944 _ZN14Actor_Derived18vfunc_24Ev kind:function(arm,size=0x68) addr:0x020a9948 -_ZN14Actor_Derived18vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x48) addr:0x020a99b0 +_ZN14Actor_Derived18vfunc_2CEi kind:function(arm,size=0x48) addr:0x020a99b0 _ZN14Actor_Derived18vfunc_B8Ev kind:function(arm,size=0x34) addr:0x020a99f8 _ZN14Actor_Derived18vfunc_14EP8Cylinder kind:function(arm,size=0x48) addr:0x020a9a2c _ZN19func_ov000_020a9a20D1Ev kind:function(arm,size=0x14) addr:0x020a9a74 diff --git a/config/eur1/arm9/overlays/ov031/delinks.txt b/config/eur1/arm9/overlays/ov031/delinks.txt index 53b6294c..cd565da0 100644 --- a/config/eur1/arm9/overlays/ov031/delinks.txt +++ b/config/eur1/arm9/overlays/ov031/delinks.txt @@ -78,6 +78,7 @@ src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp: .bss start:0x0211686c end:0x02116998 src/031_Land/Actor/ActorHeart.cpp: + complete .text start:0x020eee14 end:0x020ef94c .init start:0x021114cc end:0x02111538 .ctor start:0x021128f0 end:0x021128f4 @@ -93,6 +94,7 @@ src/031_Land/Actor/ActorUnkRMTG.cpp: .bss start:0x021169e4 end:0x02116acc src/031_Land/Actor/ActorUnkSCCN.cpp: + complete .text start:0x020efb3c end:0x020efe04 .init start:0x02111588 end:0x021115d8 .ctor start:0x021128f8 end:0x021128fc @@ -116,11 +118,13 @@ src/031_Land/Actor/ActorItemFlower.cpp: .bss start:0x02116b64 end:0x02116bb0 src/031_Land/Actor/ActorShotArrow.cpp: + complete .text start:0x020f14c0 end:0x020f3eac .init start:0x02111678 end:0x021116c8 .ctor start:0x02112904 end:0x02112908 .data start:0x021143a4 end:0x021144dc .bss start:0x02116bb0 end:0x02116bfc + .rodata start:0x02110c30 end:0x02110c38 src/031_Land/Actor/ActorUnkATTG.cpp: complete diff --git a/config/eur1/arm9/overlays/ov031/relocs.txt b/config/eur1/arm9/overlays/ov031/relocs.txt index 36e03235..1ad22ad2 100644 --- a/config/eur1/arm9/overlays/ov031/relocs.txt +++ b/config/eur1/arm9/overlays/ov031/relocs.txt @@ -2155,7 +2155,7 @@ from:0x020ec4ac kind:arm_call to:0x0206c9a8 module:overlay(0) from:0x020ec4b4 kind:arm_call to:0x020ec4f0 module:overlay(31) from:0x020ec4d0 kind:arm_call to:0x02080a0c module:overlay(0) from:0x020ec4dc kind:load to:0x020d8780 module:overlay(24) -from:0x020ec4e0 kind:load to:0x02164294 module:overlays(59,68,71,73,84) +from:0x020ec4e0 kind:load to:0x02164294 module:overlay(73) from:0x020ec4e4 kind:load to:0x020b51f8 module:overlay(0) from:0x020ec4ec kind:load to:0x027e0cd8 module:dtcm from:0x020ec520 kind:arm_call to:0x0206d0bc module:overlay(0) @@ -2437,7 +2437,7 @@ from:0x020eef28 kind:arm_call to:0x02097c0c module:overlay(0) from:0x020eef88 kind:arm_call to:0x020ef828 module:overlay(31) from:0x020eefb4 kind:arm_call to:0x01ffedac module:itcm from:0x020eefc8 kind:arm_call to:0x020801b4 module:overlay(0) -from:0x020eefe0 kind:load to:0x02113f58 module:overlay(31) +from:0x020eefe0 kind:load to:0x02113f50 module:overlay(31) add:0x8 from:0x020eefe4 kind:load to:0x02049be4 module:main from:0x020eeff0 kind:load to:0x027e0cd8 module:dtcm from:0x020eeff4 kind:load to:0x02113ea4 module:overlay(31) @@ -2540,7 +2540,7 @@ from:0x020efb9c kind:arm_call to:0x020983dc module:overlay(0) from:0x020efbac kind:arm_call to:0x0207c04c module:overlay(0) from:0x020efbbc kind:arm_call to:0x0207ecbc module:overlay(0) from:0x020efbc8 kind:load to:0x02114078 add:0x8 module:overlay(31) -from:0x020efbcc kind:load to:0x02114058 module:overlay(31) +from:0x020efbcc kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x020efc00 kind:arm_call to:0x02080654 module:overlay(0) from:0x020efc50 kind:arm_call to:0x01ffd054 module:itcm from:0x020efcac kind:arm_call to:0x01ffb6e4 module:itcm @@ -2758,7 +2758,7 @@ from:0x020f1720 kind:load to:0x020b19a0 add:0x8 module:overlay(0) from:0x020f1724 kind:load to:0x02110c8c module:overlay(31) from:0x020f1728 kind:load to:0x02110c38 module:overlay(31) from:0x020f1730 kind:load to:0x02043e50 module:main -from:0x020f1734 kind:load to:0x02164280 module:overlays(59,68,71,73,84) +from:0x020f1734 kind:load to:0x02164280 module:overlay(73) from:0x020f1740 kind:arm_call to:0x0207b6f4 module:overlay(0) from:0x020f175c kind:arm_call to:0x0205aeac module:overlay(0) from:0x020f1794 kind:arm_call to:0x02080aac module:overlay(0) @@ -2846,13 +2846,13 @@ from:0x020f20d0 kind:arm_call to:0x0205aeac module:overlay(0) from:0x020f2104 kind:arm_call to:0x02080aac module:overlay(0) from:0x020f2130 kind:load to:0x027e09a8 module:dtcm from:0x020f2138 kind:load to:0x027e0cd8 module:dtcm -from:0x020f213c kind:load to:0x02164294 module:overlays(59,68,71,73,84) +from:0x020f213c kind:load to:0x02164294 module:overlay(73) from:0x020f214c kind:arm_call to:0x020f3340 module:overlay(31) from:0x020f2164 kind:arm_call to:0x020f23b0 module:overlay(31) from:0x020f216c kind:arm_call to:0x0209888c module:overlay(0) from:0x020f2194 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f21ac kind:arm_call to:0x020f28c4 module:overlay(31) -from:0x020f21e8 kind:load to:0x02164294 module:overlays(59,68,71,73,84) +from:0x020f21e8 kind:load to:0x02164294 module:overlay(73) from:0x020f21f8 kind:arm_call to:0x020f3340 module:overlay(31) from:0x020f2230 kind:arm_call to:0x0209888c module:overlay(0) from:0x020f2258 kind:arm_call to:0x01ffb6e4 module:itcm @@ -2864,7 +2864,7 @@ from:0x020f22e8 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f22f0 kind:arm_call to:0x01ffb800 module:itcm from:0x020f22fc kind:arm_call to:0x020f30cc module:overlay(31) from:0x020f2304 kind:arm_call to:0x020f3020 module:overlay(31) -from:0x020f2340 kind:load to:0x02164294 module:overlays(59,68,71,73,84) +from:0x020f2340 kind:load to:0x02164294 module:overlay(73) from:0x020f2370 kind:arm_call to:0x0209888c module:overlay(0) from:0x020f2398 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f2420 kind:arm_call to:0x0200eab0 module:main @@ -2918,7 +2918,7 @@ from:0x020f2c5c kind:arm_call to:0x020f30cc module:overlay(31) from:0x020f2c90 kind:arm_call to:0x02098b08 module:overlay(0) from:0x020f2cb0 kind:load to:0x027e0ce4 module:dtcm from:0x020f2cb4 kind:load to:0x027e0ce0 module:dtcm -from:0x020f2cb8 kind:load to:0x02110c31 module:overlay(31) +from:0x020f2cb8 kind:load to:0x02110c30 add:1 module:overlay(31) from:0x020f2ce4 kind:arm_call to:0x020f19a8 module:overlay(31) from:0x020f2d14 kind:arm_call to:0x020f19a8 module:overlay(31) from:0x020f2d30 kind:arm_call to:0x020f19a8 module:overlay(31) @@ -2944,7 +2944,7 @@ from:0x020f30b4 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f30c4 kind:arm_call to:0x01ffb714 module:itcm from:0x020f3118 kind:arm_call to:0x0207e5c0 module:overlay(0) from:0x020f3128 kind:load to:0x027e09c0 module:dtcm -from:0x020f312c kind:load to:0x02110c31 module:overlay(31) +from:0x020f312c kind:load to:0x02110c30 add:1 module:overlay(31) from:0x020f317c kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x020f31c4 kind:arm_call_thumb to:0x01ffa184 module:itcm from:0x020f31d4 kind:arm_call to:0x01ffa60c module:itcm @@ -2998,7 +2998,7 @@ from:0x020f3b30 kind:arm_call to:0x020f387c module:overlay(31) from:0x020f3b50 kind:arm_call to:0x021531e4 module:overlay(84) from:0x020f3b68 kind:arm_call to:0x020f324c module:overlay(31) from:0x020f3ba4 kind:arm_call to:0x020f387c module:overlay(31) -from:0x020f3bc0 kind:arm_call to:0x0215bd30 module:overlays(62,75) +from:0x020f3bc0 kind:arm_call to:0x0215bd30 module:overlay(75) from:0x020f3bd8 kind:arm_call to:0x021609a4 module:overlay(75) from:0x020f3bfc kind:arm_call to:0x020f19a8 module:overlay(31) from:0x020f3c40 kind:arm_call to:0x01fff3b4 module:itcm @@ -3009,7 +3009,7 @@ from:0x020f3cc4 kind:arm_call to:0x020f387c module:overlay(31) from:0x020f3ccc kind:arm_call to:0x020f2cec module:overlay(31) from:0x020f3ce8 kind:arm_call to:0x01ffb714 module:itcm from:0x020f3d58 kind:load to:0x027e0d80 module:dtcm -from:0x020f3d5c kind:load to:0x02163658 module:overlays(59,60,63,68,73,74,75,84) +from:0x020f3d5c kind:load to:0x02163658 module:overlay(75) from:0x020f3d60 kind:load to:0x027e0ce4 module:dtcm from:0x020f3dc4 kind:arm_call to:0x01ffb714 module:itcm from:0x020f3df0 kind:arm_call to:0x01ffccf4 module:itcm @@ -3918,7 +3918,7 @@ from:0x020fbe74 kind:arm_call to:0x020984dc module:overlay(0) from:0x020fbe7c kind:arm_call to:0x02011ff4 module:main from:0x020fbe90 kind:arm_call to:0x02097960 module:overlay(0) from:0x020fbeb4 kind:arm_call to:0x0207c04c module:overlay(0) -from:0x020fbf68 kind:load to:0x02114058 module:overlay(31) +from:0x020fbf68 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x020fbf80 kind:arm_call to:0x0209d034 module:overlay(0) from:0x020fbf88 kind:arm_call to:0x02073268 module:overlay(0) from:0x020fc024 kind:arm_call to:0x0205fc20 module:overlay(0) @@ -4245,13 +4245,13 @@ from:0x020ff03c kind:arm_call_thumb to:0x02057b70 module:overlay(0) from:0x020ff044 kind:arm_call to:0x0207c04c module:overlay(0) from:0x020ff06c kind:load to:0x021153b4 add:0x8 module:overlay(31) from:0x020ff070 kind:load to:0x02115454 module:overlay(31) -from:0x020ff074 kind:load to:0x02114058 module:overlay(31) +from:0x020ff074 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x020ff080 kind:arm_call to:0x020fbf74 module:overlay(31) from:0x020ff0a0 kind:arm_call_thumb to:0x02057b70 module:overlay(0) from:0x020ff0a8 kind:arm_call to:0x0207c04c module:overlay(0) from:0x020ff0d0 kind:load to:0x021153b4 add:0x8 module:overlay(31) from:0x020ff0d4 kind:load to:0x02115454 module:overlay(31) -from:0x020ff0d8 kind:load to:0x02114058 module:overlay(31) +from:0x020ff0d8 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x020ff110 kind:arm_call to:0x020fc040 module:overlay(31) from:0x020ff1c8 kind:arm_call to:0x01ffd420 module:itcm from:0x020ff1d8 kind:arm_call to:0x020fc184 module:overlay(31) @@ -4299,14 +4299,14 @@ from:0x020ff734 kind:arm_call to:0x0209d318 module:overlay(0) from:0x020ff740 kind:load to:0x02115494 add:0x8 module:overlay(31) from:0x020ff744 kind:load to:0x02115534 module:overlay(31) from:0x020ff748 kind:load to:0x020b19a0 add:0x8 module:overlay(0) -from:0x020ff74c kind:load to:0x02114058 module:overlay(31) +from:0x020ff74c kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x020ff758 kind:arm_call to:0x020fbf74 module:overlay(31) from:0x020ff78c kind:arm_call to:0x0207c04c module:overlay(0) from:0x020ff7bc kind:arm_call to:0x0209d318 module:overlay(0) from:0x020ff7c8 kind:load to:0x02115494 add:0x8 module:overlay(31) from:0x020ff7cc kind:load to:0x02115534 module:overlay(31) from:0x020ff7d0 kind:load to:0x020b19a0 add:0x8 module:overlay(0) -from:0x020ff7d4 kind:load to:0x02114058 module:overlay(31) +from:0x020ff7d4 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x020ff7e8 kind:load to:0x02110d58 module:overlay(31) from:0x020ff808 kind:arm_call to:0x020fc040 module:overlay(31) from:0x020ff81c kind:arm_call to:0x020fd03c module:overlay(31) @@ -4412,7 +4412,7 @@ from:0x02100688 kind:arm_call to:0x0209d034 module:overlay(0) from:0x021006b0 kind:arm_call to:0x0207c04c module:overlay(0) from:0x0210071c kind:load to:0x02115660 module:overlay(31) from:0x02100720 kind:load to:0x020b19a0 add:0x8 module:overlay(0) -from:0x02100724 kind:load to:0x02114058 module:overlay(31) +from:0x02100724 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x02100728 kind:load to:0x02117768 module:overlay(31) from:0x02100758 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02100794 kind:arm_call to:0x01ffcfcc module:itcm @@ -4433,7 +4433,7 @@ from:0x02100968 kind:arm_call to:0x0209d034 module:overlay(0) from:0x02100980 kind:arm_call_thumb to:0x02058b98 module:overlay(0) from:0x02100988 kind:arm_call to:0x0207c04c module:overlay(0) from:0x021009b8 kind:load to:0x021156c8 module:overlay(31) -from:0x021009bc kind:load to:0x02114058 module:overlay(31) +from:0x021009bc kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x021009e0 kind:arm_call to:0x0209cd2c module:overlay(0) from:0x02100a68 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02100aec kind:arm_call to:0x01ffcfcc module:itcm @@ -4459,7 +4459,7 @@ from:0x02100cc4 kind:arm_call to:0x0207c04c module:overlay(0) from:0x02100cd0 kind:arm_call to:0x0207ecbc module:overlay(0) from:0x02100ce0 kind:load to:0x02115724 module:overlay(31) from:0x02100ce4 kind:load to:0x020b19a0 add:0x8 module:overlay(0) -from:0x02100ce8 kind:load to:0x02114058 module:overlay(31) +from:0x02100ce8 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x02100d34 kind:arm_call to:0x01ffedf4 module:itcm from:0x02100d58 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x02100d60 kind:arm_call to:0x02100ed4 module:overlay(31) @@ -4719,7 +4719,7 @@ from:0x021031fc kind:arm_call to:0x02103118 module:overlay(31) from:0x02103208 kind:arm_call to:0x02060804 module:overlay(0) from:0x02103218 kind:arm_call to:0x0206082c module:overlay(0) from:0x02103224 kind:load to:0x021159a8 add:0x8 module:overlay(31) -from:0x02103228 kind:load to:0x02114058 module:overlay(31) +from:0x02103228 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x02103234 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0210324c kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x02103254 kind:arm_call to:0x0209d100 module:overlay(0) @@ -5006,7 +5006,7 @@ from:0x021055f4 kind:arm_call to:0x021056c0 module:overlay(31) from:0x0210560c kind:arm_call to:0x0209c9fc module:overlay(0) from:0x0210561c kind:arm_call to:0x0207c04c module:overlay(0) from:0x02105684 kind:load to:0x02115ccc module:overlay(31) -from:0x02105690 kind:load to:0x02114058 module:overlay(31) +from:0x02105690 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x02105694 kind:load to:0x02115ce8 module:overlay(31) from:0x021056b8 kind:load to:0x027e0cd8 module:dtcm from:0x021056bc kind:load to:0x02081db0 module:overlay(0) @@ -5087,7 +5087,7 @@ from:0x021062ac kind:load to:0x0211836c module:overlay(31) from:0x021062b0 kind:load to:0x020b19a0 add:0x8 module:overlay(0) from:0x021062b4 kind:load to:0x020e1914 module:overlay(31) from:0x021062b8 kind:load to:0x020e34cc module:overlay(31) -from:0x021062bc kind:load to:0x02114058 module:overlay(31) +from:0x021062bc kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x021062fc kind:arm_call to:0x020a0388 module:overlay(0) from:0x021063e0 kind:arm_call to:0x021062c0 module:overlay(31) from:0x021063e8 kind:arm_call to:0x0210630c module:overlay(31) @@ -5190,7 +5190,7 @@ from:0x021070d4 kind:arm_call to:0x0209d034 module:overlay(0) from:0x02107104 kind:arm_call to:0x0207c04c module:overlay(0) from:0x02107118 kind:load to:0x02115eec module:overlay(31) from:0x0210711c kind:load to:0x020b19a0 add:0x8 module:overlay(0) -from:0x02107120 kind:load to:0x02114058 module:overlay(31) +from:0x02107120 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x0210713c kind:arm_call to:0x01ffb6e4 module:itcm from:0x02107170 kind:arm_call to:0x0209cd2c module:overlay(0) from:0x02107214 kind:arm_call to:0x01ffcfcc module:itcm @@ -5338,7 +5338,7 @@ from:0x02108ac4 kind:arm_call to:0x02108b34 module:overlay(31) from:0x02108adc kind:arm_call to:0x0209c9fc module:overlay(0) from:0x02108aec kind:arm_call to:0x0207c04c module:overlay(0) from:0x02108b24 kind:load to:0x02115ccc module:overlay(31) -from:0x02108b28 kind:load to:0x02114058 module:overlay(31) +from:0x02108b28 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x02108b2c kind:load to:0x02115f98 module:overlay(31) from:0x02108b3c kind:arm_call to:0x0209d034 module:overlay(0) from:0x02108b9c kind:arm_call to:0x0205a690 module:overlay(0) @@ -5347,7 +5347,7 @@ from:0x02108bf8 kind:arm_call to:0x01ffa06c module:itcm from:0x02108c04 kind:load to:0x02115fb4 module:overlay(31) from:0x02108c08 kind:load to:0x02118628 module:overlay(31) from:0x02108c0c kind:load to:0x0211471c module:overlay(31) -from:0x02108c10 kind:load to:0x02114058 module:overlay(31) +from:0x02108c10 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x02108c40 kind:arm_call to:0x01ffedf4 module:itcm from:0x02108cb4 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x02108cd0 kind:arm_call to:0x0205fc20 module:overlay(0) @@ -5443,7 +5443,7 @@ from:0x0210980c kind:arm_call to:0x0209d034 module:overlay(0) from:0x02109820 kind:arm_call_thumb to:0x02058b98 module:overlay(0) from:0x02109828 kind:arm_call to:0x0207c04c module:overlay(0) from:0x0210983c kind:load to:0x02116010 module:overlay(31) -from:0x02109840 kind:load to:0x02114058 module:overlay(31) +from:0x02109840 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x02109870 kind:arm_call to:0x0200f05c module:main from:0x021098c4 kind:arm_call to:0x01ffedf4 module:itcm from:0x02109914 kind:arm_call to:0x01ffb714 module:itcm @@ -5467,7 +5467,7 @@ from:0x02109b44 kind:arm_call to:0x02109c5c module:overlay(31) from:0x02109b5c kind:arm_call to:0x0209c9fc module:overlay(0) from:0x02109b6c kind:arm_call to:0x0207c04c module:overlay(0) from:0x02109be0 kind:load to:0x02115ccc module:overlay(31) -from:0x02109be4 kind:load to:0x02114058 module:overlay(31) +from:0x02109be4 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x02109be8 kind:load to:0x02116050 module:overlay(31) from:0x02109c00 kind:arm_call to:0x0209d034 module:overlay(0) from:0x02109c3c kind:arm_call to:0x0205fc20 module:overlay(0) @@ -5513,7 +5513,7 @@ from:0x0210a078 kind:arm_call to:0x0210a1cc module:overlay(31) from:0x0210a090 kind:arm_call to:0x0209c9fc module:overlay(0) from:0x0210a0a0 kind:arm_call to:0x0207c04c module:overlay(0) from:0x0210a120 kind:load to:0x02115ccc module:overlay(31) -from:0x0210a128 kind:load to:0x02114058 module:overlay(31) +from:0x0210a128 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x0210a12c kind:load to:0x021160bc module:overlay(31) from:0x0210a140 kind:arm_call to:0x0209d034 module:overlay(0) from:0x0210a158 kind:arm_call_thumb to:0x02057b70 module:overlay(0) @@ -5602,7 +5602,7 @@ from:0x0210acb0 kind:arm_call to:0x0207c04c module:overlay(0) from:0x0210ad9c kind:arm_call to:0x0207f530 module:overlay(0) from:0x0210adc0 kind:arm_call to:0x02028c4c module:main from:0x0210ade0 kind:load to:0x02115ccc module:overlay(31) -from:0x0210ade4 kind:load to:0x02114058 module:overlay(31) +from:0x0210ade4 kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x0210ade8 kind:load to:0x02183bd4 add:0x8 module:overlay(101) from:0x0210adf4 kind:load to:0x02116140 module:overlay(31) from:0x0210adf8 kind:load to:0x02118a58 module:overlay(31) @@ -5897,7 +5897,7 @@ from:0x0210d044 kind:arm_call to:0x0210d408 module:overlay(31) from:0x0210d05c kind:arm_call to:0x0209c9fc module:overlay(0) from:0x0210d06c kind:arm_call to:0x0207c04c module:overlay(0) from:0x0210d0e8 kind:load to:0x02115ccc module:overlay(31) -from:0x0210d0ec kind:load to:0x02114058 module:overlay(31) +from:0x0210d0ec kind:load to:0x02114050 module:overlay(31) add:0x8 from:0x0210d0f0 kind:load to:0x021162e0 module:overlay(31) from:0x0210d104 kind:arm_call_thumb to:0x02057b54 module:overlay(0) from:0x0210d12c kind:arm_call to:0x02057f18 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov031/symbols.txt b/config/eur1/arm9/overlays/ov031/symbols.txt index 887c7c8c..fe32fea9 100644 --- a/config/eur1/arm9/overlays/ov031/symbols.txt +++ b/config/eur1/arm9/overlays/ov031/symbols.txt @@ -342,7 +342,7 @@ _ZN9ActorBomb19func_ov031_020e20fcEv kind:function(arm,size=0x4) addr:0x020e221c _ZN9ActorBomb19func_ov031_020e2100Ev kind:function(arm,size=0x34) addr:0x020e2220 _ZN9ActorBomb19func_ov031_020e2134Ev kind:function(arm,size=0xec) addr:0x020e2254 _ZN24ActorBomb_ov031_020e2134D1Ev kind:function(arm,size=0x14) addr:0x020e2340 -_ZN9ActorBomb8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x158) addr:0x020e2354 +_ZN9ActorBomb8vfunc_2CEi kind:function(arm,size=0x158) addr:0x020e2354 _ZN9ActorBomb19func_ov031_020e238cEv kind:function(arm,size=0xe0) addr:0x020e24ac _ZN9ActorBomb4GrabE15ActorGrabParams kind:function(arm,size=0x40) addr:0x020e258c _ZN9ActorBomb4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x110) addr:0x020e25cc @@ -363,7 +363,7 @@ _ZN13ActorBomb_1808vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ k _ZN13ActorBomb_1808vfunc_10E9RefStructi kind:function(arm,size=0x84) addr:0x020e33ac _ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e3430 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3460 -_ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e349c +_ZN13ActorBomb_19C8vfunc_10EPK5Actor kind:function(arm,size=0x30) addr:0x020e349c _ZN13ActorBomb_unkC1Ev kind:function(arm,size=0x14) addr:0x020e34cc _ZN24ActorBomb_ov031_020e2134D0Ev kind:function(arm,size=0x1c) addr:0x020e34e0 _ZN13ActorBomb_19CD0Ev kind:function(arm,size=0x1c) addr:0x020e34fc @@ -436,9 +436,9 @@ _ZN18ActorItemBoomerang6UpdateEv kind:function(arm,size=0x614) addr:0x020e4b40 _ZN18ActorItemBoomerang19func_ov031_020e5034Ei kind:function(arm,size=0x1ec) addr:0x020e5154 _ZN18ActorItemBoomerang19func_ov031_020e5220Ev kind:function(arm,size=0x80) addr:0x020e5340 _ZN18ActorItemBoomerang19func_ov031_020e52a0Ev kind:function(arm,size=0xb4) addr:0x020e53c0 -_ZN18ActorItemBoomerang8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x74) addr:0x020e5474 -_ZN21ActorItemBoomerang_A08vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e54e8 -_ZN21ActorItemBoomerang_CC8vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e5504 +_ZN18ActorItemBoomerang8vfunc_2CEi kind:function(arm,size=0x74) addr:0x020e5474 +_ZN21ActorItemBoomerang_A08vfunc_10EPK5Actor kind:function(arm,size=0x1c) addr:0x020e54e8 +_ZN21ActorItemBoomerang_CC8vfunc_10EPK5Actor kind:function(arm,size=0x1c) addr:0x020e5504 _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c) addr:0x020e5520 _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) addr:0x020e556c _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5594 @@ -462,7 +462,7 @@ _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5d20 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5e38 _ZN16ActorItemTornado6UpdateEv kind:function(arm,size=0x10) addr:0x020e6268 _ZN16ActorItemTornado8vfunc_24Ev kind:function(arm,size=0x44) addr:0x020e6278 -_ZN16ActorItemTornado8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x124) addr:0x020e62bc +_ZN16ActorItemTornado8vfunc_2CEi kind:function(arm,size=0x124) addr:0x020e62bc _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e63e0 _ZN16ActorItemTornado19func_ov031_020e6314Et kind:function(arm,size=0x2c) addr:0x020e6434 _ZN16ActorItemTornado19func_ov031_020e6340EPK7VecFx32ss kind:function(arm,size=0x58) addr:0x020e6460 @@ -484,7 +484,7 @@ _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e69dc _ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e69f8 _ZN15ActorUnkSWBM_948vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e6a20 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e6a3c -_ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6a94 +_ZN15ActorUnkSWBM_988vfunc_10EPK5Actor kind:function(arm,size=0x58) addr:0x020e6a94 _ZN15ActorUnkSWBM_C88vfunc_00Eii kind:function(arm,size=0x168) addr:0x020e6aec _ZN19ActorProfileUnkSWBM10GetProfileEv kind:function(arm,size=0xc) addr:0x020e6c54 _ZN19ActorProfileUnkSWBM6CreateEv kind:function(arm,size=0x24) addr:0x020e6c60 @@ -499,7 +499,7 @@ _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020 _ZN12ActorUnkSWBM6UpdateEv kind:function(arm,size=0x268) addr:0x020e7018 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7280 _ZN12ActorUnkSWBM19func_ov031_020e718cEPK7VecFx32P7MtxFx33isss kind:function(arm,size=0x108) addr:0x020e72ac -_ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e73b4 +_ZN12ActorUnkSWBM8vfunc_2CEi kind:function(arm,size=0x40) addr:0x020e73b4 _ZN15ActorUnkSWBM_94D0Ev kind:function(arm,size=0x1c) addr:0x020e73f4 _ZN15ActorUnkSWBM_98D0Ev kind:function(arm,size=0x1c) addr:0x020e7410 _ZN12ActorUnkSWBMD1Ev kind:function(arm,size=0x28) addr:0x020e742c @@ -550,7 +550,7 @@ _ZN12ActorUnkROCK4InitEi kind:function(arm,size=0x30) addr:0x020e8a9c _ZN12ActorUnkROCK6UpdateEv kind:function(arm,size=0x9c) addr:0x020e8acc _ZN12ActorUnkROCK19func_ov031_020e8a48Es kind:function(arm,size=0x84) addr:0x020e8b68 _ZN12ActorUnkROCK19func_ov031_020e8accEv kind:function(arm,size=0x30) addr:0x020e8bec -_ZN12ActorUnkROCK8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x020e8c1c +_ZN12ActorUnkROCK8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x020e8c1c _ZN12ActorUnkROCK4GrabE15ActorGrabParams kind:function(arm,size=0x68) addr:0x020e8cc0 _ZN12ActorUnkROCK4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x44) addr:0x020e8d28 _ZN12ActorUnkROCKD1Ev kind:function(arm,size=0x28) addr:0x020e8d6c @@ -594,7 +594,7 @@ _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e9a24 _ZN10ActorRupee6UpdateEv kind:function(arm,size=0x230) addr:0x020e9a78 _ZN10ActorRupee19func_ov031_020e9b88Ev kind:function(arm,size=0x60) addr:0x020e9ca8 _ZN10ActorRupee19func_ov031_020e9be8Ev kind:function(arm,size=0x44) addr:0x020e9d08 -_ZN10ActorRupee8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x128) addr:0x020e9d4c +_ZN10ActorRupee8vfunc_2CEi kind:function(arm,size=0x128) addr:0x020e9d4c _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9e74 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9eb4 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9f7c @@ -665,7 +665,7 @@ _ZN12ActorUnkZLSL19func_ov031_020ec0d4Ev kind:function(arm,size=0x58) addr:0x020 _ZN12ActorUnkZLSL19func_ov031_020ec12cEv kind:function(arm,size=0x38) addr:0x020ec24c _ZN12ActorUnkZLSL19func_ov031_020ec164Ev kind:function(arm,size=0xc) addr:0x020ec284 _ZN12ActorUnkZLSL19func_ov031_020ec170Ev kind:function(arm,size=0x64) addr:0x020ec290 -_ZN12ActorUnkZLSL8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xfc) addr:0x020ec2f4 +_ZN12ActorUnkZLSL8vfunc_2CEi kind:function(arm,size=0xfc) addr:0x020ec2f4 _ZN12ActorUnkZLSL8vfunc_7CEi kind:function(arm,size=0x100) addr:0x020ec3f0 _ZN12ActorUnkZLSL19func_ov031_020ec3d0Ev kind:function(arm,size=0xcc) addr:0x020ec4f0 _ZN12ActorUnkZLSL19func_ov031_020ec49cEv kind:function(arm,size=0xb0) addr:0x020ec5bc @@ -752,7 +752,7 @@ _ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020ef _ZN10ActorHeart19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020ef5c8 _ZN10ActorHeart19func_ov031_020ef528Ev kind:function(arm,size=0x58) addr:0x020ef648 _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef6a0 -_ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef718 +_ZN10ActorHeart8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020ef718 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef7c8 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef828 _ZN13ActorHeart_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020ef860 @@ -768,7 +768,7 @@ _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef97c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef9a4 _ZN12ActorUnkRMTG4InitEi kind:function(arm,size=0xb8) addr:0x020ef9d0 _ZN12ActorUnkRMTG5SetupEv kind:function(arm,size=0x38) addr:0x020efa88 -_ZN12ActorUnkRMTG8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020efac0 +_ZN12ActorUnkRMTG8vfunc_2CEi kind:function(arm,size=0x20) addr:0x020efac0 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020efae0 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020efb00 _ZN19ActorProfileUnkRMTGD1Ev kind:function(arm,size=0x14) addr:0x020efb28 @@ -830,7 +830,7 @@ _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0e20 _ZN8ActorPot4InitEi kind:function(arm,size=0x28) addr:0x020f0e34 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0e5c _ZN8ActorPot6UpdateEv kind:function(arm,size=0x38) addr:0x020f0eb0 -_ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f0ee8 +_ZN8ActorPot8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f0ee8 _ZN8ActorPot19func_ov031_020f0de8Ev kind:function(arm,size=0xc) addr:0x020f0f18 _ZN8ActorPot19func_ov031_020f0df4Ev kind:function(arm,size=0xc) addr:0x020f0f24 _ZN8ActorPot19func_ov031_020f0e00Ev kind:function(arm,size=0xc) addr:0x020f0f30 @@ -854,7 +854,7 @@ _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f11f0 _ZN15ActorItemFlower4InitEi kind:function(arm,size=0x28) addr:0x020f1204 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f122c _ZN15ActorItemFlower6UpdateEv kind:function(arm,size=0x38) addr:0x020f1270 -_ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f12a8 +_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f12a8 _ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f12d8 _ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f12e4 _ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f12f0 @@ -903,7 +903,7 @@ _ZN14ActorShotArrow19func_ov031_020f2270Ev kind:function(arm,size=0x10) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2280Ev kind:function(arm,size=0x1c) addr:0x020f23b0 _ZN14ActorShotArrow19func_ov031_020f229cEv kind:function(arm,size=0x38) addr:0x020f23cc _ZN14ActorShotArrow19func_ov031_020f22d4EP7MtxFx33P7VecFx32 kind:function(arm,size=0x3c) addr:0x020f2404 -_ZN14ActorShotArrow8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x344) addr:0x020f2440 +_ZN14ActorShotArrow8vfunc_2CEi kind:function(arm,size=0x344) addr:0x020f2440 _ZN14ActorShotArrow19func_ov031_020f2654EP7MtxFx33 kind:function(arm,size=0x140) addr:0x020f2784 _ZN14ActorShotArrow19func_ov031_020f2794Es kind:function(arm,size=0x118) addr:0x020f28c4 _ZN14ActorShotArrow19func_ov031_020f28acEv kind:function(arm,size=0x2e0) addr:0x020f29dc @@ -911,7 +911,7 @@ _ZN14ActorShotArrow19func_ov031_020f2b8cEv kind:function(arm,size=0x30) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2bbcEv kind:function(arm,size=0x30) addr:0x020f2cec _ZN14ActorShotArrow19func_ov031_020f2becEv kind:function(arm,size=0x1c) addr:0x020f2d1c _ZN14ActorShotArrow19func_ov031_020f2c08Es kind:function(arm,size=0xa4) addr:0x020f2d38 -_ZN14ActorShotArrow19func_ov031_020f2cacEP7VecFx32b kind:function(arm,size=0x244) addr:0x020f2ddc +_ZN14ActorShotArrow19func_ov031_020f2cacEPK7VecFx32b kind:function(arm,size=0x244) addr:0x020f2ddc _ZN14ActorShotArrow19func_ov031_020f2ef0Ev kind:function(arm,size=0x6c) addr:0x020f3020 _ZN14ActorShotArrow19func_ov031_020f2f5cEP7VecFx32 kind:function(arm,size=0x40) addr:0x020f308c _ZN14ActorShotArrow19func_ov031_020f2f9cEv kind:function(arm,size=0x64) addr:0x020f30cc @@ -927,7 +927,7 @@ _ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm _ZN18ActorShotArrow_1788vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f34ec _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f383c _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f387c -_ZN18ActorShotArrow_1948vfunc_10EP5Actor kind:function(arm,size=0x388) addr:0x020f39e0 +_ZN18ActorShotArrow_1948vfunc_10EPK5Actor kind:function(arm,size=0x388) addr:0x020f39e0 _ZN18ActorShotArrow_1948vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0xcc) addr:0x020f3d68 _ZN14ActorShotArrow19func_ov031_020f3d04Es kind:function(arm,size=0x48) addr:0x020f3e34 _ZN18ActorShotArrow_194D0Ev kind:function(arm,size=0x1c) addr:0x020f3e7c @@ -997,7 +997,7 @@ _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6268 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6290 _ZN12ActorUnkNTTZ4InitEi kind:function(arm,size=0x8) addr:0x020f62c0 _ZN12ActorUnkNTTZ6UpdateEv kind:function(arm,size=0x4) addr:0x020f62c8 -_ZN12ActorUnkNTTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020f62cc +_ZN12ActorUnkNTTZ8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020f62cc _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f62d0 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f6320 _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6370 @@ -1029,7 +1029,7 @@ _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE9RefStruct kind:function(arm,size=0x4c) a _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP9RefStructtPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6fd8 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f7050 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f72a0 -_ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f73d8 +_ZN12ActorUnkTGTZ8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f73d8 _ZN12ActorUnkTGTZ19func_ov031_020f7358Ev kind:function(arm,size=0x8c) addr:0x020f7488 _ZN12ActorUnkTGTZ19func_ov031_020f73e4Ev kind:function(arm,size=0xc) addr:0x020f7514 _ZN12ActorUnkTGTZ19func_ov031_020f73f0Ev kind:function(arm,size=0xc) addr:0x020f7520 @@ -1042,7 +1042,7 @@ func_ov031_020f7494 kind:function(arm,size=0x40) addr:0x020f75c4 func_ov031_020f74d4 kind:function(arm,size=0x38) addr:0x020f7604 _ZN24UnkStruct_ov031_02114870C2Ev kind:function(arm,size=0x2c) addr:0x020f763c _ZN24UnkStruct_ov031_021148704InitEi kind:function(arm,size=0x3c) addr:0x020f7668 -_ZN24UnkStruct_ov031_021148708vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f76a4 +_ZN24UnkStruct_ov031_021148708vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f76a4 _ZN24UnkStruct_ov031_021148708vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f76c4 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f76cc func_ov031_020f75ec kind:function(arm,size=0x8) addr:0x020f771c @@ -1072,7 +1072,7 @@ _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7be4 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7c0c _ZN12ActorUnkSWCH4InitEi kind:function(arm,size=0x14) addr:0x020f7c3c _ZN12ActorUnkSWCH6UpdateEv kind:function(arm,size=0x68) addr:0x020f7c50 -_ZN12ActorUnkSWCH8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x10) addr:0x020f7cb8 +_ZN12ActorUnkSWCH8vfunc_2CEi kind:function(arm,size=0x10) addr:0x020f7cb8 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7cc8 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7cdc _ZN19ActorProfileUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7cf8 @@ -1112,7 +1112,7 @@ _ZN24ActorProfileRollingStone6CreateEv kind:function(arm,size=0x24) addr:0x020f8 _ZN24ActorProfileRollingStoneC1Ev kind:function(arm,size=0x44) addr:0x020f8440 _ZN21ActorRollingStone_1048vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8484 _ZN21ActorRollingStone_1048vfunc_10E9RefStructi kind:function(arm,size=0xb8) addr:0x020f8514 -_ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x020f85cc +_ZN20ActorRollingStone_D48vfunc_10EPK5Actor kind:function(arm,size=0x44) addr:0x020f85cc _ZN17ActorRollingStoneC1Ev kind:function(arm,size=0x194) addr:0x020f8610 _ZN20ActorRollingStone_D4D1Ev kind:function(arm,size=0x14) addr:0x020f87a4 _ZN21ActorRollingStone_104D1Ev kind:function(arm,size=0x14) addr:0x020f87b8 @@ -1120,7 +1120,7 @@ _ZN17ActorRollingStone4InitEi kind:function(arm,size=0xf0) addr:0x020f87cc _ZN17ActorRollingStone6UpdateEv kind:function(arm,size=0x98) addr:0x020f88bc _ZN17ActorRollingStone8SetStateEs kind:function(arm,size=0x5c) addr:0x020f8954 _ZN17ActorRollingStone19func_ov031_020f8880Ev kind:function(arm,size=0xc8) addr:0x020f89b0 -_ZN17ActorRollingStone8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xac) addr:0x020f8a78 +_ZN17ActorRollingStone8vfunc_2CEi kind:function(arm,size=0xac) addr:0x020f8a78 _ZN17ActorRollingStone19func_ov031_020f89f4Ev kind:function(arm,size=0x10) addr:0x020f8b24 _ZN17ActorRollingStone19func_ov031_020f8a04Ev kind:function(arm,size=0x28) addr:0x020f8b34 _ZN17ActorRollingStone19func_ov031_020f8a2cEv kind:function(arm,size=0xc) addr:0x020f8b5c @@ -1188,7 +1188,7 @@ _ZN13ActorItemDrop19func_ov031_020fa668Ev kind:function(arm,size=0x10) addr:0x02 _ZN13ActorItemDrop19func_ov031_020fa678Ev kind:function(arm,size=0x50) addr:0x020fa7a8 _ZN13ActorItemDrop19func_ov031_020fa6c8Ev kind:function(arm,size=0x64) addr:0x020fa7f8 _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x020fa85c -_ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa96c +_ZN13ActorItemDrop8vfunc_2CEi kind:function(arm,size=0xc4) addr:0x020fa96c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020faa30 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fab28 _ZN16ActorItemDrop_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020fab60 @@ -1250,7 +1250,7 @@ _ZN12ActorUnkEFSB4InitEi kind:function(arm,size=0xb8) addr:0x020fb744 _ZN12ActorUnkEFSB6UpdateEv kind:function(arm,size=0x38) addr:0x020fb7fc _ZN12ActorUnkEFSB8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020fb834 _ZN12ActorUnkEFSB8vfunc_54Ei kind:function(arm,size=0x8) addr:0x020fb848 -_ZN12ActorUnkEFSB8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x70) addr:0x020fb850 +_ZN12ActorUnkEFSB8vfunc_2CEi kind:function(arm,size=0x70) addr:0x020fb850 _ZN12ActorUnkEFSBD1Ev kind:function(arm,size=0x30) addr:0x020fb8c0 _ZN12ActorUnkEFSBD0Ev kind:function(arm,size=0x38) addr:0x020fb8f0 _ZN19ActorProfileUnkEFSBD1Ev kind:function(arm,size=0x14) addr:0x020fb928 @@ -1265,7 +1265,7 @@ _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fbae4 _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020fbb90 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbc1c -_ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbcb8 +_ZN12ActorUnkNFSP8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020fbcb8 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbcbc _ZN12ActorUnkNFSP19func_ov031_020fbba0E9RefStruct kind:function(arm,size=0x40) addr:0x020fbcd0 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbd10 @@ -2010,11 +2010,11 @@ data_ov031_02110bf0 kind:data(any) addr:0x02110bf0 data_ov031_02110bf4 kind:data(any) addr:0x02110bf4 data_ov031_02110bfc kind:data(any) addr:0x02110bfc data_ov031_02110ad0 kind:data(any) addr:0x02110c00 -data_ov031_02110c31 kind:data(any) addr:0x02110c31 -data_ov031_02110c38 kind:data(any) addr:0x02110c38 -data_ov031_02110c6c kind:data(any) addr:0x02110c6c -data_ov031_02110c7c kind:data(any) addr:0x02110c7c -data_ov031_02110c8c kind:data(any) addr:0x02110c8c +data_ov031_02110b00 kind:data(any) addr:0x02110c30 local +data_ov031_02110b08 kind:data(any) addr:0x02110c38 +data_ov031_02110b3c kind:data(any) addr:0x02110c6c +data_ov031_02110b4c kind:data(any) addr:0x02110c7c +data_ov031_02110b5c kind:data(any) addr:0x02110c8c data_ov031_02110ca0 kind:data(any) addr:0x02110ca0 data_ov031_02110cb0 kind:data(any) addr:0x02110cb0 data_ov031_02110cc0 kind:data(any) addr:0x02110cc0 @@ -2324,16 +2324,16 @@ data_ov031_02113e48 kind:data(any) addr:0x02113e48 _ZTV19data_ov031_02113d14 kind:data(any) addr:0x02113e4c data_ov031_02113e5c kind:data(any) addr:0x02113e5c ambiguous data_ov031_02113e98 kind:data(any) addr:0x02113e98 -data_ov031_02113ea4 kind:data(any) addr:0x02113ea4 -data_ov031_02113eb4 kind:data(any) addr:0x02113eb4 -data_ov031_02113ee4 kind:data(any) addr:0x02113ee4 +data_ov031_02113d64 kind:data(any) addr:0x02113ea4 local +data_ov031_02113d74 kind:data(any) addr:0x02113eb4 local +data_ov031_02113da4 kind:data(any) addr:0x02113ee4 local _ZTV13ActorHeart_C4 kind:data(any) addr:0x02113f14 _ZTV17ActorProfileHeart kind:data(any) addr:0x02113f2c -data_ov031_02113f58 kind:data(any) addr:0x02113f58 +_ZTV10ActorHeart kind:data(any) addr:0x02113f50 _ZTV19ActorProfileUnkRMTG kind:data(any) addr:0x02113fac _ZTV12ActorUnkRMTG kind:data(any) addr:0x02113fd0 _ZTV19ActorProfileUnkSCCN kind:data(any) addr:0x0211402c -data_ov031_02114058 kind:data(any) addr:0x02114058 +_ZTV17MapObject_10_SCCN kind:data(any) addr:0x02114050 _ZTV12ActorUnkSCCN kind:data(any) addr:0x02114078 _ZTV19data_ov031_02113f9c kind:data(any) addr:0x021140d4 _ZTV19data_ov031_02113fb8 kind:data(any) addr:0x021140f0 @@ -2349,8 +2349,8 @@ _ZTV15ActorItemFlower kind:data(any) addr:0x02114334 _ZTV18ActorShotArrow_194 kind:data(any) addr:0x021143a4 _ZTV18ActorShotArrow_178 kind:data(any) addr:0x021143c0 _ZTV21ActorProfileShotArrow kind:data(any) addr:0x021143dc -data_ov031_02114400 kind:data(any) addr:0x02114400 -data_ov031_02114440 kind:data(any) addr:0x02114440 +data_ov031_021142c0 kind:data(any) addr:0x02114400 local +data_ov031_02114300 kind:data(any) addr:0x02114440 local _ZTV14ActorShotArrow kind:data(any) addr:0x02114480 _ZTV19ActorProfileUnkATTG kind:data(any) addr:0x021144dc _ZTV12ActorUnkATTG kind:data(any) addr:0x02114500 diff --git a/config/eur1/arm9/overlays/ov032/symbols.txt b/config/eur1/arm9/overlays/ov032/symbols.txt index 0ecf205c..c5b35420 100644 --- a/config/eur1/arm9/overlays/ov032/symbols.txt +++ b/config/eur1/arm9/overlays/ov032/symbols.txt @@ -11,7 +11,7 @@ _ZN11ActorSpinut5SetupEv kind:function(arm,size=0x84) addr:0x02119598 _ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x0211961c _ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211967c _ZN11ActorSpinut6UpdateEv kind:function(arm,size=0x358) addr:0x021196c4 -_ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb4) addr:0x02119a1c +_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x02119a1c _ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x02119ad0 _ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x02119b4c _ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x02119d28 @@ -68,7 +68,7 @@ _ZN18ActorFleeingSpinut4InitEi kind:function(arm,size=0x1c) addr:0x0211bac8 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211bae4 _ZN18ActorFleeingSpinut6UpdateEv kind:function(arm,size=0x268) addr:0x0211bb4c _ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bdb4 -_ZN18ActorFleeingSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x8c) addr:0x0211beb8 +_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211beb8 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bf44 _ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211bf70 _ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211bfe8 @@ -133,7 +133,7 @@ _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e560 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e5a8 _ZN10ActorKeese6UpdateEv kind:function(arm,size=0x1b8) addr:0x0211e8b8 -_ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xbc) addr:0x0211ea70 +_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211ea70 _ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211eb2c _ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eca0 _ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ee28 @@ -177,7 +177,7 @@ _ZN12ActorUnkNSSW19func_ov032_02120190Ev kind:function(arm,size=0xcc) addr:0x021 _ZN12ActorUnkNSSW19func_ov032_0212025cEv kind:function(arm,size=0x7c) addr:0x021203bc _ZN12ActorUnkNSSW19func_ov032_021202d8Ev kind:function(arm,size=0x124) addr:0x02120438 _ZN12ActorUnkNSSW19func_ov032_021203fcEv kind:function(arm,size=0x350) addr:0x0212055c -_ZN12ActorUnkNSSW8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x134) addr:0x021208ac +_ZN12ActorUnkNSSW8vfunc_2CEi kind:function(arm,size=0x134) addr:0x021208ac _ZN12ActorUnkNSSW19func_ov032_02120880Ev kind:function(arm,size=0x14) addr:0x021209e0 _ZN12ActorUnkNSSW19func_ov032_02120894Ei kind:function(arm,size=0x2ec) addr:0x021209f4 _ZN12ActorUnkNSSW19func_ov032_02120b34E9RefStruct kind:function(arm,size=0x38) addr:0x02120ce0 @@ -191,7 +191,7 @@ _ZN16ActorUnkNSSW_0E08vfunc_00E9RefStructi kind:function(arm,size=0x3c) addr:0x0 _ZN16ActorUnkNSSW_0E08vfunc_04Ev kind:function(arm,size=0x1c) addr:0x02120f1c _ZN16ActorUnkNSSW_0E08vfunc_0CEP7VecFx32 kind:function(arm,size=0x40) addr:0x02120f38 _ZN16ActorUnkNSSW_104C1EP12ActorUnkNSSW kind:function(arm,size=0x3c) addr:0x02120f78 -_ZN16ActorUnkNSSW_1048vfunc_10EP5Actor kind:function(arm,size=0x10) addr:0x02120fb4 +_ZN16ActorUnkNSSW_1048vfunc_10EPK5Actor kind:function(arm,size=0x10) addr:0x02120fb4 _ZN16ActorUnkNSSW_104D0Ev kind:function(arm,size=0x1c) addr:0x02120fc4 _ZN12ActorUnkNSSWD1Ev kind:function(arm,size=0x28) addr:0x02120fe0 _ZN12ActorUnkNSSWD0Ev kind:function(arm,size=0x30) addr:0x02121008 diff --git a/config/eur1/arm9/overlays/ov063/symbols.txt b/config/eur1/arm9/overlays/ov063/symbols.txt index 0a7e5072..d55dad92 100644 --- a/config/eur1/arm9/overlays/ov063/symbols.txt +++ b/config/eur1/arm9/overlays/ov063/symbols.txt @@ -14,7 +14,7 @@ _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x021 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x021585b0 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021585e4 _ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x02158610 -_ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xe0) addr:0x02158b4c +_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158b4c _ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158c2c _ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158c54 _ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158cb8 @@ -71,7 +71,7 @@ _ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0 _ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ad6c _ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ad88 _ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215adac -_ZN16ActorUnkCASE_1748vfunc_10EP5Actor kind:function(arm,size=0x24) addr:0x0215ade8 +_ZN16ActorUnkCASE_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215ade8 _ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215ae0c _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ae68 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215af8c @@ -92,7 +92,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b3e4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b3e8 _ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b40c -_ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x0215b744 +_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b744 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b7e8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b844 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b8ec @@ -110,7 +110,7 @@ _ZN15ActorUnkRMSBase4InitEi kind:function(arm,size=0x54) addr:0x0215bc54 _ZN15ActorUnkRMSBase5SetupEv kind:function(arm,size=0x4) addr:0x0215bca8 _ZN15ActorUnkRMSBase6UpdateEv kind:function(arm,size=0x4) addr:0x0215bcac _ZN15ActorUnkRMSBase8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215bcb0 -_ZN15ActorUnkRMSBase8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x0215bcc4 +_ZN15ActorUnkRMSBase8vfunc_2CEi kind:function(arm,size=0x30) addr:0x0215bcc4 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bcf4 _ZN15ActorUnkRMSBaseD0Ev kind:function(arm,size=0x30) addr:0x0215bd1c _ZN19ActorProfileUnkRMSV10GetProfileEv kind:function(arm,size=0xc) addr:0x0215bd4c @@ -255,7 +255,7 @@ _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f4f4 _ZN12ActorUnkRBLS4InitEi kind:function(arm,size=0x8c) addr:0x0215f508 _ZN12ActorUnkRBLS6UpdateEv kind:function(arm,size=0x14) addr:0x0215f594 _ZN12ActorUnkRBLS8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215f5a8 -_ZN12ActorUnkRBLS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x0215f5bc +_ZN12ActorUnkRBLS8vfunc_2CEi kind:function(arm,size=0x20) addr:0x0215f5bc _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f5dc _ZN12ActorUnkRBLSD1Ev kind:function(arm,size=0x28) addr:0x0215f5f8 _ZN12ActorUnkRBLSD0Ev kind:function(arm,size=0x30) addr:0x0215f620 diff --git a/config/eur1/arm9/overlays/ov071/symbols.txt b/config/eur1/arm9/overlays/ov071/symbols.txt index 7c9618ba..dcac47d6 100644 --- a/config/eur1/arm9/overlays/ov071/symbols.txt +++ b/config/eur1/arm9/overlays/ov071/symbols.txt @@ -299,7 +299,7 @@ _ZN14ActorTearLight4InitEi kind:function(arm,size=0xac) addr:0x0215f6b0 _ZN14ActorTearLight5SetupEv kind:function(arm,size=0x2c) addr:0x0215f75c _ZN14ActorTearLight6UpdateEv kind:function(arm,size=0x4c) addr:0x0215f788 _ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x0215f7d4 -_ZN14ActorTearLight8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc8) addr:0x0215f894 +_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x0215f894 _ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f95c _ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x0215f974 _ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x0215f98c diff --git a/config/eur1/arm9/overlays/ov073/symbols.txt b/config/eur1/arm9/overlays/ov073/symbols.txt index 5d7f0f92..e829f8e8 100644 --- a/config/eur1/arm9/overlays/ov073/symbols.txt +++ b/config/eur1/arm9/overlays/ov073/symbols.txt @@ -235,8 +235,8 @@ data_ov073_0216419c kind:data(any) addr:0x0216419c data_ov073_021641c0 kind:data(any) addr:0x021641c0 data_ov073_021641ec kind:data(any) addr:0x021641ec data_ov073_02164234 kind:data(any) addr:0x02164234 -data_ov073_02164280 kind:data(any) addr:0x02164280 -data_ov073_02164294 kind:data(any) addr:0x02164294 ambiguous +data_ov073_02163fe0 kind:data(any) addr:0x02164280 +data_ov073_02163ff4 kind:data(any) addr:0x02164294 ambiguous data_ov073_021642c4 kind:data(any) addr:0x021642c4 ambiguous data_ov073_021642d8 kind:data(any) addr:0x021642d8 data_ov073_02164328 kind:data(any) addr:0x02164328 ambiguous diff --git a/config/eur1/arm9/overlays/ov075/symbols.txt b/config/eur1/arm9/overlays/ov075/symbols.txt index 35741321..b00d3a7b 100644 --- a/config/eur1/arm9/overlays/ov075/symbols.txt +++ b/config/eur1/arm9/overlays/ov075/symbols.txt @@ -250,7 +250,7 @@ _ZN12ActorUnkMABL19func_ov075_02160714Ev kind:function(arm,size=0x8) addr:0x0216 _ZN12ActorUnkMABL19func_ov075_0216071cEv kind:function(arm,size=0x1c) addr:0x0216085c _ZN19ActorProfileUnkMABLD1Ev kind:function(arm,size=0x14) addr:0x02160878 func_ov075_0216074c kind:function(arm,size=0x118) addr:0x0216088c -func_ov075_02160864 kind:function(arm,size=0xa0) addr:0x021609a4 +_ZN14ActorShotArrow19func_ov075_02160864Ei kind:function(arm,size=0xa0) addr:0x021609a4 func_ov075_02160904 kind:function(arm,size=0xec) addr:0x02160a44 func_ov075_021609f0 kind:function(arm,size=0x44) addr:0x02160b30 func_ov075_02160a34 kind:function(arm,size=0x8) addr:0x02160b74 @@ -399,7 +399,7 @@ data_ov075_02163498 kind:bss addr:0x02163498 data_ov075_021634a4 kind:bss addr:0x021634a4 data_ov075_0216357c kind:bss addr:0x0216357c data_ov075_02163654 kind:bss addr:0x02163654 -data_ov075_02163658 kind:bss addr:0x02163658 +data_ov075_02163518 kind:bss addr:0x02163658 data_ov075_0216365c kind:bss addr:0x0216365c data_ov075_02163668 kind:bss addr:0x02163668 data_ov075_02163674 kind:bss addr:0x02163674 diff --git a/config/jp/arm9/itcm/symbols.txt b/config/jp/arm9/itcm/symbols.txt index 46a22912..a03947bf 100644 --- a/config/jp/arm9/itcm/symbols.txt +++ b/config/jp/arm9/itcm/symbols.txt @@ -159,7 +159,7 @@ _ZNK18UnkStruct_027e09a421GetCurrentCourseEntryEv kind:function(arm,size=0x20) a _ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420 _ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sP7VecFx32i kind:function(arm,size=0x60) addr:0x01ffd43c func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c -_ZN21UnkStruct_027e09bc_0C13func_01ffd640EP7VecFx32 kind:function(arm,size=0x128) addr:0x01ffd640 +_ZN21UnkStruct_027e09bc_0C13func_01ffd640EP16UnkVecFx32Struct kind:function(arm,size=0x128) addr:0x01ffd640 _ZN21UnkStruct_027e09bc_0C13func_01ffd768EPvP5Vec2sc kind:function(arm,size=0x138) addr:0x01ffd768 func_01ffd8a0 kind:function(arm,size=0x190) addr:0x01ffd8a0 func_01ffda30 kind:function(arm,size=0x2ec) addr:0x01ffda30 @@ -209,7 +209,7 @@ _ZN16MapObjectManager13func_01fff4ccEPFvPvS0_ES0_ kind:function(arm,size=0x54) a _ZN16MapObjectManager13func_01fff520EP24UnkStruct_ov000_020b34c4PP9MapObject kind:function(arm,size=0x64) addr:0x01fff520 _ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 _ZN9MapObject13func_01fff590Ei kind:function(arm,size=0x40) addr:0x01fff590 -_ZN5Actor13func_01fff5d0EP14Actor_vfunc_30i kind:function(arm,size=0x3c) addr:0x01fff5d0 +_ZN5Actor13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 _ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iiiii kind:function(arm,size=0x8c) addr:0x01fff60c func_01fff698 kind:function(arm,size=0x38) addr:0x01fff698 func_01fff6d0 kind:function(arm,size=0x74) addr:0x01fff6d0 diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index c16802ce..16dfa3d1 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -350,7 +350,7 @@ func_ov000_0205ca34 kind:function(arm,size=0x40) addr:0x0205dfbc func_ov000_0205ca74 kind:function(arm,size=0x40) addr:0x0205dffc func_ov000_0205cab4 kind:function(arm,size=0x28) addr:0x0205e03c func_ov000_0205cadc kind:function(arm,size=0xe8) addr:0x0205e064 -_ZN5Actor19func_ov000_0205cbc4EjP7VecFx32 kind:function(arm,size=0x17c) addr:0x0205e14c +func_ov000_0205cbc4 kind:function(arm,size=0x17c) addr:0x0205e14c func_ov000_0205cd40 kind:function(arm,size=0x11c) addr:0x0205e2c8 func_ov000_0205ce5c kind:function(arm,size=0x128) addr:0x0205e3e4 func_ov000_0205cf84 kind:function(arm,size=0x178) addr:0x0205e50c @@ -1565,7 +1565,7 @@ _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_020802ecEtP7VecFx32 kind:function(ar func_ov000_02080364 kind:function(arm,size=0x88) addr:0x02081a1c _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_020803ecEt kind:function(arm,size=0x150) addr:0x02081aa4 _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_0208053cEt kind:function(arm,size=0xe4) addr:0x02081bf4 -_ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_02080620Ev kind:function(arm,size=0x38) addr:0x02081cd8 +_ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_02080620Ei kind:function(arm,size=0x38) addr:0x02081cd8 func_ov000_02080658 kind:function(arm,size=0xd8) addr:0x02081d10 func_ov000_02080730 kind:function(arm,size=0x64) addr:0x02081de8 func_ov000_02080794 kind:function(arm,size=0xac) addr:0x02081e4c @@ -1949,7 +1949,7 @@ func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208d520 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208d548 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208d574 func_ov000_0208bec8 kind:function(arm,size=0x20) addr:0x0208d5a0 -func_ov000_0208bee8 kind:function(arm,size=0x20) addr:0x0208d5c0 +_ZN18UnkStruct_027e0ce019func_ov000_0208bee8Ev kind:function(arm,size=0x20) addr:0x0208d5c0 func_ov000_0208bf08 kind:function(arm,size=0x2c) addr:0x0208d5e0 func_ov000_0208bf34 kind:function(arm,size=0x34) addr:0x0208d60c func_ov000_0208bf68 kind:function(arm,size=0x20) addr:0x0208d640 @@ -2321,7 +2321,7 @@ _ZN5Actor5SetupEv kind:function(arm,size=0x4) addr:0x02099c58 _ZN5Actor6UpdateEv kind:function(arm,size=0x4) addr:0x02099c5c _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x02099c60 _ZN5Actor8vfunc_28EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02099c64 -_ZN5Actor8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02099c68 +_ZN5Actor8vfunc_2CEi kind:function(arm,size=0x4) addr:0x02099c68 _ZN5Actor8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02099c6c _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x02099c70 _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x02099c78 @@ -3069,7 +3069,7 @@ _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020aaffc _ZN14Actor_Derived119func_ov000_020a9804EP5ActorP16G3d_RenderState_ kind:function(arm,size=0xec) addr:0x020ab004 _ZN14Actor_Derived16UpdateEv kind:function(arm,size=0x4) addr:0x020ab0f0 _ZN14Actor_Derived18vfunc_24Ev kind:function(arm,size=0x68) addr:0x020ab0f4 -_ZN14Actor_Derived18vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x48) addr:0x020ab15c +_ZN14Actor_Derived18vfunc_2CEi kind:function(arm,size=0x48) addr:0x020ab15c _ZN14Actor_Derived18vfunc_B8Ev kind:function(arm,size=0x34) addr:0x020ab1a4 _ZN14Actor_Derived18vfunc_14EP8Cylinder kind:function(arm,size=0x48) addr:0x020ab1d8 _ZN19func_ov000_020a9a20D1Ev kind:function(arm,size=0x14) addr:0x020ab220 diff --git a/config/jp/arm9/overlays/ov031/delinks.txt b/config/jp/arm9/overlays/ov031/delinks.txt index 6e2ad3fd..82240ef9 100644 --- a/config/jp/arm9/overlays/ov031/delinks.txt +++ b/config/jp/arm9/overlays/ov031/delinks.txt @@ -78,6 +78,7 @@ src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp: .bss start:0x021184cc end:0x021185f8 src/031_Land/Actor/ActorHeart.cpp: + complete .text start:0x020f06e0 end:0x020f1218 .init start:0x0211310c end:0x02113178 .ctor start:0x0211454c end:0x02114550 @@ -93,6 +94,7 @@ src/031_Land/Actor/ActorUnkRMTG.cpp: .bss start:0x02118644 end:0x0211872c src/031_Land/Actor/ActorUnkSCCN.cpp: + complete .text start:0x020f1408 end:0x020f16d0 .init start:0x021131c8 end:0x02113218 .ctor start:0x02114554 end:0x02114558 @@ -116,11 +118,13 @@ src/031_Land/Actor/ActorItemFlower.cpp: .bss start:0x021187c4 end:0x02118810 src/031_Land/Actor/ActorShotArrow.cpp: + complete .text start:0x020f2d8c end:0x020f5820 .init start:0x021132b8 end:0x02113308 .ctor start:0x02114560 end:0x02114564 .data start:0x02116004 end:0x0211613c .bss start:0x02118810 end:0x0211885c + .rodata start:0x02112870 end:0x02112878 src/031_Land/Actor/ActorUnkATTG.cpp: complete diff --git a/config/jp/arm9/overlays/ov031/relocs.txt b/config/jp/arm9/overlays/ov031/relocs.txt index 1609878f..d0fb72b3 100644 --- a/config/jp/arm9/overlays/ov031/relocs.txt +++ b/config/jp/arm9/overlays/ov031/relocs.txt @@ -2156,7 +2156,7 @@ from:0x020edd78 kind:arm_call to:0x0206df5c module:overlay(0) from:0x020edd80 kind:arm_call to:0x020eddbc module:overlay(31) from:0x020edd9c kind:arm_call to:0x02082090 module:overlay(0) from:0x020edda8 kind:load to:0x020da000 module:overlay(24) -from:0x020eddac kind:load to:0x02166054 module:overlays(63,68,73,84) +from:0x020eddac kind:load to:0x02166054 module:overlay(73) from:0x020eddb0 kind:load to:0x020b69b8 module:overlay(0) from:0x020eddb8 kind:load to:0x027e0cd8 module:dtcm from:0x020eddec kind:arm_call to:0x0206e670 module:overlay(0) @@ -2759,7 +2759,7 @@ from:0x020f2fec kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020f2ff0 kind:load to:0x021128cc module:overlay(31) from:0x020f2ff4 kind:load to:0x02112878 module:overlay(31) from:0x020f2ffc kind:load to:0x020453b0 module:main -from:0x020f3000 kind:load to:0x02166040 module:overlays(63,68,73,84) +from:0x020f3000 kind:load to:0x02166040 module:overlay(73) from:0x020f300c kind:arm_call to:0x0207cd78 module:overlay(0) from:0x020f3028 kind:arm_call to:0x0205c434 module:overlay(0) from:0x020f3060 kind:arm_call to:0x02082130 module:overlay(0) @@ -2847,13 +2847,13 @@ from:0x020f399c kind:arm_call to:0x0205c434 module:overlay(0) from:0x020f39d0 kind:arm_call to:0x02082130 module:overlay(0) from:0x020f39fc kind:load to:0x027e09a8 module:dtcm from:0x020f3a04 kind:load to:0x027e0cd8 module:dtcm -from:0x020f3a08 kind:load to:0x02166054 module:overlays(63,68,73,84) +from:0x020f3a08 kind:load to:0x02166054 module:overlay(73) from:0x020f3a18 kind:arm_call to:0x020f4c0c module:overlay(31) from:0x020f3a30 kind:arm_call to:0x020f3c7c module:overlay(31) from:0x020f3a38 kind:arm_call to:0x02099fe0 module:overlay(0) from:0x020f3a60 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f3a78 kind:arm_call to:0x020f4190 module:overlay(31) -from:0x020f3ab4 kind:load to:0x02166054 module:overlays(63,68,73,84) +from:0x020f3ab4 kind:load to:0x02166054 module:overlay(73) from:0x020f3ac4 kind:arm_call to:0x020f4c0c module:overlay(31) from:0x020f3afc kind:arm_call to:0x02099fe0 module:overlay(0) from:0x020f3b24 kind:arm_call to:0x01ffb6e4 module:itcm @@ -2865,7 +2865,7 @@ from:0x020f3bb4 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f3bbc kind:arm_call to:0x01ffb800 module:itcm from:0x020f3bc8 kind:arm_call to:0x020f4998 module:overlay(31) from:0x020f3bd0 kind:arm_call to:0x020f48ec module:overlay(31) -from:0x020f3c0c kind:load to:0x02166054 module:overlays(63,68,73,84) +from:0x020f3c0c kind:load to:0x02166054 module:overlay(73) from:0x020f3c3c kind:arm_call to:0x02099fe0 module:overlay(0) from:0x020f3c64 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f3cec kind:arm_call to:0x0200eab0 module:main @@ -2919,7 +2919,7 @@ from:0x020f4528 kind:arm_call to:0x020f4998 module:overlay(31) from:0x020f455c kind:arm_call to:0x0209a25c module:overlay(0) from:0x020f457c kind:load to:0x027e0ce4 module:dtcm from:0x020f4580 kind:load to:0x027e0ce0 module:dtcm -from:0x020f4584 kind:load to:0x02112871 module:overlay(31) +from:0x020f4584 kind:load to:0x02112870 add:1 module:overlay(31) from:0x020f45b0 kind:arm_call to:0x020f3274 module:overlay(31) from:0x020f45e0 kind:arm_call to:0x020f3274 module:overlay(31) from:0x020f45fc kind:arm_call to:0x020f3274 module:overlay(31) @@ -2945,7 +2945,7 @@ from:0x020f4980 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f4990 kind:arm_call to:0x01ffb714 module:itcm from:0x020f49e4 kind:arm_call to:0x0207fc44 module:overlay(0) from:0x020f49f4 kind:load to:0x027e09c0 module:dtcm -from:0x020f49f8 kind:load to:0x02112871 module:overlay(31) +from:0x020f49f8 kind:load to:0x02112870 add:1 module:overlay(31) from:0x020f4a48 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x020f4a90 kind:arm_call_thumb to:0x01ffa184 module:itcm from:0x020f4aa0 kind:arm_call to:0x01ffa60c module:itcm @@ -3013,7 +3013,7 @@ from:0x020f5638 kind:arm_call to:0x020f51f0 module:overlay(31) from:0x020f5640 kind:arm_call to:0x020f45b8 module:overlay(31) from:0x020f565c kind:arm_call to:0x01ffb714 module:itcm from:0x020f56cc kind:load to:0x027e0d80 module:dtcm -from:0x020f56d0 kind:load to:0x02165518 module:overlays(59,60,63,71,74,75,84) +from:0x020f56d0 kind:load to:0x02165518 module:overlay(75) from:0x020f56d4 kind:load to:0x027e0ce4 module:dtcm from:0x020f5738 kind:arm_call to:0x01ffb714 module:itcm from:0x020f5764 kind:arm_call to:0x01ffccf4 module:itcm diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index 8d6dc98e..99259fdf 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -342,7 +342,7 @@ _ZN9ActorBomb19func_ov031_020e20fcEv kind:function(arm,size=0x4) addr:0x020e3ae8 _ZN9ActorBomb19func_ov031_020e2100Ev kind:function(arm,size=0x34) addr:0x020e3aec _ZN9ActorBomb19func_ov031_020e2134Ev kind:function(arm,size=0xec) addr:0x020e3b20 _ZN24ActorBomb_ov031_020e2134D1Ev kind:function(arm,size=0x14) addr:0x020e3c0c -_ZN9ActorBomb8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x158) addr:0x020e3c20 +_ZN9ActorBomb8vfunc_2CEi kind:function(arm,size=0x158) addr:0x020e3c20 _ZN9ActorBomb19func_ov031_020e238cEv kind:function(arm,size=0xe0) addr:0x020e3d78 _ZN9ActorBomb4GrabE15ActorGrabParams kind:function(arm,size=0x40) addr:0x020e3e58 _ZN9ActorBomb4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x110) addr:0x020e3e98 @@ -363,7 +363,7 @@ _ZN13ActorBomb_1808vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ k _ZN13ActorBomb_1808vfunc_10E9RefStructi kind:function(arm,size=0x84) addr:0x020e4c78 _ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e4cfc _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e4d2c -_ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e4d68 +_ZN13ActorBomb_19C8vfunc_10EPK5Actor kind:function(arm,size=0x30) addr:0x020e4d68 _ZN13ActorBomb_unkC1Ev kind:function(arm,size=0x14) addr:0x020e4d98 _ZN24ActorBomb_ov031_020e2134D0Ev kind:function(arm,size=0x1c) addr:0x020e4dac _ZN13ActorBomb_19CD0Ev kind:function(arm,size=0x1c) addr:0x020e4dc8 @@ -436,9 +436,9 @@ _ZN18ActorItemBoomerang6UpdateEv kind:function(arm,size=0x614) addr:0x020e640c _ZN18ActorItemBoomerang19func_ov031_020e5034Ei kind:function(arm,size=0x1ec) addr:0x020e6a20 _ZN18ActorItemBoomerang19func_ov031_020e5220Ev kind:function(arm,size=0x80) addr:0x020e6c0c _ZN18ActorItemBoomerang19func_ov031_020e52a0Ev kind:function(arm,size=0xb4) addr:0x020e6c8c -_ZN18ActorItemBoomerang8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x74) addr:0x020e6d40 -_ZN21ActorItemBoomerang_A08vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e6db4 -_ZN21ActorItemBoomerang_CC8vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e6dd0 +_ZN18ActorItemBoomerang8vfunc_2CEi kind:function(arm,size=0x74) addr:0x020e6d40 +_ZN21ActorItemBoomerang_A08vfunc_10EPK5Actor kind:function(arm,size=0x1c) addr:0x020e6db4 +_ZN21ActorItemBoomerang_CC8vfunc_10EPK5Actor kind:function(arm,size=0x1c) addr:0x020e6dd0 _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c) addr:0x020e6dec _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) addr:0x020e6e38 _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e6e60 @@ -462,7 +462,7 @@ _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e75ec _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e7704 _ZN16ActorItemTornado6UpdateEv kind:function(arm,size=0x10) addr:0x020e7b34 _ZN16ActorItemTornado8vfunc_24Ev kind:function(arm,size=0x44) addr:0x020e7b44 -_ZN16ActorItemTornado8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x124) addr:0x020e7b88 +_ZN16ActorItemTornado8vfunc_2CEi kind:function(arm,size=0x124) addr:0x020e7b88 _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e7cac _ZN16ActorItemTornado19func_ov031_020e6314Et kind:function(arm,size=0x2c) addr:0x020e7d00 _ZN16ActorItemTornado19func_ov031_020e6340EPK7VecFx32ss kind:function(arm,size=0x58) addr:0x020e7d2c @@ -484,7 +484,7 @@ _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e82a8 _ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e82c4 _ZN15ActorUnkSWBM_948vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e82ec _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e8308 -_ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e8360 +_ZN15ActorUnkSWBM_988vfunc_10EPK5Actor kind:function(arm,size=0x58) addr:0x020e8360 _ZN15ActorUnkSWBM_C88vfunc_00Eii kind:function(arm,size=0x168) addr:0x020e83b8 _ZN19ActorProfileUnkSWBM10GetProfileEv kind:function(arm,size=0xc) addr:0x020e8520 _ZN19ActorProfileUnkSWBM6CreateEv kind:function(arm,size=0x24) addr:0x020e852c @@ -499,7 +499,7 @@ _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020 _ZN12ActorUnkSWBM6UpdateEv kind:function(arm,size=0x268) addr:0x020e88e4 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e8b4c _ZN12ActorUnkSWBM19func_ov031_020e718cEPK7VecFx32P7MtxFx33isss kind:function(arm,size=0x108) addr:0x020e8b78 -_ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e8c80 +_ZN12ActorUnkSWBM8vfunc_2CEi kind:function(arm,size=0x40) addr:0x020e8c80 _ZN15ActorUnkSWBM_94D0Ev kind:function(arm,size=0x1c) addr:0x020e8cc0 _ZN15ActorUnkSWBM_98D0Ev kind:function(arm,size=0x1c) addr:0x020e8cdc _ZN12ActorUnkSWBMD1Ev kind:function(arm,size=0x28) addr:0x020e8cf8 @@ -550,7 +550,7 @@ _ZN12ActorUnkROCK4InitEi kind:function(arm,size=0x30) addr:0x020ea368 _ZN12ActorUnkROCK6UpdateEv kind:function(arm,size=0x9c) addr:0x020ea398 _ZN12ActorUnkROCK19func_ov031_020e8a48Es kind:function(arm,size=0x84) addr:0x020ea434 _ZN12ActorUnkROCK19func_ov031_020e8accEv kind:function(arm,size=0x30) addr:0x020ea4b8 -_ZN12ActorUnkROCK8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x020ea4e8 +_ZN12ActorUnkROCK8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x020ea4e8 _ZN12ActorUnkROCK4GrabE15ActorGrabParams kind:function(arm,size=0x68) addr:0x020ea58c _ZN12ActorUnkROCK4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x44) addr:0x020ea5f4 _ZN12ActorUnkROCKD1Ev kind:function(arm,size=0x28) addr:0x020ea638 @@ -594,7 +594,7 @@ _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020eb2f0 _ZN10ActorRupee6UpdateEv kind:function(arm,size=0x230) addr:0x020eb344 _ZN10ActorRupee19func_ov031_020e9b88Ev kind:function(arm,size=0x60) addr:0x020eb574 _ZN10ActorRupee19func_ov031_020e9be8Ev kind:function(arm,size=0x44) addr:0x020eb5d4 -_ZN10ActorRupee8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x128) addr:0x020eb618 +_ZN10ActorRupee8vfunc_2CEi kind:function(arm,size=0x128) addr:0x020eb618 _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020eb740 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020eb780 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020eb848 @@ -665,7 +665,7 @@ _ZN12ActorUnkZLSL19func_ov031_020ec0d4Ev kind:function(arm,size=0x58) addr:0x020 _ZN12ActorUnkZLSL19func_ov031_020ec12cEv kind:function(arm,size=0x38) addr:0x020edb18 _ZN12ActorUnkZLSL19func_ov031_020ec164Ev kind:function(arm,size=0xc) addr:0x020edb50 _ZN12ActorUnkZLSL19func_ov031_020ec170Ev kind:function(arm,size=0x64) addr:0x020edb5c -_ZN12ActorUnkZLSL8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xfc) addr:0x020edbc0 +_ZN12ActorUnkZLSL8vfunc_2CEi kind:function(arm,size=0xfc) addr:0x020edbc0 _ZN12ActorUnkZLSL8vfunc_7CEi kind:function(arm,size=0x100) addr:0x020edcbc _ZN12ActorUnkZLSL19func_ov031_020ec3d0Ev kind:function(arm,size=0xcc) addr:0x020eddbc _ZN12ActorUnkZLSL19func_ov031_020ec49cEv kind:function(arm,size=0xb0) addr:0x020ede88 @@ -752,7 +752,7 @@ _ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020f0 _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_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f0fe4 +_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_00E9RefStructi kind:function(arm,size=0x44) addr:0x020f112c @@ -768,7 +768,7 @@ _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020f1248 _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020f1270 _ZN12ActorUnkRMTG4InitEi kind:function(arm,size=0xb8) addr:0x020f129c _ZN12ActorUnkRMTG5SetupEv kind:function(arm,size=0x38) addr:0x020f1354 -_ZN12ActorUnkRMTG8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f138c +_ZN12ActorUnkRMTG8vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f138c _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020f13ac _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020f13cc _ZN19ActorProfileUnkRMTGD1Ev kind:function(arm,size=0x14) addr:0x020f13f4 @@ -830,7 +830,7 @@ _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f26ec _ZN8ActorPot4InitEi kind:function(arm,size=0x28) addr:0x020f2700 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f2728 _ZN8ActorPot6UpdateEv kind:function(arm,size=0x38) addr:0x020f277c -_ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f27b4 +_ZN8ActorPot8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f27b4 _ZN8ActorPot19func_ov031_020f0de8Ev kind:function(arm,size=0xc) addr:0x020f27e4 _ZN8ActorPot19func_ov031_020f0df4Ev kind:function(arm,size=0xc) addr:0x020f27f0 _ZN8ActorPot19func_ov031_020f0e00Ev kind:function(arm,size=0xc) addr:0x020f27fc @@ -854,7 +854,7 @@ _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f2abc _ZN15ActorItemFlower4InitEi kind:function(arm,size=0x28) addr:0x020f2ad0 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f2af8 _ZN15ActorItemFlower6UpdateEv kind:function(arm,size=0x38) addr:0x020f2b3c -_ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f2b74 +_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f2b74 _ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f2ba4 _ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f2bb0 _ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f2bbc @@ -903,7 +903,7 @@ _ZN14ActorShotArrow19func_ov031_020f2270Ev kind:function(arm,size=0x10) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2280Ev kind:function(arm,size=0x1c) addr:0x020f3c7c _ZN14ActorShotArrow19func_ov031_020f229cEv kind:function(arm,size=0x38) addr:0x020f3c98 _ZN14ActorShotArrow19func_ov031_020f22d4EP7MtxFx33P7VecFx32 kind:function(arm,size=0x3c) addr:0x020f3cd0 -_ZN14ActorShotArrow8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x344) addr:0x020f3d0c +_ZN14ActorShotArrow8vfunc_2CEi kind:function(arm,size=0x344) addr:0x020f3d0c _ZN14ActorShotArrow19func_ov031_020f2654EP7MtxFx33 kind:function(arm,size=0x140) addr:0x020f4050 _ZN14ActorShotArrow19func_ov031_020f2794Es kind:function(arm,size=0x118) addr:0x020f4190 _ZN14ActorShotArrow19func_ov031_020f28acEv kind:function(arm,size=0x2e0) addr:0x020f42a8 @@ -911,7 +911,7 @@ _ZN14ActorShotArrow19func_ov031_020f2b8cEv kind:function(arm,size=0x30) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2bbcEv kind:function(arm,size=0x30) addr:0x020f45b8 _ZN14ActorShotArrow19func_ov031_020f2becEv kind:function(arm,size=0x1c) addr:0x020f45e8 _ZN14ActorShotArrow19func_ov031_020f2c08Es kind:function(arm,size=0xa4) addr:0x020f4604 -_ZN14ActorShotArrow19func_ov031_020f2cacEP7VecFx32b kind:function(arm,size=0x244) addr:0x020f46a8 +_ZN14ActorShotArrow19func_ov031_020f2cacEPK7VecFx32b kind:function(arm,size=0x244) addr:0x020f46a8 _ZN14ActorShotArrow19func_ov031_020f2ef0Ev kind:function(arm,size=0x6c) addr:0x020f48ec _ZN14ActorShotArrow19func_ov031_020f2f5cEP7VecFx32 kind:function(arm,size=0x40) addr:0x020f4958 _ZN14ActorShotArrow19func_ov031_020f2f9cEv kind:function(arm,size=0x64) addr:0x020f4998 @@ -927,7 +927,7 @@ _ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm _ZN18ActorShotArrow_1788vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x3f8) addr:0x020f4db8 _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f51b0 _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f51f0 -_ZN18ActorShotArrow_1948vfunc_10EP5Actor kind:function(arm,size=0x388) addr:0x020f5354 +_ZN18ActorShotArrow_1948vfunc_10EPK5Actor kind:function(arm,size=0x388) addr:0x020f5354 _ZN18ActorShotArrow_1948vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0xcc) addr:0x020f56dc _ZN14ActorShotArrow19func_ov031_020f3d04Es kind:function(arm,size=0x48) addr:0x020f57a8 _ZN18ActorShotArrow_194D0Ev kind:function(arm,size=0x1c) addr:0x020f57f0 @@ -997,7 +997,7 @@ _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f7bd8 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f7c00 _ZN12ActorUnkNTTZ4InitEi kind:function(arm,size=0x8) addr:0x020f7c30 _ZN12ActorUnkNTTZ6UpdateEv kind:function(arm,size=0x4) addr:0x020f7c38 -_ZN12ActorUnkNTTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020f7c3c +_ZN12ActorUnkNTTZ8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020f7c3c _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f7c40 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f7c90 _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f7ce0 @@ -1028,7 +1028,7 @@ _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE9RefStruct kind:function(arm,size=0x4c) a _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP9RefStructtPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f8918 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x22c) addr:0x020f8990 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f8bbc -_ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f8cf4 +_ZN12ActorUnkTGTZ8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f8cf4 _ZN12ActorUnkTGTZ19func_ov031_020f7358Ev kind:function(arm,size=0x8c) addr:0x020f8da4 _ZN12ActorUnkTGTZ19func_ov031_020f73e4Ev kind:function(arm,size=0xc) addr:0x020f8e30 _ZN12ActorUnkTGTZ19func_ov031_020f73f0Ev kind:function(arm,size=0xc) addr:0x020f8e3c @@ -1040,7 +1040,7 @@ func_ov031_020f8ec4 kind:function(arm,size=0x40) addr:0x020f8ec4 func_ov031_020f8f04 kind:function(arm,size=0x38) addr:0x020f8f04 _ZN24UnkStruct_ov031_02114870C2Ev kind:function(arm,size=0x2c) addr:0x020f8f3c _ZN24UnkStruct_ov031_021148704InitEi kind:function(arm,size=0x3c) addr:0x020f8f68 -_ZN24UnkStruct_ov031_021148708vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f8fa4 +_ZN24UnkStruct_ov031_021148708vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f8fa4 _ZN24UnkStruct_ov031_021148708vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f8fc4 func_ov031_020f8fcc kind:function(arm,size=0x50) addr:0x020f8fcc func_ov031_020f901c kind:function(arm,size=0x8) addr:0x020f901c @@ -1071,7 +1071,7 @@ _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f94f8 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f9520 _ZN12ActorUnkSWCH4InitEi kind:function(arm,size=0x14) addr:0x020f9550 _ZN12ActorUnkSWCH6UpdateEv kind:function(arm,size=0x68) addr:0x020f9564 -_ZN12ActorUnkSWCH8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x10) addr:0x020f95cc +_ZN12ActorUnkSWCH8vfunc_2CEi kind:function(arm,size=0x10) addr:0x020f95cc _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f95dc _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f95f0 _ZN19ActorProfileUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f960c @@ -1111,7 +1111,7 @@ _ZN24ActorProfileRollingStone6CreateEv kind:function(arm,size=0x24) addr:0x020f9 _ZN24ActorProfileRollingStoneC1Ev kind:function(arm,size=0x44) addr:0x020f9d54 _ZN21ActorRollingStone_1048vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f9d98 _ZN21ActorRollingStone_1048vfunc_10E9RefStructi kind:function(arm,size=0xb8) addr:0x020f9e28 -_ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x020f9ee0 +_ZN20ActorRollingStone_D48vfunc_10EPK5Actor kind:function(arm,size=0x44) addr:0x020f9ee0 _ZN17ActorRollingStoneC1Ev kind:function(arm,size=0x194) addr:0x020f9f24 _ZN20ActorRollingStone_D4D1Ev kind:function(arm,size=0x14) addr:0x020fa0b8 _ZN21ActorRollingStone_104D1Ev kind:function(arm,size=0x14) addr:0x020fa0cc @@ -1119,7 +1119,7 @@ _ZN17ActorRollingStone4InitEi kind:function(arm,size=0xf0) addr:0x020fa0e0 _ZN17ActorRollingStone6UpdateEv kind:function(arm,size=0x98) addr:0x020fa1d0 _ZN17ActorRollingStone8SetStateEs kind:function(arm,size=0x5c) addr:0x020fa268 _ZN17ActorRollingStone19func_ov031_020f8880Ev kind:function(arm,size=0xc8) addr:0x020fa2c4 -_ZN17ActorRollingStone8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xac) addr:0x020fa38c +_ZN17ActorRollingStone8vfunc_2CEi kind:function(arm,size=0xac) addr:0x020fa38c _ZN17ActorRollingStone19func_ov031_020f89f4Ev kind:function(arm,size=0x10) addr:0x020fa438 _ZN17ActorRollingStone19func_ov031_020f8a04Ev kind:function(arm,size=0x28) addr:0x020fa448 _ZN17ActorRollingStone19func_ov031_020f8a2cEv kind:function(arm,size=0xc) addr:0x020fa470 @@ -1187,7 +1187,7 @@ _ZN13ActorItemDrop19func_ov031_020fa668Ev kind:function(arm,size=0x10) addr:0x02 _ZN13ActorItemDrop19func_ov031_020fa678Ev kind:function(arm,size=0x50) addr:0x020fc0d0 _ZN13ActorItemDrop19func_ov031_020fa6c8Ev kind:function(arm,size=0x64) addr:0x020fc120 _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x020fc184 -_ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fc294 +_ZN13ActorItemDrop8vfunc_2CEi kind:function(arm,size=0xc4) addr:0x020fc294 _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fc358 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fc450 _ZN16ActorItemDrop_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020fc488 @@ -1249,7 +1249,7 @@ _ZN12ActorUnkEFSB4InitEi kind:function(arm,size=0xb8) addr:0x020fd06c _ZN12ActorUnkEFSB6UpdateEv kind:function(arm,size=0x38) addr:0x020fd124 _ZN12ActorUnkEFSB8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020fd15c _ZN12ActorUnkEFSB8vfunc_54Ei kind:function(arm,size=0x8) addr:0x020fd170 -_ZN12ActorUnkEFSB8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x70) addr:0x020fd178 +_ZN12ActorUnkEFSB8vfunc_2CEi kind:function(arm,size=0x70) addr:0x020fd178 _ZN12ActorUnkEFSBD1Ev kind:function(arm,size=0x30) addr:0x020fd1e8 _ZN12ActorUnkEFSBD0Ev kind:function(arm,size=0x38) addr:0x020fd218 _ZN19ActorProfileUnkEFSBD1Ev kind:function(arm,size=0x14) addr:0x020fd250 @@ -1264,7 +1264,7 @@ _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xa4) addr:0x020fd40c _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x84) addr:0x020fd4b0 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fd534 -_ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fd5d0 +_ZN12ActorUnkNFSP8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020fd5d0 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fd5d4 _ZN12ActorUnkNFSP19func_ov031_020fbba0E9RefStruct kind:function(arm,size=0x40) addr:0x020fd5e8 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fd628 @@ -2010,11 +2010,11 @@ data_ov031_02112830 kind:data(any) addr:0x02112830 data_ov031_02112834 kind:data(any) addr:0x02112834 data_ov031_0211283c kind:data(any) addr:0x0211283c data_ov031_02110ad0 kind:data(any) addr:0x02112840 -data_ov031_02112871 kind:data(any) addr:0x02112871 -data_ov031_02112878 kind:data(any) addr:0x02112878 -data_ov031_021128ac kind:data(any) addr:0x021128ac -data_ov031_021128bc kind:data(any) addr:0x021128bc -data_ov031_021128cc kind:data(any) addr:0x021128cc +data_ov031_02110b00 kind:data(any) addr:0x02112870 local +data_ov031_02110b08 kind:data(any) addr:0x02112878 +data_ov031_02110b3c kind:data(any) addr:0x021128ac +data_ov031_02110b4c kind:data(any) addr:0x021128bc +data_ov031_02110b5c kind:data(any) addr:0x021128cc data_ov031_021128e0 kind:data(any) addr:0x021128e0 data_ov031_021128f0 kind:data(any) addr:0x021128f0 data_ov031_02110b90 kind:data(any) addr:0x02112900 @@ -2318,9 +2318,9 @@ data_ov031_02113b58 kind:data(any) addr:0x021158f8 data_ov031_02115aa8 kind:data(any) addr:0x02115aa8 data_ov031_02115ab4 kind:data(any) addr:0x02115ab4 data_ov031_02113d58 kind:data(any) addr:0x02115af8 -data_ov031_02113d64 kind:data(any) addr:0x02115b04 -data_ov031_02113d74 kind:data(any) addr:0x02115b14 -data_ov031_02113da4 kind:data(any) addr:0x02115b44 +data_ov031_02113d64 kind:data(any) addr:0x02115b04 local +data_ov031_02113d74 kind:data(any) addr:0x02115b14 local +data_ov031_02113da4 kind:data(any) addr:0x02115b44 local _ZTV13ActorHeart_C4 kind:data(any) addr:0x02115b74 _ZTV17ActorProfileHeart kind:data(any) addr:0x02115b8c _ZTV10ActorHeart kind:data(any) addr:0x02115bb0 @@ -2343,8 +2343,8 @@ _ZTV15ActorItemFlower kind:data(any) addr:0x02115f94 _ZTV18ActorShotArrow_194 kind:data(any) addr:0x02116004 _ZTV18ActorShotArrow_178 kind:data(any) addr:0x02116020 _ZTV21ActorProfileShotArrow kind:data(any) addr:0x0211603c -data_ov031_021142c0 kind:data(any) addr:0x02116060 -data_ov031_02114300 kind:data(any) addr:0x021160a0 +data_ov031_021142c0 kind:data(any) addr:0x02116060 local +data_ov031_02114300 kind:data(any) addr:0x021160a0 local _ZTV14ActorShotArrow kind:data(any) addr:0x021160e0 _ZTV19ActorProfileUnkATTG kind:data(any) addr:0x0211613c _ZTV12ActorUnkATTG kind:data(any) addr:0x02116160 @@ -2521,10 +2521,10 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkTLKTE8sProfileE kind:bss addr:0x0211823c @30787 kind:bss addr:0x02118240 local _ZN15ProfileInstanceI19ActorProfileUnkTLKTE8sProfileE kind:bss addr:0x0211824c _ZGVN15ProfileInstanceI25ActorProfileItemBoomerangE8sProfileE kind:bss addr:0x02118288 -@30793 kind:bss addr:0x0211828c +@30793 kind:bss addr:0x0211828c local _ZN15ProfileInstanceI25ActorProfileItemBoomerangE8sProfileE kind:bss addr:0x02118298 _ZGVN15ProfileInstanceI23ActorProfileItemTornadoE8sProfileE kind:bss addr:0x021182d4 -@30799 kind:bss addr:0x021182d8 +@30799 kind:bss addr:0x021182d8 local _ZN15ProfileInstanceI23ActorProfileItemTornadoE8sProfileE kind:bss addr:0x021182e4 _ZGVN15ProfileInstanceI19ActorProfileUnkSWBME8sProfileE kind:bss addr:0x02118320 @30805 kind:bss addr:0x02118324 local @@ -2538,17 +2538,17 @@ data_ov031_0211847c kind:bss addr:0x0211847c _ZN15ProfileInstanceI17ActorProfileRupeeE8sProfileE kind:bss addr:0x02118488 data_ov031_021184c4 kind:bss addr:0x021184c4 _ZGVN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x021184cc -@30824 kind:bss addr:0x021184d8 +@30824 kind:bss addr:0x021184d8 local _ZN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x021184e4 _ZN15ProfileInstanceI19ActorProfileUnkZSRSE8sProfileE kind:bss addr:0x02118520 _ZGVN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x021185f8 -@30830 kind:bss addr:0x021185fc +@30830 kind:bss addr:0x021185fc local _ZN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x02118608 _ZGVN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x02118644 @30836 kind:bss addr:0x02118648 local _ZN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x02118654 _ZGVN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211872c -@30842 kind:bss addr:0x02118730 +@30842 kind:bss addr:0x02118730 local _ZN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211873c _ZGVN15ProfileInstanceI15ActorProfilePotE8sProfileE kind:bss addr:0x02118778 @30848 kind:bss addr:0x0211877c local @@ -2557,7 +2557,7 @@ _ZGVN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x02118 @30854 kind:bss addr:0x021187c8 local _ZN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x021187d4 _ZGVN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02118810 -@30860 kind:bss addr:0x02118814 +@30860 kind:bss addr:0x02118814 local _ZN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02118820 _ZGVN15ProfileInstanceI19ActorProfileUnkATTGE8sProfileE kind:bss addr:0x0211885c @30866 kind:bss addr:0x02118860 local diff --git a/config/jp/arm9/overlays/ov032/symbols.txt b/config/jp/arm9/overlays/ov032/symbols.txt index d09d0721..7f5182f3 100644 --- a/config/jp/arm9/overlays/ov032/symbols.txt +++ b/config/jp/arm9/overlays/ov032/symbols.txt @@ -11,7 +11,7 @@ _ZN11ActorSpinut5SetupEv kind:function(arm,size=0x84) addr:0x0211b1f8 _ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x0211b27c _ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211b2dc _ZN11ActorSpinut6UpdateEv kind:function(arm,size=0x358) addr:0x0211b324 -_ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb4) addr:0x0211b67c +_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x0211b67c _ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x0211b730 _ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x0211b7ac _ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x0211b988 @@ -68,7 +68,7 @@ _ZN18ActorFleeingSpinut4InitEi kind:function(arm,size=0x1c) addr:0x0211d728 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211d744 _ZN18ActorFleeingSpinut6UpdateEv kind:function(arm,size=0x268) addr:0x0211d7ac _ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211da14 -_ZN18ActorFleeingSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x8c) addr:0x0211db18 +_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211db18 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211dba4 _ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211dbd0 _ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211dc48 @@ -133,7 +133,7 @@ _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x02120 _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x021201c0 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x02120208 _ZN10ActorKeese6UpdateEv kind:function(arm,size=0x1b8) addr:0x02120518 -_ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xbc) addr:0x021206d0 +_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x021206d0 _ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0212078c _ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x02120900 _ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x02120a88 @@ -178,7 +178,7 @@ _ZN12ActorUnkNSSW19func_ov032_02120190Ev kind:function(arm,size=0xcc) addr:0x021 _ZN12ActorUnkNSSW19func_ov032_0212025cEv kind:function(arm,size=0x7c) addr:0x0212206c _ZN12ActorUnkNSSW19func_ov032_021202d8Ev kind:function(arm,size=0x124) addr:0x021220e8 _ZN12ActorUnkNSSW19func_ov032_021203fcEv kind:function(arm,size=0x360) addr:0x0212220c -_ZN12ActorUnkNSSW8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x134) addr:0x0212256c +_ZN12ActorUnkNSSW8vfunc_2CEi kind:function(arm,size=0x134) addr:0x0212256c _ZN12ActorUnkNSSW19func_ov032_02120880Ev kind:function(arm,size=0x14) addr:0x021226a0 _ZN12ActorUnkNSSW19func_ov032_02120894Ei kind:function(arm,size=0x2ec) addr:0x021226b4 _ZN12ActorUnkNSSW19func_ov032_02120b34E9RefStruct kind:function(arm,size=0x38) addr:0x021229a0 @@ -193,7 +193,7 @@ _ZN16ActorUnkNSSW_0E08vfunc_00E9RefStructi kind:function(arm,size=0x3c) addr:0x0 _ZN16ActorUnkNSSW_0E08vfunc_04Ev kind:function(arm,size=0x1c) addr:0x02122c74 _ZN16ActorUnkNSSW_0E08vfunc_0CEP7VecFx32 kind:function(arm,size=0x40) addr:0x02122c90 _ZN16ActorUnkNSSW_104C1EP12ActorUnkNSSW kind:function(arm,size=0x3c) addr:0x02122cd0 -_ZN16ActorUnkNSSW_1048vfunc_10EP5Actor kind:function(arm,size=0x10) addr:0x02122d0c +_ZN16ActorUnkNSSW_1048vfunc_10EPK5Actor kind:function(arm,size=0x10) addr:0x02122d0c _ZN16ActorUnkNSSW_1388vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x98) addr:0x02122d1c _ZN16ActorUnkNSSW_104D0Ev kind:function(arm,size=0x1c) addr:0x02122db4 _ZN16ActorUnkNSSW_138D0Ev kind:function(arm,size=0x1c) addr:0x02122dd0 diff --git a/config/jp/arm9/overlays/ov063/symbols.txt b/config/jp/arm9/overlays/ov063/symbols.txt index 407d9502..9fe5625f 100644 --- a/config/jp/arm9/overlays/ov063/symbols.txt +++ b/config/jp/arm9/overlays/ov063/symbols.txt @@ -14,7 +14,7 @@ _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x021 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x0215a1d0 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x0215a204 _ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x0215a230 -_ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xe0) addr:0x0215a76c +_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x0215a76c _ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x0215a84c _ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x0215a874 _ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x0215a8d8 @@ -71,7 +71,7 @@ _ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0 _ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215c9e8 _ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ca04 _ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ca28 -_ZN16ActorUnkCASE_1748vfunc_10EP5Actor kind:function(arm,size=0x24) addr:0x0215ca64 +_ZN16ActorUnkCASE_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215ca64 _ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215ca88 _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215cae4 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215cc08 @@ -92,7 +92,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215d060 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215d064 _ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215d088 -_ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x0215d3c0 +_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215d3c0 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215d464 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215d4c0 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215d568 @@ -110,7 +110,7 @@ _ZN15ActorUnkRMSBase4InitEi kind:function(arm,size=0x54) addr:0x0215d8c8 _ZN15ActorUnkRMSBase5SetupEv kind:function(arm,size=0x4) addr:0x0215d91c _ZN15ActorUnkRMSBase6UpdateEv kind:function(arm,size=0x4) addr:0x0215d920 _ZN15ActorUnkRMSBase8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215d924 -_ZN15ActorUnkRMSBase8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x0215d938 +_ZN15ActorUnkRMSBase8vfunc_2CEi kind:function(arm,size=0x30) addr:0x0215d938 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215d968 _ZN15ActorUnkRMSBaseD0Ev kind:function(arm,size=0x30) addr:0x0215d990 _ZN19ActorProfileUnkRMSV10GetProfileEv kind:function(arm,size=0xc) addr:0x0215d9c0 @@ -256,7 +256,7 @@ _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x021611a8 _ZN12ActorUnkRBLS4InitEi kind:function(arm,size=0x8c) addr:0x021611bc _ZN12ActorUnkRBLS6UpdateEv kind:function(arm,size=0x14) addr:0x02161248 _ZN12ActorUnkRBLS8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0216125c -_ZN12ActorUnkRBLS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x02161270 +_ZN12ActorUnkRBLS8vfunc_2CEi kind:function(arm,size=0x20) addr:0x02161270 _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x02161290 _ZN12ActorUnkRBLSD1Ev kind:function(arm,size=0x28) addr:0x021612ac _ZN12ActorUnkRBLSD0Ev kind:function(arm,size=0x30) addr:0x021612d4 diff --git a/config/jp/arm9/overlays/ov071/symbols.txt b/config/jp/arm9/overlays/ov071/symbols.txt index ef62cc48..b722449f 100644 --- a/config/jp/arm9/overlays/ov071/symbols.txt +++ b/config/jp/arm9/overlays/ov071/symbols.txt @@ -300,7 +300,7 @@ _ZN14ActorTearLight4InitEi kind:function(arm,size=0xac) addr:0x02161770 _ZN14ActorTearLight5SetupEv kind:function(arm,size=0x2c) addr:0x0216181c _ZN14ActorTearLight6UpdateEv kind:function(arm,size=0x4c) addr:0x02161848 _ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x02161894 -_ZN14ActorTearLight8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc8) addr:0x02161954 +_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x02161954 _ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x02161a1c _ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x02161a34 _ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x02161a4c diff --git a/config/jp/arm9/overlays/ov073/symbols.txt b/config/jp/arm9/overlays/ov073/symbols.txt index 857db0b5..f5c62fe2 100644 --- a/config/jp/arm9/overlays/ov073/symbols.txt +++ b/config/jp/arm9/overlays/ov073/symbols.txt @@ -236,8 +236,8 @@ _ZTV19data_ov073_02165fe0 kind:data(any) addr:0x02165fe0 ambiguous data_ov073_02165ff0 kind:data(any) addr:0x02165ff0 ambiguous data_ov073_02166000 kind:data(any) addr:0x02166000 data_ov073_0216602c kind:data(any) addr:0x0216602c -data_ov073_02166040 kind:data(any) addr:0x02166040 ambiguous -data_ov073_02166054 kind:data(any) addr:0x02166054 ambiguous +data_ov073_02163fe0 kind:data(any) addr:0x02166040 ambiguous +data_ov073_02163ff4 kind:data(any) addr:0x02166054 ambiguous data_ov073_02166074 kind:data(any) addr:0x02166074 _ZTV19data_ov073_021660b8 kind:data(any) addr:0x021660b8 data_ov073_02166118 kind:data(any) addr:0x02166118 diff --git a/config/jp/arm9/overlays/ov075/symbols.txt b/config/jp/arm9/overlays/ov075/symbols.txt index c503aa80..0f5ce7fc 100644 --- a/config/jp/arm9/overlays/ov075/symbols.txt +++ b/config/jp/arm9/overlays/ov075/symbols.txt @@ -250,7 +250,7 @@ _ZN12ActorUnkMABL19func_ov075_02160714Ev kind:function(arm,size=0x8) addr:0x0216 _ZN12ActorUnkMABL19func_ov075_0216071cEv kind:function(arm,size=0x1c) addr:0x02162700 _ZN19ActorProfileUnkMABLD1Ev kind:function(arm,size=0x14) addr:0x0216271c func_ov075_02162730 kind:function(arm,size=0x118) addr:0x02162730 -func_ov075_02162848 kind:function(arm,size=0xa0) addr:0x02162848 +_ZN14ActorShotArrow19func_ov075_02160864Ei kind:function(arm,size=0xa0) addr:0x02162848 func_ov075_021628e8 kind:function(arm,size=0xec) addr:0x021628e8 func_ov075_021629d4 kind:function(arm,size=0x44) addr:0x021629d4 func_ov075_02162a18 kind:function(arm,size=0x8) addr:0x02162a18 @@ -398,7 +398,7 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkMRDAE8sProfileE kind:bss addr:0x0216534c _ZN15ProfileInstanceI19ActorProfileUnkMRDAE8sProfileE kind:bss addr:0x02165364 _ZN15ProfileInstanceI19ActorProfileUnkMRDOE8sProfileE kind:bss addr:0x0216543c data_ov075_02165514 kind:bss addr:0x02165514 -data_ov075_02165518 kind:bss addr:0x02165518 +data_ov075_02163518 kind:bss addr:0x02165518 data_ov075_0216551c kind:bss addr:0x0216551c _ZGVN15ProfileInstanceI19ActorProfileUnkMRD2E8sProfileE kind:bss addr:0x02165528 @33422 kind:bss addr:0x02165534 diff --git a/config/jp/arm9/symbols.txt b/config/jp/arm9/symbols.txt index b5cf2d4f..69a9c813 100644 --- a/config/jp/arm9/symbols.txt +++ b/config/jp/arm9/symbols.txt @@ -896,7 +896,7 @@ func_02017f54 kind:function(arm,size=0x38) addr:0x02017eec func_02017f24 kind:function(arm,size=0x84) addr:0x02017f24 func_02017fa8 kind:function(arm,size=0x98) addr:0x02017fa8 func_02018040 kind:function(arm,size=0x6c) addr:0x02018040 -func_020180ac kind:function(arm,size=0xa0) addr:0x020180ac +func_02018114 kind:function(arm,size=0xa0) addr:0x020180ac func_0201814c kind:function(arm,size=0x60) addr:0x0201814c func_020181ac kind:function(arm,size=0x54) addr:0x020181ac func_02018200 kind:function(arm,size=0x7c) addr:0x02018200 diff --git a/config/usa/arm9/itcm/symbols.txt b/config/usa/arm9/itcm/symbols.txt index 46a22912..a03947bf 100644 --- a/config/usa/arm9/itcm/symbols.txt +++ b/config/usa/arm9/itcm/symbols.txt @@ -159,7 +159,7 @@ _ZNK18UnkStruct_027e09a421GetCurrentCourseEntryEv kind:function(arm,size=0x20) a _ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420 _ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sP7VecFx32i kind:function(arm,size=0x60) addr:0x01ffd43c func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c -_ZN21UnkStruct_027e09bc_0C13func_01ffd640EP7VecFx32 kind:function(arm,size=0x128) addr:0x01ffd640 +_ZN21UnkStruct_027e09bc_0C13func_01ffd640EP16UnkVecFx32Struct kind:function(arm,size=0x128) addr:0x01ffd640 _ZN21UnkStruct_027e09bc_0C13func_01ffd768EPvP5Vec2sc kind:function(arm,size=0x138) addr:0x01ffd768 func_01ffd8a0 kind:function(arm,size=0x190) addr:0x01ffd8a0 func_01ffda30 kind:function(arm,size=0x2ec) addr:0x01ffda30 @@ -209,7 +209,7 @@ _ZN16MapObjectManager13func_01fff4ccEPFvPvS0_ES0_ kind:function(arm,size=0x54) a _ZN16MapObjectManager13func_01fff520EP24UnkStruct_ov000_020b34c4PP9MapObject kind:function(arm,size=0x64) addr:0x01fff520 _ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 _ZN9MapObject13func_01fff590Ei kind:function(arm,size=0x40) addr:0x01fff590 -_ZN5Actor13func_01fff5d0EP14Actor_vfunc_30i kind:function(arm,size=0x3c) addr:0x01fff5d0 +_ZN5Actor13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 _ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iiiii kind:function(arm,size=0x8c) addr:0x01fff60c func_01fff698 kind:function(arm,size=0x38) addr:0x01fff698 func_01fff6d0 kind:function(arm,size=0x74) addr:0x01fff6d0 diff --git a/config/usa/arm9/overlays/ov000/relocs.txt b/config/usa/arm9/overlays/ov000/relocs.txt index abc9598f..1863e72a 100644 --- a/config/usa/arm9/overlays/ov000/relocs.txt +++ b/config/usa/arm9/overlays/ov000/relocs.txt @@ -8592,7 +8592,7 @@ from:0x020ae4b4 kind:load to:0x0215cf95 module:overlays(67,68) from:0x020ae4b8 kind:load to:0x021608f8 module:overlays(62,63,66,68,86) from:0x020ae4bc kind:load to:0x0215c048 module:overlays(68,77) from:0x020ae4c0 kind:load to:0x0213f774 module:overlays(26,70) -from:0x020ae4c4 kind:load to:0x020f1370 module:overlays(22,31) +from:0x020ae4c4 kind:load to:0x020f1370 module:overlay(31) from:0x020ae4c8 kind:load to:0x02156f5c module:overlays(58,77) from:0x020ae4cc kind:load to:0x02152ee8 module:overlays(29,58,77) from:0x020ae4d0 kind:load to:0x020f3d5c module:overlay(31) @@ -8755,7 +8755,7 @@ from:0x020ae740 kind:load to:0x0213a7d8 module:overlays(26,57) from:0x020ae744 kind:load to:0x02130480 module:overlays(47,48,49,50,51,52) from:0x020ae748 kind:load to:0x02154544 module:overlays(58,86) from:0x020ae74c kind:load to:0x02143a9c module:overlay(30) -from:0x020ae750 kind:load to:0x020eecd4 module:overlays(22,31) +from:0x020ae750 kind:load to:0x020eecd4 module:overlay(31) from:0x020ae754 kind:load to:0x0214b0ac module:overlay(30) from:0x020ae758 kind:load to:0x0213a9dc module:overlays(26,57) from:0x020ae75c kind:load to:0x0212a420 module:overlays(41,44,45,46) @@ -8959,7 +8959,7 @@ from:0x020aea70 kind:load to:0x020e8804 module:overlays(20,31) from:0x020aea74 kind:load to:0x0212a778 module:overlays(41,46) from:0x020aea78 kind:load to:0x020e8c98 module:overlays(20,31) from:0x020aea7c kind:load to:0x0214c004 module:overlay(70) -from:0x020aea80 kind:load to:0x020ef9ec module:overlays(22,31) +from:0x020aea80 kind:load to:0x020ef9ec module:overlay(31) from:0x020aea84 kind:load to:0x02181f50 module:overlay(98) from:0x020aea88 kind:load to:0x0216bff8 module:overlay(91) from:0x020aea8c kind:load to:0x0214d7b0 module:overlays(30,58) diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index b985dc74..381941af 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -350,7 +350,7 @@ func_ov000_0205ca34 kind:function(arm,size=0x40) addr:0x0205ca14 func_ov000_0205ca74 kind:function(arm,size=0x40) addr:0x0205ca54 func_ov000_0205cab4 kind:function(arm,size=0x28) addr:0x0205ca94 func_ov000_0205cadc kind:function(arm,size=0xe8) addr:0x0205cabc -_ZN5Actor19func_ov000_0205cbc4EjP7VecFx32 kind:function(arm,size=0x17c) addr:0x0205cba4 +func_ov000_0205cbc4 kind:function(arm,size=0x17c) addr:0x0205cba4 func_ov000_0205cd40 kind:function(arm,size=0x11c) addr:0x0205cd20 func_ov000_0205ce5c kind:function(arm,size=0x128) addr:0x0205ce3c func_ov000_0205cf84 kind:function(arm,size=0x178) addr:0x0205cf64 @@ -1430,14 +1430,14 @@ func_ov000_0207c3ec kind:function(arm,size=0x20) addr:0x0207c3cc func_ov000_0207c40c kind:function(arm,size=0x44) addr:0x0207c3ec func_ov000_0207c450 kind:function(arm,size=0x30) addr:0x0207c430 func_ov000_0207c480 kind:function(arm,size=0x1c) addr:0x0207c460 -func_ov000_0207c49c kind:function(arm,size=0x8) addr:0x0207c47c -func_ov000_0207c4a4 kind:function(arm,size=0x4b8) addr:0x0207c484 -func_ov000_0207c95c kind:function(arm,size=0x10) addr:0x0207c93c -func_ov000_0207c96c kind:function(arm,size=0x34) addr:0x0207c94c -func_ov000_0207c9a0 kind:function(arm,size=0x70) addr:0x0207c980 -func_ov000_0207ca10 kind:function(arm,size=0x28) addr:0x0207c9f0 -func_ov000_0207ca38 kind:function(arm,size=0x78) addr:0x0207ca18 -func_ov000_0207cab0 kind:function(arm,size=0x10) addr:0x0207ca90 +_ZN12MapObject_108vfunc_00Ev kind:function(arm,size=0x8) addr:0x0207c47c +_ZN12MapObject_108vfunc_04Ev kind:function(arm,size=0x4b8) addr:0x0207c484 +_ZN12MapObject_108vfunc_0CEv kind:function(arm,size=0x10) addr:0x0207c93c +_ZN12MapObject_108vfunc_08Ev kind:function(arm,size=0x34) addr:0x0207c94c +_ZN12MapObject_108vfunc_10EP8Cylinder kind:function(arm,size=0x70) addr:0x0207c980 +_ZN12MapObject_108vfunc_14Ev kind:function(arm,size=0x28) addr:0x0207c9f0 +_ZN12MapObject_108vfunc_18EP7VecFx32 kind:function(arm,size=0x78) addr:0x0207ca18 +_ZN12MapObject_108vfunc_1CEP7VecFx32 kind:function(arm,size=0x10) addr:0x0207ca90 func_ov000_0207cac0 kind:function(arm,size=0x8) addr:0x0207caa0 func_ov000_0207cac8 kind:function(arm,size=0x804) addr:0x0207caa8 func_ov000_0207d2cc kind:function(arm,size=0x10) addr:0x0207d2ac @@ -1564,7 +1564,7 @@ _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_020802ecEtP7VecFx32 kind:function(ar func_ov000_02080364 kind:function(arm,size=0x88) addr:0x02080344 _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_020803ecEt kind:function(arm,size=0x150) addr:0x020803cc _ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_0208053cEt kind:function(arm,size=0xe4) addr:0x0208051c -_ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_02080620Ev kind:function(arm,size=0x38) addr:0x02080600 +_ZN26UnkStruct_027e0cd8_0C_Base19func_ov000_02080620Ei kind:function(arm,size=0x38) addr:0x02080600 func_ov000_02080658 kind:function(arm,size=0xd8) addr:0x02080638 func_ov000_02080730 kind:function(arm,size=0x64) addr:0x02080710 func_ov000_02080794 kind:function(arm,size=0xac) addr:0x02080774 @@ -1948,7 +1948,7 @@ func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be28 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208be50 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208be7c func_ov000_0208bec8 kind:function(arm,size=0x20) addr:0x0208bea8 -func_ov000_0208bee8 kind:function(arm,size=0x20) addr:0x0208bec8 +_ZN18UnkStruct_027e0ce019func_ov000_0208bee8Ev kind:function(arm,size=0x20) addr:0x0208bec8 func_ov000_0208bf08 kind:function(arm,size=0x2c) addr:0x0208bee8 func_ov000_0208bf34 kind:function(arm,size=0x34) addr:0x0208bf14 func_ov000_0208bf68 kind:function(arm,size=0x20) addr:0x0208bf48 @@ -2321,7 +2321,7 @@ _ZN5Actor5SetupEv kind:function(arm,size=0x4) addr:0x02098490 _ZN5Actor6UpdateEv kind:function(arm,size=0x4) addr:0x02098494 _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x02098498 _ZN5Actor8vfunc_28EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x0209849c -_ZN5Actor8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984a0 +_ZN5Actor8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020984a0 _ZN5Actor8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984a4 _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x020984a8 _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x020984b0 @@ -3067,7 +3067,7 @@ _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a97dc _ZN14Actor_Derived119func_ov000_020a9804EP5ActorP16G3d_RenderState_ kind:function(arm,size=0xec) addr:0x020a97e4 _ZN14Actor_Derived16UpdateEv kind:function(arm,size=0x4) addr:0x020a98d0 _ZN14Actor_Derived18vfunc_24Ev kind:function(arm,size=0x68) addr:0x020a98d4 -_ZN14Actor_Derived18vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x48) addr:0x020a993c +_ZN14Actor_Derived18vfunc_2CEi kind:function(arm,size=0x48) addr:0x020a993c _ZN14Actor_Derived18vfunc_B8Ev kind:function(arm,size=0x34) addr:0x020a9984 _ZN14Actor_Derived18vfunc_14EP8Cylinder kind:function(arm,size=0x48) addr:0x020a99b8 _ZN19func_ov000_020a9a20D1Ev kind:function(arm,size=0x14) addr:0x020a9a00 diff --git a/config/usa/arm9/overlays/ov031/delinks.txt b/config/usa/arm9/overlays/ov031/delinks.txt index 17e35895..fe1ec5cd 100644 --- a/config/usa/arm9/overlays/ov031/delinks.txt +++ b/config/usa/arm9/overlays/ov031/delinks.txt @@ -78,6 +78,7 @@ src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp: .bss start:0x0211670c end:0x02116838 src/031_Land/Actor/ActorHeart.cpp: + complete .text start:0x020eecd4 end:0x020ef7fc .init start:0x0211137c end:0x021113e8 .ctor start:0x021127a0 end:0x021127a4 @@ -93,6 +94,7 @@ src/031_Land/Actor/ActorUnkRMTG.cpp: .bss start:0x02116884 end:0x0211696c src/031_Land/Actor/ActorUnkSCCN.cpp: + complete .text start:0x020ef9ec end:0x020efcb4 .init start:0x02111438 end:0x02111488 .ctor start:0x021127a8 end:0x021127ac @@ -116,11 +118,13 @@ src/031_Land/Actor/ActorItemFlower.cpp: .bss start:0x02116a04 end:0x02116a50 src/031_Land/Actor/ActorShotArrow.cpp: + complete .text start:0x020f1370 end:0x020f3d5c .init start:0x02111528 end:0x02111578 .ctor start:0x021127b4 end:0x021127b8 .data start:0x02114244 end:0x0211437c .bss start:0x02116a50 end:0x02116a9c + .rodata start:0x02110ae0 end:0x02110ae8 src/031_Land/Actor/ActorUnkATTG.cpp: complete diff --git a/config/usa/arm9/overlays/ov031/relocs.txt b/config/usa/arm9/overlays/ov031/relocs.txt index 7e818182..846b581f 100644 --- a/config/usa/arm9/overlays/ov031/relocs.txt +++ b/config/usa/arm9/overlays/ov031/relocs.txt @@ -2155,7 +2155,7 @@ from:0x020ec36c kind:arm_call to:0x0206c988 module:overlay(0) from:0x020ec374 kind:arm_call to:0x020ec3b0 module:overlay(31) from:0x020ec390 kind:arm_call to:0x020809b8 module:overlay(0) from:0x020ec39c kind:load to:0x020d8640 module:overlay(24) -from:0x020ec3a0 kind:load to:0x02163fd4 module:overlays(59,60,63,68,73,84) +from:0x020ec3a0 kind:load to:0x02163fd4 module:overlay(73) from:0x020ec3a4 kind:load to:0x020b5198 module:overlay(0) from:0x020ec3ac kind:load to:0x027e0cd8 module:dtcm from:0x020ec3e0 kind:arm_call to:0x0206d09c module:overlay(0) @@ -2459,7 +2459,7 @@ from:0x020ef130 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020ef14c kind:arm_call to:0x020988f0 module:overlay(0) from:0x020ef168 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020ef180 kind:load to:0x027e0ce0 module:dtcm -from:0x020ef18c kind:load to:0x02113d4c add:0x8 module:overlay(31) +from:0x020ef18c kind:load to:0x02113d54 module:overlay(31) from:0x020ef1e0 kind:load to:0x020aecd8 module:overlay(0) from:0x020ef1e4 kind:load to:0x02113d84 module:overlay(31) from:0x020ef2c4 kind:arm_call to:0x020984b0 module:overlay(0) @@ -2757,7 +2757,7 @@ from:0x020f15d0 kind:load to:0x020b1940 add:0x8 module:overlay(0) from:0x020f15d4 kind:load to:0x02110b3c module:overlay(31) from:0x020f15d8 kind:load to:0x02110ae8 module:overlay(31) from:0x020f15e0 kind:load to:0x02043e30 module:main -from:0x020f15e4 kind:load to:0x02163fc0 module:overlays(59,60,68,73,84) +from:0x020f15e4 kind:load to:0x02163fc0 module:overlay(73) from:0x020f15f0 kind:arm_call to:0x0207b6a0 module:overlay(0) from:0x020f160c kind:arm_call to:0x0205ae8c module:overlay(0) from:0x020f1644 kind:arm_call to:0x02080a58 module:overlay(0) @@ -2845,13 +2845,13 @@ from:0x020f1f80 kind:arm_call to:0x0205ae8c module:overlay(0) from:0x020f1fb4 kind:arm_call to:0x02080a58 module:overlay(0) from:0x020f1fe0 kind:load to:0x027e09a8 module:dtcm from:0x020f1fe8 kind:load to:0x027e0cd8 module:dtcm -from:0x020f1fec kind:load to:0x02163fd4 module:overlays(59,60,63,68,73,84) +from:0x020f1fec kind:load to:0x02163fd4 module:overlay(73) from:0x020f1ffc kind:arm_call to:0x020f31f0 module:overlay(31) from:0x020f2014 kind:arm_call to:0x020f2260 module:overlay(31) from:0x020f201c kind:arm_call to:0x02098818 module:overlay(0) from:0x020f2044 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f205c kind:arm_call to:0x020f2774 module:overlay(31) -from:0x020f2098 kind:load to:0x02163fd4 module:overlays(59,60,63,68,73,84) +from:0x020f2098 kind:load to:0x02163fd4 module:overlay(73) from:0x020f20a8 kind:arm_call to:0x020f31f0 module:overlay(31) from:0x020f20e0 kind:arm_call to:0x02098818 module:overlay(0) from:0x020f2108 kind:arm_call to:0x01ffb6e4 module:itcm @@ -2863,7 +2863,7 @@ from:0x020f2198 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f21a0 kind:arm_call to:0x01ffb800 module:itcm from:0x020f21ac kind:arm_call to:0x020f2f7c module:overlay(31) from:0x020f21b4 kind:arm_call to:0x020f2ed0 module:overlay(31) -from:0x020f21f0 kind:load to:0x02163fd4 module:overlays(59,60,63,68,73,84) +from:0x020f21f0 kind:load to:0x02163fd4 module:overlay(73) from:0x020f2220 kind:arm_call to:0x02098818 module:overlay(0) from:0x020f2248 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f22d0 kind:arm_call to:0x0200eab0 module:main @@ -2917,7 +2917,7 @@ from:0x020f2b0c kind:arm_call to:0x020f2f7c module:overlay(31) from:0x020f2b40 kind:arm_call to:0x02098a94 module:overlay(0) from:0x020f2b60 kind:load to:0x027e0ce4 module:dtcm from:0x020f2b64 kind:load to:0x027e0ce0 module:dtcm -from:0x020f2b68 kind:load to:0x02110ae1 module:overlay(31) +from:0x020f2b68 kind:load to:0x02110ae0 add:1 module:overlay(31) from:0x020f2b94 kind:arm_call to:0x020f1858 module:overlay(31) from:0x020f2bc4 kind:arm_call to:0x020f1858 module:overlay(31) from:0x020f2be0 kind:arm_call to:0x020f1858 module:overlay(31) @@ -2943,7 +2943,7 @@ from:0x020f2f64 kind:arm_call to:0x01ffb6e4 module:itcm from:0x020f2f74 kind:arm_call to:0x01ffb714 module:itcm from:0x020f2fc8 kind:arm_call to:0x0207e56c module:overlay(0) from:0x020f2fd8 kind:load to:0x027e09c0 module:dtcm -from:0x020f2fdc kind:load to:0x02110ae1 module:overlay(31) +from:0x020f2fdc kind:load to:0x02110ae0 add:1 module:overlay(31) from:0x020f302c kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x020f3074 kind:arm_call_thumb to:0x01ffa184 module:itcm from:0x020f3084 kind:arm_call to:0x01ffa60c module:itcm @@ -2997,7 +2997,7 @@ from:0x020f39e0 kind:arm_call to:0x020f372c module:overlay(31) from:0x020f3a00 kind:arm_call to:0x02153044 module:overlay(84) from:0x020f3a18 kind:arm_call to:0x020f30fc module:overlay(31) from:0x020f3a54 kind:arm_call to:0x020f372c module:overlay(31) -from:0x020f3a70 kind:arm_call to:0x0215bbd0 module:overlays(62,75) +from:0x020f3a70 kind:arm_call to:0x0215bbd0 module:overlay(75) from:0x020f3a88 kind:arm_call to:0x02160844 module:overlay(75) from:0x020f3aac kind:arm_call to:0x020f1858 module:overlay(31) from:0x020f3af0 kind:arm_call to:0x01fff3b4 module:itcm @@ -3008,7 +3008,7 @@ from:0x020f3b74 kind:arm_call to:0x020f372c module:overlay(31) from:0x020f3b7c kind:arm_call to:0x020f2b9c module:overlay(31) from:0x020f3b98 kind:arm_call to:0x01ffb714 module:itcm from:0x020f3c08 kind:load to:0x027e0d80 module:dtcm -from:0x020f3c0c kind:load to:0x021634f8 module:overlays(59,60,63,68,74,75,84) +from:0x020f3c0c kind:load to:0x021634f8 module:overlay(75) from:0x020f3c10 kind:load to:0x027e0ce4 module:dtcm from:0x020f3c74 kind:arm_call to:0x01ffb714 module:itcm from:0x020f3ca0 kind:arm_call to:0x01ffccf4 module:itcm diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt index bf1f2407..9d34d2b0 100644 --- a/config/usa/arm9/overlays/ov031/symbols.txt +++ b/config/usa/arm9/overlays/ov031/symbols.txt @@ -342,7 +342,7 @@ _ZN9ActorBomb19func_ov031_020e20fcEv kind:function(arm,size=0x4) addr:0x020e20dc _ZN9ActorBomb19func_ov031_020e2100Ev kind:function(arm,size=0x34) addr:0x020e20e0 _ZN9ActorBomb19func_ov031_020e2134Ev kind:function(arm,size=0xec) addr:0x020e2114 _ZN24ActorBomb_ov031_020e2134D1Ev kind:function(arm,size=0x14) addr:0x020e2200 -_ZN9ActorBomb8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x158) addr:0x020e2214 +_ZN9ActorBomb8vfunc_2CEi kind:function(arm,size=0x158) addr:0x020e2214 _ZN9ActorBomb19func_ov031_020e238cEv kind:function(arm,size=0xe0) addr:0x020e236c _ZN9ActorBomb4GrabE15ActorGrabParams kind:function(arm,size=0x40) addr:0x020e244c _ZN9ActorBomb4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x110) addr:0x020e248c @@ -363,7 +363,7 @@ _ZN13ActorBomb_1808vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ k _ZN13ActorBomb_1808vfunc_10E9RefStructi kind:function(arm,size=0x84) addr:0x020e326c _ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e32f0 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3320 -_ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e335c +_ZN13ActorBomb_19C8vfunc_10EPK5Actor kind:function(arm,size=0x30) addr:0x020e335c _ZN13ActorBomb_unkC1Ev kind:function(arm,size=0x14) addr:0x020e338c _ZN24ActorBomb_ov031_020e2134D0Ev kind:function(arm,size=0x1c) addr:0x020e33a0 _ZN13ActorBomb_19CD0Ev kind:function(arm,size=0x1c) addr:0x020e33bc @@ -436,9 +436,9 @@ _ZN18ActorItemBoomerang6UpdateEv kind:function(arm,size=0x614) addr:0x020e4a00 _ZN18ActorItemBoomerang19func_ov031_020e5034Ei kind:function(arm,size=0x1ec) addr:0x020e5014 _ZN18ActorItemBoomerang19func_ov031_020e5220Ev kind:function(arm,size=0x80) addr:0x020e5200 _ZN18ActorItemBoomerang19func_ov031_020e52a0Ev kind:function(arm,size=0xb4) addr:0x020e5280 -_ZN18ActorItemBoomerang8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x74) addr:0x020e5334 -_ZN21ActorItemBoomerang_A08vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e53a8 -_ZN21ActorItemBoomerang_CC8vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e53c4 +_ZN18ActorItemBoomerang8vfunc_2CEi kind:function(arm,size=0x74) addr:0x020e5334 +_ZN21ActorItemBoomerang_A08vfunc_10EPK5Actor kind:function(arm,size=0x1c) addr:0x020e53a8 +_ZN21ActorItemBoomerang_CC8vfunc_10EPK5Actor kind:function(arm,size=0x1c) addr:0x020e53c4 _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c) addr:0x020e53e0 _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) addr:0x020e542c _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5454 @@ -462,7 +462,7 @@ _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5be0 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5cf8 _ZN16ActorItemTornado6UpdateEv kind:function(arm,size=0x10) addr:0x020e6128 _ZN16ActorItemTornado8vfunc_24Ev kind:function(arm,size=0x44) addr:0x020e6138 -_ZN16ActorItemTornado8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x124) addr:0x020e617c +_ZN16ActorItemTornado8vfunc_2CEi kind:function(arm,size=0x124) addr:0x020e617c _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e62a0 _ZN16ActorItemTornado19func_ov031_020e6314Et kind:function(arm,size=0x2c) addr:0x020e62f4 _ZN16ActorItemTornado19func_ov031_020e6340EPK7VecFx32ss kind:function(arm,size=0x58) addr:0x020e6320 @@ -484,7 +484,7 @@ _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e689c _ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e68b8 _ZN15ActorUnkSWBM_948vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e68e0 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e68fc -_ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6954 +_ZN15ActorUnkSWBM_988vfunc_10EPK5Actor kind:function(arm,size=0x58) addr:0x020e6954 _ZN15ActorUnkSWBM_C88vfunc_00Eii kind:function(arm,size=0x168) addr:0x020e69ac _ZN19ActorProfileUnkSWBM10GetProfileEv kind:function(arm,size=0xc) addr:0x020e6b14 _ZN19ActorProfileUnkSWBM6CreateEv kind:function(arm,size=0x24) addr:0x020e6b20 @@ -499,7 +499,7 @@ _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020 _ZN12ActorUnkSWBM6UpdateEv kind:function(arm,size=0x268) addr:0x020e6ed8 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7140 _ZN12ActorUnkSWBM19func_ov031_020e718cEPK7VecFx32P7MtxFx33isss kind:function(arm,size=0x108) addr:0x020e716c -_ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e7274 +_ZN12ActorUnkSWBM8vfunc_2CEi kind:function(arm,size=0x40) addr:0x020e7274 _ZN15ActorUnkSWBM_94D0Ev kind:function(arm,size=0x1c) addr:0x020e72b4 _ZN15ActorUnkSWBM_98D0Ev kind:function(arm,size=0x1c) addr:0x020e72d0 _ZN12ActorUnkSWBMD1Ev kind:function(arm,size=0x28) addr:0x020e72ec @@ -550,7 +550,7 @@ _ZN12ActorUnkROCK4InitEi kind:function(arm,size=0x30) addr:0x020e895c _ZN12ActorUnkROCK6UpdateEv kind:function(arm,size=0x9c) addr:0x020e898c _ZN12ActorUnkROCK19func_ov031_020e8a48Es kind:function(arm,size=0x84) addr:0x020e8a28 _ZN12ActorUnkROCK19func_ov031_020e8accEv kind:function(arm,size=0x30) addr:0x020e8aac -_ZN12ActorUnkROCK8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x020e8adc +_ZN12ActorUnkROCK8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x020e8adc _ZN12ActorUnkROCK4GrabE15ActorGrabParams kind:function(arm,size=0x68) addr:0x020e8b80 _ZN12ActorUnkROCK4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x44) addr:0x020e8be8 _ZN12ActorUnkROCKD1Ev kind:function(arm,size=0x28) addr:0x020e8c2c @@ -594,7 +594,7 @@ _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e98e4 _ZN10ActorRupee6UpdateEv kind:function(arm,size=0x230) addr:0x020e9938 _ZN10ActorRupee19func_ov031_020e9b88Ev kind:function(arm,size=0x60) addr:0x020e9b68 _ZN10ActorRupee19func_ov031_020e9be8Ev kind:function(arm,size=0x44) addr:0x020e9bc8 -_ZN10ActorRupee8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x128) addr:0x020e9c0c +_ZN10ActorRupee8vfunc_2CEi kind:function(arm,size=0x128) addr:0x020e9c0c _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9d34 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9d74 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9e3c @@ -665,7 +665,7 @@ _ZN12ActorUnkZLSL19func_ov031_020ec0d4Ev kind:function(arm,size=0x58) addr:0x020 _ZN12ActorUnkZLSL19func_ov031_020ec12cEv kind:function(arm,size=0x38) addr:0x020ec10c _ZN12ActorUnkZLSL19func_ov031_020ec164Ev kind:function(arm,size=0xc) addr:0x020ec144 _ZN12ActorUnkZLSL19func_ov031_020ec170Ev kind:function(arm,size=0x64) addr:0x020ec150 -_ZN12ActorUnkZLSL8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xfc) addr:0x020ec1b4 +_ZN12ActorUnkZLSL8vfunc_2CEi kind:function(arm,size=0xfc) addr:0x020ec1b4 _ZN12ActorUnkZLSL8vfunc_7CEi kind:function(arm,size=0x100) addr:0x020ec2b0 _ZN12ActorUnkZLSL19func_ov031_020ec3d0Ev kind:function(arm,size=0xcc) addr:0x020ec3b0 _ZN12ActorUnkZLSL19func_ov031_020ec49cEv kind:function(arm,size=0xb0) addr:0x020ec47c @@ -752,7 +752,7 @@ _ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020ef _ZN10ActorHeart19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020ef488 _ZN10ActorHeart19func_ov031_020ef528Ev kind:function(arm,size=0x48) addr:0x020ef508 _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef550 -_ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef5c8 +_ZN10ActorHeart8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020ef5c8 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef678 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef6d8 _ZN13ActorHeart_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020ef710 @@ -768,7 +768,7 @@ _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef82c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef854 _ZN12ActorUnkRMTG4InitEi kind:function(arm,size=0xb8) addr:0x020ef880 _ZN12ActorUnkRMTG5SetupEv kind:function(arm,size=0x38) addr:0x020ef938 -_ZN12ActorUnkRMTG8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020ef970 +_ZN12ActorUnkRMTG8vfunc_2CEi kind:function(arm,size=0x20) addr:0x020ef970 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020ef990 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020ef9b0 _ZN19ActorProfileUnkRMTGD1Ev kind:function(arm,size=0x14) addr:0x020ef9d8 @@ -830,7 +830,7 @@ _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0cd0 _ZN8ActorPot4InitEi kind:function(arm,size=0x28) addr:0x020f0ce4 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0d0c _ZN8ActorPot6UpdateEv kind:function(arm,size=0x38) addr:0x020f0d60 -_ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f0d98 +_ZN8ActorPot8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f0d98 _ZN8ActorPot19func_ov031_020f0de8Ev kind:function(arm,size=0xc) addr:0x020f0dc8 _ZN8ActorPot19func_ov031_020f0df4Ev kind:function(arm,size=0xc) addr:0x020f0dd4 _ZN8ActorPot19func_ov031_020f0e00Ev kind:function(arm,size=0xc) addr:0x020f0de0 @@ -854,7 +854,7 @@ _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f10a0 _ZN15ActorItemFlower4InitEi kind:function(arm,size=0x28) addr:0x020f10b4 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f10dc _ZN15ActorItemFlower6UpdateEv kind:function(arm,size=0x38) addr:0x020f1120 -_ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f1158 +_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f1158 _ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f1188 _ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f1194 _ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f11a0 @@ -903,7 +903,7 @@ _ZN14ActorShotArrow19func_ov031_020f2270Ev kind:function(arm,size=0x10) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2280Ev kind:function(arm,size=0x1c) addr:0x020f2260 _ZN14ActorShotArrow19func_ov031_020f229cEv kind:function(arm,size=0x38) addr:0x020f227c _ZN14ActorShotArrow19func_ov031_020f22d4EP7MtxFx33P7VecFx32 kind:function(arm,size=0x3c) addr:0x020f22b4 -_ZN14ActorShotArrow8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x344) addr:0x020f22f0 +_ZN14ActorShotArrow8vfunc_2CEi kind:function(arm,size=0x344) addr:0x020f22f0 _ZN14ActorShotArrow19func_ov031_020f2654EP7MtxFx33 kind:function(arm,size=0x140) addr:0x020f2634 _ZN14ActorShotArrow19func_ov031_020f2794Es kind:function(arm,size=0x118) addr:0x020f2774 _ZN14ActorShotArrow19func_ov031_020f28acEv kind:function(arm,size=0x2e0) addr:0x020f288c @@ -911,7 +911,7 @@ _ZN14ActorShotArrow19func_ov031_020f2b8cEv kind:function(arm,size=0x30) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2bbcEv kind:function(arm,size=0x30) addr:0x020f2b9c _ZN14ActorShotArrow19func_ov031_020f2becEv kind:function(arm,size=0x1c) addr:0x020f2bcc _ZN14ActorShotArrow19func_ov031_020f2c08Es kind:function(arm,size=0xa4) addr:0x020f2be8 -_ZN14ActorShotArrow19func_ov031_020f2cacEP7VecFx32b kind:function(arm,size=0x244) addr:0x020f2c8c +_ZN14ActorShotArrow19func_ov031_020f2cacEPK7VecFx32b kind:function(arm,size=0x244) addr:0x020f2c8c _ZN14ActorShotArrow19func_ov031_020f2ef0Ev kind:function(arm,size=0x6c) addr:0x020f2ed0 _ZN14ActorShotArrow19func_ov031_020f2f5cEP7VecFx32 kind:function(arm,size=0x40) addr:0x020f2f3c _ZN14ActorShotArrow19func_ov031_020f2f9cEv kind:function(arm,size=0x64) addr:0x020f2f7c @@ -927,7 +927,7 @@ _ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm _ZN18ActorShotArrow_1788vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f339c _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f36ec _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f372c -_ZN18ActorShotArrow_1948vfunc_10EP5Actor kind:function(arm,size=0x388) addr:0x020f3890 +_ZN18ActorShotArrow_1948vfunc_10EPK5Actor kind:function(arm,size=0x388) addr:0x020f3890 _ZN18ActorShotArrow_1948vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0xcc) addr:0x020f3c18 _ZN14ActorShotArrow19func_ov031_020f3d04Es kind:function(arm,size=0x48) addr:0x020f3ce4 _ZN18ActorShotArrow_194D0Ev kind:function(arm,size=0x1c) addr:0x020f3d2c @@ -997,7 +997,7 @@ _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6118 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6140 _ZN12ActorUnkNTTZ4InitEi kind:function(arm,size=0x8) addr:0x020f6170 _ZN12ActorUnkNTTZ6UpdateEv kind:function(arm,size=0x4) addr:0x020f6178 -_ZN12ActorUnkNTTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020f617c +_ZN12ActorUnkNTTZ8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020f617c _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f6180 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f61d0 _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6220 @@ -1029,7 +1029,7 @@ _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE9RefStruct kind:function(arm,size=0x4c) a _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP9RefStructtPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6e88 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f6f00 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f7150 -_ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f7288 +_ZN12ActorUnkTGTZ8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f7288 _ZN12ActorUnkTGTZ19func_ov031_020f7358Ev kind:function(arm,size=0x8c) addr:0x020f7338 _ZN12ActorUnkTGTZ19func_ov031_020f73e4Ev kind:function(arm,size=0xc) addr:0x020f73c4 _ZN12ActorUnkTGTZ19func_ov031_020f73f0Ev kind:function(arm,size=0xc) addr:0x020f73d0 @@ -1042,7 +1042,7 @@ func_ov031_020f7494 kind:function(arm,size=0x40) addr:0x020f7474 func_ov031_020f74d4 kind:function(arm,size=0x38) addr:0x020f74b4 _ZN24UnkStruct_ov031_02114870C2Ev kind:function(arm,size=0x2c) addr:0x020f74ec _ZN24UnkStruct_ov031_021148704InitEi kind:function(arm,size=0x3c) addr:0x020f7518 -_ZN24UnkStruct_ov031_021148708vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f7554 +_ZN24UnkStruct_ov031_021148708vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f7554 _ZN24UnkStruct_ov031_021148708vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f7574 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f757c func_ov031_020f75ec kind:function(arm,size=0x8) addr:0x020f75cc @@ -1072,7 +1072,7 @@ _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7a94 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7abc _ZN12ActorUnkSWCH4InitEi kind:function(arm,size=0x14) addr:0x020f7aec _ZN12ActorUnkSWCH6UpdateEv kind:function(arm,size=0x68) addr:0x020f7b00 -_ZN12ActorUnkSWCH8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x10) addr:0x020f7b68 +_ZN12ActorUnkSWCH8vfunc_2CEi kind:function(arm,size=0x10) addr:0x020f7b68 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7b78 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7b8c _ZN19ActorProfileUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7ba8 @@ -1112,7 +1112,7 @@ _ZN24ActorProfileRollingStone6CreateEv kind:function(arm,size=0x24) addr:0x020f8 _ZN24ActorProfileRollingStoneC1Ev kind:function(arm,size=0x44) addr:0x020f82f0 _ZN21ActorRollingStone_1048vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8334 _ZN21ActorRollingStone_1048vfunc_10E9RefStructi kind:function(arm,size=0xb8) addr:0x020f83c4 -_ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x020f847c +_ZN20ActorRollingStone_D48vfunc_10EPK5Actor kind:function(arm,size=0x44) addr:0x020f847c _ZN17ActorRollingStoneC1Ev kind:function(arm,size=0x194) addr:0x020f84c0 _ZN20ActorRollingStone_D4D1Ev kind:function(arm,size=0x14) addr:0x020f8654 _ZN21ActorRollingStone_104D1Ev kind:function(arm,size=0x14) addr:0x020f8668 @@ -1120,7 +1120,7 @@ _ZN17ActorRollingStone4InitEi kind:function(arm,size=0xf0) addr:0x020f867c _ZN17ActorRollingStone6UpdateEv kind:function(arm,size=0x98) addr:0x020f876c _ZN17ActorRollingStone8SetStateEs kind:function(arm,size=0x5c) addr:0x020f8804 _ZN17ActorRollingStone19func_ov031_020f8880Ev kind:function(arm,size=0xc8) addr:0x020f8860 -_ZN17ActorRollingStone8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xac) addr:0x020f8928 +_ZN17ActorRollingStone8vfunc_2CEi kind:function(arm,size=0xac) addr:0x020f8928 _ZN17ActorRollingStone19func_ov031_020f89f4Ev kind:function(arm,size=0x10) addr:0x020f89d4 _ZN17ActorRollingStone19func_ov031_020f8a04Ev kind:function(arm,size=0x28) addr:0x020f89e4 _ZN17ActorRollingStone19func_ov031_020f8a2cEv kind:function(arm,size=0xc) addr:0x020f8a0c @@ -1188,7 +1188,7 @@ _ZN13ActorItemDrop19func_ov031_020fa668Ev kind:function(arm,size=0x10) addr:0x02 _ZN13ActorItemDrop19func_ov031_020fa678Ev kind:function(arm,size=0x50) addr:0x020fa658 _ZN13ActorItemDrop19func_ov031_020fa6c8Ev kind:function(arm,size=0x64) addr:0x020fa6a8 _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x020fa70c -_ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa81c +_ZN13ActorItemDrop8vfunc_2CEi kind:function(arm,size=0xc4) addr:0x020fa81c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fa8e0 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fa9d8 _ZN16ActorItemDrop_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020faa10 @@ -1250,7 +1250,7 @@ _ZN12ActorUnkEFSB4InitEi kind:function(arm,size=0xb8) addr:0x020fb5f4 _ZN12ActorUnkEFSB6UpdateEv kind:function(arm,size=0x38) addr:0x020fb6ac _ZN12ActorUnkEFSB8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020fb6e4 _ZN12ActorUnkEFSB8vfunc_54Ei kind:function(arm,size=0x8) addr:0x020fb6f8 -_ZN12ActorUnkEFSB8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x70) addr:0x020fb700 +_ZN12ActorUnkEFSB8vfunc_2CEi kind:function(arm,size=0x70) addr:0x020fb700 _ZN12ActorUnkEFSBD1Ev kind:function(arm,size=0x30) addr:0x020fb770 _ZN12ActorUnkEFSBD0Ev kind:function(arm,size=0x38) addr:0x020fb7a0 _ZN19ActorProfileUnkEFSBD1Ev kind:function(arm,size=0x14) addr:0x020fb7d8 @@ -1265,7 +1265,7 @@ _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fb994 _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020fba40 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbacc -_ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbb68 +_ZN12ActorUnkNFSP8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020fbb68 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbb6c _ZN12ActorUnkNFSP19func_ov031_020fbba0E9RefStruct kind:function(arm,size=0x40) addr:0x020fbb80 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbbc0 @@ -2010,11 +2010,11 @@ data_ov031_02110aa0 kind:data(any) addr:0x02110aa0 data_ov031_02110aa4 kind:data(any) addr:0x02110aa4 data_ov031_02110aac kind:data(any) addr:0x02110aac data_ov031_02110ad0 kind:data(any) addr:0x02110ab0 -data_ov031_02110ae1 kind:data(any) addr:0x02110ae1 -data_ov031_02110ae8 kind:data(any) addr:0x02110ae8 -data_ov031_02110b1c kind:data(any) addr:0x02110b1c -data_ov031_02110b2c kind:data(any) addr:0x02110b2c -data_ov031_02110b3c kind:data(any) addr:0x02110b3c +data_ov031_02110b00 kind:data(any) addr:0x02110ae0 local +data_ov031_02110b08 kind:data(any) addr:0x02110ae8 +data_ov031_02110b3c kind:data(any) addr:0x02110b1c +data_ov031_02110b4c kind:data(any) addr:0x02110b2c +data_ov031_02110b5c kind:data(any) addr:0x02110b3c data_ov031_02110b50 kind:data(any) addr:0x02110b50 data_ov031_02110b60 kind:data(any) addr:0x02110b60 data_ov031_02110b70 kind:data(any) addr:0x02110b70 @@ -2322,9 +2322,9 @@ data_ov031_02113ce8 kind:data(any) addr:0x02113ce8 _ZTV19data_ov031_02113d14 kind:data(any) addr:0x02113cec data_ov031_02113d1c kind:data(any) addr:0x02113d1c ambiguous data_ov031_02113d38 kind:data(any) addr:0x02113d38 -data_ov031_02113d44 kind:data(any) addr:0x02113d44 -_ZTV19data_ov031_02113d54 kind:data(any) addr:0x02113d4c -data_ov031_02113d84 kind:data(any) addr:0x02113d84 +data_ov031_02113d64 kind:data(any) addr:0x02113d44 local +data_ov031_02113d74 kind:data(any) addr:0x02113d54 local +data_ov031_02113da4 kind:data(any) addr:0x02113d84 local _ZTV13ActorHeart_C4 kind:data(any) addr:0x02113db4 _ZTV17ActorProfileHeart kind:data(any) addr:0x02113dcc _ZTV10ActorHeart kind:data(any) addr:0x02113df0 @@ -2347,8 +2347,8 @@ _ZTV15ActorItemFlower kind:data(any) addr:0x021141d4 _ZTV18ActorShotArrow_194 kind:data(any) addr:0x02114244 _ZTV18ActorShotArrow_178 kind:data(any) addr:0x02114260 _ZTV21ActorProfileShotArrow kind:data(any) addr:0x0211427c -data_ov031_021142a0 kind:data(any) addr:0x021142a0 -data_ov031_021142e0 kind:data(any) addr:0x021142e0 +data_ov031_021142c0 kind:data(any) addr:0x021142a0 local +data_ov031_02114300 kind:data(any) addr:0x021142e0 local _ZTV14ActorShotArrow kind:data(any) addr:0x02114320 _ZTV19ActorProfileUnkATTG kind:data(any) addr:0x0211437c _ZTV12ActorUnkATTG kind:data(any) addr:0x021143a0 @@ -2553,24 +2553,24 @@ data_ov031_02116718 kind:bss addr:0x02116718 data_ov031_02116724 kind:bss addr:0x02116724 data_ov031_02116760 kind:bss addr:0x02116760 data_ov031_021167a4 kind:bss addr:0x021167a4 ambiguous -data_ov031_02116838 kind:bss addr:0x02116838 -data_ov031_0211683c kind:bss addr:0x0211683c -data_ov031_02116848 kind:bss addr:0x02116848 +_ZGVN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x02116838 +@10830 kind:bss addr:0x0211683c local +_ZN15ProfileInstanceI17ActorProfileHeartE8sProfileE kind:bss addr:0x02116848 _ZGVN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x02116884 @10836 kind:bss addr:0x02116888 local _ZN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x02116894 -data_ov031_0211696c kind:bss addr:0x0211696c -data_ov031_02116970 kind:bss addr:0x02116970 -data_ov031_0211697c kind:bss addr:0x0211697c +_ZGVN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211696c +@10842 kind:bss addr:0x02116970 local +_ZN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211697c _ZGVN15ProfileInstanceI15ActorProfilePotE8sProfileE kind:bss addr:0x021169b8 @10848 kind:bss addr:0x021169bc local _ZN15ProfileInstanceI15ActorProfilePotE8sProfileE kind:bss addr:0x021169c8 _ZGVN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x02116a04 @10854 kind:bss addr:0x02116a08 local _ZN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x02116a14 -data_ov031_02116a50 kind:bss addr:0x02116a50 -data_ov031_02116a54 kind:bss addr:0x02116a54 -data_ov031_02116a60 kind:bss addr:0x02116a60 +_ZGVN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02116a50 +@8784 kind:bss addr:0x02116a54 local +_ZN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02116a60 _ZGVN15ProfileInstanceI19ActorProfileUnkATTGE8sProfileE kind:bss addr:0x02116a9c @8299 kind:bss addr:0x02116aa0 local _ZN15ProfileInstanceI19ActorProfileUnkATTGE8sProfileE kind:bss addr:0x02116aac diff --git a/config/usa/arm9/overlays/ov032/symbols.txt b/config/usa/arm9/overlays/ov032/symbols.txt index b0856d77..c6e36374 100644 --- a/config/usa/arm9/overlays/ov032/symbols.txt +++ b/config/usa/arm9/overlays/ov032/symbols.txt @@ -11,7 +11,7 @@ _ZN11ActorSpinut5SetupEv kind:function(arm,size=0x84) addr:0x02119438 _ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x021194bc _ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211951c _ZN11ActorSpinut6UpdateEv kind:function(arm,size=0x358) addr:0x02119564 -_ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb4) addr:0x021198bc +_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x021198bc _ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x02119970 _ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x021199ec _ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x02119bc8 @@ -68,7 +68,7 @@ _ZN18ActorFleeingSpinut4InitEi kind:function(arm,size=0x1c) addr:0x0211b968 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211b984 _ZN18ActorFleeingSpinut6UpdateEv kind:function(arm,size=0x268) addr:0x0211b9ec _ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bc54 -_ZN18ActorFleeingSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x8c) addr:0x0211bd58 +_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211bd58 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bde4 _ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211be10 _ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211be88 @@ -133,7 +133,7 @@ _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e400 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e448 _ZN10ActorKeese6UpdateEv kind:function(arm,size=0x1b8) addr:0x0211e758 -_ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xbc) addr:0x0211e910 +_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211e910 _ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211e9cc _ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eb40 _ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ecc8 @@ -177,7 +177,7 @@ _ZN12ActorUnkNSSW19func_ov032_02120190Ev kind:function(arm,size=0xcc) addr:0x021 _ZN12ActorUnkNSSW19func_ov032_0212025cEv kind:function(arm,size=0x7c) addr:0x0212023c _ZN12ActorUnkNSSW19func_ov032_021202d8Ev kind:function(arm,size=0x124) addr:0x021202b8 _ZN12ActorUnkNSSW19func_ov032_021203fcEv kind:function(arm,size=0x350) addr:0x021203dc -_ZN12ActorUnkNSSW8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x134) addr:0x0212072c +_ZN12ActorUnkNSSW8vfunc_2CEi kind:function(arm,size=0x134) addr:0x0212072c _ZN12ActorUnkNSSW19func_ov032_02120880Ev kind:function(arm,size=0x14) addr:0x02120860 _ZN12ActorUnkNSSW19func_ov032_02120894Ei kind:function(arm,size=0x2a0) addr:0x02120874 _ZN12ActorUnkNSSW19func_ov032_02120b34E9RefStruct kind:function(arm,size=0x38) addr:0x02120b14 @@ -191,7 +191,7 @@ _ZN16ActorUnkNSSW_0E08vfunc_00E9RefStructi kind:function(arm,size=0x3c) addr:0x0 _ZN16ActorUnkNSSW_0E08vfunc_04Ev kind:function(arm,size=0x1c) addr:0x02120d40 _ZN16ActorUnkNSSW_0E08vfunc_0CEP7VecFx32 kind:function(arm,size=0x40) addr:0x02120d5c _ZN16ActorUnkNSSW_104C1EP12ActorUnkNSSW kind:function(arm,size=0x3c) addr:0x02120d9c -_ZN16ActorUnkNSSW_1048vfunc_10EP5Actor kind:function(arm,size=0x10) addr:0x02120dd8 +_ZN16ActorUnkNSSW_1048vfunc_10EPK5Actor kind:function(arm,size=0x10) addr:0x02120dd8 _ZN16ActorUnkNSSW_104D0Ev kind:function(arm,size=0x1c) addr:0x02120de8 _ZN12ActorUnkNSSWD1Ev kind:function(arm,size=0x28) addr:0x02120e04 _ZN12ActorUnkNSSWD0Ev kind:function(arm,size=0x30) addr:0x02120e2c diff --git a/config/usa/arm9/overlays/ov063/symbols.txt b/config/usa/arm9/overlays/ov063/symbols.txt index 0f3e03c2..86027424 100644 --- a/config/usa/arm9/overlays/ov063/symbols.txt +++ b/config/usa/arm9/overlays/ov063/symbols.txt @@ -14,7 +14,7 @@ _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x021 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158470 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584a4 _ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x021584d0 -_ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xe0) addr:0x02158a0c +_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158a0c _ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158aec _ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158b14 _ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158b78 @@ -71,7 +71,7 @@ _ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0 _ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ac2c _ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ac48 _ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ac6c -_ZN16ActorUnkCASE_1748vfunc_10EP5Actor kind:function(arm,size=0x24) addr:0x0215aca8 +_ZN16ActorUnkCASE_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215aca8 _ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215accc _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ad28 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215ae4c @@ -92,7 +92,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2a4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2a8 _ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b2cc -_ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x0215b604 +_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b604 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6a8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b704 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7ac @@ -110,7 +110,7 @@ _ZN15ActorUnkRMSBase4InitEi kind:function(arm,size=0x54) addr:0x0215bb14 _ZN15ActorUnkRMSBase5SetupEv kind:function(arm,size=0x4) addr:0x0215bb68 _ZN15ActorUnkRMSBase6UpdateEv kind:function(arm,size=0x4) addr:0x0215bb6c _ZN15ActorUnkRMSBase8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215bb70 -_ZN15ActorUnkRMSBase8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x0215bb84 +_ZN15ActorUnkRMSBase8vfunc_2CEi kind:function(arm,size=0x30) addr:0x0215bb84 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bbb4 _ZN15ActorUnkRMSBaseD0Ev kind:function(arm,size=0x30) addr:0x0215bbdc _ZN19ActorProfileUnkRMSV10GetProfileEv kind:function(arm,size=0xc) addr:0x0215bc0c @@ -255,7 +255,7 @@ _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f3b4 _ZN12ActorUnkRBLS4InitEi kind:function(arm,size=0x8c) addr:0x0215f3c8 _ZN12ActorUnkRBLS6UpdateEv kind:function(arm,size=0x14) addr:0x0215f454 _ZN12ActorUnkRBLS8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215f468 -_ZN12ActorUnkRBLS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x0215f47c +_ZN12ActorUnkRBLS8vfunc_2CEi kind:function(arm,size=0x20) addr:0x0215f47c _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f49c _ZN12ActorUnkRBLSD1Ev kind:function(arm,size=0x28) addr:0x0215f4b8 _ZN12ActorUnkRBLSD0Ev kind:function(arm,size=0x30) addr:0x0215f4e0 diff --git a/config/usa/arm9/overlays/ov071/symbols.txt b/config/usa/arm9/overlays/ov071/symbols.txt index 016d15b8..9caea20a 100644 --- a/config/usa/arm9/overlays/ov071/symbols.txt +++ b/config/usa/arm9/overlays/ov071/symbols.txt @@ -299,7 +299,7 @@ _ZN14ActorTearLight4InitEi kind:function(arm,size=0xac) addr:0x0215f510 _ZN14ActorTearLight5SetupEv kind:function(arm,size=0x2c) addr:0x0215f5bc _ZN14ActorTearLight6UpdateEv kind:function(arm,size=0x4c) addr:0x0215f5e8 _ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x0215f634 -_ZN14ActorTearLight8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc8) addr:0x0215f6f4 +_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x0215f6f4 _ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f7bc _ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x0215f7d4 _ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x0215f7ec diff --git a/config/usa/arm9/overlays/ov073/symbols.txt b/config/usa/arm9/overlays/ov073/symbols.txt index ee562012..b7753df5 100644 --- a/config/usa/arm9/overlays/ov073/symbols.txt +++ b/config/usa/arm9/overlays/ov073/symbols.txt @@ -232,8 +232,8 @@ data_ov073_02163f58 kind:data(any) addr:0x02163f58 data_ov073_02163f68 kind:data(any) addr:0x02163f68 data_ov073_02163f80 kind:data(any) addr:0x02163f80 data_ov073_02163f9c kind:data(any) addr:0x02163f9c -data_ov073_02163fc0 kind:data(any) addr:0x02163fc0 -data_ov073_02163fd4 kind:data(any) addr:0x02163fd4 ambiguous +data_ov073_02163fe0 kind:data(any) addr:0x02163fc0 +data_ov073_02163ff4 kind:data(any) addr:0x02163fd4 ambiguous data_ov073_02163fec kind:data(any) addr:0x02163fec data_ov073_02164034 kind:data(any) addr:0x02164034 data_ov073_02164080 kind:data(any) addr:0x02164080 diff --git a/config/usa/arm9/overlays/ov075/symbols.txt b/config/usa/arm9/overlays/ov075/symbols.txt index acb45107..4c9160dc 100644 --- a/config/usa/arm9/overlays/ov075/symbols.txt +++ b/config/usa/arm9/overlays/ov075/symbols.txt @@ -250,7 +250,7 @@ _ZN12ActorUnkMABL19func_ov075_02160714Ev kind:function(arm,size=0x8) addr:0x0216 _ZN12ActorUnkMABL19func_ov075_0216071cEv kind:function(arm,size=0x1c) addr:0x021606fc _ZN19ActorProfileUnkMABLD1Ev kind:function(arm,size=0x14) addr:0x02160718 func_ov075_0216074c kind:function(arm,size=0x118) addr:0x0216072c -func_ov075_02160864 kind:function(arm,size=0xa0) addr:0x02160844 +_ZN14ActorShotArrow19func_ov075_02160864Ei kind:function(arm,size=0xa0) addr:0x02160844 func_ov075_02160904 kind:function(arm,size=0xec) addr:0x021608e4 func_ov075_021609f0 kind:function(arm,size=0x44) addr:0x021609d0 func_ov075_02160a34 kind:function(arm,size=0x8) addr:0x02160a14 @@ -401,7 +401,7 @@ data_ov075_02163344 kind:bss addr:0x02163344 data_ov075_0216341c kind:bss addr:0x0216341c data_ov075_021634ac kind:bss addr:0x021634ac ambiguous data_ov075_021634f4 kind:bss addr:0x021634f4 -data_ov075_021634f8 kind:bss addr:0x021634f8 +data_ov075_02163518 kind:bss addr:0x021634f8 data_ov075_021634fc kind:bss addr:0x021634fc data_ov075_02163508 kind:bss addr:0x02163508 data_ov075_02163514 kind:bss addr:0x02163514 diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 04b3e81f..8523ca9a 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -207,7 +207,7 @@ public: /* 20 */ virtual void Update(); /* 24 */ virtual void vfunc_24(); /* 28 */ virtual void vfunc_28(Actor_vfunc_30 *param1); - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1); + /* 2C */ virtual void vfunc_2C(unk32 param1); /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1); /* 34 */ virtual unk32 vfunc_34(); /* 38 */ virtual bool Grab(ActorGrabParams grabParams); @@ -218,7 +218,7 @@ public: /* 4C */ virtual ~Actor(); /* 54 */ - bool func_01fff5d0(Actor_vfunc_30 *param1, unk32 param2); + bool func_01fff5d0(unk32 param1, unk32 param2); void ResetFlags() { *(u32 *) this->mFlags = 0; @@ -228,6 +228,14 @@ public: UNSET_FLAG(this->mFlags, ActorFlag_Alive); } + u16 GetDirection() { + return (u16) GET_DIRECTION(this->mAngle.angle_s); + } + + u16 GetInitialDirection() { + return (u16) GET_DIRECTION(this->mUnk_5C.mInitialAngle); + } + // clang-format off /* x & 0x00000001 */ const bool IsAlive() { return GET_FLAG(this->mFlags, ActorFlag_Alive); } /* x & 0x00000002 */ const bool IsVisible() { return GET_FLAG(this->mFlags, ActorFlag_Visible); } @@ -268,7 +276,6 @@ public: ActorId GetActorId(); // overlay 0 - bool func_ov000_0205cbc4(u32 param1, VecFx32 *param2); unk32 func_ov000_0207df88(Cylinder *param1, unk32 param2); unk32 func_ov000_0207e294(Cylinder *param1); void func_ov000_0209848c(ActorProfile *param1); @@ -353,16 +360,8 @@ class Actor_C4 : public Actor_C4_Base { public: /* 00 (vtable) */ /* 04 */ unk32 mUnk_04; - // might be a VecFx16 - /* 08 */ unk16 mUnk_08; - /* 08 */ unk16 mUnk_0A; - /* 0C */ unk16 mUnk_0C; - - // might be a VecFx16 - /* 0C */ unk16 mUnk_0E; - /* 10 */ unk16 mUnk_10; - /* 10 */ unk16 mUnk_12; - + /* 08 */ VecFx16 mUnk_08; + /* 0C */ VecFx16 mUnk_0E; /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; /* 1C */ unk32 mUnk_1C; diff --git a/include/Actor/ActorBomb.hpp b/include/Actor/ActorBomb.hpp index 9b9bf49c..d30bf54e 100644 --- a/include/Actor/ActorBomb.hpp +++ b/include/Actor/ActorBomb.hpp @@ -28,7 +28,7 @@ public: ActorBomb_19C(Actor *param1); // data_ov031_02112c94 - /* 10 */ virtual void vfunc_10(Actor *actor) override; + /* 10 */ virtual void vfunc_10(const Actor *actor) override; }; class ActorBomb_180 : public UnkStruct_ov031_Items_00 { @@ -100,7 +100,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 38 */ virtual bool Grab(ActorGrabParams grabParams) override; /* 3C */ virtual bool Drop(ActorGrabParams grabParams, const VecFx32 *pVel) override; diff --git a/include/Actor/ActorFleeingSpinut.hpp b/include/Actor/ActorFleeingSpinut.hpp index ecf3364f..5616010f 100644 --- a/include/Actor/ActorFleeingSpinut.hpp +++ b/include/Actor/ActorFleeingSpinut.hpp @@ -78,7 +78,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorFleeingSpinut() override; diff --git a/include/Actor/ActorHeart.hpp b/include/Actor/ActorHeart.hpp index fe88f1ce..759b4123 100644 --- a/include/Actor/ActorHeart.hpp +++ b/include/Actor/ActorHeart.hpp @@ -29,8 +29,7 @@ public: class ActorHeart : public Actor { public: /* 00 (base) */ - /* 94 */ u16 mUnk_94; - /* 96 */ u16 mUnk_96; + /* 94 */ Timer mUnk_94; /* 98 */ Actor_9C mUnk_98; /* B8 */ s16 mUnk_B8; /* BA */ unk16 mUnk_BA; @@ -46,7 +45,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 4C */ virtual ~ActorHeart() override {}; void func_ov031_020f0750(); diff --git a/include/Actor/ActorItemBoomerang.hpp b/include/Actor/ActorItemBoomerang.hpp index 0aec2b16..997ffa04 100644 --- a/include/Actor/ActorItemBoomerang.hpp +++ b/include/Actor/ActorItemBoomerang.hpp @@ -46,7 +46,7 @@ public: /* 00 (vtable) */ /* 04 */ - /* 10 */ virtual void vfunc_10(Actor *actor) override; + /* 10 */ virtual void vfunc_10(const Actor *actor) override; }; class ActorItemBoomerang_CC : public UnkStruct_ov031_Items_01 { @@ -60,7 +60,7 @@ public: mUnk_2C(0x0) {} /* 0C */ virtual bool vfunc_0C(Actor *actor, VecFx32 *param2) override; - /* 10 */ virtual void vfunc_10(Actor *actor) override; + /* 10 */ virtual void vfunc_10(const Actor *actor) override; }; class ActorItemBoomerang : public Actor { @@ -85,7 +85,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 4C */ virtual ~ActorItemBoomerang() override; void SetState(ActorState state); diff --git a/include/Actor/ActorItemDrop.hpp b/include/Actor/ActorItemDrop.hpp index 54e52bcf..de2edcce 100644 --- a/include/Actor/ActorItemDrop.hpp +++ b/include/Actor/ActorItemDrop.hpp @@ -63,7 +63,7 @@ public: ActorItemDrop(); /* 18 */ virtual bool Init(unk32 param1) override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; diff --git a/include/Actor/ActorItemFlower.hpp b/include/Actor/ActorItemFlower.hpp index a216e41c..22f9dc59 100644 --- a/include/Actor/ActorItemFlower.hpp +++ b/include/Actor/ActorItemFlower.hpp @@ -42,7 +42,7 @@ public: /* 18 */ virtual bool Init(unk32 param1); /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 5C */ virtual void vfunc_5C(ActorState state) override; void func_ov031_020f11a8(); diff --git a/include/Actor/ActorItemTornado.hpp b/include/Actor/ActorItemTornado.hpp index 146c4ee2..34757c7f 100644 --- a/include/Actor/ActorItemTornado.hpp +++ b/include/Actor/ActorItemTornado.hpp @@ -68,7 +68,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; void SetState(ActorState state); void func_ov031_020e5d18(unk32 param1); diff --git a/include/Actor/ActorKeese.hpp b/include/Actor/ActorKeese.hpp index 18fd6b2f..b10e142c 100644 --- a/include/Actor/ActorKeese.hpp +++ b/include/Actor/ActorKeese.hpp @@ -109,7 +109,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; void func_ov032_0211e0c0(); void func_ov032_0211e0d4(s16 param1, unk32 param2); diff --git a/include/Actor/ActorPot.hpp b/include/Actor/ActorPot.hpp index 62a8a374..03a98bba 100644 --- a/include/Actor/ActorPot.hpp +++ b/include/Actor/ActorPot.hpp @@ -88,7 +88,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 5C */ virtual void vfunc_5C(ActorState state) override; void func_ov031_020f0cf0(); diff --git a/include/Actor/ActorRollingStone.hpp b/include/Actor/ActorRollingStone.hpp index 66625e4a..5187d786 100644 --- a/include/Actor/ActorRollingStone.hpp +++ b/include/Actor/ActorRollingStone.hpp @@ -50,7 +50,7 @@ public: } // data_ov031_02114a40 - /* 10 */ virtual void vfunc_10(Actor *param1) override; // func_ov031_020f849c + /* 10 */ virtual void vfunc_10(const Actor *param1) override; // func_ov031_020f849c }; class ActorRollingStone : public Actor { @@ -79,9 +79,9 @@ public: ActorRollingStone(); - /* 18 */ virtual bool Init(unk32 param1) override; // func_ov031_020f869c - /* 20 */ virtual void Update() override; // func_ov031_020f878c - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; // func_ov031_020f8948 + /* 18 */ virtual bool Init(unk32 param1) override; // func_ov031_020f869c + /* 20 */ virtual void Update() override; // func_ov031_020f878c + /* 2C */ virtual void vfunc_2C(unk32 param1) override; // func_ov031_020f8948 /* 54 */ void SetState(ActorState state); diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index 419a01ba..eed2f1d1 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -71,7 +71,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 4C */ virtual ~ActorRupee() override; void func_ov031_020e8fec(); diff --git a/include/Actor/ActorShotArrow.hpp b/include/Actor/ActorShotArrow.hpp index 00120abb..6710093d 100644 --- a/include/Actor/ActorShotArrow.hpp +++ b/include/Actor/ActorShotArrow.hpp @@ -72,8 +72,7 @@ public: // data_ov031_0211426c /* 0C */ virtual bool vfunc_0C(Actor *param1, VecFx32 *vector) override; // func_ov031_020f3c38 - /* 10 */ virtual void vfunc_10(Actor *actor) override; // func_ov031_020f38b0 - // /* 14 */ virtual void vfunc_14(MtxFx33 *, VecFx32 *); + /* 10 */ virtual void vfunc_10(const Actor *actor) override; // func_ov031_020f38b0 void func_ov031_020f374c(Actor *param1); }; @@ -131,7 +130,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 4C */ virtual ~ActorShotArrow() override; void func_ov031_020f1868(); @@ -148,7 +147,7 @@ public: void func_ov031_020f2bbc(); void func_ov031_020f2bec(); void func_ov031_020f2c08(unk16 param1); - void func_ov031_020f2cac(VecFx32 *param1, bool param2); + void func_ov031_020f2cac(const VecFx32 *param1, bool param2); void func_ov031_020f2ef0(); void func_ov031_020f2f5c(VecFx32 *param1); bool func_ov031_020f2f9c(); @@ -177,6 +176,9 @@ public: void func_ov031_020f2160(); void func_ov031_020f2214(); void func_ov031_020f1958(); + + // overlay 75 + void func_ov075_02160864(unk32 param1); }; class ActorProfileShotArrow : public ActorProfile { diff --git a/include/Actor/ActorSpinut.hpp b/include/Actor/ActorSpinut.hpp index a5e5557c..e58cc657 100644 --- a/include/Actor/ActorSpinut.hpp +++ b/include/Actor/ActorSpinut.hpp @@ -120,7 +120,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 1C */ virtual void Setup() override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 4C */ virtual ~ActorSpinut() override; /* 54 */ virtual void vfunc_54(unk32 param1) override; diff --git a/include/Actor/ActorTearLight.hpp b/include/Actor/ActorTearLight.hpp index fd791f93..c215eeb5 100644 --- a/include/Actor/ActorTearLight.hpp +++ b/include/Actor/ActorTearLight.hpp @@ -112,7 +112,7 @@ public: /* 1C */ virtual void Setup() override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; void func_ov071_0215f7f4(ActorState state); diff --git a/include/Actor/ActorUnkCANS.hpp b/include/Actor/ActorUnkCANS.hpp index 4fb854c7..bc94e10e 100644 --- a/include/Actor/ActorUnkCANS.hpp +++ b/include/Actor/ActorUnkCANS.hpp @@ -124,7 +124,7 @@ public: /* 1C */ virtual void Setup(void) override; /* 20 */ virtual void Update(void) override; /* 24 */ virtual void vfunc_24(void) override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; void func_ov063_02158424(void); void func_ov063_02158448(unk32 param1); diff --git a/include/Actor/ActorUnkCASE.hpp b/include/Actor/ActorUnkCASE.hpp index ee30316d..88210a04 100644 --- a/include/Actor/ActorUnkCASE.hpp +++ b/include/Actor/ActorUnkCASE.hpp @@ -57,7 +57,7 @@ public: ActorUnkCASE_174(Actor *param1); - /* 10 */ virtual void vfunc_10(Actor *actor) override; + /* 10 */ virtual void vfunc_10(const Actor *actor) override; }; class ActorUnkCASE : public Actor_Derived2 { @@ -89,7 +89,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; void func_ov063_0215ab70(void); void func_ov063_0215aba4(void); diff --git a/include/Actor/ActorUnkEFSB.hpp b/include/Actor/ActorUnkEFSB.hpp index ee9bdc24..99a8c2c8 100644 --- a/include/Actor/ActorUnkEFSB.hpp +++ b/include/Actor/ActorUnkEFSB.hpp @@ -21,7 +21,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 54 */ virtual void vfunc_54(unk32 param1); }; diff --git a/include/Actor/ActorUnkNFSP.hpp b/include/Actor/ActorUnkNFSP.hpp index e084eda8..e9958907 100644 --- a/include/Actor/ActorUnkNFSP.hpp +++ b/include/Actor/ActorUnkNFSP.hpp @@ -35,7 +35,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 54 */ virtual void vfunc_54(unk32 param1); void func_ov031_020fb988(); diff --git a/include/Actor/ActorUnkNSSW.hpp b/include/Actor/ActorUnkNSSW.hpp index de190ed7..7b9f5ea8 100644 --- a/include/Actor/ActorUnkNSSW.hpp +++ b/include/Actor/ActorUnkNSSW.hpp @@ -28,7 +28,7 @@ public: ActorUnkNSSW_104(ActorUnkNSSW *actor); - /* 10 */ virtual void vfunc_10(Actor *actor) override; + /* 10 */ virtual void vfunc_10(const Actor *actor) override; }; #if IS_JP @@ -81,7 +81,7 @@ public: /* 1C */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; void func_ov032_02120118(); void func_ov032_02120190(); diff --git a/include/Actor/ActorUnkNTTZ.hpp b/include/Actor/ActorUnkNTTZ.hpp index 0c9bff51..a8486dd5 100644 --- a/include/Actor/ActorUnkNTTZ.hpp +++ b/include/Actor/ActorUnkNTTZ.hpp @@ -15,7 +15,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; void func_ov031_020f61a0(); void func_ov031_020f61f0(); diff --git a/include/Actor/ActorUnkRBLS.hpp b/include/Actor/ActorUnkRBLS.hpp index 149d0ce0..6850a900 100644 --- a/include/Actor/ActorUnkRBLS.hpp +++ b/include/Actor/ActorUnkRBLS.hpp @@ -29,7 +29,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update(void) override; /* 24 */ virtual void vfunc_24(void) override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; void func_ov063_0215f3d4(void); void func_ov063_0215f500(void); diff --git a/include/Actor/ActorUnkRMSBase.hpp b/include/Actor/ActorUnkRMSBase.hpp index 168de4ed..854f4ac1 100644 --- a/include/Actor/ActorUnkRMSBase.hpp +++ b/include/Actor/ActorUnkRMSBase.hpp @@ -20,6 +20,6 @@ public: /* 1C */ virtual void Setup() override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 58 */ virtual G3d_Model *vfunc_58() = 0; }; diff --git a/include/Actor/ActorUnkRMTG.hpp b/include/Actor/ActorUnkRMTG.hpp index 2943a688..ccc3021b 100644 --- a/include/Actor/ActorUnkRMTG.hpp +++ b/include/Actor/ActorUnkRMTG.hpp @@ -15,7 +15,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 1C */ virtual void Setup() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; }; class ActorProfileUnkRMTG : public ActorProfile_Derived1 { diff --git a/include/Actor/ActorUnkROCK.hpp b/include/Actor/ActorUnkROCK.hpp index d281bc3a..5fc10adf 100644 --- a/include/Actor/ActorUnkROCK.hpp +++ b/include/Actor/ActorUnkROCK.hpp @@ -28,7 +28,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 38 */ virtual bool Grab(ActorGrabParams param1) override; /* 38 */ virtual bool Drop(ActorGrabParams param1, const VecFx32 *param2) override; diff --git a/include/Actor/ActorUnkSWBM.hpp b/include/Actor/ActorUnkSWBM.hpp index 6482443c..870e7722 100644 --- a/include/Actor/ActorUnkSWBM.hpp +++ b/include/Actor/ActorUnkSWBM.hpp @@ -36,7 +36,7 @@ public: // data_ov031_0211312c /* 0C */ virtual bool vfunc_0C(Actor *param1, VecFx32 *vector) override; - /* 10 */ virtual void vfunc_10(Actor *actor) override; + /* 10 */ virtual void vfunc_10(const Actor *actor) override; }; class ActorUnkSWBM_C8 : public UnkStruct_PlayerGet_74_base { @@ -70,7 +70,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; void func_ov031_020e6d48(); void func_ov031_020e6d80(unk32 param1); diff --git a/include/Actor/ActorUnkSWCH.hpp b/include/Actor/ActorUnkSWCH.hpp index b353dd71..977af640 100644 --- a/include/Actor/ActorUnkSWCH.hpp +++ b/include/Actor/ActorUnkSWCH.hpp @@ -16,7 +16,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; }; class ActorProfileUnkSWCH : public ActorProfile { diff --git a/include/Actor/ActorUnkTGTZ.hpp b/include/Actor/ActorUnkTGTZ.hpp index 26c50641..84deb49b 100644 --- a/include/Actor/ActorUnkTGTZ.hpp +++ b/include/Actor/ActorUnkTGTZ.hpp @@ -45,7 +45,7 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 30 */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 30 */ virtual void vfunc_2C(unk32 param1) override; /* 34 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; void func_ov031_020f6984(); diff --git a/include/Actor/ActorUnkZLSL_ZSRS.hpp b/include/Actor/ActorUnkZLSL_ZSRS.hpp index a2521316..1490ae78 100644 --- a/include/Actor/ActorUnkZLSL_ZSRS.hpp +++ b/include/Actor/ActorUnkZLSL_ZSRS.hpp @@ -336,7 +336,7 @@ public: /* 00 */ virtual void GetOffsetPos(VecFx32 *pPos) const override; /* 18 */ virtual bool Init(unk32 param1) override; /* 20 */ virtual void Update() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 4C */ virtual ~ActorUnkZLSL() override; /* 58 */ virtual void vfunc_58(ActorState state) override; /* 68 */ virtual void vfunc_68() override; diff --git a/include/Actor/Actor_Derived1.hpp b/include/Actor/Actor_Derived1.hpp index e429375a..497dc018 100644 --- a/include/Actor/Actor_Derived1.hpp +++ b/include/Actor/Actor_Derived1.hpp @@ -149,7 +149,7 @@ public: /* 1C */ virtual void Setup() override; /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 4C */ virtual ~Actor_Derived1(); /* 54 */ virtual void vfunc_54(unk32 param1); /* 58 */ virtual void vfunc_58(ActorState param1) = 0; diff --git a/include/CommonFuncs.hpp b/include/CommonFuncs.hpp index e8e7c5a2..8e88ce4b 100644 --- a/include/CommonFuncs.hpp +++ b/include/CommonFuncs.hpp @@ -20,7 +20,6 @@ struct EntranceInfo; struct UnkAngleStruct; struct ModelRender; struct Cylinder; -struct UnkStruct_ov031_020eeee8; struct Actor; struct RefStruct; struct UnkStruct_ov031_Items_00; @@ -100,7 +99,7 @@ void func_01ffc5a0(ModelRender *, unk32, UnkAngleStruct, void *); void func_01ffcb94(unk16, unk16, MtxFx33 *); bool func_01ffccf4(Cylinder *, VecFx32 *, VecFx32 *, unk32 *); void func_01ffce1c(Cylinder *, Cylinder *); -int func_01ffcea0(unk32, UnkStruct_ov031_020eeee8 *); +int func_01ffcea0(Cylinder *, Cylinder *); void func_01ffcfcc(VecFx32 *, VecFx32 *, VecFx32 *); void func_01ffd054(VecFx32 *, VecFx32 *); void func_01ffd1b4(VecFx32 *, VecFx32 *); @@ -133,7 +132,7 @@ void func_0200b578(G3d_RenderObject *, G3d_CallbackFunction, unk32, unk32, unk32 void func_0200b58c(G3d_RenderObject *); void G3d_GetCurrentMtx(MtxFx43 *mtx1, MtxFx33 *mtx2); void func_0200ea38(G3d_Model *, unk32, unk32); -void func_0200eab0(G3d_Model *, unk32, u8); +void func_0200eab0(G3d_Model *, unk32, unk32); void func_0200ef5c(G3d_Model *, unk32); void func_0200ef9c(G3d_Model *, unk32); UnkResourceStruct2 *func_0200f05c(G3d_NameList *, char *); @@ -317,7 +316,7 @@ void func_ov000_02089bbc(void *, unk32); void func_ov000_0208a7a4(void *, void *); void func_ov000_0208abc4(RefStruct *, void *, Vec2s *); void func_ov000_0208ba10(void *, void *, unk32); -void func_ov000_0208bc00(UnkStruct_027e0ce0 *, unk16, unk16 *); +void func_ov000_0208bc00(UnkStruct_027e0ce0 *, unk16, Cylinder *); void func_ov000_0208bd20(UnkStruct_027e0ce0 *param1, unk32 param2, unk32 param3, unk32 param4); void func_ov000_0208cac8(UnkStruct_ov000_0208f820_28 *, VecFx32 *, unk32); unk32 func_ov000_0208dc98(unk32); @@ -349,6 +348,7 @@ unk8 func_ov000_02070164(void *); //! TODO: turn to a class void func_ov000_0205a950(u8 bgType, bool isTopScreen, bool); void func_ov000_0205a944(u8 bgType, bool isTopScreen, bool); void *func_ov000_0208ea70(PlayerCharacter, unk32, bool); // returns pointer to .NSBTX +bool func_ov000_0205cbc4(u32 param1, VecFx32 *param2); // overlay 2 AdventureModeManager_160_14 *func_ov002_020b6520(void *, void *, int); @@ -422,9 +422,6 @@ UnkStruct_ov070_0214dc74 *func_ov070_02143fe4(int index); // overlay 71 void func_ov071_0215e8d4(); -// overlay 75 -void func_ov075_02160864(ActorShotArrow *, unk32); - // overlay 84 void func_ov084_0216122c(); void func_ov084_021612ac(); diff --git a/include/MapObject/MapObject.hpp b/include/MapObject/MapObject.hpp index ae3ebe80..2d6bd8df 100644 --- a/include/MapObject/MapObject.hpp +++ b/include/MapObject/MapObject.hpp @@ -155,7 +155,7 @@ public: /* 38 */ u16 GetDirection() { - return (u16) (this->mAngle.angle_s + DEG_TO_ANG(45)) / DEG_TO_ANG(90); + return GET_DIRECTION(this->mAngle.angle_s); } bool IsOrientedVertically() { diff --git a/include/Render/ModelRender.hpp b/include/Render/ModelRender.hpp index e5b232fe..acab3606 100644 --- a/include/Render/ModelRender.hpp +++ b/include/Render/ModelRender.hpp @@ -16,9 +16,10 @@ class Actor; extern "C" void *func_ov000_02057750(size_t allocSize); struct ActorUnkZLSL_AnimationTag { - unk32 index; - char name[0x10]; - u32 unknown; + /* 00 */ unk32 index; + /* 04 */ char name[16]; + /* 14 */ u32 unknown; + /* 18 */ }; typedef void (*UnkSystem4_UnkCallback)(Actor *, G3d_RenderState *); @@ -172,17 +173,19 @@ public: void func_ov000_020578a4(unk32 param1, unk32 param2); }; -class UnkSystem5_Derived1 : public UnkSystem5 { +class UnkSystem5_Derived1 { public: + /* 00 */ UnkSystem5 mUnk_00; + UnkSystem5_Derived1(void *param1, G3d_Model *param2, UnkStruct_ov000_02058a84 *param3) : - UnkSystem5(param1, param2) { + mUnk_00(param1, param2) { bool value = false; if (!(param3->mUnk_08 & 2)) { value = true; } - this->func_ov000_020577a4(param3, 0, value); + this->mUnk_00.func_ov000_020577a4(param3, 0, value); } }; diff --git a/include/Unknown/UnkStruct_027e09bc.hpp b/include/Unknown/UnkStruct_027e09bc.hpp index 4e56cbd9..e245c2a1 100644 --- a/include/Unknown/UnkStruct_027e09bc.hpp +++ b/include/Unknown/UnkStruct_027e09bc.hpp @@ -57,7 +57,7 @@ public: // itcm bool func_01ffd43c(Vec2s *param1, VecFx32 *param2, unk32 param3); - bool func_01ffd640(VecFx32 *param1); + bool func_01ffd640(UnkVecFx32Struct *param1); bool func_01ffd768(void *param1, Vec2s *param2, unk8 param3); // overlay 0 diff --git a/include/Unknown/UnkStruct_027e0cd8.hpp b/include/Unknown/UnkStruct_027e0cd8.hpp index 3b182d3c..93a5a2ec 100644 --- a/include/Unknown/UnkStruct_027e0cd8.hpp +++ b/include/Unknown/UnkStruct_027e0cd8.hpp @@ -117,15 +117,20 @@ public: class UnkStruct_027e0cd8_0C_Base_148_00_Base { public: - /* 00 */ PAD(0x00, 0x14); + /* 00 (vtable) */ + /* 04 */ PAD(0x04, 0x14); /* 14 */ UnkStruct_027e0cd8_0C_Base_148_00_Base(); + + /* 00 */ virtual void vfunc_00(); + /* 04 */ virtual bool vfunc_04(); }; class UnkStruct_027e0cd8_0C_Base_148_00 : public UnkStruct_027e0cd8_0C_Base_148_00_Base { public: - /* 00 */ PAD(0x14, 0x2C); + /* 00 (base) */ + /* 14 */ VecFx32x2 mUnk_14; /* 2C */ UnkStruct_027e0cd8_0C_Base_148_00(ZMBEntryARAB *pARAB); @@ -134,7 +139,7 @@ public: class UnkStruct_027e0cd8_0C_Base_148_01 : public UnkStruct_027e0cd8_0C_Base_148_00_Base { public: - /* 00 */ PAD(0x14, 0x28); + /* 00 (base) */ PAD(0x14, 0x28); /* 28 */ UnkStruct_027e0cd8_0C_Base_148_01(ZMBEntryARAB *pARAB); @@ -143,7 +148,7 @@ public: class UnkStruct_027e0cd8_0C_Base_148_02 : public UnkStruct_027e0cd8_0C_Base_148_00_Base { public: - /* 00 */ PAD(0x14, 0x34); + /* 00 (base) */ PAD(0x14, 0x34); /* 34 */ UnkStruct_027e0cd8_0C_Base_148_02(ZMBEntryARAB *pARAB); @@ -185,8 +190,7 @@ class UnkStruct_func_ov000_02080620 { public: /* 00 (vtable) */ /* 04 */ PAD(0x04, 0x14); - /* 14 */ VecFx32 mUnk_14; - /* 20 */ VecFx32 mUnk_20; + /* 14 */ VecFx32x2 mUnk_14; /* 2C */ /* 00 */ virtual void vfunc_00(); @@ -275,7 +279,7 @@ public: bool func_ov000_020802ec(u16 param1, VecFx32 *param2); void func_ov000_020803ec(u16 param1); void func_ov000_0208053c(u16 param1); - UnkStruct_func_ov000_02080620 *func_ov000_02080620(); + UnkStruct_027e0cd8_0C_Base_148_00 *func_ov000_02080620(unk32 param1); //! TODO wrong class? weirdness with mUnk_14 bool func_ov000_02080658(unk32 param1, EntranceInfo *param2); void func_ov000_020808f4(void *param1, Vec2bCpp *param2, u8 param3); void func_ov000_020809d8(unk32 param1, unk32 param2); diff --git a/include/Unknown/UnkStruct_027e0ce0.hpp b/include/Unknown/UnkStruct_027e0ce0.hpp index b60e8419..dd8cf7f3 100644 --- a/include/Unknown/UnkStruct_027e0ce0.hpp +++ b/include/Unknown/UnkStruct_027e0ce0.hpp @@ -937,6 +937,7 @@ public: void func_ov000_0208bd30(bool param1, unk32 param2, unk32 param3, unk32 param4); bool func_ov000_0208be0c(RefStruct param1); bool func_ov000_0208be70(VecFx32 param1); + bool func_ov000_0208bee8(); bool func_ov000_0208bf34(unk32 param1); static UnkStruct_027e0ce0_34 *func_ov000_0205c904(); diff --git a/include/Unknown/UnkStruct_ov031_02114664.hpp b/include/Unknown/UnkStruct_ov031_02114664.hpp index 24cac575..2cfa2514 100644 --- a/include/Unknown/UnkStruct_ov031_02114664.hpp +++ b/include/Unknown/UnkStruct_ov031_02114664.hpp @@ -10,5 +10,5 @@ public: /* 18 */ virtual bool Init(unk32 param1) override; /* 1C */ virtual void Setup() override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; }; diff --git a/include/Unknown/UnkStruct_ov031_02114870.hpp b/include/Unknown/UnkStruct_ov031_02114870.hpp index 69e438b3..5e9d87cf 100644 --- a/include/Unknown/UnkStruct_ov031_02114870.hpp +++ b/include/Unknown/UnkStruct_ov031_02114870.hpp @@ -11,6 +11,6 @@ public: UnkStruct_ov031_02114870(); /* 18 */ virtual bool Init(unk32 param1) override; - /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; /* 54 */ virtual G3d_Model *vfunc_54(); }; diff --git a/include/Unknown/UnkStruct_ov031_Items.hpp b/include/Unknown/UnkStruct_ov031_Items.hpp index ed866dec..4d8faac0 100644 --- a/include/Unknown/UnkStruct_ov031_Items.hpp +++ b/include/Unknown/UnkStruct_ov031_Items.hpp @@ -60,7 +60,7 @@ public: // data_ov000_020b27c8 /* 08 */ virtual void vfunc_08(); /* 0C */ virtual bool vfunc_0C(Actor *param1, VecFx32 *vector); - /* 10 */ virtual void vfunc_10(Actor *actor); + /* 10 */ virtual void vfunc_10(const Actor *actor); }; class UnkStruct_ov031_Items_02 { diff --git a/include/math.hpp b/include/math.hpp index 593737c3..00814898 100644 --- a/include/math.hpp +++ b/include/math.hpp @@ -11,6 +11,9 @@ #define UNK_FX_OPERATION_2(a) MUL_FX32_U((u64) (a), FX_F32_TO_FX32(1.2f)) #define DEG_TO_ANG(n) ((n) * 0x10000 / 360) #define DEG_TO_ANG_ALT(n) DEG_TO_ANG((u64) (n)) +#define GET_DIRECTION(angle) ((u16) ((s16) angle + DEG_TO_ANG(45)) / DEG_TO_ANG(90)) +#define MUL_FXUNK(a, b) (fx32)((((s16) (a)) * ((s16) (b)) + 0x800) >> FX32_SHIFT) +#define MUL_FXUNK2(a, b) (fx32)((((s32) (a)) * ((s32) (b)) + 0x800) >> FX32_SHIFT) #define ABS(x) ((x) < 0 ? -(x) : (x)) #define ABS2(x) ((x) >= 0 ? (x) : -(x)) @@ -37,6 +40,16 @@ static inline void ClampValue16(s16 *value, const s32 min, const s32 max) { } } +struct VecFx32x2 { + /* 00 */ VecFx32 unk_00; + /* 0C */ VecFx32 unk_0C; +}; + +struct UnkVecFx32Struct { + /* 00 */ VecFx32 unk_00; + /* 0C */ fx32 unk_0C; +}; + // C++ wrapper for VecFx32 struct VecFx32Cpp { VecFx32 vec; diff --git a/libs/nitro/include/nitro/reg.h b/libs/nitro/include/nitro/reg.h index 4aba25a3..fb9ddf56 100644 --- a/libs/nitro/include/nitro/reg.h +++ b/libs/nitro/include/nitro/reg.h @@ -112,6 +112,7 @@ typedef struct DivParam { #define REG_GFX_FIFO_TEXTURE_PARAM (*(vu32 *) (REG_BASE | 0x4A8)) #define REG_GFX_FIFO_TEXTURE_PALETTE (*(vu32 *) (REG_BASE | 0x4AC)) #define REG_GFX_FIFO_DIFFUSE_AMBIENT_REFLECT (*(vu32 *) (REG_BASE | 0x4C0)) +#define REG_GFX_FIFO_SPECULAR_REF_AND_EMISSION (*(vu32 *) (REG_BASE | 0x4C4)) #define REG_GFX_FIFO_POLYGONS_BEGIN (*(vu32 *) (REG_BASE | 0x500)) #define REG_GFX_FIFO_POLYGONS_END (*(vu32 *) (REG_BASE | 0x504)) #define REG_GFX_FIFO_SWAP_BUFFERS (*(vu32 *) (REG_BASE | 0x540)) diff --git a/src/000_Second/Actor/Actor.cpp b/src/000_Second/Actor/Actor.cpp index 6e83b7f1..07ed5348 100644 --- a/src/000_Second/Actor/Actor.cpp +++ b/src/000_Second/Actor/Actor.cpp @@ -55,7 +55,7 @@ void Actor::vfunc_24() {} void Actor::vfunc_28(Actor_vfunc_30 *param1) {} -void Actor::vfunc_2C(Actor_vfunc_30 *param1) {} +void Actor::vfunc_2C(unk32 param1) {} void Actor::vfunc_30(Actor_vfunc_30 *param1) {} diff --git a/src/000_Second/Actor/Actor_Derived1.cpp b/src/000_Second/Actor/Actor_Derived1.cpp index 85f44972..4a81aa98 100644 --- a/src/000_Second/Actor/Actor_Derived1.cpp +++ b/src/000_Second/Actor/Actor_Derived1.cpp @@ -238,7 +238,7 @@ void Actor_Derived1::vfunc_24() { } // non-matching -void Actor_Derived1::vfunc_2C(Actor_vfunc_30 *param1) { +void Actor_Derived1::vfunc_2C(unk32 param1) { if (this->func_01fff5d0(param1, 0) == 0) { return; } diff --git a/src/017_CourseExec/Actor/ActorManager_017.cpp b/src/017_CourseExec/Actor/ActorManager_017.cpp index 49807ea1..2bde3155 100644 --- a/src/017_CourseExec/Actor/ActorManager_017.cpp +++ b/src/017_CourseExec/Actor/ActorManager_017.cpp @@ -68,7 +68,7 @@ void ActorManager::func_ov017_020bee64(Actor *pActor, Actor_vfunc_30 *param2) { void ActorManager::func_ov017_020bee84(Actor *pActor, Actor_vfunc_30 *param2) { if (pActor->IsVisible()) { - pActor->vfunc_2C(param2); + pActor->vfunc_2C((unk32) param2); //! TODO: solve this oddity } } @@ -81,7 +81,7 @@ void ActorManager::func_ov017_020beea4(Actor *pActor, Actor_vfunc_30 *param2) { return; } - pActor->vfunc_2C(param2); + pActor->vfunc_2C((unk32) param2); //! TODO: solve this oddity } void ActorManager::func_ov017_020beecc(Actor *pActor, Actor_vfunc_30 *param2) { diff --git a/src/017_CourseExec/UnkStackStruct_ov017_020c1104_017.cpp b/src/017_CourseExec/UnkStackStruct_ov017_020c1104_017.cpp index a5e2d024..dcbc3d59 100644 --- a/src/017_CourseExec/UnkStackStruct_ov017_020c1104_017.cpp +++ b/src/017_CourseExec/UnkStackStruct_ov017_020c1104_017.cpp @@ -75,8 +75,6 @@ void UnkStackStruct_ov017_020c1104::func_ov017_020c12fc(u8 param2, unk16 param3) G3_PopMtx(1); } -#define MUL_FXUNK(a, b) (fx32)((((s16) (a)) * ((s16) (b)) + 0x800) >> FX32_SHIFT) - // https://decomp.me/scratch/bsO9Z void UnkStackStruct_ov017_020c1104::func_ov017_020c13b4() { s16 temp_r1; diff --git a/src/031_Land/Actor/ActorBomb.cpp b/src/031_Land/Actor/ActorBomb.cpp index eed3231f..4acc9fd7 100644 --- a/src/031_Land/Actor/ActorBomb.cpp +++ b/src/031_Land/Actor/ActorBomb.cpp @@ -508,7 +508,7 @@ void ActorBomb::func_ov031_020e2134() { } } -void ActorBomb::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorBomb::vfunc_2C(unk32 param1) { if (!this->Actor::func_01fff5d0(param1, 0x0)) { for (ActorBomb_unk *ptr = this->mUnk_164; ptr != this->mUnk_164 + ARRAY_LEN(this->mUnk_164); ptr++) { ptr->func_ov000_020a0334(); @@ -1076,11 +1076,15 @@ bool ActorBomb_ov031_020e2134::vfunc_08(const UnkStruct_ov031_020f3310 *param1, ActorBomb_19C::ActorBomb_19C(Actor *param1) : mUnk_2C(param1) {} -void ActorBomb_19C::vfunc_10(Actor *actor) { +void ActorBomb_19C::vfunc_10(const Actor *actor) { +#pragma unused(actor) + Actor *bomb = this->mUnk_2C; + if (!GET_FLAG(bomb->mFlags, ActorFlag_Alive)) { return; } + ActorBlast::func_ov031_020e3b9c(bomb, 0x0, 0x0); this->mUnk_2C->func_ov000_020984d0(); } diff --git a/src/031_Land/Actor/ActorHeart.cpp b/src/031_Land/Actor/ActorHeart.cpp index 04d9537a..caae5e92 100644 --- a/src/031_Land/Actor/ActorHeart.cpp +++ b/src/031_Land/Actor/ActorHeart.cpp @@ -5,23 +5,9 @@ #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" #include "nitro/fx.h" +#include "nitro/math.h" -typedef struct UnkStruct_ov031_020eeee8 { - unk16 mUnk_00; - unk16 mUnk_02; - unk16 mUnk_04; - unk16 mUnk_06; - unk16 mUnk_08; - PAD(0x0A, 0x14); - unk16 mUnk_14; - PAD(0x16, 0x18); - unk16 mUnk_18; - PAD(0x1A, 0x1C); - unk16 mUnk_1C; - PAD(0x1E, 0x28); - unk16 mUnk_28; - PAD(0x2A, 0x3C); -} UnkStruct_ov031_020eeee8; +extern unk32 data_ov000_020aecf8; const Cylinder data_ov031_02113d64(0x800); @@ -54,8 +40,7 @@ void ActorHeart::func_ov031_020eed64(RefStruct *pOutRef, const VecFx32 *pPos, u3 void ActorHeart::func_ov031_020f0750() {} ActorHeart::ActorHeart() : - mUnk_94(0), - mUnk_96(6), + mUnk_94(0, 6), mUnk_B8(0), mUnk_BA(gRandom.Next32(0) & 0x80000000 ? 0x666 : ~0x665), mUnk_BC(0), @@ -79,6 +64,7 @@ ActorHeart::ActorHeart() : } bool ActorHeart::Init(unk32 param1) { +#pragma unused(param1) this->func_ov031_020ef4a8(); return true; } @@ -92,104 +78,103 @@ static PTMF data_ov031_02113d74[ActorHeartState_Max] = { &ActorHeart::func_ov031_020ef458, // ActorHeartState_5 }; -// non-matching void ActorHeart::Update() { - UnkStruct_ov031_020eeee8 stack; + Cylinder sp2C; + struct { + Cylinder unk_00; + fx32 unk_10; + } sp18; + Cylinder sp8; + VecFx16 sp2; + unk16 sp0; - stack.mUnk_02 = 0; - stack.mUnk_04 = 0x666; - stack.mUnk_06 = 0xFB33; + sp2.x = 0; + sp2.y = 0x666; + sp2.z = -0x4CD; - func_01fff17c(&stack.mUnk_00, data_027e0ce0, 0); - func_02018114(&stack.mUnk_02, stack.mUnk_00); + unk16 *psp0 = (unk16 *) &sp0; + func_01fff17c(psp0, data_027e0ce0, 0); + func_02018114(&sp2.x, *psp0); - this->mUnk_C8.mUnk_08 = stack.mUnk_02; // d0 - this->mUnk_C8.mUnk_0A = stack.mUnk_04; // d2 - this->mUnk_C8.mUnk_0C = stack.mUnk_06; // d4 - stack.mUnk_02 = 0; - stack.mUnk_04 = 0x666; - stack.mUnk_06 = 0; - this->mUnk_C8.mUnk_0E = 0; + this->mUnk_C8.mUnk_08.x = sp2.x; + this->mUnk_C8.mUnk_08.y = sp2.y; + this->mUnk_C8.mUnk_08.z = sp2.z; - this->mUnk_C8.mUnk_10 = stack.mUnk_04; // d8 - stack.mUnk_06 = stack.mUnk_04; - this->mUnk_C8.mUnk_12 = stack.mUnk_06; // da - this->mUnk_3C = &this->mUnk_98; + sp2.x = 0; + sp2.y = 0x666; + sp2.z = 0; + + this->mUnk_C8.mUnk_0E.x = sp2.x; + this->mUnk_C8.mUnk_0E.y = sp2.y; + this->mUnk_C8.mUnk_0E.z = sp2.z; + + this->mUnk_3C = &this->mUnk_98; CALL_PTMF(PTMF, data_ov031_02113d74[this->mState]); - bool t = true; - if (this->mUnk_94 < this->mUnk_96) { - this->mUnk_94 = this->mUnk_96; - this->mUnk_94++; - t = false; - } else { - t = true; - } - if (t) { + if (this->mUnk_94.HasExpired()) { this->func_ov000_020989e0(); if (this->mState == ActorHeartState_1) { - func_ov000_0208bc00(data_027e0ce0, 0, &stack.mUnk_08); + func_ov000_0208bc00(data_027e0ce0, 0, &sp8); + func_01ffce1c(&sp18.unk_00, &sp8); + sp18.unk_00.pos.y -= sp8.size; + sp18.unk_10 += sp8.size * 3; + this->vfunc_10(&sp2C); - func_01ffce1c((Cylinder *) &stack.mUnk_18, (Cylinder *) &stack.mUnk_08); - - stack.mUnk_28 += stack.mUnk_14 + (stack.mUnk_14 << 1); - stack.mUnk_1C -= stack.mUnk_14; - - func_01ffcea0(0, &stack); - - while (1) { - // should be lower + if (func_01ffcea0(&sp18.unk_00, &sp2C) != 0) { this->func_ov031_020ef528(); + goto skip; + } else if (data_027e0ce0->func_01fff1a4() != 0) { + func_ov000_0208bc00(data_027e0ce0, 1, &sp8); + func_01ffce1c(&sp18.unk_00, &sp8); + sp18.unk_00.pos.y -= sp8.size; + sp18.unk_10 += sp8.size * 3; - if (data_027e0ce0->func_01fff1a4()) { - func_ov000_0208bc00(data_027e0ce0, 0, &stack.mUnk_08); - - func_01ffce1c(0, 0); - - stack.mUnk_1C += stack.mUnk_14 + stack.mUnk_1C; - stack.mUnk_28 = stack.mUnk_14 + (stack.mUnk_14 << 1) + stack.mUnk_28; - if (func_01ffcea0(0, &stack) != 0x0) { - break; - } + if (func_01ffcea0(&sp18.unk_00, &sp2C) != 0) { + this->func_ov031_020ef528(); + goto skip; } } } - if (!(this->mUnk_98.mUnk_08 & 0x3FFFF)) { - unk16 var = this->mUnk_98.mUnk_1C; - if (var != 0x8 && var == 0xC) { - this->mUnk_C0 = this->mUnk_98.mUnk_0C; - this->mUnk_98.mUnk_04 &= ~0x1000; + if (this->mUnk_98.mUnk_08 & 0x3FFFF) { + switch (this->mUnk_98.mUnk_1C) { + case 8: + case 16: + if (this->mUnk_98.mUnk_0C.acRef.type_index & 0x100) { + this->func_ov031_020ef528(); + } + break; + case 12: + this->mUnk_C0 = this->mUnk_98.mUnk_0C; + this->mUnk_98.mUnk_04 &= ~0x1000; + this->SetState(ActorHeartState_3); + break; } } } +skip: if (this->mUnk_5C.mUnk_24 < 0) { this->func_ov031_020ef208(); } - this->mPrevPos.x = this->mPos.x; - this->mPrevPos.y = this->mPos.y; - this->mPrevPos.z = this->mPos.z; - + VecFx32_Copy(&this->mPos, &this->mPrevPos); VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); + if (this->mState != ActorHeartState_3) { this->func_ov000_02098910(0, 0x10); } - if (this->mUnk_46 & 0x3) { + + if (this->mUnk_46 & 0x03) { this->mVel.y = FX_F32_TO_FX32(0.0); } VecFx32_Add(&this->mPos, &this->mUnk_EC, &this->mPos); - this->mUnk_EC.x = FX_F32_TO_FX32(0.0); - this->mUnk_EC.y = FX_F32_TO_FX32(0.0); - this->mUnk_EC.z = FX_F32_TO_FX32(0.0); + VecFx32_Reset(&this->mUnk_EC); } -extern unk32 data_ov000_020aecf8; - static PTMF data_ov031_02113da4[ActorHeartState_Max] = { &ActorHeart::func_ov031_020ef2ec, // ActorHeartState_0 &ActorHeart::func_ov031_020ef320, // ActorHeartState_1 @@ -356,6 +341,12 @@ void ActorHeart::func_ov031_020ef4a8() { } void ActorHeart::func_ov031_020ef528() { +#if IS_JP || IS_EUR1 + if (data_027e0ce0->func_ov000_0208bee8()) { + return; + } +#endif + data_027e0ce0->func_ov000_0208bc9c(4, 1); data_027e09a8->func_ov000_02071b30(0x76, &this->mPos, 0); this->func_ov000_020984d0(); @@ -374,7 +365,7 @@ void ActorHeart::func_ov031_020ef570() { } } -void ActorHeart::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorHeart::vfunc_2C(unk32 param1) { VecFx32 iStack_20; VecFx32 iStack_2c; unk32 auStack_30; diff --git a/src/031_Land/Actor/ActorItemBoomerang.cpp b/src/031_Land/Actor/ActorItemBoomerang.cpp index d242f210..38f96ea6 100644 --- a/src/031_Land/Actor/ActorItemBoomerang.cpp +++ b/src/031_Land/Actor/ActorItemBoomerang.cpp @@ -346,18 +346,18 @@ void ActorItemBoomerang::func_ov031_020e52a0() { } // non-matching -void ActorItemBoomerang::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorItemBoomerang::vfunc_2C(unk32 param1) { if (Actor::func_01fff5d0(param1, 0x0)) { this->mUnk_94.func_01ffc6d4(this->mAngle, &this->mPos); data_027e09b4->func_ov017_020c08c4(&this->mPos, 0x400, 0x400, 0x1F, 0x0, 0x1); } } -void ActorItemBoomerang_A0::vfunc_10(Actor *actor) { +void ActorItemBoomerang_A0::vfunc_10(const Actor *actor) { data_027e0d2c->func_ov031_020d95c8(actor->mRef); } -void ActorItemBoomerang_CC::vfunc_10(Actor *actor) { +void ActorItemBoomerang_CC::vfunc_10(const Actor *actor) { data_027e0d2c->func_ov031_020d95c8(actor->mRef); } diff --git a/src/031_Land/Actor/ActorItemDrop.cpp b/src/031_Land/Actor/ActorItemDrop.cpp index aedfcee2..072ba32f 100644 --- a/src/031_Land/Actor/ActorItemDrop.cpp +++ b/src/031_Land/Actor/ActorItemDrop.cpp @@ -461,7 +461,7 @@ void ActorItemDrop::func_ov031_020fa72c() { } } -void ActorItemDrop::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorItemDrop::vfunc_2C(unk32 param1) { VecFx32 vec1; VecFx32 vec2; unk32 value; diff --git a/src/031_Land/Actor/ActorItemFlower.cpp b/src/031_Land/Actor/ActorItemFlower.cpp index 0d3631e6..1d27c191 100644 --- a/src/031_Land/Actor/ActorItemFlower.cpp +++ b/src/031_Land/Actor/ActorItemFlower.cpp @@ -60,7 +60,7 @@ void ActorItemFlower::Update() { CALL_PTMF(PTMF, data_ov031_021141b4[this->mState]); } -void ActorItemFlower::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorItemFlower::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorItemTornado.cpp b/src/031_Land/Actor/ActorItemTornado.cpp index f52f3f52..0fe3c46e 100644 --- a/src/031_Land/Actor/ActorItemTornado.cpp +++ b/src/031_Land/Actor/ActorItemTornado.cpp @@ -284,9 +284,7 @@ void ActorItemTornado::vfunc_24() { this->func_ov031_020e5d18(0x1); } -#define MUL_FXUNK2(a, b) (fx32)((((s32) (a)) * ((s32) (b)) + 0x800) >> FX32_SHIFT) - -void ActorItemTornado::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorItemTornado::vfunc_2C(unk32 param1) { if (this->mUnk_1DC <= 0x0) { return; } diff --git a/src/031_Land/Actor/ActorPot.cpp b/src/031_Land/Actor/ActorPot.cpp index 869d0cae..1b9a4927 100644 --- a/src/031_Land/Actor/ActorPot.cpp +++ b/src/031_Land/Actor/ActorPot.cpp @@ -63,10 +63,11 @@ void ActorPot::Update() { CALL_PTMF(PTMF, data_ov031_021140a0[this->mState]); } -void ActorPot::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorPot::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } + this->mUnk_110.vfunc_18(&this->mPos); } diff --git a/src/031_Land/Actor/ActorRollingStone.cpp b/src/031_Land/Actor/ActorRollingStone.cpp index bd8e316a..f6126e6b 100644 --- a/src/031_Land/Actor/ActorRollingStone.cpp +++ b/src/031_Land/Actor/ActorRollingStone.cpp @@ -80,12 +80,11 @@ bool ActorRollingStone_104::vfunc_10(RefStruct param1, unk32 param2) { return this->UnkStruct_027e0ce0_38_Base::vfunc_10(param1, param2); } -void ActorRollingStone_D4::vfunc_10(Actor *param1) { - if (param1->GetActorId() != ActorId_RollingStone) { - return; +void ActorRollingStone_D4::vfunc_10(const Actor *actor) { + if (((Actor *) actor)->GetActorId() == ActorId_RollingStone) { + this->mUnk_2C->SetState(ActorRollingStoneState_6); + ((ActorRollingStone *) actor)->SetState(ActorRollingStoneState_6); } - this->mUnk_2C->SetState(ActorRollingStoneState_6); - ((ActorRollingStone *) param1)->SetState(ActorRollingStoneState_6); } // non-matching @@ -183,7 +182,7 @@ void ActorRollingStone::func_ov031_020f8880() { this->func_ov000_020984d0(); } -void ActorRollingStone::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorRollingStone::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0x0) || !this->mUnk_158) { return; } @@ -251,7 +250,7 @@ void ActorRollingStone::func_ov031_020f8a58() { void ActorRollingStone::func_ov031_020f8b58() { this->mUnk_2C = 0x0; - switch (((u32) (this->mUnk_5C.mInitialAngle + 0x2000) << 0x10) >> 0x1E) { + switch (this->GetInitialDirection()) { case 0x1: this->mVel.y = FX_F32_TO_FX32(0.0f); this->mVel.x = FX_F32_TO_FX32(0.105f); @@ -404,8 +403,8 @@ void ActorRollingStone::func_ov031_020f8f30() { void ActorRollingStone::func_ov031_020f9018() { this->mUnk_2C = 0x0; - fx32 angle = ((u32) (this->mAngle.angle_s + DEG_TO_ANG(45)) << 0x10) >> 0x1E; - if (angle == 0x1 || angle == 0x3) { + int direction = this->GetDirection(); + if (direction == 0x1 || direction == 0x3) { this->mVel.y = FX_F32_TO_FX32(0.0f); this->mVel.z = FX_F32_TO_FX32(0.0f); } else { @@ -418,8 +417,8 @@ void ActorRollingStone::func_ov031_020f9050() { this->mUnk_3C = &this->mUnk_AC; this->func_ov031_020f8de8(); - fx32 angle = ((u32) (this->mAngle.angle_s + DEG_TO_ANG(45)) << 0x10) >> 0x1E; - if (angle == 0x1 || angle == 0x3) { + int direction = this->GetDirection(); + if (direction == 0x1 || direction == 0x3) { this->mVel.y = FX_F32_TO_FX32(0.0f); this->mVel.z = FX_F32_TO_FX32(0.0f); func_01ff916c(&this->mVel.x, 0x0, 0x10); @@ -438,8 +437,8 @@ void ActorRollingStone::func_ov031_020f9050() { data_027e09c0->func_ov000_0207de98(this->mRef, &unk, this->mUnk_38); - angle = ((u32) (this->mAngle.angle_s + DEG_TO_ANG(45)) << 0x10) >> 0x1E; - if (angle == 0x1 || angle == 0x3) { + direction = this->GetDirection(); + if (direction == 0x1 || direction == 0x3) { if (this->mVel.x != FX_F32_TO_FX32(0.0f)) { return; } @@ -528,10 +527,9 @@ void ActorRollingStone::func_ov031_020f92cc() { // non-matching void ActorRollingStone::func_ov031_020f9340() { - fx32 angle = ((u32) (this->mUnk_5C.mInitialAngle + DEG_TO_ANG(45)) << 0x10) >> 0x1E; this->mUnk_2C = data_ov000_020aecf8; - switch (angle) { + switch (this->GetInitialDirection()) { case 0x1: this->mVel.x = FX_F32_TO_FX32(0.105f); this->mVel.y = FX_F32_TO_FX32(0.0f); diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index 9d363df1..1cf5da8a 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -563,16 +563,17 @@ void ActorRupee::Update() { func_01fff17c(&sStack_1c, data_027e0ce0, 0); func_02018114(&uStack_1a, sStack_1c); - this->mUnk_C4.mUnk_08 = uStack_1a; - this->mUnk_C4.mUnk_0A = uStack_18; - this->mUnk_C4.mUnk_0C = uStack_16; + this->mUnk_C4.mUnk_08.x = uStack_1a; + this->mUnk_C4.mUnk_08.y = uStack_18; + this->mUnk_C4.mUnk_08.z = uStack_16; - uStack_1a = 0; - uStack_18 = 0x666; - uStack_16 = 0; - this->mUnk_C4.mUnk_0E = 0; - this->mUnk_C4.mUnk_10 = 0x666; - sVar1 = this->mState; + uStack_1a = 0; + uStack_18 = 0x666; + uStack_16 = 0; + this->mUnk_C4.mUnk_0E.x = 0; + this->mUnk_C4.mUnk_0E.y = 0x666; + this->mUnk_C4.mUnk_0E.z = 0; + sVar1 = this->mState; test = this->mPos; @@ -580,8 +581,6 @@ void ActorRupee::Update() { iVar4 = (int) (short) this->mState; } - this->mUnk_C4.mUnk_12 = 0; - this->mPrevPos = test; uVar3 = uVar2; @@ -672,7 +671,7 @@ extern unk32 data_ov031_02110aa0[]; extern unk32 data_ov031_02113468[]; // non-matching -void ActorRupee::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorRupee::vfunc_2C(unk32 param1) { VecFx32 iStack_18; VecFx32 iStack_28; unk32 auStack_30[4]; diff --git a/src/031_Land/Actor/ActorShotArrow.cpp b/src/031_Land/Actor/ActorShotArrow.cpp index 67253cdd..fa150bed 100644 --- a/src/031_Land/Actor/ActorShotArrow.cpp +++ b/src/031_Land/Actor/ActorShotArrow.cpp @@ -5,7 +5,10 @@ #include "Actor/ActorUnkGYAM.hpp" #include "Actor/ActorUnkIWTS.hpp" #include "Actor/ActorUnkMRD2.hpp" +#include "Map/MapObjectId.hpp" +#include "MapObject/MapObjectManager.hpp" #include "Physics/Cylinder.hpp" +#include "RefStruct.hpp" #include "System/OverlayManager.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" @@ -16,79 +19,36 @@ #include "Unknown/UnkStruct_027e0ce0.hpp" #include "Unknown/UnkStruct_027e0cec.hpp" #include "Unknown/UnkStruct_027e0d30.hpp" +#include "global.h" +#include "math.hpp" #include "nitro/fx.h" +#include "nitro/gx.h" +#include "nitro/math.h" +#include -typedef struct UnkResourceStruct2 { - /* 00 */ unk32 mUnk_00; - /* 04 */ unk32 mUnk_04; - /* 08 */ unk32 mUnk_08; - /* 0C */ -} UnkResourceStruct2; +static const struct { + u8 unk_00; + u8 unk_01[7]; +} data_ov031_02110b00 = {0x04, {0x08, 0x02, 0x02, 0x0C, 0x04, 0x02, 0x00}}; -typedef struct { - /* 00 */ VecFx32 mUnk_00; - /* 0C */ Cylinder mUnk_0C; - /* 1C */ VecFx32 mUnk_1C; - /* 28 */ VecFx32 mUnk_28; - /* 34 */ -} UnkStruct_020f374c; - -typedef struct { - /* 00 */ PAD(0x00, 0x04); - /* 04 */ RefStruct mUnk_04; - /* 08 */ unk32 mUnk_08; - /* 0C */ MtxFx43 *mUnk_0C; - /* 10 */ VecFx32 mUnk_10; - /* 1C */ VecFx32 mUnk_1C; - /* 28 */ -} UnkStruct_020f38b0; - -typedef struct { - /* 00 */ PAD(0x00, 0x04); - /* 04 */ Cylinder mUnk_04; - /* 14 */ VecFx32 mUnk_14; - /* 20 */ -} UnkStruct_020f3c38; - -typedef struct { - /* 000 */ PAD(0x0, 0x25B); - /* 25B */ bool mUnk_25B; - /* 25C */ -} UnkStruct_ov060_02163ff4; - -typedef struct { - /* 0C */ MtxFx33 mUnk_0C; - /* 30 */ MtxFx33 mUnk_30; - /* 54 */ VecFx32 mUnk_54; - /* 60 */ MtxFx33 mUnk_60; - /* 84 */ MtxFx43 mUnk_84; - /* B4 */ MtxFx43 mUnk_B4; - /* E4 */ VecFx32 mUnk_E4; - /* F0 */ fx32 mUnk_F0; -} UnkStack_ov031_020f2310; - -struct UnkStruct_020f1b04 { - /* 0C */ Actor *mUnk_0C; - /* 10 */ PAD(0x10, 0x24); - /* 24 */ -}; - -extern u8 data_ov031_02110b01[]; // = {0x08, 0x02, 0x02, 0x0C, 0x04, 0x00}; +//! TODO: annoying to match extern char data_ov031_02110b3c[0x10]; // = "arrow"; extern char data_ov031_02110b4c[0x10]; // = "arrow_s"; - extern char data_ov031_02110b5c[0x14]; // = "ef_arrowB"; extern char data_ov031_02110b08[0x34]; // = "ef_arrowB"; extern MtxFx43 data_027e0964; extern ActorUnkIWTS *data_027e0d80; -extern bool data_ov060_02163fe0; -extern UnkStruct_ov060_02163ff4 data_ov060_02163ff4; -extern ActorUnkMRD2 *data_ov075_02163518; +extern bool data_ov073_02163fe0; -MapObjectProfile_Derived2_20_Base *func_ov031_020f1404() { - return data_027e0ce0->mUnk_1C->mUnk_08[PlayerCharacter_Link][1]; -} +struct UnkStruct_ov073_02163ff4 { + /* 000 */ PAD(0x0, 0x25B); + /* 25B */ bool mUnk_25B; + /* 25C */ +}; +extern UnkStruct_ov073_02163ff4 data_ov073_02163ff4; + +extern ActorUnkMRD2 *data_ov075_02163518; DECL_PROFILE(ActorProfileShotArrow); @@ -101,6 +61,10 @@ ActorProfileShotArrow::ActorProfileShotArrow() : this->mUnk_04.Init(FX_F32_TO_FX32(0.2f)); } +MapObjectProfile_Derived2_20_Base *func_ov031_020f1404() { + return data_027e0ce0->mUnk_1C->mUnk_08[PlayerCharacter_Link][1]; +} + ActorShotArrow::ActorShotArrow() : mUnk_94(true), mUnk_A0(GetModelFromProfile3(func_ov031_020f1404(), data_ov031_02110b5c)), @@ -135,7 +99,7 @@ ActorShotArrow::ActorShotArrow() : this->func_ov031_020f2794(0); } - if (gOverlayManager.IsPirateHideout() && data_ov060_02163fe0) { + if (gOverlayManager.IsPirateHideout() && data_ov073_02163fe0) { this->mUnk_25C = true; } } @@ -150,6 +114,8 @@ ActorShotArrow::~ActorShotArrow() { } bool ActorShotArrow::Init(unk32 param1) { +#pragma unused(param1) + fx32 sin_value = SIN((u16) this->mAngle.angle_s); fx32 cos_value = COS((u16) this->mAngle.angle_s); @@ -206,7 +172,7 @@ void ActorShotArrow::vfunc_24() { this->mUnk_25E = 0x1F; } } - this->mUnk_100.func_01ffc3b4(); + this->mUnk_100.mUnk_00.func_01ffc3b4(); } if (func_ov000_0205aeac() != 0) { bool paramIs3Or4 = this->mUnk_5C.mParams[1] == 0x3 || this->mUnk_5C.mParams[1] == 0x4; @@ -245,7 +211,7 @@ void ActorShotArrow::Update() { this->mUnk_25E = 0x1F; } - this->mUnk_100.func_01ffc3b4(); + this->mUnk_100.mUnk_00.func_01ffc3b4(); } if (func_ov000_0205aeac()) { @@ -284,10 +250,7 @@ void ActorShotArrow::func_ov031_020f1a64() { this->mVel.y = FX_F32_TO_FX32(0.0f); } -// non-matching void ActorShotArrow::func_ov031_020f1b04() { - UnkStruct_020f1b04 stack; - if (this->mTimer.HasExpired()) { this->SetState(ActorShotArrowState_6); return; @@ -306,11 +269,12 @@ void ActorShotArrow::func_ov031_020f1b04() { } if (!this->func_ov017_020beeec(0x0)) { - stack.mUnk_0C = NULL; - VecFx32 *mPos = &this->mPos; - func_01ffe6c4(&stack.mUnk_0C, this->mRef, mPos, &this->mPrevPos, (s16) this->mUnk_44, mPos, 0); + UnkStruct_ov031_020e5d18_00 spC; + spC.mUnk_00 = NULL; - if (this->func_ov000_0207e294(this->mUnk_30)) { + func_01ffe6c4(&spC.mUnk_00, this->mRef, &this->mPos, &this->mPrevPos, (s16) this->mUnk_44, &this->mPos, 0); + + if (((Actor *) &spC)->func_ov000_0207e294(this->mUnk_30)) { this->Kill(); } @@ -332,7 +296,6 @@ void ActorShotArrow::func_ov031_020f1c24() { this->mUnk_16C = 0; } -// non-matching void ActorShotArrow::func_ov031_020f1c7c() { if (this->func_ov031_020f3210(0x1)) { this->Kill(); @@ -346,9 +309,10 @@ void ActorShotArrow::func_ov031_020f1c7c() { s16 delta = this->mUnk_1C8.mUnk_00->mAngle.angle_s - this->mUnk_1C8.mUnk_10; VecFx32 vec_fx32 = this->mUnk_1C8.mUnk_04; func_01ff9638(&vec_fx32, delta); - VecFx32_Add(&this->mPos, &vec_fx32, &this->mPos); - this->mAngle = this->mUnk_1C8.mUnk_00->mAngle.angle_s + (s16) (this->mUnk_1C8.mUnk_12 - this->mUnk_1C8.mUnk_10); + + s16 diff = this->mUnk_1C8.mUnk_12 - this->mUnk_1C8.mUnk_10; + this->mAngle = diff + this->mUnk_1C8.mUnk_00->mAngle.angle_s; } else { this->func_ov031_020f2c08(0x400); } @@ -429,7 +393,7 @@ void ActorShotArrow::func_ov031_020f1f54() { } if (this->mUnk_25C && !this->mUnk_25D) { - data_ov060_02163ff4.mUnk_25B = true; + data_ov073_02163ff4.mUnk_25B = true; } } @@ -452,7 +416,7 @@ void ActorShotArrow::func_ov031_020f206c() { this->mUnk_168 = 0; if (this->mUnk_25C && !this->mUnk_25D) { - data_ov060_02163ff4.mUnk_25B = true; + data_ov073_02163ff4.mUnk_25B = true; } } @@ -495,7 +459,7 @@ void ActorShotArrow::func_ov031_020f21dc() { this->mUnk_16C = 0; if (this->mUnk_25C && !this->mUnk_25D) { - data_ov060_02163ff4.mUnk_25B = true; + data_ov073_02163ff4.mUnk_25B = true; } } @@ -529,79 +493,130 @@ void ActorShotArrow::func_ov031_020f22d4(MtxFx33 *param1, VecFx32 *param2) { this->mUnk_A0.vfunc_14(param1, param2); } -// non-matching -void ActorShotArrow::vfunc_2C(Actor_vfunc_30 *param1) { - UnkStack_ov031_020f2310 stack; +void ActorShotArrow::vfunc_2C(unk32 param1) { + UnkVecFx32Struct spE4; + MtxFx43 spB4; + MtxFx43 sp84; + MtxFx33 sp60; + VecFx32 sp54; + MtxFx33 sp30; + MtxFx33 spC; - VecFx32_Copy(&this->mPos, &stack.mUnk_E4); - stack.mUnk_F0 = 0x2000; + spE4.unk_00.x = this->mPos.x; + spE4.unk_00.y = this->mPos.y; + spE4.unk_00.z = this->mPos.z; + spE4.unk_0C = 0x2000; - if (!data_027e09bc->mUnk_04[0]->func_01ffd640(&stack.mUnk_E4)) { + if (!data_027e09bc->mUnk_04[param1]->func_01ffd640(&spE4)) { return; } - u8 var4 = 0x1F; - u8 var5 = 0x1F; + u16 var_r4 = 0x1F; + u16 var_r5 = 0x1F; - if (this->mUnk_170 < (s16) 0x10) { - var4 = FX_F32_TO_FX32(this->mUnk_170); + if ((s32) this->mUnk_170 < 0x10) { + var_r4 = (this->mUnk_170 * 32) / 16; } - if (this->mUnk_172 < (s16) 0x10) { - var5 = FX_F32_TO_FX32(this->mUnk_170); + if ((s32) this->mUnk_172 < 0x10) { + var_r5 = (this->mUnk_172 * 32) / 16; } - if (var4 == 0) { + if (var_r4 == 0) { return; } - func_0200eab0(this->mUnk_94.mpModel, 0x0, var4); + func_0200eab0(this->mUnk_94.mpModel, 0, var_r4); - if (this->mState == ActorShotArrowState_2 && this->mUnk_224 != NULL) { - MtxFx43_InitXRotation(&stack.mUnk_84, SIN((u16) this->mUnk_174), COS((u16) this->mUnk_174)); - - func_01ffad5c(this->mUnk_224, &data_027e0964, &stack.mUnk_B4); - func_01ffad5c(&stack.mUnk_84, &this->mUnk_228, &stack.mUnk_84); - func_01ffad5c(&stack.mUnk_84, &stack.mUnk_B4, &stack.mUnk_B4); - - CopySingle288(&stack.mUnk_B4, &stack.mUnk_60); + if (this->mState == 2 && this->mUnk_224 != NULL) { + MtxFx43_InitXRotation(&sp84, SIN((u16) this->mUnk_174), COS((u16) this->mUnk_174)); + func_01ffad5c(this->mUnk_224, &data_027e0964, &spB4); + func_01ffad5c(&sp84, &this->mUnk_228, &sp84); + func_01ffad5c(&sp84, &spB4, &spB4); + CopySingle288(&spB4, &sp60); VecFx32_Copy(&this->mPos, &this->mPrevPos); - VecFx32_Copy((VecFx32 *) &stack.mUnk_B4._30, &this->mPos); - this->mUnk_94.vfunc_14(&stack.mUnk_60, &this->mPos); + VecFx32 temp; + temp.x = spB4._30; + temp.z = spB4._32; + temp.y = spB4._31; + VecFx32_Copy(&temp, &this->mPos); - if (var5 >= 0x1F) { - this->func_ov031_020f2654(&stack.mUnk_60); + this->mUnk_94.vfunc_14(&sp60, &this->mPos); + + if ((s32) var_r5 >= 0x1F) { + this->func_ov031_020f2654(&sp60); } } else { - VecFx32_Copy(&this->mPos, (VecFx32 *) &stack.mUnk_30._20); + sp54.x = this->mPos.x; + sp54.y = this->mPos.y; + sp54.z = this->mPos.z; - MtxFx33_InitYRotation(&stack.mUnk_30, SIN((u16) this->mAngle.angle_s), COS((u16) this->mAngle.angle_s)); - MtxFx33_InitXRotation(&stack.mUnk_30, SIN((u16) (s16) (this->mUnk_174 + this->mUnk_176)), - COS((u16) (s16) (this->mUnk_174 + this->mUnk_176))); + MtxFx33_InitYRotation(&sp30, SIN(this->mAngle.angle_u), COS(this->mAngle.angle_u)); - func_01ffa60c(&stack.mUnk_0C, &stack.mUnk_30, &stack.mUnk_30); + s16 angle = this->mUnk_174 + this->mUnk_176; + fx16 sin = SIN((u16) angle); + fx16 cos = COS((u16) angle); - // should have if/else structure - stack.mUnk_54.y = FX_MUL(FX_F32_TO_FX32(0.2f), SIN(this->mUnk_174 + this->mUnk_176)); + MtxFx33_InitXRotation(&spC, sin, cos); + func_01ffa60c(&spC, &sp30, &sp30); - this->mUnk_94.vfunc_14(&stack.mUnk_30, &stack.mUnk_54); - - if (this->mUnk_25A) { - this->func_ov031_020f22d4(&stack.mUnk_30, &stack.mUnk_54); + if (this->mState == 4) { + sp54.y -= FX_MUL(sin, 0x333); + } else { + sp54.y += FX_MUL(sin, 0x333); } - if (var5 >= 0x1F && this->mState != ActorShotArrowState_4) { - this->func_ov031_020f2654(&stack.mUnk_30); + this->mUnk_94.vfunc_14(&sp30, &sp54); + + if (this->mUnk_25A) { + this->func_ov031_020f22d4(&sp30, &sp54); + } + + if ((s32) var_r5 >= 0x1F && this->mState != 4) { + this->func_ov031_020f2654(&sp30); } } - data_027e09b4->func_ov017_020c08c4(&this->mPos, 0x7B, 0x666, var4, this->mAngle.angle_s, 0x1); + data_027e09b4->func_ov017_020c08c4(&this->mPos, 0x7B, 0x666, (s32) (u8) var_r4, (s32) (s16) this->mAngle.angle_s, 1); } -// non-matching -void ActorShotArrow::func_ov031_020f2654(MtxFx33 *param1) {} +void ActorShotArrow::func_ov031_020f2654(MtxFx33 *param1) { + VecFx32 sp0; + + fx32 scaleZ = FX_MUL(this->mUnk_168, FX_F32_TO_FX32(1.0f)); + + FlushGfxQueue(); + G3_MtxMode(2); + G3_PushMtx(); + + sp0 = this->mPos; + sp0.x -= MUL_FXUNK2(SIN((u16) this->mAngle.angle_s), FX_F32_TO_FX32(0.5f)); + sp0.z -= MUL_FXUNK2(COS((u16) this->mAngle.angle_s), FX_F32_TO_FX32(0.5f)); + + G3_Translate(sp0.x, sp0.y, sp0.z); + func_02024a84(param1); + G3_Scale(0x1000, 0x1000, scaleZ); + G3_TexImageParam(GX_TEXFMT_NONE, GX_TEXGEN_NONE, GX_TEXSIZE_S8, GX_TEXSIZE_T8, GX_TEXREPEAT_NONE, GX_TEXFLIP_NONE, + GX_TEXPLTTCOLOR0_USE, 0); + G3_TexPlttBase(0, GX_TEXFMT_NONE); + G3_PolygonAttr(GX_LIGHTMASK_NONE, GX_POLYGONMODE_UNK_00, 3, 1, 7, FALSE); + + REG_GFX_FIFO_DIFFUSE_AMBIENT_REFLECT = 0x4210FFFF; + REG_GFX_FIFO_SPECULAR_REF_AND_EMISSION = 0; + + { + G3_Begin(GX_BEGIN_TRIS); + G3_Vtx(0, 0, 0xF000); + G3_Vtx(0xFEC0, 0, 0); + G3_Vtx(0x140, 0, 0); + G3_End(); + } + + G3_MtxMode(2); + G3_PopMtx(1); +} void ActorShotArrow::func_ov031_020f2794(unk16 param1) { switch (param1) { @@ -616,104 +631,83 @@ void ActorShotArrow::func_ov031_020f2794(unk16 param1) { case 0x2: this->mUnk_94.vfunc_08(GetModelFromProfile3(func_ov031_020f1404(), data_ov031_02110b4c)); this->mUnk_25A = true; - this->mUnk_A0.func_ov000_02057c98(&this->mUnk_100); + this->mUnk_A0.func_ov000_02057c98(&this->mUnk_100.mUnk_00); break; default: break; } } -// non-matching void ActorShotArrow::func_ov031_020f28ac() { - VecFx32 vec1; - VecFx32 vec2; + VecFx32 sp1C; + VecFx32 sp10; + bool var_r1; + bool var_r6; + bool var_r7; + + STACK_PAD(4); this->func_ov000_020989e0(); - bool notEarlyReturn = true; + var_r7 = true; - if (this->mUnk_140.mUnk_08 == 0x3FFFF) { - notEarlyReturn = false; + if (this->mUnk_140.mUnk_08 & 0x3FFFF) { + var_r7 = false; switch (this->mUnk_140.mUnk_1C) { - case 0x8: - if (this->mUnk_140.mUnk_0C.acRef.unk_id == 0x102) { - bool var = false; - if (this->mUnk_140.mUnk_0C.acRef.unk_id == 0x102) { - if (this->mUnk_140.mUnk_0C.data == 0x1 || this->mUnk_140.mUnk_0C.data == 0x3) { - var = true; - } - } - bool var2 = false; - if (!var) { - var2 = true; - } - VecFx32 *result = this->func_ov000_0209853c(var2); - func_01ffb714(&this->mPos, result, &vec1); - this->func_ov031_020f2cac(&vec1, true); - break; - } - - if (!func_ov000_0205cbc4(this->mUnk_140.mUnk_0C.Get32(), &vec2)) { - vec1.x = FX_F32_TO_FX32(0.0f); - vec1.y = FX_F32_TO_FX32(0.0f); - vec1.z = FX_F32_TO_FX32(0.0f); + case 8: + if (this->mUnk_140.mUnk_0C.acRef.type_index == 0x102) { + var_r1 = this->mUnk_140.mUnk_0C.acRef.UnkCheck3(0x102); + func_01ffb714(&this->mPos, this->func_ov000_0209853c(var_r1), &sp1C); + } else if (!func_ov000_0205cbc4(this->mUnk_140.mUnk_0C.Get32(), &sp10)) { + sp1C.x = 0; + sp1C.y = 0; + sp1C.z = 0; } else { - func_01ffb714(&this->mPos, &vec2, &vec1); + func_01ffb714(&this->mPos, &sp10, &sp1C); } - this->func_ov031_020f2cac(&vec1, true); + this->func_ov031_020f2cac(&sp1C, true); break; - case 0x4: { - Actor *actor = gpActorManager->func_01fff3b4(this->mUnk_140.mUnk_0C); + case 4: { + Actor *var_r0_2 = gpActorManager->func_01fff3b4(this->mUnk_140.mUnk_0C); - if (actor != NULL) { - func_01ffb714(&this->mPos, &actor->mPrevPos, &vec1); - this->func_ov031_020f2cac(&vec1, true); + if (var_r0_2 != NULL) { + func_01ffb714(&this->mPos, &var_r0_2->mPos, &sp1C); + this->func_ov031_020f2cac(&sp1C, true); } break; } - case 0xE: - if (this->mUnk_140.mUnk_0C.acRef.unk_id == 0x102) { - bool var = false; + case 14: + if (this->mUnk_140.mUnk_0C.acRef.type_index == 0x102) { + var_r6 = this->mUnk_140.mUnk_0C.acRef.UnkCheck3(0x102); - if (this->mUnk_140.mUnk_0C.acRef.unk_id == 0x102) { - if (this->mUnk_140.mUnk_0C.data == 0x1 || this->mUnk_140.mUnk_0C.data == 0x3) { - var = true; - } - } - - bool var2 = true; - if (!var) { - var2 = false; - } - - if (this->func_ov000_02098800(var2)) { - notEarlyReturn = true; + if (this->func_ov000_02098800(var_r6)) { + data_027e0ce0->func_ov000_0208bd30(var_r6, 0xE6, 0, 0); + func_01ffb714(&this->mPos, this->func_ov000_0209853c(0), &sp1C); + this->func_ov031_020f2cac(&sp1C, true); } else { - data_027e0ce0->func_ov000_0208bd30(var2, 0xE6, 0, 0); - func_01ffb714(&this->mPos, this->func_ov000_0209853c(0), &vec1); - this->func_ov031_020f2cac(&vec1, true); + var_r7 = 1; } } + break; - case 0xF: { - if (this->mUnk_5C.mParams[1] == 0x0 || this->mUnk_5C.mParams[1] == 0x3) { - data_027e0ce0->func_ov000_0208bc1c(1, 0, 0x18, 0, 0, 0); + case 15: + if (this->mUnk_5C.mParams[1] == 0 || this->mUnk_5C.mParams[1] == 3) { + data_027e0ce0->func_ov000_0208bc1c(1, 0, 0x18, NULL, NULL, 0); } - VecFx32 *result = this->func_ov000_0209853c(0x1); - func_01ffb714(&this->mPos, result, &vec1); - this->func_ov031_020f2cac(&vec1, true); + func_01ffb714(&this->mPos, this->func_ov000_0209853c(1), &sp1C); + this->func_ov031_020f2cac(&sp1C, true); break; - } - case 0x3: - if (this->mUnk_140.mUnk_0C.common.type != ActorRefType_0) { - Actor *actor = gpActorManager->func_01fff3b4(this->mUnk_140.mUnk_0C); - if (actor) { - func_01ffb714(&actor->mPos, &actor->mPrevPos, &vec1); - VecFx32_TryNormalize(&vec1); - this->func_ov031_020f2cac(&vec1, true); + case 3: + if (this->mUnk_140.mUnk_0C.common.type != 0) { + Actor *var_r0_2 = gpActorManager->func_01fff3b4(this->mUnk_140.mUnk_0C); + + if (var_r0_2 != NULL) { + func_01ffb714(&var_r0_2->mPos, &var_r0_2->mPrevPos, &sp1C); + VecFx32_TryNormalize(&sp1C); + this->func_ov031_020f2cac(&sp1C, true); } } @@ -723,15 +717,14 @@ void ActorShotArrow::func_ov031_020f28ac() { } } - if (!notEarlyReturn) { + if (var_r7 == 0) { return; } this->func_ov031_020f2f9c(); - if ((this->mUnk_5C.mParams[1] != 0) && (this->mUnk_5C.mParams[1] != 3)) { - u32 var_r0 = this->func_ov000_02098ab4(data_ov031_02110b01[this->mUnk_5C.mParams[1]], 0, 1, &this->mVel); - if (var_r0) { + if (this->mUnk_5C.mParams[1] != 0 && this->mUnk_5C.mParams[1] != 3) { + if (this->func_ov000_02098ab4(data_ov031_02110b00.unk_01[this->mUnk_5C.mParams[1]], 0, 1, &mVel) != 0) { this->Kill(); } } @@ -757,45 +750,48 @@ void ActorShotArrow::func_ov031_020f2bec() { } } -// non-matching void ActorShotArrow::func_ov031_020f2c08(unk16 param1) { - VecFx32 vel; + VecFx32 sp0; - this->mVel.x = FX_MUL(SIN((u16) this->mAngle.angle_s), param1); - this->mVel.z = FX_MUL(COS((u16) this->mAngle.angle_s), param1); + fx16 sin = SIN(this->mAngle.angle_u); + fx16 cos = COS(this->mAngle.angle_u); + + this->mVel.x = FX_MUL(sin, param1); + this->mVel.z = FX_MUL(cos, param1); this->mVel.y = FX_F32_TO_FX32(0.0f); - vel = this->mVel; - func_01ff93c0(&vel, -0x1000); - this->func_ov031_020f2cac(&vel, false); + sp0 = this->mVel; + func_01ff93c0(&sp0, -0x1000); + this->func_ov031_020f2cac(&sp0, false); } -// non-matching -void ActorShotArrow::func_ov031_020f2cac(VecFx32 *param1, bool param2) { - VecFx32 vel; - VecFx32 pos; - VecFx16 vec; +void ActorShotArrow::func_ov031_020f2cac(const VecFx32 *param1, bool param2) { + VecFx32 sp1C; + VecFx32 sp10; + VecFx16 sp8; if (this->mState == ActorShotArrowState_4) { return; } this->mUnk_140.mUnk_04 &= ~0x8; + s16 temp_r8 = this->mAngle.angle_s; this->SetState(ActorShotArrowState_4); - if (param1->x == 0 && param1->y == 0) { - if (param1->z != 0) { - vel = this->mVel; - if (this->mVel.x == 0 && this->mVel.y == 0 && this->mVel.z == 0) { - VecFx32_Copy(&this->mVel, param1); - } else { - func_01ff94cc(&this->mVel, param1, &vel); - } + if (!VecFx32_IsCleared(param1)) { + sp1C = this->mVel; + + if (VecFx32_IsCleared(&this->mVel)) { + this->mVel.x = param1->x; + this->mVel.y = param1->y; + this->mVel.z = param1->z; } else { - this->mVel.x = -this->mVel.x; - this->mVel.y = -this->mVel.y; - this->mVel.z = -this->mVel.z; + func_01ff94cc(&this->mVel, (VecFx32 *) param1, &sp1C); } + } else { + this->mVel.x = -this->mVel.x; + this->mVel.y = -this->mVel.y; + this->mVel.z = -this->mVel.z; } VecFx32_TryNormalize(&this->mVel); @@ -803,32 +799,36 @@ void ActorShotArrow::func_ov031_020f2cac(VecFx32 *param1, bool param2) { this->mVel.y = 0xCD; if (param2) { - pos = this->mPos; - this->mPos.x -= FX_F32_TO_FX32(SIN((u16) this->mAngle.angle_s)); - this->mPos.z -= FX_F32_TO_FX32(COS((u16) this->mAngle.angle_s)); + sp10 = this->mPos; + this->mPos.x -= MUL_FXUNK2(SIN(this->mAngle.angle_u), FX_F32_TO_FX32(0.3f)); + this->mPos.z -= MUL_FXUNK2(COS(this->mAngle.angle_u), FX_F32_TO_FX32(0.3f)); data_027e09a8->func_ov000_02071eac(&this->mPos); - data_027e09a8->func_ov000_02071b30(0x8D7B, &pos, 0x0); + data_027e09a8->func_ov000_02071b30(0x8D7B, &sp10, 0x0); - vec.x = (fx16) FX_F32_TO_FX32(SIN((u16) (this->mAngle.angle_s - 0x8000))); - vec.y = (fx16) FX_F32_TO_FX32(0.0f); - vec.z = (fx16) FX_F32_TO_FX32(COS((u16) (this->mAngle.angle_s - 0x8000))); + s16 diff = temp_r8 - 0x8000; + sp8.x = MUL_FXUNK2(SIN((u16) diff), FX_F32_TO_FX32(1.0f)); + sp8.y = FX_F32_TO_FX32(0.0f); + sp8.z = MUL_FXUNK2(COS((u16) diff), FX_F32_TO_FX32(1.0f)); - data_027e0cec->func_ov000_0209feac(0x804, &pos, 0x2, 0x0, 0x0); - data_027e0cec->func_ov000_0209ff24(0x805, &pos, &vec, 2); + data_027e0cec->func_ov000_0209feac(0x804, &sp10, 0x2, 0x0, 0x0); + data_027e0cec->func_ov000_0209ff24(0x805, &sp10, &sp8, 2); } this->mAngle = func_01ffbbe0(this->mVel.x, this->mVel.z); } -// non-matching void ActorShotArrow::func_ov031_020f2ef0() { - Actor *value = NULL; ActorShotArrow_178 *unk_178; - unk_178 = &this->mUnk_178; - func_01ffe6c4(&value, this->mRef.Get32(), &this->mPos, &this->mVel, (s16) this->mUnk_44, &this->mPos, 0); + UnkStruct_ov031_020e5d18_00 spC; + spC.mUnk_00 = NULL; - this->mUnk_46 = (s16) (value->func_ov000_0207df88(this->mUnk_30, 0x3) | func_ov000_0207e294(this->mUnk_30)); + func_01ffe6c4(&spC.mUnk_00, this->mRef, &this->mPos, &this->mPrevPos, (s16) this->mUnk_44, &this->mPos, &this->mUnk_178); + + s32 temp_r5 = 0; + temp_r5 |= ((Actor *) &spC)->func_ov000_0207df88(this->mUnk_30, 0x3); + temp_r5 |= ((Actor *) &spC)->func_ov000_0207e294(this->mUnk_30); + this->mUnk_46 = temp_r5; } void ActorShotArrow::func_ov031_020f2f5c(VecFx32 *param1) { @@ -840,11 +840,10 @@ void ActorShotArrow::func_ov031_020f2f5c(VecFx32 *param1) { bool ActorShotArrow::func_ov031_020f2f9c() { VecFx32_Copy(&this->mPos, &this->mUnk_194.mUnk_0C.pos); this->mUnk_194.mUnk_0C.size = FX_F32_TO_FX32(0.2f); - data_027e09c0->func_ov000_0207e58c(this->mRef, 0x3, data_ov031_02110b01[this->mUnk_5C.mParams[1]], &this->mUnk_194); + data_027e09c0->func_ov000_0207e58c(this->mRef, 0x3, data_ov031_02110b00.unk_01[this->mUnk_5C.mParams[1]], &this->mUnk_194); return true; } -// non-matching void ActorShotArrow::func_ov031_020f3000() { VecFx32 vec; MtxFx33 m1; @@ -910,18 +909,20 @@ bool ActorShotArrow::func_ov031_020f3210(u16 param1) { return false; } -// non-matching bool ActorShotArrow::func_ov031_020f3258(u16 param1) { + s32 var_r1; + if (this->mUnk_172 == 0) { return true; } if (this->mUnk_172 > param1) { - this->mUnk_172 -= param1; + var_r1 = this->mUnk_172 - param1; } else { - this->mUnk_172 = 0; + var_r1 = 0; } + this->mUnk_172 = var_r1; return false; } @@ -941,15 +942,16 @@ void ActorShotArrow_178::func_ov031_020f3304() { this->mUnk_18 = FX_F32_TO_FX32(0.0f); } -// non-matching bool ActorShotArrow_178::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { - u32 var = param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06]; +#pragma unused(param2) - if ((var >> 0x17 & 1) == 1) { + u32 temp_r3 = param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06]; + + if ((temp_r3 >> 0x17 & 0x01) == 0x01) { return false; } - if ((this->mUnk_08->mUnk_178.mUnk_18 & 0x1) == 0 && (var >> 0x1F & 1) == 1) { + if ((this->mUnk_08->mUnk_178.mUnk_18 & 0x1) == 0 && (temp_r3 >> 0x1F & 0x01) == 0x01) { this->mUnk_08->func_ov031_020f2b8c(); } else if ((this->mUnk_08->mUnk_178.mUnk_18 & 0x2) == 0) { if (this->mUnk_08->mState == ActorShotArrowState_4) { @@ -957,16 +959,198 @@ bool ActorShotArrow_178::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 return false; } + VecFx32 temp; + VecFx16_Copy2VecFx32(¶m1->mUnk_08, &temp); + this->mUnk_08->mUnk_178.mUnk_18 |= 0x1; - VecFx16_Copy2VecFx32(¶m1->mUnk_08, &this->mUnk_08->mUnk_178.mUnk_0C); + + VecFx32_Copy(&temp, &this->mUnk_08->mUnk_178.mUnk_0C); } return true; } -// non-matching bool ActorShotArrow_178::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, - const VecFx32 *param4) {} + const VecFx32 *param4) { + VecFx32 sp3C; + VecFx32 jp_sp48; + VecFx32 jp_sp3C; + VecFx32 sp30; + VecFx32 sp24; + VecFx32 sp18; + VecFx32 spC; + MapObjRef sp8; + MapObjRef sp4; + Vec2bCpp sp2; + Vec2bCpp sp0; + bool var_r1; + bool var_r5; + MapObject *pMapObj; + bool var_r7; + + var_r5 = true; + + if (((param2->mUnk_08 >> 0x17) & 0x01) == 0x01) { + return false; + } + + var_r7 = true; + if (ref.moRef.unk_00_u16 != 0x1000) { + var_r7 = false; + } + +#if IS_JP + if (var_r7) { + sp8 = ref.moRef; + sp2 = sp8.GetUnk02(); + pMapObj = gpMapObjManager->func_01fff498(sp2); + + if (pMapObj != NULL) { + switch (pMapObj->GetMapObjectId()) { + case MapObjectId_BombFlower: + case MapObjectId_ITFL: + case MapObjectId_Pot: + var_r1 = true; + + if (this->mUnk_08->mUnk_5C.mParams[1] != 3 && this->mUnk_08->mUnk_5C.mParams[1] != 4) { + var_r1 = false; + } + + if (var_r1) { + return true; + } + + break; + case MapObjectId_SWRA: + case MapObjectId_SWEY: + jp_sp48.x = 0; + jp_sp48.y = 0; + jp_sp48.z = 0x1000; + + jp_sp3C.x = 0; + jp_sp3C.y = 0; + jp_sp3C.z = 0x1000; + + func_01ff9638(&jp_sp3C, this->mUnk_08->mUnk_5C.mInitialAngle); + func_01ff9638(&jp_sp48, pMapObj->mAngle.angle_s); + + if (VecFx32_Dot(&jp_sp3C, &jp_sp48) > 0) { + return false; + } + + break; + default: + break; + } + } + } +#else + var_r1 = true; + + if (this->mUnk_08->mUnk_5C.mParams[1] != 3 && this->mUnk_08->mUnk_5C.mParams[1] != 4) { + var_r1 = false; + } + + if (var_r1 && var_r7) { + sp8 = ref.moRef; + sp2 = sp8.GetUnk02(); + MapObject *pMapObj = gpMapObjManager->func_01fff498(sp2); + + if (pMapObj != NULL) { + switch (pMapObj->GetMapObjectId()) { + case MapObjectId_BombFlower: + case MapObjectId_ITFL: + case MapObjectId_Pot: + return true; + default: + break; + } + } + } +#endif + + if (((param2->mUnk_08 >> 0x1F) & 0x01) == 0x01) { + if (var_r7) { + sp4 = ref.moRef; + sp0 = sp4.GetUnk02(); + MapObject *pMapObj = gpMapObjManager->func_01fff498(sp0); + + if (pMapObj != NULL) { + if (pMapObj->GetMapObjectId() == MapObjectId_TREE && pMapObj->mUnk_20.mParams[2] == 0x02) { + sp30.x = 0; + sp30.y = 0; + sp30.z = -FX_F32_TO_FX32(0.4f); + + func_01ff9638(&sp30, this->mUnk_08->mAngle.angle_s); + + VecFx32 temp; + temp.x = pMapObj->mPos.x; + temp.z = pMapObj->mPos.z; + temp.y = this->mUnk_08->mPos.y; + + sp24.x = temp.x; + sp24.y = temp.y; + sp24.z = temp.z; + + VecFx32_Add(&sp24, &sp30, &sp24); + + this->mUnk_08->mPos.x = (this->mUnk_08->mPos.x + sp24.x) >> 1; + this->mUnk_08->mPos.z = (this->mUnk_08->mPos.z + sp24.z) >> 1; + VecFx32_Copy(&this->mUnk_08->mPos, &this->mUnk_08->mPrevPos); + + this->mUnk_08->func_ov031_020f2b8c(); + return false; + } + } + } + + this->mUnk_08->func_ov031_020f2b8c(); + return true; + } + + if ((param2->mUnk_08 & 0x1F) == 0x0A) { + var_r5 = false; + } + + VecFx32 temp; + switch (param2->vfunc_00()) { + case 0: + case 1: + sp3C.x = this->mUnk_08->mVel.x; + sp3C.y = this->mUnk_08->mVel.y; + sp3C.z = this->mUnk_08->mVel.z; + + sp3C.x = -sp3C.x; + sp3C.y = -sp3C.y; + sp3C.z = -sp3C.z; + break; + case 2: + param2->vfunc_14(&spC); + VecFx32_Add(&spC, param4, &spC); + VecFx32_Add(&sp18, param4, &sp18); + + if (param3->x > spC.x && param3->x < sp18.x) { + sp3C.z = this->mUnk_08->mVel.z; + + sp3C.x = 0; + sp3C.y = 0; + sp3C.z = -sp3C.z; + } else { + sp3C.x = this->mUnk_08->mVel.x; + + sp3C.x = -sp3C.x; + sp3C.y = 0; + sp3C.z = 0; + } + + break; + default: + break; + } + + this->mUnk_08->func_ov031_020f2cac(&sp3C, var_r5); + return true; +} ActorShotArrow_194::ActorShotArrow_194(ActorShotArrow *param1) { this->mUnk_2C = param1; @@ -974,42 +1158,52 @@ ActorShotArrow_194::ActorShotArrow_194(ActorShotArrow *param1) { } void ActorShotArrow_194::func_ov031_020f374c(Actor *actor) { - UnkStruct_020f374c stack; + VecFx32 sp28; + VecFx32 sp1C; + Cylinder spC; + VecFx32 sp0; - stack.mUnk_28 = this->mUnk_2C->mVel; - func_01ff93c0(&stack.mUnk_28, this->mUnk_30); - stack.mUnk_1C = this->mUnk_0C.pos; - VecFx32_Add(&stack.mUnk_1C, &stack.mUnk_28, &stack.mUnk_1C); + sp28 = this->mUnk_2C->mVel; + func_01ff93c0(&sp28, this->mUnk_30); + sp1C = this->mUnk_0C.pos; + VecFx32_Add(&sp1C, &sp28, &sp1C); - func_01ffb714(&stack.mUnk_1C, &actor->mVel, &stack.mUnk_1C); - actor->vfunc_10(&stack.mUnk_0C); + func_01ffb714(&sp1C, &actor->mVel, &sp1C); + actor->vfunc_10(&spC); - stack.mUnk_00 = stack.mUnk_0C.pos; - func_01ffb714(&stack.mUnk_00, &stack.mUnk_1C, &stack.mUnk_00); + sp0 = spC.pos; + func_01ffb714(&sp0, &sp1C, &sp0); - unk32 temp = func_01ff9258(stack.mUnk_00.x, stack.mUnk_00.z); + unk32 temp = func_01ff9258(sp0.x, sp0.z); - //! @bug: stack.mUnk_18 is used uninitialized? - if (temp > stack.mUnk_0C.size && stack.mUnk_0C.size > FX_F32_TO_FX32(0.15f)) { - fx32 temp_r5 = (temp - stack.mUnk_0C.size) + FX_F32_TO_FX32(0.15f); - u16 value = (u32) (s16) (s32) func_01ffbbe0(stack.mUnk_00.x, stack.mUnk_00.z); + if (temp > spC.size && spC.size > FX_F32_TO_FX32(0.15f)) { + fx32 temp_r5 = (temp - spC.size) + FX_F32_TO_FX32(0.15f); + u16 value = (u32) (s16) (s32) func_01ffbbe0(sp0.x, sp0.z); fx16 sin = SIN(value); fx16 cos = COS(value); - stack.mUnk_28.x += FX_MUL(sin, temp_r5); - stack.mUnk_28.z += FX_MUL(cos, temp_r5); + sp28.x += FX_MUL(sin, temp_r5); + sp28.z += FX_MUL(cos, temp_r5); } - this->mUnk_2C->func_ov031_020f2f5c(&stack.mUnk_28); + this->mUnk_2C->func_ov031_020f2f5c(&sp28); this->mUnk_2C->mUnk_1C8.mUnk_00 = actor; } -// non-matching -void ActorShotArrow_194::vfunc_10(Actor *actor) { - UnkStruct_020f38b0 stack; +void ActorShotArrow_194::vfunc_10(const Actor *actor) { + VecFx32 sp1C; + VecFx32 sp10; + MtxFx43 *spC; + unk32 sp8; + RefStruct sp4; - if (!(this->mUnk_04 != actor->mRef && actor->mUnk_34 != NULL)) { + STACK_PAD(4); + + u32 actorRef = actor->mRef.Get32(); + u32 thisRef = *(vu32 *) &this->mUnk_04; + + if (!(actorRef != thisRef && actor->mUnk_34 != NULL)) { return; } @@ -1017,59 +1211,62 @@ void ActorShotArrow_194::vfunc_10(Actor *actor) { return; } - if (actor->GetActorId() == ActorId_ShotArrow) { + if (((Actor *) actor)->GetActorId() == ActorId_ShotArrow) { return; } s16 result = func_01ffbbe0(this->mUnk_2C->mVel.x, this->mUnk_2C->mVel.z); - switch (actor->GetActorId()) { + switch (((Actor *) actor)->GetActorId()) { case ActorId_WIDR: - this->func_ov031_020f374c(actor); + this->func_ov031_020f374c(((Actor *) actor)); this->mUnk_2C->func_ov031_020f2bec(); if (actor != NULL) { - func_01ffb714(&this->mUnk_2C->mPos, &actor->mPos, &stack.mUnk_1C); - VecFx32_Copy(&stack.mUnk_1C, &this->mUnk_2C->mUnk_1C8.mUnk_04); + func_01ffb714(&this->mUnk_2C->mPos, &actor->mPos, &sp1C); + VecFx32_Copy(&sp1C, &this->mUnk_2C->mUnk_1C8.mUnk_04); this->mUnk_2C->mUnk_1C8.mUnk_10 = actor->mAngle.angle_s; this->mUnk_2C->mUnk_1C8.mUnk_12 = result; } + break; - case ActorId_IWTS: - this->func_ov031_020f374c(actor); - stack.mUnk_0C = NULL; + this->func_ov031_020f374c((Actor *) actor); + spC = NULL; - if (!data_027e0d80->func_ov084_02153064(&this->mUnk_2C->mRef, &stack.mUnk_0C)) { - this->mUnk_2C->func_ov031_020f311c(stack.mUnk_0C); + if (data_027e0d80->func_ov084_02153064(&this->mUnk_2C->mRef, &spC)) { + this->mUnk_2C->func_ov031_020f311c(spC); this->mUnk_2C->mUnk_258 = 0x01; } + break; + case ActorId_MRD2: { + ActorUnkMRD2 *ptr = data_ov075_02163518; - case ActorId_MRD2: - if (data_ov075_02163518->mUnk_910 != 1) { - this->func_ov031_020f374c(actor); - stack.mUnk_08 = 0; + if (ptr->mUnk_910 == 1) { + this->func_ov031_020f374c((Actor *) actor); + sp8 = 0; - if (data_ov075_02163518->func_ov075_0215bbf0(&this->mUnk_2C->mRef, &stack.mUnk_08)) { - func_ov075_02160864(this->mUnk_2C, stack.mUnk_08); + if (ptr->func_ov075_0215bbf0(&this->mUnk_2C->mRef, &sp8)) { + this->mUnk_2C->func_ov075_02160864(sp8); this->mUnk_2C->mUnk_258 = 0x01; } } - break; + break; + } case ActorId_RYAW: this->mUnk_2C->SetState(ActorShotArrowState_6); UNSET_FLAG(this->mUnk_2C->mFlags, ActorFlag_Visible); break; - case ActorId_LOCK: - stack.mUnk_04 = actor->mUnk_5C.mUnk_28; - if (stack.mUnk_04.data != 0 && stack.mUnk_04.common.type != ActorRefType_0) { - ActorUnkGYAM *lockedActor = (ActorUnkGYAM *) gpActorManager->func_01fff3b4(actor->mUnk_5C.mUnk_28); + sp4 = actor->mUnk_5C.mUnk_28; + + if (sp4.acRef.type_index != 0 && sp4.common.type != ActorRefType_0) { + ActorUnkGYAM *lockedActor = (ActorUnkGYAM *) gpActorManager->func_01fff3b4(sp4); if (lockedActor != NULL && lockedActor->GetActorId() == ActorId_GYAM) { - this->func_ov031_020f374c(actor); + this->func_ov031_020f374c((Actor *) actor); this->mUnk_2C->func_ov031_020f311c(&lockedActor->mUnk_220); SET_FLAG(this->mUnk_2C->mFlags, ActorFlag_Visible); this->mUnk_2C->mUnk_258 = 0x0; @@ -1077,14 +1274,13 @@ void ActorShotArrow_194::vfunc_10(Actor *actor) { } } // fallthrough - default: if (!this->IsParam1_3Or4()) { - this->func_ov031_020f374c(actor); + this->func_ov031_020f374c((Actor *) actor); this->mUnk_2C->func_ov031_020f2bbc(); if (actor) { - func_01ffb714(&this->mUnk_2C->mPos, &actor->mPos, &stack.mUnk_10); - VecFx32_Copy(&stack.mUnk_10, &this->mUnk_2C->mUnk_1C8.mUnk_04); + func_01ffb714(&this->mUnk_2C->mPos, &actor->mPos, &sp10); + VecFx32_Copy(&sp10, &this->mUnk_2C->mUnk_1C8.mUnk_04); this->mUnk_2C->mUnk_1C8.mUnk_10 = actor->mAngle.angle_s; this->mUnk_2C->mUnk_1C8.mUnk_12 = result; } @@ -1098,17 +1294,24 @@ void ActorShotArrow_194::vfunc_10(Actor *actor) { } } -// non-matching bool ActorShotArrow_194::vfunc_0C(Actor *actor, VecFx32 *vector) { - UnkStruct_020f3c38 stack; - if (!(actor->mRef != this->mUnk_04 && actor->mUnk_34 != NULL) || + VecFx32 sp14; + Cylinder sp4; + + STACK_PAD(4); + + u32 actorRef = actor->mRef.Get32(); + u32 thisRef = *(vu32 *) &this->mUnk_04; + + if (!(actorRef != thisRef && actor->mUnk_34 != NULL) || !(this->mUnk_2C->mState == ActorShotArrowState_0 || this->mUnk_2C->mState == ActorShotArrowState_5)) { return false; } - func_01ffb714(&actor->mVel, &this->mUnk_2C->mVel, &stack.mUnk_14); - actor->vfunc_10(&stack.mUnk_04); - if (!func_01ffccf4(&this->mUnk_0C, &stack.mUnk_04.pos, &stack.mUnk_14, &this->mUnk_30)) { + func_01ffb714(&actor->mVel, &this->mUnk_2C->mVel, &sp14); + actor->vfunc_10(&sp4); + + if (!func_01ffccf4(&this->mUnk_0C, &sp4.pos, &sp14, &this->mUnk_30)) { return false; } diff --git a/src/031_Land/Actor/ActorUnkEFSB.cpp b/src/031_Land/Actor/ActorUnkEFSB.cpp index 5b9acd0f..fe0b8368 100644 --- a/src/031_Land/Actor/ActorUnkEFSB.cpp +++ b/src/031_Land/Actor/ActorUnkEFSB.cpp @@ -50,7 +50,7 @@ void ActorUnkEFSB::vfunc_54(unk32 param1) { this->mUnk_094 = param1; } -void ActorUnkEFSB::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkEFSB::vfunc_2C(unk32 param1) { VecFx32 vec; VecFx32_Init(FX_F32_TO_FX32(1.0f), FX_F32_TO_FX32(1.0f), FX_F32_TO_FX32(1.0f), &vec); diff --git a/src/031_Land/Actor/ActorUnkNFSP.cpp b/src/031_Land/Actor/ActorUnkNFSP.cpp index 0b3fd574..f23a79ba 100644 --- a/src/031_Land/Actor/ActorUnkNFSP.cpp +++ b/src/031_Land/Actor/ActorUnkNFSP.cpp @@ -45,12 +45,13 @@ ActorUnkNFSP::ActorUnkNFSP() : bool ActorUnkNFSP::Init(unk32 param1) { this->mUnk_9C = (MapObjectUnkSWFS *) param1; - this->mUnk_C0.mUnk_08 = 0x0; - this->mUnk_C0.mUnk_0A = 0x0; - this->mUnk_C0.mUnk_0C = 0x1000; - this->mUnk_C0.mUnk_0E = 0x0; - this->mUnk_C0.mUnk_10 = 0x0; - this->mUnk_C0.mUnk_12 = 0x1000; + this->mUnk_C0.mUnk_08.x = 0x0; + this->mUnk_C0.mUnk_08.y = 0x0; + this->mUnk_C0.mUnk_08.z = 0x1000; + + this->mUnk_C0.mUnk_0E.x = 0x0; + this->mUnk_C0.mUnk_0E.y = 0x0; + this->mUnk_C0.mUnk_0E.z = 0x1000; if (this->mUnk_5C.mParams[3] == 0x0) { this->vfunc_54(0x0); @@ -169,7 +170,7 @@ void ActorUnkNFSP::vfunc_54(unk32 param1) { } } -void ActorUnkNFSP::vfunc_2C(Actor_vfunc_30 *param1) {} +void ActorUnkNFSP::vfunc_2C(unk32 param1) {} void ActorUnkNFSP::func_ov031_020fbb8c() { this->mUnk_3C = &this->mUnk_A0; diff --git a/src/031_Land/Actor/ActorUnkNTTZ.cpp b/src/031_Land/Actor/ActorUnkNTTZ.cpp index 3965a402..e1fd0080 100644 --- a/src/031_Land/Actor/ActorUnkNTTZ.cpp +++ b/src/031_Land/Actor/ActorUnkNTTZ.cpp @@ -27,7 +27,7 @@ bool ActorUnkNTTZ::Init(unk32 param1) { void ActorUnkNTTZ::Update() {} -void ActorUnkNTTZ::vfunc_2C(Actor_vfunc_30 *param1) {} +void ActorUnkNTTZ::vfunc_2C(unk32 param1) {} void ActorUnkNTTZ::func_ov031_020f61a0() { if (this->mUnk_5C.mUnk_28.common.type == 0x0) { diff --git a/src/031_Land/Actor/ActorUnkRMTG.cpp b/src/031_Land/Actor/ActorUnkRMTG.cpp index bec0e5d1..a1e345e9 100644 --- a/src/031_Land/Actor/ActorUnkRMTG.cpp +++ b/src/031_Land/Actor/ActorUnkRMTG.cpp @@ -42,6 +42,6 @@ void ActorUnkRMTG::Setup() { data->func_ov000_0207834c(&this->mPos, func_ov000_02077590(0x7), 0x0); } -void ActorUnkRMTG::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkRMTG::vfunc_2C(unk32 param1) { this->mUnk_94.vfunc_18(&this->mPos); } diff --git a/src/031_Land/Actor/ActorUnkROCK.cpp b/src/031_Land/Actor/ActorUnkROCK.cpp index c02875cd..59f0abcf 100644 --- a/src/031_Land/Actor/ActorUnkROCK.cpp +++ b/src/031_Land/Actor/ActorUnkROCK.cpp @@ -92,7 +92,7 @@ void ActorUnkROCK::func_ov031_020e8acc() { this->func_ov000_020984d0(); } -void ActorUnkROCK::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkROCK::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorUnkSCCN.cpp b/src/031_Land/Actor/ActorUnkSCCN.cpp index 3481f279..79a54f9d 100644 --- a/src/031_Land/Actor/ActorUnkSCCN.cpp +++ b/src/031_Land/Actor/ActorUnkSCCN.cpp @@ -3,6 +3,7 @@ #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09c0.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" +#include "nitro/fx.h" DECL_PROFILE(ActorProfileUnkSCCN); @@ -15,60 +16,68 @@ ActorProfileUnkSCCN::ActorProfileUnkSCCN() : ActorUnkSCCN::ActorUnkSCCN() {} -// non-matching bool ActorUnkSCCN::Init(unk32 param1) { +#pragma unused(param1) + if (this->mUnk_5C.mParams[1] == 0x0) { return false; } - UnkStruct_027e0cd8_0C_Base *data_0C = data_027e0cd8->mUnk_0C; - UnkStruct_func_ov000_02080620 *unk = data_027e0cd8->mUnk_0C->func_ov000_02080620(); - if (unk == NULL) { + + UnkStruct_027e0cd8_0C_Base *data_0C = data_027e0cd8->mUnk_0C; + UnkStruct_027e0cd8_0C_Base_148_00 *ptr = data_0C->func_ov000_02080620(this->mUnk_5C.mParams[1]); + + if (ptr == NULL) { return false; } - if (!unk->vfunc_04()) { - VecFx32 vec1; - VecFx32 vec2; - vec2 = unk->mUnk_14; - vec1 = unk->mUnk_20; - func_01ffd054(&vec2, &this->mPos); - this->mPos.y = data_0C->vfunc_28(&this->mPos, 0x1, 0x0); - VecFx32 vec3; - VecFx32_Init(FX_F32_TO_FX32(0.0f), FX_F32_TO_FX32(0.0f), FX_F32_TO_FX32(0.0f), &vec3); - vec3.x = -this->mPos.x; - vec3.z = -this->mPos.z; + if (!ptr->vfunc_04()) { + VecFx32x2 spC; - VecFx32_Add(&vec2, &vec3, &vec2); - VecFx32_Add(&vec1, &vec3, &vec1); + VecFx32x2 *pVec = &ptr->mUnk_14; + spC.unk_00 = pVec->unk_00; + spC.unk_0C = pVec->unk_0C; - this->mUnk_94.mUnk_0C = vec2; - this->mUnk_94.mUnk_18 = vec1; + func_01ffd054(&spC.unk_00, &this->mPos); + this->mPos.y = data_0C->vfunc_28(&this->mPos, 0x01, 0x00); + + VecFx32 sp0; + VecFx32 *psp0 = (VecFx32 *) &sp0; + VecFx32_Reset(psp0); + sp0.x = -this->mPos.x; + sp0.z = -this->mPos.z; + + VecFx32_Add(&spC.unk_00, psp0, &spC.unk_00); + VecFx32_Add(&spC.unk_0C, psp0, &spC.unk_0C); + + this->mUnk_94.mUnk_0C = spC.unk_00; + this->mUnk_94.mUnk_18 = spC.unk_0C; } + this->mUnk_94.mUnk_08 = (((0x04407007 | ((u8) this->mUnk_5C.mParams[0] << 0x10)) & ~0x7000) | 0x3000); this->mUnk_94.mUnk_04 |= 0x2; + if (this->mUnk_5C.mParams[2] != 0) { this->mUnk_94.mUnk_07 = 0x13; } else { - unk32 var; - switch (((u32) (this->mAngle.angle_s + DEG_TO_ANG(45)) << 0x10) >> 0x1E) { + switch (this->GetDirection()) { case 0: - var = 9; + this->mUnk_94.mUnk_07 = 0x09; break; case 2: - var = 8; + this->mUnk_94.mUnk_07 = 0x08; break; case 3: - var = 0x22; + this->mUnk_94.mUnk_07 = 0x22; break; case 1: - var = 0x23; + this->mUnk_94.mUnk_07 = 0x23; break; default: - var = 7; + this->mUnk_94.mUnk_07 = 0x07; break; } - this->mUnk_94.mUnk_07 = var; } + this->mUnk_B8.mUnk_04 = this->mRef; this->mUnk_B8.mUnk_08 = &this->mPos; this->mUnk_B8.mUnk_0C = &this->mUnk_94; diff --git a/src/031_Land/Actor/ActorUnkSWBM.cpp b/src/031_Land/Actor/ActorUnkSWBM.cpp index 2d89f6f2..3eaedd4a 100644 --- a/src/031_Land/Actor/ActorUnkSWBM.cpp +++ b/src/031_Land/Actor/ActorUnkSWBM.cpp @@ -38,7 +38,7 @@ bool ActorUnkSWBM_98::vfunc_0C(Actor *param1, VecFx32 *vector) { return retValue; } -void ActorUnkSWBM_98::vfunc_10(Actor *actor) { +void ActorUnkSWBM_98::vfunc_10(const Actor *actor) { switch (GET_FLAG(actor->mFlags, ActorFlag_17) ? 1 : 0) { case false: { ActorUnkSWBM *actorSWBM = this->mUnk_2C; @@ -310,7 +310,7 @@ void ActorUnkSWBM::func_ov031_020e718c(const VecFx32 *param0, MtxFx33 *param1, s G3_PopMtx(1); } -void ActorUnkSWBM::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkSWBM::vfunc_2C(unk32 param1) { if (this->mState == ActorUnkSWBMState_2) { return; } diff --git a/src/031_Land/Actor/ActorUnkSWCH.cpp b/src/031_Land/Actor/ActorUnkSWCH.cpp index b62d2f94..0ec71b92 100644 --- a/src/031_Land/Actor/ActorUnkSWCH.cpp +++ b/src/031_Land/Actor/ActorUnkSWCH.cpp @@ -38,7 +38,7 @@ void ActorUnkSWCH::Update() { this->func_ov000_02098a88(0x1, 0x1); } -void ActorUnkSWCH::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkSWCH::vfunc_2C(unk32 param1) { if (this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorUnkTGTZ.cpp b/src/031_Land/Actor/ActorUnkTGTZ.cpp index 7e9e73a6..8c35829e 100644 --- a/src/031_Land/Actor/ActorUnkTGTZ.cpp +++ b/src/031_Land/Actor/ActorUnkTGTZ.cpp @@ -341,7 +341,7 @@ void ActorUnkTGTZ::vfunc_30(Actor_vfunc_30 *param1) { data_0204af1c.func_0201aa44(this->mUnk_1C8, NULL, 0x2, NULL); } -void ActorUnkTGTZ::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkTGTZ::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp index 5f54bd8d..2aa9fb22 100644 --- a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp +++ b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp @@ -1066,7 +1066,7 @@ void ActorUnkZLSL::func_ov031_020ec170() { this->mAngle = 0x0; } -void ActorUnkZLSL::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkZLSL::vfunc_2C(unk32 param1) { #pragma unused(param1) MtxFx33 sp00; diff --git a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp index c646edaa..51b1b7e2 100644 --- a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp +++ b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp @@ -219,7 +219,7 @@ void ActorFleeingSpinut::vfunc_30(Actor_vfunc_30 *param1) { data_0204af1c.func_0201aa44(&data_ov032_0212290c, &sp04, 0x1, NULL); } -void ActorFleeingSpinut::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorFleeingSpinut::vfunc_2C(unk32 param1) { if (!this->Actor::func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/032_MapA1/Actor/ActorKeese.cpp b/src/032_MapA1/Actor/ActorKeese.cpp index c4ccccfe..14ae8267 100644 --- a/src/032_MapA1/Actor/ActorKeese.cpp +++ b/src/032_MapA1/Actor/ActorKeese.cpp @@ -312,7 +312,7 @@ void ActorKeese::Update() { } // non-matching -void ActorKeese::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorKeese::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0x0)) { this->mUnk_278.func_ov000_020a0334(); diff --git a/src/032_MapA1/Actor/ActorSpinut.cpp b/src/032_MapA1/Actor/ActorSpinut.cpp index 2ab522d8..0a177ac8 100644 --- a/src/032_MapA1/Actor/ActorSpinut.cpp +++ b/src/032_MapA1/Actor/ActorSpinut.cpp @@ -255,7 +255,7 @@ void ActorSpinut::Update() { data_027e09c0->func_ov000_0207de98(this->mRef, &stack, this->mUnk_38); } -void ActorSpinut::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorSpinut::vfunc_2C(unk32 param1) { if (!this->Actor::func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/032_MapA1/Actor/ActorUnkNSSW.cpp b/src/032_MapA1/Actor/ActorUnkNSSW.cpp index 07223dda..2be41fd1 100644 --- a/src/032_MapA1/Actor/ActorUnkNSSW.cpp +++ b/src/032_MapA1/Actor/ActorUnkNSSW.cpp @@ -401,7 +401,7 @@ void ActorUnkNSSW::func_ov032_021203fc() { this->func_ov032_0212025c(); } -void ActorUnkNSSW::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkNSSW::vfunc_2C(unk32 param1) { if (!this->Actor::func_01fff5d0(param1, 0x0)) { return; } @@ -674,8 +674,8 @@ void ActorUnkNSSW_0E0::vfunc_0C(VecFx32 *param1) { ActorUnkNSSW_104::ActorUnkNSSW_104(ActorUnkNSSW *actor) : mUnk_2C(actor) {} -void ActorUnkNSSW_104::vfunc_10(Actor *actor) { - this->mUnk_2C->func_ov032_02120bfc(actor); +void ActorUnkNSSW_104::vfunc_10(const Actor *actor) { + this->mUnk_2C->func_ov032_02120bfc((Actor *) actor); } #if IS_JP diff --git a/src/063_Shrine/Actor/ActorUnkCANS.cpp b/src/063_Shrine/Actor/ActorUnkCANS.cpp index 50012ecd..3bd6be10 100644 --- a/src/063_Shrine/Actor/ActorUnkCANS.cpp +++ b/src/063_Shrine/Actor/ActorUnkCANS.cpp @@ -408,7 +408,7 @@ void ActorUnkCANS::Update(void) { } } -void ActorUnkCANS::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkCANS::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0)) { return; } diff --git a/src/063_Shrine/Actor/ActorUnkCASE.cpp b/src/063_Shrine/Actor/ActorUnkCASE.cpp index 6f089bf1..12ccd3be 100644 --- a/src/063_Shrine/Actor/ActorUnkCASE.cpp +++ b/src/063_Shrine/Actor/ActorUnkCASE.cpp @@ -117,9 +117,9 @@ ActorUnkCASE_174::ActorUnkCASE_174(Actor *param1) { mUnk_2C = param1; } -void ActorUnkCASE_174::vfunc_10(Actor *actor) { +void ActorUnkCASE_174::vfunc_10(const Actor *actor) { ((ActorUnkCASE *) mUnk_2C)->func_ov063_0215b724(); - func_ov000_0207b70c(this, actor); + func_ov000_0207b70c(this, (Actor *) actor); } // Static @@ -417,7 +417,7 @@ post: } } -void ActorUnkCASE::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkCASE::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0)) { return; } diff --git a/src/063_Shrine/Actor/ActorUnkRBLS.cpp b/src/063_Shrine/Actor/ActorUnkRBLS.cpp index 6f102958..aae2762a 100644 --- a/src/063_Shrine/Actor/ActorUnkRBLS.cpp +++ b/src/063_Shrine/Actor/ActorUnkRBLS.cpp @@ -40,7 +40,7 @@ void ActorUnkRBLS::vfunc_24(void) { this->Update(); } -void ActorUnkRBLS::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkRBLS::vfunc_2C(unk32 param1) { ModelRender *var1 = &this->mUnk_94; VecFx32 *var2 = &this->mPos; var1->vfunc_18(var2); diff --git a/src/063_Shrine/Actor/ActorUnkRMSBase.cpp b/src/063_Shrine/Actor/ActorUnkRMSBase.cpp index f580ca1c..fc62ffa2 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSBase.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSBase.cpp @@ -24,7 +24,7 @@ void ActorUnkRMSBase::vfunc_24() { this->Update(); } -void ActorUnkRMSBase::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorUnkRMSBase::vfunc_2C(unk32 param1) { UnkStruct_ov031_02114870::vfunc_2C(param1); if (mUnk_154) { diff --git a/src/071_Tower/Actor/ActorTearLight.cpp b/src/071_Tower/Actor/ActorTearLight.cpp index 320a50b7..ecfd1b83 100644 --- a/src/071_Tower/Actor/ActorTearLight.cpp +++ b/src/071_Tower/Actor/ActorTearLight.cpp @@ -142,7 +142,7 @@ void ActorTearLight::vfunc_24() { this->mUnk_104.vfunc_34(); } -void ActorTearLight::vfunc_2C(Actor_vfunc_30 *param1) { +void ActorTearLight::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/101_SceneInitLand/UnkStruct_027e0ce0_40_101.cpp b/src/101_SceneInitLand/UnkStruct_027e0ce0_40_101.cpp index 0149d1e7..0dab6804 100644 --- a/src/101_SceneInitLand/UnkStruct_027e0ce0_40_101.cpp +++ b/src/101_SceneInitLand/UnkStruct_027e0ce0_40_101.cpp @@ -4,6 +4,7 @@ #include "Unknown/UnkStruct_027e09a4.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" +#include "math.hpp" #include @@ -124,8 +125,7 @@ void UnkStruct_027e0ce0_40::func_ov101_02183024(const UnkStruct_ov001_020c40f4 * if (sp8) { VecFx32 sp34 = sp40.mUnk_00; - //! TODO: fake match? - switch ((u32) ((sp40.mUnk_0C + 0x2000) << 0x10) >> 0x1E) { + switch (GET_DIRECTION(sp40.mUnk_0C)) { case 0x03: sp34.z += FX_F32_TO_FX32(0.5f); break; @@ -153,8 +153,7 @@ void UnkStruct_027e0ce0_40::func_ov101_02183024(const UnkStruct_ov001_020c40f4 * if (sp8) { VecFx32 sp10 = sp1C.mUnk_00; - //! TODO: fake match? - switch ((u32) ((sp1C.mUnk_0C + 0x2000) << 0x10) >> 0x1E) { + switch (GET_DIRECTION(sp1C.mUnk_0C)) { case 0x03: sp10.z -= FX_F32_TO_FX32(0.5f); break;