From 07a5bd9fcce0beeba0ecb153cde63073dfcc2198 Mon Sep 17 00:00:00 2001 From: Yanis <35189056+Yanis002@users.noreply.github.com> Date: Fri, 2 Oct 2026 20:54:43 +0200 Subject: [PATCH] Create `Timer` struct, improve angle usage and name known virtual functions (#154) * name some actor vfuncs * name some map object vfuncs * remove angle union * fix lots of clangd errors * create Timer struct * fix regressions --- .clangd | 1 + config/eur/arm9/overlays/ov000/symbols.txt | 34 +-- config/eur/arm9/overlays/ov005/symbols.txt | 4 +- config/eur/arm9/overlays/ov024/symbols.txt | 4 +- config/eur/arm9/overlays/ov031/symbols.txt | 140 ++++++------ config/eur/arm9/overlays/ov032/symbols.txt | 16 +- config/eur/arm9/overlays/ov063/symbols.txt | 38 ++-- config/eur/arm9/overlays/ov071/symbols.txt | 6 +- config/eur/arm9/overlays/ov102/symbols.txt | 2 +- config/eur1/arm9/overlays/ov000/symbols.txt | 34 +-- config/eur1/arm9/overlays/ov005/symbols.txt | 4 +- config/eur1/arm9/overlays/ov024/symbols.txt | 4 +- config/eur1/arm9/overlays/ov031/symbols.txt | 140 ++++++------ config/eur1/arm9/overlays/ov032/symbols.txt | 16 +- config/eur1/arm9/overlays/ov063/symbols.txt | 36 +-- config/eur1/arm9/overlays/ov071/symbols.txt | 6 +- config/eur1/arm9/overlays/ov102/symbols.txt | 2 +- config/jp/arm9/overlays/ov000/symbols.txt | 34 +-- config/jp/arm9/overlays/ov005/symbols.txt | 4 +- config/jp/arm9/overlays/ov024/symbols.txt | 4 +- config/jp/arm9/overlays/ov031/symbols.txt | 138 ++++++------ config/jp/arm9/overlays/ov032/symbols.txt | 16 +- config/jp/arm9/overlays/ov063/symbols.txt | 38 ++-- config/jp/arm9/overlays/ov071/symbols.txt | 6 +- config/jp/arm9/overlays/ov102/symbols.txt | 2 +- config/usa/arm9/overlays/ov000/symbols.txt | 34 +-- config/usa/arm9/overlays/ov005/symbols.txt | 4 +- config/usa/arm9/overlays/ov024/symbols.txt | 4 +- config/usa/arm9/overlays/ov031/symbols.txt | 140 ++++++------ config/usa/arm9/overlays/ov032/symbols.txt | 16 +- config/usa/arm9/overlays/ov063/symbols.txt | 34 +-- config/usa/arm9/overlays/ov071/symbols.txt | 6 +- config/usa/arm9/overlays/ov102/symbols.txt | 2 +- include/Actor/Actor.hpp | 41 +--- include/Actor/ActorBlast.hpp | 15 +- include/Actor/ActorBomb.hpp | 15 +- include/Actor/ActorEventIcon.hpp | 4 +- include/Actor/ActorFleeingSpinut.hpp | 4 +- include/Actor/ActorHeart.hpp | 6 +- include/Actor/ActorItemBoomerang.hpp | 4 +- include/Actor/ActorItemDrop.hpp | 16 +- include/Actor/ActorItemFlower.hpp | 4 +- include/Actor/ActorItemTornado.hpp | 4 +- include/Actor/ActorKeese.hpp | 4 +- include/Actor/ActorPot.hpp | 8 +- include/Actor/ActorRollingStone.hpp | 28 +-- include/Actor/ActorRupee.hpp | 4 +- include/Actor/ActorShotArrow.hpp | 4 +- include/Actor/ActorSpinut.hpp | 18 +- include/Actor/ActorTearLight.hpp | 6 +- include/Actor/ActorUnkATTG.hpp | 4 +- include/Actor/ActorUnkCANS.hpp | 12 +- include/Actor/ActorUnkCASE.hpp | 4 +- include/Actor/ActorUnkEFIK.hpp | 4 +- include/Actor/ActorUnkEFSB.hpp | 4 +- include/Actor/ActorUnkFLEN.hpp | 4 +- include/Actor/ActorUnkMLCK.hpp | 7 +- include/Actor/ActorUnkNFSP.hpp | 7 +- include/Actor/ActorUnkNORE.hpp | 2 +- include/Actor/ActorUnkNTTZ.hpp | 4 +- include/Actor/ActorUnkOBPC.hpp | 4 +- include/Actor/ActorUnkRBLS.hpp | 4 +- include/Actor/ActorUnkRMSBase.hpp | 6 +- include/Actor/ActorUnkRMSD.hpp | 4 +- include/Actor/ActorUnkRMSV.hpp | 4 +- include/Actor/ActorUnkRMSW.hpp | 4 +- include/Actor/ActorUnkRMTG.hpp | 4 +- include/Actor/ActorUnkROCK.hpp | 4 +- include/Actor/ActorUnkSCCN.hpp | 2 +- include/Actor/ActorUnkSKDO.hpp | 6 +- include/Actor/ActorUnkSWBM.hpp | 4 +- include/Actor/ActorUnkSWCH.hpp | 4 +- include/Actor/ActorUnkSWOB.hpp | 4 +- include/Actor/ActorUnkSWON.hpp | 2 +- include/Actor/ActorUnkSWTM.hpp | 4 +- include/Actor/ActorUnkTGTZ.hpp | 18 +- include/Actor/ActorUnkTLKT.hpp | 6 +- include/Actor/ActorUnkZLSL_ZSRS.hpp | 4 +- include/Actor/Actor_Derived1.hpp | 11 +- include/FileSelect/FileSelect.hpp | 2 - include/MapObject/MapObject.hpp | 11 +- include/MapObject/MapObjectBombFlower.hpp | 12 +- include/MapObject/MapObjectChestBase.hpp | 4 +- include/MapObject/MapObjectDoorClick.hpp | 2 +- .../MapObject/MapObjectDoorDangerSpawn.hpp | 8 +- include/MapObject/MapObjectDoorKey.hpp | 2 +- include/MapObject/MapObjectDoorSwitch.hpp | 2 +- include/MapObject/MapObjectDoorTouch.hpp | 2 +- include/MapObject/MapObjectGrass.hpp | 2 +- include/MapObject/MapObjectMiniBlocks.hpp | 2 +- include/MapObject/MapObjectPot.hpp | 2 +- include/MapObject/MapObjectPot_Base.hpp | 2 +- include/MapObject/MapObjectSwitchStep.hpp | 6 +- include/MapObject/MapObjectUnkLTRW.hpp | 6 +- include/MapObject/MapObjectUnkMTJR.hpp | 6 +- include/MapObject/MapObjectUnkPTFL.hpp | 4 +- include/MapObject/MapObjectUnkSKDI.hpp | 8 +- include/MapObject/MapObjectUnkSTAT.hpp | 6 +- include/MapObject/MapObjectUnkSWHT.hpp | 2 +- include/MapObject/MapObjectUnkSWSW.hpp | 17 +- include/MapObject/MapObject_10_Pot.hpp | 1 + include/MapObject/MapObject_ov031.hpp | 5 +- include/Player/PlayerActorBase.hpp | 5 +- include/Player/PlayerGet.hpp | 5 +- include/Unknown/UnkStruct_ov000_020b34c4.hpp | 4 +- include/Unknown/UnkStruct_ov000_020b5d34.hpp | 3 +- include/Unknown/UnkStruct_ov031_02114664.hpp | 4 +- include/Unknown/UnkStruct_ov031_02114870.hpp | 2 +- include/math.hpp | 27 ++- include/timer.hpp | 83 +++++++ libs/nitro/include/nitro/math.h | 1 + src/000_Second/Actor/Actor.cpp | 33 ++- src/000_Second/Actor/ActorEventIcon.cpp | 2 +- src/000_Second/Actor/ActorUnkEFIK.cpp | 6 +- src/000_Second/Actor/ActorUnkSWOB.cpp | 7 +- src/000_Second/Actor/ActorUnkSWTM.cpp | 13 +- src/000_Second/Actor/Actor_Derived1.cpp | 13 +- src/000_Second/MapObject/MapObject.cpp | 6 +- .../MapObject/MapObjectManager_000.cpp | 2 +- .../MapObject/MapObjectMiniBlocks.cpp | 6 +- .../MapObject/MapObjectPot_Base.cpp | 4 +- .../MapObject/MapObjectSwitchStep.cpp | 17 +- src/001_SceneInit/Actor/ActorManager_001.cpp | 2 +- .../MapObject/MapObjectManager_001.cpp | 2 +- .../Player/PlayerLinkActor_001.cpp | 3 +- .../UnkStruct_ov020_020e8544_001.cpp | 6 +- src/001_SceneInit/code_020bfeec.cpp | 2 +- src/017_CourseExec/Actor/Actor_017.cpp | 34 ++- .../MapObject/MapObjectSwitchStep_017.cpp | 9 +- .../Player/PlayerLinkActor_017.cpp | 12 +- src/019_MainSelect/019_SaveManager.cpp | 6 +- .../019_UnkSystem1_ov019_Derived1.cpp | 8 +- src/019_MainSelect/FileSelectMain.cpp | 138 ++++++------ src/019_MainSelect/FileSelectManager.cpp | 3 +- src/019_MainSelect/FileSelectMicTest.cpp | 8 +- src/019_MainSelect/FileSelectOptions.cpp | 34 +-- src/024_MainGame/Actor/ActorUnkOBPC.cpp | 6 +- .../Game/AdventureModeManager_024.cpp | 3 +- .../Unknown/UnkStruct_027e0d08_024.cpp | 2 +- src/025_Title/TitleScreen.cpp | 12 +- src/026_Train/Actor/ActorUnkRB1T.cpp | 2 +- src/031_Land/Actor/ActorBlast.cpp | 11 +- src/031_Land/Actor/ActorBomb.cpp | 49 ++-- src/031_Land/Actor/ActorHeart.cpp | 57 +++-- src/031_Land/Actor/ActorItemBoomerang.cpp | 23 +- src/031_Land/Actor/ActorItemDrop.cpp | 59 +++-- src/031_Land/Actor/ActorItemFlower.cpp | 38 ++-- src/031_Land/Actor/ActorItemTornado.cpp | 27 +-- src/031_Land/Actor/ActorPot.cpp | 38 ++-- src/031_Land/Actor/ActorRollingStone.cpp | 123 +++++----- src/031_Land/Actor/ActorRupee.cpp | 84 ++++--- src/031_Land/Actor/ActorShotArrow.cpp | 104 +++++---- src/031_Land/Actor/ActorUnkATTG.cpp | 9 +- src/031_Land/Actor/ActorUnkEFSB.cpp | 8 +- src/031_Land/Actor/ActorUnkFLEN.cpp | 8 +- src/031_Land/Actor/ActorUnkMLCK.cpp | 10 +- src/031_Land/Actor/ActorUnkNFSP.cpp | 18 +- src/031_Land/Actor/ActorUnkNORE.cpp | 4 +- src/031_Land/Actor/ActorUnkNTTZ.cpp | 4 +- src/031_Land/Actor/ActorUnkRMTG.cpp | 4 +- src/031_Land/Actor/ActorUnkROCK.cpp | 7 +- src/031_Land/Actor/ActorUnkSCCN.cpp | 4 +- src/031_Land/Actor/ActorUnkSKDO.cpp | 6 +- src/031_Land/Actor/ActorUnkSWBM.cpp | 36 +-- src/031_Land/Actor/ActorUnkSWCH.cpp | 4 +- src/031_Land/Actor/ActorUnkSWON.cpp | 2 +- src/031_Land/Actor/ActorUnkTGTZ.cpp | 68 +++--- src/031_Land/Actor/ActorUnkTLKT.cpp | 3 +- src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp | 212 ++++++++---------- .../MapObject/MapObjectBombFlower.cpp | 22 +- src/031_Land/MapObject/MapObjectChestBase.cpp | 4 +- src/031_Land/MapObject/MapObjectDoorBase.cpp | 17 +- src/031_Land/MapObject/MapObjectDoorClick.cpp | 2 +- .../MapObject/MapObjectDoorDangerSpawn.cpp | 48 ++-- src/031_Land/MapObject/MapObjectDoorKey.cpp | 2 +- .../MapObject/MapObjectDoorSwitch.cpp | 8 +- src/031_Land/MapObject/MapObjectDoorTouch.cpp | 4 +- src/031_Land/MapObject/MapObjectGrass.cpp | 2 +- src/031_Land/MapObject/MapObjectPot.cpp | 6 +- src/031_Land/MapObject/MapObjectUnkSKDI.cpp | 43 ++-- src/031_Land/MapObject/MapObjectUnkSWHT.cpp | 2 +- src/032_MapA1/Actor/ActorFleeingSpinut.cpp | 56 +++-- src/032_MapA1/Actor/ActorKeese.cpp | 89 ++++---- src/032_MapA1/Actor/ActorSpinut.cpp | 166 +++++++------- src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp | 59 ++--- src/063_Shrine/Actor/ActorUnkCANS.cpp | 100 ++++----- src/063_Shrine/Actor/ActorUnkCASE.cpp | 32 +-- src/063_Shrine/Actor/ActorUnkRBLS.cpp | 6 +- src/063_Shrine/Actor/ActorUnkRMSBase.cpp | 10 +- src/063_Shrine/Actor/ActorUnkRMSD.cpp | 8 +- src/063_Shrine/Actor/ActorUnkRMSV.cpp | 8 +- src/063_Shrine/Actor/ActorUnkRMSW.cpp | 8 +- src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp | 14 +- src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp | 16 +- src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp | 31 ++- src/070_Dungeon/Actor/ActorUnkKEYN.cpp | 2 +- src/071_Tower/Actor/ActorTearLight.cpp | 42 ++-- src/102_CourseExecLand/ActorUnkMLCK_102.cpp | 8 +- .../MapObjectUnkPTFL_102.cpp | 6 +- .../MapObjectUnkSAND_102.cpp | 2 +- .../UnkStruct_027e0ce0_40_102.cpp | 10 +- src/110_PlayerGet/PlayerGet.cpp | 8 +- .../PlayerSceneChange.cpp | 18 +- .../PlayerSceneChange2.cpp | 3 +- 204 files changed, 1851 insertions(+), 1985 deletions(-) create mode 100644 include/timer.hpp diff --git a/.clangd b/.clangd index 1770ff82..b2da5914 100644 --- a/.clangd +++ b/.clangd @@ -20,6 +20,7 @@ Diagnostics: - "illegal_union_or_anon_struct_member" - "main_returns_nonint" - "template_spec_needs_header" + - "goto_into_protected_scope" Documentation: CommentFormat: Doxygen --- diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index f7d76cf9..8747fc8e 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2316,9 +2316,9 @@ _ZN5ActorD1Ev kind:function(arm,size=0x4) addr:0x02098470 _ZN5ActorD0Ev kind:function(arm,size=0x14) addr:0x02098474 _ZN5ActorD2Ev kind:function(arm,size=0x4) addr:0x02098488 _ZN5Actor19func_ov000_0209848cEP12ActorProfile kind:function(arm,size=0x1c) addr:0x0209848c -_ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020984a8 -_ZN5Actor8vfunc_1CEv kind:function(arm,size=0x4) addr:0x020984b0 -_ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020984b4 +_ZN5Actor4InitEi kind:function(arm,size=0x8) addr:0x020984a8 +_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 @@ -2436,7 +2436,7 @@ _ZN19ActorProfileUnkSWOB10GetProfileEv kind:function(arm,size=0xc) addr:0x0209a8 _ZN19ActorProfileUnkSWOB6CreateEv kind:function(arm,size=0x24) addr:0x0209a8c4 _ZN19ActorProfileUnkSWOBC1Ev kind:function(arm,size=0x28) addr:0x0209a8e8 _ZN12ActorUnkSWOBC1Ev kind:function(arm,size=0x38) addr:0x0209a910 -_ZN12ActorUnkSWOB8vfunc_18Ei kind:function(arm,size=0x6c) addr:0x0209a948 +_ZN12ActorUnkSWOB4InitEi kind:function(arm,size=0x6c) addr:0x0209a948 _ZN12ActorUnkSWOB8SetStateEs kind:function(arm,size=0x7c) addr:0x0209a9b4 _ZN12ActorUnkSWOB19func_ov000_0209aa30Ev kind:function(arm,size=0x234) addr:0x0209aa30 _ZN12ActorUnkSWOBD1Ev kind:function(arm,size=0x14) addr:0x0209ac64 @@ -2448,8 +2448,8 @@ _ZN19ActorProfileUnkSWTMC1Ev kind:function(arm,size=0x28) addr:0x0209acd8 _ZN12ActorUnkSWTMC1Ev kind:function(arm,size=0x5c) addr:0x0209ad00 _ZN12ActorUnkSWTMD1Ev kind:function(arm,size=0x48) addr:0x0209ad5c _ZN12ActorUnkSWTMD0Ev kind:function(arm,size=0x50) addr:0x0209ada4 -_ZN12ActorUnkSWTM8vfunc_18Ei kind:function(arm,size=0x74) addr:0x0209adf4 -_ZN12ActorUnkSWTM8vfunc_20Ev kind:function(arm,size=0xe8) addr:0x0209ae68 +_ZN12ActorUnkSWTM4InitEi kind:function(arm,size=0x74) addr:0x0209adf4 +_ZN12ActorUnkSWTM6UpdateEv kind:function(arm,size=0xe8) addr:0x0209ae68 _ZN12ActorUnkSWTM8vfunc_24Ev kind:function(arm,size=0x4) addr:0x0209af50 _ZN12ActorUnkSWTM8SetStateEs kind:function(arm,size=0x90) addr:0x0209af54 _ZN12ActorUnkSWTM19func_ov000_0209afe4Ev kind:function(arm,size=0x54) addr:0x0209afe4 @@ -2477,7 +2477,7 @@ _ZN21ActorProfileEventIcon10GetProfileEv kind:function(arm,size=0xc) addr:0x0209 _ZN21ActorProfileEventIcon6CreateEv kind:function(arm,size=0x24) addr:0x0209bf94 _ZN21ActorProfileEventIconC1Ev kind:function(arm,size=0x28) addr:0x0209bfb8 _ZN14ActorEventIconC1Ev kind:function(arm,size=0x34) addr:0x0209bfe0 -_ZN14ActorEventIcon8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0209c014 +_ZN14ActorEventIcon4InitEi kind:function(arm,size=0x1c) addr:0x0209c014 _ZN14ActorEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209c030 _ZN14ActorEventIconD0Ev kind:function(arm,size=0x1c) addr:0x0209c044 _ZN21ActorProfileEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209c060 @@ -2485,8 +2485,8 @@ _ZN19ActorProfileUnkEFIK10GetProfileEv kind:function(arm,size=0xc) addr:0x0209c0 _ZN19ActorProfileUnkEFIK6CreateEv kind:function(arm,size=0x24) addr:0x0209c080 _ZN19ActorProfileUnkEFIKC1Ev kind:function(arm,size=0x28) addr:0x0209c0a4 _ZN12ActorUnkEFIKC1Ev kind:function(arm,size=0x34) addr:0x0209c0cc -_ZN12ActorUnkEFIK8vfunc_18Ei kind:function(arm,size=0x40) addr:0x0209c100 -_ZN12ActorUnkEFIK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x0209c140 +_ZN12ActorUnkEFIK4InitEi kind:function(arm,size=0x40) addr:0x0209c100 +_ZN12ActorUnkEFIK6UpdateEv kind:function(arm,size=0x190) addr:0x0209c140 _ZN12ActorUnkEFIK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0209c2d0 _ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209c2e4 _ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209c2ec @@ -2551,8 +2551,8 @@ _ZN9MapObjectC2Ev kind:function(arm,size=0xb4) addr:0x0209cfe0 _ZN9MapObjectD1Ev kind:function(arm,size=0x4) addr:0x0209d094 _ZN9MapObjectD0Ev kind:function(arm,size=0x14) addr:0x0209d098 _ZN9MapObjectD2Ev kind:function(arm,size=0x4) addr:0x0209d0ac -_ZN9MapObject8vfunc_00Ev kind:function(arm,size=0x8) addr:0x0209d0b0 -_ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209d0b8 +_ZN9MapObject4InitEv kind:function(arm,size=0x8) addr:0x0209d0b0 +_ZN9MapObject5SetupEv kind:function(arm,size=0x4) addr:0x0209d0b8 _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) addr:0x0209d0bc _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d114 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d12c @@ -2578,7 +2578,7 @@ _ZN9MapObject19func_ov000_0209d6acEP7VecFx32 kind:function(arm,size=0x54) addr:0 _ZN17MapObjectPot_BaseC2Ev kind:function(arm,size=0x50) addr:0x0209d700 _ZN17MapObjectPot_BaseD0Ev kind:function(arm,size=0x1c) addr:0x0209d750 _ZN17MapObjectPot_BaseD2Ev kind:function(arm,size=0x14) addr:0x0209d76c -_ZN17MapObjectPot_Base8vfunc_00Ev kind:function(arm,size=0x24) addr:0x0209d780 +_ZN17MapObjectPot_Base4InitEv kind:function(arm,size=0x24) addr:0x0209d780 _ZN17MapObjectPot_Base8SetStateEsi kind:function(arm,size=0x144) addr:0x0209d7a4 _ZN17MapObjectPot_Base8vfunc_24EP9MapObject7VecFx32 kind:function(arm,size=0xc4) addr:0x0209d8e8 _ZN17MapObjectPot_Base8vfunc_38Ev kind:function(arm,size=0x4c) addr:0x0209d9ac @@ -2607,7 +2607,7 @@ _ZN19MapObjectSwitchStepC1Ev kind:function(arm,size=0xfc) addr:0x0209dea0 _ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209df9c _ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209dfb0 _ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209e008 -_ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209e068 +_ZN19MapObjectSwitchStep4InitEv kind:function(arm,size=0xb4) addr:0x0209e068 _ZN19MapObjectSwitchStep19func_ov000_0209e11cEsi kind:function(arm,size=0x164) addr:0x0209e11c _ZN19MapObjectSwitchStep8vfunc_20Ei kind:function(arm,size=0x34) addr:0x0209e280 _ZN19MapObjectSwitchStep8vfunc_18EPc kind:function(arm,size=0xd8) addr:0x0209e2b4 @@ -2618,7 +2618,7 @@ _ZN26MapObjectProfileMiniBlocks10GetProfileEv kind:function(arm,size=0xc) addr:0 _ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x0209e404 _ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209e428 _ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209e474 -_ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209e4b0 +_ZN19MapObjectMiniBlocks4InitEv kind:function(arm,size=0x1fc) addr:0x0209e4b0 _ZN19MapObjectMiniBlocks8vfunc_14Ei kind:function(arm,size=0x60) addr:0x0209e6ac _ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209e70c _ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209e72c @@ -3028,9 +3028,9 @@ _ZN14Actor_Derived1C1EP11ModelRenderP20Actor_Derived1_94_0C kind:function(arm,si _ZN14Actor_Derived1D1Ev kind:function(arm,size=0x20) addr:0x020a8cc0 _ZN14Actor_Derived1D0Ev kind:function(arm,size=0x28) addr:0x020a8ce0 _ZN14Actor_Derived1D2Ev kind:function(arm,size=0x20) addr:0x020a8d08 -_ZN14Actor_Derived18vfunc_18Ei kind:function(arm,size=0x78) addr:0x020a8d28 +_ZN14Actor_Derived14InitEi kind:function(arm,size=0x78) addr:0x020a8d28 _ZN14Actor_Derived18vfunc_54Ei kind:function(arm,size=0x4) addr:0x020a8da0 -_ZN14Actor_Derived18vfunc_1CEv kind:function(arm,size=0xc) addr:0x020a8da4 +_ZN14Actor_Derived15SetupEv kind:function(arm,size=0xc) addr:0x020a8da4 _ZN14Actor_Derived119func_ov000_020a8db0Ev kind:function(arm,size=0x20) addr:0x020a8db0 _ZN14Actor_Derived119func_ov000_020a8dd0Ev kind:function(arm,size=0x20) addr:0x020a8dd0 _ZN14Actor_Derived119func_ov000_020a8df0E8ActorRefi kind:function(arm,size=0x94) addr:0x020a8df0 @@ -3065,7 +3065,7 @@ _ZN14Actor_Derived119func_ov000_020a95d8Ev kind:function(arm,size=0xc) addr:0x02 _ZN14Actor_Derived18vfunc_A4Ev kind:function(arm,size=0x218) addr:0x020a95e4 _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a97fc _ZN14Actor_Derived119func_ov000_020a9804Ev kind:function(arm,size=0xec) addr:0x020a9804 -_ZN14Actor_Derived18vfunc_20Ev kind:function(arm,size=0x4) addr:0x020a98f0 +_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_B8Ev kind:function(arm,size=0x34) addr:0x020a99a4 diff --git a/config/eur/arm9/overlays/ov005/symbols.txt b/config/eur/arm9/overlays/ov005/symbols.txt index ebb0544e..1002ce5c 100644 --- a/config/eur/arm9/overlays/ov005/symbols.txt +++ b/config/eur/arm9/overlays/ov005/symbols.txt @@ -2,10 +2,10 @@ func_ov005_020b6520 kind:function(arm,size=0x28) addr:0x020b6520 func_ov005_020b6548 kind:function(arm,size=0x28) addr:0x020b6548 _ZN16MapObjectManager19func_ov005_020b6570Ei kind:function(arm,size=0x134) addr:0x020b6570 _ZN12ActorManager19func_ov005_020b66a4Ei kind:function(arm,size=0x1a4) addr:0x020b66a4 -_ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b6848 +_ZN12ActorUnkSWOB6UpdateEv kind:function(arm,size=0xf4) addr:0x020b6848 func_ov005_020b693c kind:function(arm,size=0x224) addr:0x020b693c func_ov005_020b6b60 kind:function(arm,size=0x4c) addr:0x020b6b60 -_ZN14ActorEventIcon8vfunc_20Ev kind:function(arm,size=0x84) addr:0x020b6bac +_ZN14ActorEventIcon6UpdateEv kind:function(arm,size=0x84) addr:0x020b6bac func_ov005_020b6c30 kind:function(arm,size=0xd0) addr:0x020b6c30 func_ov005_020b6d00 kind:function(arm,size=0x84) addr:0x020b6d00 func_ov005_020b6d84 kind:function(arm,size=0x15c) addr:0x020b6d84 diff --git a/config/eur/arm9/overlays/ov024/symbols.txt b/config/eur/arm9/overlays/ov024/symbols.txt index c940b6a6..581d27fb 100644 --- a/config/eur/arm9/overlays/ov024/symbols.txt +++ b/config/eur/arm9/overlays/ov024/symbols.txt @@ -710,9 +710,9 @@ _ZN19ActorProfileUnkOBPC10GetProfileEv kind:function(arm,size=0xc) addr:0x020d6e _ZN19ActorProfileUnkOBPC6CreateEv kind:function(arm,size=0x24) addr:0x020d6ea8 _ZN19ActorProfileUnkOBPCC1Ev kind:function(arm,size=0x28) addr:0x020d6ecc _ZN12ActorUnkOBPCC1Ev kind:function(arm,size=0x34) addr:0x020d6ef4 -_ZN12ActorUnkOBPC8vfunc_18Ei kind:function(arm,size=0x4c) addr:0x020d6f28 +_ZN12ActorUnkOBPC4InitEi kind:function(arm,size=0x4c) addr:0x020d6f28 _ZN12ActorUnkOBPC19func_ov024_020d6f74Ev kind:function(arm,size=0x20) addr:0x020d6f74 -_ZN12ActorUnkOBPC8vfunc_20Ev kind:function(arm,size=0xbc) addr:0x020d6f94 +_ZN12ActorUnkOBPC6UpdateEv kind:function(arm,size=0xbc) addr:0x020d6f94 _ZN12ActorUnkOBPC8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020d7050 _ZN12ActorUnkOBPC8SetStateEsi kind:function(arm,size=0xf0) addr:0x020d7064 _ZN12ActorUnkOBPC19func_ov024_020d7154Ev kind:function(arm,size=0x168) addr:0x020d7154 diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 7b5b660e..5701fe73 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -314,13 +314,13 @@ _ZN9ActorBomb19func_ov031_020e1634Ev kind:function(arm,size=0x58) addr:0x020e163 _ZN9ActorBombC1Ev kind:function(arm,size=0x168) addr:0x020e168c _ZN13ActorBomb_unkD1Ev kind:function(arm,size=0x14) addr:0x020e17f4 _ZN13ActorBomb_19CD1Ev kind:function(arm,size=0x14) addr:0x020e1808 -_ZN9ActorBomb8vfunc_18Ei kind:function(arm,size=0x84) addr:0x020e181c +_ZN9ActorBomb4InitEi kind:function(arm,size=0x84) addr:0x020e181c _ZN9ActorBomb19func_ov031_020e18a0Ev kind:function(arm,size=0x24) addr:0x020e18a0 _ZN9ActorBomb8SetStateEs kind:function(arm,size=0x44) addr:0x020e18c4 _ZN9ActorBomb19func_ov031_020e1908Ev kind:function(arm,size=0x18) addr:0x020e1908 _ZN9ActorBomb19func_ov031_020e1920EP7VecFx32 kind:function(arm,size=0x1c) addr:0x020e1920 _ZN9ActorBomb19func_ov031_020e193cEv kind:function(arm,size=0xec) addr:0x020e193c -_ZN9ActorBomb8vfunc_20Ev kind:function(arm,size=0xd0) addr:0x020e1a28 +_ZN9ActorBomb6UpdateEv kind:function(arm,size=0xd0) addr:0x020e1a28 _ZN9ActorBomb8vfunc_24Ev kind:function(arm,size=0x24) addr:0x020e1af8 _ZN9ActorBomb19func_ov031_020e1b1cEv kind:function(arm,size=0x60) addr:0x020e1b1c _ZN9ActorBomb19func_ov031_020e1b7cEv kind:function(arm,size=0x19c) addr:0x020e1b7c @@ -376,8 +376,8 @@ _ZN17ActorProfileBlastC1Ev kind:function(arm,size=0x38) addr:0x020e34e4 _ZN13ActorBlast_E88vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x1a4) addr:0x020e351c _ZN10ActorBlastC1Ev kind:function(arm,size=0x7c) addr:0x020e36c0 _ZN13ActorBlast_E8D1Ev kind:function(arm,size=0x14) addr:0x020e373c -_ZN10ActorBlast8vfunc_18Ei kind:function(arm,size=0x274) addr:0x020e3750 -_ZN10ActorBlast8vfunc_20Ev kind:function(arm,size=0x180) addr:0x020e39c4 +_ZN10ActorBlast4InitEi kind:function(arm,size=0x274) addr:0x020e3750 +_ZN10ActorBlast6UpdateEv kind:function(arm,size=0x180) addr:0x020e39c4 _ZN10ActorBlast8vfunc_24Ev kind:function(arm,size=0x50) addr:0x020e3b44 _ZN10ActorBlast19func_ov031_020e3b94Ev kind:function(arm,size=0x8) addr:0x020e3b94 _ZN10ActorBlast19func_ov031_020e3b9cEP5Actorss kind:function(arm,size=0x80) addr:0x020e3b9c @@ -391,10 +391,10 @@ func_ov031_020e3d10 kind:function(arm,size=0x90) addr:0x020e3d10 _ZN22ActorUnkTLKTnCLLT_BaseC2Ev kind:function(arm,size=0x30) addr:0x020e3da0 func_ov031_020e3dd0 kind:function(arm,size=0x28) addr:0x020e3dd0 _ZN22ActorUnkTLKTnCLLT_Base19func_ov031_020e3df8Ev kind:function(arm,size=0x20) addr:0x020e3df8 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_18Ei kind:function(arm,size=0x2c) addr:0x020e3e18 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_1CEv kind:function(arm,size=0x28) addr:0x020e3e44 +_ZN22ActorUnkTLKTnCLLT_Base4InitEi kind:function(arm,size=0x2c) addr:0x020e3e18 +_ZN22ActorUnkTLKTnCLLT_Base5SetupEv kind:function(arm,size=0x28) addr:0x020e3e44 _ZN22ActorUnkTLKTnCLLT_Base19func_ov031_020e3e6cEv kind:function(arm,size=0x18) addr:0x020e3e6c -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_20Ev kind:function(arm,size=0x54) addr:0x020e3e84 +_ZN22ActorUnkTLKTnCLLT_Base6UpdateEv kind:function(arm,size=0x54) addr:0x020e3e84 _ZN22ActorUnkTLKTnCLLT_Base8vfunc_24Ev kind:function(arm,size=0x28) addr:0x020e3ed8 func_ov031_020e3f00 kind:function(arm,size=0x50) addr:0x020e3f00 _ZN22ActorUnkTLKTnCLLT_Base8vfunc_54Ev kind:function(arm,size=0x124) addr:0x020e3f50 @@ -429,10 +429,10 @@ _ZN21ActorItemBoomerang_A0D1Ev kind:function(arm,size=0x14) addr:0x020e4760 _ZN21ActorItemBoomerang_CCD1Ev kind:function(arm,size=0x14) addr:0x020e4774 _ZN18ActorItemBoomerangD1Ev kind:function(arm,size=0xa0) addr:0x020e4788 _ZN18ActorItemBoomerangD0Ev kind:function(arm,size=0xa8) addr:0x020e4828 -_ZN18ActorItemBoomerang8vfunc_18Ei kind:function(arm,size=0xc4) addr:0x020e48d0 +_ZN18ActorItemBoomerang4InitEi kind:function(arm,size=0xc4) addr:0x020e48d0 _ZN18ActorItemBoomerang8SetStateEs kind:function(arm,size=0x1c) addr:0x020e4994 _ZN18ActorItemBoomerang19func_ov031_020e49b0Ei kind:function(arm,size=0x70) addr:0x020e49b0 -_ZN18ActorItemBoomerang8vfunc_20Ev kind:function(arm,size=0x614) addr:0x020e4a20 +_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 @@ -457,10 +457,10 @@ _ZN23ActorProfileItemTornado6CreateEv kind:function(arm,size=0x24) addr:0x020e58 _ZN23ActorProfileItemTornadoC1Ev kind:function(arm,size=0x44) addr:0x020e58f8 _ZN16ActorItemTornadoC1Ev kind:function(arm,size=0x1e4) addr:0x020e593c _ZN24UnkStruct_ov031_02112ff4D1Ev kind:function(arm,size=0x14) addr:0x020e5b20 -_ZN16ActorItemTornado8vfunc_18Ei kind:function(arm,size=0xcc) addr:0x020e5b34 +_ZN16ActorItemTornado4InitEi kind:function(arm,size=0xcc) addr:0x020e5b34 _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5c00 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5d18 -_ZN16ActorItemTornado8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020e6148 +_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 _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e62c0 @@ -492,11 +492,11 @@ _ZN19ActorProfileUnkSWBMC1Ev kind:function(arm,size=0x44) addr:0x020e6b64 _ZN12ActorUnkSWBMC1Ev kind:function(arm,size=0xb8) addr:0x020e6ba8 _ZN15ActorUnkSWBM_94D1Ev kind:function(arm,size=0x14) addr:0x020e6c60 _ZN15ActorUnkSWBM_98D1Ev kind:function(arm,size=0x14) addr:0x020e6c74 -_ZN12ActorUnkSWBM8vfunc_18Ei kind:function(arm,size=0xc0) addr:0x020e6c88 +_ZN12ActorUnkSWBM4InitEi kind:function(arm,size=0xc0) addr:0x020e6c88 _ZN12ActorUnkSWBM19func_ov031_020e6d48Ev kind:function(arm,size=0x38) addr:0x020e6d48 _ZN12ActorUnkSWBM19func_ov031_020e6d80Ei kind:function(arm,size=0x104) addr:0x020e6d80 _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020e6e84 -_ZN12ActorUnkSWBM8vfunc_20Ev kind:function(arm,size=0x268) addr:0x020e6ef8 +_ZN12ActorUnkSWBM6UpdateEv kind:function(arm,size=0x268) addr:0x020e6ef8 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7160 _ZN12ActorUnkSWBM19func_ov031_020e718cEP7VecFx32P5Mat3pists kind:function(arm,size=0x108) addr:0x020e718c _ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e7294 @@ -546,8 +546,8 @@ _ZN19ActorProfileUnkROCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020e88 _ZN19ActorProfileUnkROCK6CreateEv kind:function(arm,size=0x24) addr:0x020e8830 _ZN19ActorProfileUnkROCKC1Ev kind:function(arm,size=0x8c) addr:0x020e8854 _ZN12ActorUnkROCKC1Ev kind:function(arm,size=0x9c) addr:0x020e88e0 -_ZN12ActorUnkROCK8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020e897c -_ZN12ActorUnkROCK8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020e89ac +_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 @@ -561,7 +561,7 @@ _ZN17ActorProfileRupee6CreateEv kind:function(arm,size=0x24) addr:0x020e8cc4 _ZN17ActorProfileRupeeC1Ev kind:function(arm,size=0x44) addr:0x020e8ce8 _ZN10ActorRupee19func_ov031_020e8d2cEP8ActorRefPK7VecFx32jjS0_ kind:function(arm,size=0x7c) addr:0x020e8d2c _ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020e8da8 -_ZN10ActorRupee8vfunc_18Ei kind:function(arm,size=0x1d0) addr:0x020e8e1c +_ZN10ActorRupee4InitEi kind:function(arm,size=0x1d0) addr:0x020e8e1c _ZN10ActorRupee19func_ov031_020e8fecEv kind:function(arm,size=0x7c) addr:0x020e8fec _ZN10ActorRupee19func_ov031_020e9068Ev kind:function(arm,size=0xa0) addr:0x020e9068 _ZN10ActorRupee19func_ov031_020e9108Ev kind:function(arm,size=0xa0) addr:0x020e9108 @@ -591,7 +591,7 @@ _ZN10ActorRupee19func_ov031_020e9740Ev kind:function(arm,size=0xf8) addr:0x020e9 _ZN10ActorRupee19func_ov031_020e9838Ev kind:function(arm,size=0x8c) addr:0x020e9838 _ZN10ActorRupee19func_ov031_020e98c4Ev kind:function(arm,size=0x40) addr:0x020e98c4 _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e9904 -_ZN10ActorRupee8vfunc_20Ev kind:function(arm,size=0x230) addr:0x020e9958 +_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 @@ -624,7 +624,7 @@ _ZN17ActorUnkZLSL_27CCD1Ev kind:function(thumb,size=0xc) addr:0x020ea518 _ZN12ActorUnkZLSLD1Ev kind:function(thumb,size=0xa4) addr:0x020ea524 _ZN12ActorUnkZLSLD0Ev kind:function(thumb,size=0xac) addr:0x020ea5c8 _ZN12ActorUnkZLSL19func_ov031_020ea674Ev kind:function(arm,size=0x24) addr:0x020ea674 -_ZN12ActorUnkZLSL8vfunc_18Ei kind:function(arm,size=0x10c) addr:0x020ea698 +_ZN12ActorUnkZLSL4InitEi kind:function(arm,size=0x10c) addr:0x020ea698 _ZN12ActorUnkZLSL8vfunc_ACEv kind:function(arm,size=0x4) addr:0x020ea7a4 _ZN12ActorUnkZLSL19func_ov031_020ea7a8Ev kind:function(arm,size=0xbc) addr:0x020ea7a8 _ZN12ActorUnkZLSL19func_ov031_020ea864Ev kind:function(arm,size=0x4) addr:0x020ea864 @@ -634,7 +634,7 @@ _ZN12ActorUnkZLSL8vfunc_58Es kind:function(arm,size=0x50) addr:0x020ea870 _ZN12ActorUnkZLSL19func_ov031_020ea8c0Ev kind:function(arm,size=0x4) addr:0x020ea8c0 _ZN12ActorUnkZLSL19func_ov031_020ea8c4Ev kind:function(arm,size=0x4) addr:0x020ea8c4 _ZN12ActorUnkZLSL19func_ov031_020ea8c8Ev kind:function(arm,size=0x4) addr:0x020ea8c8 -_ZN12ActorUnkZLSL8vfunc_20Ev kind:function(arm,size=0x19c) addr:0x020ea8cc +_ZN12ActorUnkZLSL6UpdateEv kind:function(arm,size=0x19c) addr:0x020ea8cc _ZN12ActorUnkZLSL19func_ov031_020eaa68Ev kind:function(arm,size=0x20) addr:0x020eaa68 _ZN12ActorUnkZLSL19func_ov031_020eaa88Ev kind:function(arm,size=0x4) addr:0x020eaa88 _ZN12ActorUnkZLSL19func_ov031_020eaa8cEv kind:function(arm,size=0x80) addr:0x020eaa8c @@ -733,8 +733,8 @@ _ZN17ActorProfileHeart6CreateEv kind:function(arm,size=0x24) addr:0x020eed00 _ZN17ActorProfileHeartC1Ev kind:function(arm,size=0x40) addr:0x020eed24 _ZN10ActorHeart19func_ov031_020eed64EP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020eed64 _ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020eede0 -_ZN10ActorHeart8vfunc_18Ei kind:function(arm,size=0x10) addr:0x020eeed8 -_ZN10ActorHeart8vfunc_20Ev kind:function(arm,size=0x2cc) addr:0x020eeee8 +_ZN10ActorHeart4InitEi kind:function(arm,size=0x10) addr:0x020eeed8 +_ZN10ActorHeart6UpdateEv kind:function(arm,size=0x2cc) addr:0x020eeee8 _ZN10ActorHeart8SetStateEs kind:function(arm,size=0x54) addr:0x020ef1b4 _ZN10ActorHeart19func_ov031_020ef208Ev kind:function(arm,size=0xe4) addr:0x020ef208 _ZN10ActorHeart19func_ov031_020ef2ecEv kind:function(arm,size=0xc) addr:0x020ef2ec @@ -766,8 +766,8 @@ _ZN19ActorProfileUnkRMTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020ef8 _ZN19ActorProfileUnkRMTG6CreateEv kind:function(arm,size=0x24) addr:0x020ef828 _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef84c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef874 -_ZN12ActorUnkRMTG8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020ef8a0 -_ZN12ActorUnkRMTG8vfunc_1CEv kind:function(arm,size=0x38) addr:0x020ef958 +_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 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020ef9b0 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020ef9d0 @@ -776,19 +776,19 @@ _ZN19ActorProfileUnkSCCN10GetProfileEv kind:function(arm,size=0xc) addr:0x020efa _ZN19ActorProfileUnkSCCN6CreateEv kind:function(arm,size=0x24) addr:0x020efa18 _ZN19ActorProfileUnkSCCNC1Ev kind:function(arm,size=0x28) addr:0x020efa3c _ZN12ActorUnkSCCNC1Ev kind:function(arm,size=0x3c) addr:0x020efa64 -_ZN12ActorUnkSCCN8vfunc_18Ei kind:function(arm,size=0x1d8) addr:0x020efaa0 +_ZN12ActorUnkSCCN4InitEi kind:function(arm,size=0x1d8) addr:0x020efaa0 _ZN12ActorUnkSCCND1Ev kind:function(arm,size=0x20) addr:0x020efc78 _ZN12ActorUnkSCCND0Ev kind:function(arm,size=0x28) addr:0x020efc98 _ZN19ActorProfileUnkSCCND1Ev kind:function(arm,size=0x14) addr:0x020efcc0 _ZN20Actor_ov031_02113fd4C2Ev kind:function(arm,size=0x98) addr:0x020efcd4 -_ZN20Actor_ov031_02113fd48vfunc_18Ei kind:function(arm,size=0x60) addr:0x020efd6c +_ZN20Actor_ov031_02113fd44InitEi kind:function(arm,size=0x60) addr:0x020efd6c _ZN20Actor_ov031_02113fd44GrabE15ActorGrabParams kind:function(arm,size=0x3c) addr:0x020efdcc _ZN20Actor_ov031_02113fd44DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0xb8) addr:0x020efe08 func_ov031_020efec0 kind:function(arm,size=0x18) addr:0x020efec0 func_ov031_020efed8 kind:function(arm,size=0x2c) addr:0x020efed8 func_ov031_020eff04 kind:function(arm,size=0xb8) addr:0x020eff04 func_ov031_020effbc kind:function(arm,size=0xa0) addr:0x020effbc -_ZN20Actor_ov031_02113fd48vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f005c +_ZN20Actor_ov031_02113fd46UpdateEv kind:function(arm,size=0x4) addr:0x020f005c _ZN20Actor_ov031_02113fd48vfunc_24Ev kind:function(arm,size=0x30) addr:0x020f0060 _ZN20Actor_ov031_02113fd48vfunc_60Ev kind:function(arm,size=0x4) addr:0x020f0090 _ZN20Actor_ov031_02113fd419func_ov031_020f0094Ev kind:function(arm,size=0x4) addr:0x020f0094 @@ -827,9 +827,9 @@ _ZN15ActorProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x020f0c0c _ZN15ActorProfilePotC1Ev kind:function(arm,size=0x30) addr:0x020f0c30 _ZN8ActorPotC1Ev kind:function(arm,size=0x90) addr:0x020f0c60 _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0cf0 -_ZN8ActorPot8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f0d04 +_ZN8ActorPot4InitEi kind:function(arm,size=0x28) addr:0x020f0d04 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0d2c -_ZN8ActorPot8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f0d80 +_ZN8ActorPot6UpdateEv kind:function(arm,size=0x38) addr:0x020f0d80 _ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 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 @@ -851,9 +851,9 @@ _ZN22ActorProfileItemFlower6CreateEv kind:function(arm,size=0x24) addr:0x020f0fd _ZN22ActorProfileItemFlowerC1Ev kind:function(arm,size=0x30) addr:0x020f0ffc _ZN15ActorItemFlowerC1Ev kind:function(arm,size=0x94) addr:0x020f102c _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f10c0 -_ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f10d4 +_ZN15ActorItemFlower4InitEi kind:function(arm,size=0x28) addr:0x020f10d4 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f10fc -_ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f1140 +_ZN15ActorItemFlower6UpdateEv kind:function(arm,size=0x38) addr:0x020f1140 _ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 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 @@ -878,13 +878,13 @@ _ZN14ActorShotArrowC1Ev kind:function(arm,size=0x1ec) addr:0x020f141c _ZN18ActorShotArrow_194D1Ev kind:function(arm,size=0x14) addr:0x020f1608 _ZN14ActorShotArrowD1Ev kind:function(arm,size=0x8c) addr:0x020f161c _ZN14ActorShotArrowD0Ev kind:function(arm,size=0x94) addr:0x020f16a8 -_ZN14ActorShotArrow8vfunc_18Ei kind:function(arm,size=0x12c) addr:0x020f173c +_ZN14ActorShotArrow4InitEi kind:function(arm,size=0x12c) addr:0x020f173c _ZN14ActorShotArrow19func_ov031_020f1868Ev kind:function(arm,size=0xc) addr:0x020f1868 _ZN14ActorShotArrow19func_ov031_020f1874Ev kind:function(arm,size=0x4) addr:0x020f1874 _ZN14ActorShotArrow8SetStateEj kind:function(arm,size=0x44) addr:0x020f1878 _ZN14ActorShotArrow8vfunc_24Ev kind:function(arm,size=0x9c) addr:0x020f18bc _ZN14ActorShotArrow19func_ov031_020f1958Ev kind:function(arm,size=0x4) addr:0x020f1958 -_ZN14ActorShotArrow8vfunc_20Ev kind:function(arm,size=0x108) addr:0x020f195c +_ZN14ActorShotArrow6UpdateEv kind:function(arm,size=0x108) addr:0x020f195c _ZN14ActorShotArrow19func_ov031_020f1a64Ev kind:function(arm,size=0xa0) addr:0x020f1a64 _ZN14ActorShotArrow19func_ov031_020f1b04Ev kind:function(arm,size=0x120) addr:0x020f1b04 _ZN14ActorShotArrow19func_ov031_020f1c24Ev kind:function(arm,size=0x58) addr:0x020f1c24 @@ -936,8 +936,8 @@ _ZN19ActorProfileUnkATTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020f3d _ZN19ActorProfileUnkATTG6CreateEv kind:function(arm,size=0x24) addr:0x020f3d88 _ZN19ActorProfileUnkATTGC1Ev kind:function(arm,size=0x28) addr:0x020f3dac _ZN12ActorUnkATTGC1Ev kind:function(arm,size=0x28) addr:0x020f3dd4 -_ZN12ActorUnkATTG8vfunc_18Ei kind:function(arm,size=0x54) addr:0x020f3dfc -_ZN12ActorUnkATTG8vfunc_20Ev kind:function(arm,size=0x5c) addr:0x020f3e50 +_ZN12ActorUnkATTG4InitEi kind:function(arm,size=0x54) addr:0x020f3dfc +_ZN12ActorUnkATTG6UpdateEv kind:function(arm,size=0x5c) addr:0x020f3e50 _ZN12ActorUnkATTG8vfunc_24Ev kind:function(arm,size=0x40) addr:0x020f3eac _ZN12ActorUnkATTG19func_ov031_020f3eecEsi kind:function(arm,size=0x128) addr:0x020f3eec _ZN12ActorUnkATTG19func_ov031_020f4014Ev kind:function(arm,size=0x44) addr:0x020f4014 @@ -995,8 +995,8 @@ _ZN19ActorProfileUnkNTTZ10GetProfileEv kind:function(arm,size=0xc) addr:0x020f61 _ZN19ActorProfileUnkNTTZ6CreateEv kind:function(arm,size=0x24) addr:0x020f6114 _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6138 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6160 -_ZN12ActorUnkNTTZ8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020f6190 -_ZN12ActorUnkNTTZ8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f6198 +_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 _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f61a0 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f61f0 @@ -1022,8 +1022,8 @@ _ZN19ActorProfileUnkTGTZ6CreateEv kind:function(arm,size=0x24) addr:0x020f6840 _ZN19ActorProfileUnkTGTZC1Ev kind:function(arm,size=0x44) addr:0x020f6864 _ZN12ActorUnkTGTZC1Ev kind:function(arm,size=0xdc) addr:0x020f68a8 _ZN24ActorUnkTGTZ_ModelRenderD1Ev kind:function(arm,size=0x14) addr:0x020f6984 -_ZN12ActorUnkTGTZ8vfunc_18Ei kind:function(arm,size=0x14c) addr:0x020f6998 -_ZN12ActorUnkTGTZ8vfunc_20Ev kind:function(arm,size=0x364) addr:0x020f6ae4 +_ZN12ActorUnkTGTZ4InitEi kind:function(arm,size=0x14c) addr:0x020f6998 +_ZN12ActorUnkTGTZ6UpdateEv kind:function(arm,size=0x364) addr:0x020f6ae4 _ZN12ActorUnkTGTZ8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020f6e48 _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE8ActorRef kind:function(arm,size=0x4c) addr:0x020f6e5c _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP8ActorReftPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6ea8 @@ -1041,7 +1041,7 @@ func_ov031_020f7474 kind:function(arm,size=0x20) addr:0x020f7474 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_021148708vfunc_18Ei kind:function(arm,size=0x3c) addr:0x020f7538 +_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_54Ev kind:function(arm,size=0x8) addr:0x020f7594 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f759c @@ -1070,8 +1070,8 @@ _ZN19ActorProfileUnkSWCH10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7a _ZN19ActorProfileUnkSWCH6CreateEv kind:function(arm,size=0x24) addr:0x020f7a90 _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7ab4 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7adc -_ZN12ActorUnkSWCH8vfunc_18Ei kind:function(arm,size=0x14) addr:0x020f7b0c -_ZN12ActorUnkSWCH8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020f7b20 +_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 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7b98 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7bac @@ -1084,7 +1084,7 @@ _ZN19ActorProfileUnkSWON10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7d _ZN19ActorProfileUnkSWON6CreateEv kind:function(arm,size=0x24) addr:0x020f7dc8 _ZN19ActorProfileUnkSWONC1Ev kind:function(arm,size=0x28) addr:0x020f7dec _ZN12ActorUnkSWONC1Ev kind:function(arm,size=0x20) addr:0x020f7e14 -_ZN12ActorUnkSWON8vfunc_18Ei kind:function(arm,size=0x9c) addr:0x020f7e34 +_ZN12ActorUnkSWON4InitEi kind:function(arm,size=0x9c) addr:0x020f7e34 _ZN12ActorUnkSWOND1Ev kind:function(arm,size=0x14) addr:0x020f7ed0 _ZN12ActorUnkSWOND0Ev kind:function(arm,size=0x1c) addr:0x020f7ee4 _ZN19ActorProfileUnkSWOND1Ev kind:function(arm,size=0x14) addr:0x020f7f00 @@ -1092,7 +1092,7 @@ _ZN19ActorProfileUnkNORE10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7f _ZN19ActorProfileUnkNORE6CreateEv kind:function(arm,size=0x24) addr:0x020f7f20 _ZN19ActorProfileUnkNOREC1Ev kind:function(arm,size=0x28) addr:0x020f7f44 _ZN12ActorUnkNOREC1Ev kind:function(arm,size=0x20) addr:0x020f7f6c -_ZN12ActorUnkNORE8vfunc_18Ei kind:function(arm,size=0x54) addr:0x020f7f8c +_ZN12ActorUnkNORE4InitEi kind:function(arm,size=0x54) addr:0x020f7f8c _ZN12ActorUnkNORED1Ev kind:function(arm,size=0x14) addr:0x020f7fe0 _ZN12ActorUnkNORED0Ev kind:function(arm,size=0x1c) addr:0x020f7ff4 _ZN19ActorProfileUnkNORED1Ev kind:function(arm,size=0x14) addr:0x020f8010 @@ -1100,8 +1100,8 @@ _ZN19ActorProfileUnkFLEN10GetProfileEv kind:function(arm,size=0xc) addr:0x020f80 _ZN19ActorProfileUnkFLEN6CreateEv kind:function(arm,size=0x24) addr:0x020f8030 _ZN19ActorProfileUnkFLENC1Ev kind:function(arm,size=0x3c) addr:0x020f8054 _ZN12ActorUnkFLENC1Ev kind:function(arm,size=0x28) addr:0x020f8090 -_ZN12ActorUnkFLEN8vfunc_18Ei kind:function(arm,size=0x60) addr:0x020f80b8 -_ZN12ActorUnkFLEN8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020f8118 +_ZN12ActorUnkFLEN4InitEi kind:function(arm,size=0x60) addr:0x020f80b8 +_ZN12ActorUnkFLEN6UpdateEv kind:function(arm,size=0x9c) addr:0x020f8118 _ZN12ActorUnkFLEN8SetStateEs kind:function(arm,size=0x44) addr:0x020f81b4 _ZN12ActorUnkFLEN19func_ov031_020f81f8Ev kind:function(arm,size=0xa4) addr:0x020f81f8 _ZN12ActorUnkFLEND1Ev kind:function(arm,size=0x14) addr:0x020f829c @@ -1116,8 +1116,8 @@ _ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x0 _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 -_ZN17ActorRollingStone8vfunc_18Ei kind:function(arm,size=0xf0) addr:0x020f869c -_ZN17ActorRollingStone8vfunc_20Ev kind:function(arm,size=0x98) addr:0x020f878c +_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 @@ -1169,8 +1169,8 @@ _ZN24ActorProfileTreasureDrop6CreateEv kind:function(arm,size=0x24) addr:0x020f9 _ZN24ActorProfileTreasureDropC1Ev kind:function(arm,size=0x40) addr:0x020f9f4c _ZN13ActorItemDrop19func_ov031_020f9f8cEP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020f9f8c _ZN13ActorItemDropC1Ev kind:function(arm,size=0x200) addr:0x020fa00c -_ZN13ActorItemDrop8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020fa20c -_ZN13ActorItemDrop8vfunc_20Ev kind:function(arm,size=0xc) addr:0x020fa23c +_ZN13ActorItemDrop4InitEi kind:function(arm,size=0x30) addr:0x020fa20c +_ZN13ActorItemDrop6UpdateEv kind:function(arm,size=0xc) addr:0x020fa23c _ZN13ActorItemDrop8vfunc_24Ev kind:function(arm,size=0x18) addr:0x020fa248 _ZN13ActorItemDrop19func_ov031_020fa260Ev kind:function(arm,size=0x1c4) addr:0x020fa260 _ZN13ActorItemDrop8SetStateEs kind:function(arm,size=0x44) addr:0x020fa424 @@ -1205,7 +1205,7 @@ _ZN19ActorProfileUnkMLCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020fab _ZN19ActorProfileUnkMLCK6CreateEv kind:function(arm,size=0x24) addr:0x020fab68 _ZN19ActorProfileUnkMLCKC1Ev kind:function(arm,size=0x28) addr:0x020fab8c _ZN12ActorUnkMLCKC1Ev kind:function(arm,size=0xb0) addr:0x020fabb4 -_ZN12ActorUnkMLCK8vfunc_18Ei kind:function(arm,size=0xd8) addr:0x020fac64 +_ZN12ActorUnkMLCK4InitEi kind:function(arm,size=0xd8) addr:0x020fac64 _ZN12ActorUnkMLCK8vfunc_64Ei kind:function(arm,size=0x4c) addr:0x020fad3c _ZN12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x20) addr:0x020fad88 _ZN12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0xc) addr:0x020fada8 @@ -1246,8 +1246,8 @@ _ZN19ActorProfileUnkEFSB10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb4 _ZN19ActorProfileUnkEFSB6CreateEv kind:function(arm,size=0x24) addr:0x020fb4b8 _ZN19ActorProfileUnkEFSBC1Ev kind:function(arm,size=0x28) addr:0x020fb4dc _ZN12ActorUnkEFSBC1Ev kind:function(arm,size=0x110) addr:0x020fb504 -_ZN12ActorUnkEFSB8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020fb614 -_ZN12ActorUnkEFSB8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020fb6cc +_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 @@ -1258,8 +1258,8 @@ _ZN19ActorProfileUnkNFSP10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb8 _ZN19ActorProfileUnkNFSP6CreateEv kind:function(arm,size=0x24) addr:0x020fb818 _ZN19ActorProfileUnkNFSPC1Ev kind:function(arm,size=0x44) addr:0x020fb83c _ZN12ActorUnkNFSPC1Ev kind:function(arm,size=0x58) addr:0x020fb880 -_ZN12ActorUnkNFSP8vfunc_18Ei kind:function(arm,size=0x48) addr:0x020fb8d8 -_ZN12ActorUnkNFSP8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020fb920 +_ZN12ActorUnkNFSP4InitEi kind:function(arm,size=0x48) addr:0x020fb8d8 +_ZN12ActorUnkNFSP6UpdateEv kind:function(arm,size=0x68) addr:0x020fb920 _ZN12ActorUnkNFSP19func_ov031_020fb988Ev kind:function(arm,size=0xc) addr:0x020fb988 _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020fb994 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fb9b4 @@ -1316,8 +1316,8 @@ _ZN31MapObjectProfileDoorDangerSpawn10GetProfileEv kind:function(arm,size=0xc) a _ZN31MapObjectProfileDoorDangerSpawn6CreateEv kind:function(arm,size=0x24) addr:0x020fd104 _ZN31MapObjectProfileDoorDangerSpawnC1Ev kind:function(arm,size=0x50) addr:0x020fd128 _ZN24MapObjectDoorDangerSpawnC1Ev kind:function(arm,size=0xbc) addr:0x020fd178 -_ZN24MapObjectDoorDangerSpawn8vfunc_00Ev kind:function(arm,size=0x50) addr:0x020fd234 -_ZN24MapObjectDoorDangerSpawn8vfunc_04Ev kind:function(arm,size=0x174) addr:0x020fd284 +_ZN24MapObjectDoorDangerSpawn4InitEv kind:function(arm,size=0x50) addr:0x020fd234 +_ZN24MapObjectDoorDangerSpawn5SetupEv kind:function(arm,size=0x174) addr:0x020fd284 _ZN24MapObjectDoorDangerSpawn9vfunc2_04Ev kind:function(arm,size=0xc) addr:0x020fd3f8 _ZN24MapObjectDoorDangerSpawn9vfunc2_08Ev kind:function(arm,size=0x70) addr:0x020fd404 _ZN24MapObjectDoorDangerSpawn8vfunc_08Ev kind:function(arm,size=0x374) addr:0x020fd474 @@ -1349,7 +1349,7 @@ _ZN23MapObjectProfileDoorKey10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileDoorKey6CreateEv kind:function(arm,size=0x24) addr:0x020fe740 _ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x020fe764 _ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x020fe7b8 -_ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020fe86c +_ZN16MapObjectDoorKey4InitEv kind:function(arm,size=0x1c) addr:0x020fe86c _ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x020fe888 _ZN16MapObjectDoorKey8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fe8a0 _ZN16MapObjectDoorKey8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020fe8ac @@ -1374,7 +1374,7 @@ _ZN26MapObjectProfileDoorSwitch6CreateEv kind:function(arm,size=0x24) addr:0x020 _ZN26MapObjectProfileDoorSwitchC1Ev kind:function(arm,size=0x48) addr:0x020fee9c _ZN19MapObjectDoorSwitchC2Ev kind:function(arm,size=0x64) addr:0x020feee4 _ZN19MapObjectDoorSwitchC1Ev kind:function(arm,size=0x64) addr:0x020fef48 -_ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0xd0) addr:0x020fefac +_ZN19MapObjectDoorSwitch4InitEv kind:function(arm,size=0xd0) addr:0x020fefac _ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x020ff07c _ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ff100 _ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x020ff110 @@ -1398,7 +1398,7 @@ _ZN25MapObjectProfileDoorClickC1Ev kind:function(arm,size=0x50) addr:0x020ff548 _ZN18MapObjectDoorClickC2Ev kind:function(arm,size=0x88) addr:0x020ff598 _ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x020ff620 _ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x020ff6a8 -_ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x020ff6bc +_ZN18MapObjectDoorClick4InitEv kind:function(arm,size=0x100) addr:0x020ff6bc _ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x020ff7bc _ZN18MapObjectDoorClick8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ffb8c _ZN18MapObjectDoorClick8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020ffb98 @@ -1426,7 +1426,7 @@ _ZN25MapObjectProfileDoorTouch10GetProfileEv kind:function(arm,size=0xc) addr:0x _ZN25MapObjectProfileDoorTouch6CreateEv kind:function(arm,size=0x24) addr:0x02100258 _ZN25MapObjectProfileDoorTouchC1Ev kind:function(arm,size=0x4c) addr:0x0210027c _ZN18MapObjectDoorTouchC1Ev kind:function(arm,size=0x34) addr:0x021002c8 -_ZN18MapObjectDoorTouch8vfunc_00Ev kind:function(arm,size=0x18) addr:0x021002fc +_ZN18MapObjectDoorTouch4InitEv kind:function(arm,size=0x18) addr:0x021002fc _ZN18MapObjectDoorTouch9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x02100314 _ZN18MapObjectDoorTouch8vfunc_40Ev kind:function(arm,size=0x28) addr:0x021003a0 _ZN18MapObjectDoorTouch8vfunc_44Ev kind:function(arm,size=0x44) addr:0x021003c8 @@ -1474,7 +1474,7 @@ _ZN21MapObjectProfileGrass6CreateEv kind:function(arm,size=0x24) addr:0x02101018 _ZN21MapObjectProfileGrassC1Ev kind:function(arm,size=0xa4) addr:0x0210103c _ZN14MapObjectGrassC2Ev kind:function(arm,size=0x48) addr:0x021010e0 _ZN14MapObjectGrassC1Ev kind:function(arm,size=0x48) addr:0x02101128 -_ZN14MapObjectGrass8vfunc_00Ev kind:function(arm,size=0x31c) addr:0x02101170 +_ZN14MapObjectGrass4InitEv kind:function(arm,size=0x31c) addr:0x02101170 _ZN14MapObjectGrass8vfunc_08Ev kind:function(arm,size=0x78) addr:0x0210148c _ZN14MapObjectGrass8vfunc_14Ei kind:function(arm,size=0x74) addr:0x02101504 _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x02101578 @@ -1497,7 +1497,7 @@ _ZN23MapObjectProfileUnkSWHTC1Ev kind:function(arm,size=0x90) addr:0x02101a44 _ZN16MapObjectUnkSWHTC1Ev kind:function(arm,size=0x114) addr:0x02101ad4 _ZN16MapObjectUnkSWHTD1Ev kind:function(arm,size=0x7c) addr:0x02101be8 _ZN16MapObjectUnkSWHTD0Ev kind:function(arm,size=0x84) addr:0x02101c64 -_ZN16MapObjectUnkSWHT8vfunc_00Ev kind:function(arm,size=0xf0) addr:0x02101ce8 +_ZN16MapObjectUnkSWHT4InitEv kind:function(arm,size=0xf0) addr:0x02101ce8 _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0x02101dd8 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101e1c _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02101f88 @@ -1546,8 +1546,8 @@ _ZN19MapObjectUnkTRES_74D1Ev kind:function(arm,size=0x14) addr:0x021030fc _ZN18MapObjectChestBaseD1Ev kind:function(arm,size=0x20) addr:0x02103110 _ZN18MapObjectChestBaseD0Ev kind:function(arm,size=0x28) addr:0x02103130 _ZN18MapObjectChestBaseD2Ev kind:function(arm,size=0x20) addr:0x02103158 -_ZN18MapObjectChestBase8vfunc_00Ev kind:function(arm,size=0xdc) addr:0x02103178 -_ZN18MapObjectChestBase8vfunc_04Ev kind:function(arm,size=0x2e0) addr:0x02103254 +_ZN18MapObjectChestBase4InitEv kind:function(arm,size=0xdc) addr:0x02103178 +_ZN18MapObjectChestBase5SetupEv kind:function(arm,size=0x2e0) addr:0x02103254 _ZN18MapObjectChestBase8vfunc_08Ev kind:function(arm,size=0x27c) addr:0x02103534 _ZN18MapObjectChestBase8vfunc_0CEv kind:function(arm,size=0x14) addr:0x021037b0 _ZN18MapObjectChestBase8vfunc_28Eiii kind:function(arm,size=0xc) addr:0x021037c4 @@ -1625,7 +1625,7 @@ _ZN19MapObjectProfilePot10GetProfileEv kind:function(arm,size=0xc) addr:0x02104f _ZN19MapObjectProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x02104f3c _ZN19MapObjectProfilePotC1Ev kind:function(arm,size=0x8c) addr:0x02104f60 _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02104fec -_ZN12MapObjectPot8vfunc_04Ev kind:function(arm,size=0x2c) addr:0x02105088 +_ZN12MapObjectPot5SetupEv kind:function(arm,size=0x2c) addr:0x02105088 _ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x021050b4 _ZN12MapObjectPot8vfunc_48Ev kind:function(arm,size=0xf8) addr:0x021051d4 _ZN12MapObjectPot8vfunc_14Ei kind:function(arm,size=0x44) addr:0x021052cc @@ -1666,8 +1666,8 @@ _ZN23MapObjectProfileUnkSKDIC1Ev kind:function(arm,size=0x48) addr:0x02106030 _ZN16MapObjectUnkSKDIC1Ev kind:function(arm,size=0x118) addr:0x02106078 _ZN16MapObjectUnkSKDI19func_ov031_02106190Ev kind:function(arm,size=0x4c) addr:0x02106190 _ZN16MapObjectUnkSKDI19func_ov031_021061dcEv kind:function(arm,size=0x48) addr:0x021061dc -_ZN16MapObjectUnkSKDI8vfunc_00Ev kind:function(arm,size=0xc8) addr:0x02106224 -_ZN16MapObjectUnkSKDI8vfunc_04Ev kind:function(arm,size=0xe0) addr:0x021062ec +_ZN16MapObjectUnkSKDI4InitEv kind:function(arm,size=0xc8) addr:0x02106224 +_ZN16MapObjectUnkSKDI5SetupEv kind:function(arm,size=0xe0) addr:0x021062ec _ZN16MapObjectUnkSKDI8vfunc_08Ev kind:function(arm,size=0x10) addr:0x021063cc _ZN16MapObjectUnkSKDI8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021063dc _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr:0x0210643c @@ -1686,9 +1686,9 @@ _ZN19ActorProfileUnkSKDO10GetProfileEv kind:function(arm,size=0xc) addr:0x02106d _ZN19ActorProfileUnkSKDO6CreateEv kind:function(arm,size=0x24) addr:0x02106d6c _ZN19ActorProfileUnkSKDOC1Ev kind:function(arm,size=0x28) addr:0x02106d90 _ZN12ActorUnkSKDOC1Ev kind:function(arm,size=0x28) addr:0x02106db8 -_ZN12ActorUnkSKDO8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02106de0 -_ZN12ActorUnkSKDO8vfunc_1CEv kind:function(arm,size=0x70) addr:0x02106de8 -_ZN12ActorUnkSKDO8vfunc_20Ev kind:function(arm,size=0x38) addr:0x02106e58 +_ZN12ActorUnkSKDO4InitEi kind:function(arm,size=0x8) addr:0x02106de0 +_ZN12ActorUnkSKDO5SetupEv kind:function(arm,size=0x70) addr:0x02106de8 +_ZN12ActorUnkSKDO6UpdateEv kind:function(arm,size=0x38) addr:0x02106e58 _ZN12ActorUnkSKDO8vfunc_54Ei kind:function(arm,size=0x8) addr:0x02106e90 _ZN27ActorUnkSKDO_ov031_02115ce88vfunc_00EP9MapObject kind:function(arm,size=0x3c) addr:0x02106e98 _ZN12ActorUnkSKDOD1Ev kind:function(arm,size=0x14) addr:0x02106ed4 diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt index f2148f6a..632f444d 100644 --- a/config/eur/arm9/overlays/ov032/symbols.txt +++ b/config/eur/arm9/overlays/ov032/symbols.txt @@ -6,11 +6,11 @@ _ZN15ActorSpinut_110D1Ev kind:function(arm,size=0x14) addr:0x02119248 _ZN15ActorSpinut_1BCD1Ev kind:function(arm,size=0x14) addr:0x0211925c _ZN11ActorSpinutD1Ev kind:function(arm,size=0x8c) addr:0x02119270 _ZN11ActorSpinutD0Ev kind:function(arm,size=0x94) addr:0x021192fc -_ZN11ActorSpinut8vfunc_18Ei kind:function(arm,size=0xc8) addr:0x02119390 -_ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x02119458 +_ZN11ActorSpinut4InitEi kind:function(arm,size=0xc8) addr:0x02119390 +_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 -_ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x02119584 +_ZN11ActorSpinut6UpdateEv kind:function(arm,size=0x358) addr:0x02119584 _ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 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 @@ -64,9 +64,9 @@ _ZN25ActorProfileFleeingSpinutC1Ev kind:function(arm,size=0x4c) addr:0x0211b6fc _ZN18ActorFleeingSpinutC1Ev kind:function(arm,size=0x1d8) addr:0x0211b748 _ZN18ActorFleeingSpinutD1Ev kind:function(arm,size=0x30) addr:0x0211b920 _ZN18ActorFleeingSpinutD0Ev kind:function(arm,size=0x38) addr:0x0211b950 -_ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211b988 +_ZN18ActorFleeingSpinut4InitEi kind:function(arm,size=0x1c) addr:0x0211b988 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211b9a4 -_ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211ba0c +_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 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211be04 @@ -124,7 +124,7 @@ _ZN14ActorKeese_2ACD1Ev kind:function(arm,size=0x1c) addr:0x0211de6c _ZN14ActorKeese_2ACD0Ev kind:function(arm,size=0x24) addr:0x0211de88 _ZN14ActorKeese_2AC8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211deac _ZN14ActorKeese_2AC8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x144) addr:0x0211ded0 -_ZN10ActorKeese8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0211e014 +_ZN10ActorKeese4InitEi kind:function(arm,size=0xac) addr:0x0211e014 _ZN10ActorKeese19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e0c0 _ZN10ActorKeese19func_ov032_0211e0d4Esi kind:function(arm,size=0x234) addr:0x0211e0d4 _ZN10ActorKeese19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e308 @@ -132,7 +132,7 @@ _ZN10ActorKeese19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e40c _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e420 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e468 -_ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e778 +_ZN10ActorKeese6UpdateEv kind:function(arm,size=0x1b8) addr:0x0211e778 _ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 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 @@ -204,7 +204,7 @@ _ZN19MapObjectUnkSWSW_408vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size= _ZN19MapObjectUnkSWSW_4019func_ov032_021210a0Ei kind:function(arm,size=0x64) addr:0x021210a0 _ZN16MapObjectUnkSWSWC1Ev kind:function(arm,size=0xc4) addr:0x02121104 _ZN19MapObjectUnkSWSW_40D1Ev kind:function(arm,size=0x14) addr:0x021211c8 -_ZN16MapObjectUnkSWSW8vfunc_00Ev kind:function(arm,size=0x240) addr:0x021211dc +_ZN16MapObjectUnkSWSW4InitEv kind:function(arm,size=0x240) addr:0x021211dc _ZN16MapObjectUnkSWSW8vfunc_08Ev kind:function(arm,size=0x4b4) addr:0x0212141c _ZN16MapObjectUnkSWSW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x278) addr:0x021218d0 _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121b48 diff --git a/config/eur/arm9/overlays/ov063/symbols.txt b/config/eur/arm9/overlays/ov063/symbols.txt index b2d6a9e1..8eb3819b 100644 --- a/config/eur/arm9/overlays/ov063/symbols.txt +++ b/config/eur/arm9/overlays/ov063/symbols.txt @@ -7,13 +7,13 @@ _ZN24UnkStruct_ov063_02162e888vfunc_04E8ActorRefiiPi kind:function(arm,size=0x17 _ZN12ActorUnkCANSC1Ev kind:function(arm,size=0x1dc) addr:0x0215811c _ZN24UnkStruct_ov063_02162ee8D1Ev kind:function(arm,size=0x14) addr:0x021582f8 _ZN24UnkStruct_ov063_02162f14D1Ev kind:function(arm,size=0x14) addr:0x0215830c -_ZN12ActorUnkCANS8vfunc_18Ei kind:function(arm,size=0x68) addr:0x02158320 -_ZN12ActorUnkCANS8vfunc_1CEv kind:function(arm,size=0x9c) addr:0x02158388 +_ZN12ActorUnkCANS4InitEi kind:function(arm,size=0x68) addr:0x02158320 +_ZN12ActorUnkCANS5SetupEv kind:function(arm,size=0x9c) addr:0x02158388 _ZN12ActorUnkCANS19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158424 _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x02158448 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158490 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584c4 -_ZN12ActorUnkCANS8vfunc_20Ev kind:function(arm,size=0x53c) addr:0x021584f0 +_ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x021584f0 _ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 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 @@ -76,7 +76,7 @@ _ZN12ActorUnkCASE19func_ov063_0215acecEP8ActorRefS0_ kind:function(arm,size=0x5c _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ad48 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215ae6c _ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215ae80 -_ZN12ActorUnkCASE8vfunc_18Ei kind:function(arm,size=0x68) addr:0x0215ae94 +_ZN12ActorUnkCASE4InitEi kind:function(arm,size=0x68) addr:0x0215ae94 _ZN12ActorUnkCASE19func_ov063_0215aefcEs kind:function(arm,size=0x58) addr:0x0215aefc _ZN12ActorUnkCASE19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215af54 _ZN12ActorUnkCASE19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215af58 @@ -91,7 +91,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b2b0 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2c4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2c8 -_ZN12ActorUnkCASE8vfunc_20Ev kind:function(arm,size=0x338) addr:0x0215b2ec +_ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b2ec _ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 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 @@ -106,9 +106,9 @@ _ZN12ActorUnkCASED1Ev kind:function(arm,size=0x30) addr:0x0215ba80 _ZN12ActorUnkCASED0Ev kind:function(arm,size=0x38) addr:0x0215bab0 _ZN19ActorProfileUnkCASED1Ev kind:function(arm,size=0x14) addr:0x0215bae8 _ZN15ActorUnkRMSBaseC2Ev kind:function(arm,size=0x38) addr:0x0215bafc -_ZN15ActorUnkRMSBase8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215bb34 -_ZN15ActorUnkRMSBase8vfunc_1CEv kind:function(arm,size=0x4) addr:0x0215bb88 -_ZN15ActorUnkRMSBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0215bb8c +_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 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bbd4 @@ -118,9 +118,9 @@ _ZN19ActorProfileUnkRMSV6CreateEv kind:function(arm,size=0x24) addr:0x0215bc38 _ZN19ActorProfileUnkRMSVC1Ev kind:function(arm,size=0x28) addr:0x0215bc5c _ZN12ActorUnkRMSVC1Ev kind:function(arm,size=0xc0) addr:0x0215bc84 _ZN24UnkStruct_ov063_021632e4D1Ev kind:function(arm,size=0x14) addr:0x0215bd44 -_ZN12ActorUnkRMSV8vfunc_18Ei kind:function(arm,size=0x94) addr:0x0215bd58 +_ZN12ActorUnkRMSV4InitEi kind:function(arm,size=0x94) addr:0x0215bd58 _ZN24UnkStruct_ov063_021632e48vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215bdec -_ZN12ActorUnkRMSV8vfunc_20Ev kind:function(arm,size=0x2c) addr:0x0215be10 +_ZN12ActorUnkRMSV6UpdateEv kind:function(arm,size=0x2c) addr:0x0215be10 _ZN12ActorUnkRMSV8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215be3c _ZN12ActorUnkRMSV8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215be50 _ZN12ActorUnkRMSV8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215be90 @@ -134,8 +134,8 @@ _ZN19ActorProfileUnkRMSW10GetProfileEv kind:function(arm,size=0xc) addr:0x0215bf _ZN19ActorProfileUnkRMSW6CreateEv kind:function(arm,size=0x24) addr:0x0215bf9c _ZN19ActorProfileUnkRMSWC1Ev kind:function(arm,size=0x28) addr:0x0215bfc0 _ZN12ActorUnkRMSWC1Ev kind:function(arm,size=0x74) addr:0x0215bfe8 -_ZN12ActorUnkRMSW8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215c05c -_ZN12ActorUnkRMSW8vfunc_20Ev kind:function(arm,size=0x18) addr:0x0215c0b0 +_ZN12ActorUnkRMSW4InitEi kind:function(arm,size=0x54) addr:0x0215c05c +_ZN12ActorUnkRMSW6UpdateEv kind:function(arm,size=0x18) addr:0x0215c0b0 _ZN12ActorUnkRMSW8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215c0c8 _ZN12ActorUnkRMSW8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215c0dc _ZN12ActorUnkRMSW8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215c11c @@ -155,8 +155,8 @@ _ZN19ActorProfileUnkRMSD10GetProfileEv kind:function(arm,size=0xc) addr:0x0215c3 _ZN19ActorProfileUnkRMSD6CreateEv kind:function(arm,size=0x24) addr:0x0215c348 _ZN19ActorProfileUnkRMSDC1Ev kind:function(arm,size=0x28) addr:0x0215c36c _ZN12ActorUnkRMSDC1Ev kind:function(arm,size=0x74) addr:0x0215c394 -_ZN12ActorUnkRMSD8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215c408 -_ZN12ActorUnkRMSD8vfunc_20Ev kind:function(arm,size=0x18) addr:0x0215c45c +_ZN12ActorUnkRMSD4InitEi kind:function(arm,size=0x54) addr:0x0215c408 +_ZN12ActorUnkRMSD6UpdateEv kind:function(arm,size=0x18) addr:0x0215c45c _ZN12ActorUnkRMSD8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215c474 _ZN12ActorUnkRMSD8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215c488 _ZN12ActorUnkRMSD8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215c4c8 @@ -252,8 +252,8 @@ _ZN19ActorProfileUnkRBLS6CreateEv kind:function(arm,size=0x24) addr:0x0215f2c4 _ZN19ActorProfileUnkRBLSC1Ev kind:function(arm,size=0x28) addr:0x0215f2e8 _ZN12ActorUnkRBLSC1Ev kind:function(arm,size=0xc4) addr:0x0215f310 _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f3d4 -_ZN12ActorUnkRBLS8vfunc_18Ei kind:function(arm,size=0x8c) addr:0x0215f3e8 -_ZN12ActorUnkRBLS8vfunc_20Ev kind:function(arm,size=0x14) addr:0x0215f474 +_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 _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f4bc @@ -264,7 +264,7 @@ _ZN23MapObjectProfileUnkSTAT10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkSTAT6CreateEv kind:function(arm,size=0x24) addr:0x0215f550 _ZN23MapObjectProfileUnkSTATC1Ev kind:function(arm,size=0x94) addr:0x0215f574 _ZN16MapObjectUnkSTATC1Ev kind:function(arm,size=0xc8) addr:0x0215f608 -_ZN16MapObjectUnkSTAT8vfunc_00Ev kind:function(arm,size=0x40) addr:0x0215f6d0 +_ZN16MapObjectUnkSTAT4InitEv kind:function(arm,size=0x40) addr:0x0215f6d0 _ZN16MapObjectUnkSTAT8vfunc_08Ev kind:function(arm,size=0x88) addr:0x0215f710 _ZN16MapObjectUnkSTAT8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0215f798 _ZN16MapObjectUnkSTAT19func_ov063_0215f7acEv kind:function(arm,size=0x494) addr:0x0215f7ac @@ -308,7 +308,7 @@ _ZN23MapObjectProfileUnkLTRW10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkLTRW6CreateEv kind:function(arm,size=0x24) addr:0x02160adc _ZN23MapObjectProfileUnkLTRWC1Ev kind:function(arm,size=0xd0) addr:0x02160b00 _ZN16MapObjectUnkLTRWC1Ev kind:function(arm,size=0x9c) addr:0x02160bd0 -_ZN16MapObjectUnkLTRW8vfunc_00Ev kind:function(arm,size=0x5c) addr:0x02160c6c +_ZN16MapObjectUnkLTRW4InitEv kind:function(arm,size=0x5c) addr:0x02160c6c _ZN16MapObjectUnkLTRW8vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02160cc8 _ZN16MapObjectUnkLTRW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x34) addr:0x02160ce4 _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02160d18 @@ -322,7 +322,7 @@ _ZN23MapObjectProfileUnkMTJR10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkMTJR6CreateEv kind:function(arm,size=0x24) addr:0x02160ea4 _ZN23MapObjectProfileUnkMTJRC1Ev kind:function(arm,size=0x9c) addr:0x02160ec8 _ZN16MapObjectUnkMTJRC1Ev kind:function(arm,size=0x98) addr:0x02160f64 -_ZN16MapObjectUnkMTJR8vfunc_00Ev kind:function(arm,size=0x74) addr:0x02160ffc +_ZN16MapObjectUnkMTJR4InitEv kind:function(arm,size=0x74) addr:0x02160ffc _ZN16MapObjectUnkMTJR8vfunc_08Ev kind:function(arm,size=0x13c) addr:0x02161070 _ZN16MapObjectUnkMTJR8vfunc_0CEv kind:function(arm,size=0x14) addr:0x021611ac _ZN16MapObjectUnkMTJR8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x94) addr:0x021611c0 diff --git a/config/eur/arm9/overlays/ov071/symbols.txt b/config/eur/arm9/overlays/ov071/symbols.txt index 6a8e992a..f2dad1f1 100644 --- a/config/eur/arm9/overlays/ov071/symbols.txt +++ b/config/eur/arm9/overlays/ov071/symbols.txt @@ -295,9 +295,9 @@ _ZN14ActorTearLightC1Ev kind:function(arm,size=0x194) addr:0x0215f290 _ZN18ActorTearLight_104D1Ev kind:function(arm,size=0x14) addr:0x0215f424 _ZN14ActorTearLightD1Ev kind:function(arm,size=0x78) addr:0x0215f438 _ZN14ActorTearLightD0Ev kind:function(arm,size=0x80) addr:0x0215f4b0 -_ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0215f530 -_ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0215f5dc -_ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x0215f608 +_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_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f7dc diff --git a/config/eur/arm9/overlays/ov102/symbols.txt b/config/eur/arm9/overlays/ov102/symbols.txt index 72196237..d07705d6 100644 --- a/config/eur/arm9/overlays/ov102/symbols.txt +++ b/config/eur/arm9/overlays/ov102/symbols.txt @@ -25,7 +25,7 @@ _ZN16MapObjectUnkPTFL19func_ov102_0218419cEv kind:function(arm,size=0x218) addr: _ZN16MapObjectUnkPTFL19func_ov102_021843b4Ev kind:function(arm,size=0x214) addr:0x021843b4 _ZN21UnkStruct_027e0cd8_0C8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021845c8 _ZN21UnkStruct_027e0cd8_0C19func_ov102_02184628Ev kind:function(arm,size=0x1c) addr:0x02184628 -_ZN12ActorUnkMLCK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184644 +_ZN12ActorUnkMLCK6UpdateEv kind:function(arm,size=0x190) addr:0x02184644 _ZN12ActorUnkMLCK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x021847d4 _ZN15ActorUnkMLCK_C419func_ov102_021847e8Eii kind:function(arm,size=0x78) addr:0x021847e8 _ZN24UnkStruct_ov102_02184a248vfunc_00EP5Actor kind:function(arm,size=0x50) addr:0x02184860 diff --git a/config/eur1/arm9/overlays/ov000/symbols.txt b/config/eur1/arm9/overlays/ov000/symbols.txt index 7af463b0..f28108e7 100644 --- a/config/eur1/arm9/overlays/ov000/symbols.txt +++ b/config/eur1/arm9/overlays/ov000/symbols.txt @@ -2316,9 +2316,9 @@ _ZN5ActorD1Ev kind:function(arm,size=0x4) addr:0x020984c4 _ZN5ActorD0Ev kind:function(arm,size=0x14) addr:0x020984c8 _ZN5ActorD2Ev kind:function(arm,size=0x4) addr:0x020984dc _ZN5Actor19func_ov000_0209848cEP12ActorProfile kind:function(arm,size=0x1c) addr:0x020984e0 -_ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020984fc -_ZN5Actor8vfunc_1CEv kind:function(arm,size=0x4) addr:0x02098504 -_ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x02098508 +_ZN5Actor4InitEi kind:function(arm,size=0x8) addr:0x020984fc +_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 @@ -2436,7 +2436,7 @@ _ZN19ActorProfileUnkSWOB10GetProfileEv kind:function(arm,size=0xc) addr:0x0209a9 _ZN19ActorProfileUnkSWOB6CreateEv kind:function(arm,size=0x24) addr:0x0209a918 _ZN19ActorProfileUnkSWOBC1Ev kind:function(arm,size=0x28) addr:0x0209a93c _ZN12ActorUnkSWOBC1Ev kind:function(arm,size=0x38) addr:0x0209a964 -_ZN12ActorUnkSWOB8vfunc_18Ei kind:function(arm,size=0x6c) addr:0x0209a99c +_ZN12ActorUnkSWOB4InitEi kind:function(arm,size=0x6c) addr:0x0209a99c _ZN12ActorUnkSWOB8SetStateEs kind:function(arm,size=0x7c) addr:0x0209aa08 _ZN12ActorUnkSWOB19func_ov000_0209aa30Ev kind:function(arm,size=0x234) addr:0x0209aa84 _ZN12ActorUnkSWOBD1Ev kind:function(arm,size=0x14) addr:0x0209acb8 @@ -2448,8 +2448,8 @@ _ZN19ActorProfileUnkSWTMC1Ev kind:function(arm,size=0x28) addr:0x0209ad2c _ZN12ActorUnkSWTMC1Ev kind:function(arm,size=0x5c) addr:0x0209ad54 _ZN12ActorUnkSWTMD1Ev kind:function(arm,size=0x48) addr:0x0209adb0 _ZN12ActorUnkSWTMD0Ev kind:function(arm,size=0x50) addr:0x0209adf8 -_ZN12ActorUnkSWTM8vfunc_18Ei kind:function(arm,size=0x74) addr:0x0209ae48 -_ZN12ActorUnkSWTM8vfunc_20Ev kind:function(arm,size=0xe8) addr:0x0209aebc +_ZN12ActorUnkSWTM4InitEi kind:function(arm,size=0x74) addr:0x0209ae48 +_ZN12ActorUnkSWTM6UpdateEv kind:function(arm,size=0xe8) addr:0x0209aebc _ZN12ActorUnkSWTM8vfunc_24Ev kind:function(arm,size=0x4) addr:0x0209afa4 _ZN12ActorUnkSWTM8SetStateEs kind:function(arm,size=0x90) addr:0x0209afa8 _ZN12ActorUnkSWTM19func_ov000_0209afe4Ev kind:function(arm,size=0x54) addr:0x0209b038 @@ -2477,7 +2477,7 @@ _ZN21ActorProfileEventIcon10GetProfileEv kind:function(arm,size=0xc) addr:0x0209 _ZN21ActorProfileEventIcon6CreateEv kind:function(arm,size=0x24) addr:0x0209bfe8 _ZN21ActorProfileEventIconC1Ev kind:function(arm,size=0x28) addr:0x0209c00c _ZN14ActorEventIconC1Ev kind:function(arm,size=0x34) addr:0x0209c034 -_ZN14ActorEventIcon8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0209c068 +_ZN14ActorEventIcon4InitEi kind:function(arm,size=0x1c) addr:0x0209c068 _ZN14ActorEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209c084 _ZN14ActorEventIconD0Ev kind:function(arm,size=0x1c) addr:0x0209c098 _ZN21ActorProfileEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209c0b4 @@ -2485,8 +2485,8 @@ _ZN19ActorProfileUnkEFIK10GetProfileEv kind:function(arm,size=0xc) addr:0x0209c0 _ZN19ActorProfileUnkEFIK6CreateEv kind:function(arm,size=0x24) addr:0x0209c0d4 _ZN19ActorProfileUnkEFIKC1Ev kind:function(arm,size=0x28) addr:0x0209c0f8 _ZN12ActorUnkEFIKC1Ev kind:function(arm,size=0x34) addr:0x0209c120 -_ZN12ActorUnkEFIK8vfunc_18Ei kind:function(arm,size=0x40) addr:0x0209c154 -_ZN12ActorUnkEFIK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x0209c194 +_ZN12ActorUnkEFIK4InitEi kind:function(arm,size=0x40) addr:0x0209c154 +_ZN12ActorUnkEFIK6UpdateEv kind:function(arm,size=0x190) addr:0x0209c194 _ZN12ActorUnkEFIK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0209c324 _ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209c338 _ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209c340 @@ -2551,8 +2551,8 @@ _ZN9MapObjectC2Ev kind:function(arm,size=0xb4) addr:0x0209d034 _ZN9MapObjectD1Ev kind:function(arm,size=0x4) addr:0x0209d0e8 _ZN9MapObjectD0Ev kind:function(arm,size=0x14) addr:0x0209d0ec _ZN9MapObjectD2Ev kind:function(arm,size=0x4) addr:0x0209d100 -_ZN9MapObject8vfunc_00Ev kind:function(arm,size=0x8) addr:0x0209d104 -_ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209d10c +_ZN9MapObject4InitEv kind:function(arm,size=0x8) addr:0x0209d104 +_ZN9MapObject5SetupEv kind:function(arm,size=0x4) addr:0x0209d10c _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) addr:0x0209d110 _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d168 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d180 @@ -2578,7 +2578,7 @@ _ZN9MapObject19func_ov000_0209d6acEP7VecFx32 kind:function(arm,size=0x54) addr:0 _ZN17MapObjectPot_BaseC2Ev kind:function(arm,size=0x50) addr:0x0209d754 _ZN19func_ov000_0209d750D0Ev kind:function(arm,size=0x1c) addr:0x0209d7a4 _ZN17MapObjectPot_BaseD2Ev kind:function(arm,size=0x14) addr:0x0209d7c0 -_ZN17MapObjectPot_Base8vfunc_00Ev kind:function(arm,size=0x24) addr:0x0209d7d4 +_ZN17MapObjectPot_Base4InitEv kind:function(arm,size=0x24) addr:0x0209d7d4 _ZN17MapObjectPot_Base8vfunc_44Eii kind:function(arm,size=0x144) addr:0x0209d7f8 _ZN17MapObjectPot_Base19func_ov000_0209d8e8EPS_i kind:function(arm,size=0xc4) addr:0x0209d93c _ZN17MapObjectPot_Base8vfunc_38Ev kind:function(arm,size=0x4c) addr:0x0209da00 @@ -2607,7 +2607,7 @@ _ZN19MapObjectSwitchStepC1Ev kind:function(arm,size=0xfc) addr:0x0209def4 _ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209dff0 _ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209e004 _ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209e05c -_ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209e0bc +_ZN19MapObjectSwitchStep4InitEv kind:function(arm,size=0xb4) addr:0x0209e0bc _ZN19MapObjectSwitchStep19func_ov000_0209e11cEsi kind:function(arm,size=0x164) addr:0x0209e170 _ZN19MapObjectSwitchStep8vfunc_20Ei kind:function(arm,size=0x34) addr:0x0209e2d4 _ZN19MapObjectSwitchStep8vfunc_18EPc kind:function(arm,size=0xd8) addr:0x0209e308 @@ -2618,7 +2618,7 @@ _ZN26MapObjectProfileMiniBlocks10GetProfileEv kind:function(arm,size=0xc) addr:0 _ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x0209e458 _ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209e47c _ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209e4c8 -_ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209e504 +_ZN19MapObjectMiniBlocks4InitEv kind:function(arm,size=0x1fc) addr:0x0209e504 _ZN19MapObjectMiniBlocks8vfunc_14Ei kind:function(arm,size=0x60) addr:0x0209e700 _ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209e760 _ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209e780 @@ -3028,9 +3028,9 @@ _ZN14Actor_Derived1C1EP11ModelRenderP20Actor_Derived1_94_0C kind:function(arm,si _ZN14Actor_Derived1D1Ev kind:function(arm,size=0x20) addr:0x020a8d14 _ZN14Actor_Derived1D0Ev kind:function(arm,size=0x28) addr:0x020a8d34 _ZN14Actor_Derived1D2Ev kind:function(arm,size=0x20) addr:0x020a8d5c -_ZN14Actor_Derived18vfunc_18Ei kind:function(arm,size=0x78) addr:0x020a8d7c +_ZN14Actor_Derived14InitEi kind:function(arm,size=0x78) addr:0x020a8d7c _ZN14Actor_Derived18vfunc_54Ei kind:function(arm,size=0x4) addr:0x020a8df4 -_ZN14Actor_Derived18vfunc_1CEv kind:function(arm,size=0xc) addr:0x020a8df8 +_ZN14Actor_Derived15SetupEv kind:function(arm,size=0xc) addr:0x020a8df8 _ZN14Actor_Derived119func_ov000_020a8db0Ev kind:function(arm,size=0x20) addr:0x020a8e04 _ZN14Actor_Derived119func_ov000_020a8dd0Ev kind:function(arm,size=0x20) addr:0x020a8e24 _ZN14Actor_Derived119func_ov000_020a8df0E8ActorRefi kind:function(arm,size=0x94) addr:0x020a8e44 @@ -3065,7 +3065,7 @@ _ZN14Actor_Derived119func_ov000_020a95d8Ev kind:function(arm,size=0xc) addr:0x02 _ZN14Actor_Derived18vfunc_A4Ev kind:function(arm,size=0x218) addr:0x020a9638 _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a9850 _ZN14Actor_Derived119func_ov000_020a9804Ev kind:function(arm,size=0xec) addr:0x020a9858 -_ZN14Actor_Derived18vfunc_20Ev kind:function(arm,size=0x4) addr:0x020a9944 +_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_B8Ev kind:function(arm,size=0x34) addr:0x020a99f8 diff --git a/config/eur1/arm9/overlays/ov005/symbols.txt b/config/eur1/arm9/overlays/ov005/symbols.txt index ac2bec19..de577cec 100644 --- a/config/eur1/arm9/overlays/ov005/symbols.txt +++ b/config/eur1/arm9/overlays/ov005/symbols.txt @@ -2,10 +2,10 @@ func_ov005_020b6520 kind:function(arm,size=0x28) addr:0x020b6560 func_ov005_020b6548 kind:function(arm,size=0x28) addr:0x020b6588 _ZN16MapObjectManager19func_ov005_020b6570Ei kind:function(arm,size=0x134) addr:0x020b65b0 _ZN12ActorManager19func_ov005_020b66a4Ei kind:function(arm,size=0x1a4) addr:0x020b66e4 -_ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b6888 +_ZN12ActorUnkSWOB6UpdateEv kind:function(arm,size=0xf4) addr:0x020b6888 func_ov005_020b693c kind:function(arm,size=0x224) addr:0x020b697c func_ov005_020b6b60 kind:function(arm,size=0x4c) addr:0x020b6ba0 -_ZN14ActorEventIcon8vfunc_20Ev kind:function(arm,size=0x84) addr:0x020b6bec +_ZN14ActorEventIcon6UpdateEv kind:function(arm,size=0x84) addr:0x020b6bec func_ov005_020b6c30 kind:function(arm,size=0xd0) addr:0x020b6c70 func_ov005_020b6d00 kind:function(arm,size=0x84) addr:0x020b6d40 func_ov005_020b6d84 kind:function(arm,size=0x15c) addr:0x020b6dc4 diff --git a/config/eur1/arm9/overlays/ov024/symbols.txt b/config/eur1/arm9/overlays/ov024/symbols.txt index 0271ac67..aabf4b49 100644 --- a/config/eur1/arm9/overlays/ov024/symbols.txt +++ b/config/eur1/arm9/overlays/ov024/symbols.txt @@ -710,9 +710,9 @@ _ZN19ActorProfileUnkOBPC10GetProfileEv kind:function(arm,size=0xc) addr:0x020d6f _ZN19ActorProfileUnkOBPC6CreateEv kind:function(arm,size=0x24) addr:0x020d6fc8 _ZN19ActorProfileUnkOBPCC1Ev kind:function(arm,size=0x28) addr:0x020d6fec _ZN12ActorUnkOBPCC1Ev kind:function(arm,size=0x34) addr:0x020d7014 -_ZN12ActorUnkOBPC8vfunc_18Ei kind:function(arm,size=0x4c) addr:0x020d7048 +_ZN12ActorUnkOBPC4InitEi kind:function(arm,size=0x4c) addr:0x020d7048 _ZN12ActorUnkOBPC19func_ov024_020d6f74Ev kind:function(arm,size=0x20) addr:0x020d7094 -_ZN12ActorUnkOBPC8vfunc_20Ev kind:function(arm,size=0xbc) addr:0x020d70b4 +_ZN12ActorUnkOBPC6UpdateEv kind:function(arm,size=0xbc) addr:0x020d70b4 _ZN12ActorUnkOBPC8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020d7170 _ZN12ActorUnkOBPC8SetStateEsi kind:function(arm,size=0xf0) addr:0x020d7184 _ZN12ActorUnkOBPC19func_ov024_020d7154Ev kind:function(arm,size=0x168) addr:0x020d7274 diff --git a/config/eur1/arm9/overlays/ov031/symbols.txt b/config/eur1/arm9/overlays/ov031/symbols.txt index 3b0e09b0..07abc319 100644 --- a/config/eur1/arm9/overlays/ov031/symbols.txt +++ b/config/eur1/arm9/overlays/ov031/symbols.txt @@ -314,13 +314,13 @@ _ZN9ActorBomb19func_ov031_020e1634Ev kind:function(arm,size=0x58) addr:0x020e175 _ZN9ActorBombC1Ev kind:function(arm,size=0x168) addr:0x020e17ac _ZN13ActorBomb_unkD1Ev kind:function(arm,size=0x14) addr:0x020e1914 _ZN13ActorBomb_19CD1Ev kind:function(arm,size=0x14) addr:0x020e1928 -_ZN9ActorBomb8vfunc_18Ei kind:function(arm,size=0x84) addr:0x020e193c +_ZN9ActorBomb4InitEi kind:function(arm,size=0x84) addr:0x020e193c _ZN9ActorBomb19func_ov031_020e18a0Ev kind:function(arm,size=0x24) addr:0x020e19c0 _ZN9ActorBomb8SetStateEs kind:function(arm,size=0x44) addr:0x020e19e4 _ZN9ActorBomb19func_ov031_020e1908Ev kind:function(arm,size=0x18) addr:0x020e1a28 _ZN9ActorBomb19func_ov031_020e1920EP7VecFx32 kind:function(arm,size=0x1c) addr:0x020e1a40 _ZN9ActorBomb19func_ov031_020e193cEv kind:function(arm,size=0xec) addr:0x020e1a5c -_ZN9ActorBomb8vfunc_20Ev kind:function(arm,size=0xd0) addr:0x020e1b48 +_ZN9ActorBomb6UpdateEv kind:function(arm,size=0xd0) addr:0x020e1b48 _ZN9ActorBomb8vfunc_24Ev kind:function(arm,size=0x24) addr:0x020e1c18 _ZN9ActorBomb19func_ov031_020e1b1cEv kind:function(arm,size=0x60) addr:0x020e1c3c _ZN9ActorBomb19func_ov031_020e1b7cEv kind:function(arm,size=0x19c) addr:0x020e1c9c @@ -376,8 +376,8 @@ _ZN17ActorProfileBlastC1Ev kind:function(arm,size=0x38) addr:0x020e3604 _ZN13ActorBlast_E88vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x1a4) addr:0x020e363c _ZN10ActorBlastC1Ev kind:function(arm,size=0x7c) addr:0x020e37e0 _ZN13ActorBlast_E8D1Ev kind:function(arm,size=0x14) addr:0x020e385c -_ZN10ActorBlast8vfunc_18Ei kind:function(arm,size=0x274) addr:0x020e3870 -_ZN10ActorBlast8vfunc_20Ev kind:function(arm,size=0x180) addr:0x020e3ae4 +_ZN10ActorBlast4InitEi kind:function(arm,size=0x274) addr:0x020e3870 +_ZN10ActorBlast6UpdateEv kind:function(arm,size=0x180) addr:0x020e3ae4 _ZN10ActorBlast8vfunc_24Ev kind:function(arm,size=0x50) addr:0x020e3c64 _ZN10ActorBlast19func_ov031_020e3b94Ev kind:function(arm,size=0x8) addr:0x020e3cb4 _ZN10ActorBlast19func_ov031_020e3b9cEP5Actorss kind:function(arm,size=0x80) addr:0x020e3cbc @@ -391,10 +391,10 @@ func_ov031_020e3d10 kind:function(arm,size=0x90) addr:0x020e3e30 _ZN22ActorUnkTLKTnCLLT_BaseC2Ev kind:function(arm,size=0x30) addr:0x020e3ec0 func_ov031_020e3dd0 kind:function(arm,size=0x28) addr:0x020e3ef0 _ZN22ActorUnkTLKTnCLLT_Base19func_ov031_020e3df8Ev kind:function(arm,size=0x20) addr:0x020e3f18 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_18Ei kind:function(arm,size=0x2c) addr:0x020e3f38 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_1CEv kind:function(arm,size=0x28) addr:0x020e3f64 +_ZN22ActorUnkTLKTnCLLT_Base4InitEi kind:function(arm,size=0x2c) addr:0x020e3f38 +_ZN22ActorUnkTLKTnCLLT_Base5SetupEv kind:function(arm,size=0x28) addr:0x020e3f64 _ZN22ActorUnkTLKTnCLLT_Base19func_ov031_020e3e6cEv kind:function(arm,size=0x18) addr:0x020e3f8c -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_20Ev kind:function(arm,size=0x54) addr:0x020e3fa4 +_ZN22ActorUnkTLKTnCLLT_Base6UpdateEv kind:function(arm,size=0x54) addr:0x020e3fa4 _ZN22ActorUnkTLKTnCLLT_Base8vfunc_24Ev kind:function(arm,size=0x28) addr:0x020e3ff8 func_ov031_020e3f00 kind:function(arm,size=0x50) addr:0x020e4020 _ZN22ActorUnkTLKTnCLLT_Base8vfunc_54Ev kind:function(arm,size=0x124) addr:0x020e4070 @@ -429,10 +429,10 @@ _ZN21ActorItemBoomerang_A0D1Ev kind:function(arm,size=0x14) addr:0x020e4880 _ZN21ActorItemBoomerang_CCD1Ev kind:function(arm,size=0x14) addr:0x020e4894 _ZN18ActorItemBoomerangD1Ev kind:function(arm,size=0xa0) addr:0x020e48a8 _ZN18ActorItemBoomerangD0Ev kind:function(arm,size=0xa8) addr:0x020e4948 -_ZN18ActorItemBoomerang8vfunc_18Ei kind:function(arm,size=0xc4) addr:0x020e49f0 +_ZN18ActorItemBoomerang4InitEi kind:function(arm,size=0xc4) addr:0x020e49f0 _ZN18ActorItemBoomerang8SetStateEs kind:function(arm,size=0x1c) addr:0x020e4ab4 _ZN18ActorItemBoomerang19func_ov031_020e49b0Ei kind:function(arm,size=0x70) addr:0x020e4ad0 -_ZN18ActorItemBoomerang8vfunc_20Ev kind:function(arm,size=0x614) addr:0x020e4b40 +_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 @@ -457,10 +457,10 @@ _ZN23ActorProfileItemTornado6CreateEv kind:function(arm,size=0x24) addr:0x020e59 _ZN23ActorProfileItemTornadoC1Ev kind:function(arm,size=0x44) addr:0x020e5a18 _ZN16ActorItemTornadoC1Ev kind:function(arm,size=0x1e4) addr:0x020e5a5c _ZN24UnkStruct_ov031_02112ff4D1Ev kind:function(arm,size=0x14) addr:0x020e5c40 -_ZN16ActorItemTornado8vfunc_18Ei kind:function(arm,size=0xcc) addr:0x020e5c54 +_ZN16ActorItemTornado4InitEi kind:function(arm,size=0xcc) addr:0x020e5c54 _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5d20 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5e38 -_ZN16ActorItemTornado8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020e6268 +_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 _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e63e0 @@ -492,11 +492,11 @@ _ZN19ActorProfileUnkSWBMC1Ev kind:function(arm,size=0x44) addr:0x020e6c84 _ZN12ActorUnkSWBMC1Ev kind:function(arm,size=0xb8) addr:0x020e6cc8 _ZN15ActorUnkSWBM_94D1Ev kind:function(arm,size=0x14) addr:0x020e6d80 _ZN15ActorUnkSWBM_98D1Ev kind:function(arm,size=0x14) addr:0x020e6d94 -_ZN12ActorUnkSWBM8vfunc_18Ei kind:function(arm,size=0xc0) addr:0x020e6da8 +_ZN12ActorUnkSWBM4InitEi kind:function(arm,size=0xc0) addr:0x020e6da8 _ZN12ActorUnkSWBM19func_ov031_020e6d48Ev kind:function(arm,size=0x38) addr:0x020e6e68 _ZN12ActorUnkSWBM19func_ov031_020e6d80Ei kind:function(arm,size=0x104) addr:0x020e6ea0 _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020e6fa4 -_ZN12ActorUnkSWBM8vfunc_20Ev kind:function(arm,size=0x268) addr:0x020e7018 +_ZN12ActorUnkSWBM6UpdateEv kind:function(arm,size=0x268) addr:0x020e7018 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7280 _ZN12ActorUnkSWBM19func_ov031_020e718cEP7VecFx32P5Mat3pists kind:function(arm,size=0x108) addr:0x020e72ac _ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e73b4 @@ -546,8 +546,8 @@ _ZN19ActorProfileUnkROCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020e89 _ZN19ActorProfileUnkROCK6CreateEv kind:function(arm,size=0x24) addr:0x020e8950 _ZN19ActorProfileUnkROCKC1Ev kind:function(arm,size=0x8c) addr:0x020e8974 _ZN12ActorUnkROCKC1Ev kind:function(arm,size=0x9c) addr:0x020e8a00 -_ZN12ActorUnkROCK8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020e8a9c -_ZN12ActorUnkROCK8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020e8acc +_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 @@ -561,7 +561,7 @@ _ZN17ActorProfileRupee6CreateEv kind:function(arm,size=0x24) addr:0x020e8de4 _ZN17ActorProfileRupeeC1Ev kind:function(arm,size=0x44) addr:0x020e8e08 _ZN10ActorRupee19func_ov031_020e8d2cEP8ActorRefPK7VecFx32jjS0_ kind:function(arm,size=0x7c) addr:0x020e8e4c _ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020e8ec8 -_ZN10ActorRupee8vfunc_18Ei kind:function(arm,size=0x1d0) addr:0x020e8f3c +_ZN10ActorRupee4InitEi kind:function(arm,size=0x1d0) addr:0x020e8f3c _ZN10ActorRupee19func_ov031_020e8fecEv kind:function(arm,size=0x7c) addr:0x020e910c _ZN10ActorRupee19func_ov031_020e9068Ev kind:function(arm,size=0xa0) addr:0x020e9188 _ZN10ActorRupee19func_ov031_020e9108Ev kind:function(arm,size=0xa0) addr:0x020e9228 @@ -591,7 +591,7 @@ _ZN10ActorRupee19func_ov031_020e9740Ev kind:function(arm,size=0xf8) addr:0x020e9 _ZN10ActorRupee19func_ov031_020e9838Ev kind:function(arm,size=0x8c) addr:0x020e9958 _ZN10ActorRupee19func_ov031_020e98c4Ev kind:function(arm,size=0x40) addr:0x020e99e4 _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e9a24 -_ZN10ActorRupee8vfunc_20Ev kind:function(arm,size=0x230) addr:0x020e9a78 +_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 @@ -624,7 +624,7 @@ _ZN17ActorUnkZLSL_27CCD1Ev kind:function(thumb,size=0xc) addr:0x020ea638 _ZN12ActorUnkZLSLD1Ev kind:function(thumb,size=0xa4) addr:0x020ea644 _ZN12ActorUnkZLSLD0Ev kind:function(thumb,size=0xac) addr:0x020ea6e8 _ZN12ActorUnkZLSL19func_ov031_020ea674Ev kind:function(arm,size=0x24) addr:0x020ea794 -_ZN12ActorUnkZLSL8vfunc_18Ei kind:function(arm,size=0x10c) addr:0x020ea7b8 +_ZN12ActorUnkZLSL4InitEi kind:function(arm,size=0x10c) addr:0x020ea7b8 _ZN12ActorUnkZLSL8vfunc_ACEv kind:function(arm,size=0x4) addr:0x020ea8c4 _ZN12ActorUnkZLSL19func_ov031_020ea7a8Ev kind:function(arm,size=0xbc) addr:0x020ea8c8 _ZN12ActorUnkZLSL19func_ov031_020ea864Ev kind:function(arm,size=0x4) addr:0x020ea984 @@ -634,7 +634,7 @@ _ZN12ActorUnkZLSL8vfunc_58Es kind:function(arm,size=0x50) addr:0x020ea990 _ZN12ActorUnkZLSL19func_ov031_020ea8c0Ev kind:function(arm,size=0x4) addr:0x020ea9e0 _ZN12ActorUnkZLSL19func_ov031_020ea8c4Ev kind:function(arm,size=0x4) addr:0x020ea9e4 _ZN12ActorUnkZLSL19func_ov031_020ea8c8Ev kind:function(arm,size=0x4) addr:0x020ea9e8 -_ZN12ActorUnkZLSL8vfunc_20Ev kind:function(arm,size=0x19c) addr:0x020ea9ec +_ZN12ActorUnkZLSL6UpdateEv kind:function(arm,size=0x19c) addr:0x020ea9ec _ZN12ActorUnkZLSL19func_ov031_020eaa68Ev kind:function(arm,size=0x20) addr:0x020eab88 _ZN12ActorUnkZLSL19func_ov031_020eaa88Ev kind:function(arm,size=0x4) addr:0x020eaba8 _ZN12ActorUnkZLSL19func_ov031_020eaa8cEv kind:function(arm,size=0x80) addr:0x020eabac @@ -733,8 +733,8 @@ _ZN17ActorProfileHeart6CreateEv kind:function(arm,size=0x24) addr:0x020eee20 _ZN17ActorProfileHeartC1Ev kind:function(arm,size=0x40) addr:0x020eee44 _ZN10ActorHeart19func_ov031_020eed64EP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020eee84 _ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020eef00 -_ZN10ActorHeart8vfunc_18Ei kind:function(arm,size=0x10) addr:0x020eeff8 -_ZN10ActorHeart8vfunc_20Ev kind:function(arm,size=0x2cc) addr:0x020ef008 +_ZN10ActorHeart4InitEi kind:function(arm,size=0x10) addr:0x020eeff8 +_ZN10ActorHeart6UpdateEv kind:function(arm,size=0x2cc) addr:0x020ef008 _ZN10ActorHeart8SetStateEs kind:function(arm,size=0x54) addr:0x020ef2d4 _ZN10ActorHeart19func_ov031_020ef208Ev kind:function(arm,size=0xe4) addr:0x020ef328 _ZN10ActorHeart19func_ov031_020ef2ecEv kind:function(arm,size=0xc) addr:0x020ef40c @@ -766,8 +766,8 @@ _ZN19ActorProfileUnkRMTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020ef9 _ZN19ActorProfileUnkRMTG6CreateEv kind:function(arm,size=0x24) addr:0x020ef958 _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef97c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef9a4 -_ZN12ActorUnkRMTG8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020ef9d0 -_ZN12ActorUnkRMTG8vfunc_1CEv kind:function(arm,size=0x38) addr:0x020efa88 +_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 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020efae0 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020efb00 @@ -776,19 +776,19 @@ _ZN19ActorProfileUnkSCCN10GetProfileEv kind:function(arm,size=0xc) addr:0x020efb _ZN19ActorProfileUnkSCCN6CreateEv kind:function(arm,size=0x24) addr:0x020efb48 _ZN19ActorProfileUnkSCCNC1Ev kind:function(arm,size=0x28) addr:0x020efb6c _ZN12ActorUnkSCCNC1Ev kind:function(arm,size=0x3c) addr:0x020efb94 -_ZN12ActorUnkSCCN8vfunc_18Ei kind:function(arm,size=0x1d8) addr:0x020efbd0 +_ZN12ActorUnkSCCN4InitEi kind:function(arm,size=0x1d8) addr:0x020efbd0 _ZN12ActorUnkSCCND1Ev kind:function(arm,size=0x20) addr:0x020efda8 _ZN12ActorUnkSCCND0Ev kind:function(arm,size=0x28) addr:0x020efdc8 _ZN19ActorProfileUnkSCCND1Ev kind:function(arm,size=0x14) addr:0x020efdf0 _ZN20Actor_ov031_02113fd4C2Ev kind:function(arm,size=0x98) addr:0x020efe04 -_ZN20Actor_ov031_02113fd48vfunc_18Ei kind:function(arm,size=0x60) addr:0x020efe9c +_ZN20Actor_ov031_02113fd44InitEi kind:function(arm,size=0x60) addr:0x020efe9c _ZN20Actor_ov031_02113fd44GrabE15ActorGrabParams kind:function(arm,size=0x3c) addr:0x020efefc _ZN20Actor_ov031_02113fd44DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0xb8) addr:0x020eff38 func_ov031_020efec0 kind:function(arm,size=0x18) addr:0x020efff0 func_ov031_020efed8 kind:function(arm,size=0x2c) addr:0x020f0008 func_ov031_020eff04 kind:function(arm,size=0xb8) addr:0x020f0034 func_ov031_020effbc kind:function(arm,size=0xa0) addr:0x020f00ec -_ZN20Actor_ov031_02113fd48vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f018c +_ZN20Actor_ov031_02113fd46UpdateEv kind:function(arm,size=0x4) addr:0x020f018c _ZN20Actor_ov031_02113fd48vfunc_24Ev kind:function(arm,size=0x30) addr:0x020f0190 _ZN20Actor_ov031_02113fd48vfunc_60Ev kind:function(arm,size=0x4) addr:0x020f01c0 _ZN20Actor_ov031_02113fd419func_ov031_020f0094Ev kind:function(arm,size=0x4) addr:0x020f01c4 @@ -827,9 +827,9 @@ _ZN15ActorProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x020f0d3c _ZN15ActorProfilePotC1Ev kind:function(arm,size=0x30) addr:0x020f0d60 _ZN8ActorPotC1Ev kind:function(arm,size=0x90) addr:0x020f0d90 _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0e20 -_ZN8ActorPot8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f0e34 +_ZN8ActorPot4InitEi kind:function(arm,size=0x28) addr:0x020f0e34 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0e5c -_ZN8ActorPot8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f0eb0 +_ZN8ActorPot6UpdateEv kind:function(arm,size=0x38) addr:0x020f0eb0 _ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 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 @@ -851,9 +851,9 @@ _ZN22ActorProfileItemFlower6CreateEv kind:function(arm,size=0x24) addr:0x020f110 _ZN22ActorProfileItemFlowerC1Ev kind:function(arm,size=0x30) addr:0x020f112c _ZN15ActorItemFlowerC1Ev kind:function(arm,size=0x94) addr:0x020f115c _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f11f0 -_ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f1204 +_ZN15ActorItemFlower4InitEi kind:function(arm,size=0x28) addr:0x020f1204 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f122c -_ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f1270 +_ZN15ActorItemFlower6UpdateEv kind:function(arm,size=0x38) addr:0x020f1270 _ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 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 @@ -878,13 +878,13 @@ _ZN14ActorShotArrowC1Ev kind:function(arm,size=0x1ec) addr:0x020f154c _ZN18ActorShotArrow_194D1Ev kind:function(arm,size=0x14) addr:0x020f1738 _ZN14ActorShotArrowD1Ev kind:function(arm,size=0x8c) addr:0x020f174c _ZN14ActorShotArrowD0Ev kind:function(arm,size=0x94) addr:0x020f17d8 -_ZN14ActorShotArrow8vfunc_18Ei kind:function(arm,size=0x12c) addr:0x020f186c +_ZN14ActorShotArrow4InitEi kind:function(arm,size=0x12c) addr:0x020f186c _ZN14ActorShotArrow19func_ov031_020f1868Ev kind:function(arm,size=0xc) addr:0x020f1998 _ZN14ActorShotArrow19func_ov031_020f1874Ev kind:function(arm,size=0x4) addr:0x020f19a4 _ZN14ActorShotArrow8SetStateEj kind:function(arm,size=0x44) addr:0x020f19a8 _ZN14ActorShotArrow8vfunc_24Ev kind:function(arm,size=0x9c) addr:0x020f19ec _ZN14ActorShotArrow19func_ov031_020f1958Ev kind:function(arm,size=0x4) addr:0x020f1a88 -_ZN14ActorShotArrow8vfunc_20Ev kind:function(arm,size=0x108) addr:0x020f1a8c +_ZN14ActorShotArrow6UpdateEv kind:function(arm,size=0x108) addr:0x020f1a8c _ZN14ActorShotArrow19func_ov031_020f1a64Ev kind:function(arm,size=0xa0) addr:0x020f1b94 _ZN14ActorShotArrow19func_ov031_020f1b04Ev kind:function(arm,size=0x120) addr:0x020f1c34 _ZN14ActorShotArrow19func_ov031_020f1c24Ev kind:function(arm,size=0x58) addr:0x020f1d54 @@ -936,8 +936,8 @@ _ZN19ActorProfileUnkATTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020f3e _ZN19ActorProfileUnkATTG6CreateEv kind:function(arm,size=0x24) addr:0x020f3eb8 _ZN19ActorProfileUnkATTGC1Ev kind:function(arm,size=0x28) addr:0x020f3edc _ZN12ActorUnkATTGC1Ev kind:function(arm,size=0x28) addr:0x020f3f04 -_ZN12ActorUnkATTG8vfunc_18Ei kind:function(arm,size=0x54) addr:0x020f3f2c -_ZN12ActorUnkATTG8vfunc_20Ev kind:function(arm,size=0x5c) addr:0x020f3f80 +_ZN12ActorUnkATTG4InitEi kind:function(arm,size=0x54) addr:0x020f3f2c +_ZN12ActorUnkATTG6UpdateEv kind:function(arm,size=0x5c) addr:0x020f3f80 _ZN12ActorUnkATTG8vfunc_24Ev kind:function(arm,size=0x40) addr:0x020f3fdc _ZN12ActorUnkATTG19func_ov031_020f3eecEsi kind:function(arm,size=0x128) addr:0x020f401c _ZN12ActorUnkATTG19func_ov031_020f4014Ev kind:function(arm,size=0x44) addr:0x020f4144 @@ -995,8 +995,8 @@ _ZN19ActorProfileUnkNTTZ10GetProfileEv kind:function(arm,size=0xc) addr:0x020f62 _ZN19ActorProfileUnkNTTZ6CreateEv kind:function(arm,size=0x24) addr:0x020f6244 _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6268 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6290 -_ZN12ActorUnkNTTZ8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020f62c0 -_ZN12ActorUnkNTTZ8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f62c8 +_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 _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f62d0 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f6320 @@ -1022,8 +1022,8 @@ _ZN19ActorProfileUnkTGTZ6CreateEv kind:function(arm,size=0x24) addr:0x020f6970 _ZN19ActorProfileUnkTGTZC1Ev kind:function(arm,size=0x44) addr:0x020f6994 _ZN12ActorUnkTGTZC1Ev kind:function(arm,size=0xdc) addr:0x020f69d8 _ZN24ActorUnkTGTZ_ModelRenderD1Ev kind:function(arm,size=0x14) addr:0x020f6ab4 -_ZN12ActorUnkTGTZ8vfunc_18Ei kind:function(arm,size=0x14c) addr:0x020f6ac8 -_ZN12ActorUnkTGTZ8vfunc_20Ev kind:function(arm,size=0x364) addr:0x020f6c14 +_ZN12ActorUnkTGTZ4InitEi kind:function(arm,size=0x14c) addr:0x020f6ac8 +_ZN12ActorUnkTGTZ6UpdateEv kind:function(arm,size=0x364) addr:0x020f6c14 _ZN12ActorUnkTGTZ8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020f6f78 _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE8ActorRef kind:function(arm,size=0x4c) addr:0x020f6f8c _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP8ActorReftPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6fd8 @@ -1041,7 +1041,7 @@ func_ov031_020f7474 kind:function(arm,size=0x20) addr:0x020f75a4 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_021148708vfunc_18Ei kind:function(arm,size=0x3c) addr:0x020f7668 +_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_54Ev kind:function(arm,size=0x8) addr:0x020f76c4 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f76cc @@ -1070,8 +1070,8 @@ _ZN19ActorProfileUnkSWCH10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7b _ZN19ActorProfileUnkSWCH6CreateEv kind:function(arm,size=0x24) addr:0x020f7bc0 _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7be4 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7c0c -_ZN12ActorUnkSWCH8vfunc_18Ei kind:function(arm,size=0x14) addr:0x020f7c3c -_ZN12ActorUnkSWCH8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020f7c50 +_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 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7cc8 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7cdc @@ -1084,7 +1084,7 @@ _ZN19ActorProfileUnkSWON10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7e _ZN19ActorProfileUnkSWON6CreateEv kind:function(arm,size=0x24) addr:0x020f7ef8 _ZN19ActorProfileUnkSWONC1Ev kind:function(arm,size=0x28) addr:0x020f7f1c _ZN12ActorUnkSWONC1Ev kind:function(arm,size=0x20) addr:0x020f7f44 -_ZN12ActorUnkSWON8vfunc_18Ei kind:function(arm,size=0x9c) addr:0x020f7f64 +_ZN12ActorUnkSWON4InitEi kind:function(arm,size=0x9c) addr:0x020f7f64 _ZN12ActorUnkSWOND1Ev kind:function(arm,size=0x14) addr:0x020f8000 _ZN12ActorUnkSWOND0Ev kind:function(arm,size=0x1c) addr:0x020f8014 _ZN19ActorProfileUnkSWOND1Ev kind:function(arm,size=0x14) addr:0x020f8030 @@ -1092,7 +1092,7 @@ _ZN19ActorProfileUnkNORE10GetProfileEv kind:function(arm,size=0xc) addr:0x020f80 _ZN19ActorProfileUnkNORE6CreateEv kind:function(arm,size=0x24) addr:0x020f8050 _ZN19ActorProfileUnkNOREC1Ev kind:function(arm,size=0x28) addr:0x020f8074 _ZN12ActorUnkNOREC1Ev kind:function(arm,size=0x20) addr:0x020f809c -_ZN12ActorUnkNORE8vfunc_18Ei kind:function(arm,size=0x54) addr:0x020f80bc +_ZN12ActorUnkNORE4InitEi kind:function(arm,size=0x54) addr:0x020f80bc _ZN12ActorUnkNORED1Ev kind:function(arm,size=0x14) addr:0x020f8110 _ZN12ActorUnkNORED0Ev kind:function(arm,size=0x1c) addr:0x020f8124 _ZN19ActorProfileUnkNORED1Ev kind:function(arm,size=0x14) addr:0x020f8140 @@ -1100,8 +1100,8 @@ _ZN19ActorProfileUnkFLEN10GetProfileEv kind:function(arm,size=0xc) addr:0x020f81 _ZN19ActorProfileUnkFLEN6CreateEv kind:function(arm,size=0x24) addr:0x020f8160 _ZN19ActorProfileUnkFLENC1Ev kind:function(arm,size=0x3c) addr:0x020f8184 _ZN12ActorUnkFLENC1Ev kind:function(arm,size=0x28) addr:0x020f81c0 -_ZN12ActorUnkFLEN8vfunc_18Ei kind:function(arm,size=0x60) addr:0x020f81e8 -_ZN12ActorUnkFLEN8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020f8248 +_ZN12ActorUnkFLEN4InitEi kind:function(arm,size=0x60) addr:0x020f81e8 +_ZN12ActorUnkFLEN6UpdateEv kind:function(arm,size=0x9c) addr:0x020f8248 _ZN12ActorUnkFLEN8SetStateEs kind:function(arm,size=0x44) addr:0x020f82e4 _ZN12ActorUnkFLEN19func_ov031_020f81f8Ev kind:function(arm,size=0xa4) addr:0x020f8328 _ZN12ActorUnkFLEND1Ev kind:function(arm,size=0x14) addr:0x020f83cc @@ -1116,8 +1116,8 @@ _ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x0 _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 -_ZN17ActorRollingStone8vfunc_18Ei kind:function(arm,size=0xf0) addr:0x020f87cc -_ZN17ActorRollingStone8vfunc_20Ev kind:function(arm,size=0x98) addr:0x020f88bc +_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 @@ -1169,8 +1169,8 @@ _ZN24ActorProfileTreasureDrop6CreateEv kind:function(arm,size=0x24) addr:0x020fa _ZN24ActorProfileTreasureDropC1Ev kind:function(arm,size=0x40) addr:0x020fa07c _ZN13ActorItemDrop19func_ov031_020f9f8cEP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020fa0bc _ZN13ActorItemDropC1Ev kind:function(arm,size=0x200) addr:0x020fa13c -_ZN13ActorItemDrop8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020fa33c -_ZN13ActorItemDrop8vfunc_20Ev kind:function(arm,size=0xc) addr:0x020fa36c +_ZN13ActorItemDrop4InitEi kind:function(arm,size=0x30) addr:0x020fa33c +_ZN13ActorItemDrop6UpdateEv kind:function(arm,size=0xc) addr:0x020fa36c _ZN13ActorItemDrop8vfunc_24Ev kind:function(arm,size=0x18) addr:0x020fa378 _ZN13ActorItemDrop19func_ov031_020fa260Ev kind:function(arm,size=0x1c4) addr:0x020fa390 _ZN13ActorItemDrop8SetStateEs kind:function(arm,size=0x44) addr:0x020fa554 @@ -1205,7 +1205,7 @@ _ZN19ActorProfileUnkMLCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020fac _ZN19ActorProfileUnkMLCK6CreateEv kind:function(arm,size=0x24) addr:0x020fac98 _ZN19ActorProfileUnkMLCKC1Ev kind:function(arm,size=0x28) addr:0x020facbc _ZN12ActorUnkMLCKC1Ev kind:function(arm,size=0xb0) addr:0x020face4 -_ZN12ActorUnkMLCK8vfunc_18Ei kind:function(arm,size=0xd8) addr:0x020fad94 +_ZN12ActorUnkMLCK4InitEi kind:function(arm,size=0xd8) addr:0x020fad94 _ZN12ActorUnkMLCK8vfunc_64Ei kind:function(arm,size=0x4c) addr:0x020fae6c _ZN12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x20) addr:0x020faeb8 _ZN12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0xc) addr:0x020faed8 @@ -1246,8 +1246,8 @@ _ZN19ActorProfileUnkEFSB10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb5 _ZN19ActorProfileUnkEFSB6CreateEv kind:function(arm,size=0x24) addr:0x020fb5e8 _ZN19ActorProfileUnkEFSBC1Ev kind:function(arm,size=0x28) addr:0x020fb60c _ZN12ActorUnkEFSBC1Ev kind:function(arm,size=0x110) addr:0x020fb634 -_ZN12ActorUnkEFSB8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020fb744 -_ZN12ActorUnkEFSB8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020fb7fc +_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 @@ -1258,8 +1258,8 @@ _ZN19ActorProfileUnkNFSP10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb9 _ZN19ActorProfileUnkNFSP6CreateEv kind:function(arm,size=0x24) addr:0x020fb948 _ZN19ActorProfileUnkNFSPC1Ev kind:function(arm,size=0x44) addr:0x020fb96c _ZN12ActorUnkNFSPC1Ev kind:function(arm,size=0x58) addr:0x020fb9b0 -_ZN12ActorUnkNFSP8vfunc_18Ei kind:function(arm,size=0x48) addr:0x020fba08 -_ZN12ActorUnkNFSP8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020fba50 +_ZN12ActorUnkNFSP4InitEi kind:function(arm,size=0x48) addr:0x020fba08 +_ZN12ActorUnkNFSP6UpdateEv kind:function(arm,size=0x68) addr:0x020fba50 _ZN12ActorUnkNFSP19func_ov031_020fb988Ev kind:function(arm,size=0xc) addr:0x020fbab8 _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020fbac4 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fbae4 @@ -1316,8 +1316,8 @@ _ZN31MapObjectProfileDoorDangerSpawn10GetProfileEv kind:function(arm,size=0xc) a _ZN31MapObjectProfileDoorDangerSpawn6CreateEv kind:function(arm,size=0x24) addr:0x020fd234 _ZN31MapObjectProfileDoorDangerSpawnC1Ev kind:function(arm,size=0x50) addr:0x020fd258 _ZN24MapObjectDoorDangerSpawnC1Ev kind:function(arm,size=0xbc) addr:0x020fd2a8 -_ZN24MapObjectDoorDangerSpawn8vfunc_00Ev kind:function(arm,size=0x50) addr:0x020fd364 -_ZN24MapObjectDoorDangerSpawn8vfunc_04Ev kind:function(arm,size=0x174) addr:0x020fd3b4 +_ZN24MapObjectDoorDangerSpawn4InitEv kind:function(arm,size=0x50) addr:0x020fd364 +_ZN24MapObjectDoorDangerSpawn5SetupEv kind:function(arm,size=0x174) addr:0x020fd3b4 _ZN24MapObjectDoorDangerSpawn9vfunc2_04Ev kind:function(arm,size=0xc) addr:0x020fd528 _ZN24MapObjectDoorDangerSpawn9vfunc2_08Ev kind:function(arm,size=0x70) addr:0x020fd534 _ZN24MapObjectDoorDangerSpawn8vfunc_08Ev kind:function(arm,size=0x374) addr:0x020fd5a4 @@ -1349,7 +1349,7 @@ _ZN23MapObjectProfileDoorKey10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileDoorKey6CreateEv kind:function(arm,size=0x24) addr:0x020fe870 _ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x020fe894 _ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x020fe8e8 -_ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020fe99c +_ZN16MapObjectDoorKey4InitEv kind:function(arm,size=0x1c) addr:0x020fe99c _ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x020fe9b8 _ZN16MapObjectDoorKey8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fe9d0 _ZN16MapObjectDoorKey8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020fe9dc @@ -1374,7 +1374,7 @@ _ZN26MapObjectProfileDoorSwitch6CreateEv kind:function(arm,size=0x24) addr:0x020 _ZN26MapObjectProfileDoorSwitchC1Ev kind:function(arm,size=0x48) addr:0x020fefcc _ZN19MapObjectDoorSwitchC2Ev kind:function(arm,size=0x64) addr:0x020ff014 _ZN19MapObjectDoorSwitchC1Ev kind:function(arm,size=0x64) addr:0x020ff078 -_ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0xd0) addr:0x020ff0dc +_ZN19MapObjectDoorSwitch4InitEv kind:function(arm,size=0xd0) addr:0x020ff0dc _ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x020ff1ac _ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ff230 _ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x020ff240 @@ -1398,7 +1398,7 @@ _ZN25MapObjectProfileDoorClickC1Ev kind:function(arm,size=0x50) addr:0x020ff678 _ZN18MapObjectDoorClickC2Ev kind:function(arm,size=0x88) addr:0x020ff6c8 _ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x020ff750 _ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x020ff7d8 -_ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x020ff7ec +_ZN18MapObjectDoorClick4InitEv kind:function(arm,size=0x100) addr:0x020ff7ec _ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x020ff8ec _ZN18MapObjectDoorClick8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ffcbc _ZN18MapObjectDoorClick8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020ffcc8 @@ -1426,7 +1426,7 @@ _ZN25MapObjectProfileDoorTouch10GetProfileEv kind:function(arm,size=0xc) addr:0x _ZN25MapObjectProfileDoorTouch6CreateEv kind:function(arm,size=0x24) addr:0x02100388 _ZN25MapObjectProfileDoorTouchC1Ev kind:function(arm,size=0x4c) addr:0x021003ac _ZN18MapObjectDoorTouchC1Ev kind:function(arm,size=0x34) addr:0x021003f8 -_ZN18MapObjectDoorTouch8vfunc_00Ev kind:function(arm,size=0x18) addr:0x0210042c +_ZN18MapObjectDoorTouch4InitEv kind:function(arm,size=0x18) addr:0x0210042c _ZN18MapObjectDoorTouch9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x02100444 _ZN18MapObjectDoorTouch8vfunc_40Ev kind:function(arm,size=0x28) addr:0x021004d0 _ZN18MapObjectDoorTouch8vfunc_44Ev kind:function(arm,size=0x44) addr:0x021004f8 @@ -1474,7 +1474,7 @@ _ZN21MapObjectProfileGrass6CreateEv kind:function(arm,size=0x24) addr:0x02101148 _ZN21MapObjectProfileGrassC1Ev kind:function(arm,size=0xa4) addr:0x0210116c _ZN14MapObjectGrassC2Ev kind:function(arm,size=0x48) addr:0x02101210 _ZN14MapObjectGrassC1Ev kind:function(arm,size=0x48) addr:0x02101258 -_ZN14MapObjectGrass8vfunc_00Ev kind:function(arm,size=0x31c) addr:0x021012a0 +_ZN14MapObjectGrass4InitEv kind:function(arm,size=0x31c) addr:0x021012a0 _ZN14MapObjectGrass8vfunc_08Ev kind:function(arm,size=0x78) addr:0x021015bc _ZN14MapObjectGrass8vfunc_14Ei kind:function(arm,size=0x74) addr:0x02101634 _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x021016a8 @@ -1497,7 +1497,7 @@ _ZN23MapObjectProfileUnkSWHTC1Ev kind:function(arm,size=0x90) addr:0x02101b74 _ZN16MapObjectUnkSWHTC1Ev kind:function(arm,size=0x114) addr:0x02101c04 _ZN16MapObjectUnkSWHTD1Ev kind:function(arm,size=0x7c) addr:0x02101d18 _ZN16MapObjectUnkSWHTD0Ev kind:function(arm,size=0x84) addr:0x02101d94 -_ZN16MapObjectUnkSWHT8vfunc_00Ev kind:function(arm,size=0xf0) addr:0x02101e18 +_ZN16MapObjectUnkSWHT4InitEv kind:function(arm,size=0xf0) addr:0x02101e18 _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0x02101f08 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101f4c _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x021020b8 @@ -1546,8 +1546,8 @@ _ZN19MapObjectUnkTRES_74D1Ev kind:function(arm,size=0x14) addr:0x0210322c _ZN18MapObjectChestBaseD1Ev kind:function(arm,size=0x20) addr:0x02103240 _ZN18MapObjectChestBaseD0Ev kind:function(arm,size=0x28) addr:0x02103260 _ZN18MapObjectChestBaseD2Ev kind:function(arm,size=0x20) addr:0x02103288 -_ZN18MapObjectChestBase8vfunc_00Ev kind:function(arm,size=0xdc) addr:0x021032a8 -_ZN18MapObjectChestBase8vfunc_04Ev kind:function(arm,size=0x2e0) addr:0x02103384 +_ZN18MapObjectChestBase4InitEv kind:function(arm,size=0xdc) addr:0x021032a8 +_ZN18MapObjectChestBase5SetupEv kind:function(arm,size=0x2e0) addr:0x02103384 _ZN18MapObjectChestBase8vfunc_08Ev kind:function(arm,size=0x27c) addr:0x02103664 _ZN18MapObjectChestBase8vfunc_0CEv kind:function(arm,size=0x14) addr:0x021038e0 _ZN18MapObjectChestBase8vfunc_28Eiii kind:function(arm,size=0xc) addr:0x021038f4 @@ -1625,7 +1625,7 @@ _ZN19MapObjectProfilePot10GetProfileEv kind:function(arm,size=0xc) addr:0x021050 _ZN19MapObjectProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x0210506c _ZN19MapObjectProfilePotC1Ev kind:function(arm,size=0x8c) addr:0x02105090 _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x0210511c -_ZN12MapObjectPot8vfunc_04Ev kind:function(arm,size=0x2c) addr:0x021051b8 +_ZN12MapObjectPot5SetupEv kind:function(arm,size=0x2c) addr:0x021051b8 _ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x021051e4 _ZN12MapObjectPot8vfunc_48Ev kind:function(arm,size=0xf8) addr:0x02105304 _ZN12MapObjectPot8vfunc_14Ei kind:function(arm,size=0x44) addr:0x021053fc @@ -1666,8 +1666,8 @@ _ZN23MapObjectProfileUnkSKDIC1Ev kind:function(arm,size=0x48) addr:0x02106160 _ZN16MapObjectUnkSKDIC1Ev kind:function(arm,size=0x118) addr:0x021061a8 _ZN16MapObjectUnkSKDI19func_ov031_02106190Ev kind:function(arm,size=0x4c) addr:0x021062c0 _ZN16MapObjectUnkSKDI19func_ov031_021061dcEv kind:function(arm,size=0x48) addr:0x0210630c -_ZN16MapObjectUnkSKDI8vfunc_00Ev kind:function(arm,size=0xc8) addr:0x02106354 -_ZN16MapObjectUnkSKDI8vfunc_04Ev kind:function(arm,size=0xe0) addr:0x0210641c +_ZN16MapObjectUnkSKDI4InitEv kind:function(arm,size=0xc8) addr:0x02106354 +_ZN16MapObjectUnkSKDI5SetupEv kind:function(arm,size=0xe0) addr:0x0210641c _ZN16MapObjectUnkSKDI8vfunc_08Ev kind:function(arm,size=0x10) addr:0x021064fc _ZN16MapObjectUnkSKDI8vfunc_0CEv kind:function(arm,size=0x60) addr:0x0210650c _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr:0x0210656c @@ -1686,9 +1686,9 @@ _ZN19ActorProfileUnkSKDO10GetProfileEv kind:function(arm,size=0xc) addr:0x02106e _ZN19ActorProfileUnkSKDO6CreateEv kind:function(arm,size=0x24) addr:0x02106e9c _ZN19ActorProfileUnkSKDOC1Ev kind:function(arm,size=0x28) addr:0x02106ec0 _ZN12ActorUnkSKDOC1Ev kind:function(arm,size=0x28) addr:0x02106ee8 -_ZN12ActorUnkSKDO8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02106f10 -_ZN12ActorUnkSKDO8vfunc_1CEv kind:function(arm,size=0x70) addr:0x02106f18 -_ZN12ActorUnkSKDO8vfunc_20Ev kind:function(arm,size=0x38) addr:0x02106f88 +_ZN12ActorUnkSKDO4InitEi kind:function(arm,size=0x8) addr:0x02106f10 +_ZN12ActorUnkSKDO5SetupEv kind:function(arm,size=0x70) addr:0x02106f18 +_ZN12ActorUnkSKDO6UpdateEv kind:function(arm,size=0x38) addr:0x02106f88 _ZN12ActorUnkSKDO8vfunc_54Ei kind:function(arm,size=0x8) addr:0x02106fc0 _ZN27ActorUnkSKDO_ov031_02115ce88vfunc_00EP9MapObject kind:function(arm,size=0x3c) addr:0x02106fc8 _ZN12ActorUnkSKDOD1Ev kind:function(arm,size=0x14) addr:0x02107004 diff --git a/config/eur1/arm9/overlays/ov032/symbols.txt b/config/eur1/arm9/overlays/ov032/symbols.txt index 9781c9e3..477c2449 100644 --- a/config/eur1/arm9/overlays/ov032/symbols.txt +++ b/config/eur1/arm9/overlays/ov032/symbols.txt @@ -6,11 +6,11 @@ _ZN15ActorSpinut_110D1Ev kind:function(arm,size=0x14) addr:0x02119388 _ZN15ActorSpinut_1BCD1Ev kind:function(arm,size=0x14) addr:0x0211939c _ZN11ActorSpinutD1Ev kind:function(arm,size=0x8c) addr:0x021193b0 _ZN11ActorSpinutD0Ev kind:function(arm,size=0x94) addr:0x0211943c -_ZN11ActorSpinut8vfunc_18Ei kind:function(arm,size=0xc8) addr:0x021194d0 -_ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x02119598 +_ZN11ActorSpinut4InitEi kind:function(arm,size=0xc8) addr:0x021194d0 +_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 -_ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x021196c4 +_ZN11ActorSpinut6UpdateEv kind:function(arm,size=0x358) addr:0x021196c4 _ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 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 @@ -64,9 +64,9 @@ _ZN25ActorProfileFleeingSpinutC1Ev kind:function(arm,size=0x4c) addr:0x0211b83c _ZN18ActorFleeingSpinutC1Ev kind:function(arm,size=0x1d8) addr:0x0211b888 _ZN18ActorFleeingSpinutD1Ev kind:function(arm,size=0x30) addr:0x0211ba60 _ZN18ActorFleeingSpinutD0Ev kind:function(arm,size=0x38) addr:0x0211ba90 -_ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211bac8 +_ZN18ActorFleeingSpinut4InitEi kind:function(arm,size=0x1c) addr:0x0211bac8 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211bae4 -_ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211bb4c +_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 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bf44 @@ -124,7 +124,7 @@ _ZN14ActorKeese_2ACD1Ev kind:function(arm,size=0x1c) addr:0x0211dfac _ZN14ActorKeese_2ACD0Ev kind:function(arm,size=0x24) addr:0x0211dfc8 _ZN14ActorKeese_2AC8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211dfec _ZN14ActorKeese_2AC8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x144) addr:0x0211e010 -_ZN10ActorKeese8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0211e154 +_ZN10ActorKeese4InitEi kind:function(arm,size=0xac) addr:0x0211e154 _ZN10ActorKeese19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e200 _ZN10ActorKeese19func_ov032_0211e0d4Esi kind:function(arm,size=0x234) addr:0x0211e214 _ZN10ActorKeese19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e448 @@ -132,7 +132,7 @@ _ZN10ActorKeese19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e54c _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e560 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e5a8 -_ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e8b8 +_ZN10ActorKeese6UpdateEv kind:function(arm,size=0x1b8) addr:0x0211e8b8 _ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 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 @@ -204,7 +204,7 @@ _ZN19MapObjectUnkSWSW_408vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size= _ZN19MapObjectUnkSWSW_4019func_ov032_021210a0Ei kind:function(arm,size=0x64) addr:0x0212125c _ZN16MapObjectUnkSWSWC1Ev kind:function(arm,size=0xc4) addr:0x021212c0 _ZN19MapObjectUnkSWSW_40D1Ev kind:function(arm,size=0x14) addr:0x02121384 -_ZN16MapObjectUnkSWSW8vfunc_00Ev kind:function(arm,size=0x240) addr:0x02121398 +_ZN16MapObjectUnkSWSW4InitEv kind:function(arm,size=0x240) addr:0x02121398 _ZN16MapObjectUnkSWSW8vfunc_08Ev kind:function(arm,size=0x4b4) addr:0x021215d8 _ZN16MapObjectUnkSWSW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x278) addr:0x02121a8c _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121d04 diff --git a/config/eur1/arm9/overlays/ov063/symbols.txt b/config/eur1/arm9/overlays/ov063/symbols.txt index 3d807a5e..d91674fc 100644 --- a/config/eur1/arm9/overlays/ov063/symbols.txt +++ b/config/eur1/arm9/overlays/ov063/symbols.txt @@ -7,13 +7,13 @@ _ZN24UnkStruct_ov063_02162e888vfunc_04E8ActorRefiiPi kind:function(arm,size=0x17 _ZN12ActorUnkCANSC1Ev kind:function(arm,size=0x1dc) addr:0x0215823c _ZN24UnkStruct_ov063_02162ee8D1Ev kind:function(arm,size=0x14) addr:0x02158418 _ZN24UnkStruct_ov063_02162f14D1Ev kind:function(arm,size=0x14) addr:0x0215842c -_ZN12ActorUnkCANS8vfunc_18Ei kind:function(arm,size=0x68) addr:0x02158440 -_ZN12ActorUnkCANS8vfunc_1CEv kind:function(arm,size=0x9c) addr:0x021584a8 +_ZN12ActorUnkCANS4InitEi kind:function(arm,size=0x68) addr:0x02158440 +_ZN12ActorUnkCANS5SetupEv kind:function(arm,size=0x9c) addr:0x021584a8 _ZN12ActorUnkCANS19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158544 _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x02158568 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x021585b0 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021585e4 -_ZN12ActorUnkCANS8vfunc_20Ev kind:function(arm,size=0x53c) addr:0x02158610 +_ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x02158610 _ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 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 @@ -76,7 +76,7 @@ _ZN12ActorUnkCASE19func_ov063_0215acecEP8ActorRefS0_ kind:function(arm,size=0x5c _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ae68 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215af8c _ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215afa0 -_ZN12ActorUnkCASE8vfunc_18Ei kind:function(arm,size=0x68) addr:0x0215afb4 +_ZN12ActorUnkCASE4InitEi kind:function(arm,size=0x68) addr:0x0215afb4 _ZN12ActorUnkCASE19func_ov063_0215aefcEs kind:function(arm,size=0x58) addr:0x0215b01c _ZN12ActorUnkCASE19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215b074 _ZN12ActorUnkCASE19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215b078 @@ -91,7 +91,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b3d0 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b3e4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b3e8 -_ZN12ActorUnkCASE8vfunc_20Ev kind:function(arm,size=0x338) addr:0x0215b40c +_ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b40c _ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 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 @@ -106,9 +106,9 @@ _ZN12ActorUnkCASED1Ev kind:function(arm,size=0x30) addr:0x0215bba0 _ZN12ActorUnkCASED0Ev kind:function(arm,size=0x38) addr:0x0215bbd0 _ZN19ActorProfileUnkCASED1Ev kind:function(arm,size=0x14) addr:0x0215bc08 _ZN15ActorUnkRMSBaseC2Ev kind:function(arm,size=0x38) addr:0x0215bc1c -_ZN15ActorUnkRMSBase8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215bc54 -_ZN15ActorUnkRMSBase8vfunc_1CEv kind:function(arm,size=0x4) addr:0x0215bca8 -_ZN15ActorUnkRMSBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0215bcac +_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 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bcf4 @@ -118,9 +118,9 @@ _ZN19ActorProfileUnkRMSV6CreateEv kind:function(arm,size=0x24) addr:0x0215bd58 _ZN19ActorProfileUnkRMSVC1Ev kind:function(arm,size=0x28) addr:0x0215bd7c _ZN12ActorUnkRMSVC1Ev kind:function(arm,size=0xc0) addr:0x0215bda4 _ZN24UnkStruct_ov063_021632e4D1Ev kind:function(arm,size=0x14) addr:0x0215be64 -_ZN12ActorUnkRMSV8vfunc_18Ei kind:function(arm,size=0x94) addr:0x0215be78 +_ZN12ActorUnkRMSV4InitEi kind:function(arm,size=0x94) addr:0x0215be78 _ZN24UnkStruct_ov063_021632e48vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215bf0c -_ZN12ActorUnkRMSV8vfunc_20Ev kind:function(arm,size=0x2c) addr:0x0215bf30 +_ZN12ActorUnkRMSV6UpdateEv kind:function(arm,size=0x2c) addr:0x0215bf30 _ZN12ActorUnkRMSV8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215bf5c _ZN12ActorUnkRMSV8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215bf70 _ZN12ActorUnkRMSV8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215bfb0 @@ -134,8 +134,8 @@ _ZN19ActorProfileUnkRMSW10GetProfileEv kind:function(arm,size=0xc) addr:0x0215c0 _ZN19ActorProfileUnkRMSW6CreateEv kind:function(arm,size=0x24) addr:0x0215c0bc _ZN19ActorProfileUnkRMSWC1Ev kind:function(arm,size=0x28) addr:0x0215c0e0 _ZN12ActorUnkRMSWC1Ev kind:function(arm,size=0x74) addr:0x0215c108 -_ZN12ActorUnkRMSW8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215c17c -_ZN12ActorUnkRMSW8vfunc_20Ev kind:function(arm,size=0x18) addr:0x0215c1d0 +_ZN12ActorUnkRMSW4InitEi kind:function(arm,size=0x54) addr:0x0215c17c +_ZN12ActorUnkRMSW6UpdateEv kind:function(arm,size=0x18) addr:0x0215c1d0 _ZN12ActorUnkRMSW8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215c1e8 _ZN12ActorUnkRMSW8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215c1fc _ZN12ActorUnkRMSW8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215c23c @@ -155,8 +155,8 @@ _ZN19ActorProfileUnkRMSD10GetProfileEv kind:function(arm,size=0xc) addr:0x0215c4 _ZN19ActorProfileUnkRMSD6CreateEv kind:function(arm,size=0x24) addr:0x0215c468 _ZN19ActorProfileUnkRMSDC1Ev kind:function(arm,size=0x28) addr:0x0215c48c _ZN12ActorUnkRMSDC1Ev kind:function(arm,size=0x74) addr:0x0215c4b4 -_ZN12ActorUnkRMSD8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215c528 -_ZN12ActorUnkRMSD8vfunc_20Ev kind:function(arm,size=0x18) addr:0x0215c57c +_ZN12ActorUnkRMSD4InitEi kind:function(arm,size=0x54) addr:0x0215c528 +_ZN12ActorUnkRMSD6UpdateEv kind:function(arm,size=0x18) addr:0x0215c57c _ZN12ActorUnkRMSD8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215c594 _ZN12ActorUnkRMSD8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215c5a8 _ZN12ActorUnkRMSD8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215c5e8 @@ -252,8 +252,8 @@ _ZN19ActorProfileUnkRBLS6CreateEv kind:function(arm,size=0x24) addr:0x0215f3e4 _ZN19ActorProfileUnkRBLSC1Ev kind:function(arm,size=0x28) addr:0x0215f408 _ZN12ActorUnkRBLSC1Ev kind:function(arm,size=0xc4) addr:0x0215f430 _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f4f4 -_ZN12ActorUnkRBLS8vfunc_18Ei kind:function(arm,size=0x8c) addr:0x0215f508 -_ZN12ActorUnkRBLS8vfunc_20Ev kind:function(arm,size=0x14) addr:0x0215f594 +_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 _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f5dc @@ -264,7 +264,7 @@ _ZN23MapObjectProfileUnkSTAT10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkSTAT6CreateEv kind:function(arm,size=0x24) addr:0x0215f670 _ZN23MapObjectProfileUnkSTATC1Ev kind:function(arm,size=0x94) addr:0x0215f694 _ZN16MapObjectUnkSTATC1Ev kind:function(arm,size=0xc8) addr:0x0215f728 -_ZN16MapObjectUnkSTAT8vfunc_00Ev kind:function(arm,size=0x40) addr:0x0215f7f0 +_ZN16MapObjectUnkSTAT4InitEv kind:function(arm,size=0x40) addr:0x0215f7f0 _ZN16MapObjectUnkSTAT8vfunc_08Ev kind:function(arm,size=0x88) addr:0x0215f830 _ZN16MapObjectUnkSTAT8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0215f8b8 _ZN16MapObjectUnkSTAT19func_ov063_0215f7acEv kind:function(arm,size=0x494) addr:0x0215f8cc @@ -309,7 +309,7 @@ _ZN23MapObjectProfileUnkLTRW10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkLTRW6CreateEv kind:function(arm,size=0x24) addr:0x02160c40 _ZN23MapObjectProfileUnkLTRWC1Ev kind:function(arm,size=0xd0) addr:0x02160c64 _ZN16MapObjectUnkLTRWC1Ev kind:function(arm,size=0x9c) addr:0x02160d34 -_ZN16MapObjectUnkLTRW8vfunc_00Ev kind:function(arm,size=0x5c) addr:0x02160dd0 +_ZN16MapObjectUnkLTRW4InitEv kind:function(arm,size=0x5c) addr:0x02160dd0 _ZN16MapObjectUnkLTRW8vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02160e2c _ZN16MapObjectUnkLTRW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x34) addr:0x02160e48 _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02160e7c diff --git a/config/eur1/arm9/overlays/ov071/symbols.txt b/config/eur1/arm9/overlays/ov071/symbols.txt index a0fd099d..10336e25 100644 --- a/config/eur1/arm9/overlays/ov071/symbols.txt +++ b/config/eur1/arm9/overlays/ov071/symbols.txt @@ -295,9 +295,9 @@ _ZN14ActorTearLightC1Ev kind:function(arm,size=0x194) addr:0x0215f410 _ZN18ActorTearLight_104D1Ev kind:function(arm,size=0x14) addr:0x0215f5a4 _ZN14ActorTearLightD1Ev kind:function(arm,size=0x78) addr:0x0215f5b8 _ZN14ActorTearLightD0Ev kind:function(arm,size=0x80) addr:0x0215f630 -_ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0215f6b0 -_ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0215f75c -_ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x0215f788 +_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_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f95c diff --git a/config/eur1/arm9/overlays/ov102/symbols.txt b/config/eur1/arm9/overlays/ov102/symbols.txt index c6fa443f..b7999e7e 100644 --- a/config/eur1/arm9/overlays/ov102/symbols.txt +++ b/config/eur1/arm9/overlays/ov102/symbols.txt @@ -25,7 +25,7 @@ _ZN16MapObjectUnkPTFL19func_ov102_0218419cEv kind:function(arm,size=0x218) addr: _ZN16MapObjectUnkPTFL19func_ov102_021843b4Ev kind:function(arm,size=0x214) addr:0x021845b4 _ZN21UnkStruct_027e0cd8_0C8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021847c8 _ZN21UnkStruct_027e0cd8_0C19func_ov102_02184628Ev kind:function(arm,size=0x1c) addr:0x02184828 -_ZN12ActorUnkMLCK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184844 +_ZN12ActorUnkMLCK6UpdateEv kind:function(arm,size=0x190) addr:0x02184844 _ZN12ActorUnkMLCK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x021849d4 _ZN15ActorUnkMLCK_C419func_ov102_021847e8Eii kind:function(arm,size=0x78) addr:0x021849e8 _ZN24UnkStruct_ov102_02184a248vfunc_00EP5Actor kind:function(arm,size=0x50) addr:0x02184a60 diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index 6f054faf..c8366cb5 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -2316,9 +2316,9 @@ _ZN5ActorD1Ev kind:function(arm,size=0x4) addr:0x02099c18 _ZN5ActorD0Ev kind:function(arm,size=0x14) addr:0x02099c1c _ZN5ActorD2Ev kind:function(arm,size=0x4) addr:0x02099c30 _ZN5Actor19func_ov000_0209848cEP12ActorProfile kind:function(arm,size=0x1c) addr:0x02099c34 -_ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02099c50 -_ZN5Actor8vfunc_1CEv kind:function(arm,size=0x4) addr:0x02099c58 -_ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x02099c5c +_ZN5Actor4InitEi kind:function(arm,size=0x8) addr:0x02099c50 +_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 @@ -2436,7 +2436,7 @@ _ZN19ActorProfileUnkSWOB10GetProfileEv kind:function(arm,size=0xc) addr:0x0209c0 _ZN19ActorProfileUnkSWOB6CreateEv kind:function(arm,size=0x24) addr:0x0209c090 _ZN19ActorProfileUnkSWOBC1Ev kind:function(arm,size=0x28) addr:0x0209c0b4 _ZN12ActorUnkSWOBC1Ev kind:function(arm,size=0x38) addr:0x0209c0dc -_ZN12ActorUnkSWOB8vfunc_18Ei kind:function(arm,size=0x6c) addr:0x0209c114 +_ZN12ActorUnkSWOB4InitEi kind:function(arm,size=0x6c) addr:0x0209c114 _ZN12ActorUnkSWOB8SetStateEs kind:function(arm,size=0x7c) addr:0x0209c180 _ZN12ActorUnkSWOB19func_ov000_0209aa30Ev kind:function(arm,size=0x234) addr:0x0209c1fc _ZN12ActorUnkSWOBD1Ev kind:function(arm,size=0x14) addr:0x0209c430 @@ -2448,8 +2448,8 @@ _ZN19ActorProfileUnkSWTMC1Ev kind:function(arm,size=0x28) addr:0x0209c4a4 _ZN12ActorUnkSWTMC1Ev kind:function(arm,size=0x5c) addr:0x0209c4cc _ZN12ActorUnkSWTMD1Ev kind:function(arm,size=0x48) addr:0x0209c528 _ZN12ActorUnkSWTMD0Ev kind:function(arm,size=0x50) addr:0x0209c570 -_ZN12ActorUnkSWTM8vfunc_18Ei kind:function(arm,size=0x74) addr:0x0209c5c0 -_ZN12ActorUnkSWTM8vfunc_20Ev kind:function(arm,size=0xe8) addr:0x0209c634 +_ZN12ActorUnkSWTM4InitEi kind:function(arm,size=0x74) addr:0x0209c5c0 +_ZN12ActorUnkSWTM6UpdateEv kind:function(arm,size=0xe8) addr:0x0209c634 _ZN12ActorUnkSWTM8vfunc_24Ev kind:function(arm,size=0x4) addr:0x0209c71c _ZN12ActorUnkSWTM8SetStateEs kind:function(arm,size=0x90) addr:0x0209c720 _ZN12ActorUnkSWTM19func_ov000_0209afe4Ev kind:function(arm,size=0x54) addr:0x0209c7b0 @@ -2477,7 +2477,7 @@ _ZN21ActorProfileEventIcon10GetProfileEv kind:function(arm,size=0xc) addr:0x0209 _ZN21ActorProfileEventIcon6CreateEv kind:function(arm,size=0x24) addr:0x0209d760 _ZN21ActorProfileEventIconC1Ev kind:function(arm,size=0x28) addr:0x0209d784 _ZN14ActorEventIconC1Ev kind:function(arm,size=0x34) addr:0x0209d7ac -_ZN14ActorEventIcon8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0209d7e0 +_ZN14ActorEventIcon4InitEi kind:function(arm,size=0x1c) addr:0x0209d7e0 _ZN14ActorEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209d7fc _ZN14ActorEventIconD0Ev kind:function(arm,size=0x1c) addr:0x0209d810 _ZN21ActorProfileEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209d82c @@ -2485,8 +2485,8 @@ _ZN19ActorProfileUnkEFIK10GetProfileEv kind:function(arm,size=0xc) addr:0x0209d8 _ZN19ActorProfileUnkEFIK6CreateEv kind:function(arm,size=0x24) addr:0x0209d84c _ZN19ActorProfileUnkEFIKC1Ev kind:function(arm,size=0x28) addr:0x0209d870 _ZN12ActorUnkEFIKC1Ev kind:function(arm,size=0x34) addr:0x0209d898 -_ZN12ActorUnkEFIK8vfunc_18Ei kind:function(arm,size=0x40) addr:0x0209d8cc -_ZN12ActorUnkEFIK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x0209d90c +_ZN12ActorUnkEFIK4InitEi kind:function(arm,size=0x40) addr:0x0209d8cc +_ZN12ActorUnkEFIK6UpdateEv kind:function(arm,size=0x190) addr:0x0209d90c _ZN12ActorUnkEFIK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0209da9c _ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209dab0 _ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209dab8 @@ -2550,8 +2550,8 @@ _ZN9MapObjectC2Ev kind:function(arm,size=0xb4) addr:0x0209e7a4 _ZN9MapObjectD1Ev kind:function(arm,size=0x4) addr:0x0209e858 _ZN9MapObjectD0Ev kind:function(arm,size=0x14) addr:0x0209e85c _ZN9MapObjectD2Ev kind:function(arm,size=0x4) addr:0x0209e870 -_ZN9MapObject8vfunc_00Ev kind:function(arm,size=0x8) addr:0x0209e874 -_ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209e87c +_ZN9MapObject4InitEv kind:function(arm,size=0x8) addr:0x0209e874 +_ZN9MapObject5SetupEv kind:function(arm,size=0x4) addr:0x0209e87c _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) addr:0x0209e880 _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209e8d8 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209e8f0 @@ -2577,7 +2577,7 @@ _ZN9MapObject19func_ov000_0209d6acEP7VecFx32 kind:function(arm,size=0x54) addr:0 _ZN17MapObjectPot_BaseC2Ev kind:function(arm,size=0x50) addr:0x0209eec4 _ZN17MapObjectPot_BaseD0Ev kind:function(arm,size=0x1c) addr:0x0209ef14 _ZN17MapObjectPot_BaseD2Ev kind:function(arm,size=0x14) addr:0x0209ef30 -_ZN17MapObjectPot_Base8vfunc_00Ev kind:function(arm,size=0x24) addr:0x0209ef44 +_ZN17MapObjectPot_Base4InitEv kind:function(arm,size=0x24) addr:0x0209ef44 _ZN17MapObjectPot_Base8SetStateEsi kind:function(arm,size=0x144) addr:0x0209ef68 _ZN17MapObjectPot_Base8vfunc_24EP9MapObject7VecFx32 kind:function(arm,size=0xc4) addr:0x0209f0ac _ZN17MapObjectPot_Base8vfunc_38Ev kind:function(arm,size=0x4c) addr:0x0209f170 @@ -2606,7 +2606,7 @@ _ZN19MapObjectSwitchStepC1Ev kind:function(arm,size=0xfc) addr:0x0209f664 _ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209f760 _ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209f774 _ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209f7cc -_ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209f82c +_ZN19MapObjectSwitchStep4InitEv kind:function(arm,size=0xb4) addr:0x0209f82c _ZN19MapObjectSwitchStep19func_ov000_0209e11cEsi kind:function(arm,size=0x164) addr:0x0209f8e0 _ZN19MapObjectSwitchStep8vfunc_20Ei kind:function(arm,size=0x34) addr:0x0209fa44 _ZN19MapObjectSwitchStep8vfunc_18EPc kind:function(arm,size=0xd8) addr:0x0209fa78 @@ -2617,7 +2617,7 @@ _ZN26MapObjectProfileMiniBlocks10GetProfileEv kind:function(arm,size=0xc) addr:0 _ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x0209fbc8 _ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209fbec _ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209fc38 -_ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209fc74 +_ZN19MapObjectMiniBlocks4InitEv kind:function(arm,size=0x1fc) addr:0x0209fc74 _ZN19MapObjectMiniBlocks8vfunc_14Ei kind:function(arm,size=0x60) addr:0x0209fe70 _ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209fed0 _ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209fef0 @@ -3030,9 +3030,9 @@ _ZN14Actor_Derived1C1EP11ModelRenderP20Actor_Derived1_94_0C kind:function(arm,si _ZN14Actor_Derived1D1Ev kind:function(arm,size=0x20) addr:0x020aa4c0 _ZN14Actor_Derived1D0Ev kind:function(arm,size=0x28) addr:0x020aa4e0 _ZN14Actor_Derived1D2Ev kind:function(arm,size=0x20) addr:0x020aa508 -_ZN14Actor_Derived18vfunc_18Ei kind:function(arm,size=0x78) addr:0x020aa528 +_ZN14Actor_Derived14InitEi kind:function(arm,size=0x78) addr:0x020aa528 _ZN14Actor_Derived18vfunc_54Ei kind:function(arm,size=0x4) addr:0x020aa5a0 -_ZN14Actor_Derived18vfunc_1CEv kind:function(arm,size=0xc) addr:0x020aa5a4 +_ZN14Actor_Derived15SetupEv kind:function(arm,size=0xc) addr:0x020aa5a4 _ZN14Actor_Derived119func_ov000_020a8db0Ev kind:function(arm,size=0x20) addr:0x020aa5b0 _ZN14Actor_Derived119func_ov000_020a8dd0Ev kind:function(arm,size=0x20) addr:0x020aa5d0 _ZN14Actor_Derived119func_ov000_020a8df0E8ActorRefi kind:function(arm,size=0x94) addr:0x020aa5f0 @@ -3067,7 +3067,7 @@ _ZN14Actor_Derived119func_ov000_020a95d8Ev kind:function(arm,size=0xc) addr:0x02 _ZN14Actor_Derived18vfunc_A4Ev kind:function(arm,size=0x218) addr:0x020aade4 _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020aaffc _ZN14Actor_Derived119func_ov000_020a9804Ev kind:function(arm,size=0xec) addr:0x020ab004 -_ZN14Actor_Derived18vfunc_20Ev kind:function(arm,size=0x4) addr:0x020ab0f0 +_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_B8Ev kind:function(arm,size=0x34) addr:0x020ab1a4 diff --git a/config/jp/arm9/overlays/ov005/symbols.txt b/config/jp/arm9/overlays/ov005/symbols.txt index dea373c2..51191937 100644 --- a/config/jp/arm9/overlays/ov005/symbols.txt +++ b/config/jp/arm9/overlays/ov005/symbols.txt @@ -2,10 +2,10 @@ func_ov005_020b7d40 kind:function(arm,size=0x28) addr:0x020b7d40 func_ov005_020b7d68 kind:function(arm,size=0x28) addr:0x020b7d68 _ZN16MapObjectManager19func_ov005_020b6570Ei kind:function(arm,size=0x134) addr:0x020b7d90 _ZN12ActorManager19func_ov005_020b66a4Ei kind:function(arm,size=0x1a4) addr:0x020b7ec4 -_ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b8068 +_ZN12ActorUnkSWOB6UpdateEv kind:function(arm,size=0xf4) addr:0x020b8068 func_ov005_020b815c kind:function(arm,size=0x224) addr:0x020b815c func_ov005_020b8380 kind:function(arm,size=0x4c) addr:0x020b8380 -_ZN14ActorEventIcon8vfunc_20Ev kind:function(arm,size=0x84) addr:0x020b83cc +_ZN14ActorEventIcon6UpdateEv kind:function(arm,size=0x84) addr:0x020b83cc func_ov005_020b8450 kind:function(arm,size=0xd0) addr:0x020b8450 func_ov005_020b8520 kind:function(arm,size=0x84) addr:0x020b8520 func_ov005_020b85a4 kind:function(arm,size=0x15c) addr:0x020b85a4 diff --git a/config/jp/arm9/overlays/ov024/symbols.txt b/config/jp/arm9/overlays/ov024/symbols.txt index 88670f1b..da1ed931 100644 --- a/config/jp/arm9/overlays/ov024/symbols.txt +++ b/config/jp/arm9/overlays/ov024/symbols.txt @@ -710,9 +710,9 @@ _ZN19ActorProfileUnkOBPC10GetProfileEv kind:function(arm,size=0xc) addr:0x020d88 _ZN19ActorProfileUnkOBPC6CreateEv kind:function(arm,size=0x24) addr:0x020d884c _ZN19ActorProfileUnkOBPCC1Ev kind:function(arm,size=0x28) addr:0x020d8870 _ZN12ActorUnkOBPCC1Ev kind:function(arm,size=0x34) addr:0x020d8898 -_ZN12ActorUnkOBPC8vfunc_18Ei kind:function(arm,size=0x4c) addr:0x020d88cc +_ZN12ActorUnkOBPC4InitEi kind:function(arm,size=0x4c) addr:0x020d88cc _ZN12ActorUnkOBPC19func_ov024_020d6f74Ev kind:function(arm,size=0x20) addr:0x020d8918 -_ZN12ActorUnkOBPC8vfunc_20Ev kind:function(arm,size=0xbc) addr:0x020d8938 +_ZN12ActorUnkOBPC6UpdateEv kind:function(arm,size=0xbc) addr:0x020d8938 _ZN12ActorUnkOBPC8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020d89f4 _ZN12ActorUnkOBPC8SetStateEsi kind:function(arm,size=0xf0) addr:0x020d8a08 _ZN12ActorUnkOBPC19func_ov024_020d7154Ev kind:function(arm,size=0x168) addr:0x020d8af8 diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index 5af54964..6c102c01 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -314,13 +314,13 @@ _ZN9ActorBomb19func_ov031_020e1634Ev kind:function(arm,size=0x58) addr:0x020e300 _ZN9ActorBombC1Ev kind:function(arm,size=0x16c) addr:0x020e305c _ZN13ActorBomb_unkD1Ev kind:function(arm,size=0x14) addr:0x020e31c8 _ZN13ActorBomb_19CD1Ev kind:function(arm,size=0x14) addr:0x020e31dc -_ZN9ActorBomb8vfunc_18Ei kind:function(arm,size=0x84) addr:0x020e31f0 +_ZN9ActorBomb4InitEi kind:function(arm,size=0x84) addr:0x020e31f0 _ZN9ActorBomb19func_ov031_020e18a0Ev kind:function(arm,size=0x24) addr:0x020e3274 _ZN9ActorBomb8SetStateEs kind:function(arm,size=0x44) addr:0x020e3298 _ZN9ActorBomb19func_ov031_020e1908Ev kind:function(arm,size=0x18) addr:0x020e32dc _ZN9ActorBomb19func_ov031_020e1920EP7VecFx32 kind:function(arm,size=0x1c) addr:0x020e32f4 _ZN9ActorBomb19func_ov031_020e193cEv kind:function(arm,size=0xec) addr:0x020e3310 -_ZN9ActorBomb8vfunc_20Ev kind:function(arm,size=0xd0) addr:0x020e33fc +_ZN9ActorBomb6UpdateEv kind:function(arm,size=0xd0) addr:0x020e33fc _ZN9ActorBomb8vfunc_24Ev kind:function(arm,size=0x24) addr:0x020e34cc _ZN9ActorBomb19func_ov031_020e1b1cEv kind:function(arm,size=0x60) addr:0x020e34f0 _ZN9ActorBomb19func_ov031_020e1b7cEv kind:function(arm,size=0x19c) addr:0x020e3550 @@ -376,8 +376,8 @@ _ZN17ActorProfileBlastC1Ev kind:function(arm,size=0x38) addr:0x020e4ed0 _ZN13ActorBlast_E88vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x1a4) addr:0x020e4f08 _ZN10ActorBlastC1Ev kind:function(arm,size=0x7c) addr:0x020e50ac _ZN13ActorBlast_E8D1Ev kind:function(arm,size=0x14) addr:0x020e5128 -_ZN10ActorBlast8vfunc_18Ei kind:function(arm,size=0x274) addr:0x020e513c -_ZN10ActorBlast8vfunc_20Ev kind:function(arm,size=0x180) addr:0x020e53b0 +_ZN10ActorBlast4InitEi kind:function(arm,size=0x274) addr:0x020e513c +_ZN10ActorBlast6UpdateEv kind:function(arm,size=0x180) addr:0x020e53b0 _ZN10ActorBlast8vfunc_24Ev kind:function(arm,size=0x50) addr:0x020e5530 _ZN10ActorBlast19func_ov031_020e3b94Ev kind:function(arm,size=0x8) addr:0x020e5580 _ZN10ActorBlast19func_ov031_020e3b9cEP5Actorss kind:function(arm,size=0x80) addr:0x020e5588 @@ -391,10 +391,10 @@ func_ov031_020e56fc kind:function(arm,size=0x90) addr:0x020e56fc _ZN22ActorUnkTLKTnCLLT_BaseC2Ev kind:function(arm,size=0x30) addr:0x020e578c func_ov031_020e3dd0 kind:function(arm,size=0x28) addr:0x020e57bc _ZN22ActorUnkTLKTnCLLT_Base19func_ov031_020e3df8Ev kind:function(arm,size=0x20) addr:0x020e57e4 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_18Ei kind:function(arm,size=0x2c) addr:0x020e5804 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_1CEv kind:function(arm,size=0x28) addr:0x020e5830 +_ZN22ActorUnkTLKTnCLLT_Base4InitEi kind:function(arm,size=0x2c) addr:0x020e5804 +_ZN22ActorUnkTLKTnCLLT_Base5SetupEv kind:function(arm,size=0x28) addr:0x020e5830 _ZN22ActorUnkTLKTnCLLT_Base19func_ov031_020e3e6cEv kind:function(arm,size=0x18) addr:0x020e5858 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_20Ev kind:function(arm,size=0x54) addr:0x020e5870 +_ZN22ActorUnkTLKTnCLLT_Base6UpdateEv kind:function(arm,size=0x54) addr:0x020e5870 func_ov031_020e58c4 kind:function(arm,size=0x28) addr:0x020e58c4 func_ov031_020e58ec kind:function(arm,size=0x50) addr:0x020e58ec _ZN22ActorUnkTLKTnCLLT_Base8vfunc_54Ev kind:function(arm,size=0x124) addr:0x020e593c @@ -429,10 +429,10 @@ _ZN21ActorItemBoomerang_A0D1Ev kind:function(arm,size=0x14) addr:0x020e614c _ZN21ActorItemBoomerang_CCD1Ev kind:function(arm,size=0x14) addr:0x020e6160 _ZN18ActorItemBoomerangD1Ev kind:function(arm,size=0xa0) addr:0x020e6174 _ZN18ActorItemBoomerangD0Ev kind:function(arm,size=0xa8) addr:0x020e6214 -_ZN18ActorItemBoomerang8vfunc_18Ei kind:function(arm,size=0xc4) addr:0x020e62bc +_ZN18ActorItemBoomerang4InitEi kind:function(arm,size=0xc4) addr:0x020e62bc _ZN18ActorItemBoomerang8SetStateEs kind:function(arm,size=0x1c) addr:0x020e6380 _ZN18ActorItemBoomerang19func_ov031_020e49b0Ei kind:function(arm,size=0x70) addr:0x020e639c -_ZN18ActorItemBoomerang8vfunc_20Ev kind:function(arm,size=0x614) addr:0x020e640c +_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 @@ -457,10 +457,10 @@ _ZN23ActorProfileItemTornado6CreateEv kind:function(arm,size=0x24) addr:0x020e72 _ZN23ActorProfileItemTornadoC1Ev kind:function(arm,size=0x44) addr:0x020e72e4 _ZN16ActorItemTornadoC1Ev kind:function(arm,size=0x1e4) addr:0x020e7328 _ZN24UnkStruct_ov031_02112ff4D1Ev kind:function(arm,size=0x14) addr:0x020e750c -_ZN16ActorItemTornado8vfunc_18Ei kind:function(arm,size=0xcc) addr:0x020e7520 +_ZN16ActorItemTornado4InitEi kind:function(arm,size=0xcc) addr:0x020e7520 _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e75ec _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e7704 -_ZN16ActorItemTornado8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020e7b34 +_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 _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e7cac @@ -492,11 +492,11 @@ _ZN19ActorProfileUnkSWBMC1Ev kind:function(arm,size=0x44) addr:0x020e8550 _ZN12ActorUnkSWBMC1Ev kind:function(arm,size=0xb8) addr:0x020e8594 _ZN15ActorUnkSWBM_94D1Ev kind:function(arm,size=0x14) addr:0x020e864c _ZN15ActorUnkSWBM_98D1Ev kind:function(arm,size=0x14) addr:0x020e8660 -_ZN12ActorUnkSWBM8vfunc_18Ei kind:function(arm,size=0xc0) addr:0x020e8674 +_ZN12ActorUnkSWBM4InitEi kind:function(arm,size=0xc0) addr:0x020e8674 _ZN12ActorUnkSWBM19func_ov031_020e6d48Ev kind:function(arm,size=0x38) addr:0x020e8734 _ZN12ActorUnkSWBM19func_ov031_020e6d80Ei kind:function(arm,size=0x104) addr:0x020e876c _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020e8870 -_ZN12ActorUnkSWBM8vfunc_20Ev kind:function(arm,size=0x268) addr:0x020e88e4 +_ZN12ActorUnkSWBM6UpdateEv kind:function(arm,size=0x268) addr:0x020e88e4 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e8b4c _ZN12ActorUnkSWBM19func_ov031_020e718cEP7VecFx32P5Mat3pists kind:function(arm,size=0x108) addr:0x020e8b78 _ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e8c80 @@ -546,8 +546,8 @@ _ZN19ActorProfileUnkROCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020ea2 _ZN19ActorProfileUnkROCK6CreateEv kind:function(arm,size=0x24) addr:0x020ea21c _ZN19ActorProfileUnkROCKC1Ev kind:function(arm,size=0x8c) addr:0x020ea240 _ZN12ActorUnkROCKC1Ev kind:function(arm,size=0x9c) addr:0x020ea2cc -_ZN12ActorUnkROCK8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020ea368 -_ZN12ActorUnkROCK8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020ea398 +_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 @@ -561,7 +561,7 @@ _ZN17ActorProfileRupee6CreateEv kind:function(arm,size=0x24) addr:0x020ea6b0 _ZN17ActorProfileRupeeC1Ev kind:function(arm,size=0x44) addr:0x020ea6d4 _ZN10ActorRupee19func_ov031_020e8d2cEP8ActorRefPK7VecFx32jjS0_ kind:function(arm,size=0x7c) addr:0x020ea718 _ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020ea794 -_ZN10ActorRupee8vfunc_18Ei kind:function(arm,size=0x1d0) addr:0x020ea808 +_ZN10ActorRupee4InitEi kind:function(arm,size=0x1d0) addr:0x020ea808 _ZN10ActorRupee19func_ov031_020e8fecEv kind:function(arm,size=0x7c) addr:0x020ea9d8 _ZN10ActorRupee19func_ov031_020e9068Ev kind:function(arm,size=0xa0) addr:0x020eaa54 _ZN10ActorRupee19func_ov031_020e9108Ev kind:function(arm,size=0xa0) addr:0x020eaaf4 @@ -591,7 +591,7 @@ _ZN10ActorRupee19func_ov031_020e9740Ev kind:function(arm,size=0xf8) addr:0x020eb _ZN10ActorRupee19func_ov031_020e9838Ev kind:function(arm,size=0x8c) addr:0x020eb224 _ZN10ActorRupee19func_ov031_020e98c4Ev kind:function(arm,size=0x40) addr:0x020eb2b0 _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020eb2f0 -_ZN10ActorRupee8vfunc_20Ev kind:function(arm,size=0x230) addr:0x020eb344 +_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 @@ -624,7 +624,7 @@ _ZN17ActorUnkZLSL_27CCD1Ev kind:function(thumb,size=0xc) addr:0x020ebf04 _ZN12ActorUnkZLSLD1Ev kind:function(thumb,size=0xa4) addr:0x020ebf10 _ZN12ActorUnkZLSLD0Ev kind:function(thumb,size=0xac) addr:0x020ebfb4 _ZN12ActorUnkZLSL19func_ov031_020ea674Ev kind:function(arm,size=0x24) addr:0x020ec060 -_ZN12ActorUnkZLSL8vfunc_18Ei kind:function(arm,size=0x10c) addr:0x020ec084 +_ZN12ActorUnkZLSL4InitEi kind:function(arm,size=0x10c) addr:0x020ec084 _ZN12ActorUnkZLSL8vfunc_ACEv kind:function(arm,size=0x4) addr:0x020ec190 _ZN12ActorUnkZLSL19func_ov031_020ea7a8Ev kind:function(arm,size=0xbc) addr:0x020ec194 _ZN12ActorUnkZLSL19func_ov031_020ea864Ev kind:function(arm,size=0x4) addr:0x020ec250 @@ -634,7 +634,7 @@ _ZN12ActorUnkZLSL8vfunc_58Es kind:function(arm,size=0x50) addr:0x020ec25c _ZN12ActorUnkZLSL19func_ov031_020ea8c0Ev kind:function(arm,size=0x4) addr:0x020ec2ac _ZN12ActorUnkZLSL19func_ov031_020ea8c4Ev kind:function(arm,size=0x4) addr:0x020ec2b0 _ZN12ActorUnkZLSL19func_ov031_020ea8c8Ev kind:function(arm,size=0x4) addr:0x020ec2b4 -_ZN12ActorUnkZLSL8vfunc_20Ev kind:function(arm,size=0x19c) addr:0x020ec2b8 +_ZN12ActorUnkZLSL6UpdateEv kind:function(arm,size=0x19c) addr:0x020ec2b8 _ZN12ActorUnkZLSL19func_ov031_020eaa68Ev kind:function(arm,size=0x20) addr:0x020ec454 _ZN12ActorUnkZLSL19func_ov031_020eaa88Ev kind:function(arm,size=0x4) addr:0x020ec474 _ZN12ActorUnkZLSL19func_ov031_020eaa8cEv kind:function(arm,size=0x80) addr:0x020ec478 @@ -733,8 +733,8 @@ _ZN17ActorProfileHeart6CreateEv kind:function(arm,size=0x24) addr:0x020f06ec _ZN17ActorProfileHeartC1Ev kind:function(arm,size=0x40) addr:0x020f0710 _ZN10ActorHeart19func_ov031_020eed64EP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020f0750 _ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020f07cc -_ZN10ActorHeart8vfunc_18Ei kind:function(arm,size=0x10) addr:0x020f08c4 -_ZN10ActorHeart8vfunc_20Ev kind:function(arm,size=0x2cc) addr:0x020f08d4 +_ZN10ActorHeart4InitEi kind:function(arm,size=0x10) addr:0x020f08c4 +_ZN10ActorHeart6UpdateEv kind:function(arm,size=0x2cc) addr:0x020f08d4 _ZN10ActorHeart8SetStateEs kind:function(arm,size=0x54) addr:0x020f0ba0 _ZN10ActorHeart19func_ov031_020ef208Ev kind:function(arm,size=0xe4) addr:0x020f0bf4 _ZN10ActorHeart19func_ov031_020ef2ecEv kind:function(arm,size=0xc) addr:0x020f0cd8 @@ -766,8 +766,8 @@ _ZN19ActorProfileUnkRMTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020f12 _ZN19ActorProfileUnkRMTG6CreateEv kind:function(arm,size=0x24) addr:0x020f1224 _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020f1248 _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020f1270 -_ZN12ActorUnkRMTG8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020f129c -_ZN12ActorUnkRMTG8vfunc_1CEv kind:function(arm,size=0x38) addr:0x020f1354 +_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 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020f13ac _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020f13cc @@ -776,12 +776,12 @@ _ZN19ActorProfileUnkSCCN10GetProfileEv kind:function(arm,size=0xc) addr:0x020f14 _ZN19ActorProfileUnkSCCN6CreateEv kind:function(arm,size=0x24) addr:0x020f1414 _ZN19ActorProfileUnkSCCNC1Ev kind:function(arm,size=0x28) addr:0x020f1438 _ZN12ActorUnkSCCNC1Ev kind:function(arm,size=0x3c) addr:0x020f1460 -_ZN12ActorUnkSCCN8vfunc_18Ei kind:function(arm,size=0x1d8) addr:0x020f149c +_ZN12ActorUnkSCCN4InitEi kind:function(arm,size=0x1d8) addr:0x020f149c _ZN12ActorUnkSCCND1Ev kind:function(arm,size=0x20) addr:0x020f1674 _ZN12ActorUnkSCCND0Ev kind:function(arm,size=0x28) addr:0x020f1694 _ZN19ActorProfileUnkSCCND1Ev kind:function(arm,size=0x14) addr:0x020f16bc _ZN20Actor_ov031_02113fd4C2Ev kind:function(arm,size=0x98) addr:0x020f16d0 -_ZN20Actor_ov031_02113fd48vfunc_18Ei kind:function(arm,size=0x60) addr:0x020f1768 +_ZN20Actor_ov031_02113fd44InitEi kind:function(arm,size=0x60) addr:0x020f1768 _ZN20Actor_ov031_02113fd44GrabE15ActorGrabParams kind:function(arm,size=0x3c) addr:0x020f17c8 _ZN20Actor_ov031_02113fd44DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0xb8) addr:0x020f1804 func_ov031_020f18bc kind:function(arm,size=0x18) addr:0x020f18bc @@ -827,9 +827,9 @@ _ZN15ActorProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x020f2608 _ZN15ActorProfilePotC1Ev kind:function(arm,size=0x30) addr:0x020f262c _ZN8ActorPotC1Ev kind:function(arm,size=0x90) addr:0x020f265c _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f26ec -_ZN8ActorPot8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f2700 +_ZN8ActorPot4InitEi kind:function(arm,size=0x28) addr:0x020f2700 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f2728 -_ZN8ActorPot8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f277c +_ZN8ActorPot6UpdateEv kind:function(arm,size=0x38) addr:0x020f277c _ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 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 @@ -851,9 +851,9 @@ _ZN22ActorProfileItemFlower6CreateEv kind:function(arm,size=0x24) addr:0x020f29d _ZN22ActorProfileItemFlowerC1Ev kind:function(arm,size=0x30) addr:0x020f29f8 _ZN15ActorItemFlowerC1Ev kind:function(arm,size=0x94) addr:0x020f2a28 _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f2abc -_ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f2ad0 +_ZN15ActorItemFlower4InitEi kind:function(arm,size=0x28) addr:0x020f2ad0 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f2af8 -_ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f2b3c +_ZN15ActorItemFlower6UpdateEv kind:function(arm,size=0x38) addr:0x020f2b3c _ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 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 @@ -878,13 +878,13 @@ _ZN14ActorShotArrowC1Ev kind:function(arm,size=0x1ec) addr:0x020f2e18 _ZN18ActorShotArrow_194D1Ev kind:function(arm,size=0x14) addr:0x020f3004 _ZN14ActorShotArrowD1Ev kind:function(arm,size=0x8c) addr:0x020f3018 _ZN14ActorShotArrowD0Ev kind:function(arm,size=0x94) addr:0x020f30a4 -_ZN14ActorShotArrow8vfunc_18Ei kind:function(arm,size=0x12c) addr:0x020f3138 +_ZN14ActorShotArrow4InitEi kind:function(arm,size=0x12c) addr:0x020f3138 _ZN14ActorShotArrow19func_ov031_020f1868Ev kind:function(arm,size=0xc) addr:0x020f3264 _ZN14ActorShotArrow19func_ov031_020f1874Ev kind:function(arm,size=0x4) addr:0x020f3270 _ZN14ActorShotArrow8SetStateEj kind:function(arm,size=0x44) addr:0x020f3274 _ZN14ActorShotArrow8vfunc_24Ev kind:function(arm,size=0x9c) addr:0x020f32b8 _ZN14ActorShotArrow19func_ov031_020f1958Ev kind:function(arm,size=0x4) addr:0x020f3354 -_ZN14ActorShotArrow8vfunc_20Ev kind:function(arm,size=0x108) addr:0x020f3358 +_ZN14ActorShotArrow6UpdateEv kind:function(arm,size=0x108) addr:0x020f3358 _ZN14ActorShotArrow19func_ov031_020f1a64Ev kind:function(arm,size=0xa0) addr:0x020f3460 _ZN14ActorShotArrow19func_ov031_020f1b04Ev kind:function(arm,size=0x120) addr:0x020f3500 _ZN14ActorShotArrow19func_ov031_020f1c24Ev kind:function(arm,size=0x58) addr:0x020f3620 @@ -936,8 +936,8 @@ _ZN19ActorProfileUnkATTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020f58 _ZN19ActorProfileUnkATTG6CreateEv kind:function(arm,size=0x24) addr:0x020f582c _ZN19ActorProfileUnkATTGC1Ev kind:function(arm,size=0x28) addr:0x020f5850 _ZN12ActorUnkATTGC1Ev kind:function(arm,size=0x28) addr:0x020f5878 -_ZN12ActorUnkATTG8vfunc_18Ei kind:function(arm,size=0x54) addr:0x020f58a0 -_ZN12ActorUnkATTG8vfunc_20Ev kind:function(arm,size=0x5c) addr:0x020f58f4 +_ZN12ActorUnkATTG4InitEi kind:function(arm,size=0x54) addr:0x020f58a0 +_ZN12ActorUnkATTG6UpdateEv kind:function(arm,size=0x5c) addr:0x020f58f4 _ZN12ActorUnkATTG8vfunc_24Ev kind:function(arm,size=0x40) addr:0x020f5950 _ZN12ActorUnkATTG19func_ov031_020f3eecEsi kind:function(arm,size=0x128) addr:0x020f5990 _ZN12ActorUnkATTG19func_ov031_020f4014Ev kind:function(arm,size=0x44) addr:0x020f5ab8 @@ -995,8 +995,8 @@ _ZN19ActorProfileUnkNTTZ10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7b _ZN19ActorProfileUnkNTTZ6CreateEv kind:function(arm,size=0x24) addr:0x020f7bb4 _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f7bd8 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f7c00 -_ZN12ActorUnkNTTZ8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020f7c30 -_ZN12ActorUnkNTTZ8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f7c38 +_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 _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f7c40 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f7c90 @@ -1021,8 +1021,8 @@ _ZN19ActorProfileUnkTGTZ10GetProfileEv kind:function(arm,size=0xc) addr:0x020f82 _ZN19ActorProfileUnkTGTZ6CreateEv kind:function(arm,size=0x24) addr:0x020f82e0 _ZN19ActorProfileUnkTGTZC1Ev kind:function(arm,size=0x44) addr:0x020f8304 _ZN12ActorUnkTGTZC1Ev kind:function(arm,size=0xd4) addr:0x020f8348 -_ZN12ActorUnkTGTZ8vfunc_18Ei kind:function(arm,size=0x148) addr:0x020f841c -_ZN12ActorUnkTGTZ8vfunc_20Ev kind:function(arm,size=0x354) addr:0x020f8564 +_ZN12ActorUnkTGTZ4InitEi kind:function(arm,size=0x148) addr:0x020f841c +_ZN12ActorUnkTGTZ6UpdateEv kind:function(arm,size=0x354) addr:0x020f8564 _ZN12ActorUnkTGTZ8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020f88b8 _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE8ActorRef kind:function(arm,size=0x4c) addr:0x020f88cc _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP8ActorReftPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f8918 @@ -1039,7 +1039,7 @@ func_ov031_020f8ea4 kind:function(arm,size=0x20) addr:0x020f8ea4 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_021148708vfunc_18Ei kind:function(arm,size=0x3c) addr:0x020f8f68 +_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_54Ev kind:function(arm,size=0x8) addr:0x020f8fc4 func_ov031_020f8fcc kind:function(arm,size=0x50) addr:0x020f8fcc @@ -1069,8 +1069,8 @@ _ZN19ActorProfileUnkSWCH10GetProfileEv kind:function(arm,size=0xc) addr:0x020f94 _ZN19ActorProfileUnkSWCH6CreateEv kind:function(arm,size=0x24) addr:0x020f94d4 _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f94f8 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f9520 -_ZN12ActorUnkSWCH8vfunc_18Ei kind:function(arm,size=0x14) addr:0x020f9550 -_ZN12ActorUnkSWCH8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020f9564 +_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 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f95dc _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f95f0 @@ -1083,7 +1083,7 @@ _ZN19ActorProfileUnkSWON10GetProfileEv kind:function(arm,size=0xc) addr:0x020f98 _ZN19ActorProfileUnkSWON6CreateEv kind:function(arm,size=0x24) addr:0x020f980c _ZN19ActorProfileUnkSWONC1Ev kind:function(arm,size=0x28) addr:0x020f9830 _ZN12ActorUnkSWONC1Ev kind:function(arm,size=0x20) addr:0x020f9858 -_ZN12ActorUnkSWON8vfunc_18Ei kind:function(arm,size=0x9c) addr:0x020f9878 +_ZN12ActorUnkSWON4InitEi kind:function(arm,size=0x9c) addr:0x020f9878 _ZN12ActorUnkSWOND1Ev kind:function(arm,size=0x14) addr:0x020f9914 _ZN12ActorUnkSWOND0Ev kind:function(arm,size=0x1c) addr:0x020f9928 _ZN19ActorProfileUnkSWOND1Ev kind:function(arm,size=0x14) addr:0x020f9944 @@ -1091,7 +1091,7 @@ _ZN19ActorProfileUnkNORE10GetProfileEv kind:function(arm,size=0xc) addr:0x020f99 _ZN19ActorProfileUnkNORE6CreateEv kind:function(arm,size=0x24) addr:0x020f9964 _ZN19ActorProfileUnkNOREC1Ev kind:function(arm,size=0x28) addr:0x020f9988 _ZN12ActorUnkNOREC1Ev kind:function(arm,size=0x20) addr:0x020f99b0 -_ZN12ActorUnkNORE8vfunc_18Ei kind:function(arm,size=0x54) addr:0x020f99d0 +_ZN12ActorUnkNORE4InitEi kind:function(arm,size=0x54) addr:0x020f99d0 _ZN12ActorUnkNORED1Ev kind:function(arm,size=0x14) addr:0x020f9a24 _ZN12ActorUnkNORED0Ev kind:function(arm,size=0x1c) addr:0x020f9a38 _ZN19ActorProfileUnkNORED1Ev kind:function(arm,size=0x14) addr:0x020f9a54 @@ -1099,8 +1099,8 @@ _ZN19ActorProfileUnkFLEN10GetProfileEv kind:function(arm,size=0xc) addr:0x020f9a _ZN19ActorProfileUnkFLEN6CreateEv kind:function(arm,size=0x24) addr:0x020f9a74 _ZN19ActorProfileUnkFLENC1Ev kind:function(arm,size=0x3c) addr:0x020f9a98 _ZN12ActorUnkFLENC1Ev kind:function(arm,size=0x28) addr:0x020f9ad4 -_ZN12ActorUnkFLEN8vfunc_18Ei kind:function(arm,size=0x60) addr:0x020f9afc -_ZN12ActorUnkFLEN8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020f9b5c +_ZN12ActorUnkFLEN4InitEi kind:function(arm,size=0x60) addr:0x020f9afc +_ZN12ActorUnkFLEN6UpdateEv kind:function(arm,size=0x9c) addr:0x020f9b5c _ZN12ActorUnkFLEN8SetStateEs kind:function(arm,size=0x44) addr:0x020f9bf8 _ZN12ActorUnkFLEN19func_ov031_020f81f8Ev kind:function(arm,size=0xa4) addr:0x020f9c3c _ZN12ActorUnkFLEND1Ev kind:function(arm,size=0x14) addr:0x020f9ce0 @@ -1115,8 +1115,8 @@ _ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x0 _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 -_ZN17ActorRollingStone8vfunc_18Ei kind:function(arm,size=0xf0) addr:0x020fa0e0 -_ZN17ActorRollingStone8vfunc_20Ev kind:function(arm,size=0x98) addr:0x020fa1d0 +_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 @@ -1168,8 +1168,8 @@ _ZN24ActorProfileTreasureDrop6CreateEv kind:function(arm,size=0x24) addr:0x020fb _ZN24ActorProfileTreasureDropC1Ev kind:function(arm,size=0x40) addr:0x020fb990 _ZN13ActorItemDrop19func_ov031_020f9f8cEP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020fb9d0 _ZN13ActorItemDropC1Ev kind:function(arm,size=0x200) addr:0x020fba50 -_ZN13ActorItemDrop8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020fbc50 -_ZN13ActorItemDrop8vfunc_20Ev kind:function(arm,size=0xc) addr:0x020fbc80 +_ZN13ActorItemDrop4InitEi kind:function(arm,size=0x30) addr:0x020fbc50 +_ZN13ActorItemDrop6UpdateEv kind:function(arm,size=0xc) addr:0x020fbc80 _ZN13ActorItemDrop8vfunc_24Ev kind:function(arm,size=0x18) addr:0x020fbc8c _ZN13ActorItemDrop19func_ov031_020fa260Ev kind:function(arm,size=0x1c4) addr:0x020fbca4 _ZN13ActorItemDrop8SetStateEs kind:function(arm,size=0x58) addr:0x020fbe68 @@ -1204,7 +1204,7 @@ _ZN19ActorProfileUnkMLCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020fc5 _ZN19ActorProfileUnkMLCK6CreateEv kind:function(arm,size=0x24) addr:0x020fc5c0 _ZN19ActorProfileUnkMLCKC1Ev kind:function(arm,size=0x28) addr:0x020fc5e4 _ZN12ActorUnkMLCKC1Ev kind:function(arm,size=0xb0) addr:0x020fc60c -_ZN12ActorUnkMLCK8vfunc_18Ei kind:function(arm,size=0xd8) addr:0x020fc6bc +_ZN12ActorUnkMLCK4InitEi kind:function(arm,size=0xd8) addr:0x020fc6bc _ZN12ActorUnkMLCK8vfunc_64Ei kind:function(arm,size=0x4c) addr:0x020fc794 _ZN12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x20) addr:0x020fc7e0 _ZN12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0xc) addr:0x020fc800 @@ -1245,8 +1245,8 @@ _ZN19ActorProfileUnkEFSB10GetProfileEv kind:function(arm,size=0xc) addr:0x020fcf _ZN19ActorProfileUnkEFSB6CreateEv kind:function(arm,size=0x24) addr:0x020fcf10 _ZN19ActorProfileUnkEFSBC1Ev kind:function(arm,size=0x28) addr:0x020fcf34 _ZN12ActorUnkEFSBC1Ev kind:function(arm,size=0x110) addr:0x020fcf5c -_ZN12ActorUnkEFSB8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020fd06c -_ZN12ActorUnkEFSB8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020fd124 +_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 @@ -1257,8 +1257,8 @@ _ZN19ActorProfileUnkNFSP10GetProfileEv kind:function(arm,size=0xc) addr:0x020fd2 _ZN19ActorProfileUnkNFSP6CreateEv kind:function(arm,size=0x24) addr:0x020fd270 _ZN19ActorProfileUnkNFSPC1Ev kind:function(arm,size=0x44) addr:0x020fd294 _ZN12ActorUnkNFSPC1Ev kind:function(arm,size=0x58) addr:0x020fd2d8 -_ZN12ActorUnkNFSP8vfunc_18Ei kind:function(arm,size=0x48) addr:0x020fd330 -_ZN12ActorUnkNFSP8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020fd378 +_ZN12ActorUnkNFSP4InitEi kind:function(arm,size=0x48) addr:0x020fd330 +_ZN12ActorUnkNFSP6UpdateEv kind:function(arm,size=0x68) addr:0x020fd378 _ZN12ActorUnkNFSP19func_ov031_020fb988Ev kind:function(arm,size=0xc) addr:0x020fd3e0 _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020fd3ec _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xa4) addr:0x020fd40c @@ -1315,8 +1315,8 @@ _ZN31MapObjectProfileDoorDangerSpawn10GetProfileEv kind:function(arm,size=0xc) a _ZN31MapObjectProfileDoorDangerSpawn6CreateEv kind:function(arm,size=0x24) addr:0x020feb4c _ZN31MapObjectProfileDoorDangerSpawnC1Ev kind:function(arm,size=0x50) addr:0x020feb70 _ZN24MapObjectDoorDangerSpawnC1Ev kind:function(arm,size=0xbc) addr:0x020febc0 -_ZN24MapObjectDoorDangerSpawn8vfunc_00Ev kind:function(arm,size=0x50) addr:0x020fec7c -_ZN24MapObjectDoorDangerSpawn8vfunc_04Ev kind:function(arm,size=0x1d4) addr:0x020feccc +_ZN24MapObjectDoorDangerSpawn4InitEv kind:function(arm,size=0x50) addr:0x020fec7c +_ZN24MapObjectDoorDangerSpawn5SetupEv kind:function(arm,size=0x1d4) addr:0x020feccc _ZN24MapObjectDoorDangerSpawn9vfunc2_04Ev kind:function(arm,size=0xc) addr:0x020feea0 _ZN24MapObjectDoorDangerSpawn9vfunc2_08Ev kind:function(arm,size=0x70) addr:0x020feeac _ZN24MapObjectDoorDangerSpawn8vfunc_08Ev kind:function(arm,size=0x374) addr:0x020fef1c @@ -1348,7 +1348,7 @@ _ZN23MapObjectProfileDoorKey10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileDoorKey6CreateEv kind:function(arm,size=0x24) addr:0x021001e8 _ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x0210020c _ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x02100260 -_ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x02100314 +_ZN16MapObjectDoorKey4InitEv kind:function(arm,size=0x1c) addr:0x02100314 _ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x02100330 _ZN16MapObjectDoorKey8vfunc_18EPc kind:function(arm,size=0xc) addr:0x02100348 _ZN16MapObjectDoorKey8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x02100354 @@ -1373,7 +1373,7 @@ _ZN26MapObjectProfileDoorSwitch6CreateEv kind:function(arm,size=0x24) addr:0x021 _ZN26MapObjectProfileDoorSwitchC1Ev kind:function(arm,size=0x48) addr:0x02100944 _ZN19MapObjectDoorSwitchC2Ev kind:function(arm,size=0x78) addr:0x0210098c _ZN19MapObjectDoorSwitchC1Ev kind:function(arm,size=0x78) addr:0x02100a04 -_ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0x128) addr:0x02100a7c +_ZN19MapObjectDoorSwitch4InitEv kind:function(arm,size=0x128) addr:0x02100a7c _ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x02100ba4 _ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x02100c28 _ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x02100c38 @@ -1397,7 +1397,7 @@ _ZN25MapObjectProfileDoorClickC1Ev kind:function(arm,size=0x50) addr:0x02101290 _ZN18MapObjectDoorClickC2Ev kind:function(arm,size=0x88) addr:0x021012e0 _ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x02101368 _ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x021013f0 -_ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x02101404 +_ZN18MapObjectDoorClick4InitEv kind:function(arm,size=0x100) addr:0x02101404 _ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x02101504 _ZN18MapObjectDoorClick8vfunc_18EPc kind:function(arm,size=0xc) addr:0x021018d4 _ZN18MapObjectDoorClick8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x021018e0 @@ -1425,7 +1425,7 @@ _ZN25MapObjectProfileDoorTouch10GetProfileEv kind:function(arm,size=0xc) addr:0x _ZN25MapObjectProfileDoorTouch6CreateEv kind:function(arm,size=0x24) addr:0x02101fa0 _ZN25MapObjectProfileDoorTouchC1Ev kind:function(arm,size=0x4c) addr:0x02101fc4 _ZN18MapObjectDoorTouchC1Ev kind:function(arm,size=0x34) addr:0x02102010 -_ZN18MapObjectDoorTouch8vfunc_00Ev kind:function(arm,size=0x18) addr:0x02102044 +_ZN18MapObjectDoorTouch4InitEv kind:function(arm,size=0x18) addr:0x02102044 _ZN18MapObjectDoorTouch9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x0210205c _ZN18MapObjectDoorTouch8vfunc_40Ev kind:function(arm,size=0x28) addr:0x021020e8 _ZN18MapObjectDoorTouch8vfunc_44Ev kind:function(arm,size=0x44) addr:0x02102110 @@ -1473,7 +1473,7 @@ _ZN21MapObjectProfileGrass6CreateEv kind:function(arm,size=0x24) addr:0x02102d60 _ZN21MapObjectProfileGrassC1Ev kind:function(arm,size=0xa4) addr:0x02102d84 _ZN14MapObjectGrassC2Ev kind:function(arm,size=0x48) addr:0x02102e28 _ZN14MapObjectGrassC1Ev kind:function(arm,size=0x48) addr:0x02102e70 -_ZN14MapObjectGrass8vfunc_00Ev kind:function(arm,size=0x31c) addr:0x02102eb8 +_ZN14MapObjectGrass4InitEv kind:function(arm,size=0x31c) addr:0x02102eb8 _ZN14MapObjectGrass8vfunc_08Ev kind:function(arm,size=0x78) addr:0x021031d4 _ZN14MapObjectGrass8vfunc_14Ei kind:function(arm,size=0x74) addr:0x0210324c _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x021032c0 @@ -1496,7 +1496,7 @@ _ZN23MapObjectProfileUnkSWHTC1Ev kind:function(arm,size=0x90) addr:0x0210378c _ZN16MapObjectUnkSWHTC1Ev kind:function(arm,size=0x114) addr:0x0210381c _ZN16MapObjectUnkSWHTD1Ev kind:function(arm,size=0x7c) addr:0x02103930 _ZN16MapObjectUnkSWHTD0Ev kind:function(arm,size=0x84) addr:0x021039ac -_ZN16MapObjectUnkSWHT8vfunc_00Ev kind:function(arm,size=0xf0) addr:0x02103a30 +_ZN16MapObjectUnkSWHT4InitEv kind:function(arm,size=0xf0) addr:0x02103a30 _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0x02103b20 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02103b64 _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02103cd0 @@ -1545,8 +1545,8 @@ _ZN19MapObjectUnkTRES_74D1Ev kind:function(arm,size=0x14) addr:0x02104e58 _ZN18MapObjectChestBaseD1Ev kind:function(arm,size=0x20) addr:0x02104e6c _ZN18MapObjectChestBaseD0Ev kind:function(arm,size=0x28) addr:0x02104e8c _ZN18MapObjectChestBaseD2Ev kind:function(arm,size=0x20) addr:0x02104eb4 -_ZN18MapObjectChestBase8vfunc_00Ev kind:function(arm,size=0xdc) addr:0x02104ed4 -_ZN18MapObjectChestBase8vfunc_04Ev kind:function(arm,size=0x2e0) addr:0x02104fb0 +_ZN18MapObjectChestBase4InitEv kind:function(arm,size=0xdc) addr:0x02104ed4 +_ZN18MapObjectChestBase5SetupEv kind:function(arm,size=0x2e0) addr:0x02104fb0 _ZN18MapObjectChestBase8vfunc_08Ev kind:function(arm,size=0x27c) addr:0x02105290 _ZN18MapObjectChestBase8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0210550c _ZN18MapObjectChestBase8vfunc_28Eiii kind:function(arm,size=0xc) addr:0x02105520 @@ -1624,7 +1624,7 @@ _ZN19MapObjectProfilePot10GetProfileEv kind:function(arm,size=0xc) addr:0x02106c _ZN19MapObjectProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x02106c98 _ZN19MapObjectProfilePotC1Ev kind:function(arm,size=0x8c) addr:0x02106cbc _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02106d48 -_ZN12MapObjectPot8vfunc_04Ev kind:function(arm,size=0x2c) addr:0x02106de4 +_ZN12MapObjectPot5SetupEv kind:function(arm,size=0x2c) addr:0x02106de4 _ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x02106e10 _ZN12MapObjectPot8vfunc_48Ev kind:function(arm,size=0xf8) addr:0x02106f30 _ZN12MapObjectPot8vfunc_14Ei kind:function(arm,size=0x44) addr:0x02107028 @@ -1665,8 +1665,8 @@ _ZN23MapObjectProfileUnkSKDIC1Ev kind:function(arm,size=0x48) addr:0x02107d8c _ZN16MapObjectUnkSKDIC1Ev kind:function(arm,size=0x118) addr:0x02107dd4 _ZN16MapObjectUnkSKDI19func_ov031_02106190Ev kind:function(arm,size=0x4c) addr:0x02107eec _ZN16MapObjectUnkSKDI19func_ov031_021061dcEv kind:function(arm,size=0x48) addr:0x02107f38 -_ZN16MapObjectUnkSKDI8vfunc_00Ev kind:function(arm,size=0xc8) addr:0x02107f80 -_ZN16MapObjectUnkSKDI8vfunc_04Ev kind:function(arm,size=0xe0) addr:0x02108048 +_ZN16MapObjectUnkSKDI4InitEv kind:function(arm,size=0xc8) addr:0x02107f80 +_ZN16MapObjectUnkSKDI5SetupEv kind:function(arm,size=0xe0) addr:0x02108048 _ZN16MapObjectUnkSKDI8vfunc_08Ev kind:function(arm,size=0x10) addr:0x02108128 _ZN16MapObjectUnkSKDI8vfunc_0CEv kind:function(arm,size=0x60) addr:0x02108138 _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr:0x02108198 @@ -1685,9 +1685,9 @@ _ZN19ActorProfileUnkSKDO10GetProfileEv kind:function(arm,size=0xc) addr:0x02108a _ZN19ActorProfileUnkSKDO6CreateEv kind:function(arm,size=0x24) addr:0x02108ac8 _ZN19ActorProfileUnkSKDOC1Ev kind:function(arm,size=0x28) addr:0x02108aec _ZN12ActorUnkSKDOC1Ev kind:function(arm,size=0x28) addr:0x02108b14 -_ZN12ActorUnkSKDO8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02108b3c -_ZN12ActorUnkSKDO8vfunc_1CEv kind:function(arm,size=0x70) addr:0x02108b44 -_ZN12ActorUnkSKDO8vfunc_20Ev kind:function(arm,size=0x38) addr:0x02108bb4 +_ZN12ActorUnkSKDO4InitEi kind:function(arm,size=0x8) addr:0x02108b3c +_ZN12ActorUnkSKDO5SetupEv kind:function(arm,size=0x70) addr:0x02108b44 +_ZN12ActorUnkSKDO6UpdateEv kind:function(arm,size=0x38) addr:0x02108bb4 _ZN12ActorUnkSKDO8vfunc_54Ei kind:function(arm,size=0x8) addr:0x02108bec _ZN27ActorUnkSKDO_ov031_02115ce88vfunc_00EP9MapObject kind:function(arm,size=0x3c) addr:0x02108bf4 _ZN12ActorUnkSKDOD1Ev kind:function(arm,size=0x14) addr:0x02108c30 diff --git a/config/jp/arm9/overlays/ov032/symbols.txt b/config/jp/arm9/overlays/ov032/symbols.txt index c1d4d731..f4d7e0bf 100644 --- a/config/jp/arm9/overlays/ov032/symbols.txt +++ b/config/jp/arm9/overlays/ov032/symbols.txt @@ -6,11 +6,11 @@ _ZN15ActorSpinut_110D1Ev kind:function(arm,size=0x14) addr:0x0211afe8 _ZN15ActorSpinut_1BCD1Ev kind:function(arm,size=0x14) addr:0x0211affc _ZN11ActorSpinutD1Ev kind:function(arm,size=0x8c) addr:0x0211b010 _ZN11ActorSpinutD0Ev kind:function(arm,size=0x94) addr:0x0211b09c -_ZN11ActorSpinut8vfunc_18Ei kind:function(arm,size=0xc8) addr:0x0211b130 -_ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x0211b1f8 +_ZN11ActorSpinut4InitEi kind:function(arm,size=0xc8) addr:0x0211b130 +_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 -_ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x0211b324 +_ZN11ActorSpinut6UpdateEv kind:function(arm,size=0x358) addr:0x0211b324 _ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 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 @@ -64,9 +64,9 @@ _ZN25ActorProfileFleeingSpinutC1Ev kind:function(arm,size=0x4c) addr:0x0211d49c _ZN18ActorFleeingSpinutC1Ev kind:function(arm,size=0x1d8) addr:0x0211d4e8 _ZN18ActorFleeingSpinutD1Ev kind:function(arm,size=0x30) addr:0x0211d6c0 _ZN18ActorFleeingSpinutD0Ev kind:function(arm,size=0x38) addr:0x0211d6f0 -_ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211d728 +_ZN18ActorFleeingSpinut4InitEi kind:function(arm,size=0x1c) addr:0x0211d728 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211d744 -_ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211d7ac +_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 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211dba4 @@ -124,7 +124,7 @@ _ZN14ActorKeese_2ACD1Ev kind:function(arm,size=0x1c) addr:0x0211fc0c _ZN14ActorKeese_2ACD0Ev kind:function(arm,size=0x24) addr:0x0211fc28 _ZN14ActorKeese_2AC8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211fc4c _ZN14ActorKeese_2AC8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x144) addr:0x0211fc70 -_ZN10ActorKeese8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0211fdb4 +_ZN10ActorKeese4InitEi kind:function(arm,size=0xac) addr:0x0211fdb4 _ZN10ActorKeese19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211fe60 _ZN10ActorKeese19func_ov032_0211e0d4Esi kind:function(arm,size=0x234) addr:0x0211fe74 _ZN10ActorKeese19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x021200a8 @@ -132,7 +132,7 @@ _ZN10ActorKeese19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x02120 _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x021201ac _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x021201c0 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x02120208 -_ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x02120518 +_ZN10ActorKeese6UpdateEv kind:function(arm,size=0x1b8) addr:0x02120518 _ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 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 @@ -208,7 +208,7 @@ _ZN19MapObjectUnkSWSW_408vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size= _ZN19MapObjectUnkSWSW_4019func_ov032_021210a0Ei kind:function(arm,size=0x64) addr:0x02123078 _ZN16MapObjectUnkSWSWC1Ev kind:function(arm,size=0xc4) addr:0x021230dc _ZN19MapObjectUnkSWSW_40D1Ev kind:function(arm,size=0x14) addr:0x021231a0 -_ZN16MapObjectUnkSWSW8vfunc_00Ev kind:function(arm,size=0x240) addr:0x021231b4 +_ZN16MapObjectUnkSWSW4InitEv kind:function(arm,size=0x240) addr:0x021231b4 _ZN16MapObjectUnkSWSW8vfunc_08Ev kind:function(arm,size=0x4b4) addr:0x021233f4 _ZN16MapObjectUnkSWSW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x278) addr:0x021238a8 _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02123b20 diff --git a/config/jp/arm9/overlays/ov063/symbols.txt b/config/jp/arm9/overlays/ov063/symbols.txt index 0e886611..a0a25e29 100644 --- a/config/jp/arm9/overlays/ov063/symbols.txt +++ b/config/jp/arm9/overlays/ov063/symbols.txt @@ -7,13 +7,13 @@ _ZN24UnkStruct_ov063_02162e888vfunc_04E8ActorRefiiPi kind:function(arm,size=0x17 _ZN12ActorUnkCANSC1Ev kind:function(arm,size=0x1dc) addr:0x02159e5c _ZN24UnkStruct_ov063_02162ee8D1Ev kind:function(arm,size=0x14) addr:0x0215a038 _ZN24UnkStruct_ov063_02162f14D1Ev kind:function(arm,size=0x14) addr:0x0215a04c -_ZN12ActorUnkCANS8vfunc_18Ei kind:function(arm,size=0x68) addr:0x0215a060 -_ZN12ActorUnkCANS8vfunc_1CEv kind:function(arm,size=0x9c) addr:0x0215a0c8 +_ZN12ActorUnkCANS4InitEi kind:function(arm,size=0x68) addr:0x0215a060 +_ZN12ActorUnkCANS5SetupEv kind:function(arm,size=0x9c) addr:0x0215a0c8 _ZN12ActorUnkCANS19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x0215a164 _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x0215a188 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x0215a1d0 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x0215a204 -_ZN12ActorUnkCANS8vfunc_20Ev kind:function(arm,size=0x53c) addr:0x0215a230 +_ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x0215a230 _ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 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 @@ -76,7 +76,7 @@ _ZN12ActorUnkCASE19func_ov063_0215acecEP8ActorRefS0_ kind:function(arm,size=0x5c _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215cae4 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215cc08 _ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215cc1c -_ZN12ActorUnkCASE8vfunc_18Ei kind:function(arm,size=0x68) addr:0x0215cc30 +_ZN12ActorUnkCASE4InitEi kind:function(arm,size=0x68) addr:0x0215cc30 _ZN12ActorUnkCASE19func_ov063_0215aefcEs kind:function(arm,size=0x58) addr:0x0215cc98 _ZN12ActorUnkCASE19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215ccf0 _ZN12ActorUnkCASE19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215ccf4 @@ -91,7 +91,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215d04c _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215d060 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215d064 -_ZN12ActorUnkCASE8vfunc_20Ev kind:function(arm,size=0x338) addr:0x0215d088 +_ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215d088 _ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 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 @@ -106,9 +106,9 @@ _ZN12ActorUnkCASED1Ev kind:function(arm,size=0x30) addr:0x0215d814 _ZN12ActorUnkCASED0Ev kind:function(arm,size=0x38) addr:0x0215d844 _ZN19ActorProfileUnkCASED1Ev kind:function(arm,size=0x14) addr:0x0215d87c _ZN15ActorUnkRMSBaseC2Ev kind:function(arm,size=0x38) addr:0x0215d890 -_ZN15ActorUnkRMSBase8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215d8c8 -_ZN15ActorUnkRMSBase8vfunc_1CEv kind:function(arm,size=0x4) addr:0x0215d91c -_ZN15ActorUnkRMSBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0215d920 +_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 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215d968 @@ -118,9 +118,9 @@ _ZN19ActorProfileUnkRMSV6CreateEv kind:function(arm,size=0x24) addr:0x0215d9cc _ZN19ActorProfileUnkRMSVC1Ev kind:function(arm,size=0x28) addr:0x0215d9f0 _ZN12ActorUnkRMSVC1Ev kind:function(arm,size=0xc0) addr:0x0215da18 _ZN24UnkStruct_ov063_021632e4D1Ev kind:function(arm,size=0x14) addr:0x0215dad8 -_ZN12ActorUnkRMSV8vfunc_18Ei kind:function(arm,size=0x94) addr:0x0215daec +_ZN12ActorUnkRMSV4InitEi kind:function(arm,size=0x94) addr:0x0215daec _ZN24UnkStruct_ov063_021632e48vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215db80 -_ZN12ActorUnkRMSV8vfunc_20Ev kind:function(arm,size=0x2c) addr:0x0215dba4 +_ZN12ActorUnkRMSV6UpdateEv kind:function(arm,size=0x2c) addr:0x0215dba4 _ZN12ActorUnkRMSV8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215dbd0 _ZN12ActorUnkRMSV8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215dbe4 _ZN12ActorUnkRMSV8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215dc24 @@ -134,8 +134,8 @@ _ZN19ActorProfileUnkRMSW10GetProfileEv kind:function(arm,size=0xc) addr:0x0215dd _ZN19ActorProfileUnkRMSW6CreateEv kind:function(arm,size=0x24) addr:0x0215dd30 _ZN19ActorProfileUnkRMSWC1Ev kind:function(arm,size=0x28) addr:0x0215dd54 _ZN12ActorUnkRMSWC1Ev kind:function(arm,size=0x74) addr:0x0215dd7c -_ZN12ActorUnkRMSW8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215ddf0 -_ZN12ActorUnkRMSW8vfunc_20Ev kind:function(arm,size=0x18) addr:0x0215de44 +_ZN12ActorUnkRMSW4InitEi kind:function(arm,size=0x54) addr:0x0215ddf0 +_ZN12ActorUnkRMSW6UpdateEv kind:function(arm,size=0x18) addr:0x0215de44 _ZN12ActorUnkRMSW8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215de5c _ZN12ActorUnkRMSW8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215de70 _ZN12ActorUnkRMSW8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215deb0 @@ -155,8 +155,8 @@ _ZN19ActorProfileUnkRMSD10GetProfileEv kind:function(arm,size=0xc) addr:0x0215e0 _ZN19ActorProfileUnkRMSD6CreateEv kind:function(arm,size=0x24) addr:0x0215e0dc _ZN19ActorProfileUnkRMSDC1Ev kind:function(arm,size=0x28) addr:0x0215e100 _ZN12ActorUnkRMSDC1Ev kind:function(arm,size=0x74) addr:0x0215e128 -_ZN12ActorUnkRMSD8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215e19c -_ZN12ActorUnkRMSD8vfunc_20Ev kind:function(arm,size=0x18) addr:0x0215e1f0 +_ZN12ActorUnkRMSD4InitEi kind:function(arm,size=0x54) addr:0x0215e19c +_ZN12ActorUnkRMSD6UpdateEv kind:function(arm,size=0x18) addr:0x0215e1f0 _ZN12ActorUnkRMSD8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215e208 _ZN12ActorUnkRMSD8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215e21c _ZN12ActorUnkRMSD8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215e25c @@ -253,8 +253,8 @@ _ZN19ActorProfileUnkRBLS6CreateEv kind:function(arm,size=0x24) addr:0x02161098 _ZN19ActorProfileUnkRBLSC1Ev kind:function(arm,size=0x28) addr:0x021610bc _ZN12ActorUnkRBLSC1Ev kind:function(arm,size=0xc4) addr:0x021610e4 _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x021611a8 -_ZN12ActorUnkRBLS8vfunc_18Ei kind:function(arm,size=0x8c) addr:0x021611bc -_ZN12ActorUnkRBLS8vfunc_20Ev kind:function(arm,size=0x14) addr:0x02161248 +_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 _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x02161290 @@ -265,7 +265,7 @@ _ZN23MapObjectProfileUnkSTAT10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkSTAT6CreateEv kind:function(arm,size=0x24) addr:0x02161324 _ZN23MapObjectProfileUnkSTATC1Ev kind:function(arm,size=0x94) addr:0x02161348 _ZN16MapObjectUnkSTATC1Ev kind:function(arm,size=0xc8) addr:0x021613dc -_ZN16MapObjectUnkSTAT8vfunc_00Ev kind:function(arm,size=0x40) addr:0x021614a4 +_ZN16MapObjectUnkSTAT4InitEv kind:function(arm,size=0x40) addr:0x021614a4 _ZN16MapObjectUnkSTAT8vfunc_08Ev kind:function(arm,size=0x88) addr:0x021614e4 _ZN16MapObjectUnkSTAT8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0216156c _ZN16MapObjectUnkSTAT19func_ov063_0215f7acEv kind:function(arm,size=0x494) addr:0x02161580 @@ -310,7 +310,7 @@ _ZN23MapObjectProfileUnkLTRW10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkLTRW6CreateEv kind:function(arm,size=0x24) addr:0x021628f4 _ZN23MapObjectProfileUnkLTRWC1Ev kind:function(arm,size=0xd0) addr:0x02162918 _ZN16MapObjectUnkLTRWC1Ev kind:function(arm,size=0x9c) addr:0x021629e8 -_ZN16MapObjectUnkLTRW8vfunc_00Ev kind:function(arm,size=0x5c) addr:0x02162a84 +_ZN16MapObjectUnkLTRW4InitEv kind:function(arm,size=0x5c) addr:0x02162a84 _ZN16MapObjectUnkLTRW8vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02162ae0 _ZN16MapObjectUnkLTRW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x34) addr:0x02162afc _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02162b30 @@ -324,7 +324,7 @@ _ZN23MapObjectProfileUnkMTJR10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkMTJR6CreateEv kind:function(arm,size=0x24) addr:0x02162cbc _ZN23MapObjectProfileUnkMTJRC1Ev kind:function(arm,size=0x9c) addr:0x02162ce0 _ZN16MapObjectUnkMTJRC1Ev kind:function(arm,size=0x98) addr:0x02162d7c -_ZN16MapObjectUnkMTJR8vfunc_00Ev kind:function(arm,size=0x74) addr:0x02162e14 +_ZN16MapObjectUnkMTJR4InitEv kind:function(arm,size=0x74) addr:0x02162e14 _ZN16MapObjectUnkMTJR8vfunc_08Ev kind:function(arm,size=0x13c) addr:0x02162e88 _ZN16MapObjectUnkMTJR8vfunc_0CEv kind:function(arm,size=0x14) addr:0x02162fc4 _ZN16MapObjectUnkMTJR8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x94) addr:0x02162fd8 diff --git a/config/jp/arm9/overlays/ov071/symbols.txt b/config/jp/arm9/overlays/ov071/symbols.txt index 5411ab15..46b89488 100644 --- a/config/jp/arm9/overlays/ov071/symbols.txt +++ b/config/jp/arm9/overlays/ov071/symbols.txt @@ -296,9 +296,9 @@ _ZN14ActorTearLightC1Ev kind:function(arm,size=0x194) addr:0x021614d0 _ZN18ActorTearLight_104D1Ev kind:function(arm,size=0x14) addr:0x02161664 _ZN14ActorTearLightD1Ev kind:function(arm,size=0x78) addr:0x02161678 _ZN14ActorTearLightD0Ev kind:function(arm,size=0x80) addr:0x021616f0 -_ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x02161770 -_ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0216181c -_ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x02161848 +_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_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x02161a1c diff --git a/config/jp/arm9/overlays/ov102/symbols.txt b/config/jp/arm9/overlays/ov102/symbols.txt index 35e95325..8842b246 100644 --- a/config/jp/arm9/overlays/ov102/symbols.txt +++ b/config/jp/arm9/overlays/ov102/symbols.txt @@ -25,7 +25,7 @@ _ZN16MapObjectUnkPTFL19func_ov102_0218419cEv kind:function(arm,size=0x218) addr: _ZN16MapObjectUnkPTFL19func_ov102_021843b4Ev kind:function(arm,size=0x214) addr:0x02185f34 _ZN21UnkStruct_027e0cd8_0C8vfunc_0CEv kind:function(arm,size=0x60) addr:0x02186148 _ZN21UnkStruct_027e0cd8_0C19func_ov102_02184628Ev kind:function(arm,size=0x1c) addr:0x021861a8 -_ZN12ActorUnkMLCK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x021861c4 +_ZN12ActorUnkMLCK6UpdateEv kind:function(arm,size=0x190) addr:0x021861c4 _ZN12ActorUnkMLCK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x02186354 _ZN15ActorUnkMLCK_C419func_ov102_021847e8Eii kind:function(arm,size=0x78) addr:0x02186368 _ZN24UnkStruct_ov102_02184a248vfunc_00EP5Actor kind:function(arm,size=0x50) addr:0x021863e0 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 67e34514..1b0c57d7 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -2316,9 +2316,9 @@ _ZN5ActorD1Ev kind:function(arm,size=0x4) addr:0x02098450 _ZN5ActorD0Ev kind:function(arm,size=0x14) addr:0x02098454 _ZN5ActorD2Ev kind:function(arm,size=0x4) addr:0x02098468 _ZN5Actor19func_ov000_0209848cEP12ActorProfile kind:function(arm,size=0x1c) addr:0x0209846c -_ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02098488 -_ZN5Actor8vfunc_1CEv kind:function(arm,size=0x4) addr:0x02098490 -_ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x02098494 +_ZN5Actor4InitEi kind:function(arm,size=0x8) addr:0x02098488 +_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 @@ -2436,7 +2436,7 @@ _ZN19ActorProfileUnkSWOB10GetProfileEv kind:function(arm,size=0xc) addr:0x0209a8 _ZN19ActorProfileUnkSWOB6CreateEv kind:function(arm,size=0x24) addr:0x0209a8a4 _ZN19ActorProfileUnkSWOBC1Ev kind:function(arm,size=0x28) addr:0x0209a8c8 _ZN12ActorUnkSWOBC1Ev kind:function(arm,size=0x38) addr:0x0209a8f0 -_ZN12ActorUnkSWOB8vfunc_18Ei kind:function(arm,size=0x6c) addr:0x0209a928 +_ZN12ActorUnkSWOB4InitEi kind:function(arm,size=0x6c) addr:0x0209a928 _ZN12ActorUnkSWOB8SetStateEs kind:function(arm,size=0x7c) addr:0x0209a994 _ZN12ActorUnkSWOB19func_ov000_0209aa30Ev kind:function(arm,size=0x234) addr:0x0209aa10 _ZN12ActorUnkSWOBD1Ev kind:function(arm,size=0x14) addr:0x0209ac44 @@ -2448,8 +2448,8 @@ _ZN19ActorProfileUnkSWTMC1Ev kind:function(arm,size=0x28) addr:0x0209acb8 _ZN12ActorUnkSWTMC1Ev kind:function(arm,size=0x5c) addr:0x0209ace0 _ZN12ActorUnkSWTMD1Ev kind:function(arm,size=0x48) addr:0x0209ad3c _ZN12ActorUnkSWTMD0Ev kind:function(arm,size=0x50) addr:0x0209ad84 -_ZN12ActorUnkSWTM8vfunc_18Ei kind:function(arm,size=0x74) addr:0x0209add4 -_ZN12ActorUnkSWTM8vfunc_20Ev kind:function(arm,size=0xe8) addr:0x0209ae48 +_ZN12ActorUnkSWTM4InitEi kind:function(arm,size=0x74) addr:0x0209add4 +_ZN12ActorUnkSWTM6UpdateEv kind:function(arm,size=0xe8) addr:0x0209ae48 _ZN12ActorUnkSWTM8vfunc_24Ev kind:function(arm,size=0x4) addr:0x0209af30 _ZN12ActorUnkSWTM8SetStateEs kind:function(arm,size=0x90) addr:0x0209af34 _ZN12ActorUnkSWTM19func_ov000_0209afe4Ev kind:function(arm,size=0x54) addr:0x0209afc4 @@ -2477,7 +2477,7 @@ _ZN21ActorProfileEventIcon10GetProfileEv kind:function(arm,size=0xc) addr:0x0209 _ZN21ActorProfileEventIcon6CreateEv kind:function(arm,size=0x24) addr:0x0209bf74 _ZN21ActorProfileEventIconC1Ev kind:function(arm,size=0x28) addr:0x0209bf98 _ZN14ActorEventIconC1Ev kind:function(arm,size=0x34) addr:0x0209bfc0 -_ZN14ActorEventIcon8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0209bff4 +_ZN14ActorEventIcon4InitEi kind:function(arm,size=0x1c) addr:0x0209bff4 _ZN14ActorEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209c010 _ZN14ActorEventIconD0Ev kind:function(arm,size=0x1c) addr:0x0209c024 _ZN21ActorProfileEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209c040 @@ -2485,8 +2485,8 @@ _ZN19ActorProfileUnkEFIK10GetProfileEv kind:function(arm,size=0xc) addr:0x0209c0 _ZN19ActorProfileUnkEFIK6CreateEv kind:function(arm,size=0x24) addr:0x0209c060 _ZN19ActorProfileUnkEFIKC1Ev kind:function(arm,size=0x28) addr:0x0209c084 _ZN12ActorUnkEFIKC1Ev kind:function(arm,size=0x34) addr:0x0209c0ac -_ZN12ActorUnkEFIK8vfunc_18Ei kind:function(arm,size=0x40) addr:0x0209c0e0 -_ZN12ActorUnkEFIK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x0209c120 +_ZN12ActorUnkEFIK4InitEi kind:function(arm,size=0x40) addr:0x0209c0e0 +_ZN12ActorUnkEFIK6UpdateEv kind:function(arm,size=0x190) addr:0x0209c120 _ZN12ActorUnkEFIK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0209c2b0 _ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209c2c4 _ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209c2cc @@ -2551,8 +2551,8 @@ _ZN9MapObjectC2Ev kind:function(arm,size=0xb4) addr:0x0209cfc0 _ZN9MapObjectD1Ev kind:function(arm,size=0x4) addr:0x0209d074 _ZN9MapObjectD0Ev kind:function(arm,size=0x14) addr:0x0209d078 _ZN9MapObjectD2Ev kind:function(arm,size=0x4) addr:0x0209d08c -_ZN9MapObject8vfunc_00Ev kind:function(arm,size=0x8) addr:0x0209d090 -_ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209d098 +_ZN9MapObject4InitEv kind:function(arm,size=0x8) addr:0x0209d090 +_ZN9MapObject5SetupEv kind:function(arm,size=0x4) addr:0x0209d098 _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) addr:0x0209d09c _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d0f4 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d10c @@ -2578,7 +2578,7 @@ _ZN9MapObject19func_ov000_0209d6acEP7VecFx32 kind:function(arm,size=0x54) addr:0 _ZN17MapObjectPot_BaseC2Ev kind:function(arm,size=0x50) addr:0x0209d6e0 _ZN19func_ov000_0209d750D0Ev kind:function(arm,size=0x1c) addr:0x0209d730 _ZN17MapObjectPot_BaseD2Ev kind:function(arm,size=0x14) addr:0x0209d74c -_ZN17MapObjectPot_Base8vfunc_00Ev kind:function(arm,size=0x24) addr:0x0209d760 +_ZN17MapObjectPot_Base4InitEv kind:function(arm,size=0x24) addr:0x0209d760 _ZN17MapObjectPot_Base8vfunc_44Eii kind:function(arm,size=0x144) addr:0x0209d784 _ZN17MapObjectPot_Base19func_ov000_0209d8e8EPS_i kind:function(arm,size=0xc4) addr:0x0209d8c8 _ZN17MapObjectPot_Base8vfunc_38Ev kind:function(arm,size=0x4c) addr:0x0209d98c @@ -2607,7 +2607,7 @@ _ZN19MapObjectSwitchStepC1Ev kind:function(arm,size=0xfc) addr:0x0209de80 _ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209df7c _ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209df90 _ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209dfe8 -_ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209e048 +_ZN19MapObjectSwitchStep4InitEv kind:function(arm,size=0xb4) addr:0x0209e048 _ZN19MapObjectSwitchStep19func_ov000_0209e11cEsi kind:function(arm,size=0x164) addr:0x0209e0fc _ZN19MapObjectSwitchStep8vfunc_20Ei kind:function(arm,size=0x34) addr:0x0209e260 _ZN19MapObjectSwitchStep8vfunc_18EPc kind:function(arm,size=0xd8) addr:0x0209e294 @@ -2618,7 +2618,7 @@ _ZN26MapObjectProfileMiniBlocks10GetProfileEv kind:function(arm,size=0xc) addr:0 _ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x0209e3e4 _ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209e408 _ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209e454 -_ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209e490 +_ZN19MapObjectMiniBlocks4InitEv kind:function(arm,size=0x1fc) addr:0x0209e490 _ZN19MapObjectMiniBlocks8vfunc_14Ei kind:function(arm,size=0x60) addr:0x0209e68c _ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209e6ec _ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209e70c @@ -3028,9 +3028,9 @@ _ZN14Actor_Derived1C1EP11ModelRenderP20Actor_Derived1_94_0C kind:function(arm,si _ZN14Actor_Derived1D1Ev kind:function(arm,size=0x20) addr:0x020a8ca0 _ZN14Actor_Derived1D0Ev kind:function(arm,size=0x28) addr:0x020a8cc0 _ZN14Actor_Derived1D2Ev kind:function(arm,size=0x20) addr:0x020a8ce8 -_ZN14Actor_Derived18vfunc_18Ei kind:function(arm,size=0x78) addr:0x020a8d08 +_ZN14Actor_Derived14InitEi kind:function(arm,size=0x78) addr:0x020a8d08 _ZN14Actor_Derived18vfunc_54Ei kind:function(arm,size=0x4) addr:0x020a8d80 -_ZN14Actor_Derived18vfunc_1CEv kind:function(arm,size=0xc) addr:0x020a8d84 +_ZN14Actor_Derived15SetupEv kind:function(arm,size=0xc) addr:0x020a8d84 _ZN14Actor_Derived119func_ov000_020a8db0Ev kind:function(arm,size=0x20) addr:0x020a8d90 _ZN14Actor_Derived119func_ov000_020a8dd0Ev kind:function(arm,size=0x20) addr:0x020a8db0 _ZN14Actor_Derived119func_ov000_020a8df0E8ActorRefi kind:function(arm,size=0x94) addr:0x020a8dd0 @@ -3065,7 +3065,7 @@ _ZN14Actor_Derived119func_ov000_020a95d8Ev kind:function(arm,size=0xc) addr:0x02 _ZN14Actor_Derived18vfunc_A4Ev kind:function(arm,size=0x218) addr:0x020a95c4 _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a97dc _ZN14Actor_Derived119func_ov000_020a9804Ev kind:function(arm,size=0xec) addr:0x020a97e4 -_ZN14Actor_Derived18vfunc_20Ev kind:function(arm,size=0x4) addr:0x020a98d0 +_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_B8Ev kind:function(arm,size=0x34) addr:0x020a9984 diff --git a/config/usa/arm9/overlays/ov005/symbols.txt b/config/usa/arm9/overlays/ov005/symbols.txt index a75290b7..f59f700f 100644 --- a/config/usa/arm9/overlays/ov005/symbols.txt +++ b/config/usa/arm9/overlays/ov005/symbols.txt @@ -2,10 +2,10 @@ func_ov005_020b6520 kind:function(arm,size=0x28) addr:0x020b6500 func_ov005_020b6548 kind:function(arm,size=0x28) addr:0x020b6528 _ZN16MapObjectManager19func_ov005_020b6570Ei kind:function(arm,size=0x134) addr:0x020b6550 _ZN12ActorManager19func_ov005_020b66a4Ei kind:function(arm,size=0x1a4) addr:0x020b6684 -_ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b6828 +_ZN12ActorUnkSWOB6UpdateEv kind:function(arm,size=0xf4) addr:0x020b6828 func_ov005_020b693c kind:function(arm,size=0x224) addr:0x020b691c func_ov005_020b6b60 kind:function(arm,size=0x4c) addr:0x020b6b40 -_ZN14ActorEventIcon8vfunc_20Ev kind:function(arm,size=0x84) addr:0x020b6b8c +_ZN14ActorEventIcon6UpdateEv kind:function(arm,size=0x84) addr:0x020b6b8c func_ov005_020b6c30 kind:function(arm,size=0xd0) addr:0x020b6c10 func_ov005_020b6d00 kind:function(arm,size=0x84) addr:0x020b6ce0 func_ov005_020b6d84 kind:function(arm,size=0x15c) addr:0x020b6d64 diff --git a/config/usa/arm9/overlays/ov024/symbols.txt b/config/usa/arm9/overlays/ov024/symbols.txt index b7db8380..bc313d0b 100644 --- a/config/usa/arm9/overlays/ov024/symbols.txt +++ b/config/usa/arm9/overlays/ov024/symbols.txt @@ -710,9 +710,9 @@ _ZN19ActorProfileUnkOBPC10GetProfileEv kind:function(arm,size=0xc) addr:0x020d6e _ZN19ActorProfileUnkOBPC6CreateEv kind:function(arm,size=0x24) addr:0x020d6e88 _ZN19ActorProfileUnkOBPCC1Ev kind:function(arm,size=0x28) addr:0x020d6eac _ZN12ActorUnkOBPCC1Ev kind:function(arm,size=0x34) addr:0x020d6ed4 -_ZN12ActorUnkOBPC8vfunc_18Ei kind:function(arm,size=0x4c) addr:0x020d6f08 +_ZN12ActorUnkOBPC4InitEi kind:function(arm,size=0x4c) addr:0x020d6f08 _ZN12ActorUnkOBPC19func_ov024_020d6f74Ev kind:function(arm,size=0x20) addr:0x020d6f54 -_ZN12ActorUnkOBPC8vfunc_20Ev kind:function(arm,size=0xbc) addr:0x020d6f74 +_ZN12ActorUnkOBPC6UpdateEv kind:function(arm,size=0xbc) addr:0x020d6f74 _ZN12ActorUnkOBPC8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020d7030 _ZN12ActorUnkOBPC8SetStateEsi kind:function(arm,size=0xf0) addr:0x020d7044 _ZN12ActorUnkOBPC19func_ov024_020d7154Ev kind:function(arm,size=0x168) addr:0x020d7134 diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt index d6c129d0..27338cce 100644 --- a/config/usa/arm9/overlays/ov031/symbols.txt +++ b/config/usa/arm9/overlays/ov031/symbols.txt @@ -314,13 +314,13 @@ _ZN9ActorBomb19func_ov031_020e1634Ev kind:function(arm,size=0x58) addr:0x020e161 _ZN9ActorBombC1Ev kind:function(arm,size=0x168) addr:0x020e166c _ZN13ActorBomb_unkD1Ev kind:function(arm,size=0x14) addr:0x020e17d4 _ZN13ActorBomb_19CD1Ev kind:function(arm,size=0x14) addr:0x020e17e8 -_ZN9ActorBomb8vfunc_18Ei kind:function(arm,size=0x84) addr:0x020e17fc +_ZN9ActorBomb4InitEi kind:function(arm,size=0x84) addr:0x020e17fc _ZN9ActorBomb19func_ov031_020e18a0Ev kind:function(arm,size=0x24) addr:0x020e1880 _ZN9ActorBomb8SetStateEs kind:function(arm,size=0x44) addr:0x020e18a4 _ZN9ActorBomb19func_ov031_020e1908Ev kind:function(arm,size=0x18) addr:0x020e18e8 _ZN9ActorBomb19func_ov031_020e1920EP7VecFx32 kind:function(arm,size=0x1c) addr:0x020e1900 _ZN9ActorBomb19func_ov031_020e193cEv kind:function(arm,size=0xec) addr:0x020e191c -_ZN9ActorBomb8vfunc_20Ev kind:function(arm,size=0xd0) addr:0x020e1a08 +_ZN9ActorBomb6UpdateEv kind:function(arm,size=0xd0) addr:0x020e1a08 _ZN9ActorBomb8vfunc_24Ev kind:function(arm,size=0x24) addr:0x020e1ad8 _ZN9ActorBomb19func_ov031_020e1b1cEv kind:function(arm,size=0x60) addr:0x020e1afc _ZN9ActorBomb19func_ov031_020e1b7cEv kind:function(arm,size=0x19c) addr:0x020e1b5c @@ -376,8 +376,8 @@ _ZN17ActorProfileBlastC1Ev kind:function(arm,size=0x38) addr:0x020e34c4 _ZN13ActorBlast_E88vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x1a4) addr:0x020e34fc _ZN10ActorBlastC1Ev kind:function(arm,size=0x7c) addr:0x020e36a0 _ZN13ActorBlast_E8D1Ev kind:function(arm,size=0x14) addr:0x020e371c -_ZN10ActorBlast8vfunc_18Ei kind:function(arm,size=0x274) addr:0x020e3730 -_ZN10ActorBlast8vfunc_20Ev kind:function(arm,size=0x180) addr:0x020e39a4 +_ZN10ActorBlast4InitEi kind:function(arm,size=0x274) addr:0x020e3730 +_ZN10ActorBlast6UpdateEv kind:function(arm,size=0x180) addr:0x020e39a4 _ZN10ActorBlast8vfunc_24Ev kind:function(arm,size=0x50) addr:0x020e3b24 _ZN10ActorBlast19func_ov031_020e3b94Ev kind:function(arm,size=0x8) addr:0x020e3b74 _ZN10ActorBlast19func_ov031_020e3b9cEP5Actorss kind:function(arm,size=0x80) addr:0x020e3b7c @@ -391,10 +391,10 @@ func_ov031_020e3d10 kind:function(arm,size=0x90) addr:0x020e3cf0 _ZN22ActorUnkTLKTnCLLT_BaseC2Ev kind:function(arm,size=0x30) addr:0x020e3d80 func_ov031_020e3dd0 kind:function(arm,size=0x28) addr:0x020e3db0 _ZN22ActorUnkTLKTnCLLT_Base19func_ov031_020e3df8Ev kind:function(arm,size=0x20) addr:0x020e3dd8 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_18Ei kind:function(arm,size=0x2c) addr:0x020e3df8 -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_1CEv kind:function(arm,size=0x28) addr:0x020e3e24 +_ZN22ActorUnkTLKTnCLLT_Base4InitEi kind:function(arm,size=0x2c) addr:0x020e3df8 +_ZN22ActorUnkTLKTnCLLT_Base5SetupEv kind:function(arm,size=0x28) addr:0x020e3e24 _ZN22ActorUnkTLKTnCLLT_Base19func_ov031_020e3e6cEv kind:function(arm,size=0x18) addr:0x020e3e4c -_ZN22ActorUnkTLKTnCLLT_Base8vfunc_20Ev kind:function(arm,size=0x54) addr:0x020e3e64 +_ZN22ActorUnkTLKTnCLLT_Base6UpdateEv kind:function(arm,size=0x54) addr:0x020e3e64 _ZN22ActorUnkTLKTnCLLT_Base8vfunc_24Ev kind:function(arm,size=0x28) addr:0x020e3eb8 func_ov031_020e3f00 kind:function(arm,size=0x50) addr:0x020e3ee0 _ZN22ActorUnkTLKTnCLLT_Base8vfunc_54Ev kind:function(arm,size=0x124) addr:0x020e3f30 @@ -429,10 +429,10 @@ _ZN21ActorItemBoomerang_A0D1Ev kind:function(arm,size=0x14) addr:0x020e4740 _ZN21ActorItemBoomerang_CCD1Ev kind:function(arm,size=0x14) addr:0x020e4754 _ZN18ActorItemBoomerangD1Ev kind:function(arm,size=0xa0) addr:0x020e4768 _ZN18ActorItemBoomerangD0Ev kind:function(arm,size=0xa8) addr:0x020e4808 -_ZN18ActorItemBoomerang8vfunc_18Ei kind:function(arm,size=0xc4) addr:0x020e48b0 +_ZN18ActorItemBoomerang4InitEi kind:function(arm,size=0xc4) addr:0x020e48b0 _ZN18ActorItemBoomerang8SetStateEs kind:function(arm,size=0x1c) addr:0x020e4974 _ZN18ActorItemBoomerang19func_ov031_020e49b0Ei kind:function(arm,size=0x70) addr:0x020e4990 -_ZN18ActorItemBoomerang8vfunc_20Ev kind:function(arm,size=0x614) addr:0x020e4a00 +_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 @@ -457,10 +457,10 @@ _ZN23ActorProfileItemTornado6CreateEv kind:function(arm,size=0x24) addr:0x020e58 _ZN23ActorProfileItemTornadoC1Ev kind:function(arm,size=0x44) addr:0x020e58d8 _ZN16ActorItemTornadoC1Ev kind:function(arm,size=0x1e4) addr:0x020e591c _ZN24UnkStruct_ov031_02112ff4D1Ev kind:function(arm,size=0x14) addr:0x020e5b00 -_ZN16ActorItemTornado8vfunc_18Ei kind:function(arm,size=0xcc) addr:0x020e5b14 +_ZN16ActorItemTornado4InitEi kind:function(arm,size=0xcc) addr:0x020e5b14 _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5be0 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5cf8 -_ZN16ActorItemTornado8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020e6128 +_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 _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e62a0 @@ -492,11 +492,11 @@ _ZN19ActorProfileUnkSWBMC1Ev kind:function(arm,size=0x44) addr:0x020e6b44 _ZN12ActorUnkSWBMC1Ev kind:function(arm,size=0xb8) addr:0x020e6b88 _ZN15ActorUnkSWBM_94D1Ev kind:function(arm,size=0x14) addr:0x020e6c40 _ZN15ActorUnkSWBM_98D1Ev kind:function(arm,size=0x14) addr:0x020e6c54 -_ZN12ActorUnkSWBM8vfunc_18Ei kind:function(arm,size=0xc0) addr:0x020e6c68 +_ZN12ActorUnkSWBM4InitEi kind:function(arm,size=0xc0) addr:0x020e6c68 _ZN12ActorUnkSWBM19func_ov031_020e6d48Ev kind:function(arm,size=0x38) addr:0x020e6d28 _ZN12ActorUnkSWBM19func_ov031_020e6d80Ei kind:function(arm,size=0x104) addr:0x020e6d60 _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020e6e64 -_ZN12ActorUnkSWBM8vfunc_20Ev kind:function(arm,size=0x268) addr:0x020e6ed8 +_ZN12ActorUnkSWBM6UpdateEv kind:function(arm,size=0x268) addr:0x020e6ed8 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7140 _ZN12ActorUnkSWBM19func_ov031_020e718cEP7VecFx32P5Mat3pists kind:function(arm,size=0x108) addr:0x020e716c _ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e7274 @@ -546,8 +546,8 @@ _ZN19ActorProfileUnkROCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020e88 _ZN19ActorProfileUnkROCK6CreateEv kind:function(arm,size=0x24) addr:0x020e8810 _ZN19ActorProfileUnkROCKC1Ev kind:function(arm,size=0x8c) addr:0x020e8834 _ZN12ActorUnkROCKC1Ev kind:function(arm,size=0x9c) addr:0x020e88c0 -_ZN12ActorUnkROCK8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020e895c -_ZN12ActorUnkROCK8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020e898c +_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 @@ -561,7 +561,7 @@ _ZN17ActorProfileRupee6CreateEv kind:function(arm,size=0x24) addr:0x020e8ca4 _ZN17ActorProfileRupeeC1Ev kind:function(arm,size=0x44) addr:0x020e8cc8 _ZN10ActorRupee19func_ov031_020e8d2cEP8ActorRefPK7VecFx32jjS0_ kind:function(arm,size=0x7c) addr:0x020e8d0c _ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020e8d88 -_ZN10ActorRupee8vfunc_18Ei kind:function(arm,size=0x1d0) addr:0x020e8dfc +_ZN10ActorRupee4InitEi kind:function(arm,size=0x1d0) addr:0x020e8dfc _ZN10ActorRupee19func_ov031_020e8fecEv kind:function(arm,size=0x7c) addr:0x020e8fcc _ZN10ActorRupee19func_ov031_020e9068Ev kind:function(arm,size=0xa0) addr:0x020e9048 _ZN10ActorRupee19func_ov031_020e9108Ev kind:function(arm,size=0xa0) addr:0x020e90e8 @@ -591,7 +591,7 @@ _ZN10ActorRupee19func_ov031_020e9740Ev kind:function(arm,size=0xf8) addr:0x020e9 _ZN10ActorRupee19func_ov031_020e9838Ev kind:function(arm,size=0x8c) addr:0x020e9818 _ZN10ActorRupee19func_ov031_020e98c4Ev kind:function(arm,size=0x40) addr:0x020e98a4 _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e98e4 -_ZN10ActorRupee8vfunc_20Ev kind:function(arm,size=0x230) addr:0x020e9938 +_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 @@ -624,7 +624,7 @@ _ZN17ActorUnkZLSL_27CCD1Ev kind:function(thumb,size=0xc) addr:0x020ea4f8 _ZN12ActorUnkZLSLD1Ev kind:function(thumb,size=0xa4) addr:0x020ea504 _ZN12ActorUnkZLSLD0Ev kind:function(thumb,size=0xac) addr:0x020ea5a8 _ZN12ActorUnkZLSL19func_ov031_020ea674Ev kind:function(arm,size=0x24) addr:0x020ea654 -_ZN12ActorUnkZLSL8vfunc_18Ei kind:function(arm,size=0x10c) addr:0x020ea678 +_ZN12ActorUnkZLSL4InitEi kind:function(arm,size=0x10c) addr:0x020ea678 _ZN12ActorUnkZLSL8vfunc_ACEv kind:function(arm,size=0x4) addr:0x020ea784 _ZN12ActorUnkZLSL19func_ov031_020ea7a8Ev kind:function(arm,size=0xbc) addr:0x020ea788 _ZN12ActorUnkZLSL19func_ov031_020ea864Ev kind:function(arm,size=0x4) addr:0x020ea844 @@ -634,7 +634,7 @@ _ZN12ActorUnkZLSL8vfunc_58Es kind:function(arm,size=0x50) addr:0x020ea850 _ZN12ActorUnkZLSL19func_ov031_020ea8c0Ev kind:function(arm,size=0x4) addr:0x020ea8a0 _ZN12ActorUnkZLSL19func_ov031_020ea8c4Ev kind:function(arm,size=0x4) addr:0x020ea8a4 _ZN12ActorUnkZLSL19func_ov031_020ea8c8Ev kind:function(arm,size=0x4) addr:0x020ea8a8 -_ZN12ActorUnkZLSL8vfunc_20Ev kind:function(arm,size=0x19c) addr:0x020ea8ac +_ZN12ActorUnkZLSL6UpdateEv kind:function(arm,size=0x19c) addr:0x020ea8ac _ZN12ActorUnkZLSL19func_ov031_020eaa68Ev kind:function(arm,size=0x20) addr:0x020eaa48 _ZN12ActorUnkZLSL19func_ov031_020eaa88Ev kind:function(arm,size=0x4) addr:0x020eaa68 _ZN12ActorUnkZLSL19func_ov031_020eaa8cEv kind:function(arm,size=0x80) addr:0x020eaa6c @@ -733,8 +733,8 @@ _ZN17ActorProfileHeart6CreateEv kind:function(arm,size=0x24) addr:0x020eece0 _ZN17ActorProfileHeartC1Ev kind:function(arm,size=0x40) addr:0x020eed04 _ZN10ActorHeart19func_ov031_020eed64EP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020eed44 _ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020eedc0 -_ZN10ActorHeart8vfunc_18Ei kind:function(arm,size=0x10) addr:0x020eeeb8 -_ZN10ActorHeart8vfunc_20Ev kind:function(arm,size=0x2cc) addr:0x020eeec8 +_ZN10ActorHeart4InitEi kind:function(arm,size=0x10) addr:0x020eeeb8 +_ZN10ActorHeart6UpdateEv kind:function(arm,size=0x2cc) addr:0x020eeec8 _ZN10ActorHeart8SetStateEs kind:function(arm,size=0x54) addr:0x020ef194 _ZN10ActorHeart19func_ov031_020ef208Ev kind:function(arm,size=0xe4) addr:0x020ef1e8 _ZN10ActorHeart19func_ov031_020ef2ecEv kind:function(arm,size=0xc) addr:0x020ef2cc @@ -766,8 +766,8 @@ _ZN19ActorProfileUnkRMTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020ef7 _ZN19ActorProfileUnkRMTG6CreateEv kind:function(arm,size=0x24) addr:0x020ef808 _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef82c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef854 -_ZN12ActorUnkRMTG8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020ef880 -_ZN12ActorUnkRMTG8vfunc_1CEv kind:function(arm,size=0x38) addr:0x020ef938 +_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 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020ef990 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020ef9b0 @@ -776,19 +776,19 @@ _ZN19ActorProfileUnkSCCN10GetProfileEv kind:function(arm,size=0xc) addr:0x020ef9 _ZN19ActorProfileUnkSCCN6CreateEv kind:function(arm,size=0x24) addr:0x020ef9f8 _ZN19ActorProfileUnkSCCNC1Ev kind:function(arm,size=0x28) addr:0x020efa1c _ZN12ActorUnkSCCNC1Ev kind:function(arm,size=0x3c) addr:0x020efa44 -_ZN12ActorUnkSCCN8vfunc_18Ei kind:function(arm,size=0x1d8) addr:0x020efa80 +_ZN12ActorUnkSCCN4InitEi kind:function(arm,size=0x1d8) addr:0x020efa80 _ZN12ActorUnkSCCND1Ev kind:function(arm,size=0x20) addr:0x020efc58 _ZN12ActorUnkSCCND0Ev kind:function(arm,size=0x28) addr:0x020efc78 _ZN19ActorProfileUnkSCCND1Ev kind:function(arm,size=0x14) addr:0x020efca0 _ZN20Actor_ov031_02113fd4C2Ev kind:function(arm,size=0x98) addr:0x020efcb4 -_ZN20Actor_ov031_02113fd48vfunc_18Ei kind:function(arm,size=0x60) addr:0x020efd4c +_ZN20Actor_ov031_02113fd44InitEi kind:function(arm,size=0x60) addr:0x020efd4c _ZN20Actor_ov031_02113fd44GrabE15ActorGrabParams kind:function(arm,size=0x3c) addr:0x020efdac _ZN20Actor_ov031_02113fd44DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0xb8) addr:0x020efde8 func_ov031_020efec0 kind:function(arm,size=0x18) addr:0x020efea0 func_ov031_020efed8 kind:function(arm,size=0x2c) addr:0x020efeb8 func_ov031_020eff04 kind:function(arm,size=0xb8) addr:0x020efee4 func_ov031_020effbc kind:function(arm,size=0xa0) addr:0x020eff9c -_ZN20Actor_ov031_02113fd48vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f003c +_ZN20Actor_ov031_02113fd46UpdateEv kind:function(arm,size=0x4) addr:0x020f003c _ZN20Actor_ov031_02113fd48vfunc_24Ev kind:function(arm,size=0x30) addr:0x020f0040 _ZN20Actor_ov031_02113fd48vfunc_60Ev kind:function(arm,size=0x4) addr:0x020f0070 _ZN20Actor_ov031_02113fd419func_ov031_020f0094Ev kind:function(arm,size=0x4) addr:0x020f0074 @@ -827,9 +827,9 @@ _ZN15ActorProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x020f0bec _ZN15ActorProfilePotC1Ev kind:function(arm,size=0x30) addr:0x020f0c10 _ZN8ActorPotC1Ev kind:function(arm,size=0x90) addr:0x020f0c40 _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0cd0 -_ZN8ActorPot8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f0ce4 +_ZN8ActorPot4InitEi kind:function(arm,size=0x28) addr:0x020f0ce4 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0d0c -_ZN8ActorPot8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f0d60 +_ZN8ActorPot6UpdateEv kind:function(arm,size=0x38) addr:0x020f0d60 _ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 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 @@ -851,9 +851,9 @@ _ZN22ActorProfileItemFlower6CreateEv kind:function(arm,size=0x24) addr:0x020f0fb _ZN22ActorProfileItemFlowerC1Ev kind:function(arm,size=0x30) addr:0x020f0fdc _ZN15ActorItemFlowerC1Ev kind:function(arm,size=0x94) addr:0x020f100c _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f10a0 -_ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f10b4 +_ZN15ActorItemFlower4InitEi kind:function(arm,size=0x28) addr:0x020f10b4 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f10dc -_ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f1120 +_ZN15ActorItemFlower6UpdateEv kind:function(arm,size=0x38) addr:0x020f1120 _ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 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 @@ -878,13 +878,13 @@ _ZN14ActorShotArrowC1Ev kind:function(arm,size=0x1ec) addr:0x020f13fc _ZN18ActorShotArrow_194D1Ev kind:function(arm,size=0x14) addr:0x020f15e8 _ZN14ActorShotArrowD1Ev kind:function(arm,size=0x8c) addr:0x020f15fc _ZN14ActorShotArrowD0Ev kind:function(arm,size=0x94) addr:0x020f1688 -_ZN14ActorShotArrow8vfunc_18Ei kind:function(arm,size=0x12c) addr:0x020f171c +_ZN14ActorShotArrow4InitEi kind:function(arm,size=0x12c) addr:0x020f171c _ZN14ActorShotArrow19func_ov031_020f1868Ev kind:function(arm,size=0xc) addr:0x020f1848 _ZN14ActorShotArrow19func_ov031_020f1874Ev kind:function(arm,size=0x4) addr:0x020f1854 _ZN14ActorShotArrow8SetStateEj kind:function(arm,size=0x44) addr:0x020f1858 _ZN14ActorShotArrow8vfunc_24Ev kind:function(arm,size=0x9c) addr:0x020f189c _ZN14ActorShotArrow19func_ov031_020f1958Ev kind:function(arm,size=0x4) addr:0x020f1938 -_ZN14ActorShotArrow8vfunc_20Ev kind:function(arm,size=0x108) addr:0x020f193c +_ZN14ActorShotArrow6UpdateEv kind:function(arm,size=0x108) addr:0x020f193c _ZN14ActorShotArrow19func_ov031_020f1a64Ev kind:function(arm,size=0xa0) addr:0x020f1a44 _ZN14ActorShotArrow19func_ov031_020f1b04Ev kind:function(arm,size=0x120) addr:0x020f1ae4 _ZN14ActorShotArrow19func_ov031_020f1c24Ev kind:function(arm,size=0x58) addr:0x020f1c04 @@ -936,8 +936,8 @@ _ZN19ActorProfileUnkATTG10GetProfileEv kind:function(arm,size=0xc) addr:0x020f3d _ZN19ActorProfileUnkATTG6CreateEv kind:function(arm,size=0x24) addr:0x020f3d68 _ZN19ActorProfileUnkATTGC1Ev kind:function(arm,size=0x28) addr:0x020f3d8c _ZN12ActorUnkATTGC1Ev kind:function(arm,size=0x28) addr:0x020f3db4 -_ZN12ActorUnkATTG8vfunc_18Ei kind:function(arm,size=0x54) addr:0x020f3ddc -_ZN12ActorUnkATTG8vfunc_20Ev kind:function(arm,size=0x5c) addr:0x020f3e30 +_ZN12ActorUnkATTG4InitEi kind:function(arm,size=0x54) addr:0x020f3ddc +_ZN12ActorUnkATTG6UpdateEv kind:function(arm,size=0x5c) addr:0x020f3e30 _ZN12ActorUnkATTG8vfunc_24Ev kind:function(arm,size=0x40) addr:0x020f3e8c _ZN12ActorUnkATTG19func_ov031_020f3eecEsi kind:function(arm,size=0x128) addr:0x020f3ecc _ZN12ActorUnkATTG19func_ov031_020f4014Ev kind:function(arm,size=0x44) addr:0x020f3ff4 @@ -995,8 +995,8 @@ _ZN19ActorProfileUnkNTTZ10GetProfileEv kind:function(arm,size=0xc) addr:0x020f60 _ZN19ActorProfileUnkNTTZ6CreateEv kind:function(arm,size=0x24) addr:0x020f60f4 _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6118 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6140 -_ZN12ActorUnkNTTZ8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020f6170 -_ZN12ActorUnkNTTZ8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f6178 +_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 _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f6180 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f61d0 @@ -1022,8 +1022,8 @@ _ZN19ActorProfileUnkTGTZ6CreateEv kind:function(arm,size=0x24) addr:0x020f6820 _ZN19ActorProfileUnkTGTZC1Ev kind:function(arm,size=0x44) addr:0x020f6844 _ZN12ActorUnkTGTZC1Ev kind:function(arm,size=0xdc) addr:0x020f6888 _ZN24ActorUnkTGTZ_ModelRenderD1Ev kind:function(arm,size=0x14) addr:0x020f6964 -_ZN12ActorUnkTGTZ8vfunc_18Ei kind:function(arm,size=0x14c) addr:0x020f6978 -_ZN12ActorUnkTGTZ8vfunc_20Ev kind:function(arm,size=0x364) addr:0x020f6ac4 +_ZN12ActorUnkTGTZ4InitEi kind:function(arm,size=0x14c) addr:0x020f6978 +_ZN12ActorUnkTGTZ6UpdateEv kind:function(arm,size=0x364) addr:0x020f6ac4 _ZN12ActorUnkTGTZ8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020f6e28 _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE8ActorRef kind:function(arm,size=0x4c) addr:0x020f6e3c _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP8ActorReftPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6e88 @@ -1041,7 +1041,7 @@ func_ov031_020f7474 kind:function(arm,size=0x20) addr:0x020f7454 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_021148708vfunc_18Ei kind:function(arm,size=0x3c) addr:0x020f7518 +_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_54Ev kind:function(arm,size=0x8) addr:0x020f7574 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f757c @@ -1070,8 +1070,8 @@ _ZN19ActorProfileUnkSWCH10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7a _ZN19ActorProfileUnkSWCH6CreateEv kind:function(arm,size=0x24) addr:0x020f7a70 _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7a94 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7abc -_ZN12ActorUnkSWCH8vfunc_18Ei kind:function(arm,size=0x14) addr:0x020f7aec -_ZN12ActorUnkSWCH8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020f7b00 +_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 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7b78 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7b8c @@ -1084,7 +1084,7 @@ _ZN19ActorProfileUnkSWON10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7d _ZN19ActorProfileUnkSWON6CreateEv kind:function(arm,size=0x24) addr:0x020f7da8 _ZN19ActorProfileUnkSWONC1Ev kind:function(arm,size=0x28) addr:0x020f7dcc _ZN12ActorUnkSWONC1Ev kind:function(arm,size=0x20) addr:0x020f7df4 -_ZN12ActorUnkSWON8vfunc_18Ei kind:function(arm,size=0x9c) addr:0x020f7e14 +_ZN12ActorUnkSWON4InitEi kind:function(arm,size=0x9c) addr:0x020f7e14 _ZN12ActorUnkSWOND1Ev kind:function(arm,size=0x14) addr:0x020f7eb0 _ZN12ActorUnkSWOND0Ev kind:function(arm,size=0x1c) addr:0x020f7ec4 _ZN19ActorProfileUnkSWOND1Ev kind:function(arm,size=0x14) addr:0x020f7ee0 @@ -1092,7 +1092,7 @@ _ZN19ActorProfileUnkNORE10GetProfileEv kind:function(arm,size=0xc) addr:0x020f7e _ZN19ActorProfileUnkNORE6CreateEv kind:function(arm,size=0x24) addr:0x020f7f00 _ZN19ActorProfileUnkNOREC1Ev kind:function(arm,size=0x28) addr:0x020f7f24 _ZN12ActorUnkNOREC1Ev kind:function(arm,size=0x20) addr:0x020f7f4c -_ZN12ActorUnkNORE8vfunc_18Ei kind:function(arm,size=0x54) addr:0x020f7f6c +_ZN12ActorUnkNORE4InitEi kind:function(arm,size=0x54) addr:0x020f7f6c _ZN12ActorUnkNORED1Ev kind:function(arm,size=0x14) addr:0x020f7fc0 _ZN12ActorUnkNORED0Ev kind:function(arm,size=0x1c) addr:0x020f7fd4 _ZN19ActorProfileUnkNORED1Ev kind:function(arm,size=0x14) addr:0x020f7ff0 @@ -1100,8 +1100,8 @@ _ZN19ActorProfileUnkFLEN10GetProfileEv kind:function(arm,size=0xc) addr:0x020f80 _ZN19ActorProfileUnkFLEN6CreateEv kind:function(arm,size=0x24) addr:0x020f8010 _ZN19ActorProfileUnkFLENC1Ev kind:function(arm,size=0x3c) addr:0x020f8034 _ZN12ActorUnkFLENC1Ev kind:function(arm,size=0x28) addr:0x020f8070 -_ZN12ActorUnkFLEN8vfunc_18Ei kind:function(arm,size=0x60) addr:0x020f8098 -_ZN12ActorUnkFLEN8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020f80f8 +_ZN12ActorUnkFLEN4InitEi kind:function(arm,size=0x60) addr:0x020f8098 +_ZN12ActorUnkFLEN6UpdateEv kind:function(arm,size=0x9c) addr:0x020f80f8 _ZN12ActorUnkFLEN8SetStateEs kind:function(arm,size=0x44) addr:0x020f8194 _ZN12ActorUnkFLEN19func_ov031_020f81f8Ev kind:function(arm,size=0xa4) addr:0x020f81d8 _ZN12ActorUnkFLEND1Ev kind:function(arm,size=0x14) addr:0x020f827c @@ -1116,8 +1116,8 @@ _ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x0 _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 -_ZN17ActorRollingStone8vfunc_18Ei kind:function(arm,size=0xf0) addr:0x020f867c -_ZN17ActorRollingStone8vfunc_20Ev kind:function(arm,size=0x98) addr:0x020f876c +_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 @@ -1169,8 +1169,8 @@ _ZN24ActorProfileTreasureDrop6CreateEv kind:function(arm,size=0x24) addr:0x020f9 _ZN24ActorProfileTreasureDropC1Ev kind:function(arm,size=0x40) addr:0x020f9f2c _ZN13ActorItemDrop19func_ov031_020f9f8cEP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020f9f6c _ZN13ActorItemDropC1Ev kind:function(arm,size=0x200) addr:0x020f9fec -_ZN13ActorItemDrop8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020fa1ec -_ZN13ActorItemDrop8vfunc_20Ev kind:function(arm,size=0xc) addr:0x020fa21c +_ZN13ActorItemDrop4InitEi kind:function(arm,size=0x30) addr:0x020fa1ec +_ZN13ActorItemDrop6UpdateEv kind:function(arm,size=0xc) addr:0x020fa21c _ZN13ActorItemDrop8vfunc_24Ev kind:function(arm,size=0x18) addr:0x020fa228 _ZN13ActorItemDrop19func_ov031_020fa260Ev kind:function(arm,size=0x1c4) addr:0x020fa240 _ZN13ActorItemDrop8SetStateEs kind:function(arm,size=0x44) addr:0x020fa404 @@ -1205,7 +1205,7 @@ _ZN19ActorProfileUnkMLCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020fab _ZN19ActorProfileUnkMLCK6CreateEv kind:function(arm,size=0x24) addr:0x020fab48 _ZN19ActorProfileUnkMLCKC1Ev kind:function(arm,size=0x28) addr:0x020fab6c _ZN12ActorUnkMLCKC1Ev kind:function(arm,size=0xb0) addr:0x020fab94 -_ZN12ActorUnkMLCK8vfunc_18Ei kind:function(arm,size=0xd8) addr:0x020fac44 +_ZN12ActorUnkMLCK4InitEi kind:function(arm,size=0xd8) addr:0x020fac44 _ZN12ActorUnkMLCK8vfunc_64Ei kind:function(arm,size=0x4c) addr:0x020fad1c _ZN12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x20) addr:0x020fad68 _ZN12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0xc) addr:0x020fad88 @@ -1246,8 +1246,8 @@ _ZN19ActorProfileUnkEFSB10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb4 _ZN19ActorProfileUnkEFSB6CreateEv kind:function(arm,size=0x24) addr:0x020fb498 _ZN19ActorProfileUnkEFSBC1Ev kind:function(arm,size=0x28) addr:0x020fb4bc _ZN12ActorUnkEFSBC1Ev kind:function(arm,size=0x110) addr:0x020fb4e4 -_ZN12ActorUnkEFSB8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020fb5f4 -_ZN12ActorUnkEFSB8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020fb6ac +_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 @@ -1258,8 +1258,8 @@ _ZN19ActorProfileUnkNFSP10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb7 _ZN19ActorProfileUnkNFSP6CreateEv kind:function(arm,size=0x24) addr:0x020fb7f8 _ZN19ActorProfileUnkNFSPC1Ev kind:function(arm,size=0x44) addr:0x020fb81c _ZN12ActorUnkNFSPC1Ev kind:function(arm,size=0x58) addr:0x020fb860 -_ZN12ActorUnkNFSP8vfunc_18Ei kind:function(arm,size=0x48) addr:0x020fb8b8 -_ZN12ActorUnkNFSP8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020fb900 +_ZN12ActorUnkNFSP4InitEi kind:function(arm,size=0x48) addr:0x020fb8b8 +_ZN12ActorUnkNFSP6UpdateEv kind:function(arm,size=0x68) addr:0x020fb900 _ZN12ActorUnkNFSP19func_ov031_020fb988Ev kind:function(arm,size=0xc) addr:0x020fb968 _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020fb974 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fb994 @@ -1316,8 +1316,8 @@ _ZN31MapObjectProfileDoorDangerSpawn10GetProfileEv kind:function(arm,size=0xc) a _ZN31MapObjectProfileDoorDangerSpawn6CreateEv kind:function(arm,size=0x24) addr:0x020fd0e4 _ZN31MapObjectProfileDoorDangerSpawnC1Ev kind:function(arm,size=0x50) addr:0x020fd108 _ZN24MapObjectDoorDangerSpawnC1Ev kind:function(arm,size=0xbc) addr:0x020fd158 -_ZN24MapObjectDoorDangerSpawn8vfunc_00Ev kind:function(arm,size=0x50) addr:0x020fd214 -_ZN24MapObjectDoorDangerSpawn8vfunc_04Ev kind:function(arm,size=0x174) addr:0x020fd264 +_ZN24MapObjectDoorDangerSpawn4InitEv kind:function(arm,size=0x50) addr:0x020fd214 +_ZN24MapObjectDoorDangerSpawn5SetupEv kind:function(arm,size=0x174) addr:0x020fd264 _ZN24MapObjectDoorDangerSpawn9vfunc2_04Ev kind:function(arm,size=0xc) addr:0x020fd3d8 _ZN24MapObjectDoorDangerSpawn9vfunc2_08Ev kind:function(arm,size=0x70) addr:0x020fd3e4 _ZN24MapObjectDoorDangerSpawn8vfunc_08Ev kind:function(arm,size=0x374) addr:0x020fd454 @@ -1349,7 +1349,7 @@ _ZN23MapObjectProfileDoorKey10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileDoorKey6CreateEv kind:function(arm,size=0x24) addr:0x020fe720 _ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x020fe744 _ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x020fe798 -_ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020fe84c +_ZN16MapObjectDoorKey4InitEv kind:function(arm,size=0x1c) addr:0x020fe84c _ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x020fe868 _ZN16MapObjectDoorKey8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fe880 _ZN16MapObjectDoorKey8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020fe88c @@ -1374,7 +1374,7 @@ _ZN26MapObjectProfileDoorSwitch6CreateEv kind:function(arm,size=0x24) addr:0x020 _ZN26MapObjectProfileDoorSwitchC1Ev kind:function(arm,size=0x48) addr:0x020fee7c _ZN19MapObjectDoorSwitchC2Ev kind:function(arm,size=0x64) addr:0x020feec4 _ZN19MapObjectDoorSwitchC1Ev kind:function(arm,size=0x64) addr:0x020fef28 -_ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0xd0) addr:0x020fef8c +_ZN19MapObjectDoorSwitch4InitEv kind:function(arm,size=0xd0) addr:0x020fef8c _ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x020ff05c _ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ff0e0 _ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x020ff0f0 @@ -1398,7 +1398,7 @@ _ZN25MapObjectProfileDoorClickC1Ev kind:function(arm,size=0x50) addr:0x020ff528 _ZN18MapObjectDoorClickC2Ev kind:function(arm,size=0x88) addr:0x020ff578 _ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x020ff600 _ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x020ff688 -_ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x020ff69c +_ZN18MapObjectDoorClick4InitEv kind:function(arm,size=0x100) addr:0x020ff69c _ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x020ff79c _ZN18MapObjectDoorClick8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ffb6c _ZN18MapObjectDoorClick8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020ffb78 @@ -1426,7 +1426,7 @@ _ZN25MapObjectProfileDoorTouch10GetProfileEv kind:function(arm,size=0xc) addr:0x _ZN25MapObjectProfileDoorTouch6CreateEv kind:function(arm,size=0x24) addr:0x02100238 _ZN25MapObjectProfileDoorTouchC1Ev kind:function(arm,size=0x4c) addr:0x0210025c _ZN18MapObjectDoorTouchC1Ev kind:function(arm,size=0x34) addr:0x021002a8 -_ZN18MapObjectDoorTouch8vfunc_00Ev kind:function(arm,size=0x18) addr:0x021002dc +_ZN18MapObjectDoorTouch4InitEv kind:function(arm,size=0x18) addr:0x021002dc _ZN18MapObjectDoorTouch9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x021002f4 _ZN18MapObjectDoorTouch8vfunc_40Ev kind:function(arm,size=0x28) addr:0x02100380 _ZN18MapObjectDoorTouch8vfunc_44Ev kind:function(arm,size=0x44) addr:0x021003a8 @@ -1474,7 +1474,7 @@ _ZN21MapObjectProfileGrass6CreateEv kind:function(arm,size=0x24) addr:0x02100ff8 _ZN21MapObjectProfileGrassC1Ev kind:function(arm,size=0xa4) addr:0x0210101c _ZN14MapObjectGrassC2Ev kind:function(arm,size=0x48) addr:0x021010c0 _ZN14MapObjectGrassC1Ev kind:function(arm,size=0x48) addr:0x02101108 -_ZN14MapObjectGrass8vfunc_00Ev kind:function(arm,size=0x31c) addr:0x02101150 +_ZN14MapObjectGrass4InitEv kind:function(arm,size=0x31c) addr:0x02101150 _ZN14MapObjectGrass8vfunc_08Ev kind:function(arm,size=0x78) addr:0x0210146c _ZN14MapObjectGrass8vfunc_14Ei kind:function(arm,size=0x74) addr:0x021014e4 _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x02101558 @@ -1497,7 +1497,7 @@ _ZN23MapObjectProfileUnkSWHTC1Ev kind:function(arm,size=0x90) addr:0x02101a24 _ZN16MapObjectUnkSWHTC1Ev kind:function(arm,size=0x114) addr:0x02101ab4 _ZN16MapObjectUnkSWHTD1Ev kind:function(arm,size=0x7c) addr:0x02101bc8 _ZN16MapObjectUnkSWHTD0Ev kind:function(arm,size=0x84) addr:0x02101c44 -_ZN16MapObjectUnkSWHT8vfunc_00Ev kind:function(arm,size=0xf0) addr:0x02101cc8 +_ZN16MapObjectUnkSWHT4InitEv kind:function(arm,size=0xf0) addr:0x02101cc8 _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0x02101db8 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101dfc _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02101f68 @@ -1546,8 +1546,8 @@ _ZN19MapObjectUnkTRES_74D1Ev kind:function(arm,size=0x14) addr:0x021030dc _ZN18MapObjectChestBaseD1Ev kind:function(arm,size=0x20) addr:0x021030f0 _ZN18MapObjectChestBaseD0Ev kind:function(arm,size=0x28) addr:0x02103110 _ZN18MapObjectChestBaseD2Ev kind:function(arm,size=0x20) addr:0x02103138 -_ZN18MapObjectChestBase8vfunc_00Ev kind:function(arm,size=0xdc) addr:0x02103158 -_ZN18MapObjectChestBase8vfunc_04Ev kind:function(arm,size=0x2e0) addr:0x02103234 +_ZN18MapObjectChestBase4InitEv kind:function(arm,size=0xdc) addr:0x02103158 +_ZN18MapObjectChestBase5SetupEv kind:function(arm,size=0x2e0) addr:0x02103234 _ZN18MapObjectChestBase8vfunc_08Ev kind:function(arm,size=0x27c) addr:0x02103514 _ZN18MapObjectChestBase8vfunc_0CEv kind:function(arm,size=0x14) addr:0x02103790 _ZN18MapObjectChestBase8vfunc_28Eiii kind:function(arm,size=0xc) addr:0x021037a4 @@ -1625,7 +1625,7 @@ _ZN19MapObjectProfilePot10GetProfileEv kind:function(arm,size=0xc) addr:0x02104f _ZN19MapObjectProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x02104f1c _ZN19MapObjectProfilePotC1Ev kind:function(arm,size=0x8c) addr:0x02104f40 _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02104fcc -_ZN12MapObjectPot8vfunc_04Ev kind:function(arm,size=0x2c) addr:0x02105068 +_ZN12MapObjectPot5SetupEv kind:function(arm,size=0x2c) addr:0x02105068 _ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x02105094 _ZN12MapObjectPot8vfunc_48Ev kind:function(arm,size=0xf8) addr:0x021051b4 _ZN12MapObjectPot8vfunc_14Ei kind:function(arm,size=0x44) addr:0x021052ac @@ -1666,8 +1666,8 @@ _ZN23MapObjectProfileUnkSKDIC1Ev kind:function(arm,size=0x48) addr:0x02106010 _ZN16MapObjectUnkSKDIC1Ev kind:function(arm,size=0x118) addr:0x02106058 _ZN16MapObjectUnkSKDI19func_ov031_02106190Ev kind:function(arm,size=0x4c) addr:0x02106170 _ZN16MapObjectUnkSKDI19func_ov031_021061dcEv kind:function(arm,size=0x48) addr:0x021061bc -_ZN16MapObjectUnkSKDI8vfunc_00Ev kind:function(arm,size=0xc8) addr:0x02106204 -_ZN16MapObjectUnkSKDI8vfunc_04Ev kind:function(arm,size=0xe0) addr:0x021062cc +_ZN16MapObjectUnkSKDI4InitEv kind:function(arm,size=0xc8) addr:0x02106204 +_ZN16MapObjectUnkSKDI5SetupEv kind:function(arm,size=0xe0) addr:0x021062cc _ZN16MapObjectUnkSKDI8vfunc_08Ev kind:function(arm,size=0x10) addr:0x021063ac _ZN16MapObjectUnkSKDI8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021063bc _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr:0x0210641c @@ -1686,9 +1686,9 @@ _ZN19ActorProfileUnkSKDO10GetProfileEv kind:function(arm,size=0xc) addr:0x02106d _ZN19ActorProfileUnkSKDO6CreateEv kind:function(arm,size=0x24) addr:0x02106d4c _ZN19ActorProfileUnkSKDOC1Ev kind:function(arm,size=0x28) addr:0x02106d70 _ZN12ActorUnkSKDOC1Ev kind:function(arm,size=0x28) addr:0x02106d98 -_ZN12ActorUnkSKDO8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02106dc0 -_ZN12ActorUnkSKDO8vfunc_1CEv kind:function(arm,size=0x70) addr:0x02106dc8 -_ZN12ActorUnkSKDO8vfunc_20Ev kind:function(arm,size=0x38) addr:0x02106e38 +_ZN12ActorUnkSKDO4InitEi kind:function(arm,size=0x8) addr:0x02106dc0 +_ZN12ActorUnkSKDO5SetupEv kind:function(arm,size=0x70) addr:0x02106dc8 +_ZN12ActorUnkSKDO6UpdateEv kind:function(arm,size=0x38) addr:0x02106e38 _ZN12ActorUnkSKDO8vfunc_54Ei kind:function(arm,size=0x8) addr:0x02106e70 _ZN27ActorUnkSKDO_ov031_02115ce88vfunc_00EP9MapObject kind:function(arm,size=0x3c) addr:0x02106e78 _ZN12ActorUnkSKDOD1Ev kind:function(arm,size=0x14) addr:0x02106eb4 diff --git a/config/usa/arm9/overlays/ov032/symbols.txt b/config/usa/arm9/overlays/ov032/symbols.txt index ac6ec51e..14778cd2 100644 --- a/config/usa/arm9/overlays/ov032/symbols.txt +++ b/config/usa/arm9/overlays/ov032/symbols.txt @@ -6,11 +6,11 @@ _ZN15ActorSpinut_110D1Ev kind:function(arm,size=0x14) addr:0x02119228 _ZN15ActorSpinut_1BCD1Ev kind:function(arm,size=0x14) addr:0x0211923c _ZN11ActorSpinutD1Ev kind:function(arm,size=0x8c) addr:0x02119250 _ZN11ActorSpinutD0Ev kind:function(arm,size=0x94) addr:0x021192dc -_ZN11ActorSpinut8vfunc_18Ei kind:function(arm,size=0xc8) addr:0x02119370 -_ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x02119438 +_ZN11ActorSpinut4InitEi kind:function(arm,size=0xc8) addr:0x02119370 +_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 -_ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x02119564 +_ZN11ActorSpinut6UpdateEv kind:function(arm,size=0x358) addr:0x02119564 _ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 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 @@ -64,9 +64,9 @@ _ZN25ActorProfileFleeingSpinutC1Ev kind:function(arm,size=0x4c) addr:0x0211b6dc _ZN18ActorFleeingSpinutC1Ev kind:function(arm,size=0x1d8) addr:0x0211b728 _ZN18ActorFleeingSpinutD1Ev kind:function(arm,size=0x30) addr:0x0211b900 _ZN18ActorFleeingSpinutD0Ev kind:function(arm,size=0x38) addr:0x0211b930 -_ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211b968 +_ZN18ActorFleeingSpinut4InitEi kind:function(arm,size=0x1c) addr:0x0211b968 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211b984 -_ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211b9ec +_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 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bde4 @@ -124,7 +124,7 @@ _ZN14ActorKeese_2ACD1Ev kind:function(arm,size=0x1c) addr:0x0211de4c _ZN14ActorKeese_2ACD0Ev kind:function(arm,size=0x24) addr:0x0211de68 _ZN14ActorKeese_2AC8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211de8c _ZN14ActorKeese_2AC8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x144) addr:0x0211deb0 -_ZN10ActorKeese8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0211dff4 +_ZN10ActorKeese4InitEi kind:function(arm,size=0xac) addr:0x0211dff4 _ZN10ActorKeese19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e0a0 _ZN10ActorKeese19func_ov032_0211e0d4Esi kind:function(arm,size=0x234) addr:0x0211e0b4 _ZN10ActorKeese19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e2e8 @@ -132,7 +132,7 @@ _ZN10ActorKeese19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e3ec _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e400 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e448 -_ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e758 +_ZN10ActorKeese6UpdateEv kind:function(arm,size=0x1b8) addr:0x0211e758 _ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 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 @@ -204,7 +204,7 @@ _ZN19MapObjectUnkSWSW_408vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size= _ZN19MapObjectUnkSWSW_4019func_ov032_021210a0Ei kind:function(arm,size=0x64) addr:0x02121080 _ZN16MapObjectUnkSWSWC1Ev kind:function(arm,size=0xc4) addr:0x021210e4 _ZN19MapObjectUnkSWSW_40D1Ev kind:function(arm,size=0x14) addr:0x021211a8 -_ZN16MapObjectUnkSWSW8vfunc_00Ev kind:function(arm,size=0x240) addr:0x021211bc +_ZN16MapObjectUnkSWSW4InitEv kind:function(arm,size=0x240) addr:0x021211bc _ZN16MapObjectUnkSWSW8vfunc_08Ev kind:function(arm,size=0x4b4) addr:0x021213fc _ZN16MapObjectUnkSWSW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x278) addr:0x021218b0 _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121b28 diff --git a/config/usa/arm9/overlays/ov063/symbols.txt b/config/usa/arm9/overlays/ov063/symbols.txt index e6c58c1a..0f719825 100644 --- a/config/usa/arm9/overlays/ov063/symbols.txt +++ b/config/usa/arm9/overlays/ov063/symbols.txt @@ -7,13 +7,13 @@ _ZN24UnkStruct_ov063_02162e888vfunc_04E8ActorRefiiPi kind:function(arm,size=0x17 _ZN12ActorUnkCANSC1Ev kind:function(arm,size=0x1dc) addr:0x021580fc _ZN24UnkStruct_ov063_02162ee8D1Ev kind:function(arm,size=0x14) addr:0x021582d8 _ZN24UnkStruct_ov063_02162f14D1Ev kind:function(arm,size=0x14) addr:0x021582ec -_ZN12ActorUnkCANS8vfunc_18Ei kind:function(arm,size=0x68) addr:0x02158300 -_ZN12ActorUnkCANS8vfunc_1CEv kind:function(arm,size=0x9c) addr:0x02158368 +_ZN12ActorUnkCANS4InitEi kind:function(arm,size=0x68) addr:0x02158300 +_ZN12ActorUnkCANS5SetupEv kind:function(arm,size=0x9c) addr:0x02158368 _ZN12ActorUnkCANS19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158404 _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x02158428 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158470 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584a4 -_ZN12ActorUnkCANS8vfunc_20Ev kind:function(arm,size=0x53c) addr:0x021584d0 +_ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x021584d0 _ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 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 @@ -76,7 +76,7 @@ _ZN12ActorUnkCASE19func_ov063_0215acecEP8ActorRefS0_ kind:function(arm,size=0x5c _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ad28 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215ae4c _ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215ae60 -_ZN12ActorUnkCASE8vfunc_18Ei kind:function(arm,size=0x68) addr:0x0215ae74 +_ZN12ActorUnkCASE4InitEi kind:function(arm,size=0x68) addr:0x0215ae74 _ZN12ActorUnkCASE19func_ov063_0215aefcEs kind:function(arm,size=0x58) addr:0x0215aedc _ZN12ActorUnkCASE19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215af34 _ZN12ActorUnkCASE19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215af38 @@ -91,7 +91,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b290 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2a4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2a8 -_ZN12ActorUnkCASE8vfunc_20Ev kind:function(arm,size=0x338) addr:0x0215b2cc +_ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b2cc _ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 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 @@ -106,9 +106,9 @@ _ZN12ActorUnkCASED1Ev kind:function(arm,size=0x30) addr:0x0215ba60 _ZN12ActorUnkCASED0Ev kind:function(arm,size=0x38) addr:0x0215ba90 _ZN19ActorProfileUnkCASED1Ev kind:function(arm,size=0x14) addr:0x0215bac8 _ZN15ActorUnkRMSBaseC2Ev kind:function(arm,size=0x38) addr:0x0215badc -_ZN15ActorUnkRMSBase8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215bb14 -_ZN15ActorUnkRMSBase8vfunc_1CEv kind:function(arm,size=0x4) addr:0x0215bb68 -_ZN15ActorUnkRMSBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0215bb6c +_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 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bbb4 @@ -118,9 +118,9 @@ _ZN19ActorProfileUnkRMSV6CreateEv kind:function(arm,size=0x24) addr:0x0215bc18 _ZN19ActorProfileUnkRMSVC1Ev kind:function(arm,size=0x28) addr:0x0215bc3c _ZN12ActorUnkRMSVC1Ev kind:function(arm,size=0xc0) addr:0x0215bc64 _ZN24UnkStruct_ov063_021632e4D1Ev kind:function(arm,size=0x14) addr:0x0215bd24 -_ZN12ActorUnkRMSV8vfunc_18Ei kind:function(arm,size=0x94) addr:0x0215bd38 +_ZN12ActorUnkRMSV4InitEi kind:function(arm,size=0x94) addr:0x0215bd38 _ZN24UnkStruct_ov063_021632e48vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215bdcc -_ZN12ActorUnkRMSV8vfunc_20Ev kind:function(arm,size=0x2c) addr:0x0215bdf0 +_ZN12ActorUnkRMSV6UpdateEv kind:function(arm,size=0x2c) addr:0x0215bdf0 _ZN12ActorUnkRMSV8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215be1c _ZN12ActorUnkRMSV8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215be30 _ZN12ActorUnkRMSV8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215be70 @@ -134,8 +134,8 @@ _ZN19ActorProfileUnkRMSW10GetProfileEv kind:function(arm,size=0xc) addr:0x0215bf _ZN19ActorProfileUnkRMSW6CreateEv kind:function(arm,size=0x24) addr:0x0215bf7c _ZN19ActorProfileUnkRMSWC1Ev kind:function(arm,size=0x28) addr:0x0215bfa0 _ZN12ActorUnkRMSWC1Ev kind:function(arm,size=0x74) addr:0x0215bfc8 -_ZN12ActorUnkRMSW8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215c03c -_ZN12ActorUnkRMSW8vfunc_20Ev kind:function(arm,size=0x18) addr:0x0215c090 +_ZN12ActorUnkRMSW4InitEi kind:function(arm,size=0x54) addr:0x0215c03c +_ZN12ActorUnkRMSW6UpdateEv kind:function(arm,size=0x18) addr:0x0215c090 _ZN12ActorUnkRMSW8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215c0a8 _ZN12ActorUnkRMSW8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215c0bc _ZN12ActorUnkRMSW8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215c0fc @@ -155,8 +155,8 @@ _ZN19ActorProfileUnkRMSD10GetProfileEv kind:function(arm,size=0xc) addr:0x0215c3 _ZN19ActorProfileUnkRMSD6CreateEv kind:function(arm,size=0x24) addr:0x0215c328 _ZN19ActorProfileUnkRMSDC1Ev kind:function(arm,size=0x28) addr:0x0215c34c _ZN12ActorUnkRMSDC1Ev kind:function(arm,size=0x74) addr:0x0215c374 -_ZN12ActorUnkRMSD8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215c3e8 -_ZN12ActorUnkRMSD8vfunc_20Ev kind:function(arm,size=0x18) addr:0x0215c43c +_ZN12ActorUnkRMSD4InitEi kind:function(arm,size=0x54) addr:0x0215c3e8 +_ZN12ActorUnkRMSD6UpdateEv kind:function(arm,size=0x18) addr:0x0215c43c _ZN12ActorUnkRMSD8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215c454 _ZN12ActorUnkRMSD8vfunc_54Ev kind:function(arm,size=0x40) addr:0x0215c468 _ZN12ActorUnkRMSD8vfunc_58Ev kind:function(arm,size=0x40) addr:0x0215c4a8 @@ -252,8 +252,8 @@ _ZN19ActorProfileUnkRBLS6CreateEv kind:function(arm,size=0x24) addr:0x0215f2a4 _ZN19ActorProfileUnkRBLSC1Ev kind:function(arm,size=0x28) addr:0x0215f2c8 _ZN12ActorUnkRBLSC1Ev kind:function(arm,size=0xc4) addr:0x0215f2f0 _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f3b4 -_ZN12ActorUnkRBLS8vfunc_18Ei kind:function(arm,size=0x8c) addr:0x0215f3c8 -_ZN12ActorUnkRBLS8vfunc_20Ev kind:function(arm,size=0x14) addr:0x0215f454 +_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 _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f49c @@ -264,7 +264,7 @@ _ZN23MapObjectProfileUnkSTAT10GetProfileEv kind:function(arm,size=0xc) addr:0x02 _ZN23MapObjectProfileUnkSTAT6CreateEv kind:function(arm,size=0x24) addr:0x0215f530 _ZN23MapObjectProfileUnkSTATC1Ev kind:function(arm,size=0x94) addr:0x0215f554 _ZN16MapObjectUnkSTATC1Ev kind:function(arm,size=0xc8) addr:0x0215f5e8 -_ZN16MapObjectUnkSTAT8vfunc_00Ev kind:function(arm,size=0x40) addr:0x0215f6b0 +_ZN16MapObjectUnkSTAT4InitEv kind:function(arm,size=0x40) addr:0x0215f6b0 _ZN16MapObjectUnkSTAT8vfunc_08Ev kind:function(arm,size=0x88) addr:0x0215f6f0 _ZN16MapObjectUnkSTAT8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0215f778 _ZN16MapObjectUnkSTAT19func_ov063_0215f7acEv kind:function(arm,size=0x494) addr:0x0215f78c diff --git a/config/usa/arm9/overlays/ov071/symbols.txt b/config/usa/arm9/overlays/ov071/symbols.txt index bf91099d..8e1cf8d3 100644 --- a/config/usa/arm9/overlays/ov071/symbols.txt +++ b/config/usa/arm9/overlays/ov071/symbols.txt @@ -295,9 +295,9 @@ _ZN14ActorTearLightC1Ev kind:function(arm,size=0x194) addr:0x0215f270 _ZN18ActorTearLight_104D1Ev kind:function(arm,size=0x14) addr:0x0215f404 _ZN14ActorTearLightD1Ev kind:function(arm,size=0x78) addr:0x0215f418 _ZN14ActorTearLightD0Ev kind:function(arm,size=0x80) addr:0x0215f490 -_ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0215f510 -_ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0215f5bc -_ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x0215f5e8 +_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_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f7bc diff --git a/config/usa/arm9/overlays/ov102/symbols.txt b/config/usa/arm9/overlays/ov102/symbols.txt index dfd9fe85..74c22b7f 100644 --- a/config/usa/arm9/overlays/ov102/symbols.txt +++ b/config/usa/arm9/overlays/ov102/symbols.txt @@ -25,7 +25,7 @@ _ZN16MapObjectUnkPTFL19func_ov102_0218419cEv kind:function(arm,size=0x218) addr: _ZN16MapObjectUnkPTFL19func_ov102_021843b4Ev kind:function(arm,size=0x214) addr:0x02184394 _ZN21UnkStruct_027e0cd8_0C8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021845a8 _ZN21UnkStruct_027e0cd8_0C19func_ov102_02184628Ev kind:function(arm,size=0x1c) addr:0x02184608 -_ZN12ActorUnkMLCK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184624 +_ZN12ActorUnkMLCK6UpdateEv kind:function(arm,size=0x190) addr:0x02184624 _ZN12ActorUnkMLCK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x021847b4 _ZN15ActorUnkMLCK_C419func_ov102_021847e8Eii kind:function(arm,size=0x78) addr:0x021847c8 _ZN24UnkStruct_ov102_02184a248vfunc_00EP5Actor kind:function(arm,size=0x50) addr:0x02184840 diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 53547e89..41ad68ab 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -11,6 +11,7 @@ #include "global.h" #include "math.hpp" #include "nitro/fx.h" +#include "timer.hpp" #include "types.h" #include "versions.h" @@ -95,11 +96,6 @@ enum ActorFlag_ { ActorFlag_31 = FLAG(0, 31), }; -// normal: 0x603B - 0110 0000 0011 1011 - Alive | Visible | Active | Flag_4 | Flag_13 | Flag_14 | Flag 5 -// out of stun: 0xE03B - 1110 0000 0011 1011 - Alive | Visible | Active | Flag_4 | Flag_13 | Flag_14 | Flag 5 | Flag_15 -// caught in tornado: 0xE01B - 1110 0000 0001 1011 - Alive | Visible | Active | Flag_4 | Flag_13 | Flag_14 | Flag_15 -// stunned: 0xA01B - 1010 0000 0001 1011 - Alive | Visible | Active | Flag_4 | Flag_13 | Flag_15 - class Actor_9C { public: /* 00 (vtable) */ @@ -146,8 +142,7 @@ public: class UnkStruct_ActorUnkCANS_224 { public: /* 00 (base) */ UnkStruct_PlayerGet_ec mUnk_00[0x2]; - /* 08 */ volatile u16 mUnk_08; - /* 0A */ u16 mUnk_0A; + /* 08 */ Timer mUnk_08; /* 0C */ u16 mUnk_0C; /* 0E */ u16 mUnk_0E; /* 10 */ @@ -163,14 +158,7 @@ public: ptr->func_ov000_020a0334(); } - this->mUnk_0A = 0; - this->mUnk_08 = 0; - } - - void UpdateTimer() { - if (this->mUnk_08 < this->mUnk_0A) { - this->mUnk_08++; - } + this->mUnk_08.Init(); } void func_ov000_020998f0(ActorRef ref, VecFx32 *pPos); @@ -186,10 +174,7 @@ public: /* 04 */ VecFx32 mPos; /* 10 */ VecFx32 mPrevPos; /* 1C */ VecFx32 mVel; - /* 28 */ union { - /* 28 */ fx16 mAngle; - /* 28 */ UnkAngleStruct mAngleStruct; - }; + /* 28 */ UnkAngleStruct mAngle; /* 2A */ unk16 mUnk_2A; /* 2C */ unk32 mUnk_2C; // gravity? /* 30 */ Cylinder *mUnk_30; @@ -203,8 +188,7 @@ public: /* 4A */ u8 mUnk_4A[2]; /* 4C */ ActorState mState; /* 4E */ fx16 mYOffset; - /* 50 */ volatile u16 mTimer; // generic timer, used for stunned time, drop expiration, ... - /* 52 */ u16 mTimerMax; // maximum value for the above timer + /* 50 */ Timer mTimer; // generic timer, used for stunned time, drop expiration, ... /* 54 */ UnkStruct_ActorUnkCANS_224 *mUnk_54; /* 58 */ ActorFlags mFlags[1]; /* 5C */ ActorParams mUnk_5C; @@ -218,9 +202,9 @@ public: /* 0C */ virtual unk8 vfunc_0C(); /* 10 */ virtual void vfunc_10(Cylinder *param1); /* 14 */ virtual bool vfunc_14(Cylinder *param1); - /* 18 */ virtual bool vfunc_18(unk32 param1); // Init? - /* 1C */ virtual void vfunc_1C(); // Setup - /* 20 */ virtual void vfunc_20(); // Update? + /* 18 */ virtual bool Init(unk32 param1); + /* 1C */ virtual void Setup(); + /* 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); @@ -283,15 +267,6 @@ public: ActorId GetActorId(); - bool IsTimerOut() { - if (this->mTimer < this->mTimerMax) { - this->mTimer++; - return false; - } - - return true; - } - // overlay 0 bool func_ov000_0205cbc4(u32 param1, VecFx32 *param2); unk32 func_ov000_0207df88(Cylinder *param1, unk32 param2); diff --git a/include/Actor/ActorBlast.hpp b/include/Actor/ActorBlast.hpp index 461d000b..b704be26 100644 --- a/include/Actor/ActorBlast.hpp +++ b/include/Actor/ActorBlast.hpp @@ -24,8 +24,7 @@ class ActorBlast : public Actor { public: /* 00 (base) */ /* 94 */ fx32 mUnk_94; - /* 98 */ volatile u16 mUnk_98; - /* 9A */ u16 mUnk_9A; + /* 98 */ Timer mUnk_98; /* 9C */ UnkStruct_ov031_Items_01 mUnk_9C; /* C8 */ Cylinder mUnk_C8; /* D8 */ Cylinder mUnk_D8; @@ -36,18 +35,10 @@ public: ActorBlast(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; - bool IsInternalTimerOut() { - if (this->mUnk_98 < this->mUnk_9A) { - ++this->mUnk_98; - return false; - } - return true; - } - fx32 func_ov031_020e3b94(); static void func_ov031_020e3b9c(Actor *spawner, unk16 param1, unk16 param2); }; diff --git a/include/Actor/ActorBomb.hpp b/include/Actor/ActorBomb.hpp index 06e7b02c..4c329448 100644 --- a/include/Actor/ActorBomb.hpp +++ b/include/Actor/ActorBomb.hpp @@ -87,8 +87,7 @@ public: /* 1E4 */ ActorRef mUnk_1E4; /* 1E8 */ u8 mUnk_1E8; /* 1E8 */ u8 mUnk_1E9; - /* 1EA */ volatile u16 mUnk_1EA; - /* 1EC */ u16 mUnk_1EC; + /* 1EA */ Timer mUnk_1EA; /* 1EE */ bool mUnk_1EE; /* 1EF */ bool mUnk_1EF; /* 1F0 */ bool mUnk_1F0; @@ -103,21 +102,13 @@ public: ActorBomb(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 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; /* 38 */ virtual bool Grab(ActorGrabParams grabParams) override; /* 3C */ virtual bool Drop(ActorGrabParams grabParams, const VecFx32 *pVel) override; - bool IsInternalTimerOut() { - if (this->mUnk_1EA < this->mUnk_1EC) { - ++this->mUnk_1EA; - return false; - } - return true; - } - // check if really in ActorUnkBomb G3d_Model *func_ov031_020e1540(u16 param1); UnkStruct_ov000_02058a84 *func_ov031_020e15d0(u16 param1); diff --git a/include/Actor/ActorEventIcon.hpp b/include/Actor/ActorEventIcon.hpp index 740f490e..4a4a6d88 100644 --- a/include/Actor/ActorEventIcon.hpp +++ b/include/Actor/ActorEventIcon.hpp @@ -15,8 +15,8 @@ public: ActorEventIcon(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorEventIcon() override; diff --git a/include/Actor/ActorFleeingSpinut.hpp b/include/Actor/ActorFleeingSpinut.hpp index 32b8331d..5e7dbdb9 100644 --- a/include/Actor/ActorFleeingSpinut.hpp +++ b/include/Actor/ActorFleeingSpinut.hpp @@ -75,8 +75,8 @@ public: ActorFleeingSpinut(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *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 633a80cc..8235a41c 100644 --- a/include/Actor/ActorHeart.hpp +++ b/include/Actor/ActorHeart.hpp @@ -35,7 +35,7 @@ public: /* B8 */ s16 mUnk_B8; /* BA */ unk16 mUnk_BA; /* BC */ unk16 mUnk_BC; - /* BE */ s8 mUnk_BE; + /* BE */ bool mUnk_BE; /* BF */ STRUCT_PAD(0xBF, 0xC0); /* C0 */ ActorRef mUnk_C0; /* C4 */ ActorRef mUnk_C4; @@ -44,8 +44,8 @@ public: ActorHeart(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorHeart() override {}; diff --git a/include/Actor/ActorItemBoomerang.hpp b/include/Actor/ActorItemBoomerang.hpp index 11b9cf64..deee23bf 100644 --- a/include/Actor/ActorItemBoomerang.hpp +++ b/include/Actor/ActorItemBoomerang.hpp @@ -82,8 +82,8 @@ public: ActorItemBoomerang(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorItemBoomerang() override; diff --git a/include/Actor/ActorItemDrop.hpp b/include/Actor/ActorItemDrop.hpp index 2bad32ab..c7e9e1ae 100644 --- a/include/Actor/ActorItemDrop.hpp +++ b/include/Actor/ActorItemDrop.hpp @@ -46,8 +46,7 @@ public: class ActorItemDrop : public Actor_Derived2 { public: /* 000 (base) */ - /* 0AE */ volatile u16 mUnk_AE; - /* 0B0 */ u16 mUnk_B0; + /* 0AE */ Timer mUnk_AE; /* 0B2 */ STRUCT_PAD(0xB2, 0xB4); /* 0B4 */ Actor_9C mUnk_B4; /* 0D4 */ ItemDropType mItemTypeId; @@ -61,20 +60,11 @@ public: /* 118 */ bool mUnk_118; /* 119 */ bool mUnk_119; - bool IsTimerOut() { - if (this->mUnk_AE < this->mUnk_B0) { - this->mUnk_AE++; - return false; - } - - return true; - } - ActorItemDrop(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 18 */ virtual bool Init(unk32 param1) override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; void func_ov031_020fa260(); diff --git a/include/Actor/ActorItemFlower.hpp b/include/Actor/ActorItemFlower.hpp index 820441af..56c68947 100644 --- a/include/Actor/ActorItemFlower.hpp +++ b/include/Actor/ActorItemFlower.hpp @@ -40,8 +40,8 @@ public: ActorItemFlower(); - /* 18 */ bool vfunc_18(unk32 param1); - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1); + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 5C */ virtual void vfunc_5C(ActorState state) override; diff --git a/include/Actor/ActorItemTornado.hpp b/include/Actor/ActorItemTornado.hpp index f78e5d80..1a92eb47 100644 --- a/include/Actor/ActorItemTornado.hpp +++ b/include/Actor/ActorItemTornado.hpp @@ -50,8 +50,8 @@ public: ActorItemTornado(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 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; diff --git a/include/Actor/ActorKeese.hpp b/include/Actor/ActorKeese.hpp index 1e3240f9..26a1f45d 100644 --- a/include/Actor/ActorKeese.hpp +++ b/include/Actor/ActorKeese.hpp @@ -117,8 +117,8 @@ public: ActorKeese(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void func_ov032_0211e0c0(); diff --git a/include/Actor/ActorPot.hpp b/include/Actor/ActorPot.hpp index 2902c313..7276e677 100644 --- a/include/Actor/ActorPot.hpp +++ b/include/Actor/ActorPot.hpp @@ -49,8 +49,8 @@ public: Actor_ov031_02113fd4(); // data_ov031_02113fd4 - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; /* 38 */ virtual bool Grab(ActorGrabParams grabParams) override; /* 3C */ virtual bool Drop(ActorGrabParams grabParams, const VecFx32 *pVel) override; @@ -86,8 +86,8 @@ public: ActorPot(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 5C */ virtual void vfunc_5C(ActorState state) override; diff --git a/include/Actor/ActorRollingStone.hpp b/include/Actor/ActorRollingStone.hpp index 16631fc4..93420483 100644 --- a/include/Actor/ActorRollingStone.hpp +++ b/include/Actor/ActorRollingStone.hpp @@ -68,10 +68,8 @@ public: /* 138 */ unk16 mUnk_138; /* 13C */ Cylinder mUnk_13C; /* 14C */ unk32 mUnk_14C; - /* 150 */ volatile u16 mUnk_150; - /* 152 */ volatile u16 mUnk_152; - /* 154 */ volatile u16 mUnk_154; - /* 156 */ volatile u16 mUnk_156; + /* 150 */ Timer mUnk_150; + /* 154 */ Timer mUnk_154; /* 158 */ bool mUnk_158; /* 159 */ bool mUnk_159; /* 15A */ s8 mUnk_15A; @@ -81,29 +79,11 @@ public: ActorRollingStone(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020f869c - /* 20 */ virtual void vfunc_20() override; // func_ov031_020f878c + /* 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 /* 54 */ - bool IsInternalTimerOut1() { - if (this->mUnk_150 < this->mUnk_152) { - this->mUnk_150++; - return false; - } - - return true; - } - - bool IsInternalTimerOut2() { - if (this->mUnk_154 < this->mUnk_156) { - this->mUnk_154++; - return false; - } - - return true; - } - void SetState(ActorState state); void func_ov031_020f8880(); void func_ov031_020f89f4(); diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index e7af5015..13fa8c87 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -69,8 +69,8 @@ public: ActorRupee(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorRupee() override; diff --git a/include/Actor/ActorShotArrow.hpp b/include/Actor/ActorShotArrow.hpp index 2ae1ec76..d067e7ad 100644 --- a/include/Actor/ActorShotArrow.hpp +++ b/include/Actor/ActorShotArrow.hpp @@ -127,8 +127,8 @@ public: ActorShotArrow(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 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; /* 4C */ virtual ~ActorShotArrow() override; diff --git a/include/Actor/ActorSpinut.hpp b/include/Actor/ActorSpinut.hpp index f0190d65..7ddd90be 100644 --- a/include/Actor/ActorSpinut.hpp +++ b/include/Actor/ActorSpinut.hpp @@ -112,24 +112,14 @@ public: /* 27C */ VecFx32 mUnk_27C; /* 288 */ VecFx32 mUnk_288; /* 294 */ bool mUnk_294; - /* 296 */ volatile u16 mUnk_296; - /* 298 */ u16 mUnk_298; + /* 296 */ Timer mUnk_296; /* 29A */ ActorSpinut(); - bool IsInternalTimerOut() { - if (this->mUnk_296 < this->mUnk_298) { - this->mUnk_296++; - return false; - } - - return true; - } - - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C() override; - /* 20 */ virtual void vfunc_20() override; + /* 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; /* 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 205e631a..a108010d 100644 --- a/include/Actor/ActorTearLight.hpp +++ b/include/Actor/ActorTearLight.hpp @@ -108,9 +108,9 @@ public: ActorTearLight(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C() override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 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; /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; diff --git a/include/Actor/ActorUnkATTG.hpp b/include/Actor/ActorUnkATTG.hpp index 58e561e0..8a4300b8 100644 --- a/include/Actor/ActorUnkATTG.hpp +++ b/include/Actor/ActorUnkATTG.hpp @@ -20,8 +20,8 @@ public: ActorUnkATTG(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; void func_ov031_020f3eec(ActorState state, unk32 param2); bool func_ov031_020f4014(); diff --git a/include/Actor/ActorUnkCANS.hpp b/include/Actor/ActorUnkCANS.hpp index a2774f8f..d841aa0a 100644 --- a/include/Actor/ActorUnkCANS.hpp +++ b/include/Actor/ActorUnkCANS.hpp @@ -100,10 +100,8 @@ public: /* 1F4 */ Actor_Derived1_94 mUnk_1F4; /* 200 */ UnkStruct_ov063_02162e88 mUnk_200; /* 224 */ UnkStruct_ActorUnkCANS_224 mUnk_224; - /* 234 */ volatile u16 mUnk_234; - /* 236 */ u16 mUnk_236; - /* 238 */ volatile u16 mUnk_238; - /* 23A */ u16 mUnk_23A; + /* 234 */ Timer mUnk_234; + /* 238 */ Timer mUnk_238; /* 23C */ UnkStruct_ov063_02162ea8 mUnk_23C; /* 250 */ VecFx32 mUnk_250; /* 25C */ unk32 mUnk_25C; @@ -121,9 +119,9 @@ public: ActorUnkCANS(); /* 10 */ virtual void vfunc_10(Cylinder *param1) override; - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(void) override; - /* 20 */ virtual void vfunc_20(void) override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 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; diff --git a/include/Actor/ActorUnkCASE.hpp b/include/Actor/ActorUnkCASE.hpp index 65dae732..c4713786 100644 --- a/include/Actor/ActorUnkCASE.hpp +++ b/include/Actor/ActorUnkCASE.hpp @@ -86,8 +86,8 @@ public: ActorUnkCASE(); /* 10 */ virtual void vfunc_10(Cylinder *param1) override; - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 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; diff --git a/include/Actor/ActorUnkEFIK.hpp b/include/Actor/ActorUnkEFIK.hpp index 4f3f4ba2..730efe3c 100644 --- a/include/Actor/ActorUnkEFIK.hpp +++ b/include/Actor/ActorUnkEFIK.hpp @@ -16,8 +16,8 @@ public: ActorUnkEFIK(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; /* 4C */ virtual ~ActorUnkEFIK() override; /* 54 */ virtual void vfunc_54(unk32 param1); diff --git a/include/Actor/ActorUnkEFSB.hpp b/include/Actor/ActorUnkEFSB.hpp index e6c5d91a..ee9bdc24 100644 --- a/include/Actor/ActorUnkEFSB.hpp +++ b/include/Actor/ActorUnkEFSB.hpp @@ -18,8 +18,8 @@ public: ActorUnkEFSB(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 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; /* 54 */ virtual void vfunc_54(unk32 param1); diff --git a/include/Actor/ActorUnkFLEN.hpp b/include/Actor/ActorUnkFLEN.hpp index 9eb56ed6..1475eb52 100644 --- a/include/Actor/ActorUnkFLEN.hpp +++ b/include/Actor/ActorUnkFLEN.hpp @@ -20,8 +20,8 @@ public: ActorUnkFLEN(); - /* 18 */ virtual bool vfunc_18(int param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(int param1) override; + /* 20 */ virtual void Update() override; void SetState(ActorState state); bool func_ov031_020f81f8(); diff --git a/include/Actor/ActorUnkMLCK.hpp b/include/Actor/ActorUnkMLCK.hpp index 5d0ae8e2..3dd180b1 100644 --- a/include/Actor/ActorUnkMLCK.hpp +++ b/include/Actor/ActorUnkMLCK.hpp @@ -78,8 +78,7 @@ public: /* B4 */ ActorUnkMLCK_A0 **mUnk_B4; /* B8 */ unk32 mUnk_B8; /* BC */ unk32 mUnk_BC; - /* C0 */ u16 mUnk_C0; - /* C2 */ vu16 mUnk_C2; + /* C0 */ Timer mUnk_C0; /* C4 */ ActorUnkMLCK_C4 mUnk_C4; /* D8 */ ActorUnkMLCK_D8 mUnk_D8; /* E4 */ ActorUnkMLCK_D8 mUnk_E4; @@ -93,10 +92,10 @@ public: /// (Actor) // overlay 31 - /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 18 */ virtual bool Init(unk32 param1) override; // overlay 102 - /* 20 */ virtual void vfunc_20() override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; /// (FileSelectManager_UnkDrawBase) diff --git a/include/Actor/ActorUnkNFSP.hpp b/include/Actor/ActorUnkNFSP.hpp index e4d2efef..333ad5cb 100644 --- a/include/Actor/ActorUnkNFSP.hpp +++ b/include/Actor/ActorUnkNFSP.hpp @@ -24,8 +24,7 @@ class ActorUnkNFSP : public Actor { public: /* 00 (base) */ /* 94 */ unk32 mUnk_94; - /* 98 */ volatile u16 mUnk_98; - /* 9A */ u16 mUnk_9A; + /* 98 */ Timer mUnk_98; /* 9C */ MapObjectUnkSWFS *mUnk_9C; /* A0 */ Actor_9C mUnk_A0; /* C0 */ ActorUnkNFSP_C0 mUnk_C0; @@ -34,8 +33,8 @@ public: ActorUnkNFSP(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 54 */ virtual void vfunc_54(unk32 param1); diff --git a/include/Actor/ActorUnkNORE.hpp b/include/Actor/ActorUnkNORE.hpp index 2c791aa4..8be5c0df 100644 --- a/include/Actor/ActorUnkNORE.hpp +++ b/include/Actor/ActorUnkNORE.hpp @@ -12,7 +12,7 @@ public: ActorUnkNORE(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 18 */ virtual bool Init(unk32 param1) override; }; class ActorProfileUnkNORE : public ActorProfile { diff --git a/include/Actor/ActorUnkNTTZ.hpp b/include/Actor/ActorUnkNTTZ.hpp index 36555a1f..0c9bff51 100644 --- a/include/Actor/ActorUnkNTTZ.hpp +++ b/include/Actor/ActorUnkNTTZ.hpp @@ -13,8 +13,8 @@ public: ActorUnkNTTZ(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void func_ov031_020f61a0(); diff --git a/include/Actor/ActorUnkOBPC.hpp b/include/Actor/ActorUnkOBPC.hpp index d0ca9f15..9b543bb4 100644 --- a/include/Actor/ActorUnkOBPC.hpp +++ b/include/Actor/ActorUnkOBPC.hpp @@ -22,8 +22,8 @@ public: ActorUnkOBPC(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; bool func_ov024_020d6f74(void); diff --git a/include/Actor/ActorUnkRBLS.hpp b/include/Actor/ActorUnkRBLS.hpp index 096247e7..253aea39 100644 --- a/include/Actor/ActorUnkRBLS.hpp +++ b/include/Actor/ActorUnkRBLS.hpp @@ -26,8 +26,8 @@ public: ActorUnkRBLS(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20(void) override; + /* 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; diff --git a/include/Actor/ActorUnkRMSBase.hpp b/include/Actor/ActorUnkRMSBase.hpp index 74609f07..26631251 100644 --- a/include/Actor/ActorUnkRMSBase.hpp +++ b/include/Actor/ActorUnkRMSBase.hpp @@ -16,9 +16,9 @@ public: ActorUnkRMSBase(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C() override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 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; /* 58 */ virtual G3d_Model *vfunc_58() = 0; diff --git a/include/Actor/ActorUnkRMSD.hpp b/include/Actor/ActorUnkRMSD.hpp index 369e0605..dfdac2ab 100644 --- a/include/Actor/ActorUnkRMSD.hpp +++ b/include/Actor/ActorUnkRMSD.hpp @@ -17,8 +17,8 @@ public: ActorUnkRMSD(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20(void) override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update(void) override; /* 24 */ virtual void vfunc_24(void) override; /* 54 */ virtual G3d_Model *vfunc_54(void); /* 58 */ virtual G3d_Model *vfunc_58(void); diff --git a/include/Actor/ActorUnkRMSV.hpp b/include/Actor/ActorUnkRMSV.hpp index 4d1474dc..30ea8457 100644 --- a/include/Actor/ActorUnkRMSV.hpp +++ b/include/Actor/ActorUnkRMSV.hpp @@ -40,8 +40,8 @@ public: ActorUnkRMSV(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20(void) override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update(void) override; /* 24 */ virtual void vfunc_24(void) override; /* 54 */ virtual G3d_Model *vfunc_54(void) override; /* 58 */ virtual G3d_Model *vfunc_58(void) override; diff --git a/include/Actor/ActorUnkRMSW.hpp b/include/Actor/ActorUnkRMSW.hpp index b31b8df6..013e8fa1 100644 --- a/include/Actor/ActorUnkRMSW.hpp +++ b/include/Actor/ActorUnkRMSW.hpp @@ -27,8 +27,8 @@ public: ActorUnkRMSW(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20(void) override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update(void) override; /* 24 */ virtual void vfunc_24(void) override; /* 54 */ virtual G3d_Model *vfunc_54(void) override; /* 58 */ virtual G3d_Model *vfunc_58(void) override; diff --git a/include/Actor/ActorUnkRMTG.hpp b/include/Actor/ActorUnkRMTG.hpp index 44f47f5a..2943a688 100644 --- a/include/Actor/ActorUnkRMTG.hpp +++ b/include/Actor/ActorUnkRMTG.hpp @@ -13,8 +13,8 @@ public: ActorUnkRMTG(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 1C */ virtual void Setup() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; }; diff --git a/include/Actor/ActorUnkROCK.hpp b/include/Actor/ActorUnkROCK.hpp index 0d824125..d281bc3a 100644 --- a/include/Actor/ActorUnkROCK.hpp +++ b/include/Actor/ActorUnkROCK.hpp @@ -26,8 +26,8 @@ public: ActorUnkROCK(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 38 */ virtual bool Grab(ActorGrabParams param1) override; /* 38 */ virtual bool Drop(ActorGrabParams param1, const VecFx32 *param2) override; diff --git a/include/Actor/ActorUnkSCCN.hpp b/include/Actor/ActorUnkSCCN.hpp index 70c549fe..4fc151ca 100644 --- a/include/Actor/ActorUnkSCCN.hpp +++ b/include/Actor/ActorUnkSCCN.hpp @@ -38,7 +38,7 @@ public: ActorUnkSCCN(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 18 */ virtual bool Init(unk32 param1) override; }; class ActorProfileUnkSCCN : public ActorProfile { diff --git a/include/Actor/ActorUnkSKDO.hpp b/include/Actor/ActorUnkSKDO.hpp index fdd66f0c..571a0565 100644 --- a/include/Actor/ActorUnkSKDO.hpp +++ b/include/Actor/ActorUnkSKDO.hpp @@ -29,9 +29,9 @@ public: ActorUnkSKDO(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C() override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 1C */ virtual void Setup() override; + /* 20 */ virtual void Update() override; /* 54 */ virtual void vfunc_54(unk32 param1); }; diff --git a/include/Actor/ActorUnkSWBM.hpp b/include/Actor/ActorUnkSWBM.hpp index 87871f84..880b507b 100644 --- a/include/Actor/ActorUnkSWBM.hpp +++ b/include/Actor/ActorUnkSWBM.hpp @@ -66,8 +66,8 @@ public: ActorUnkSWBM(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 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; diff --git a/include/Actor/ActorUnkSWCH.hpp b/include/Actor/ActorUnkSWCH.hpp index be352561..b353dd71 100644 --- a/include/Actor/ActorUnkSWCH.hpp +++ b/include/Actor/ActorUnkSWCH.hpp @@ -14,8 +14,8 @@ public: ActorUnkSWCH(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; }; diff --git a/include/Actor/ActorUnkSWOB.hpp b/include/Actor/ActorUnkSWOB.hpp index 6377d90c..bfba013c 100644 --- a/include/Actor/ActorUnkSWOB.hpp +++ b/include/Actor/ActorUnkSWOB.hpp @@ -27,8 +27,8 @@ public: ActorUnkSWOB(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; bool func_ov000_0209a948(void); void SetState(ActorState state); diff --git a/include/Actor/ActorUnkSWON.hpp b/include/Actor/ActorUnkSWON.hpp index 50c1dd6e..61b1ff4f 100644 --- a/include/Actor/ActorUnkSWON.hpp +++ b/include/Actor/ActorUnkSWON.hpp @@ -12,7 +12,7 @@ public: ActorUnkSWON(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 18 */ virtual bool Init(unk32 param1) override; /* 4C */ virtual ~ActorUnkSWON() override; }; diff --git a/include/Actor/ActorUnkSWTM.hpp b/include/Actor/ActorUnkSWTM.hpp index 75f92129..22ee366c 100644 --- a/include/Actor/ActorUnkSWTM.hpp +++ b/include/Actor/ActorUnkSWTM.hpp @@ -42,8 +42,8 @@ public: ActorUnkSWTM(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; /* 4C */ virtual ~ActorUnkSWTM() override; diff --git a/include/Actor/ActorUnkTGTZ.hpp b/include/Actor/ActorUnkTGTZ.hpp index e8498379..3064c591 100644 --- a/include/Actor/ActorUnkTGTZ.hpp +++ b/include/Actor/ActorUnkTGTZ.hpp @@ -29,13 +29,11 @@ public: /* 1B4 */ ActorUnkNTTZ *mUnk_1B4; /* 1B8 */ unk32 mUnk_1B8; /* 1BC */ unk32 mUnk_1BC; - /* 1C0 */ volatile u16 mUnk_1C0; - /* 1C2 */ u16 mUnk_1C2; + /* 1C0 */ Timer mUnk_1C0; /* 1CC */ fx32 mUnk_1C4; /* 1C8 */ UnkStruct_ov019_020d24c8_28_258_00 *mUnk_1C8; /* 1CC */ unk32 mUnk_1CC; - /* 1D0 */ volatile u16 mUnk_1D0; - /* 1D2 */ u16 mUnk_1D2; + /* 1D0 */ Timer mUnk_1D0; /* 1D4 */ u16 mUnk_1D4; /* 1D6 */ u16 mUnk_1D6; /* 1D8 */ bool mUnk_1D8; @@ -44,20 +42,12 @@ public: ActorUnkTGTZ(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 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; /* 34 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; - bool IsInternalTimerOut() { - if (this->mUnk_1D0 < this->mUnk_1D2) { - ++this->mUnk_1D0; - return false; - } - return true; - } - void func_ov031_020f6984(); static void func_ov031_020f6e5c(ActorRef param1); static void func_ov031_020f6ea8(ActorRef *param0, u16 param1, const VecFx32 *param2, s16 param3, u16 param4); diff --git a/include/Actor/ActorUnkTLKT.hpp b/include/Actor/ActorUnkTLKT.hpp index e588fb00..2ded8438 100644 --- a/include/Actor/ActorUnkTLKT.hpp +++ b/include/Actor/ActorUnkTLKT.hpp @@ -24,9 +24,9 @@ public: ActorUnkTLKTnCLLT_Base(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C() override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 1C */ virtual void Setup() override; + /* 20 */ virtual void Update() override; /* 24 */ virtual void vfunc_24() override; /* 54 */ virtual void vfunc_54(); /* 58 */ virtual void vfunc_58(); diff --git a/include/Actor/ActorUnkZLSL_ZSRS.hpp b/include/Actor/ActorUnkZLSL_ZSRS.hpp index b3555dde..0a113322 100644 --- a/include/Actor/ActorUnkZLSL_ZSRS.hpp +++ b/include/Actor/ActorUnkZLSL_ZSRS.hpp @@ -279,8 +279,8 @@ public: // data_ov031_02113880 /* 00 */ virtual void GetOffsetPos(VecFx32 *pPos) const override; - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 20 */ virtual void Update() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorUnkZLSL() override; /* 58 */ virtual void vfunc_58(ActorState state) override; diff --git a/include/Actor/Actor_Derived1.hpp b/include/Actor/Actor_Derived1.hpp index 11648d47..02cba2da 100644 --- a/include/Actor/Actor_Derived1.hpp +++ b/include/Actor/Actor_Derived1.hpp @@ -92,7 +92,7 @@ public: /* 0A */ unk32 mUnk_08; /* 0C */ - void func_01ffc6d4(u16 param1, VecFx32 *pos); + void func_01ffc6d4(UnkAngleStruct param1, VecFx32 *pos); Actor_Derived1_a4(ModelRender *pModelRender) { this->mpModelRender = pModelRender; @@ -147,8 +147,7 @@ public: /* 0E0 */ unk16 mUnk_0E0; /* 0E0 */ unk16 mUnk_0E2; /* 0E4 */ void (*mUnk_0E4)(); // callback - /* 0E8 */ volatile u16 mUnk_0E8; - /* 0E8 */ volatile u16 mUnk_0EA; + /* 0E8 */ Timer mUnk_0E8; /* 0EC */ Actor_Derived1_EC mUnk_0EC; /* 104 */ Cylinder mUnk_104; /* 114 */ unk32 mUnk_114; @@ -156,9 +155,9 @@ public: /* 11C */ unk32 mUnk_11C; /* 14 */ virtual bool vfunc_14(Cylinder *param1) override; - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C() override; - /* 20 */ virtual void vfunc_20() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 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; /* 4C */ virtual ~Actor_Derived1(); diff --git a/include/FileSelect/FileSelect.hpp b/include/FileSelect/FileSelect.hpp index a3afbc13..082a7638 100644 --- a/include/FileSelect/FileSelect.hpp +++ b/include/FileSelect/FileSelect.hpp @@ -221,5 +221,3 @@ public: this->mUnk_0C = 0x20004; } }; - -extern const UnkStruct_ov019_020d1e70 data_ov019_020d1e70; diff --git a/include/MapObject/MapObject.hpp b/include/MapObject/MapObject.hpp index 50eac98c..79a640ed 100644 --- a/include/MapObject/MapObject.hpp +++ b/include/MapObject/MapObject.hpp @@ -126,10 +126,7 @@ public: /* 00 (vtable) */ /* 04 */ VecFx32 mPos; /* 10 */ MapObject_10_Base *mUnk_10; - /* 14 */ union { - s16 mAngle; - UnkAngleStruct mAngleStruct; - }; + /* 14 */ UnkAngleStruct mAngle; /* 16 */ MapObjState mState; /* 18 */ unk8 mUnk_18[2]; // related to Link walking to the map object when touched /* 1A */ unk8 mUnk_1A; @@ -144,8 +141,8 @@ public: /* 40 */ // data_ov000_020b3590 - /* 00 */ virtual bool vfunc_00(); // Init - /* 04 */ virtual void vfunc_04(); // Setup + /* 00 */ virtual bool Init(); + /* 04 */ virtual void Setup(); /* 08 */ virtual void vfunc_08(); /* 0C */ virtual void vfunc_0C(); /* 10 */ virtual void vfunc_10(); @@ -160,7 +157,7 @@ public: /* 38 */ u16 GetDirection() { - return (u16) (this->mAngle + DEG_TO_ANG(45)) / DEG_TO_ANG(90); + return (u16) (this->mAngle.angle_s + DEG_TO_ANG(45)) / DEG_TO_ANG(90); } bool IsOrientedVertically() { diff --git a/include/MapObject/MapObjectBombFlower.hpp b/include/MapObject/MapObjectBombFlower.hpp index c29d0bae..ab0dbdc3 100644 --- a/include/MapObject/MapObjectBombFlower.hpp +++ b/include/MapObject/MapObjectBombFlower.hpp @@ -27,8 +27,7 @@ public: /* A8 */ STRUCT_PAD(0xA8, 0xB0); /* BC */ fx32 mUnk_B0; /* BC */ fx32 mUnk_B4; - /* B8 */ volatile u16 mUnk_B8; - /* BA */ u16 mUnk_BA; + /* B8 */ Timer mUnk_B8; /* BC */ bool mUnk_BC; /* C0 */ MapObject_10_Pot mUnk_C0; @@ -44,15 +43,6 @@ public: /* 50 */ virtual void vfunc_50(ActorRef *param1, MapObjectPot_Base *thisx) override; /* 58 */ virtual void vfunc_58(); - bool IsInternalTimerOut() { - if (this->mUnk_B8 < this->mUnk_BA) { - ++this->mUnk_B8; - return false; - } - - return true; - } - void func_ov031_02102728(unk32 param1); }; diff --git a/include/MapObject/MapObjectChestBase.hpp b/include/MapObject/MapObjectChestBase.hpp index a5a16348..19e069de 100644 --- a/include/MapObject/MapObjectChestBase.hpp +++ b/include/MapObject/MapObjectChestBase.hpp @@ -58,8 +58,8 @@ public: MapObjectChestBase(unk32 param1); // func_ov031_0210307c - /* 00 */ virtual bool vfunc_00() override; - /* 04 */ virtual void vfunc_04() override; + /* 00 */ virtual bool Init() override; + /* 04 */ virtual void Setup() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; diff --git a/include/MapObject/MapObjectDoorClick.hpp b/include/MapObject/MapObjectDoorClick.hpp index 69d06683..07b4cf11 100644 --- a/include/MapObject/MapObjectDoorClick.hpp +++ b/include/MapObject/MapObjectDoorClick.hpp @@ -41,7 +41,7 @@ public: MapObjectDoorClick(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 18 */ virtual void vfunc_18(s8 *param1) override; diff --git a/include/MapObject/MapObjectDoorDangerSpawn.hpp b/include/MapObject/MapObjectDoorDangerSpawn.hpp index c4760fa7..8f11f653 100644 --- a/include/MapObject/MapObjectDoorDangerSpawn.hpp +++ b/include/MapObject/MapObjectDoorDangerSpawn.hpp @@ -5,6 +5,7 @@ #include "Unknown/Common.hpp" #include "Unknown/UnkStruct_ov000_020b34c4.hpp" #include "global.h" +#include "timer.hpp" #include "types.h" class MapObjectDoorDangerSpawn_ov031_02116e24 : public UnkStruct_ov000_020b34c4 { @@ -50,14 +51,13 @@ public: /* A3 */ unk8 mUnk_A3; /* A4 */ unk32 mUnk_A4; /* A8 */ UnkStruct_PlayerGet_ec mUnk_A8; - /* AC */ volatile u16 mUnk_AC; - /* AE */ u16 mUnk_AE; + /* AC */ Timer mUnk_AC; MapObjectDoorDangerSpawn(); // data_ov031_021150d8 (MapObject) - /* 00 */ virtual bool vfunc_00() override; - /* 04 */ virtual void vfunc_04() override; + /* 00 */ virtual bool Init() override; + /* 04 */ virtual void Setup() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; diff --git a/include/MapObject/MapObjectDoorKey.hpp b/include/MapObject/MapObjectDoorKey.hpp index 68c63b8b..69eec9dc 100644 --- a/include/MapObject/MapObjectDoorKey.hpp +++ b/include/MapObject/MapObjectDoorKey.hpp @@ -32,7 +32,7 @@ public: MapObjectDoorKey(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 18 */ virtual void vfunc_18(s8 *param1) override; diff --git a/include/MapObject/MapObjectDoorSwitch.hpp b/include/MapObject/MapObjectDoorSwitch.hpp index c1ddefa4..e585932b 100644 --- a/include/MapObject/MapObjectDoorSwitch.hpp +++ b/include/MapObject/MapObjectDoorSwitch.hpp @@ -40,7 +40,7 @@ public: MapObjectDoorSwitch(); // data_ov031_0211527c (MapObject) - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 18 */ virtual void vfunc_18(s8 *param1) override; diff --git a/include/MapObject/MapObjectDoorTouch.hpp b/include/MapObject/MapObjectDoorTouch.hpp index d8e2a69a..527e048c 100644 --- a/include/MapObject/MapObjectDoorTouch.hpp +++ b/include/MapObject/MapObjectDoorTouch.hpp @@ -12,7 +12,7 @@ public: MapObjectDoorTouch(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 30 */ virtual ~MapObjectDoorTouch() override; /* 40 */ virtual void vfunc_40() override; /* 44 */ virtual void vfunc_44() override; diff --git a/include/MapObject/MapObjectGrass.hpp b/include/MapObject/MapObjectGrass.hpp index e9e80062..4f8f9f9f 100644 --- a/include/MapObject/MapObjectGrass.hpp +++ b/include/MapObject/MapObjectGrass.hpp @@ -37,7 +37,7 @@ public: MapObjectGrass(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; diff --git a/include/MapObject/MapObjectMiniBlocks.hpp b/include/MapObject/MapObjectMiniBlocks.hpp index 93d31b08..10e9503f 100644 --- a/include/MapObject/MapObjectMiniBlocks.hpp +++ b/include/MapObject/MapObjectMiniBlocks.hpp @@ -14,7 +14,7 @@ public: MapObjectMiniBlocks(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 30 */ virtual ~MapObjectMiniBlocks() override; }; diff --git a/include/MapObject/MapObjectPot.hpp b/include/MapObject/MapObjectPot.hpp index 01c26eb0..9e11b091 100644 --- a/include/MapObject/MapObjectPot.hpp +++ b/include/MapObject/MapObjectPot.hpp @@ -13,7 +13,7 @@ public: MapObjectPot(); - /* 04 */ virtual void vfunc_04() override; // func_ov031_02105088 + /* 04 */ virtual void Setup() override; // func_ov031_02105088 /* 14 */ virtual void vfunc_14(unk32 param1) override; // func_ov031_021052cc /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3); // func_ov031_021050b4 /* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2) override; // func_ov031_02105348 diff --git a/include/MapObject/MapObjectPot_Base.hpp b/include/MapObject/MapObjectPot_Base.hpp index a737aecc..17b4d25f 100644 --- a/include/MapObject/MapObjectPot_Base.hpp +++ b/include/MapObject/MapObjectPot_Base.hpp @@ -20,7 +20,7 @@ public: MapObjectPot_Base(); // data_ov000_020b35d0 - /* 00 */ virtual bool vfunc_00(); + /* 00 */ virtual bool Init(); /* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2) override; /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override; /* 30 */ virtual ~MapObjectPot_Base() = 0 override; diff --git a/include/MapObject/MapObjectSwitchStep.hpp b/include/MapObject/MapObjectSwitchStep.hpp index 15c82754..ab82d98a 100644 --- a/include/MapObject/MapObjectSwitchStep.hpp +++ b/include/MapObject/MapObjectSwitchStep.hpp @@ -5,6 +5,7 @@ #include "Render/ModelRender.hpp" #include "Unknown/Common.hpp" #include "global.h" +#include "timer.hpp" #include "types.h" class MapObjectSwitchStep_40 : public ModelRender { @@ -39,8 +40,7 @@ public: /* A4 */ UnkSystem5 mUnk_A4; /* C4 */ unk32 mUnk_C4; /* C8 */ STRUCT_PAD(0xC8, 0xE4); - /* E4 */ volatile u16 mUnk_E4; - /* E6 */ u16 mUnk_E6; + /* E4 */ Timer mUnk_E4; /* E8 */ unk16 mUnk_E8; /* EA */ u8 mUnk_EA; // bool? /* EB */ unk8 mUnk_EB; @@ -48,7 +48,7 @@ public: MapObjectSwitchStep(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 18 */ virtual void vfunc_18(s8 *param1) override; diff --git a/include/MapObject/MapObjectUnkLTRW.hpp b/include/MapObject/MapObjectUnkLTRW.hpp index 7fad4c0c..936d033c 100644 --- a/include/MapObject/MapObjectUnkLTRW.hpp +++ b/include/MapObject/MapObjectUnkLTRW.hpp @@ -5,6 +5,7 @@ #include "MapObject/MapObjectProfile.hpp" #include "Render/ModelRender.hpp" #include "global.h" +#include "timer.hpp" class UnkStruct_ov063_021639e4 : public ActorUnkTLKT_9C_Base { public: @@ -24,13 +25,12 @@ public: /* 00 (base) */ /* 40 */ ModelRender mUnk_40; /* A0 */ unk32 mUnk_A0; - /* A4 */ volatile u16 mUnk_A4; - /* A6 */ u16 mUnk_A6; + /* A4 */ Timer mUnk_A4; /* A8 */ UnkStruct_ov063_021639e4 mUnk_A8; MapObjectUnkLTRW(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; diff --git a/include/MapObject/MapObjectUnkMTJR.hpp b/include/MapObject/MapObjectUnkMTJR.hpp index 7c6b3ce6..27c52344 100644 --- a/include/MapObject/MapObjectUnkMTJR.hpp +++ b/include/MapObject/MapObjectUnkMTJR.hpp @@ -5,6 +5,7 @@ #include "MapObject/MapObjectUnkSTAT.hpp" #include "Render/ModelRender.hpp" #include "Unknown/Common.hpp" +#include "timer.hpp" #include "types.h" class MapObjectUnkMTJR : public MapObject { @@ -12,15 +13,14 @@ public: /* 00 (base) */ /* 40 */ ModelRender mUnk_40; /* A0 */ unk32 mUnk_A0; - /* A4 */ volatile u16 mUnk_A4; // Probably a counter - /* A6 */ u16 mUnk_A6; // Counter (mUnk_A4) bound + /* A4 */ Timer mUnk_A4; /* A8 */ UnkSystem7 mUnk_A8; /* AC */ unk32 mUnk_AC; /* B0 */ unk32 mUnk_B0; MapObjectUnkMTJR(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; diff --git a/include/MapObject/MapObjectUnkPTFL.hpp b/include/MapObject/MapObjectUnkPTFL.hpp index a730046f..b1cff0cc 100644 --- a/include/MapObject/MapObjectUnkPTFL.hpp +++ b/include/MapObject/MapObjectUnkPTFL.hpp @@ -5,6 +5,7 @@ #include "MapObject/MapObject.hpp" #include "MapObject/MapObjectProfile.hpp" #include "global.h" +#include "timer.hpp" typedef MapObjState MapObjectUnkPTFLState; enum MapObjectUnkPTFLState_ { @@ -25,8 +26,7 @@ public: /* 4C */ unk32 mUnk_4C; /* 50 */ unk32 mUnk_50; /* 54 */ fx16 mUnk_54; - /* 56 */ volatile u16 mUnk_56; - /* 58 */ volatile u16 mUnk_58; + /* 56 */ Timer mUnk_56; /* 5A */ u8 mUnk_5A; /* 5B */ bool mUnk_5B; /* 5C */ bool mUnk_5C; diff --git a/include/MapObject/MapObjectUnkSKDI.hpp b/include/MapObject/MapObjectUnkSKDI.hpp index 6fecde42..302dc525 100644 --- a/include/MapObject/MapObjectUnkSKDI.hpp +++ b/include/MapObject/MapObjectUnkSKDI.hpp @@ -5,6 +5,7 @@ #include "MapObject/MapObjectProfile.hpp" #include "Unknown/UnkStruct_ov031_Items.hpp" #include "global.h" +#include "timer.hpp" #include "types.h" enum MapObjUnkSKDIState_ { @@ -33,15 +34,14 @@ public: /* 0BC */ unk32 mUnk_0BC; /* 0C0 */ STRUCT_PAD(0x0C0, 0x0D4); /* 0D4 */ MapObject_10 mUnk_0D4; - /* 0F8 */ volatile u16 mUnk_0F8; - /* 0FA */ u16 mUnk_0FA; + /* 0F8 */ Timer mUnk_0F8; /* 0FC */ unk32 mUnk_0FC; /* 100 */ MapObjectUnkSKDI(); - /* 00 */ virtual bool vfunc_00() override; - /* 04 */ virtual void vfunc_04() override; + /* 00 */ virtual bool Init() override; + /* 04 */ virtual void Setup() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; diff --git a/include/MapObject/MapObjectUnkSTAT.hpp b/include/MapObject/MapObjectUnkSTAT.hpp index 76a0da6b..0bf0e547 100644 --- a/include/MapObject/MapObjectUnkSTAT.hpp +++ b/include/MapObject/MapObjectUnkSTAT.hpp @@ -4,6 +4,7 @@ #include "MapObject/MapObjectProfile.hpp" #include "Render/ModelRender.hpp" #include "global.h" +#include "timer.hpp" #include "types.h" class MapObjectUnkSTAT : public MapObject { @@ -14,8 +15,7 @@ public: /* 50 */ unk32 mUnk_50; /* 54 */ unk32 mUnk_54; /* 58 */ unk16 mUnk_58; - /* 5A */ volatile u16 mUnk_5A; - /* 5C */ u16 mUnk_5C; + /* 5A */ Timer mUnk_5A; /* 5E */ STRUCT_PAD(0x5E, 0x60); /* 60 */ unk32 mUnk_60; /* 64 */ unk32 mUnk_64; @@ -23,7 +23,7 @@ public: MapObjectUnkSTAT(); - /* 00 */ virtual bool vfunc_00() override; // Init + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; diff --git a/include/MapObject/MapObjectUnkSWHT.hpp b/include/MapObject/MapObjectUnkSWHT.hpp index 3b0e0009..4119aba4 100644 --- a/include/MapObject/MapObjectUnkSWHT.hpp +++ b/include/MapObject/MapObjectUnkSWHT.hpp @@ -31,7 +31,7 @@ public: MapObjectUnkSWHT(); - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; diff --git a/include/MapObject/MapObjectUnkSWSW.hpp b/include/MapObject/MapObjectUnkSWSW.hpp index f9b75a6d..d43c0626 100644 --- a/include/MapObject/MapObjectUnkSWSW.hpp +++ b/include/MapObject/MapObjectUnkSWSW.hpp @@ -3,6 +3,7 @@ #include "MapObject/MapObject.hpp" #include "MapObject/MapObjectProfile.hpp" #include "global.h" +#include "timer.hpp" #include "types.h" class ActorUnkNSSW; @@ -34,29 +35,19 @@ public: /* 0EC */ VecFx32 mUnk_0EC; /* 0F8 */ ActorUnkNSSW *mUnk_0F8; /* 0FC */ unk32 mUnk_0FC; - /* 100 */ volatile u16 mUnk_100; - /* 102 */ u16 mUnk_102; + /* 100 */ Timer mUnk_100; /* 104 */ u8 mUnk_104; /* 105 */ u8 mUnk_105; /* 106 */ STRUCT_PAD(0x106, 0x108); /* 108 */ fx32 mUnk_108; /* 10C */ unk16 mUnk_10C; - /* 10E */ volatile u16 mUnk_10E; - /* 110 */ u16 mUnk_110; + /* 10E */ Timer mUnk_10E; /* 114 */ ActorUnkNSSW *mUnk_114; /* 118 */ MapObjectUnkSWSW(); - bool IsInternalTimerOut() { - if (this->mUnk_100 < this->mUnk_102) { - ++this->mUnk_100; - return false; - } - return true; - } - - /* 00 */ virtual bool vfunc_00() override; + /* 00 */ virtual bool Init() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; diff --git a/include/MapObject/MapObject_10_Pot.hpp b/include/MapObject/MapObject_10_Pot.hpp index 7a6de908..760a1cc6 100644 --- a/include/MapObject/MapObject_10_Pot.hpp +++ b/include/MapObject/MapObject_10_Pot.hpp @@ -1,4 +1,5 @@ #pragma once + #include "MapObject.hpp" class MapObject_10_Pot_Base : public MapObject_10_Base { diff --git a/include/MapObject/MapObject_ov031.hpp b/include/MapObject/MapObject_ov031.hpp index 03736038..619d82fb 100644 --- a/include/MapObject/MapObject_ov031.hpp +++ b/include/MapObject/MapObject_ov031.hpp @@ -1,5 +1,7 @@ #pragma once +#include "MapObject/MapObject.hpp" + class MapObjectPot_Base : public MapObject { public: /* 00 (base) */ @@ -8,8 +10,7 @@ public: MapObjectPot_Base(); // data_ov000_020b35d0 - - /* 00 */ virtual bool vfunc_00(); // func_ov000_0209d780 + /* 00 */ virtual bool Init(); // func_ov000_0209d780 /* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2) override; // func_ov000_0209d8e8 /* 28 */ virtual unk32 vfunc_28(unk32 param1) override; // func_ov000_0209d9f8 /* 30 */ virtual ~MapObjectPot_Base() = 0 override; diff --git a/include/Player/PlayerActorBase.hpp b/include/Player/PlayerActorBase.hpp index 75684a81..fc84518d 100644 --- a/include/Player/PlayerActorBase.hpp +++ b/include/Player/PlayerActorBase.hpp @@ -520,10 +520,7 @@ public: /* 0C */ VecFx32 mPrevPos; /* 18 */ VecFx32 mVel; /* 24 */ VecFx32 mAccel; - /* 30 */ union { - u16 mAngle; - UnkAngleStruct mAngleStruct; - }; + /* 30 */ UnkAngleStruct mAngle; /* 32 */ u8 mInvincibilityTimer; /* 33 */ u8 mInvincibilityIconTimer; // the blinking icon on top-screen /* 34 */ ActorRef mGrabActor; diff --git a/include/Player/PlayerGet.hpp b/include/Player/PlayerGet.hpp index 340776be..0061745f 100644 --- a/include/Player/PlayerGet.hpp +++ b/include/Player/PlayerGet.hpp @@ -149,10 +149,7 @@ public: /* 064 */ UnkStruct_PlayerGet_64_2 mUnk_64; /* 068 */ unk32 mUnk_68; /* 06C */ unk32 mUnk_6C; // scale - /* 070 */ union { - unk16 mAngle; - UnkAngleStruct mUnkAngleStruct; - }; // angle/rotation + /* 070 */ UnkAngleStruct mAngle; /* 070 */ u8 mUnk_72; // probably bools /* 070 */ u8 mUnk_73; // probably bools /* 074 */ UnkStruct_PlayerGet_74 mUnk_74; diff --git a/include/Unknown/UnkStruct_ov000_020b34c4.hpp b/include/Unknown/UnkStruct_ov000_020b34c4.hpp index b66cda37..1007e500 100644 --- a/include/Unknown/UnkStruct_ov000_020b34c4.hpp +++ b/include/Unknown/UnkStruct_ov000_020b34c4.hpp @@ -1,6 +1,8 @@ #pragma once -#include "types.h" +#include "Map/MapObjectId.hpp" +#include "MapObject/MapObject.hpp" +#include "nitro/fx.h" class UnkStruct_ov000_020b34c4 { public: diff --git a/include/Unknown/UnkStruct_ov000_020b5d34.hpp b/include/Unknown/UnkStruct_ov000_020b5d34.hpp index 2f4056d8..d8b23435 100644 --- a/include/Unknown/UnkStruct_ov000_020b5d34.hpp +++ b/include/Unknown/UnkStruct_ov000_020b5d34.hpp @@ -1,6 +1,8 @@ #pragma once +#include "MapObject/MapObject.hpp" #include "global.h" +#include "nitro/fx.h" #include "types.h" class MapObject_20; @@ -41,4 +43,3 @@ template struct UnkStruct_ov000_020b5d34_Instance { }; #define data_ov000_020b5d34 UnkStruct_ov000_020b5d34_Instance::data_ov000_020b5d34 -extern UnkStruct_ov000_020b5d34 data_ov000_020b5d34; diff --git a/include/Unknown/UnkStruct_ov031_02114664.hpp b/include/Unknown/UnkStruct_ov031_02114664.hpp index 02e826a5..24cac575 100644 --- a/include/Unknown/UnkStruct_ov031_02114664.hpp +++ b/include/Unknown/UnkStruct_ov031_02114664.hpp @@ -8,7 +8,7 @@ public: UnkStruct_ov031_02114664(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C() override; + /* 18 */ virtual bool Init(unk32 param1) override; + /* 1C */ virtual void Setup() override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; }; diff --git a/include/Unknown/UnkStruct_ov031_02114870.hpp b/include/Unknown/UnkStruct_ov031_02114870.hpp index 8a26c771..69e438b3 100644 --- a/include/Unknown/UnkStruct_ov031_02114870.hpp +++ b/include/Unknown/UnkStruct_ov031_02114870.hpp @@ -10,7 +10,7 @@ public: UnkStruct_ov031_02114870(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 18 */ virtual bool Init(unk32 param1) override; /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 54 */ virtual G3d_Model *vfunc_54(); }; diff --git a/include/math.hpp b/include/math.hpp index 84c056f0..0685ba30 100644 --- a/include/math.hpp +++ b/include/math.hpp @@ -405,11 +405,32 @@ union Vec3s { struct UnkAngleStruct { union { - u16 angle; - s16 angle_signed; + u16 angle_u; + s16 angle_s; }; UnkAngleStruct() {} UnkAngleStruct(s16 angle) : - angle_signed(angle) {} + angle_s(angle) {} + + // clang-format off + UnkAngleStruct& operator+=(const u16 value) { this->angle_u += value; return *this; } + UnkAngleStruct& operator+=(const unsigned int value) { this->angle_u += value; return *this; } + UnkAngleStruct& operator+=(const s16 value) { this->angle_s += value; return *this; } + UnkAngleStruct& operator+=(const int value) { this->angle_s += value; return *this; } + UnkAngleStruct& operator++() { this->angle_s += 1; return *this; } + UnkAngleStruct& operator++(int) { this->angle_s += 1; return *this; } + + UnkAngleStruct& operator-=(const u16 value) { this->angle_u -= value; return *this; } + UnkAngleStruct& operator-=(const unsigned int value) { this->angle_u -= value; return *this; } + UnkAngleStruct& operator-=(const s16 value) { this->angle_s -= value; return *this; } + UnkAngleStruct& operator-=(const int value) { this->angle_s -= value; return *this; } + UnkAngleStruct& operator--() { this->angle_s -= 1; return *this; } + UnkAngleStruct& operator--(int) { this->angle_s -= 1; return *this; } + + UnkAngleStruct& operator=(const u16 value) { this->angle_u = value; return *this; } + UnkAngleStruct& operator=(const unsigned int value) { this->angle_u += value; return *this; } + UnkAngleStruct& operator=(const s16 value) { this->angle_s = value; return *this; } + UnkAngleStruct& operator=(const int value) { this->angle_s = value; return *this; } + // clang-format on }; diff --git a/include/timer.hpp b/include/timer.hpp new file mode 100644 index 00000000..df58d384 --- /dev/null +++ b/include/timer.hpp @@ -0,0 +1,83 @@ +#pragma once + +#include "nitro/types.h" + +struct Timer { + /* 00 */ volatile u16 value; + /* 02 */ u16 max; + /* 04 */ + + Timer() {} + + Timer(u16 value, u16 max) { + this->value = value; + this->max = max; + } + + // advances the value until it reached the max value + void Update() { + if (this->value < this->max) { + this->value++; + } + } + + // same as `Update()` except it returns true if the max value is reached + bool HasExpired() { + if (this->value < this->max) { + this->value++; + return false; + } + + return true; + } + + void Set(u16 value, u16 max) { + this->max = max; + this->value = value; + } + + void SetAlt(u16 value, u16 max) { + this->value = value; + this->max = max; + } + + void Init() { + this->Set(0, 0); + } + + void Reset() { + this->Set(0, -1); + } + + int GetRemainingTime() { + return this->max - this->value; + } + + bool HasReachedMax() { + return this->GetValue() >= this->max; + } + + bool HasReachedMaxU() { + u32 value = this->value; + return value >= this->max; + } + + int GetValue() { + return this->value; + } + + u32 GetValueU() { + return this->value; + } + + int GetMax() { + return this->max; + } + + bool Test(u16 value) { + u16 max = this->max; + u16 time = this->value; + + return !(time < max && max - time != value); + } +}; diff --git a/libs/nitro/include/nitro/math.h b/libs/nitro/include/nitro/math.h index 4c0e5228..b69e95f2 100644 --- a/libs/nitro/include/nitro/math.h +++ b/libs/nitro/include/nitro/math.h @@ -47,6 +47,7 @@ extern "C" { #define ABS2(x) ((x) >= 0 ? (x) : -(x)) #define CLAMP(x, min, max) ((x) > (max) ? (max) : (x) < (min) ? (min) : (x)) #define CLAMP2(x, min, max) ((x) > (max) ? (max) : (x) >= (min) ? (x) : (min)) +#define CLAMP3(x, min, max) ((x) >= (max) ? (max) : (x) <= (min) ? (min) : (x)) #define POW_2(x) (x * x) static inline const s32 ClampValue(s32 value, const s32 min, const s32 max) { diff --git a/src/000_Second/Actor/Actor.cpp b/src/000_Second/Actor/Actor.cpp index d4c4ff84..fdeba27b 100644 --- a/src/000_Second/Actor/Actor.cpp +++ b/src/000_Second/Actor/Actor.cpp @@ -4,18 +4,17 @@ #include Actor::Actor() { - this->mVel.x = 0; - this->mVel.y = 0; - this->mVel.z = 0; - this->mUnk_2C = 0xCD; - this->mUnk_38 = 0; - this->mUnk_3C = NULL; - this->mUnk_40 = 0; - this->mUnk_48 = 4; - this->mState = ActorState_None; - this->mTimer = 0; - this->mTimerMax = 0; - this->mUnk_54 = 0; + this->mVel.x = 0; + this->mVel.y = 0; + this->mVel.z = 0; + this->mUnk_2C = 0xCD; + this->mUnk_38 = 0; + this->mUnk_3C = NULL; + this->mUnk_40 = 0; + this->mUnk_48 = 4; + this->mState = ActorState_None; + this->mTimer.SetAlt(0, 0); + this->mUnk_54 = 0; this->ResetFlags(); this->mUnk_5C.mUnk_28 = 0; this->mUnk_5C.func_ov000_020975f8(); @@ -24,7 +23,7 @@ Actor::Actor() { MI_CpuCopyFast(&data_ov000_020b539c_eur.mUnk_00, &this->mUnk_5C, sizeof(ActorParams)); VecFx32_Copy(&this->mUnk_5C.mInitialPos, &this->mPos); VecFx32_Copy(&this->mUnk_5C.mInitialPos, &this->mPrevPos); - this->mAngle = this->mUnk_5C.mInitialAngle; + this->mAngle.angle_s = this->mUnk_5C.mInitialAngle; INIT_FLAGS(this->mFlags, ActorFlag_Alive, ActorFlag_Visible, ActorFlag_Active, ActorFlag_14); this->mUnk_44 = 0xFF; this->mUnk_46 = 0; @@ -46,13 +45,13 @@ void Actor::func_ov000_0209848c(ActorProfile *param1) { this->mYOffset = unk_1c; } -bool Actor::vfunc_18(unk32 param1) { +bool Actor::Init(unk32 param1) { return true; } -void Actor::vfunc_1C() {} +void Actor::Setup() {} -void Actor::vfunc_20() {} +void Actor::Update() {} void Actor::vfunc_24() {} @@ -67,7 +66,7 @@ unk32 Actor::vfunc_34() { } void Actor::func_ov000_020984d0() { - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); if (GET_FLAG(this->mFlags, ActorFlag_16)) { this->func_ov000_020984f0(); diff --git a/src/000_Second/Actor/ActorEventIcon.cpp b/src/000_Second/Actor/ActorEventIcon.cpp index f836359c..51ffa23a 100644 --- a/src/000_Second/Actor/ActorEventIcon.cpp +++ b/src/000_Second/Actor/ActorEventIcon.cpp @@ -14,7 +14,7 @@ ActorEventIcon::ActorEventIcon() { this->mUnk_10C = 0; } -bool ActorEventIcon::vfunc_18(unk32 param1) { +bool ActorEventIcon::Init(unk32 param1) { this->mUnk_094.func_ov000_0206082c(0x5D, this->mUnk_5C.mParams[0]); return true; } diff --git a/src/000_Second/Actor/ActorUnkEFIK.cpp b/src/000_Second/Actor/ActorUnkEFIK.cpp index c4cabea6..f77ee30c 100644 --- a/src/000_Second/Actor/ActorUnkEFIK.cpp +++ b/src/000_Second/Actor/ActorUnkEFIK.cpp @@ -23,7 +23,7 @@ ActorUnkEFIK::ActorUnkEFIK() : this->mUnk_A0 = 0; } -bool ActorUnkEFIK::vfunc_18(unk32 param1) { +bool ActorUnkEFIK::Init(unk32 param1) { this->mUnk_9C = 0x86F; this->mUnk_A0 = 4; this->mUnk_98.func_ov000_020a0334(); @@ -31,7 +31,7 @@ bool ActorUnkEFIK::vfunc_18(unk32 param1) { return true; } -void ActorUnkEFIK::vfunc_20() { +void ActorUnkEFIK::Update() { if (this->mUnk_94 != 0) { return; } @@ -81,7 +81,7 @@ void ActorUnkEFIK::vfunc_20() { } void ActorUnkEFIK::vfunc_24() { - this->vfunc_20(); + this->Update(); } void ActorUnkEFIK::vfunc_54(unk32 param1) { diff --git a/src/000_Second/Actor/ActorUnkSWOB.cpp b/src/000_Second/Actor/ActorUnkSWOB.cpp index e176e6a4..e69b26fb 100644 --- a/src/000_Second/Actor/ActorUnkSWOB.cpp +++ b/src/000_Second/Actor/ActorUnkSWOB.cpp @@ -20,7 +20,7 @@ ActorProfileUnkSWOB::ActorProfileUnkSWOB() : ActorUnkSWOB::ActorUnkSWOB() {} -bool ActorUnkSWOB::vfunc_18(unk32 param1) { +bool ActorUnkSWOB::Init(unk32 param1) { this->mUnk_9E = this->mUnk_5C.mUnk_1A[1]; this->mUnk_94 = this->mUnk_5C.mParams[1]; this->mUnk_98 = this->mUnk_5C.mParams[2]; @@ -49,13 +49,12 @@ void ActorUnkSWOB::SetState(ActorState state) { this->func_ov000_02098a88(0, 1); if (this->mUnk_94 == 0) { - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); } break; case ActorUnkSWOBState_2: this->func_ov000_0209aa30(); - this->mTimerMax = -1; - this->mTimer = 0; + this->mTimer.Reset(); break; default: break; diff --git a/src/000_Second/Actor/ActorUnkSWTM.cpp b/src/000_Second/Actor/ActorUnkSWTM.cpp index 921134d7..79b2e09f 100644 --- a/src/000_Second/Actor/ActorUnkSWTM.cpp +++ b/src/000_Second/Actor/ActorUnkSWTM.cpp @@ -29,7 +29,7 @@ ActorUnkSWTM::~ActorUnkSWTM() { } // https://decomp.me/scratch/qkP8m -bool ActorUnkSWTM::vfunc_18(unk32 param1) { +bool ActorUnkSWTM::Init(unk32 param1) { this->mUnk_9E = this->mUnk_5C.mUnk_1A[1]; this->mUnk_98 = this->mUnk_5C.mParams[2]; this->mUnk_A4 = this->mUnk_5C.mParams[1] * 30; @@ -46,7 +46,7 @@ bool ActorUnkSWTM::vfunc_18(unk32 param1) { return true; } -void ActorUnkSWTM::vfunc_20(void) { +void ActorUnkSWTM::Update(void) { switch (this->mState) { case ActorUnkSWTMState_0: if (!this->func_ov000_0209afe4()) { @@ -77,9 +77,9 @@ void ActorUnkSWTM::vfunc_20(void) { case ActorUnkSWTMState_2: break; case ActorUnkSWTMState_3: - this->IsTimerOut(); + this->mTimer.Update(); - if ((s32) this->mTimer >= 15) { + if (this->mTimer.GetValue() >= 15) { this->func_ov000_0209b184(); this->SetState(ActorUnkSWTMState_0); } @@ -107,13 +107,12 @@ void ActorUnkSWTM::SetState(ActorState state) { this->func_ov000_02098a88(0, 1); if (this->mUnk_94 == 0) { - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); } break; case ActorUnkSWTMState_3: this->func_ov000_0209b160(); - this->mTimer = 0; - this->mTimerMax = -1; + this->mTimer.Reset(); break; default: break; diff --git a/src/000_Second/Actor/Actor_Derived1.cpp b/src/000_Second/Actor/Actor_Derived1.cpp index 448d2129..0cac10e5 100644 --- a/src/000_Second/Actor/Actor_Derived1.cpp +++ b/src/000_Second/Actor/Actor_Derived1.cpp @@ -32,8 +32,7 @@ Actor_Derived1::Actor_Derived1(ModelRender *param1, Actor_Derived1_94_0C *param2 mUnk_0DE(0xEAAB), mUnk_0E0(0x1555), mUnk_0E4(NULL), - mUnk_0E8(0), - mUnk_0EA(0), + mUnk_0E8(0, 0), mUnk_104(this->mUnk_34->size), mUnk_114(-1), mUnk_118(0x1000), @@ -48,9 +47,9 @@ Actor_Derived1::Actor_Derived1(ModelRender *param1, Actor_Derived1_94_0C *param2 Actor_Derived1::~Actor_Derived1() {} -bool Actor_Derived1::vfunc_18(unk32 param1) { +bool Actor_Derived1::Init(unk32 param1) { if (this->mUnk_5C.mParams[2] == 0 && this->func_ov000_020a8dd0()) { - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); } if (this->mUnk_0B0 & 8) { @@ -64,7 +63,7 @@ bool Actor_Derived1::vfunc_18(unk32 param1) { void Actor_Derived1::vfunc_54(unk32 param1) {} -void Actor_Derived1::vfunc_1C() { +void Actor_Derived1::Setup() { this->func_ov031_020e3ca4(); } @@ -223,12 +222,12 @@ unk32 Actor_Derived1::vfunc_A8() { } void Actor_Derived1::func_ov000_020a9804(void *param1, unk32 param2) {} -void Actor_Derived1::vfunc_20() {} +void Actor_Derived1::Update() {} // non-matching void Actor_Derived1::vfunc_24() { if (!data_027e09b8->func_ov000_020732dc(3) || !(this->mUnk_0B0 & 4)) { - this->vfunc_20(); + this->Update(); } if (!(this->mUnk_0B0 & 0x200)) { diff --git a/src/000_Second/MapObject/MapObject.cpp b/src/000_Second/MapObject/MapObject.cpp index dd974212..e47428e5 100644 --- a/src/000_Second/MapObject/MapObject.cpp +++ b/src/000_Second/MapObject/MapObject.cpp @@ -36,7 +36,7 @@ MapObject::MapObject() { this->mPos.y = ptr->y; this->mPos.z = ptr->z; - this->mAngle = *ptr2->mUnk_0C; + this->mAngle.angle_s = *ptr2->mUnk_0C; MI_CpuCopyFast(ptr2->mUnk_04, &this->mUnk_20, sizeof(MapObject_20)); for (int i = 0; i < ARRAY_LEN(this->mUnk_18); i++) { @@ -48,11 +48,11 @@ MapObject::MapObject() { MapObject::~MapObject() {} -bool MapObject::vfunc_00() { +bool MapObject::Init() { return true; } -void MapObject::vfunc_04() {} +void MapObject::Setup() {} void MapObject::func_ov000_0209d0bc(Vec2bCpp *param1, MapObject *thisx) { VecFx32 pos; diff --git a/src/000_Second/MapObject/MapObjectManager_000.cpp b/src/000_Second/MapObject/MapObjectManager_000.cpp index 8d2e1e99..102b3f8c 100644 --- a/src/000_Second/MapObject/MapObjectManager_000.cpp +++ b/src/000_Second/MapObject/MapObjectManager_000.cpp @@ -36,7 +36,7 @@ MapObject *MapObjectManager::AllocateMapObject(MapObjectId mapObjId, Vec2b param MapObject *pMapObj = data_ov000_020b5d34.CreateMapObject(mapObjId); *ppTable = pMapObj; - if (pMapObj->vfunc_00()) { + if (pMapObj->Init()) { // init was successful, proceed and return the pointer // this seems to set map object table index in an array that uses tile pos to figure out which map obj it is diff --git a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp index dd0cdef2..e3f14768 100644 --- a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp +++ b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp @@ -33,7 +33,7 @@ MapObjectMiniBlocks::MapObjectMiniBlocks() { this->mUnk_40.mUnk_08 = 1; } -bool MapObjectMiniBlocks::vfunc_00(void) { +bool MapObjectMiniBlocks::Init(void) { GET_PROFILE(MapObjectProfileMiniBlocks) ->func_ov000_0209ccd8(this->mUnk_20.mParams[1], data_ov000_020af574[this->mUnk_20.mParams[1]]); UnkStruct_027e0cd8_0C_Base *pUnkStruct_027e0cd8_0C = data_027e0cd8->mUnk_0C; @@ -102,14 +102,14 @@ bool MapObjectMiniBlocks::vfunc_00(void) { break; } - func_01ff9638(&vec, -this->mAngle); + func_01ff9638(&vec, -this->mAngle.angle_s); VecFx32_Add(&this->mPos, &vec, &this->mPos); return true; } void MapObjectMiniBlocks::vfunc_14(unk32 param1) { Mat3p m; - u16 unk_14 = this->mAngle; + u16 unk_14 = this->mAngle.angle_s; Mat3p_InitYRotation(&m, SIN(unk_14), COS(unk_14)); this->mUnk_40.vfunc_14(&m, &this->mPos); } diff --git a/src/000_Second/MapObject/MapObjectPot_Base.cpp b/src/000_Second/MapObject/MapObjectPot_Base.cpp index 22da773e..88c73db1 100644 --- a/src/000_Second/MapObject/MapObjectPot_Base.cpp +++ b/src/000_Second/MapObject/MapObjectPot_Base.cpp @@ -12,7 +12,7 @@ MapObjectPot_Base::MapObjectPot_Base() { MapObjectPot_Base::~MapObjectPot_Base() {} -bool MapObjectPot_Base::vfunc_00() { +bool MapObjectPot_Base::Init() { this->SetState(MapObjPot_BaseState_0, 0x1); return true; } @@ -20,7 +20,7 @@ bool MapObjectPot_Base::vfunc_00() { // non-matching bool MapObjectPot_Base::SetState(MapObjState state, unk32 param2) { if (param2 == 0x0 && this->mState == MapObjPot_BaseState_1) { - return; + return true; } this->mState = state; switch (this->mState) { diff --git a/src/000_Second/MapObject/MapObjectSwitchStep.cpp b/src/000_Second/MapObject/MapObjectSwitchStep.cpp index 348b57fc..169ba701 100644 --- a/src/000_Second/MapObject/MapObjectSwitchStep.cpp +++ b/src/000_Second/MapObject/MapObjectSwitchStep.cpp @@ -81,9 +81,8 @@ void MapObjectSwitchStep_40::vfunc_1C(UnkSystem4_vfunc_1C *param1) { } MapObjectSwitchStep::MapObjectSwitchStep() : - mUnk_A4(&mUnk_C4, NULL) { - this->mUnk_E4 = 0; - this->mUnk_E6 = 0; + mUnk_A4(&mUnk_C4, NULL), + mUnk_E4(0, 0) { this->mUnk_E8 = 0; this->mUnk_EA = 0; this->mUnk_EB = 0; @@ -105,7 +104,7 @@ MapObjectSwitchStep::~MapObjectSwitchStep() { } } -bool MapObjectSwitchStep::vfunc_00(void) { +bool MapObjectSwitchStep::Init(void) { SET_FLAG(this->mFlags, MapObjFlag_9); this->mUnk_18[0] = 1; @@ -127,9 +126,8 @@ bool MapObjectSwitchStep::vfunc_00(void) { } void MapObjectSwitchStep::func_ov000_0209e11c(MapObjState state, unk32 param2) { - this->mState = state; - this->mUnk_E6 = -1; - this->mUnk_E4 = 0; + this->mState = state; + this->mUnk_E4.Reset(); this->mUnk_A4.func_01ffc3b4(); switch (this->mState) { @@ -161,8 +159,7 @@ void MapObjectSwitchStep::func_ov000_0209e11c(MapObjState state, unk32 param2) { } if (this->mUnk_20.mParams[0] == 2) { - this->mUnk_E6 = this->mUnk_20.mParams[1]; - this->mUnk_E4 = 0; + this->mUnk_E4.Set(0, this->mUnk_20.mParams[1]); } this->mUnk_A4.func_ov000_020577f8(0x1000); @@ -222,7 +219,7 @@ void MapObjectSwitchStep::vfunc_18(s8 *param1) { } void MapObjectSwitchStep::func_ov000_0209e38c(void) { - if (this->mUnk_E6 - this->mUnk_E4 < 0x3C) { + if (this->mUnk_E4.GetRemainingTime() < 60) { data_ov000_020b5214.func_ov000_0206e7e8(0x92); } else { data_ov000_020b5214.func_ov000_0206e7e8(0x91); diff --git a/src/001_SceneInit/Actor/ActorManager_001.cpp b/src/001_SceneInit/Actor/ActorManager_001.cpp index 191760f7..d63aaae0 100644 --- a/src/001_SceneInit/Actor/ActorManager_001.cpp +++ b/src/001_SceneInit/Actor/ActorManager_001.cpp @@ -71,7 +71,7 @@ void ActorManager::func_ov001_020bafdc() { if (pActor != NULL) { // alive and uninitialized? if (GET_FLAG(pActor->mFlags, ActorFlag_Alive) && !GET_FLAG(pActor->mFlags, ActorFlag_4)) { - pActor->vfunc_1C(); + pActor->Setup(); SET_FLAG(pActor->mFlags, ActorFlag_4); } } diff --git a/src/001_SceneInit/MapObject/MapObjectManager_001.cpp b/src/001_SceneInit/MapObject/MapObjectManager_001.cpp index 5188c7cf..9675eff1 100644 --- a/src/001_SceneInit/MapObject/MapObjectManager_001.cpp +++ b/src/001_SceneInit/MapObject/MapObjectManager_001.cpp @@ -43,7 +43,7 @@ void MapObjectManager::func_ov001_020bac9c() { if (pMapObj != NULL) { // alive and uninitialized? if (GET_FLAG(pMapObj->mFlags, MapObjFlag_Alive) && !GET_FLAG(pMapObj->mFlags, MapObjFlag_4)) { - pMapObj->vfunc_04(); + pMapObj->Setup(); SET_FLAG(pMapObj->mFlags, MapObjFlag_4); } } diff --git a/src/001_SceneInit/Player/PlayerLinkActor_001.cpp b/src/001_SceneInit/Player/PlayerLinkActor_001.cpp index 0520a6cc..1bfc9000 100644 --- a/src/001_SceneInit/Player/PlayerLinkActor_001.cpp +++ b/src/001_SceneInit/Player/PlayerLinkActor_001.cpp @@ -77,8 +77,7 @@ void PlayerLinkActor::func_ov001_020bcbd0(VecFx32 *pVec) { this->mUnk_90->mUnk_034.func_ov000_0208efd0(pVec); PlayerActorBase_70 *unk_70 = this->mUnk_70; - unk_70->func_ov001_020bbe18(0, this->mAngleStruct, this->mUnk_0A0->func_ov000_02093718(), - this->mUnk_0A0->func_ov000_0209378c()); + unk_70->func_ov001_020bbe18(0, this->mAngle, this->mUnk_0A0->func_ov000_02093718(), this->mUnk_0A0->func_ov000_0209378c()); bool uVar1 = false; if (this->mUnk_094 != NULL) { diff --git a/src/001_SceneInit/UnkStruct_ov020_020e8544_001.cpp b/src/001_SceneInit/UnkStruct_ov020_020e8544_001.cpp index 5a60d708..c0eee6b4 100644 --- a/src/001_SceneInit/UnkStruct_ov020_020e8544_001.cpp +++ b/src/001_SceneInit/UnkStruct_ov020_020e8544_001.cpp @@ -63,9 +63,9 @@ void func_ov001_020bfd54() { void GameModeBattle::func_ov001_020bfd84(unk32 param1) { switch (param1) { case 0: - DSProt_DetectEmulator(func_ov001_020bfcc0); - DSProt_DetectFlashcart(func_ov001_020bfcf0); - DSProt_DetectNotDummy(func_ov001_020bfd20); + DSProt_DetectEmulator((void *) func_ov001_020bfcc0); + DSProt_DetectFlashcart((void *) func_ov001_020bfcf0); + DSProt_DetectNotDummy((void *) func_ov001_020bfd20); func_ov001_020bfd54(); break; case 1: diff --git a/src/001_SceneInit/code_020bfeec.cpp b/src/001_SceneInit/code_020bfeec.cpp index b098f7cb..31319e3d 100644 --- a/src/001_SceneInit/code_020bfeec.cpp +++ b/src/001_SceneInit/code_020bfeec.cpp @@ -22,7 +22,7 @@ void func_ov001_020bff1c(void) { } void Actor_Derived1::func_ov001_020bff2c(void) { - this->Actor_Derived1::vfunc_1C(); + this->Actor_Derived1::Setup(); } void ActorUnkLBCK::func_ov001_020bff34() { diff --git a/src/017_CourseExec/Actor/Actor_017.cpp b/src/017_CourseExec/Actor/Actor_017.cpp index 3d7ab691..9d7f5099 100644 --- a/src/017_CourseExec/Actor/Actor_017.cpp +++ b/src/017_CourseExec/Actor/Actor_017.cpp @@ -309,7 +309,7 @@ void Actor::func_ov017_020bf4b0(unk32 param1) { } void Actor::func_ov017_020bf574(unk32 param1, unk32 param2) { - func_ov000_020a1330(param1, this->mRef, this->mPos, this->mAngleStruct, 8, param2); + func_ov000_020a1330(param1, this->mRef, this->mPos, this->mAngle, 8, param2); } void Actor::func_ov017_020bf5c4(VecFx32 *param1, unk32 param2, unk32 param3, unk32 param4, s16 param5) { @@ -323,8 +323,7 @@ void Actor::func_ov017_020bf5c4(VecFx32 *param1, unk32 param2, unk32 param3, unk void Actor::func_ov017_020bf634(const VecFx32 *param1, u16 param2, unk32 param3) { UNSET_FLAG(this->mFlags, ActorFlag_5); - this->mTimerMax = param2; - this->mTimer = 0; + this->mTimer.Set(0, param2); this->mVel.x = param1->x; this->mVel.z = param1->z; @@ -347,7 +346,7 @@ void Actor::func_ov017_020bf688() { this->mUnk_3C = NULL; - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { SET_FLAG(this->mFlags, ActorFlag_5); } } @@ -358,8 +357,7 @@ void Actor::func_ov017_020bf710(UnkStruct_ActorUnkCANS_224 *param1, const VecFx3 this->mUnk_54 = param1; func_ov000_02099870(param1, &this->mPos, param3); - this->mTimerMax = param1->mUnk_0A - param1->mUnk_08; - this->mTimer = 0; + this->mTimer.Set(0, param1->mUnk_08.GetRemainingTime()); this->mVel.x = param2->x; this->mVel.z = param2->z; @@ -378,7 +376,7 @@ void Actor::func_ov017_020bf7a8() { this->func_ov000_02098838(); UnkStruct_ActorUnkCANS_224 *temp_r4 = this->mUnk_54; - temp_r4->UpdateTimer(); + temp_r4->mUnk_08.Update(); func_01ff93c0(&this->mVel, 0xC7B); @@ -387,11 +385,11 @@ void Actor::func_ov017_020bf7a8() { this->mVel.z /= 2; } - if (this->mTimer < temp_r4->mUnk_0E) { + if (this->mTimer.value < temp_r4->mUnk_0E) { this->mUnk_3C = NULL; } - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { temp_r4->Destroy(); SET_FLAG(this->mFlags, ActorFlag_5); } @@ -428,8 +426,7 @@ void Actor::vfunc_44() { void Actor::func_ov017_020bf99c() { UNSET_FLAG(this->mFlags, ActorFlag_5); VecFx32_Reset(&this->mVel); - this->mTimerMax = 1; - this->mTimer = 0; + this->mTimer.Set(0, 1); } void Actor::func_ov017_020bf9c8(Actor *param1) { @@ -439,16 +436,16 @@ void Actor::func_ov017_020bf9c8(Actor *param1) { return; } - u16 timerMax = this->mTimerMax; - u16 timer = this->mTimer; + u16 timerMax = this->mTimer.max; + u16 time = this->mTimer.value; - if (timer >= timerMax) { + if (time >= timerMax) { SET_FLAG(this->mFlags, ActorFlag_5); return; } - if (timer < timerMax) { - this->mTimer++; + if (time < timerMax) { + this->mTimer.value++; } func_01ffb714(data_027e0ce0->func_01fff148(0), &this->mPos, &this->mVel); @@ -458,8 +455,7 @@ void Actor::func_ov017_020bf9c8(Actor *param1) { void Actor::func_ov017_020bfa50(VecFx32 *param1, unk32 param2) { UNSET_FLAG(this->mFlags, ActorFlag_5); - this->mTimerMax = param2; - this->mTimer = 0; + this->mTimer.Set(0, param2); VecFx32 sp0; func_01ffb714(param1, &this->mPos, &sp0); @@ -476,7 +472,7 @@ void Actor::func_ov017_020bfa50(VecFx32 *param1, unk32 param2) { void Actor::func_ov017_020bfad4() { this->mVel.y -= this->mUnk_2C; - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { SET_FLAG(this->mFlags, ActorFlag_5); } } diff --git a/src/017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp b/src/017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp index 952a3118..28651de5 100644 --- a/src/017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp +++ b/src/017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp @@ -26,11 +26,11 @@ void MapObjectSwitchStep::vfunc_08() { if (this->mUnk_20.mParams[0] != 0) { if (this->mUnk_20.mParams[0] == 2) { if (!this->func_ov000_0209d29c(1)) { - if (this->mUnk_EA == 0 && (this->mUnk_E4 >= this->mUnk_E6 || !this->func_ov000_0209d29c(0))) { + if (this->mUnk_EA == 0 && (this->mUnk_E4.HasReachedMaxU() || !this->func_ov000_0209d29c(0))) { this->func_ov000_0209e11c(0, 0); sp0 = this->mUnk_40.mUnk_60; } else { - if (this->mUnk_EA != 0 && (this->mUnk_E4 >= this->mUnk_E6 || !this->func_ov000_0209d29c(0))) { + if (this->mUnk_EA != 0 && (this->mUnk_E4.HasReachedMaxU() || !this->func_ov000_0209d29c(0))) { this->func_ov000_0209e11c(3, 0); } else { this->func_ov000_0209e38c(); @@ -55,10 +55,7 @@ void MapObjectSwitchStep::vfunc_08() { this->mUnk_40.mUnk_60 = sp0; this->mUnk_EA = 0; - - if (this->mUnk_E4 < this->mUnk_E6) { - this->mUnk_E4++; - } + this->mUnk_E4.Update(); } void MapObjectSwitchStep::vfunc_14(unk32 param1) { diff --git a/src/017_CourseExec/Player/PlayerLinkActor_017.cpp b/src/017_CourseExec/Player/PlayerLinkActor_017.cpp index 107266b3..f5313539 100644 --- a/src/017_CourseExec/Player/PlayerLinkActor_017.cpp +++ b/src/017_CourseExec/Player/PlayerLinkActor_017.cpp @@ -145,7 +145,7 @@ void PlayerLinkActor::func_ov017_020bd788(bool param1) { this->func_ov017_020bd758(); PlayerActorBase_70 *temp_r5_3 = this->mUnk_70; - temp_r5_3->func_ov000_020830d4(this->mAngleStruct, this->mUnk_0A0->func_ov000_02093718(), + temp_r5_3->func_ov000_020830d4(this->mAngle, this->mUnk_0A0->func_ov000_02093718(), this->mUnk_0A0->func_ov000_0209378c(), this->mUnk_0A0->mUnk_28); this->mUnk_0B0 = data_0204a088->mUnk_04; @@ -212,8 +212,8 @@ void PlayerLinkActor::func_ov017_020bd788(bool param1) { this->func_ov017_020bd758(); PlayerActorBase_70 *temp_r5_4 = this->mUnk_70; - temp_r5_4->func_ov000_020830d4(this->mAngleStruct, this->mUnk_0A0->func_ov000_02093718(), - this->mUnk_0A0->func_ov000_0209378c(), this->mUnk_0A0->mUnk_28); + temp_r5_4->func_ov000_020830d4(this->mAngle, this->mUnk_0A0->func_ov000_02093718(), this->mUnk_0A0->func_ov000_0209378c(), + this->mUnk_0A0->mUnk_28); this->mUnk_0A0->func_ov000_02092e38(); this->mUnk_0B0 = data_0204a088->mUnk_04; @@ -254,10 +254,10 @@ void PlayerLinkActor::func_ov017_020bdd84(void *param1, unk32 param2) { if (var_r5) { if (param2 != 0) { if (this->mUnk_74 != 0) { - this->mUnk_70->func_ov017_020bbef4(&this->mPos, this->mAngleStruct); + this->mUnk_70->func_ov017_020bbef4(&this->mPos, this->mAngle); } } else { - this->mUnk_70->func_ov017_020bbcd8(&this->mPos, this->mAngleStruct); + this->mUnk_70->func_ov017_020bbcd8(&this->mPos, this->mAngle); } if (param1 == NULL && data_0204a110.func_02019514() == 0) { @@ -283,7 +283,7 @@ void PlayerLinkActor::func_ov017_020bdd84(void *param1, unk32 param2) { spC = 0; temp_r1_2 = func_ov000_020864f8(&this->mUnk_09C->mUnk_0DC, this->mUnk_09C->mUnk_5A, &sp8, &spC); - this->mUnk_74->func_ov102_02182c84(temp_r1_2, spC, this->mAngleStruct, &temp_r4[0], &temp_r4[1]); + this->mUnk_74->func_ov102_02182c84(temp_r1_2, spC, this->mAngle, &temp_r4[0], &temp_r4[1]); } } } diff --git a/src/019_MainSelect/019_SaveManager.cpp b/src/019_MainSelect/019_SaveManager.cpp index e84ef927..daad064d 100644 --- a/src/019_MainSelect/019_SaveManager.cpp +++ b/src/019_MainSelect/019_SaveManager.cpp @@ -59,7 +59,7 @@ bool SaveManager::func_ov019_020d0964() { data_02049b80.func_02013ee8(0, 1); if (this->mUnk_20A == 0) { - this->func_ov019_020d08fc(1, SaveFile::func_ov019_020d17e0); + this->func_ov019_020d08fc(1, &SaveFile::func_ov019_020d17e0); return true; } @@ -68,12 +68,12 @@ bool SaveManager::func_ov019_020d0964() { void SaveManager::func_ov019_020d09dc(u16 saveSlotIndex) { this->mpSaveFile->mSaveSlotIndex = saveSlotIndex; - this->func_ov019_020d08fc(2, SaveFile::func_ov019_020d1434); + this->func_ov019_020d08fc(2, &SaveFile::func_ov019_020d1434); } void SaveManager::func_ov019_020d0a04(u16 saveSlotIndex) { this->mpSaveFile->mSaveSlotIndex = saveSlotIndex; - this->func_ov019_020d08fc(2, SaveFile::func_ov019_020d1538); + this->func_ov019_020d08fc(2, &SaveFile::func_ov019_020d1538); } void SaveManager::func_ov019_020d0a2c(u16 saveSlotIndex) { diff --git a/src/019_MainSelect/019_UnkSystem1_ov019_Derived1.cpp b/src/019_MainSelect/019_UnkSystem1_ov019_Derived1.cpp index 36d941b4..3a194be5 100644 --- a/src/019_MainSelect/019_UnkSystem1_ov019_Derived1.cpp +++ b/src/019_MainSelect/019_UnkSystem1_ov019_Derived1.cpp @@ -26,17 +26,17 @@ unk32 UnkSystem1_ov019_Derived1::vfunc_1C(u32 param1, unk32 param2, unk32 param3 case 0x1E: switch (param1) { case 0: - gSaveManager.func_ov019_020d08fc(2, SaveFile::func_ov019_020d0d50); + gSaveManager.func_ov019_020d08fc(2, &SaveFile::func_ov019_020d0d50); gSaveManager.mUnk_20A = 0; break; case 1: - gSaveManager.func_ov019_020d08fc(2, SaveFile::func_ov019_020d0ea8); + gSaveManager.func_ov019_020d08fc(2, &SaveFile::func_ov019_020d0ea8); break; case 2: - gSaveManager.func_ov019_020d08fc(2, SaveFile::func_ov019_020d1108); + gSaveManager.func_ov019_020d08fc(2, &SaveFile::func_ov019_020d1108); break; case 3: - gSaveManager.func_ov019_020d08fc(2, SaveFile::func_ov019_020d127c); + gSaveManager.func_ov019_020d08fc(2, &SaveFile::func_ov019_020d127c); break; default: break; diff --git a/src/019_MainSelect/FileSelectMain.cpp b/src/019_MainSelect/FileSelectMain.cpp index f09f6b05..a833e988 100644 --- a/src/019_MainSelect/FileSelectMain.cpp +++ b/src/019_MainSelect/FileSelectMain.cpp @@ -41,81 +41,81 @@ UnkStruct_ov019_020d1e4c UnkStruct_ov019_020d1e70::data_ov019_020d1e4c = { }; static PTMF data_ov019_020d1f94[FileSelectState_Max] = { - FileSelectMain::func_ov019_020c8290, // FileSelectState_Unk_00 - FileSelectMain::func_ov019_020c82c4, // FileSelectState_Init - FileSelectMain::func_ov019_020c8454, // FileSelectState_SlotSelectIdle - FileSelectMain::func_ov019_020c8aac, // FileSelectState_SlotSelectToFileManager - FileSelectMain::func_ov019_020c8ad8, // FileSelectState_FileManagerFromSlotSelect - FileSelectMain::func_ov019_020c8b10, // FileSelectState_FileManagerToSlotSelect - FileSelectMain::func_ov019_020c8b48, // FileSelectState_SlotSelectFromFileManager - FileSelectMain::func_ov019_020c8b74, // FileSelectState_FileManagerIdle - FileSelectMain::func_ov019_020c9b28, // FileSelectState_FileManagerToChooseMode - FileSelectMain::func_ov019_020c9b70, // FileSelectState_ChooseModeFromFileManager - FileSelectMain::func_ov019_020c9bcc, // FileSelectState_ChooseModeToFileManager - FileSelectMain::func_ov019_020c9c18, // FileSelectState_FileManagerFromChooseMode - FileSelectMain::func_ov019_020c9c70, // FileSelectState_ChooseModeIdle - FileSelectMain::func_ov019_020c9d88, // FileSelectState_ChooseModeToEnterGameMode - FileSelectMain::func_ov019_020c9e08, // FileSelectState_EnterGameMode - FileSelectMain::func_ov019_020ca80c, // FileSelectState_SlotSelectToNewFile - FileSelectMain::func_ov019_020ca844, // FileSelectState_NewFileToSlotSelect - FileSelectMain::func_ov019_020ca87c, // FileSelectState_FileManagerToCopyErase - FileSelectMain::func_ov019_020ca8b4, // FileSelectState_CopyEraseFromFileManager - FileSelectMain::func_ov019_020cb180, // FileSelectState_ChooseModeToContactMode - FileSelectMain::func_ov019_020cb1dc, // FileSelectState_OptionsToChooseMode - FileSelectMain::func_ov019_020c80f4, // FileSelectState_NewFileFromSlotSelect - FileSelectMain::func_ov019_020c80f4, // FileSelectState_OptionsFromChooseMode + &FileSelectMain::func_ov019_020c8290, // FileSelectState_Unk_00 + &FileSelectMain::func_ov019_020c82c4, // FileSelectState_Init + &FileSelectMain::func_ov019_020c8454, // FileSelectState_SlotSelectIdle + &FileSelectMain::func_ov019_020c8aac, // FileSelectState_SlotSelectToFileManager + &FileSelectMain::func_ov019_020c8ad8, // FileSelectState_FileManagerFromSlotSelect + &FileSelectMain::func_ov019_020c8b10, // FileSelectState_FileManagerToSlotSelect + &FileSelectMain::func_ov019_020c8b48, // FileSelectState_SlotSelectFromFileManager + &FileSelectMain::func_ov019_020c8b74, // FileSelectState_FileManagerIdle + &FileSelectMain::func_ov019_020c9b28, // FileSelectState_FileManagerToChooseMode + &FileSelectMain::func_ov019_020c9b70, // FileSelectState_ChooseModeFromFileManager + &FileSelectMain::func_ov019_020c9bcc, // FileSelectState_ChooseModeToFileManager + &FileSelectMain::func_ov019_020c9c18, // FileSelectState_FileManagerFromChooseMode + &FileSelectMain::func_ov019_020c9c70, // FileSelectState_ChooseModeIdle + &FileSelectMain::func_ov019_020c9d88, // FileSelectState_ChooseModeToEnterGameMode + &FileSelectMain::func_ov019_020c9e08, // FileSelectState_EnterGameMode + &FileSelectMain::func_ov019_020ca80c, // FileSelectState_SlotSelectToNewFile + &FileSelectMain::func_ov019_020ca844, // FileSelectState_NewFileToSlotSelect + &FileSelectMain::func_ov019_020ca87c, // FileSelectState_FileManagerToCopyErase + &FileSelectMain::func_ov019_020ca8b4, // FileSelectState_CopyEraseFromFileManager + &FileSelectMain::func_ov019_020cb180, // FileSelectState_ChooseModeToContactMode + &FileSelectMain::func_ov019_020cb1dc, // FileSelectState_OptionsToChooseMode + &FileSelectMain::func_ov019_020c80f4, // FileSelectState_NewFileFromSlotSelect + &FileSelectMain::func_ov019_020c80f4, // FileSelectState_OptionsFromChooseMode }; static PTMF data_ov019_020d204c[FileSelectState_Max] = { - FileSelectMain::func_ov019_020cb26c, // FileSelectState_Unk_00 - FileSelectMain::func_ov019_020cb4bc, // FileSelectState_Init - FileSelectMain::func_ov019_020cb4c8, // FileSelectState_SlotSelectIdle - FileSelectMain::func_ov019_020cb4d4, // FileSelectState_SlotSelectToFileManager - FileSelectMain::func_ov019_020cb4e0, // FileSelectState_FileManagerFromSlotSelect - FileSelectMain::func_ov019_020cb4ec, // FileSelectState_FileManagerToSlotSelect - FileSelectMain::func_ov019_020cb4f8, // FileSelectState_SlotSelectFromFileManager - FileSelectMain::func_ov019_020cb504, // FileSelectState_FileManagerIdle - FileSelectMain::func_ov019_020cb510, // FileSelectState_FileManagerToChooseMode - FileSelectMain::func_ov019_020cb51c, // FileSelectState_ChooseModeFromFileManager - FileSelectMain::func_ov019_020cb528, // FileSelectState_ChooseModeToFileManager - FileSelectMain::func_ov019_020cb534, // FileSelectState_FileManagerFromChooseMode - FileSelectMain::func_ov019_020cb540, // FileSelectState_ChooseModeIdle - FileSelectMain::func_ov019_020cb54c, // FileSelectState_ChooseModeToEnterGameMode - FileSelectMain::func_ov019_020cb558, // FileSelectState_EnterGameMode - FileSelectMain::func_ov019_020cb564, // FileSelectState_SlotSelectToNewFile - FileSelectMain::func_ov019_020cb570, // FileSelectState_NewFileToSlotSelect - FileSelectMain::func_ov019_020cb57c, // FileSelectState_FileManagerToCopyErase - FileSelectMain::func_ov019_020cb588, // FileSelectState_CopyEraseFromFileManager - FileSelectMain::func_ov019_020cb5b0, // FileSelectState_ChooseModeToContactMode - FileSelectMain::func_ov019_020cb5bc, // FileSelectState_OptionsToChooseMode - FileSelectMain::func_ov019_020cb268, // FileSelectState_NewFileFromSlotSelect - FileSelectMain::func_ov019_020cb268, // FileSelectState_OptionsFromChooseMode + &FileSelectMain::func_ov019_020cb26c, // FileSelectState_Unk_00 + &FileSelectMain::func_ov019_020cb4bc, // FileSelectState_Init + &FileSelectMain::func_ov019_020cb4c8, // FileSelectState_SlotSelectIdle + &FileSelectMain::func_ov019_020cb4d4, // FileSelectState_SlotSelectToFileManager + &FileSelectMain::func_ov019_020cb4e0, // FileSelectState_FileManagerFromSlotSelect + &FileSelectMain::func_ov019_020cb4ec, // FileSelectState_FileManagerToSlotSelect + &FileSelectMain::func_ov019_020cb4f8, // FileSelectState_SlotSelectFromFileManager + &FileSelectMain::func_ov019_020cb504, // FileSelectState_FileManagerIdle + &FileSelectMain::func_ov019_020cb510, // FileSelectState_FileManagerToChooseMode + &FileSelectMain::func_ov019_020cb51c, // FileSelectState_ChooseModeFromFileManager + &FileSelectMain::func_ov019_020cb528, // FileSelectState_ChooseModeToFileManager + &FileSelectMain::func_ov019_020cb534, // FileSelectState_FileManagerFromChooseMode + &FileSelectMain::func_ov019_020cb540, // FileSelectState_ChooseModeIdle + &FileSelectMain::func_ov019_020cb54c, // FileSelectState_ChooseModeToEnterGameMode + &FileSelectMain::func_ov019_020cb558, // FileSelectState_EnterGameMode + &FileSelectMain::func_ov019_020cb564, // FileSelectState_SlotSelectToNewFile + &FileSelectMain::func_ov019_020cb570, // FileSelectState_NewFileToSlotSelect + &FileSelectMain::func_ov019_020cb57c, // FileSelectState_FileManagerToCopyErase + &FileSelectMain::func_ov019_020cb588, // FileSelectState_CopyEraseFromFileManager + &FileSelectMain::func_ov019_020cb5b0, // FileSelectState_ChooseModeToContactMode + &FileSelectMain::func_ov019_020cb5bc, // FileSelectState_OptionsToChooseMode + &FileSelectMain::func_ov019_020cb268, // FileSelectState_NewFileFromSlotSelect + &FileSelectMain::func_ov019_020cb268, // FileSelectState_OptionsFromChooseMode }; static PTMF data_ov019_020d1edc[FileSelectState_Max] = { - FileSelectMain::func_ov019_020c6d0c, // FileSelectState_Unk_00 - FileSelectMain::func_ov019_020c6d48, // FileSelectState_Init - FileSelectMain::func_ov019_020c6e14, // FileSelectState_SlotSelectIdle - FileSelectMain::func_ov019_020c717c, // FileSelectState_SlotSelectToFileManager - FileSelectMain::func_ov019_020c71f0, // FileSelectState_FileManagerFromSlotSelect - FileSelectMain::func_ov019_020c7210, // FileSelectState_FileManagerToSlotSelect - FileSelectMain::func_ov019_020c71d0, // FileSelectState_SlotSelectFromFileManager - FileSelectMain::func_ov019_020c7274, // FileSelectState_FileManagerIdle - FileSelectMain::func_ov019_020c7768, // FileSelectState_FileManagerToChooseMode - FileSelectMain::func_ov019_020c77b8, // FileSelectState_ChooseModeFromFileManager - FileSelectMain::func_ov019_020c7804, // FileSelectState_ChooseModeToFileManager - FileSelectMain::func_ov019_020c7858, // FileSelectState_FileManagerFromChooseMode - FileSelectMain::func_ov019_020c7878, // FileSelectState_ChooseModeIdle - FileSelectMain::func_ov019_020c78ac, // FileSelectState_ChooseModeToEnterGameMode - FileSelectMain::func_ov019_020c7910, // FileSelectState_EnterGameMode - FileSelectMain::func_ov019_020c7c3c, // FileSelectState_SlotSelectToNewFile - FileSelectMain::func_ov019_020c7c48, // FileSelectState_NewFileToSlotSelect - FileSelectMain::func_ov019_020c7c70, // FileSelectState_FileManagerToCopyErase - FileSelectMain::func_ov019_020c7d3c, // FileSelectState_CopyEraseFromFileManager - FileSelectMain::func_ov019_020c80dc, // FileSelectState_ChooseModeToContactMode - FileSelectMain::func_ov019_020c80e8, // FileSelectState_OptionsToChooseMode - FileSelectMain::func_ov019_020c6d08, // FileSelectState_NewFileFromSlotSelect - FileSelectMain::func_ov019_020c6d08, // FileSelectState_OptionsFromChooseMode + &FileSelectMain::func_ov019_020c6d0c, // FileSelectState_Unk_00 + &FileSelectMain::func_ov019_020c6d48, // FileSelectState_Init + &FileSelectMain::func_ov019_020c6e14, // FileSelectState_SlotSelectIdle + &FileSelectMain::func_ov019_020c717c, // FileSelectState_SlotSelectToFileManager + &FileSelectMain::func_ov019_020c71f0, // FileSelectState_FileManagerFromSlotSelect + &FileSelectMain::func_ov019_020c7210, // FileSelectState_FileManagerToSlotSelect + &FileSelectMain::func_ov019_020c71d0, // FileSelectState_SlotSelectFromFileManager + &FileSelectMain::func_ov019_020c7274, // FileSelectState_FileManagerIdle + &FileSelectMain::func_ov019_020c7768, // FileSelectState_FileManagerToChooseMode + &FileSelectMain::func_ov019_020c77b8, // FileSelectState_ChooseModeFromFileManager + &FileSelectMain::func_ov019_020c7804, // FileSelectState_ChooseModeToFileManager + &FileSelectMain::func_ov019_020c7858, // FileSelectState_FileManagerFromChooseMode + &FileSelectMain::func_ov019_020c7878, // FileSelectState_ChooseModeIdle + &FileSelectMain::func_ov019_020c78ac, // FileSelectState_ChooseModeToEnterGameMode + &FileSelectMain::func_ov019_020c7910, // FileSelectState_EnterGameMode + &FileSelectMain::func_ov019_020c7c3c, // FileSelectState_SlotSelectToNewFile + &FileSelectMain::func_ov019_020c7c48, // FileSelectState_NewFileToSlotSelect + &FileSelectMain::func_ov019_020c7c70, // FileSelectState_FileManagerToCopyErase + &FileSelectMain::func_ov019_020c7d3c, // FileSelectState_CopyEraseFromFileManager + &FileSelectMain::func_ov019_020c80dc, // FileSelectState_ChooseModeToContactMode + &FileSelectMain::func_ov019_020c80e8, // FileSelectState_OptionsToChooseMode + &FileSelectMain::func_ov019_020c6d08, // FileSelectState_NewFileFromSlotSelect + &FileSelectMain::func_ov019_020c6d08, // FileSelectState_OptionsFromChooseMode }; const unk32 data_ov019_020d1bbc[] = {0x00000000, 0x00000000, 0x00000000, 0x00000001}; diff --git a/src/019_MainSelect/FileSelectManager.cpp b/src/019_MainSelect/FileSelectManager.cpp index 02c61235..6c03717c 100644 --- a/src/019_MainSelect/FileSelectManager.cpp +++ b/src/019_MainSelect/FileSelectManager.cpp @@ -74,7 +74,7 @@ void FileSelectManager::func_ov019_020c503c() { data_ov003_020ba740->func_ov003_020b69d8(2); data_ov000_020b5214.func_ov000_0206db44(0x13); break; - case BTN_ID_FILE_SELECT_NEW_FILE_CONFIRM: + case BTN_ID_FILE_SELECT_NEW_FILE_CONFIRM: { data_ov003_020ba740->func_ov003_020b69d8(3); UnkStruct_ov019_020d1d80 *uVar2 = (UnkStruct_ov019_020d1d80 *) &data_ov019_020d1db4; @@ -84,6 +84,7 @@ void FileSelectManager::func_ov019_020c503c() { ((UnkStruct *) data_ov000_020b504c.func_ov000_02067bb4(0))->mUnk_3AC = 1; data_ov000_020b5214.func_ov000_0206db44(0x12); break; + } default: break; } diff --git a/src/019_MainSelect/FileSelectMicTest.cpp b/src/019_MainSelect/FileSelectMicTest.cpp index ac53ddc3..3f16f2a9 100644 --- a/src/019_MainSelect/FileSelectMicTest.cpp +++ b/src/019_MainSelect/FileSelectMicTest.cpp @@ -34,10 +34,10 @@ public: static const UnkStruct_ov019_020d2248 data_ov019_020d2248(0, 0x32, 0x100, 0); static PTMF data_ov019_020d225c[FSMicTestState_Max] = { - FileSelectMicTest::func_ov019_020cea70, - FileSelectMicTest::func_ov019_020ceaac, - FileSelectMicTest::func_ov019_020cebcc, - FileSelectMicTest::func_ov019_020cea6c, + &FileSelectMicTest::func_ov019_020cea70, + &FileSelectMicTest::func_ov019_020ceaac, + &FileSelectMicTest::func_ov019_020cebcc, + &FileSelectMicTest::func_ov019_020cea6c, }; OptionsManagerAssessor::OptionsManagerAssessor() { diff --git a/src/019_MainSelect/FileSelectOptions.cpp b/src/019_MainSelect/FileSelectOptions.cpp index 59a89444..7852b5c5 100644 --- a/src/019_MainSelect/FileSelectOptions.cpp +++ b/src/019_MainSelect/FileSelectOptions.cpp @@ -74,23 +74,23 @@ UnkStruct_ov019_020d215c UnkStruct_ov019_020d2170::data_ov019_020d215c = { static const UnkStruct_ov019_020d2170 data_ov019_020d2170; static PTMF data_ov019_020d21c0[FSOptionsState_Max] = { - FileSelectOptions::func_ov019_020cce04, // FSOptionsState_Idle - FileSelectOptions::func_ov019_020cce30, // FSOptionsState_OptionsFromChooseMode - FileSelectOptions::func_ov019_020cd16c, // FSOptionsState_OptionsToChooseMode - FileSelectOptions::func_ov019_020cd41c, // FSOptionsState_OptionsToMicTest - FileSelectOptions::func_ov019_020cd5f8, // FSOptionsState_MicTestIdle - FileSelectOptions::func_ov019_020cd614, // FSOptionsState_OptionsFromMicTest - FileSelectOptions::func_ov019_020cd788, // FSOptionsState_SaveSettings + &FileSelectOptions::func_ov019_020cce04, // FSOptionsState_Idle + &FileSelectOptions::func_ov019_020cce30, // FSOptionsState_OptionsFromChooseMode + &FileSelectOptions::func_ov019_020cd16c, // FSOptionsState_OptionsToChooseMode + &FileSelectOptions::func_ov019_020cd41c, // FSOptionsState_OptionsToMicTest + &FileSelectOptions::func_ov019_020cd5f8, // FSOptionsState_MicTestIdle + &FileSelectOptions::func_ov019_020cd614, // FSOptionsState_OptionsFromMicTest + &FileSelectOptions::func_ov019_020cd788, // FSOptionsState_SaveSettings }; static PTMF data_ov019_020d2188[FSOptionsState_Max] = { - FileSelectOptions::func_ov019_020cd7f8, // FSOptionsState_Idle - FileSelectOptions::func_ov019_020cdc0c, // FSOptionsState_OptionsFromChooseMode - FileSelectOptions::func_ov019_020cdc38, // FSOptionsState_OptionsToChooseMode - FileSelectOptions::func_ov019_020cdc60, // FSOptionsState_OptionsToMicTest - FileSelectOptions::func_ov019_020cdc5c, // FSOptionsState_MicTestIdle - FileSelectOptions::func_ov019_020cdc8c, // FSOptionsState_OptionsFromMicTest - FileSelectOptions::func_ov019_020cdcb8, // FSOptionsState_SaveSettings + &FileSelectOptions::func_ov019_020cd7f8, // FSOptionsState_Idle + &FileSelectOptions::func_ov019_020cdc0c, // FSOptionsState_OptionsFromChooseMode + &FileSelectOptions::func_ov019_020cdc38, // FSOptionsState_OptionsToChooseMode + &FileSelectOptions::func_ov019_020cdc60, // FSOptionsState_OptionsToMicTest + &FileSelectOptions::func_ov019_020cdc5c, // FSOptionsState_MicTestIdle + &FileSelectOptions::func_ov019_020cdc8c, // FSOptionsState_OptionsFromMicTest + &FileSelectOptions::func_ov019_020cdcb8, // FSOptionsState_SaveSettings }; GameModeManagerBase_104 *FileSelectOptionsManager::Create(void *param1, s32 saveSlotIndex) { @@ -123,20 +123,22 @@ void FileSelectOptionsManager::vfunc_08(Input *pButtons, TouchControl *pTouchCon this->mUnk_20 = 0; switch (this->mUnk_1C) { - case 0: + case 0: { FileSelectOptions *pFVar4 = this->mpOptions; this->mUnk_24->Append(pFVar4); pFVar4->vfunc_18(); this->mpOptions->func_ov019_020cde9c(); this->mpMicTest->Detach(); break; - case 1: + } + case 1: { FileSelectMicTest *pFVar5 = this->mpMicTest; this->mUnk_24->Append(pFVar5); pFVar5->vfunc_18(); this->mpMicTest->func_ov019_020cefe4(); this->mpOptions->Detach(); break; + } case 2: this->mpOptions->func_ov019_020ccdf4(); break; diff --git a/src/024_MainGame/Actor/ActorUnkOBPC.cpp b/src/024_MainGame/Actor/ActorUnkOBPC.cpp index e236e4cf..8786b73e 100644 --- a/src/024_MainGame/Actor/ActorUnkOBPC.cpp +++ b/src/024_MainGame/Actor/ActorUnkOBPC.cpp @@ -21,7 +21,7 @@ ActorUnkOBPC::ActorUnkOBPC() : mUnk_98(0), mUnk_9C(0) {} -bool ActorUnkOBPC::vfunc_18(unk32 param1) { +bool ActorUnkOBPC::Init(unk32 param1) { this->mUnk_94 = this->mUnk_5C.mParams[1]; this->mUnk_98 = this->mUnk_5C.mParams[3]; @@ -42,7 +42,7 @@ bool ActorUnkOBPC::func_ov024_020d6f74(void) { return false; } -void ActorUnkOBPC::vfunc_20(void) { +void ActorUnkOBPC::Update(void) { switch (this->mState) { case 0: if (this->func_ov024_020d7154()) { @@ -68,7 +68,7 @@ void ActorUnkOBPC::vfunc_20(void) { } void ActorUnkOBPC::vfunc_24(void) { - this->vfunc_20(); + this->Update(); } void ActorUnkOBPC::SetState(ActorState state, int param2) { diff --git a/src/024_MainGame/Game/AdventureModeManager_024.cpp b/src/024_MainGame/Game/AdventureModeManager_024.cpp index a70668c7..084533f6 100644 --- a/src/024_MainGame/Game/AdventureModeManager_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_024.cpp @@ -321,7 +321,7 @@ void AdventureModeManager::vfunc_24() { if (CHECK_BUTTON_COMBO(press, PAD_KEY_DOWN) || CHECK_BUTTON_COMBO(press, PAD_BUTTON_B)) { if (this->func_ov024_020c5f70() != 0) { switch (data_0204a088->mUnk_00) { - case 1: + case 1: { stack_ov000_02073578 spC; spC.unk_08 = 0x02; spC.unk_00 = 0x0B; @@ -329,6 +329,7 @@ void AdventureModeManager::vfunc_24() { data_ov000_020b5214.func_ov000_0206db44(0x37); break; + } #if IS_EUR || IS_USA case 7: if (data_ov031_02118fa4 == 0) { diff --git a/src/024_MainGame/Unknown/UnkStruct_027e0d08_024.cpp b/src/024_MainGame/Unknown/UnkStruct_027e0d08_024.cpp index 8fa3a076..4f0c0d74 100644 --- a/src/024_MainGame/Unknown/UnkStruct_027e0d08_024.cpp +++ b/src/024_MainGame/Unknown/UnkStruct_027e0d08_024.cpp @@ -84,7 +84,7 @@ void UnkStruct_027e0d08::func_ov024_020d5e20() { this->ResetBuffers(); - if (func_0200169c(this->mUnk_00, 0x800, 0, 0x3FEC, 0x04, UnkStruct_027e0d08::func_ov024_020d5fb8, 0)) { + if (func_0200169c(this->mUnk_00, 0x800, 0, 0x3FEC, 0x04, (void *) UnkStruct_027e0d08::func_ov024_020d5fb8, 0)) { SND_func_0013(0, 0, 0, 0); MI_CpuClearFast(this->mUnk_04, 0x2000); MI_CpuClearFast(this->mUnk_08, 0x2000); diff --git a/src/025_Title/TitleScreen.cpp b/src/025_Title/TitleScreen.cpp index 7ca6c545..783f06e9 100644 --- a/src/025_Title/TitleScreen.cpp +++ b/src/025_Title/TitleScreen.cpp @@ -17,12 +17,12 @@ void func_ov000_0205bedc(void *param1, void *param2, void *param3, void *param4, } static TitleScreenPTMF data_ov025_020c5aec[TitleScreenState_Max] = { - TitleScreen::func_ov025_020c5200, // TitleScreenState_None - TitleScreen::func_ov025_020c5204, // TitleScreenState_IdleBeforeUI - TitleScreen::func_ov025_020c5240, // TitleScreenState_DrawUIOnInput - TitleScreen::func_ov025_020c53d0, // TitleScreenState_DrawUIOnCsCmd - TitleScreen::func_ov025_020c55a4, // TitleScreenState_IdleBeforeFileSelect - TitleScreen::func_ov025_020c55e4, // TitleScreenState_ToFileSelect + &TitleScreen::func_ov025_020c5200, // TitleScreenState_None + &TitleScreen::func_ov025_020c5204, // TitleScreenState_IdleBeforeUI + &TitleScreen::func_ov025_020c5240, // TitleScreenState_DrawUIOnInput + &TitleScreen::func_ov025_020c53d0, // TitleScreenState_DrawUIOnCsCmd + &TitleScreen::func_ov025_020c55a4, // TitleScreenState_IdleBeforeFileSelect + &TitleScreen::func_ov025_020c55e4, // TitleScreenState_ToFileSelect }; #if IS_JP diff --git a/src/026_Train/Actor/ActorUnkRB1T.cpp b/src/026_Train/Actor/ActorUnkRB1T.cpp index 4130059f..4c31306e 100644 --- a/src/026_Train/Actor/ActorUnkRB1T.cpp +++ b/src/026_Train/Actor/ActorUnkRB1T.cpp @@ -27,7 +27,7 @@ bool ActorUnkRB1T::func_ov026_0211e3e0(int param1) { return true; } - this->Actor_Derived1::vfunc_18(param1); + this->Actor_Derived1::Init(param1); this->mUnk_0E4 = ActorUnkRB1T::func_ov026_021208a0; int result = this->func_ov026_0211e6cc(); diff --git a/src/031_Land/Actor/ActorBlast.cpp b/src/031_Land/Actor/ActorBlast.cpp index 157f79c6..11e24d1d 100644 --- a/src/031_Land/Actor/ActorBlast.cpp +++ b/src/031_Land/Actor/ActorBlast.cpp @@ -35,11 +35,10 @@ bool ActorBlast_E8::vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *para ActorBlast::ActorBlast() : mUnk_94(FLOAT_TO_FX32(0.625f)), - mUnk_98(0x0), - mUnk_9A(0x18), + mUnk_98(0, 24), mUnk_E8(this) {} -bool ActorBlast::vfunc_18(unk32 param1) { +bool ActorBlast::Init(unk32 param1) { this->mPos.y += FLOAT_TO_FX32(0.5f); this->mUnk_C8 = *this->mUnk_34; @@ -90,7 +89,7 @@ bool ActorBlast::vfunc_18(unk32 param1) { } // non-matching -void ActorBlast::vfunc_20() { +void ActorBlast::Update() { fx32 f0 = this->mUnk_F0; fx32 newVal = this->mUnk_94 + this->mUnk_F4; this->mUnk_94 = newVal; @@ -101,7 +100,7 @@ void ActorBlast::vfunc_20() { this->mUnk_94 = f0; this->mUnk_C8.size = ~FLOAT_TO_FX32(0.0f); } - if (this->IsInternalTimerOut()) { + if (this->mUnk_98.HasExpired()) { this->func_ov000_020984d0(); return; } @@ -136,7 +135,7 @@ void ActorBlast::vfunc_24() { newVal = f0; } this->mUnk_94 = newVal; - if (!this->IsInternalTimerOut()) { + if (!this->mUnk_98.HasExpired()) { return; } this->func_ov000_020984d0(); diff --git a/src/031_Land/Actor/ActorBomb.cpp b/src/031_Land/Actor/ActorBomb.cpp index be456a07..892e758e 100644 --- a/src/031_Land/Actor/ActorBomb.cpp +++ b/src/031_Land/Actor/ActorBomb.cpp @@ -48,23 +48,23 @@ extern "C" void func_ov017_020c26f8(unk32, VecFx32 *, unk32, unk32); static ActorUnkZLSL_AnimationTag data_ov031_02112be8 = {.index = 0, .name = "bomb_clanim", .unknown = 0}; static PTMF data_ov031_02112c00[ActorBombState_Max] = { - ActorBomb::func_ov031_020e1da0, // ActorUnkBOMBState_0 - ActorBomb::func_ov031_020e1ed8, // ActorUnkBOMBState_1 - ActorBomb::func_ov031_020e1f88, // ActorUnkBOMBState_2 - ActorBomb::func_ov031_020e1fe4, // ActorUnkBOMBState_3 - ActorBomb::func_ov031_020e2064, // ActorUnkBOMBState_4 - ActorBomb::func_ov031_020e20fc, // ActorUnkBOMBState_5 - ActorBomb::func_ov031_020e2134, // ActorUnkBOMBState_6 + &ActorBomb::func_ov031_020e1da0, // ActorUnkBOMBState_0 + &ActorBomb::func_ov031_020e1ed8, // ActorUnkBOMBState_1 + &ActorBomb::func_ov031_020e1f88, // ActorUnkBOMBState_2 + &ActorBomb::func_ov031_020e1fe4, // ActorUnkBOMBState_3 + &ActorBomb::func_ov031_020e2064, // ActorUnkBOMBState_4 + &ActorBomb::func_ov031_020e20fc, // ActorUnkBOMBState_5 + &ActorBomb::func_ov031_020e2134, // ActorUnkBOMBState_6 }; static PTMF data_ov031_02112c38[ActorBombState_Max] = { - ActorBomb::func_ov031_020e1d48, // ActorUnkBOMBState_0 - ActorBomb::func_ov031_020e1ebc, // ActorUnkBOMBState_1 - ActorBomb::func_ov031_020e1f18, // ActorUnkBOMBState_2 - ActorBomb::func_ov031_020e1fe0, // ActorUnkBOMBState_3 - ActorBomb::func_ov031_020e2034, // ActorUnkBOMBState_4 - ActorBomb::func_ov031_020e20d8, // ActorUnkBOMBState_5 - ActorBomb::func_ov031_020e2100, // ActorUnkBOMBState_6 + &ActorBomb::func_ov031_020e1d48, // ActorUnkBOMBState_0 + &ActorBomb::func_ov031_020e1ebc, // ActorUnkBOMBState_1 + &ActorBomb::func_ov031_020e1f18, // ActorUnkBOMBState_2 + &ActorBomb::func_ov031_020e1fe0, // ActorUnkBOMBState_3 + &ActorBomb::func_ov031_020e2034, // ActorUnkBOMBState_4 + &ActorBomb::func_ov031_020e20d8, // ActorUnkBOMBState_5 + &ActorBomb::func_ov031_020e2100, // ActorUnkBOMBState_6 }; DECL_PROFILE(ActorProfileBomb); @@ -115,8 +115,7 @@ ActorBomb::ActorBomb() : mUnk_1E0(0x0), mUnk_1E4(0x0), mUnk_1E8(0x0), - mUnk_1EA(0x0), - mUnk_1EC(0x0), + mUnk_1EA(0, 0), mUnk_1EE(false), #if IS_JP mUnk_1F0(false), @@ -145,7 +144,7 @@ ActorBomb::ActorBomb() : void ActorBomb::func_ov031_020e17f4() {} -bool ActorBomb::vfunc_18(unk32 param1) { +bool ActorBomb::Init(unk32 param1) { Cylinder *profileCylinder = &this->mpProfile->mUnk_04; this->mUnk_154.pos = profileCylinder->pos; @@ -158,8 +157,7 @@ bool ActorBomb::vfunc_18(unk32 param1) { VecFx32_Copy(&this->mPos, &this->mUnk_19C.mUnk_0C.pos); this->mUnk_19C.mUnk_0C.size = 0x666; - this->mUnk_1EC = 0x78; - this->mUnk_1EA = 0x0; + this->mUnk_1EA.Set(0, 120); this->Actor::func_ov000_0209862c(0x2); return true; } @@ -215,7 +213,7 @@ void ActorBomb::func_ov031_020e193c() { } } -void ActorBomb::vfunc_20() { +void ActorBomb::Update() { this->mUnk_3C = &this->mUnk_134; CALL_PTMF(PTMF, data_ov031_02112c00[this->mState]); @@ -278,24 +276,23 @@ void ActorBomb::func_ov031_020e1b7c() { data_027e09a8->func_ov000_02071d34(&this->mRef, 0xF4, &this->mPos, 0x0); if (!this->mUnk_1EE) { - if (!this->IsInternalTimerOut()) { + if (!this->mUnk_1EA.HasExpired()) { return; } this->mUnk_1EE = true; - this->mUnk_1EC = 0x3C; - this->mUnk_1EA = 0x00; + this->mUnk_1EA.Set(0, 60); this->func_ov031_020e1b1c(); return; } - fx32 delta = this->mUnk_1EC - this->mUnk_1EA; + fx32 delta = this->mUnk_1EA.GetRemainingTime(); this->mUnk_0F4.mUnk_04.mUnk_04 = FLOAT_TO_FX32(1.5f) - delta * FLOAT_TO_FX32(0.01985f); this->mUnk_0F4.func_01ffc3b4(); if (delta > 0x0) { func_01ff9218(&this->mUnk_1D8, FLOAT_TO_FX32(1.3f), func_01ffb464((u32) delta << 0xC)); } - if (!this->IsInternalTimerOut()) { + if (!this->mUnk_1EA.HasExpired()) { return; } ActorBlast::func_ov031_020e3b9c(this, 0x0, 0x0); @@ -528,7 +525,7 @@ void ActorBomb::vfunc_2C(Actor_vfunc_30 *param1) { } } - func_01ffc5a0(&this->mUnk_094, this->mUnk_1D8, this->mAngleStruct, &this->mPos); + func_01ffc5a0(&this->mUnk_094, this->mUnk_1D8, this->mAngle, &this->mPos); VecFx32 sp0C; VecFx32_Init(this->mPos.x, this->mPos.y + FLOAT_TO_FX32(0.4f), this->mPos.z, &sp0C); diff --git a/src/031_Land/Actor/ActorHeart.cpp b/src/031_Land/Actor/ActorHeart.cpp index 3f4d7868..c6672172 100644 --- a/src/031_Land/Actor/ActorHeart.cpp +++ b/src/031_Land/Actor/ActorHeart.cpp @@ -71,7 +71,7 @@ ActorHeart::ActorHeart() : mUnk_B8(0), mUnk_BA(gRandom.Next32(0) & 0x80000000 ? 0x666 : ~0x665), mUnk_BC(0), - mUnk_BE(0), + mUnk_BE(false), mUnk_C0(0), mUnk_C4(0), mUnk_C8(this) { @@ -90,22 +90,22 @@ ActorHeart::ActorHeart() : } } -bool ActorHeart::vfunc_18(unk32 param1) { +bool ActorHeart::Init(unk32 param1) { this->func_ov031_020ef4a8(); return true; } static PTMF data_ov031_02113d74[ActorHeartState_Max] = { - ActorHeart::func_ov031_020ef2f8, // ActorHeartState_0 - ActorHeart::func_ov031_020ef334, // ActorHeartState_1 - ActorHeart::func_ov031_020ef3a0, // ActorHeartState_2 - ActorHeart::func_ov031_020ef3d0, // ActorHeartState_3 - ActorHeart::func_ov031_020ef444, // ActorHeartState_4 - ActorHeart::func_ov031_020ef458, // ActorHeartState_5 + &ActorHeart::func_ov031_020ef2f8, // ActorHeartState_0 + &ActorHeart::func_ov031_020ef334, // ActorHeartState_1 + &ActorHeart::func_ov031_020ef3a0, // ActorHeartState_2 + &ActorHeart::func_ov031_020ef3d0, // ActorHeartState_3 + &ActorHeart::func_ov031_020ef444, // ActorHeartState_4 + &ActorHeart::func_ov031_020ef458, // ActorHeartState_5 }; // non-matching -void ActorHeart::vfunc_20() { +void ActorHeart::Update() { UnkStruct_ov031_020eeee8 stack; stack.mUnk_02 = 0; @@ -203,12 +203,12 @@ void ActorHeart::vfunc_20() { extern unk32 data_ov000_020aecf8; static PTMF data_ov031_02113da4[ActorHeartState_Max] = { - ActorHeart::func_ov031_020ef2ec, // ActorHeartState_0 - ActorHeart::func_ov031_020ef320, // ActorHeartState_1 - ActorHeart::func_ov031_020ef35c, // ActorHeartState_2 - ActorHeart::func_ov031_020ef3b8, // ActorHeartState_3 - ActorHeart::func_ov031_020ef430, // ActorHeartState_4 - ActorHeart::func_ov031_020ef448, // ActorHeartState_5 + &ActorHeart::func_ov031_020ef2ec, // ActorHeartState_0 + &ActorHeart::func_ov031_020ef320, // ActorHeartState_1 + &ActorHeart::func_ov031_020ef35c, // ActorHeartState_2 + &ActorHeart::func_ov031_020ef3b8, // ActorHeartState_3 + &ActorHeart::func_ov031_020ef430, // ActorHeartState_4 + &ActorHeart::func_ov031_020ef448, // ActorHeartState_5 }; void ActorHeart::SetState(ActorState state) { @@ -234,23 +234,22 @@ void ActorHeart::func_ov031_020ef208() { SET_FLAG(this->mFlags, ActorFlag_Visible); return; } - if ((u8) this->mUnk_BE == 0) { - if (!this->IsTimerOut()) { + if (!this->mUnk_BE) { + if (!this->mTimer.HasExpired()) { return; } - this->mUnk_BE = 0x01; - this->mTimerMax = 60; - this->mTimer = 0; + this->mUnk_BE = true; + this->mTimer.Set(0, 60); return; } - if ((this->mTimer % 8) < 4) { + if ((this->mTimer.value % 8) < 4) { UNSET_FLAG(this->mFlags, ActorFlag_Visible); } else { SET_FLAG(this->mFlags, ActorFlag_Visible); } - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { return; } this->func_ov000_020984d0(); @@ -285,9 +284,8 @@ void ActorHeart::func_ov031_020ef35c() { this->mVel.x = FLOAT_TO_FX32(0.0); this->mVel.y = FLOAT_TO_FX32(0.0); this->mVel.z = FLOAT_TO_FX32(0.0); - if ((u8) this->mUnk_BE == 0 && (this->mTimerMax - this->mTimer) > 0xB4) { - this->mTimerMax = 0xB4; - this->mTimer = 0x00; + if (!this->mUnk_BE && this->mTimer.GetRemainingTime() > 180) { + this->mTimer.Set(0, 180); } this->mUnk_44 = 0x9F; } @@ -353,20 +351,17 @@ void ActorHeart::func_ov031_020ef4a8() { switch (this->mUnk_5C.mUnk_2C) { case 0: - this->mTimerMax = 0xB4; - this->mTimer = 0x00; + this->mTimer.Set(0, 180); this->SetState(ActorHeartState_2); break; case 1: - this->mTimerMax = 0x1E0; - this->mTimer = 0x00; + this->mTimer.Set(0, 480); this->SetState(ActorHeartState_0); return; default: - this->mTimerMax = 0x1E0; - this->mTimer = 0x00; + this->mTimer.Set(0, 480); this->SetState(ActorHeartState_0); break; } diff --git a/src/031_Land/Actor/ActorItemBoomerang.cpp b/src/031_Land/Actor/ActorItemBoomerang.cpp index de1b508f..2fe8501f 100644 --- a/src/031_Land/Actor/ActorItemBoomerang.cpp +++ b/src/031_Land/Actor/ActorItemBoomerang.cpp @@ -37,12 +37,11 @@ ActorItemBoomerang::ActorItemBoomerang() : mUnk_13A(0x0), mUnk_13C((u16) 0x8D71), mUnk_140(0x1000, 0x0) { - this->mState = ActorItemBoomerangState_0; - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0; + this->mState = ActorItemBoomerangState_0; + this->mTimer.Reset(); } -bool ActorItemBoomerang::vfunc_18(unk32 param1) { +bool ActorItemBoomerang::Init(unk32 param1) { this->mUnk_CC.mUnk_30.func_ov031_020e45fc(); this->mUnk_A0.mUnk_0C.Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(-0.1003f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.4f)); @@ -54,8 +53,8 @@ bool ActorItemBoomerang::vfunc_18(unk32 param1) { this->func_ov031_020e5034(0x0); - unk16 sin = SIN((u16) this->mAngle); - unk16 cos = COS((u16) this->mAngle); + unk16 sin = SIN((u16) this->mAngle.angle_s); + unk16 cos = COS((u16) this->mAngle.angle_s); this->mVel.x = MUL_FX32(sin, FLOAT_TO_FX32(0.5f)); this->mVel.z = MUL_FX32(cos, FLOAT_TO_FX32(0.5f)); @@ -66,9 +65,9 @@ bool ActorItemBoomerang::vfunc_18(unk32 param1) { // non-matching void ActorItemBoomerang::SetState(ActorState state) { - this->mState = state; - this->mTimerMax = 0xFFFF; - this->mTimer = 0; + this->mState = state; + this->mTimer.Reset(); + ; } void ActorItemBoomerang::func_ov031_020e49b0(unk32 param1) { @@ -88,7 +87,7 @@ void ActorItemBoomerang::func_ov031_020e49b0(unk32 param1) { } // non-matching -void ActorItemBoomerang::vfunc_20() { +void ActorItemBoomerang::Update() { VecFx32_Copy(&this->mPos, &this->mPrevPos); VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); @@ -96,7 +95,7 @@ void ActorItemBoomerang::vfunc_20() { VecFx32_Copy(&this->mPos, &this->mUnk_140.mUnk_00); } - this->IsTimerOut(); + this->mTimer.Update(); this->mAngle += DEG_TO_ANG(45); this->func_ov031_020e52a0(); data_027e09a8->func_ov000_02071d34(&this->mRef, this->mUnk_13C, &this->mPos, 0x0); @@ -320,7 +319,7 @@ void ActorItemBoomerang::func_ov031_020e52a0() { // non-matching void ActorItemBoomerang::vfunc_2C(Actor_vfunc_30 *param1) { if (Actor::func_01fff5d0(param1, 0x0)) { - this->mUnk_94.func_01ffc6d4(this->mAngleStruct, &this->mPos); + this->mUnk_94.func_01ffc6d4(this->mAngle, &this->mPos); data_027e09b4->func_ov017_020c08c4(&this->mPos, 0x400, 0x400, 0x1F, 0x0, 0x1); } } diff --git a/src/031_Land/Actor/ActorItemDrop.cpp b/src/031_Land/Actor/ActorItemDrop.cpp index dcbdbe07..440176aa 100644 --- a/src/031_Land/Actor/ActorItemDrop.cpp +++ b/src/031_Land/Actor/ActorItemDrop.cpp @@ -91,8 +91,7 @@ void ActorItemDrop::func_ov031_020f9f8c(ActorRef *pOutRef, const VecFx32 *pPos, } ActorItemDrop::ActorItemDrop() : - mUnk_AE(0x0), - mUnk_B0(0x6), + mUnk_AE(0, 6), mUnk_D8(FLOAT_TO_FX32(0.5f)), mUnk_DC(0), mUnk_E0(0), @@ -174,18 +173,17 @@ ActorItemDrop::ActorItemDrop() : } } -bool ActorItemDrop::vfunc_18(unk32 param1) { +bool ActorItemDrop::Init(unk32 param1) { if (this->mItemTypeId >= ItemDropType_Unknown) { return false; } - this->mTimerMax = FLOAT_TO_FX32(0.1173f); - this->mTimer = FLOAT_TO_FX32(0.0f); + this->mTimer.Set(0, 480); this->SetState(ActorItemDropState_0); return true; } -void ActorItemDrop::vfunc_20() { +void ActorItemDrop::Update() { this->func_ov031_020fa260(); } @@ -196,13 +194,13 @@ void ActorItemDrop::vfunc_24() { } static PTMF data_ov031_02114bb0[ActorItemDropState_Max] = { - ActorItemDrop::func_ov031_020fa46c, // ActorItemDropState_0 - ActorItemDrop::func_ov031_020fa4a0, // ActorItemDropState_1 - ActorItemDrop::func_ov031_020fa568, // ActorItemDropState_2 - ActorItemDrop::func_ov031_020fa5f0, // ActorItemDropState_3 - ActorItemDrop::func_ov031_020fa664, // ActorItemDropState_4 - ActorItemDrop::func_ov031_020fa678, // ActorItemDropState_5 - ActorItemDrop::func_ov031_020fa72c, // ActorItemDropState_6 + &ActorItemDrop::func_ov031_020fa46c, // ActorItemDropState_0 + &ActorItemDrop::func_ov031_020fa4a0, // ActorItemDropState_1 + &ActorItemDrop::func_ov031_020fa568, // ActorItemDropState_2 + &ActorItemDrop::func_ov031_020fa5f0, // ActorItemDropState_3 + &ActorItemDrop::func_ov031_020fa664, // ActorItemDropState_4 + &ActorItemDrop::func_ov031_020fa678, // ActorItemDropState_5 + &ActorItemDrop::func_ov031_020fa72c, // ActorItemDropState_6 }; void ActorItemDrop::func_ov031_020fa260() { @@ -210,7 +208,7 @@ void ActorItemDrop::func_ov031_020fa260() { CALL_PTMF(PTMF, data_ov031_02114bb0[this->mState]); - if (this->IsTimerOut()) { + if (this->mUnk_AE.HasExpired()) { this->func_ov000_020989e0(); if (this->mUnk_B4.mUnk_08 & 0x3FFFF) { @@ -265,13 +263,13 @@ void ActorItemDrop::func_ov031_020fa260() { } static PTMF data_ov031_02114be8[ActorItemDropState_Max] = { - ActorItemDrop::func_ov031_020fa468, // ActorItemDropState_0 - ActorItemDrop::func_ov031_020fa494, // ActorItemDropState_1 - ActorItemDrop::func_ov031_020fa524, // ActorItemDropState_2 - ActorItemDrop::func_ov031_020fa5d8, // ActorItemDropState_3 - ActorItemDrop::func_ov031_020fa650, // ActorItemDropState_4 - ActorItemDrop::func_ov031_020fa668, // ActorItemDropState_5 - ActorItemDrop::func_ov031_020fa6c8, // ActorItemDropState_6 + &ActorItemDrop::func_ov031_020fa468, // ActorItemDropState_0 + &ActorItemDrop::func_ov031_020fa494, // ActorItemDropState_1 + &ActorItemDrop::func_ov031_020fa524, // ActorItemDropState_2 + &ActorItemDrop::func_ov031_020fa5d8, // ActorItemDropState_3 + &ActorItemDrop::func_ov031_020fa650, // ActorItemDropState_4 + &ActorItemDrop::func_ov031_020fa668, // ActorItemDropState_5 + &ActorItemDrop::func_ov031_020fa6c8, // ActorItemDropState_6 }; void ActorItemDrop::SetState(ActorState state) { @@ -326,9 +324,8 @@ void ActorItemDrop::func_ov031_020fa524() { this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); - if (!this->mUnk_118 && this->mTimerMax - this->mTimer > FLOAT_TO_FX32(0.044f)) { - this->mTimerMax = FLOAT_TO_FX32(0.044f); - this->mTimer = FLOAT_TO_FX32(0.0f); + if (!this->mUnk_118 && this->mTimer.GetRemainingTime() > 180) { + this->mTimer.Set(0, 180); } this->mUnk_44 = 0x9F; @@ -411,8 +408,7 @@ void ActorItemDrop::func_ov031_020fa678() { } void ActorItemDrop::func_ov031_020fa6c8() { - this->mTimerMax = FLOAT_TO_FX32(15.9998f); - this->mTimer = FLOAT_TO_FX32(0.0f); + this->mTimer.Reset(); this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); @@ -509,19 +505,18 @@ void ActorItemDrop::func_ov031_020fa900() { if (var_r2) { SET_FLAG(this->mFlags, ActorFlag_Visible); } else if (!this->mUnk_118) { - if (this->Actor::IsTimerOut()) { - this->mUnk_118 = true; - this->mTimerMax = 60; - this->mTimer = 0; + if (this->mTimer.HasExpired()) { + this->mUnk_118 = true; + this->mTimer.Set(0, 60); } } else { - if ((this->mTimer % 8) < 4) { + if ((this->mTimer.value % 8) < 4) { UNSET_FLAG(this->mFlags, ActorFlag_Visible); } else { SET_FLAG(this->mFlags, ActorFlag_Visible); } - if (this->Actor::IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->func_ov000_020984d0(); } } diff --git a/src/031_Land/Actor/ActorItemFlower.cpp b/src/031_Land/Actor/ActorItemFlower.cpp index 858e5ed5..f896240d 100644 --- a/src/031_Land/Actor/ActorItemFlower.cpp +++ b/src/031_Land/Actor/ActorItemFlower.cpp @@ -8,25 +8,25 @@ #include "Unknown/UnkStruct_ov000_020b5d34.hpp" static PTMF data_ov031_021141b4[ActorItemFlowerState_Max] = { - ActorItemFlower::func_ov031_020f11b4, // ActorItemFlowerState_0 - ActorItemFlower::func_ov031_020f11cc, // ActorItemFlowerState_1 - ActorItemFlower::func_ov031_020f11e4, // ActorItemFlowerState_2 - ActorItemFlower::func_ov031_020f11fc, // ActorItemFlowerState_3 - ActorItemFlower::func_ov031_020f121c, // ActorItemFlowerState_4 - ActorItemFlower::func_ov031_020f1308, // ActorItemFlowerState_5 - ActorItemFlower::func_ov031_020f0244, // ActorItemFlowerState_6 - ActorItemFlower::func_ov031_020f0514, // ActorItemFlowerState_7 + &ActorItemFlower::func_ov031_020f11b4, // ActorItemFlowerState_0 + &ActorItemFlower::func_ov031_020f11cc, // ActorItemFlowerState_1 + &ActorItemFlower::func_ov031_020f11e4, // ActorItemFlowerState_2 + &ActorItemFlower::func_ov031_020f11fc, // ActorItemFlowerState_3 + &ActorItemFlower::func_ov031_020f121c, // ActorItemFlowerState_4 + &ActorItemFlower::func_ov031_020f1308, // ActorItemFlowerState_5 + &ActorItemFlower::func_ov031_020f0244, // ActorItemFlowerState_6 + &ActorItemFlower::func_ov031_020f0514, // ActorItemFlowerState_7 }; static PTMF data_ov031_02114174[ActorItemFlowerState_Max] = { - ActorItemFlower::func_ov031_020f11a8, // ActorItemFlowerState_0 - ActorItemFlower::func_ov031_020f11c0, // ActorItemFlowerState_1 - ActorItemFlower::func_ov031_020f11d8, // ActorItemFlowerState_2 - ActorItemFlower::func_ov031_020f11f0, // ActorItemFlowerState_3 - ActorItemFlower::func_ov031_020f1208, // ActorItemFlowerState_4 - ActorItemFlower::func_ov031_020f1230, // ActorItemFlowerState_5 - ActorItemFlower::func_ov031_020f0220, // ActorItemFlowerState_6 - ActorItemFlower::func_ov031_020f04dc, // ActorItemFlowerState_7 + &ActorItemFlower::func_ov031_020f11a8, // ActorItemFlowerState_0 + &ActorItemFlower::func_ov031_020f11c0, // ActorItemFlowerState_1 + &ActorItemFlower::func_ov031_020f11d8, // ActorItemFlowerState_2 + &ActorItemFlower::func_ov031_020f11f0, // ActorItemFlowerState_3 + &ActorItemFlower::func_ov031_020f1208, // ActorItemFlowerState_4 + &ActorItemFlower::func_ov031_020f1230, // ActorItemFlowerState_5 + &ActorItemFlower::func_ov031_020f0220, // ActorItemFlowerState_6 + &ActorItemFlower::func_ov031_020f04dc, // ActorItemFlowerState_7 }; DECL_PROFILE(ActorProfileItemFlower); @@ -43,8 +43,8 @@ ActorProfileItemFlower::ActorProfileItemFlower() : ActorItemFlower::ActorItemFlower() : mUnk_110(G3d_GetModelPtr(data_ov000_020b5d34.GetProfileFromId(MapObjectId_ITFL)->vfunc_04()->mUnk_50), 0x1, 0x1) {} -bool ActorItemFlower::vfunc_18(unk32 param1) { - this->Actor_ov031_02113fd4::vfunc_18(param1); +bool ActorItemFlower::Init(unk32 param1) { + this->Actor_ov031_02113fd4::Init(param1); this->vfunc_5C(ActorItemFlowerState_0); return true; } @@ -56,7 +56,7 @@ void ActorItemFlower::vfunc_5C(ActorState state) { CALL_PTMF(PTMF, data_ov031_02114174[this->mState]); } -void ActorItemFlower::vfunc_20() { +void ActorItemFlower::Update() { CALL_PTMF(PTMF, data_ov031_021141b4[this->mState]); } diff --git a/src/031_Land/Actor/ActorItemTornado.cpp b/src/031_Land/Actor/ActorItemTornado.cpp index cac2a0b0..16e67a20 100644 --- a/src/031_Land/Actor/ActorItemTornado.cpp +++ b/src/031_Land/Actor/ActorItemTornado.cpp @@ -53,13 +53,12 @@ ActorItemTornado::ActorItemTornado() : this->mUnk_94.func_ov000_02057c98(&this->mUnk_F4); this->mUnk_94.func_ov000_02057c98(&this->mUnk_134); - this->mTimerMax = 0xFFFF; - this->mState = ActorItemTornadoState_0; - this->mTimer = 0x0; + this->mState = ActorItemTornadoState_0; + this->mTimer.Reset(); } -bool ActorItemTornado::vfunc_18(unk32 param1) { - u16 tmp = (u16) this->mAngle; +bool ActorItemTornado::Init(unk32 param1) { + u16 tmp = (u16) this->mAngle.angle_s; this->mUnk_44 = 0x1F; @@ -95,9 +94,8 @@ void ActorItemTornado::SetState(ActorState state) { break; } - this->mState = state; - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0; + this->mState = state; + this->mTimer.Reset(); } // non-matching @@ -115,12 +113,12 @@ void ActorItemTornado::func_ov031_020e5d18(unk32 param1) { if (param1 == 0x0) { ++this->mUnk_1D8; } - this->IsTimerOut(); + this->mTimer.Update(); switch (this->mState) { case ActorItemTornadoState_0: data_027e09a8->func_ov000_02071d34(&this->mRef, 0x8D6C, &this->mPos, 0x0); - if (this->mTimer < (s16) 0xA) { + if (this->mTimer.GetValue() < 10) { this->mUnk_1DC += 0x199; break; } @@ -139,7 +137,6 @@ void ActorItemTornado::func_ov031_020e5d18(unk32 param1) { } } - ; if (!data_027e0d38->func_ov031_020d9bec() && (((u16) this->mUnk_1CC == 0x0 && (u32) this->mUnk_1D8 >= 0x28U) || !this->func_ov017_020beeec(0))) { this->func_ov031_020e6314(0x4); @@ -161,15 +158,15 @@ void ActorItemTornado::func_ov031_020e5d18(unk32 param1) { } break; case ActorItemTornadoState_2: - if ((u32) this->mTimer >= (u32) this->mUnk_1D6) { - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + if (this->mTimer.value >= this->mUnk_1D6) { + this->Kill(); } else if (this->mUnk_1D6 != 0) { if (this->mUnk_1CE != 0) { func_01ff993c(&this->mPos, &this->mUnk_1C0, 0x266); } this->mUnk_1DC -= func_01ffb66c(0x1000, this->mUnk_1D6); if (this->mUnk_1DC <= 0) { - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); } } break; @@ -219,7 +216,7 @@ void ActorItemTornado::func_ov031_020e5d18(unk32 param1) { this->mUnk_1CC = 0x1; } } -void ActorItemTornado::vfunc_20() { +void ActorItemTornado::Update() { this->func_ov031_020e5d18(0x0); } diff --git a/src/031_Land/Actor/ActorPot.cpp b/src/031_Land/Actor/ActorPot.cpp index 8687fce3..188d63a6 100644 --- a/src/031_Land/Actor/ActorPot.cpp +++ b/src/031_Land/Actor/ActorPot.cpp @@ -7,25 +7,25 @@ #include "Unknown/UnkStruct_ov000_020b5d34.hpp" static PTMF data_ov031_021140a0[ActorPotState_Max] = { - ActorPot::func_ov031_020f0df4, // ActorPotState_0 - ActorPot::func_ov031_020f0e0c, // ActorPotState_1 - ActorPot::func_ov031_020f0e24, // ActorPotState_2 - ActorPot::func_ov031_020f0e3c, // ActorPotState_3 - ActorPot::func_ov031_020f0e5c, // ActorPotState_4 - ActorPot::func_ov031_020f0f44, // ActorPotState_5 - ActorPot::func_ov031_020f0244, // ActorPotState_6 - ActorPot::func_ov031_020f0514 // ActorPotState_7 + &ActorPot::func_ov031_020f0df4, // ActorPotState_0 + &ActorPot::func_ov031_020f0e0c, // ActorPotState_1 + &ActorPot::func_ov031_020f0e24, // ActorPotState_2 + &ActorPot::func_ov031_020f0e3c, // ActorPotState_3 + &ActorPot::func_ov031_020f0e5c, // ActorPotState_4 + &ActorPot::func_ov031_020f0f44, // ActorPotState_5 + &ActorPot::func_ov031_020f0244, // ActorPotState_6 + &ActorPot::func_ov031_020f0514 // ActorPotState_7 }; static PTMF data_ov031_02114060[ActorPotState_Max] = { - ActorPot::func_ov031_020f0de8, // ActorPotState_0 - ActorPot::func_ov031_020f0e00, // ActorPotState_1 - ActorPot::func_ov031_020f0e18, // ActorPotState_2 - ActorPot::func_ov031_020f0e30, // ActorPotState_3 - ActorPot::func_ov031_020f0e48, // ActorPotState_4 - ActorPot::func_ov031_020f0e70, // ActorPotState_5 - ActorPot::func_ov031_020f0220, // ActorPotState_6 - ActorPot::func_ov031_020f04dc // ActorPotState_7 + &ActorPot::func_ov031_020f0de8, // ActorPotState_0 + &ActorPot::func_ov031_020f0e00, // ActorPotState_1 + &ActorPot::func_ov031_020f0e18, // ActorPotState_2 + &ActorPot::func_ov031_020f0e30, // ActorPotState_3 + &ActorPot::func_ov031_020f0e48, // ActorPotState_4 + &ActorPot::func_ov031_020f0e70, // ActorPotState_5 + &ActorPot::func_ov031_020f0220, // ActorPotState_6 + &ActorPot::func_ov031_020f04dc // ActorPotState_7 }; DECL_PROFILE(ActorProfilePot); @@ -42,8 +42,8 @@ ActorProfilePot::ActorProfilePot() : ActorPot::ActorPot() : mUnk_110(G3d_GetModelPtr(data_ov000_020b5d34.GetProfileFromId(MapObjectId_Pot)->vfunc_04()->mUnk_50), 0x01) {} -bool ActorPot::vfunc_18(unk32 param1) { - Actor_ov031_02113fd4::vfunc_18(param1); +bool ActorPot::Init(unk32 param1) { + Actor_ov031_02113fd4::Init(param1); this->vfunc_5C(ActorPotState_0); @@ -59,7 +59,7 @@ void ActorPot::vfunc_5C(ActorState state) { CALL_PTMF(PTMF, data_ov031_02114060[this->mState]); } -void ActorPot::vfunc_20() { +void ActorPot::Update() { CALL_PTMF(PTMF, data_ov031_021140a0[this->mState]); } diff --git a/src/031_Land/Actor/ActorRollingStone.cpp b/src/031_Land/Actor/ActorRollingStone.cpp index cdcda345..13e36c83 100644 --- a/src/031_Land/Actor/ActorRollingStone.cpp +++ b/src/031_Land/Actor/ActorRollingStone.cpp @@ -24,31 +24,31 @@ extern "C" unk32 func_01ffb9cc(VecFx32 *, VecFx32 *); extern "C" unk8 func_02017e8c(unk16 *); static PTMF data_ov031_02114aec[0xB] = { - ActorRollingStone::func_ov031_020f89f4, // ActorRollingStoneState_0 - ActorRollingStone::func_ov031_020f8a2c, // ActorRollingStoneState_1 - ActorRollingStone::func_ov031_020f8a3c, // ActorRollingStoneState_2 - ActorRollingStone::func_ov031_020f8b58, // ActorRollingStoneState_3 - ActorRollingStone::func_ov031_020f9250, // ActorRollingStoneState_4 - ActorRollingStone::func_ov031_020f9340, // ActorRollingStoneState_5 - ActorRollingStone::func_ov031_020f8ed4, // ActorRollingStoneState_6 - ActorRollingStone::func_ov031_020f8f10, // ActorRollingStoneState_7 - ActorRollingStone::func_ov031_020f9018, // ActorRollingStoneState_8 - ActorRollingStone::func_ov031_020f916c, // ActorRollingStoneState_9 - ActorRollingStone::func_ov031_020f9494, // ActorRollingStoneState_10 + &ActorRollingStone::func_ov031_020f89f4, // ActorRollingStoneState_0 + &ActorRollingStone::func_ov031_020f8a2c, // ActorRollingStoneState_1 + &ActorRollingStone::func_ov031_020f8a3c, // ActorRollingStoneState_2 + &ActorRollingStone::func_ov031_020f8b58, // ActorRollingStoneState_3 + &ActorRollingStone::func_ov031_020f9250, // ActorRollingStoneState_4 + &ActorRollingStone::func_ov031_020f9340, // ActorRollingStoneState_5 + &ActorRollingStone::func_ov031_020f8ed4, // ActorRollingStoneState_6 + &ActorRollingStone::func_ov031_020f8f10, // ActorRollingStoneState_7 + &ActorRollingStone::func_ov031_020f9018, // ActorRollingStoneState_8 + &ActorRollingStone::func_ov031_020f916c, // ActorRollingStoneState_9 + &ActorRollingStone::func_ov031_020f9494, // ActorRollingStoneState_10 }; static PTMF data_ov031_02114a94[0xB] = { - ActorRollingStone::func_ov031_020f8a04, // ActorRollingStoneState_0 - ActorRollingStone::func_ov031_020f8a38, // ActorRollingStoneState_1 - ActorRollingStone::func_ov031_020f8a58, // ActorRollingStoneState_2 - ActorRollingStone::func_ov031_020f8bc4, // ActorRollingStoneState_3 - ActorRollingStone::func_ov031_020f92cc, // ActorRollingStoneState_4 - ActorRollingStone::func_ov031_020f93bc, // ActorRollingStoneState_5 - ActorRollingStone::func_ov031_020f8f0c, // ActorRollingStoneState_6 - ActorRollingStone::func_ov031_020f8f30, // ActorRollingStoneState_7 - ActorRollingStone::func_ov031_020f9050, // ActorRollingStoneState_8 - ActorRollingStone::func_ov031_020f91ac, // ActorRollingStoneState_9 - ActorRollingStone::func_ov031_020f9554, // ActorRollingStoneState_10 + &ActorRollingStone::func_ov031_020f8a04, // ActorRollingStoneState_0 + &ActorRollingStone::func_ov031_020f8a38, // ActorRollingStoneState_1 + &ActorRollingStone::func_ov031_020f8a58, // ActorRollingStoneState_2 + &ActorRollingStone::func_ov031_020f8bc4, // ActorRollingStoneState_3 + &ActorRollingStone::func_ov031_020f92cc, // ActorRollingStoneState_4 + &ActorRollingStone::func_ov031_020f93bc, // ActorRollingStoneState_5 + &ActorRollingStone::func_ov031_020f8f0c, // ActorRollingStoneState_6 + &ActorRollingStone::func_ov031_020f8f30, // ActorRollingStoneState_7 + &ActorRollingStone::func_ov031_020f9050, // ActorRollingStoneState_8 + &ActorRollingStone::func_ov031_020f91ac, // ActorRollingStoneState_9 + &ActorRollingStone::func_ov031_020f9554, // ActorRollingStoneState_10 }; DECL_PROFILE(ActorProfileRollingStone); @@ -99,10 +99,8 @@ ActorRollingStone::ActorRollingStone() : mUnk_10C(data_027e0130), mUnk_138(0x0), mUnk_14C(0x0), - mUnk_150(0x0), - mUnk_152(0x0), - mUnk_154(0x0), - mUnk_156(0x0), + mUnk_150(0, 0), + mUnk_154(0, 0), mUnk_158(true), mUnk_159(false), mUnk_15A(-0x1), @@ -116,7 +114,7 @@ ActorRollingStone::ActorRollingStone() : this->mUnk_38->mUnk_08 = 0x3; } -bool ActorRollingStone::vfunc_18(unk32 param1) { +bool ActorRollingStone::Init(unk32 param1) { this->mUnk_13C.Init(FLOAT_TO_FX32(0.8f)); if (data_027e09a4->mUnk_00.sceneIndex == SceneIndex_f_flame) { @@ -152,8 +150,8 @@ bool ActorRollingStone::vfunc_18(unk32 param1) { return true; } -void ActorRollingStone::vfunc_20() { - this->IsTimerOut(); +void ActorRollingStone::Update() { + this->mTimer.Update(); CALL_PTMF(PTMF, data_ov031_02114a94[this->mState]); @@ -169,9 +167,8 @@ void ActorRollingStone::vfunc_20() { } void ActorRollingStone::SetState(ActorState state) { - this->mState = state; - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0; + this->mState = state; + this->mTimer.Reset(); this->mUnk_38->mUnk_08 = 0x3; CALL_PTMF(PTMF, data_ov031_02114aec[this->mState]); } @@ -297,8 +294,8 @@ void ActorRollingStone::func_ov031_020f8bc4() { this->func_ov031_020f8de8(); VecFx32 sp38; - unk16 sinValue = SIN((u16) this->mAngle); - unk16 cosValue = COS((u16) this->mAngle); + unk16 sinValue = SIN((u16) this->mAngle.angle_s); + unk16 cosValue = COS((u16) this->mAngle.angle_s); sp38.x = MUL_FX32(sinValue, FLOAT_TO_FX32(1.0f)); sp38.z = MUL_FX32(cosValue, FLOAT_TO_FX32(1.0f)); @@ -328,7 +325,7 @@ void ActorRollingStone::func_ov031_020f8bc4() { } void ActorRollingStone::func_ov031_020f8de8() { - this->IsInternalTimerOut2(); + this->mUnk_154.Update(); this->func_ov000_020989e0(); if ((this->mUnk_AC.mUnk_08 & 0x3FFFF) == 0) { @@ -338,20 +335,20 @@ void ActorRollingStone::func_ov031_020f8de8() { switch (this->mUnk_AC.mUnk_1C) { case 0x4: data_027e0d38->func_ov031_020d9c44(0x4); - return; + break; case 0xC: - if ((u32) this->mUnk_154 < (u32) this->mUnk_156) { + if (!this->mUnk_154.HasReachedMaxU()) { return; } - this->mUnk_156 = 0x14; - this->mUnk_154 = 0x0; + + this->mUnk_154.Set(0, 20); case 0x8: case 0xD: this->func_ov017_020bfb18(&this->mUnk_AC); - return; + break; case 0x1: this->SetState(ActorRollingStoneState_6); - return; + break; case 0x0: case 0x2: case 0x3: @@ -363,7 +360,7 @@ void ActorRollingStone::func_ov031_020f8de8() { case 0xB: case 0xE: case 0xF: - return; + break; } } @@ -380,8 +377,7 @@ void ActorRollingStone::func_ov031_020f8f0c() {} void ActorRollingStone::func_ov031_020f8f10() { this->mUnk_2C = 0x0; this->mUnk_158 = false; - this->mUnk_152 = this->mUnk_5C.mParams[1]; - this->mUnk_150 = 0x0; + this->mUnk_150.Set(0, this->mUnk_5C.mParams[1]); } void ActorRollingStone::func_ov031_020f8f30() { @@ -389,7 +385,7 @@ void ActorRollingStone::func_ov031_020f8f30() { return; } - if (!this->IsInternalTimerOut1()) { + if (!this->mUnk_150.HasExpired()) { return; } ActorParams sp14; @@ -400,19 +396,18 @@ void ActorRollingStone::func_ov031_020f8f30() { VecFx32 vec = this->mPos; VecFx32_Copy(&vec, &sp14.mInitialPos); - sp14.mInitialAngle = this->mAngle; + sp14.mInitialAngle = this->mAngle.angle_s; sp14.mParams[0] = 0x1; ActorRef ref; this->func_ov000_020973f4(&ref, &data_ov000_020b539c_eur, ActorId_RollingStone, &sp14, 0x0); - this->mUnk_150 = 0; - this->mUnk_152 = this->mUnk_5C.mParams[1]; + this->mUnk_150.Set(0, this->mUnk_5C.mParams[1]); } void ActorRollingStone::func_ov031_020f9018() { this->mUnk_2C = 0x0; - fx32 angle = ((u32) (this->mAngle + DEG_TO_ANG(45)) << 0x10) >> 0x1E; + fx32 angle = ((u32) (this->mAngle.angle_s + DEG_TO_ANG(45)) << 0x10) >> 0x1E; if (angle == 0x1 || angle == 0x3) { this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); @@ -426,7 +421,7 @@ void ActorRollingStone::func_ov031_020f9050() { this->mUnk_3C = &this->mUnk_AC; this->func_ov031_020f8de8(); - fx32 angle = ((u32) (this->mAngle + DEG_TO_ANG(45)) << 0x10) >> 0x1E; + fx32 angle = ((u32) (this->mAngle.angle_s + DEG_TO_ANG(45)) << 0x10) >> 0x1E; if (angle == 0x1 || angle == 0x3) { this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); @@ -446,7 +441,7 @@ void ActorRollingStone::func_ov031_020f9050() { data_027e09c0->func_ov000_0207de98(this->mRef, &unk, this->mUnk_38); - angle = ((u32) (this->mAngle + DEG_TO_ANG(45)) << 0x10) >> 0x1E; + angle = ((u32) (this->mAngle.angle_s + DEG_TO_ANG(45)) << 0x10) >> 0x1E; if (angle == 0x1 || angle == 0x3) { if (this->mVel.x != FLOAT_TO_FX32(0.0f)) { return; @@ -634,8 +629,8 @@ void ActorRollingStone::func_ov031_020f9554() { this->func_ov031_020f8de8(); VecFx32 sp38; - unk16 sinValue = SIN((u16) this->mAngle); - unk16 cosValue = COS((u16) this->mAngle); + unk16 sinValue = SIN((u16) this->mAngle.angle_s); + unk16 cosValue = COS((u16) this->mAngle.angle_s); sp38.x = MUL_FX32(sinValue, FLOAT_TO_FX32(0.25f)); sp38.y = FLOAT_TO_FX32(0.0f); @@ -663,7 +658,7 @@ void ActorRollingStone::func_ov031_020f9554() { VecFx32_Copy(&this->mPos, &this->mPrevPos); - this->mUnk_15C.func_ov024_020d69d8(&this->mPos, &this->mAngle, &this->mVel, 0x1AE, 0xE39, 0x1AE); + this->mUnk_15C.func_ov024_020d69d8(&this->mPos, &this->mAngle.angle_s, &this->mVel, 0x1AE, 0xE39, 0x1AE); VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); this->func_ov031_020f98e4(); @@ -694,23 +689,25 @@ void ActorRollingStone::func_ov031_020f97cc() { } void ActorRollingStone::func_ov031_020f98e4() { - unk16 sp00 = this->mAngle; + unk16 sp00 = this->mAngle.angle_s; Mat3p sp34; switch (func_02017e8c(&sp00)) { case 0x2: - case 0x6: + case 0x6: { fx32 diffX = this->mPos.x - this->mPrevPos.x; fx32 angleX = -MUL_FX32(diffX, FLOAT_TO_FX32(2.6668f)); Mat3p_InitZRotation(&sp34, SIN((u16) angleX), COS((u16) angleX)); break; + } case 0x0: - case 0x4: + case 0x4: { fx32 diffZ = this->mPos.z - this->mPrevPos.z; fx32 angleZ = MUL_FX32(diffZ, FLOAT_TO_FX32(2.6668f)); Mat3p_InitXRotation(&sp34, SIN((u16) angleZ), COS((u16) angleZ)); break; - case 0x5: + } + case 0x5: { VecFx32 sp28 = data_ov031_02110b98; unk32 ret = func_01ffb9cc(&this->mPrevPos, &this->mPos); @@ -718,7 +715,8 @@ void ActorRollingStone::func_ov031_020f98e4() { Mat3p_func_01ff8248(&sp34, &sp28, SIN((u16) angleRet1), COS((u16) angleRet1)); break; - case 0x1: + } + case 0x1: { VecFx32 sp1C = data_ov031_02110ba4; unk32 ret2 = func_01ffb9cc(&this->mPrevPos, &this->mPos); @@ -726,7 +724,8 @@ void ActorRollingStone::func_ov031_020f98e4() { Mat3p_func_01ff8248(&sp34, &sp1C, SIN((u16) angleRet2), COS((u16) angleRet2)); break; - case 0x7: + } + case 0x7: { VecFx32 sp10 = data_ov031_02110bb0; unk32 ret3 = func_01ffb9cc(&this->mPrevPos, &this->mPos); @@ -734,7 +733,8 @@ void ActorRollingStone::func_ov031_020f98e4() { Mat3p_func_01ff8248(&sp34, &sp10, SIN((u16) angleRet3), COS((u16) angleRet3)); break; - case 0x3: + } + case 0x3: { VecFx32 sp04 = data_ov031_02110bbc; unk32 ret4 = func_01ffb9cc(&this->mPrevPos, &this->mPos); @@ -742,6 +742,7 @@ void ActorRollingStone::func_ov031_020f98e4() { Mat3p_func_01ff8248(&sp34, &sp04, SIN((u16) angleRet4), COS((u16) angleRet4)); break; + } default: break; } diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index 5c1c1928..944d3930 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -9,35 +9,35 @@ #include "nitro/fx.h" static PTMF data_ov031_02113588[0xD] = { - ActorRupee::func_ov031_020e91a8, // ActorRupeeState_0 - ActorRupee::func_ov031_020e9254, // ActorRupeeState_1 - ActorRupee::func_ov031_020e9310, // ActorRupeeState_2 - ActorRupee::func_ov031_020e942c, // ActorRupeeState_3 - ActorRupee::func_ov031_020e9434, // ActorRupeeState_4 - ActorRupee::func_ov031_020e951c, // ActorRupeeState_5 - ActorRupee::func_ov031_020e9450, // ActorRupeeState_6 - ActorRupee::func_ov031_020e95ac, // ActorRupeeState_7 - ActorRupee::func_ov031_020e95c0, // ActorRupeeState_8 - ActorRupee::func_ov031_020e9624, // ActorRupeeState_9 - ActorRupee::func_ov031_020e96bc, // ActorRupeeState_10 - ActorRupee::func_ov031_020e9740, // ActorRupeeState_11 - ActorRupee::func_ov031_020e98c4, // ActorRupeeState_12 + &ActorRupee::func_ov031_020e91a8, // ActorRupeeState_0 + &ActorRupee::func_ov031_020e9254, // ActorRupeeState_1 + &ActorRupee::func_ov031_020e9310, // ActorRupeeState_2 + &ActorRupee::func_ov031_020e942c, // ActorRupeeState_3 + &ActorRupee::func_ov031_020e9434, // ActorRupeeState_4 + &ActorRupee::func_ov031_020e951c, // ActorRupeeState_5 + &ActorRupee::func_ov031_020e9450, // ActorRupeeState_6 + &ActorRupee::func_ov031_020e95ac, // ActorRupeeState_7 + &ActorRupee::func_ov031_020e95c0, // ActorRupeeState_8 + &ActorRupee::func_ov031_020e9624, // ActorRupeeState_9 + &ActorRupee::func_ov031_020e96bc, // ActorRupeeState_10 + &ActorRupee::func_ov031_020e9740, // ActorRupeeState_11 + &ActorRupee::func_ov031_020e98c4, // ActorRupeeState_12 }; static PTMF data_ov031_02113520[0xD] = { - ActorRupee::func_ov031_020e9108, // ActorRupeeState_0 - ActorRupee::func_ov031_020e9234, // ActorRupeeState_1 - ActorRupee::func_ov031_020e92e0, // ActorRupeeState_2 - ActorRupee::func_ov031_020e9428, // ActorRupeeState_3 - ActorRupee::func_ov031_020e9430, // ActorRupeeState_4 - ActorRupee::func_ov031_020e94d4, // ActorRupeeState_5 - ActorRupee::func_ov031_020e9438, // ActorRupeeState_6 - ActorRupee::func_ov031_020e9598, // ActorRupeeState_7 - ActorRupee::func_ov031_020e95b0, // ActorRupeeState_8 - ActorRupee::func_ov031_020e9610, // ActorRupeeState_9 - ActorRupee::func_ov031_020e9638, // ActorRupeeState_10 - ActorRupee::func_ov031_020e970c, // ActorRupeeState_11 - ActorRupee::func_ov031_020e9838, // ActorRupeeState_12 + &ActorRupee::func_ov031_020e9108, // ActorRupeeState_0 + &ActorRupee::func_ov031_020e9234, // ActorRupeeState_1 + &ActorRupee::func_ov031_020e92e0, // ActorRupeeState_2 + &ActorRupee::func_ov031_020e9428, // ActorRupeeState_3 + &ActorRupee::func_ov031_020e9430, // ActorRupeeState_4 + &ActorRupee::func_ov031_020e94d4, // ActorRupeeState_5 + &ActorRupee::func_ov031_020e9438, // ActorRupeeState_6 + &ActorRupee::func_ov031_020e9598, // ActorRupeeState_7 + &ActorRupee::func_ov031_020e95b0, // ActorRupeeState_8 + &ActorRupee::func_ov031_020e9610, // ActorRupeeState_9 + &ActorRupee::func_ov031_020e9638, // ActorRupeeState_10 + &ActorRupee::func_ov031_020e970c, // ActorRupeeState_11 + &ActorRupee::func_ov031_020e9838, // ActorRupeeState_12 }; extern "C" void func_01ffedac(u16 *, VecFx32 *); @@ -97,7 +97,7 @@ ActorRupee::ActorRupee() : } // https://decomp.me/scratch/wunA4 -bool ActorRupee::vfunc_18(unk32 param1) { +bool ActorRupee::Init(unk32 param1) { if (this->func_ov031_020e9d54()) { this->mUnk_30 = &data_ov031_02113478; this->mUnk_34 = &data_ov031_02113478; @@ -244,7 +244,7 @@ void ActorRupee::func_ov031_020e9108() { void ActorRupee::func_ov031_020e91a8() { u32 sp0; - this->IsTimerOut(); + this->mTimer.Update(); this->func_ov031_020e9b88(); @@ -272,7 +272,7 @@ void ActorRupee::func_ov031_020e9234() { void ActorRupee::func_ov031_020e9254() { u32 sp0; - this->IsTimerOut(); + this->mTimer.Update(); this->func_ov031_020e9be8(); @@ -305,7 +305,7 @@ void ActorRupee::func_ov031_020e92e0() { void ActorRupee::func_ov031_020e9310() { u32 sp0; - this->IsTimerOut(); + this->mTimer.Update(); switch (this->mUnk_EC) { case 0: @@ -373,8 +373,7 @@ void ActorRupee::func_ov031_020e9450() { } void ActorRupee::func_ov031_020e94d4() { - this->mTimerMax = -1; - this->mTimer = 0; + this->mTimer.Reset(); this->mVel.x = 0; this->mVel.y = 0; this->mVel.z = 0; @@ -489,8 +488,7 @@ void ActorRupee::func_ov031_020e970c() { this->mVel.z = 0; SET_FLAG(this->mFlags, ActorFlag_Visible); this->mUnk_4A[0] = 1; - this->mTimerMax = -1; - this->mTimer = 0; + this->mTimer.Reset(); } // non-matching @@ -509,10 +507,9 @@ void ActorRupee::func_ov031_020e9740() { temp_r2 = (sp4 - 0x800) + temp_r0->vfunc_28(&this->mPos, 0, 0); if (this->mPos.y != temp_r2) { - this->mPos.y = temp_r2; - this->mTimerMax = -1; - this->mTimer = 0; - } else if (this->mTimer == 8) { + this->mPos.y = temp_r2; + this->mTimer.Reset(); + } else if (this->mTimer.GetValue() == 8) { this->SetState(ActorRupeeState_12); } } else { @@ -521,7 +518,7 @@ void ActorRupee::func_ov031_020e9740() { this->SetState(ActorRupeeState_12); } - this->IsTimerOut(); + this->mTimer.Update(); } // non-matching @@ -546,10 +543,9 @@ void ActorRupee::func_ov031_020e98c4() { } void ActorRupee::SetState(ActorState state) { - this->mState = state; - this->mTimerMax = -1; - this->mTimer = 0; - this->mUnk_EC = 0; + this->mState = state; + this->mTimer.Reset(); + this->mUnk_EC = 0; CALL_PTMF(PTMF, data_ov031_02113520[this->mState]); } @@ -557,7 +553,7 @@ extern "C" void func_01fff17c(unk16 *, UnkStruct_027e0ce0 *, unk32); extern "C" void func_02018114(unk16 *, unk32); // non-matching -void ActorRupee::vfunc_20() { +void ActorRupee::Update() { short sVar1; unk16 uVar2; unk16 uVar3; diff --git a/src/031_Land/Actor/ActorShotArrow.cpp b/src/031_Land/Actor/ActorShotArrow.cpp index 645b0f4e..23700c46 100644 --- a/src/031_Land/Actor/ActorShotArrow.cpp +++ b/src/031_Land/Actor/ActorShotArrow.cpp @@ -169,9 +169,9 @@ ActorShotArrow::~ActorShotArrow() { } } -bool ActorShotArrow::vfunc_18(unk32 param1) { - fx32 sin_value = SIN((u16) this->mAngle); - fx32 cos_value = COS((u16) this->mAngle); +bool ActorShotArrow::Init(unk32 param1) { + fx32 sin_value = SIN((u16) this->mAngle.angle_s); + fx32 cos_value = COS((u16) this->mAngle.angle_s); this->mUnk_2C = 0; this->mVel.x = MUL_FX32(sin_value, 1024); @@ -203,14 +203,14 @@ void ActorShotArrow::func_ov031_020f1868() { void ActorShotArrow::func_ov031_020f1874() {} static PTMF data_ov031_021142c0[ActorShotArrowState_Max] = { - ActorShotArrow::func_ov031_020f1a64, // ActorShotArrowState_0 - ActorShotArrow::func_ov031_020f1c24, // ActorShotArrowState_1 - ActorShotArrow::func_ov031_020f1dd4, // ActorShotArrowState_2 - ActorShotArrow::func_ov031_020f1f54, // ActorShotArrowState_3 - ActorShotArrow::func_ov031_020f206c, // ActorShotArrowState_4 - ActorShotArrow::func_ov031_020f2134, // ActorShotArrowState_5 - ActorShotArrow::func_ov031_020f21dc, // ActorShotArrowState_6 - ActorShotArrow::func_ov031_020f1874 // ActorShotArrowState_7 + &ActorShotArrow::func_ov031_020f1a64, // ActorShotArrowState_0 + &ActorShotArrow::func_ov031_020f1c24, // ActorShotArrowState_1 + &ActorShotArrow::func_ov031_020f1dd4, // ActorShotArrowState_2 + &ActorShotArrow::func_ov031_020f1f54, // ActorShotArrowState_3 + &ActorShotArrow::func_ov031_020f206c, // ActorShotArrowState_4 + &ActorShotArrow::func_ov031_020f2134, // ActorShotArrowState_5 + &ActorShotArrow::func_ov031_020f21dc, // ActorShotArrowState_6 + &ActorShotArrow::func_ov031_020f1874 // ActorShotArrowState_7 }; void ActorShotArrow::SetState(ActorShotArrowState state) { @@ -246,17 +246,17 @@ void ActorShotArrow::vfunc_24() { void ActorShotArrow::func_ov031_020f1958() {} static PTMF data_ov031_02114300[ActorShotArrowState_Max] = { - ActorShotArrow::func_ov031_020f1b04, // ActorShotArrowState_0 - ActorShotArrow::func_ov031_020f1c7c, // ActorShotArrowState_1 - ActorShotArrow::func_ov031_020f1e3c, // ActorShotArrowState_2 - ActorShotArrow::func_ov031_020f2010, // ActorShotArrowState_3 - ActorShotArrow::func_ov031_020f20bc, // ActorShotArrowState_4 - ActorShotArrow::func_ov031_020f2160, // ActorShotArrowState_5 - ActorShotArrow::func_ov031_020f2214, // ActorShotArrowState_6 - ActorShotArrow::func_ov031_020f1958 // ActorShotArrowState_7 + &ActorShotArrow::func_ov031_020f1b04, // ActorShotArrowState_0 + &ActorShotArrow::func_ov031_020f1c7c, // ActorShotArrowState_1 + &ActorShotArrow::func_ov031_020f1e3c, // ActorShotArrowState_2 + &ActorShotArrow::func_ov031_020f2010, // ActorShotArrowState_3 + &ActorShotArrow::func_ov031_020f20bc, // ActorShotArrowState_4 + &ActorShotArrow::func_ov031_020f2160, // ActorShotArrowState_5 + &ActorShotArrow::func_ov031_020f2214, // ActorShotArrowState_6 + &ActorShotArrow::func_ov031_020f1958 // ActorShotArrowState_7 }; -void ActorShotArrow::vfunc_20() { +void ActorShotArrow::Update() { this->mUnk_3C = &this->mUnk_140; CALL_PTMF(PTMF, data_ov031_02114300[this->mState]); @@ -287,30 +287,28 @@ void ActorShotArrow::vfunc_20() { this->func_ov031_020f229c(); } -// non-matching void ActorShotArrow::func_ov031_020f1a64() { if (this->mUnk_5C.mParams[1] == 0x1 || this->mUnk_5C.mParams[1] == 0x4) { - this->mTimer = 0x0; - this->mTimerMax = 0x78; + this->mTimer.Set(0, 120); } else { - this->mTimer = 0x0; - this->mTimerMax = 0x3C; + this->mTimer.max = 60; + *(u16 *) &this->mTimer.value = 0; //! TODO: for some reasons volatile don't match here } unk32 value_func_020f2270 = this->func_ov031_020f2270(); - unk16 sin_value = SIN((u16) this->mAngle); - unk16 cos_value = COS((u16) this->mAngle); + fx16 sin_value = SIN(this->mAngle.angle_u); + fx16 cos_value = COS(this->mAngle.angle_u); this->mVel.x = MUL_FX32(sin_value, value_func_020f2270); - this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = MUL_FX32(cos_value, value_func_020f2270); + this->mVel.y = FLOAT_TO_FX32(0.0f); } // non-matching void ActorShotArrow::func_ov031_020f1b04() { UnkStruct_020f1b04 stack; - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->SetState(ActorShotArrowState_6); return; } @@ -365,12 +363,12 @@ void ActorShotArrow::func_ov031_020f1c7c() { VecFx32_Copy(&this->mUnk_1C8.mUnk_00->mPos, &this->mPos); - s16 delta = this->mUnk_1C8.mUnk_00->mAngle - this->mUnk_1C8.mUnk_10; + 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 + (s16) (this->mUnk_1C8.mUnk_12 - this->mUnk_1C8.mUnk_10); + this->mAngle = this->mUnk_1C8.mUnk_00->mAngle.angle_s + (s16) (this->mUnk_1C8.mUnk_12 - this->mUnk_1C8.mUnk_10); } else { this->func_ov031_020f2c08(0x400); } @@ -395,20 +393,18 @@ void ActorShotArrow::func_ov031_020f1dd4() { this->mUnk_174 = 0x1555; data_027e09a8->func_ov000_02071b30(0x8D7A, &this->mPos, 0); - this->mUnk_16C = 0; - this->mTimer = 0; - this->mTimerMax = this->mUnk_258; + this->mUnk_16C = 0; + this->mTimer.Set(0, this->mUnk_258); } void ActorShotArrow::func_ov031_020f1e3c() { - if (!this->mUnk_25B && this->IsTimerOut()) { + if (!this->mUnk_25B && this->mTimer.HasExpired()) { if (this->func_ov031_020f3210(0x1)) { this->Kill(); return; } - this->mTimerMax = this->mUnk_258; - this->mTimer = 0; + this->mTimer.Set(0, this->mUnk_258); } Actor *targetActor = this->mUnk_1C8.mUnk_00; @@ -601,7 +597,7 @@ void ActorShotArrow::vfunc_2C(Actor_vfunc_30 *param1) { } else { VecFx32_Copy(&this->mPos, &stack.mUnk_30.zColumn); - Mat3p_InitYRotation(&stack.mUnk_30, SIN((u16) this->mAngle), COS((u16) this->mAngle)); + Mat3p_InitYRotation(&stack.mUnk_30, SIN((u16) this->mAngle.angle_s), COS((u16) this->mAngle.angle_s)); Mat3p_InitXRotation(&stack.mUnk_30, SIN((u16) (s16) (this->mUnk_174 + this->mUnk_176)), COS((u16) (s16) (this->mUnk_174 + this->mUnk_176))); @@ -621,7 +617,7 @@ void ActorShotArrow::vfunc_2C(Actor_vfunc_30 *param1) { } } - data_027e09b4->func_ov017_020c08c4(&this->mPos, 0x7B, 0x666, var4, this->mAngle, 0x1); + data_027e09b4->func_ov017_020c08c4(&this->mPos, 0x7B, 0x666, var4, this->mAngle.angle_s, 0x1); } // non-matching @@ -687,7 +683,7 @@ void ActorShotArrow::func_ov031_020f28ac() { this->func_ov031_020f2cac(&vec1, true); break; - case 0x4: + case 0x4: { Actor *actor = gpActorManager->func_01fff3b4(this->mUnk_140.mUnk_0C); if (actor != NULL) { @@ -696,6 +692,7 @@ void ActorShotArrow::func_ov031_020f28ac() { } break; + } case 0xE: if (this->mUnk_140.mUnk_0C.index == 0x102) { bool var = false; @@ -720,7 +717,7 @@ void ActorShotArrow::func_ov031_020f28ac() { } } break; - case 0xF: + 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); } @@ -729,6 +726,7 @@ void ActorShotArrow::func_ov031_020f28ac() { func_01ffb714(&this->mPos, result, &vec1); this->func_ov031_020f2cac(&vec1, true); break; + } case 0x3: if (this->mUnk_140.mUnk_0C.type != ActorRefType_0) { Actor *actor = gpActorManager->func_01fff3b4(this->mUnk_140.mUnk_0C); @@ -783,8 +781,8 @@ void ActorShotArrow::func_ov031_020f2bec() { void ActorShotArrow::func_ov031_020f2c08(unk16 param1) { VecFx32 vel; - this->mVel.x = MUL_FX32(SIN((u16) this->mAngle), param1); - this->mVel.z = MUL_FX32(COS((u16) this->mAngle), param1); + this->mVel.x = MUL_FX32(SIN((u16) this->mAngle.angle_s), param1); + this->mVel.z = MUL_FX32(COS((u16) this->mAngle.angle_s), param1); this->mVel.y = FLOAT_TO_FX32(0.0f); vel = this->mVel; @@ -826,14 +824,14 @@ void ActorShotArrow::func_ov031_020f2cac(VecFx32 *param1, bool param2) { if (param2) { pos = this->mPos; - this->mPos.x -= FLOAT_TO_FX32(SIN((u16) this->mAngle)); - this->mPos.z -= FLOAT_TO_FX32(COS((u16) this->mAngle)); + this->mPos.x -= FLOAT_TO_FX32(SIN((u16) this->mAngle.angle_s)); + this->mPos.z -= FLOAT_TO_FX32(COS((u16) this->mAngle.angle_s)); data_027e09a8->func_ov000_02071eac(&this->mPos); data_027e09a8->func_ov000_02071b30(0x8D7B, &pos, 0x0); - vec.x = (fx16) FLOAT_TO_FX32(SIN((u16) (this->mAngle - 0x8000))); + vec.x = (fx16) FLOAT_TO_FX32(SIN((u16) (this->mAngle.angle_s - 0x8000))); vec.y = (fx16) FLOAT_TO_FX32(0.0f); - vec.z = (fx16) FLOAT_TO_FX32(COS((u16) (this->mAngle - 0x8000))); + vec.z = (fx16) FLOAT_TO_FX32(COS((u16) (this->mAngle.angle_s - 0x8000))); data_027e0cec->func_ov000_0209feac(0x804, &pos, 0x2, 0x0, 0x0); data_027e0cec->func_ov000_0209ff24(0x805, &pos, &vec, 2); @@ -876,7 +874,7 @@ void ActorShotArrow::func_ov031_020f3000() { vec.y = FLOAT_TO_FX32(0.0f); vec.z = FLOAT_TO_FX32(0.4f); - Mat3p_InitYRotation(&m1, SIN((u16) this->mAngle), COS((u16) this->mAngle)); + Mat3p_InitYRotation(&m1, SIN((u16) this->mAngle.angle_s), COS((u16) this->mAngle.angle_s)); Mat3p_InitXRotation(&m2, SIN((u16) (s16) (this->mUnk_174 + this->mUnk_176)), COS((u16) (s16) (this->mUnk_174 + this->mUnk_176))); @@ -899,7 +897,7 @@ void ActorShotArrow::func_ov031_020f311c(Mat4x3p *param1) { if (param1 != NULL) { Mat4x3p_InitXRotation(&m1, SIN((u16) this->mUnk_176), COS((u16) this->mUnk_176)); - Mat4x3p_InitYRotation(&m2, SIN((u16) this->mAngle), COS((u16) this->mAngle)); + Mat4x3p_InitYRotation(&m2, SIN((u16) this->mAngle.angle_s), COS((u16) this->mAngle.angle_s)); func_01ffad5c(&m1, &m2, &m1); @@ -1052,7 +1050,7 @@ void ActorShotArrow_194::vfunc_10(Actor *actor) { 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); - this->mUnk_2C->mUnk_1C8.mUnk_10 = actor->mAngle; + this->mUnk_2C->mUnk_1C8.mUnk_10 = actor->mAngle.angle_s; this->mUnk_2C->mUnk_1C8.mUnk_12 = result; } break; @@ -1106,7 +1104,7 @@ void ActorShotArrow_194::vfunc_10(Actor *actor) { 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); - this->mUnk_2C->mUnk_1C8.mUnk_10 = actor->mAngle; + this->mUnk_2C->mUnk_1C8.mUnk_10 = actor->mAngle.angle_s; this->mUnk_2C->mUnk_1C8.mUnk_12 = result; } } @@ -1140,7 +1138,7 @@ bool ActorShotArrow_194::vfunc_0C(Actor *actor, VecFx32 *vector) { void ActorShotArrow::func_ov031_020f3d04(unk16 param1) { this->mUnk_176 = param1; - func_01ff9638(&this->mVel, -this->mAngle); + func_01ff9638(&this->mVel, -this->mAngle.angle_s); func_01ff95a0(&this->mVel, param1); - func_01ff9638(&this->mVel, this->mAngle); + func_01ff9638(&this->mVel, this->mAngle.angle_s); } diff --git a/src/031_Land/Actor/ActorUnkATTG.cpp b/src/031_Land/Actor/ActorUnkATTG.cpp index d435839a..3fb4a450 100644 --- a/src/031_Land/Actor/ActorUnkATTG.cpp +++ b/src/031_Land/Actor/ActorUnkATTG.cpp @@ -18,7 +18,7 @@ ActorProfileUnkATTG::ActorProfileUnkATTG() : ActorUnkATTG::ActorUnkATTG() : mUnk_94(-0x1) {} -bool ActorUnkATTG::vfunc_18(unk32 param1) { +bool ActorUnkATTG::Init(unk32 param1) { if (this->mUnk_5C.mUnk_1A[0] == 0x0 || !this->func_ov000_02098a60(0x0) || this->mUnk_5C.mParams[1] != 0x0) { this->func_ov031_020f3eec(0x0, 0x1); } else { @@ -27,7 +27,7 @@ bool ActorUnkATTG::vfunc_18(unk32 param1) { return true; } -void ActorUnkATTG::vfunc_20() { +void ActorUnkATTG::Update() { switch (this->mState) { case ActorUnkATTGState_0: if (!this->func_ov031_020f4014()) { @@ -53,13 +53,13 @@ void ActorUnkATTG::vfunc_24() { if (!data_027e09b8->func_ov000_020732ec(this->mUnk_94)) { return; } - this->vfunc_20(); + this->Update(); } void ActorUnkATTG::func_ov031_020f3eec(ActorState state, unk32 param2) { this->mState = state; switch (this->mState) { - case ActorUnkATTGState_1: + case ActorUnkATTGState_1: { UnkStackStruct1 stack; func_ov000_02072fd0(&stack); @@ -88,6 +88,7 @@ void ActorUnkATTG::func_ov031_020f3eec(ActorState state, unk32 param2) { this->mUnk_94 = data_027e09b8->func_ov000_02073388(&stack, 0x0); break; + } case ActorUnkATTGState_2: if (param2 == 0x0) { data_ov000_020b5214.func_ov000_0206db44(0x2); diff --git a/src/031_Land/Actor/ActorUnkEFSB.cpp b/src/031_Land/Actor/ActorUnkEFSB.cpp index 01aaeb18..1cffe1df 100644 --- a/src/031_Land/Actor/ActorUnkEFSB.cpp +++ b/src/031_Land/Actor/ActorUnkEFSB.cpp @@ -22,7 +22,7 @@ ActorUnkEFSB::ActorUnkEFSB() : mUnk_0F8(&this->mUnk_0F8.mUnk_1C, &this->mUnk_098, GET_PROFILE(ActorProfileUnkEFSB)->vfunc_04()), mUnk_154(&this->mUnk_154.mUnk_1C, &this->mUnk_098, GET_PROFILE(ActorProfileUnkEFSB)->vfunc_04()) {} -bool ActorUnkEFSB::vfunc_18(unk32 param1) { +bool ActorUnkEFSB::Init(unk32 param1) { this->mUnk_0F8.vfunc_1C(data_ov031_02114ed0[0], 0x1000, 0x11F, 0x0); this->mUnk_154.func_ov000_02099ff8(data_ov031_02114ed0[0], 0x1000); @@ -35,7 +35,7 @@ bool ActorUnkEFSB::vfunc_18(unk32 param1) { return true; } -void ActorUnkEFSB::vfunc_20() { +void ActorUnkEFSB::Update() { if (this->mUnk_094 != 0x0) { return; } @@ -44,7 +44,7 @@ void ActorUnkEFSB::vfunc_20() { } void ActorUnkEFSB::vfunc_24() { - this->vfunc_20(); + this->Update(); } void ActorUnkEFSB::vfunc_54(unk32 param1) { @@ -60,5 +60,5 @@ void ActorUnkEFSB::vfunc_2C(Actor_vfunc_30 *param1) { VecFx32 sp0 = this->mPos; sp0.y += FLOAT_TO_FX32(0.85f); - this->mUnk_098.func_01ffc634(&vec, this->mAngleStruct, &sp0); + this->mUnk_098.func_01ffc634(&vec, this->mAngle, &sp0); } diff --git a/src/031_Land/Actor/ActorUnkFLEN.cpp b/src/031_Land/Actor/ActorUnkFLEN.cpp index 61ca5ef9..57da0cf8 100644 --- a/src/031_Land/Actor/ActorUnkFLEN.cpp +++ b/src/031_Land/Actor/ActorUnkFLEN.cpp @@ -18,7 +18,7 @@ ActorProfileUnkFLEN::ActorProfileUnkFLEN() : ActorUnkFLEN::ActorUnkFLEN() : mUnk_94(0) {} -bool ActorUnkFLEN::vfunc_18(int param1) { +bool ActorUnkFLEN::Init(int param1) { this->mUnk_94 = this->mUnk_5C.mParams[1]; if (this->mUnk_5C.mParams[1] >= (s16) 0x2) { @@ -33,8 +33,8 @@ bool ActorUnkFLEN::vfunc_18(int param1) { return true; } -void ActorUnkFLEN::vfunc_20() { - this->IsTimerOut(); +void ActorUnkFLEN::Update() { + this->mTimer.Update(); switch (this->mState) { case ActorUnkFLENState_0: @@ -83,7 +83,7 @@ bool ActorUnkFLEN::func_ov031_020f81f8() { actorParams.mUnk_28 = 0; actorParams.func_ov000_020975f8(); actorParams.mUnk_28 = this->mRef; - actorParams.mInitialAngle = this->mAngle; + actorParams.mInitialAngle = this->mAngle.angle_s; VecFx32_Copy(&this->mPos, &actorParams.mInitialPos); actorParams.mInitialPos.y += FLOAT_TO_FX32(5.0f); diff --git a/src/031_Land/Actor/ActorUnkMLCK.cpp b/src/031_Land/Actor/ActorUnkMLCK.cpp index 3bd6a115..75fa1998 100644 --- a/src/031_Land/Actor/ActorUnkMLCK.cpp +++ b/src/031_Land/Actor/ActorUnkMLCK.cpp @@ -39,8 +39,7 @@ ActorProfileUnkMLCK::ActorProfileUnkMLCK() : ActorUnkMLCK::ActorUnkMLCK() : mUnk_B4(mUnk_A0), mUnk_BC(0x4), - mUnk_C0(0x0), - mUnk_C2(0x0), + mUnk_C0(0, 0), mUnk_D8(this), mUnk_E4(this), mUnk_F0(false), @@ -49,7 +48,7 @@ ActorUnkMLCK::ActorUnkMLCK() : mUnk_F3(true), mUnk_F4(-1) {} -bool ActorUnkMLCK::vfunc_18(unk32 param1) { +bool ActorUnkMLCK::Init(unk32 param1) { this->mUnk_B8 = this->mUnk_5C.mParams[0]; UnkStruct_ov031_02112ad4 local_9c(ActorId_MLCK, this->mUnk_5C.mParams[0]); @@ -82,8 +81,7 @@ bool ActorUnkMLCK::vfunc_18(unk32 param1) { // non-matching void ActorUnkMLCK::vfunc_64(unk32 param1) { this->mUnk_BC = param1; - this->mUnk_C2 = 0xFFFF; - this->mUnk_C0 = 0x0; + this->mUnk_C0.Reset(); if (param1 == 0x1) { this->mUnk_F1 = false; @@ -148,7 +146,7 @@ void ActorUnkMLCK::vfunc_70() { } void ActorUnkMLCK::func_ov031_020faf24() { - if (this->mUnk_C0 != 0xF) { + if (this->mUnk_C0.value != 15) { return; } diff --git a/src/031_Land/Actor/ActorUnkNFSP.cpp b/src/031_Land/Actor/ActorUnkNFSP.cpp index 8fcaf923..cdb40d4d 100644 --- a/src/031_Land/Actor/ActorUnkNFSP.cpp +++ b/src/031_Land/Actor/ActorUnkNFSP.cpp @@ -36,15 +36,14 @@ ActorProfileUnkNFSP::ActorProfileUnkNFSP() : ActorUnkNFSP::ActorUnkNFSP() : mUnk_94(0x4), - mUnk_98(0x0), - mUnk_9A(0x0), + mUnk_98(0, 0), mUnk_9C(NULL), mUnk_C0(this), mUnk_E4(0x0) { this->mUnk_40 = &this->mUnk_C0; } -bool ActorUnkNFSP::vfunc_18(unk32 param1) { +bool ActorUnkNFSP::Init(unk32 param1) { this->mUnk_9C = (MapObjectUnkSWFS *) param1; this->mUnk_C0.mUnk_08 = 0x0; @@ -61,7 +60,7 @@ bool ActorUnkNFSP::vfunc_18(unk32 param1) { return true; } -void ActorUnkNFSP::vfunc_20() { +void ActorUnkNFSP::Update() { this->mUnk_C0.mUnk_1C = 0x1; switch (this->mUnk_94) { @@ -80,9 +79,8 @@ void ActorUnkNFSP::vfunc_20() { default: break; } - if (this->mUnk_98 < this->mUnk_9A) { - ++this->mUnk_98; - } + + this->mUnk_98.Update(); } void ActorUnkNFSP::func_ov031_020fb988() { @@ -142,8 +140,7 @@ void ActorUnkNFSP::func_ov031_020fba60() { void ActorUnkNFSP::vfunc_54(unk32 param1) { this->mUnk_94 = param1; - this->mUnk_9A = 0xFFFF; - this->mUnk_98 = 0x0; + this->mUnk_98.Reset(); switch (param1) { case 0x0: @@ -155,7 +152,7 @@ void ActorUnkNFSP::vfunc_54(unk32 param1) { case 0x2: this->mUnk_40 = &this->mUnk_C0; break; - case 0x3: + case 0x3: { ActorUnkNFSP_vfunc_54 *actor = (ActorUnkNFSP_vfunc_54 *) gpActorManager->func_01fff3b4(this->mUnk_E4); if (actor != NULL) { actor->mUnk_2B0 = 0x0; @@ -167,6 +164,7 @@ void ActorUnkNFSP::vfunc_54(unk32 param1) { } this->mUnk_9C->func_ov031_0210d750(); break; + } default: break; } diff --git a/src/031_Land/Actor/ActorUnkNORE.cpp b/src/031_Land/Actor/ActorUnkNORE.cpp index 005d224d..07151edb 100644 --- a/src/031_Land/Actor/ActorUnkNORE.cpp +++ b/src/031_Land/Actor/ActorUnkNORE.cpp @@ -16,7 +16,7 @@ ActorProfileUnkNORE::ActorProfileUnkNORE() : ActorUnkNORE::ActorUnkNORE() {} -bool ActorUnkNORE::vfunc_18(unk32 param1) { +bool ActorUnkNORE::Init(unk32 param1) { Vec2bCpp local_vec; UnkStruct_027e0cd8_0C_Base *unk_obj = data_027e0cd8->mUnk_0C; @@ -25,7 +25,7 @@ bool ActorUnkNORE::vfunc_18(unk32 param1) { unk_obj->func_ov000_020801b0(&local_vec, 7, 1); - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); return true; } diff --git a/src/031_Land/Actor/ActorUnkNTTZ.cpp b/src/031_Land/Actor/ActorUnkNTTZ.cpp index 290f94b1..3bb31e55 100644 --- a/src/031_Land/Actor/ActorUnkNTTZ.cpp +++ b/src/031_Land/Actor/ActorUnkNTTZ.cpp @@ -21,11 +21,11 @@ ActorUnkNTTZ::ActorUnkNTTZ() : this->func_ov000_0209862c(0x0); } -bool ActorUnkNTTZ::vfunc_18(unk32 param1) { +bool ActorUnkNTTZ::Init(unk32 param1) { return true; } -void ActorUnkNTTZ::vfunc_20() {} +void ActorUnkNTTZ::Update() {} void ActorUnkNTTZ::vfunc_2C(Actor_vfunc_30 *param1) {} diff --git a/src/031_Land/Actor/ActorUnkRMTG.cpp b/src/031_Land/Actor/ActorUnkRMTG.cpp index 5825867c..203bbd6f 100644 --- a/src/031_Land/Actor/ActorUnkRMTG.cpp +++ b/src/031_Land/Actor/ActorUnkRMTG.cpp @@ -19,7 +19,7 @@ ActorProfileUnkRMTG::ActorProfileUnkRMTG() : ActorUnkRMTG::ActorUnkRMTG() : mUnk_94(NULL) {} -bool ActorUnkRMTG::vfunc_18(unk32 param1) { +bool ActorUnkRMTG::Init(unk32 param1) { this->mPos.x -= FLOAT_TO_FX32(0.5f); this->mPos.z -= FLOAT_TO_FX32(0.5f); @@ -38,7 +38,7 @@ bool ActorUnkRMTG::vfunc_18(unk32 param1) { return true; } -void ActorUnkRMTG::vfunc_1C() { +void ActorUnkRMTG::Setup() { UnkStruct_027e09bc_0C *data = data_027e09bc->mUnk_04[2]; data->func_ov000_0207834c(&this->mPos, func_ov000_02077590(0x7), 0x0); } diff --git a/src/031_Land/Actor/ActorUnkROCK.cpp b/src/031_Land/Actor/ActorUnkROCK.cpp index 3bfadf47..f0e6c769 100644 --- a/src/031_Land/Actor/ActorUnkROCK.cpp +++ b/src/031_Land/Actor/ActorUnkROCK.cpp @@ -31,7 +31,7 @@ ActorUnkROCK::ActorUnkROCK() : this->mUnk_4A[1] = 0x02; } -bool ActorUnkROCK::vfunc_18(unk32 param1) { +bool ActorUnkROCK::Init(unk32 param1) { this->mUnk_A0.mUnk_04 = this->mRef; this->mUnk_A0.mUnk_08 = &this->mPos; this->mUnk_A0.mUnk_0C = &data_ov031_021166b8; @@ -41,7 +41,7 @@ bool ActorUnkROCK::vfunc_18(unk32 param1) { return true; } -void ActorUnkROCK::vfunc_20() { +void ActorUnkROCK::Update() { VecFx32_Copy(&this->mPos, &this->mPrevPos); switch (this->mState) { case ActorUnkROCKState_1: @@ -64,8 +64,7 @@ void ActorUnkROCK::vfunc_20() { } void ActorUnkROCK::func_ov031_020e8a48(ActorState state) { - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0000; + this->mTimer.Reset(); if (this->mState == ActorUnkROCKState_0) { data_027e09c0->func_ov000_0207e254(&this->mUnk_A0); diff --git a/src/031_Land/Actor/ActorUnkSCCN.cpp b/src/031_Land/Actor/ActorUnkSCCN.cpp index 1bb85e44..cd2d109f 100644 --- a/src/031_Land/Actor/ActorUnkSCCN.cpp +++ b/src/031_Land/Actor/ActorUnkSCCN.cpp @@ -17,7 +17,7 @@ ActorProfileUnkSCCN::ActorProfileUnkSCCN() : ActorUnkSCCN::ActorUnkSCCN() {} // non-matching -bool ActorUnkSCCN::vfunc_18(unk32 param1) { +bool ActorUnkSCCN::Init(unk32 param1) { if (this->mUnk_5C.mParams[1] == 0x0) { return false; } @@ -51,7 +51,7 @@ bool ActorUnkSCCN::vfunc_18(unk32 param1) { this->mUnk_94.mUnk_07 = 0x13; } else { unk32 var; - switch (((u32) (this->mAngle + DEG_TO_ANG(45)) << 0x10) >> 0x1E) { + switch (((u32) (this->mAngle.angle_s + DEG_TO_ANG(45)) << 0x10) >> 0x1E) { case 0: var = 9; break; diff --git a/src/031_Land/Actor/ActorUnkSKDO.cpp b/src/031_Land/Actor/ActorUnkSKDO.cpp index 54fda5a2..e94a3a05 100644 --- a/src/031_Land/Actor/ActorUnkSKDO.cpp +++ b/src/031_Land/Actor/ActorUnkSKDO.cpp @@ -19,11 +19,11 @@ ActorProfileUnkSKDO::ActorProfileUnkSKDO() : ActorUnkSKDO::ActorUnkSKDO() : mUnk_98(NULL) {} -bool ActorUnkSKDO::vfunc_18(unk32 param1) { +bool ActorUnkSKDO::Init(unk32 param1) { return true; } -void ActorUnkSKDO::vfunc_1C() { +void ActorUnkSKDO::Setup() { ActorUnkSKDO_ov031_02115ce8 stack(MapObjectId_SKDI); stack.mUnk_08 = this->mPos; stack.mUnk_14 = FLOAT_TO_FX32(2.0f); @@ -35,7 +35,7 @@ void ActorUnkSKDO::vfunc_1C() { } } -void ActorUnkSKDO::vfunc_20() { +void ActorUnkSKDO::Update() { unk32 var2 = 0x0; if (this->mUnk_98->vfunc_40() == 0x2) { var2 = 0x1; diff --git a/src/031_Land/Actor/ActorUnkSWBM.cpp b/src/031_Land/Actor/ActorUnkSWBM.cpp index 1613809d..54a0053e 100644 --- a/src/031_Land/Actor/ActorUnkSWBM.cpp +++ b/src/031_Land/Actor/ActorUnkSWBM.cpp @@ -36,7 +36,7 @@ bool ActorUnkSWBM_98::vfunc_0C(Actor *param1, VecFx32 *vector) { return retValue; } - u16 angle = this->mUnk_2C->mAngle; + u16 angle = this->mUnk_2C->mAngle.angle_s; vector->x = SIN(angle); vector->y = FLOAT_TO_FX32(0.0f); @@ -76,7 +76,7 @@ void ActorUnkSWBM_C8::vfunc_00(unk32 param1, unk32 param2) { Mat3p mat; - u16 angle = actor->mAngle; + u16 angle = actor->mAngle.angle_s; Mat3p_InitYRotation(&mat, SIN(angle), COS(angle)); s16 var_r8 = 0xB33; @@ -115,12 +115,11 @@ ActorUnkSWBM::ActorUnkSWBM() : mUnk_108(0x0), mUnk_10A(0x0) { MI_CpuFill32(0x0, this->mUnk_0E4, ARRAY_LEN(this->mUnk_0E4) * sizeof *this->mUnk_0E4); - this->mState = ActorUnkSWBMState_0; - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0000; + this->mState = ActorUnkSWBMState_0; + this->mTimer.Reset(); } -bool ActorUnkSWBM::vfunc_18(unk32 param1) { +bool ActorUnkSWBM::Init(unk32 param1) { this->mUnk_44 = 0x1F; this->mUnk_098.mUnk_04 = this->mRef; @@ -128,8 +127,8 @@ bool ActorUnkSWBM::vfunc_18(unk32 param1) { VecFx32_Copy(&this->mPos, &this->mUnk_098.mUnk_0C.pos); this->mUnk_098.mUnk_0C.size = FLOAT_TO_FX32(0.35f); - this->mVel.x = MUL_FX32(SIN((u16) this->mAngle), 0xB33); - this->mVel.z = MUL_FX32(COS((u16) this->mAngle), 0xB33); + this->mVel.x = MUL_FX32(SIN((u16) this->mAngle.angle_s), 0xB33); + this->mVel.z = MUL_FX32(COS((u16) this->mAngle.angle_s), 0xB33); this->mVel.y = FLOAT_TO_FX32(0.0f); return true; } @@ -163,7 +162,7 @@ void ActorUnkSWBM::func_ov031_020e6d80(unk32 param1) { data_027e0cec->func_ov000_0209feac(0x8E0, &this->mPos, 0x1, 0x0, 0x0); - s16 angle = this->mAngle - DEG_TO_ANG(180); + s16 angle = this->mAngle.angle_s - DEG_TO_ANG(180); vecSp08.x = SIN((u16) angle); vecSp08.y = FLOAT_TO_FX32(0.0f); @@ -179,7 +178,7 @@ void ActorUnkSWBM::func_ov031_020e6d80(unk32 param1) { void ActorUnkSWBM::func_ov031_020e6e84(ActorState state) { switch (state) { case ActorUnkSWBMState_2: - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); break; case ActorUnkSWBMState_1: if (this->mUnk_0E0 > 0x6) { @@ -190,13 +189,12 @@ void ActorUnkSWBM::func_ov031_020e6e84(ActorState state) { this->mVel.z /= 3; break; } - this->mState = state; - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0000; + this->mState = state; + this->mTimer.Reset(); } // non-matching -void ActorUnkSWBM::vfunc_20() { +void ActorUnkSWBM::Update() { VecFx32_Copy(&this->mPos, &this->mPrevPos); VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); @@ -220,7 +218,7 @@ void ActorUnkSWBM::vfunc_20() { } } - this->IsTimerOut(); + this->mTimer.Update(); if (this->mState != ActorUnkSWBMState_2) { if (!Actor::func_ov017_020beeec(0x0)) { @@ -234,8 +232,7 @@ void ActorUnkSWBM::vfunc_20() { } switch (this->mState) { - case ActorUnkSWBMState_0: - + case ActorUnkSWBMState_0: { if (this->func_ov000_02098ab4(0x4, 0x19, 0x2, &this->mVel)) { this->func_ov031_020e6d80(-0x1); } else { @@ -258,8 +255,11 @@ void ActorUnkSWBM::vfunc_20() { this->func_ov031_020e6d80(-0x1); break; + } case ActorUnkSWBMState_1: break; + default: + break; } } @@ -268,7 +268,7 @@ void ActorUnkSWBM::vfunc_24() { this->func_ov031_020e6e84(ActorUnkSWBMState_1); return; } - this->vfunc_20(); + this->Update(); } // non-matching diff --git a/src/031_Land/Actor/ActorUnkSWCH.cpp b/src/031_Land/Actor/ActorUnkSWCH.cpp index df7b07db..b62d2f94 100644 --- a/src/031_Land/Actor/ActorUnkSWCH.cpp +++ b/src/031_Land/Actor/ActorUnkSWCH.cpp @@ -17,13 +17,13 @@ ActorProfileUnkSWCH::ActorProfileUnkSWCH() : ActorUnkSWCH::ActorUnkSWCH() : mUnk_94(0x1) {} -bool ActorUnkSWCH::vfunc_18(unk32 param1) { +bool ActorUnkSWCH::Init(unk32 param1) { this->mUnk_98.mUnk_04 = 0x0; this->mUnk_98.mUnk_04 |= 0x10000; return true; } -void ActorUnkSWCH::vfunc_20() { +void ActorUnkSWCH::Update() { if (!this->func_ov000_02098a60(0x0) && this->mUnk_5C.mUnk_1A[0] != 0x0) { return; } diff --git a/src/031_Land/Actor/ActorUnkSWON.cpp b/src/031_Land/Actor/ActorUnkSWON.cpp index 18070cef..25b937d2 100644 --- a/src/031_Land/Actor/ActorUnkSWON.cpp +++ b/src/031_Land/Actor/ActorUnkSWON.cpp @@ -12,7 +12,7 @@ ActorProfileUnkSWON::ActorProfileUnkSWON() : ActorUnkSWON::ActorUnkSWON() {} -bool ActorUnkSWON::vfunc_18(unk32 param1) { +bool ActorUnkSWON::Init(unk32 param1) { switch (this->mUnk_5C.mParams[0]) { case 0x0: if (!this->func_ov000_02098a60(0x1)) { diff --git a/src/031_Land/Actor/ActorUnkTGTZ.cpp b/src/031_Land/Actor/ActorUnkTGTZ.cpp index b0e52cf2..5a2c3c7f 100644 --- a/src/031_Land/Actor/ActorUnkTGTZ.cpp +++ b/src/031_Land/Actor/ActorUnkTGTZ.cpp @@ -43,12 +43,10 @@ ActorUnkTGTZ::ActorUnkTGTZ() : mUnk_1B4(NULL), mUnk_1B8(0x0), mUnk_1BC(-0x1), - mUnk_1C0(0x0), - mUnk_1C2(0x0), + mUnk_1C0(0, 0), mUnk_1C4(FLOAT_TO_FX32(0.0f)), mUnk_1CC(0x0), - mUnk_1D0(0x0), - mUnk_1D2(0x0), + mUnk_1D0(0, 0), mUnk_1D4(0x0), mUnk_1D6(0x0), mUnk_1D8(false), @@ -61,16 +59,16 @@ ActorUnkTGTZ::ActorUnkTGTZ() : void ActorUnkTGTZ::func_ov031_020f6984() {} // non-matching -bool ActorUnkTGTZ::vfunc_18(unk32 param1) { +bool ActorUnkTGTZ::Init(unk32 param1) { if (this->mUnk_5C.mUnk_1A[0] != 0x0) { this->mPos.y = MUL_FX32(this->mUnk_5C.mUnk_1A[0] << 0xC, 0x1333); } - Mat3p_InitYRotation(&this->mUnk_190, SIN((u16) this->mAngle), COS((u16) this->mAngle)); + Mat3p_InitYRotation(&this->mUnk_190, SIN((u16) this->mAngle.angle_s), COS((u16) this->mAngle.angle_s)); data_ov031_02116b58.func_ov000_0205fc20(0x5D, 0x32, NULL, NULL); ((UnkStruct_ov019_020d24c8_28_258_00 *) GET_PROFILE(ActorProfileUnkNTTZ))->func_ov000_0205fc20(0x5D, 0x31, NULL, NULL); unk32 temp_r3_2 = this->mUnk_5C.mParams[1]; - unk32 temp_r0 = (u16) (((s16) this->mAngle + 0x2000)) >> 0xE; + unk32 temp_r0 = (u16) (((s16) this->mAngle.angle_s + 0x2000)) >> 0xE; if ((temp_r0 != 0) && (temp_r0 != 2)) { this->mUnk_1C8 = (UnkStruct_ov019_020d24c8_28_258_00 *) GET_PROFILE(ActorProfileUnkNTTZ); } else { @@ -97,9 +95,9 @@ bool ActorUnkTGTZ::vfunc_18(unk32 param1) { } // non-matching -void ActorUnkTGTZ::vfunc_20() { +void ActorUnkTGTZ::Update() { switch (this->mUnk_1B8) { - case 0x0: + case 0x0: { if (!this->func_ov000_02098a60(0x0)) { break; } @@ -119,8 +117,8 @@ void ActorUnkTGTZ::vfunc_20() { stack.mUnk_24 = r3->mUnk_0C; + u16 unk_18 = *(volatile u16 *) &r3->mUnk_18; //! TODO: Timer? u16 unk_1A = r3->mUnk_1A; - u16 unk_18 = r3->mUnk_18; stack.mUnk_30 = unk_18; stack.mUnk_32 = unk_1A; @@ -137,6 +135,7 @@ void ActorUnkTGTZ::vfunc_20() { this->mUnk_1BC = data_027e09b8->func_ov000_02073388(&stack, 0x0); this->func_ov031_020f6f20(0x1); break; + } case 0x2: if (this->mUnk_5C.mUnk_1A[0] == 0x0) { break; @@ -150,13 +149,14 @@ void ActorUnkTGTZ::vfunc_20() { } this->func_ov031_020f6f20(0x0); break; - case 0x1: + case 0x1: { if (data_027e09b8->func_ov000_020732ec(this->mUnk_1BC) == 0x0) { return; } - u16 var1 = this->mUnk_1C2; - u16 var2 = this->mUnk_1C0; - if (var2 >= var1) { + + u16 max = this->mUnk_1C0.max; + u16 time = this->mUnk_1C0.value; + if (time >= max) { data_027e09a8->func_ov000_02071b30(0xF0, &this->mPos, 0x0); this->func_ov031_020f6f20(0x2); if (!this->mUnk_5C.mUnk_0F) { @@ -165,12 +165,13 @@ void ActorUnkTGTZ::vfunc_20() { data_027e09a8->func_ov000_020716dc(0x1E); return; } - if (var2 >= var1) { + if (time >= max) { func_01ff916c(&this->mUnk_1C4, 0x0, 0x333); } break; + } case 0x3: - if (!this->IsInternalTimerOut()) { + if (!this->mUnk_1D0.HasExpired()) { break; } this->func_ov031_020f6f20(0x5); @@ -194,7 +195,7 @@ void ActorUnkTGTZ::vfunc_20() { this->func_ov031_020f6f20(0x3); break; case 0x6: - if (!this->IsInternalTimerOut()) { + if (!this->mUnk_1D0.HasExpired()) { break; } this->func_ov031_020f6f20(0x4); @@ -211,13 +212,12 @@ void ActorUnkTGTZ::vfunc_20() { VecFx32_Init(vecSp00.x, vecSp00.y, vecSp00.z, &actor->mPos); VecFx32_Init(vecSp00.x, vecSp00.y, vecSp00.z, &actor->mPrevPos); } - if (this->mUnk_1C0 < this->mUnk_1C2) { - ++this->mUnk_1C0; - } + + this->mUnk_1C0.Update(); } void ActorUnkTGTZ::vfunc_24() { - this->vfunc_20(); + this->Update(); } void ActorUnkTGTZ::func_ov031_020f6e5c(ActorRef param1) { @@ -249,8 +249,7 @@ void ActorUnkTGTZ::func_ov031_020f6ea8(ActorRef *param0, u16 param1, const VecFx void ActorUnkTGTZ::func_ov031_020f6f20(unk32 param1) { this->mUnk_1B8 = param1; - this->mUnk_1C2 = 0xFFFF; - this->mUnk_1C0 = 0x0; + this->mUnk_1C0.Reset(); switch (param1) { case 0x0: @@ -260,15 +259,15 @@ void ActorUnkTGTZ::func_ov031_020f6f20(unk32 param1) { this->func_ov031_020f6e5c(this->mUnk_1DC); this->mUnk_1DC = 0x0; break; - case 0x1: - this->mUnk_1C2 = 0x1E; - this->mUnk_1C0 = 0x0; + case 0x1: { + this->mUnk_1C0.Set(0, 30); SET_FLAG(this->mFlags, ActorFlag_Visible); ActorRef ref; this->func_ov031_020f6ea8(&ref, 0x0, &this->mPos, 0x0, 0x1); this->mUnk_1DC = ref; break; - case 0x2: + } + case 0x2: { this->mUnk_1BC = -0x1; this->mUnk_1C4 = FLOAT_TO_FX32(0.0f); SET_FLAG(this->mFlags, ActorFlag_Visible); @@ -303,11 +302,11 @@ void ActorUnkTGTZ::func_ov031_020f6f20(unk32 param1) { this->func_ov031_020f6f20(0x3); break; + } case 0x3: this->mUnk_1C4 = FLOAT_TO_FX32(-1.0002f); SET_FLAG(this->mFlags, ActorFlag_Visible); - this->mUnk_1D2 = this->mUnk_1D4; - this->mUnk_1D0 = 0x0; + this->mUnk_1D0.Set(0, this->mUnk_1D4); break; case 0x5: data_027e09a8->func_ov000_02071b30(0x10E, &this->mPos, 0x0); @@ -318,8 +317,7 @@ void ActorUnkTGTZ::func_ov031_020f6f20(unk32 param1) { break; case 0x6: this->mUnk_1C4 = FLOAT_TO_FX32(1.0f); - this->mUnk_1D2 = this->mUnk_1D6; - this->mUnk_1D0 = 0x0; + this->mUnk_1D0.Set(0, this->mUnk_1D6); break; default: break; @@ -349,7 +347,7 @@ void ActorUnkTGTZ::vfunc_30(Actor_vfunc_30 *param1) { unk32 var_r5 = 0; unk32 var_r6 = 0; - switch (((u16) (((s16) this->mAngle + 0x2000)) >> 0xE)) { + switch (((u16) (((s16) this->mAngle.angle_s + 0x2000)) >> 0xE)) { case 0x3: var_r5 = 0x10000 >> 0x10; break; @@ -373,10 +371,10 @@ void ActorUnkTGTZ::vfunc_2C(Actor_vfunc_30 *param1) { if (this->mUnk_1CC == 0x0) { VecFx32_Init(-this->mUnk_1C4, FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &vec1); - func_01ff9638(&vec1, this->mAngle); + func_01ff9638(&vec1, this->mAngle.angle_s); } else { VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &vec1); - func_01ff9638(&vec1, this->mAngle); + func_01ff9638(&vec1, this->mAngle.angle_s); vec1.y = this->mUnk_1C4; } @@ -394,7 +392,7 @@ void ActorUnkTGTZ::func_ov031_020f7358() { params.mUnk_28 = 0x0; params.func_ov000_020975f8(); - params.mInitialAngle = this->mAngle; + params.mInitialAngle = this->mAngle.angle_s; params.mUnk_28 = this->mRef; Actor::func_ov000_020973f4(&ref, &data_ov000_020b539c_eur, ActorId_NTTZ, ¶ms, 0x0); diff --git a/src/031_Land/Actor/ActorUnkTLKT.cpp b/src/031_Land/Actor/ActorUnkTLKT.cpp index 61c96ec5..90413b49 100644 --- a/src/031_Land/Actor/ActorUnkTLKT.cpp +++ b/src/031_Land/Actor/ActorUnkTLKT.cpp @@ -83,7 +83,7 @@ void ActorUnkTLKT::vfunc_68() { void ActorUnkTLKT::vfunc_60(ActorState state) { switch (state) { - case ActorUnkTLKTState_1: + case ActorUnkTLKTState_1: { Actor *actor = this->func_ov031_020e3df8(); if (this->mUnk_5C.mParams[0] == 0x0 && actor == NULL) { this->vfunc_60(ActorUnkTLKTState_5); @@ -133,6 +133,7 @@ void ActorUnkTLKT::vfunc_60(ActorState state) { actorUnkSp40.mUnk_30 = func_ov031_020e3dd0(this); this->mUnk_04 = data_027e09b8->func_ov000_02073470(&actorUnkSp40, 0x0); break; + } case ActorUnkTLKTState_3: UnkStackStruct1 unkSp00; func_ov000_02072fd0(&unkSp00); diff --git a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp index 78f3679a..0d415543 100644 --- a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp +++ b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp @@ -45,42 +45,42 @@ static char data_ov031_021135f4[0x4] = "3\x03"; static char data_ov031_021135f8[0x4] = "\x00\x10"; static ActorUnkZLSL_AnimationTag data_ov031_021135fc = {0, "wait"}; static PTMF data_ov031_021137f8[0x11] = { - ActorUnkZLSL::func_ov031_020eaa88, // ActorUnkZLSLState_0 - ActorUnkZLSL::func_ov031_020ea8c8, // ActorUnkZLSLState_1 - ActorUnkZLSL::func_ov031_020ea8c4, // ActorUnkZLSLState_2 - ActorUnkZLSL::func_ov031_020ea8c0, // ActorUnkZLSLState_3 - ActorUnkZLSL::func_ov031_020eace0, // ActorUnkZLSLState_4 - ActorUnkZLSL::func_ov031_020ead78, // ActorUnkZLSLState_5 - ActorUnkZLSL::func_ov031_020ec058, // ActorUnkZLSLState_6 - ActorUnkZLSL::func_ov031_020ec0a8, // ActorUnkZLSLState_7 - ActorUnkZLSL::func_ov031_020ec12c, // ActorUnkZLSLState_8 - ActorUnkZLSL::func_ov031_020eb61c, // ActorUnkZLSLState_9 - ActorUnkZLSL::func_ov031_020eafb0, // ActorUnkZLSLState_10 - ActorUnkZLSL::func_ov031_020eb218, // ActorUnkZLSLState_11 - ActorUnkZLSL::func_ov031_020ec028, // ActorUnkZLSLState_12 - ActorUnkZLSL::func_ov031_020eb158, // ActorUnkZLSLState_13 - ActorUnkZLSL::func_ov031_020eab0c, // ActorUnkZLSLState_14 - ActorUnkZLSL::func_ov031_020ec170, // ActorUnkZLSLState_15 - ActorUnkZLSL::func_ov031_020eba8c, // ActorUnkZLSLState_16 + &ActorUnkZLSL::func_ov031_020eaa88, // ActorUnkZLSLState_0 + &ActorUnkZLSL::func_ov031_020ea8c8, // ActorUnkZLSLState_1 + &ActorUnkZLSL::func_ov031_020ea8c4, // ActorUnkZLSLState_2 + &ActorUnkZLSL::func_ov031_020ea8c0, // ActorUnkZLSLState_3 + &ActorUnkZLSL::func_ov031_020eace0, // ActorUnkZLSLState_4 + &ActorUnkZLSL::func_ov031_020ead78, // ActorUnkZLSLState_5 + &ActorUnkZLSL::func_ov031_020ec058, // ActorUnkZLSLState_6 + &ActorUnkZLSL::func_ov031_020ec0a8, // ActorUnkZLSLState_7 + &ActorUnkZLSL::func_ov031_020ec12c, // ActorUnkZLSLState_8 + &ActorUnkZLSL::func_ov031_020eb61c, // ActorUnkZLSLState_9 + &ActorUnkZLSL::func_ov031_020eafb0, // ActorUnkZLSLState_10 + &ActorUnkZLSL::func_ov031_020eb218, // ActorUnkZLSLState_11 + &ActorUnkZLSL::func_ov031_020ec028, // ActorUnkZLSLState_12 + &ActorUnkZLSL::func_ov031_020eb158, // ActorUnkZLSLState_13 + &ActorUnkZLSL::func_ov031_020eab0c, // ActorUnkZLSLState_14 + &ActorUnkZLSL::func_ov031_020ec170, // ActorUnkZLSLState_15 + &ActorUnkZLSL::func_ov031_020eba8c, // ActorUnkZLSLState_16 }; static PTMF data_ov031_02113770[0x11] = { - ActorUnkZLSL::func_ov031_020eaa68, // ActorUnkZLSLState_0 - ActorUnkZLSL::func_ov031_020ea86c, // ActorUnkZLSLState_1 - ActorUnkZLSL::func_ov031_020ea868, // ActorUnkZLSLState_2 - ActorUnkZLSL::func_ov031_020ea864, // ActorUnkZLSLState_3 - ActorUnkZLSL::func_ov031_020eac64, // ActorUnkZLSLState_4 - ActorUnkZLSL::func_ov031_020ead0c, // ActorUnkZLSLState_5 - ActorUnkZLSL::func_ov031_020ec034, // ActorUnkZLSLState_6 - ActorUnkZLSL::func_ov031_020ec05c, // ActorUnkZLSLState_7 - ActorUnkZLSL::func_ov031_020ec0d4, // ActorUnkZLSLState_8 - ActorUnkZLSL::func_ov031_020eb5f8, // ActorUnkZLSLState_9 - ActorUnkZLSL::func_ov031_020ead7c, // ActorUnkZLSLState_10 - ActorUnkZLSL::func_ov031_020eb188, // ActorUnkZLSLState_11 - ActorUnkZLSL::func_ov031_020ebfd8, // ActorUnkZLSLState_12 - ActorUnkZLSL::func_ov031_020eafe0, // ActorUnkZLSLState_13 - ActorUnkZLSL::func_ov031_020eaa8c, // ActorUnkZLSLState_14 - ActorUnkZLSL::func_ov031_020ec164, // ActorUnkZLSLState_15 - ActorUnkZLSL::func_ov031_020eba58, // ActorUnkZLSLState_16 + &ActorUnkZLSL::func_ov031_020eaa68, // ActorUnkZLSLState_0 + &ActorUnkZLSL::func_ov031_020ea86c, // ActorUnkZLSLState_1 + &ActorUnkZLSL::func_ov031_020ea868, // ActorUnkZLSLState_2 + &ActorUnkZLSL::func_ov031_020ea864, // ActorUnkZLSLState_3 + &ActorUnkZLSL::func_ov031_020eac64, // ActorUnkZLSLState_4 + &ActorUnkZLSL::func_ov031_020ead0c, // ActorUnkZLSLState_5 + &ActorUnkZLSL::func_ov031_020ec034, // ActorUnkZLSLState_6 + &ActorUnkZLSL::func_ov031_020ec05c, // ActorUnkZLSLState_7 + &ActorUnkZLSL::func_ov031_020ec0d4, // ActorUnkZLSLState_8 + &ActorUnkZLSL::func_ov031_020eb5f8, // ActorUnkZLSLState_9 + &ActorUnkZLSL::func_ov031_020ead7c, // ActorUnkZLSLState_10 + &ActorUnkZLSL::func_ov031_020eb188, // ActorUnkZLSLState_11 + &ActorUnkZLSL::func_ov031_020ebfd8, // ActorUnkZLSLState_12 + &ActorUnkZLSL::func_ov031_020eafe0, // ActorUnkZLSLState_13 + &ActorUnkZLSL::func_ov031_020eaa8c, // ActorUnkZLSLState_14 + &ActorUnkZLSL::func_ov031_020ec164, // ActorUnkZLSLState_15 + &ActorUnkZLSL::func_ov031_020eba58, // ActorUnkZLSLState_16 }; static ActorUnkZLSL_AnimationTag data_ov031_02113a08 = {0, "blink"}; static ActorUnkZLSL_AnimationTag data_ov031_02113a20 = {0x01, "happy"}; @@ -172,7 +172,7 @@ void ActorUnkZLSL::func_ov031_020ea674() { this->vfunc_58(ActorUnkZLSLState_8); } -bool ActorUnkZLSL::vfunc_18(unk32 param1) { +bool ActorUnkZLSL::Init(unk32 param1) { this->mUnk_1620.func_ov000_02057c38(0x6, 0x2); this->mUnk_1620.func_ov000_0209a7b8(this, this->func_ov000_020a9804); @@ -255,9 +255,9 @@ void ActorUnkZLSL::func_ov031_020ea8c4() {} // non-matching void ActorUnkZLSL::func_ov031_020ea8c8() {} -void ActorUnkZLSL::vfunc_20() { +void ActorUnkZLSL::Update() { UnkAngleStruct angleTmp; - angleTmp.angle = this->mAngle; + angleTmp.angle_u = this->mAngle.angle_u; CALL_PTMF(PTMF, data_ov031_021137f8[this->mState]); if (!GET_FLAG(this->mFlags, ActorFlag_Visible)) { @@ -365,7 +365,7 @@ void ActorUnkZLSL::func_ov031_020eab40(unk32 param1) { } VecFx32 *pVec2 = this->func_ov000_0209853c(0x0); - func_01ff930c(&this->mAngle, func_02016958(&this->mPos, pVec2), 0x71C); + func_01ff930c(&this->mAngle.angle_s, func_02016958(&this->mPos, pVec2), 0x71C); } void ActorUnkZLSL::func_ov031_020eac64() { @@ -435,10 +435,9 @@ void ActorUnkZLSL::func_ov031_020ead7c() { this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); - this->mTimerMax = 0xA; - this->mTimer = 0x0; - this->mUnk_2884 = 0x0; - this->mUnk_2888 = 0x0; + this->mTimer.Set(0, 10); + this->mUnk_2884 = 0x0; + this->mUnk_2888 = 0x0; } void ActorUnkZLSL::func_ov031_020eafb0() { @@ -503,7 +502,7 @@ void ActorUnkZLSL::func_ov031_020eb218() { bool ActorUnkZLSL::func_ov031_020eb2b0(VecFx32 *param1, unk32 param2) { func_01ff916c(&this->mUnk_27CC.mUnk_1C, param1->y, 0xCD); unk16 res = func_02016958(&this->mPos, param1); - func_01ff930c(&this->mAngle, res, 0x71C); + func_01ff930c(&this->mAngle.angle_s, res, 0x71C); VecFx32 vec = *param1; vec.y += 0x800; @@ -558,8 +557,7 @@ void ActorUnkZLSL::func_ov031_020eb61c() { } this->func_ov031_020ecc68(0x0); actor->func_ov071_021540ac(0x19); - this->mTimerMax = 0x14; - this->mTimer = 0x0; + this->mTimer.Set(0, 20); ++this->mUnk_286E; break; case 0x1: @@ -569,7 +567,7 @@ void ActorUnkZLSL::func_ov031_020eb61c() { if (data_027e09b8->func_ov000_020732ec(this->mUnk_28C8) == 0x0) { return; } - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->func_ov031_020eafe0(); ++this->mUnk_286E; } @@ -579,8 +577,7 @@ void ActorUnkZLSL::func_ov031_020eb61c() { this->func_ov031_020edd14(&vec); vec.y = this->mPos.y; if (this->func_ov031_020ed6cc(0xC00)) { - this->mTimerMax = 0xF; - this->mTimer = 0x0; + this->mTimer.Set(0, 15); ++this->mUnk_286E; } this->mAngle = func_02016958(&this->mPos, &vec); @@ -591,7 +588,7 @@ void ActorUnkZLSL::func_ov031_020eb61c() { this->func_ov031_020ed4e4(0x5, 0x93F); break; case 0x3: - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { ++this->mUnk_286E; this->mUnk_2884 = 0x0; this->func_ov031_020eb188(); @@ -623,13 +620,12 @@ void ActorUnkZLSL::func_ov031_020eb61c() { ++this->mUnk_286E; data_027e0d8c->func_ov093_021660a8(this->mUnk_28DC); actor->func_ov071_021540ac(0x1A); - this->mTimerMax = 0x1E; - this->mTimer = 0x0; + this->mTimer.Set(0, 30); } this->func_ov031_020ed4e4(0x5, 0x93F); break; case 0x6: - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { data_027e09b8->func_ov000_020732fc(this->mUnk_28C8); this->mUnk_28A4.x = FLOAT_TO_FX32(1.0f); this->mUnk_28A4.y = FLOAT_TO_FX32(1.0f); @@ -661,8 +657,7 @@ void ActorUnkZLSL::func_ov031_020eba8c() { } this->func_ov031_020ecc68(0x1); actor->func_ov071_021540ac(0x19); - this->mTimerMax = 0x14; - this->mTimer = 0x0; + this->mTimer.Set(0, 20); ++this->mUnk_286E; break; case 0x1: @@ -672,7 +667,7 @@ void ActorUnkZLSL::func_ov031_020eba8c() { if (data_027e09b8->func_ov000_020732ec(this->mUnk_28C8) == 0x0) { return; } - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->func_ov031_020ead7c(); data_027e0d8c->func_ov090_021660e8(); data_027e0d8c->func_ov093_021660f8(); @@ -684,8 +679,7 @@ void ActorUnkZLSL::func_ov031_020eba8c() { this->func_ov031_020edd14(&vec); vec.y = this->mPos.y; if (this->func_ov031_020ed8ac(0x800)) { - this->mTimerMax = 0xF; - this->mTimer = 0x0; + this->mTimer.Set(0, 15); ++this->mUnk_286E; } this->mAngle = func_02016958(&this->mPos, &vec); @@ -695,12 +689,11 @@ void ActorUnkZLSL::func_ov031_020eba8c() { this->func_ov031_020ed4e4(0x5, 0x93F); break; case 0x3: - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { data_027e0d8c->func_ov093_02166108(); ++this->mUnk_286E; this->mUnk_2884 = 0x0; - this->mTimerMax = 0x1E; - this->mTimer = 0x0; + this->mTimer.Set(0, 30); this->func_ov031_020eb188(); } VecFx32_Copy(&this->mPos, &vec); @@ -708,7 +701,7 @@ void ActorUnkZLSL::func_ov031_020eba8c() { this->func_ov031_020ed4e4(0x5, 0x93F); break; - case 0x4: + case 0x4: { VecFx32 *pVec = this->func_ov000_0209853c(0x0); if (func_01ff9258(this->mPos.x - pVec->x, this->mPos.z - pVec->z) > 0x3000) { this->func_ov031_020eb2b0(&actor->mPos, 0x666); @@ -720,7 +713,7 @@ void ActorUnkZLSL::func_ov031_020eba8c() { this->func_ov031_020ed4e4(0xA, 0x93F); - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { break; } ++this->mUnk_286E; @@ -731,11 +724,11 @@ void ActorUnkZLSL::func_ov031_020eba8c() { } this->func_ov031_020ed3c0(); - this->mTimerMax = 0xF; - this->mTimer = 0x0; + this->mTimer.Set(0, 15); break; + } case 0x5: - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { break; } if (!this->func_ov031_020eb2b0(&actor->mPos, 0xA000)) { @@ -760,11 +753,10 @@ void ActorUnkZLSL::func_ov031_020eba8c() { ++this->mUnk_286E; data_027e0d8c->func_ov093_021660a8(this->mUnk_28DC); actor->func_ov071_021540ac(0x1A); - this->mTimerMax = 0x1E; - this->mTimer = 0x0; + this->mTimer.Set(0, 30); break; case 0x7: - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { return; } data_027e09b8->func_ov000_020732fc(this->mUnk_28C8); @@ -864,7 +856,7 @@ void ActorUnkZLSL::vfunc_2C(Actor_vfunc_30 *param1) { } switch (this->mUnk_2874) { case false: - Mat3p_InitYRotation(&sp00, SIN((u16) this->mAngle), COS((u16) this->mAngle)); + Mat3p_InitYRotation(&sp00, SIN((u16) this->mAngle.angle_s), COS((u16) this->mAngle.angle_s)); this->mUnk_1620.vfunc_10(&this->mUnk_28A4, &sp00, &this->mPos); break; case true: @@ -917,12 +909,11 @@ bool ActorUnkZLSL::func_ov031_020ec3d0() { switch (this->mUnk_2872) { case 0x0: data_ov000_020b51b8.func_ov000_0206d0bc(0x0); - this->mTimerMax = 0x0; - this->mTimer = 0x0; + this->mTimer.Set(0, 0); ++this->mUnk_2872; break; case 0x1: - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { break; } data_ov000_020b51b8.func_ov000_0206c9a8(0x4E, 0x0, 0x7F, 0x0); @@ -943,12 +934,11 @@ bool ActorUnkZLSL::func_ov031_020ec49c() { switch (this->mUnk_2872) { case 0x0: data_ov000_020b51b8.func_ov000_0206d0bc(0xA); - this->mTimerMax = 0xA; - this->mTimer = 0x0; + this->mTimer.Set(0, 10); ++this->mUnk_2872; break; case 0x1: - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { break; } data_ov000_020b5214.func_ov000_0206db44(0x988A); @@ -1091,21 +1081,21 @@ bool ActorUnkZLSL::func_ov031_020ec8c4() { VecFx32 vec; UnkAngleStruct angleStruct; if (!this->func_ov000_020a8ff4(&vec)) { - angleStruct.angle = this->mAngle; + angleStruct.angle_u = this->mAngle.angle_u; } else { - angleStruct.angle = func_02016958(&this->mPos, &vec); + angleStruct.angle_u = func_02016958(&this->mPos, &vec); } if (this->mUnk_0B0 & 0x2) { - func_01ff9364(&this->mAngle, angleStruct); + func_01ff9364(&this->mAngle.angle_s, angleStruct); - s16 angle = angleStruct.angle - this->mAngle; + s16 angle = angleStruct.angle_s - this->mAngle.angle_s; if (ABS(angle) < 0x2000) { return true; } } - return func_01ff930c(&this->mAngle, angleStruct.angle, 0x71C); + return func_01ff930c(&this->mAngle.angle_s, angleStruct.angle_u, 0x71C); } // non-matching @@ -1196,13 +1186,13 @@ void ActorUnkZLSL::func_ov031_020ecc68(unk32 param1) { if (func_01ff9258(actor->mPos.x - vec->x, actor->mPos.z - vec->z) > 0x3000) { this->func_ov031_020ed0b0(); } else { - UnkAngleStruct angleStruct = this->mAngleStruct; - angleStruct.angle = 0x2000; + UnkAngleStruct angleStruct = this->mAngle; + angleStruct.angle_u = 0x2000; this->func_ov031_020ecea8(angleStruct, 0x6000, 0x4800, 0x0); } } else { - UnkAngleStruct angleStruct = this->mAngleStruct; - angleStruct.angle = 0x2000; + UnkAngleStruct angleStruct = this->mAngle; + angleStruct.angle_u = 0x2000; this->func_ov031_020ecea8(angleStruct, 0x6000, 0x4800, 0x0); } func_ov000_02072fd0(&stack.sp_34); @@ -1256,8 +1246,8 @@ void ActorUnkZLSL::func_ov031_020ed3c0() { VecFx32 sp08; UnkAngleStruct angleStruct; - sp14 = this->mUnk_28B0; - angleStruct.angle = 0xE39; + sp14 = this->mUnk_28B0; + angleStruct.angle_u = 0xE39; this->func_ov031_020ecea8(angleStruct, 0x7000, 0x4800, 0x1); @@ -1322,61 +1312,53 @@ void ActorUnkZLSL::GetOffsetPos(VecFx32 *pPos) const { VecFx32_Init(this->mUnk_2878.x, this->mUnk_2878.y + this->mYOffset, this->mUnk_2878.z, pPos); } -// non-matching void ActorUnkZLSL::vfunc_A4() { VecFx32 sp0C; if ((this->mUnk_0B0 & 0x10) || !this->func_ov000_020a8ff4(&sp0C)) { func_01ff930c(&this->mUnk_0D8, 0x0, 0x71C); return; } + VecFx32 sp00 = this->mPos; sp00.y = sp00.y + this->mYOffset - FLOAT_TO_FX32(0.5f); func_01ffb714(&sp0C, &sp00, &sp0C); - s16 var_r4 = this->mAngle - func_01ffbbe0(sp0C.x, sp0C.z); - if (this->mUnk_0E8 < this->mUnk_0EA) { - ++this->mUnk_0E8; - } + int angle = this->mAngle.angle_s; + int temp = func_01ffbbe0(sp0C.x, sp0C.z); + s16 var_r4 = (angle - (s16) temp); + + this->mUnk_0E8.Update(); + unk32 var_r0 = var_r4; if (var_r4 < 0) { var_r0 = -var_r4; } + if ((var_r0 <= 0x4000 && func_01ff9258(sp0C.x, sp0C.z) < 0x2000) || this->mUnk_0B0 & 1) { - if (var_r4 >= 0x2AAB) { - var_r4 = 0x2AAB; - } else if (var_r4 <= -0x2AAB) { - var_r4 = -0x2AAB; - } - u16 temp_r0_2 = (u16) func_01ffbbe0(sp0C.y, func_01ff9258(sp0C.x, sp0C.z)); - s16 var_r2 = temp_r0_2; - if (temp_r0_2 <= 0x18E4) { - var_r2 = 0x18E4; - } else if (var_r2 <= -0x18E4) { - var_r2 = -0x18E4; - } - this->mUnk_0CC = (s16) var_r4; - this->mUnk_0CE = var_r2; - this->mUnk_0EA = 0x32; - this->mUnk_0E8 = 0x0; - } else if ((u32) this->mUnk_0E8 >= (u32) this->mUnk_0EA) { + int clamped1 = CLAMP3(var_r4, -0x2AAB, 0x2AAB); + + int temp_r0_2 = func_01ffbbe0(sp0C.y, func_01ff9258(sp0C.x, sp0C.z)); + int clamped2 = CLAMP3((s16) temp_r0_2, -0x18E4, 0x18E4); + + this->mUnk_0CC = clamped1; + this->mUnk_0CE = clamped2; + this->mUnk_0E8.Set(0, 50); + } else if (this->mUnk_0E8.HasReachedMaxU()) { this->mUnk_0CE = 0x0; this->mUnk_0CC = 0x0; - } else { - if ((s32) var_r4 < 0x0) { - var_r4 = 0 - var_r4; - } - if ((s32) var_r4 >= 0x71C7) { - this->mUnk_0D0 = 0x0; - } + } else if (ABS(var_r4) >= 0x71C7) { + this->mUnk_0D0 = 0x0; } func_01ff916c(&this->mUnk_0D0, 0x1EC, 0x19); unk16 temp_r1 = this->mUnk_0CC; + if (this->mState != ActorUnkZLSLState_4) { func_01ff9318(&this->mUnk_0D8, temp_r1, this->mUnk_0D0); } else { func_01ff930c(&this->mUnk_0D8, temp_r1, 0x71C); } + func_01ff9318(&this->mUnk_0DA, this->mUnk_0CE, this->mUnk_0D0); } diff --git a/src/031_Land/MapObject/MapObjectBombFlower.cpp b/src/031_Land/MapObject/MapObjectBombFlower.cpp index 07fd5c36..c52f8453 100644 --- a/src/031_Land/MapObject/MapObjectBombFlower.cpp +++ b/src/031_Land/MapObject/MapObjectBombFlower.cpp @@ -33,8 +33,7 @@ MapObjectProfileBombFlower::MapObjectProfileBombFlower() : MapObjectBombFlower::MapObjectBombFlower() : mUnk_48(G3d_GetModelPtr(GET_PROFILE_20_50(MapObjectProfileBombFlower)), 0x0, 0x0), mUnk_B4(0x1000), - mUnk_B8(0x0), - mUnk_BA(0x0), + mUnk_B8(0, 0), mUnk_BC(true) { SET_FLAG(this->mFlags, MapObjFlag_8); @@ -126,24 +125,25 @@ void MapObjectBombFlower::vfunc_08() { break; } - if (!this->IsInternalTimerOut()) { + if (!this->mUnk_B8.HasExpired()) { break; } this->SetState(MapObjBombFlowerState_5, 0x0); break; - case MapObjBombFlowerState_5: - if (this->IsInternalTimerOut()) { + case MapObjBombFlowerState_5: { + if (this->mUnk_B8.HasExpired()) { this->SetState(MapObjBombFlowerState_0, 0x0); break; } - fx32 delta = this->mUnk_BA - this->mUnk_B8; + fx32 delta = this->mUnk_B8.GetRemainingTime(); if (delta > 0x0) { func_01ff9218(&this->mUnk_B4, 0x1000, func_01ffb464((u32) delta << 0xC)); } this->mUnk_B0 = this->mUnk_B4; break; + } default: break; } @@ -176,13 +176,11 @@ bool MapObjectBombFlower::SetState(MapObjState state, unk32 param2) { this->mUnk_C0.mUnk_08 |= 0xA800000; UNSET_FLAG(this->mFlags, MapObjFlag_9); this->mUnk_B4 = FLOAT_TO_FX32(0.0f); - this->mUnk_BA = 0xB4; - this->mUnk_B8 = 0x00; + this->mUnk_B8.Set(0, 180); break; case MapObjBombFlowerState_5: - this->mUnk_BA = 0xA; - this->mUnk_B8 = 0x0; + this->mUnk_B8.Set(0, 10); data_027e09a8->func_ov000_02071b30(0x10C, &this->mPos, 0x0); break; @@ -220,7 +218,7 @@ void MapObjectBombFlower::vfunc_38() { params.mUnk_28 = 0; params.func_ov000_020975f8(); - params.mInitialAngle = this->mAngle; + params.mInitialAngle = this->mAngle.angle_s; VecFx32_Copy(&this->mPos, ¶ms.mInitialPos); params.mParams[0] = 0x1; @@ -249,7 +247,7 @@ void MapObjectBombFlower::vfunc_50(ActorRef *param1, MapObjectPot_Base *thisx) { params.func_ov000_020975f8(); - params.mInitialAngle = thisx->mAngle; + params.mInitialAngle = thisx->mAngle.angle_s; VecFx32_Copy(&thisx->mPos, ¶ms.mInitialPos); params.mParams[0] = 0x1; diff --git a/src/031_Land/MapObject/MapObjectChestBase.cpp b/src/031_Land/MapObject/MapObjectChestBase.cpp index 199703ca..d1e618d7 100644 --- a/src/031_Land/MapObject/MapObjectChestBase.cpp +++ b/src/031_Land/MapObject/MapObjectChestBase.cpp @@ -69,7 +69,7 @@ MapObjectChestBase::MapObjectChestBase(unk32 param1) : MapObjectChestBase::~MapObjectChestBase() {} -bool MapObjectChestBase::vfunc_00() { +bool MapObjectChestBase::Init() { SET_FLAG(this->mFlags, MapObjFlag_9); this->mUnk_18[0] = 0x0D; @@ -91,7 +91,7 @@ bool MapObjectChestBase::vfunc_00() { } // non-matching -void MapObjectChestBase::vfunc_04() { +void MapObjectChestBase::Setup() { fx32 iVar2; UnkStruct_027e0cd8_0C_Base *pUVar5; VecFx32 sp48; diff --git a/src/031_Land/MapObject/MapObjectDoorBase.cpp b/src/031_Land/MapObject/MapObjectDoorBase.cpp index 2794230f..9c3f6caa 100644 --- a/src/031_Land/MapObject/MapObjectDoorBase.cpp +++ b/src/031_Land/MapObject/MapObjectDoorBase.cpp @@ -370,7 +370,7 @@ void MapObjectDoorBase::vfunc_5C(MapObjState state, unk32 param2) { auStack_5c.mUnk_36 = unk_1E; auStack_5c.mUnk_34 = unk_1C; - auStack_5c.mUnk_1E = this->mAngle; + auStack_5c.mUnk_1E = this->mAngle.angle_s; this->mUnk_74 = data_027e09b8->func_ov000_02073388(&auStack_5c, 0); } @@ -454,7 +454,7 @@ void MapObjectDoorBase::vfunc_5C(MapObjState state, unk32 param2) { auStack_9c.mUnk_36 = unk_1E; auStack_9c.mUnk_34 = unk_1C; - auStack_9c.mUnk_1E = this->mAngle; + auStack_9c.mUnk_1E = this->mAngle.angle_s; this->mUnk_74 = data_027e09b8->func_ov000_02073388(&auStack_9c, 0); this->mUnk_84 = 0x0D; @@ -636,15 +636,15 @@ void MapObjectDoorBase::vfunc_4C() {} void MapObjectDoorBase::vfunc_84(unk32 param1, VecFx32 *param2, unk16 *param3) { VecFx32 local_20; - *param3 = this->mAngle; + *param3 = this->mAngle.angle_s; if (param1 != 0) { - local_20.x = MUL_FX32(SIN((u16) this->mAngle), 0x1000); - local_20.z = MUL_FX32(COS((u16) this->mAngle), 0x1000); + local_20.x = MUL_FX32(SIN((u16) this->mAngle.angle_s), 0x1000); + local_20.z = MUL_FX32(COS((u16) this->mAngle.angle_s), 0x1000); local_20.y = 0; } else { - local_20.x = MUL_FX32(SIN((u16) this->mAngle), 0xC00); - local_20.z = MUL_FX32(COS((u16) this->mAngle), 0xC00); + local_20.x = MUL_FX32(SIN((u16) this->mAngle.angle_s), 0xC00); + local_20.z = MUL_FX32(COS((u16) this->mAngle.angle_s), 0xC00); local_20.y = 0; *param3 += -DEG_TO_ANG(180); @@ -687,7 +687,8 @@ void MapObjectDoorBase::vfunc2_08() { u16 *temp_r3; u16 *temp_r3_2; - if (this->mState != MapObjDoorBaseState_1 || !this->mUnk_8C || (u16) (this->mAngle + 0x2000) / DEG_TO_ANG(90) != 2) { + if (this->mState != MapObjDoorBaseState_1 || !this->mUnk_8C || + (u16) (this->mAngle.angle_s + 0x2000) / DEG_TO_ANG(90) != 2) { return; } diff --git a/src/031_Land/MapObject/MapObjectDoorClick.cpp b/src/031_Land/MapObject/MapObjectDoorClick.cpp index 4821b4c7..52b845c2 100644 --- a/src/031_Land/MapObject/MapObjectDoorClick.cpp +++ b/src/031_Land/MapObject/MapObjectDoorClick.cpp @@ -48,7 +48,7 @@ u16 MapObjectDoorClick::vfunc2_1C(unk32 param1) { } // https://decomp.me/scratch/zmw3b -bool MapObjectDoorClick::vfunc_00(void) { +bool MapObjectDoorClick::Init(void) { VecFx32 local_1c; VecFx32 local_28; VecFx32 local_40[2]; diff --git a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp index bf0477b0..27bb22f6 100644 --- a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp +++ b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp @@ -41,13 +41,12 @@ MapObjectDoorDangerSpawn::MapObjectDoorDangerSpawn() : mUnk_A2(false), mUnk_A3(0), mUnk_A4(-1), - mUnk_A8(NULL) { - this->mUnk_AC = 0; - this->mUnk_AE = 0; + mUnk_A8(NULL), + mUnk_AC(0, 0) { this->mUnk_89 = true; } -bool MapObjectDoorDangerSpawn::vfunc_00(void) { +bool MapObjectDoorDangerSpawn::Init(void) { this->func_ov031_020fbf10(true, false); this->mUnk_78 = 0x23; this->mUnk_7A = 0x0F; @@ -57,7 +56,7 @@ bool MapObjectDoorDangerSpawn::vfunc_00(void) { return true; } -void MapObjectDoorDangerSpawn::vfunc_04(void) { +void MapObjectDoorDangerSpawn::Setup(void) { UnkStruct_027e0cd8_0C_Base *ptr; VecFx32 auStack_20; @@ -152,25 +151,23 @@ void MapObjectDoorDangerSpawn::vfunc_08(void) { VecFx32 sp10; VecFx32 sp4; - if (this->mUnk_AC < this->mUnk_AE) { - this->mUnk_AC++; - } + this->mUnk_AC.Update(); switch (this->mState) { case MapObjDoorDangerSpawnState_0: if (this->mUnk_A2) { - u16 max = this->mUnk_AE; - u16 timer = this->mUnk_AC; + u16 max = this->mUnk_AC.max; + u16 time = this->mUnk_AC.value; - if (timer < max) { - if (max - timer == 1) { + if (time < max) { + if (max - time == 1) { this->mUnk_88 = 1; this->vfunc_74(); UnkStackStruct_ov000_02077590 *temp_r0_3 = func_ov000_02077590(3); sp3C = *temp_r0_3; - ((unk16 *) sp3C.data)[3] = this->mAngle; + ((unk16 *) sp3C.data)[3] = this->mAngle.angle_s; UnkStruct_027e09bc_0C *temp_r5 = data_027e09bc->mUnk_04[2]; @@ -270,12 +267,11 @@ void MapObjectDoorDangerSpawn::vfunc_5C(MapObjState state, unk32 param2) { s16 sp4; s16 *sp4Ptr; - this->mState = state; - this->mUnk_AE = 0; - this->mUnk_AC = 0; + this->mState = state; + this->mUnk_AC.Init(); switch (this->mState) { - case MapObjDoorDangerSpawnState_3: + case MapObjDoorDangerSpawnState_3: { this->vfunc_7C(); sp4Ptr = (s16 *) &sp4; @@ -321,6 +317,7 @@ void MapObjectDoorDangerSpawn::vfunc_5C(MapObjState state, unk32 param2) { } break; + } case MapObjDoorDangerSpawnState_4: this->MapObjectDoorBase::vfunc_5C(state, param2); break; @@ -335,8 +332,7 @@ void MapObjectDoorDangerSpawn::vfunc_5C(MapObjState state, unk32 param2) { data_027e0d38->func_ov031_020d9c44(4); if (this->mUnk_A2 != 0) { - this->mUnk_AE = this->vfunc_8C() * 2; - this->mUnk_AC = 0; + this->mUnk_AC.Set(0, this->vfunc_8C() * 2); this->mUnk_88 = 0; this->mUnk_90 = false; } @@ -558,7 +554,7 @@ void MapObjectDoorDangerSpawn::vfunc_18(s8 *param1) { void MapObjectDoorDangerSpawn::vfunc_14(unk32 param1) { Mat3p m; - Mat3p_InitYRotation(&m, SIN((u16) this->mAngle), COS((u16) this->mAngle)); + Mat3p_InitYRotation(&m, SIN((u16) this->mAngle.angle_s), COS((u16) this->mAngle.angle_s)); VecFx32 pos(this->mPos); pos.y += -(this->mUnk_6C * 2); @@ -616,9 +612,9 @@ void MapObjectDoorDangerSpawn::vfunc_74(void) { local_28.y = local_34.y; local_28.z = local_34.z; - u16 var_r5 = (u16) (this->mAngle + DEG_TO_ANG(45)); + u16 var_r5 = (u16) (this->mAngle.angle_s + DEG_TO_ANG(45)); - if (((u16) this->mAngle / DEG_TO_ANG(90)) == 2 && this->mState == MapObjDoorDangerSpawnState_5) { + if (((u16) this->mAngle.angle_s / DEG_TO_ANG(90)) == 2 && this->mState == MapObjDoorDangerSpawnState_5) { var_r5 = 0; } @@ -693,8 +689,8 @@ void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, VecFx32 *param2, unk16 *pa } VecFx32 local_24; - *param3 = this->mAngle; - iVar1 = this->mAngle + DEG_TO_ANG(30); + *param3 = this->mAngle.angle_s; + iVar1 = this->mAngle.angle_s + DEG_TO_ANG(30); if (param1 != 0) { local_24.x = MUL_FX32(SIN((u16) iVar1), 0x1666); local_24.z = MUL_FX32(COS((u16) iVar1), 0x1666); @@ -709,8 +705,8 @@ void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, VecFx32 *param2, unk16 *pa VecFx32_Add(&this->mPos, &local_24, param2); VecFx32 local_30; - this->mUnk_5A = this->mAngle; - iVar1 = this->mAngle - DEG_TO_ANG(30); + this->mUnk_5A = this->mAngle.angle_s; + iVar1 = this->mAngle.angle_s - DEG_TO_ANG(30); if (param1 != 0) { local_30.x = MUL_FX32(SIN((u16) iVar1), 0x1666); local_30.z = MUL_FX32(COS((u16) iVar1), 0x1666); diff --git a/src/031_Land/MapObject/MapObjectDoorKey.cpp b/src/031_Land/MapObject/MapObjectDoorKey.cpp index 984c5578..0e316ec8 100644 --- a/src/031_Land/MapObject/MapObjectDoorKey.cpp +++ b/src/031_Land/MapObject/MapObjectDoorKey.cpp @@ -32,7 +32,7 @@ MapObjectDoorKey::MapObjectDoorKey() : this->mUnk_18[0] = 0x0E; } -bool MapObjectDoorKey::vfunc_00(void) { +bool MapObjectDoorKey::Init(void) { this->func_ov031_020fbf10(true, false); return true; } diff --git a/src/031_Land/MapObject/MapObjectDoorSwitch.cpp b/src/031_Land/MapObject/MapObjectDoorSwitch.cpp index 6a984299..3151cd3d 100644 --- a/src/031_Land/MapObject/MapObjectDoorSwitch.cpp +++ b/src/031_Land/MapObject/MapObjectDoorSwitch.cpp @@ -37,7 +37,7 @@ MapObjectDoorSwitch::MapObjectDoorSwitch() : this->mUnk_89 = true; } -bool MapObjectDoorSwitch::vfunc_00(void) { +bool MapObjectDoorSwitch::Init(void) { this->mUnk_094.vfunc_08(this->GetModel()); this->func_ov031_020fbf10(true, true); @@ -113,7 +113,7 @@ bool MapObjectDoorSwitch::vfunc_6C(void) { } void MapObjectDoorSwitch::vfunc_14(unk32 param1) { - u16 angle = this->mAngle; + u16 angle = this->mAngle.angle_s; Mat3p m; Mat3p_InitYRotation(&m, SIN(angle), COS(angle)); @@ -133,7 +133,7 @@ void MapObjectDoorSwitch::vfunc_74(void) { VecFx32_Init(0, 0, 0x666, &local_2c); Mat4x3p m; - u16 angle = this->mAngle; + u16 angle = this->mAngle.angle_s; Mat4x3p_InitYRotation(&m, SIN(angle), COS(angle)); func_01ffaf74(&local_2c, &m, &local_2c); @@ -142,7 +142,7 @@ void MapObjectDoorSwitch::vfunc_74(void) { data_027e0cec->func_ov000_0209ff8c(&this->mUnk_68, 0x8CF, &local_20, 4); if (this->mUnk_68.mUnk_00 != NULL) { - this->mUnk_68.mUnk_00->mUnk_A4 = this->mAngle; + this->mUnk_68.mUnk_00->mUnk_A4 = this->mAngle.angle_s; } } diff --git a/src/031_Land/MapObject/MapObjectDoorTouch.cpp b/src/031_Land/MapObject/MapObjectDoorTouch.cpp index eb81a0a8..28d2e5e4 100644 --- a/src/031_Land/MapObject/MapObjectDoorTouch.cpp +++ b/src/031_Land/MapObject/MapObjectDoorTouch.cpp @@ -21,8 +21,8 @@ MapObjectDoorTouch::MapObjectDoorTouch() { this->mUnk_18[0] = 0x0F; } -bool MapObjectDoorTouch::vfunc_00(void) { - this->MapObjectDoorClick::vfunc_00(); +bool MapObjectDoorTouch::Init(void) { + this->MapObjectDoorClick::Init(); this->mUnk_88 = true; return true; } diff --git a/src/031_Land/MapObject/MapObjectGrass.cpp b/src/031_Land/MapObject/MapObjectGrass.cpp index e94a311b..140cecb4 100644 --- a/src/031_Land/MapObject/MapObjectGrass.cpp +++ b/src/031_Land/MapObject/MapObjectGrass.cpp @@ -33,7 +33,7 @@ MapObjectGrass::MapObjectGrass() : } // non-matching -bool MapObjectGrass::vfunc_00() {} +bool MapObjectGrass::Init() {} void MapObjectGrass::vfunc_08() { MapObjState state = this->mState; diff --git a/src/031_Land/MapObject/MapObjectPot.cpp b/src/031_Land/MapObject/MapObjectPot.cpp index 3004c9ef..8509f567 100644 --- a/src/031_Land/MapObject/MapObjectPot.cpp +++ b/src/031_Land/MapObject/MapObjectPot.cpp @@ -21,6 +21,7 @@ MapObject *MapObjectProfilePot::Create() { return new(HeapIndex_ITCM) MapObjectPot(); } +// non-matchhing MapObjectProfilePot::MapObjectProfilePot() : MapObjectProfilePot_Base(MapObjectId_Pot, MapObjectId_Pot) { this->mUnk_0E = 0x0; @@ -42,7 +43,6 @@ ModelRender_ov000_020b198c::ModelRender_ov000_020b198c(G3d_Model *pModel, unk8 p this->vfunc_08(pModel); } -// non-matching MapObjectPot::MapObjectPot() : mUnk_48(G3d_GetModelPtr(GET_PROFILE_20_50(MapObjectProfilePot)), 0x1) { this->mUnk_40 = ActorId_NTUB; @@ -50,7 +50,7 @@ MapObjectPot::MapObjectPot() : SET_FLAG(this->mFlags, MapObjFlag_8); } -void MapObjectPot::vfunc_04() { +void MapObjectPot::Setup() { this->mPos.y = INT_MAX - FLOAT_TO_FX32(1.0f); this->mPos.y = func_01ffe868(&this->mPos, 0x1, 0x0); } @@ -79,7 +79,7 @@ bool MapObjectPot::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { if (data_027e0d38->func_ov031_020d9c04(0x1, 0x0, 0x0)) { Actor *actor = gpActorManager->func_01fff3b4(param1); if (actor != NULL) { - this->mAngle = actor->mAngle; + this->mAngle.angle_s = actor->mAngle.angle_s; this->SetState(0x3, 0x0); break; } diff --git a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp index 0bca2eca..54197d7d 100644 --- a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp @@ -30,8 +30,7 @@ MapObjectUnkSKDI::MapObjectUnkSKDI() : mUnk_088(0x0), mUnk_089(0x0), mUnk_08C(0x3000, 0x1), - mUnk_0F8(0x0), - mUnk_0FA(0x0), + mUnk_0F8(0, 0), mUnk_0FC(0x0) { SET_FLAG(this->mFlags, MapObjFlag_10); this->mUnk_18[1] = 0x12; @@ -71,7 +70,7 @@ void MapObjectUnkSKDI::func_ov031_021061dc() { } // non-matching -bool MapObjectUnkSKDI::vfunc_00() { +bool MapObjectUnkSKDI::Init() { unk32 var1; if (this->mUnk_20.mParams[2] == 0x1) { var1 = 0x1; @@ -106,7 +105,7 @@ bool MapObjectUnkSKDI::vfunc_00() { return true; } -void MapObjectUnkSKDI::vfunc_04() { +void MapObjectUnkSKDI::Setup() { data_027e0cd8->mUnk_0C->func_ov000_02080a5c(&this->mUnk_08C.mUnk_00); if (this->mUnk_20.mParams[0] == 0x0) { @@ -183,7 +182,7 @@ void MapObjectUnkSKDI::func_ov031_0210643c(unk32 param1) { } this->func_ov031_02106678(MapObjUnkSKDIState_2, 0x0); break; - case MapObjUnkSKDIState_2: + case MapObjUnkSKDIState_2: { if (this->func_ov000_0209d29c(0x1) != 0x0) { if (this->mUnk_086 != 0) { this->func_ov031_02106678(MapObjUnkSKDIState_3, 0x0); @@ -191,19 +190,19 @@ void MapObjectUnkSKDI::func_ov031_0210643c(unk32 param1) { this->func_ov031_02106678(MapObjUnkSKDIState_0, 0x0); } } - unk32 temp_r1 = this->mUnk_0FA; - if (temp_r1 != 0 && ((u32) this->mUnk_0F8 >= (u32) temp_r1)) { + + if (this->mUnk_0F8.max != 0 && this->mUnk_0F8.GetValueU() >= this->mUnk_0F8.max) { this->func_ov031_02106678(MapObjUnkSKDIState_0, 0x0); - this->mUnk_0FA = 0x0; - this->mUnk_0F8 = 0x0; + this->mUnk_0F8.Init(); } + if (data_027e09b8->func_01ffd420()) { return; } - if (this->mUnk_0F8 < this->mUnk_0FA) { - ++this->mUnk_0F8; - } + + this->mUnk_0F8.Update(); break; + } default: break; } @@ -254,7 +253,7 @@ void MapObjectUnkSKDI::func_ov031_02106678(MapObjState state, unk32 param2) { } this->func_ov031_02106678(MapObjUnkSKDIState_0, 0x0); break; - case MapObjUnkSKDIState_1: + case MapObjUnkSKDIState_1: { SET_FLAG(this->mFlags, MapObjFlag_7); SET_FLAG(this->mFlags, MapObjFlag_8); if (param2 == 0x0) { @@ -278,11 +277,12 @@ void MapObjectUnkSKDI::func_ov031_02106678(MapObjState state, unk32 param2) { this->mUnk_0BC = 0x3000; UNSET_FLAG(this->mFlags, MapObjFlag_10); break; + } case MapObjUnkSKDIState_2: SET_FLAG(this->mFlags, MapObjFlag_7); this->mFlags[0] &= 0xFEFF; - this->mUnk_0FA = 0x0; - this->mUnk_0F8 = 0x0; + this->mUnk_0F8.Init(); + if (param2 == 0) { this->func_ov000_0209d2c4(0x0, false); UnkStruct_027e0cec *data = data_027e0cec; @@ -322,7 +322,6 @@ public: /* 12C */ }; -// non-matching bool MapObjectUnkSKDI::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { bool var_r1 = false; if (param1.type_index == 0x102) { @@ -342,19 +341,21 @@ bool MapObjectUnkSKDI::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) case 0x4: if (this->mState != MapObjUnkSKDIState_2) { this->func_ov031_02106678(MapObjUnkSKDIState_2, 0x0); - this->mUnk_0F8 = 0; - unk32 var = 0x28; + + u16 max = 40; + if (this->mUnk_20.mParams[3] != 0) { - var = this->mUnk_20.mParams[3]; + max = this->mUnk_20.mParams[3]; } - this->mUnk_0FA = var; + + this->mUnk_0F8.Set(0, max); } return false; case 0x3: return false; case 0xC: var_r1 = true; - if (data_027e09a4->mUnk_00.sceneIndex == SceneIndex_d_snow26 && this->mUnk_0FA != 0x0) { + if (data_027e09a4->mUnk_00.sceneIndex == SceneIndex_d_snow26 && this->mUnk_0F8.max != 0x0) { var_r1 = false; } if (this->mState == MapObjUnkSKDIState_2 && var_r1) { diff --git a/src/031_Land/MapObject/MapObjectUnkSWHT.cpp b/src/031_Land/MapObject/MapObjectUnkSWHT.cpp index 6f02db45..08bcc3e4 100644 --- a/src/031_Land/MapObject/MapObjectUnkSWHT.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSWHT.cpp @@ -66,7 +66,7 @@ MapObjectUnkSWHT::~MapObjectUnkSWHT() { } } -bool MapObjectUnkSWHT::vfunc_00() { +bool MapObjectUnkSWHT::Init() { SET_FLAGS(this->mFlags, MapObjFlag_9, MapObjFlag_10); this->mUnk_18[0] = 0x11; diff --git a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp index efc87af0..64694393 100644 --- a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp +++ b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp @@ -36,22 +36,22 @@ static ActorUnkZLSL_AnimationTag data_ov032_021223b4 = {.index = 0, .name = "wal static ActorUnkZLSL_AnimationTag data_ov032_021223cc = {.index = 1, .name = "discover", .unknown = 0x1}; static PTMF data_ov032_021223e4[ActorFleeingSpinutState_Max] = { - ActorFleeingSpinut::func_ov032_0211c2c4, // ActorFleeingSpinutState_0 - ActorFleeingSpinut::func_ov032_0211c444, // ActorFleeingSpinutState_1 - ActorFleeingSpinut::func_ov032_0211be30, // ActorFleeingSpinutState_2 - ActorFleeingSpinut::func_ov032_0211bf84, // ActorFleeingSpinutState_3 - ActorFleeingSpinut::func_ov032_0211c53c, // ActorFleeingSpinutState_4 - ActorFleeingSpinut::func_ov032_0211c73c, // ActorFleeingSpinutState_5 - ActorFleeingSpinut::func_ov032_0211c07c // ActorFleeingSpinutState_6 + &ActorFleeingSpinut::func_ov032_0211c2c4, // ActorFleeingSpinutState_0 + &ActorFleeingSpinut::func_ov032_0211c444, // ActorFleeingSpinutState_1 + &ActorFleeingSpinut::func_ov032_0211be30, // ActorFleeingSpinutState_2 + &ActorFleeingSpinut::func_ov032_0211bf84, // ActorFleeingSpinutState_3 + &ActorFleeingSpinut::func_ov032_0211c53c, // ActorFleeingSpinutState_4 + &ActorFleeingSpinut::func_ov032_0211c73c, // ActorFleeingSpinutState_5 + &ActorFleeingSpinut::func_ov032_0211c07c // ActorFleeingSpinutState_6 }; static PTMF data_ov032_0212241c[ActorFleeingSpinutState_Max] = { - ActorFleeingSpinut::func_ov032_0211c340, // ActorFleeingSpinutState_0 - ActorFleeingSpinut::func_ov032_0211c4d4, // ActorFleeingSpinutState_1 - ActorFleeingSpinut::func_ov032_0211bea8, // ActorFleeingSpinutState_2 - ActorFleeingSpinut::func_ov032_0211bffc, // ActorFleeingSpinutState_3 - ActorFleeingSpinut::func_ov032_0211c5cc, // ActorFleeingSpinutState_4 - ActorFleeingSpinut::func_ov032_0211c7bc, // ActorFleeingSpinutState_5 - ActorFleeingSpinut::func_ov032_0211c108 // ActorFleeingSpinutState_6 + &ActorFleeingSpinut::func_ov032_0211c340, // ActorFleeingSpinutState_0 + &ActorFleeingSpinut::func_ov032_0211c4d4, // ActorFleeingSpinutState_1 + &ActorFleeingSpinut::func_ov032_0211bea8, // ActorFleeingSpinutState_2 + &ActorFleeingSpinut::func_ov032_0211bffc, // ActorFleeingSpinutState_3 + &ActorFleeingSpinut::func_ov032_0211c5cc, // ActorFleeingSpinutState_4 + &ActorFleeingSpinut::func_ov032_0211c7bc, // ActorFleeingSpinutState_5 + &ActorFleeingSpinut::func_ov032_0211c108 // ActorFleeingSpinutState_6 }; DECL_PROFILE(ActorProfileFleeingSpinut); @@ -96,7 +96,7 @@ ActorFleeingSpinut::ActorFleeingSpinut() : ActorFleeingSpinut::~ActorFleeingSpinut() {} -bool ActorFleeingSpinut::vfunc_18(unk32 param1) { +bool ActorFleeingSpinut::Init(unk32 param1) { this->mUnk_1EC.mUnk_00 = this->mUnk_5C.mParams[1]; this->SetState(0x0); @@ -117,7 +117,7 @@ void ActorFleeingSpinut::SetState(ActorState state) { CALL_PTMF(PTMF, data_ov032_021223e4[oldState]); } -void ActorFleeingSpinut::vfunc_20() { +void ActorFleeingSpinut::Update() { this->mUnk_3C = &this->mUnk_1C0; if (!this->func_ov032_0211c938()) { this->mUnk_1EC.func_ov032_0211d028(); @@ -239,7 +239,7 @@ void ActorFleeingSpinut::vfunc_2C(Actor_vfunc_30 *param1) { vec.y += this->mUnk_21C; - this->mUnk_0B0.func_01ffc634(&this->mUnk_98, this->mAngleStruct, &vec); + this->mUnk_0B0.func_01ffc634(&this->mUnk_98, this->mAngle, &vec); } bool ActorFleeingSpinut::func_ov032_0211be04() { @@ -284,17 +284,14 @@ void ActorFleeingSpinut::func_ov032_0211bea8() { void ActorFleeingSpinut::func_ov032_0211bf84() { this->mUnk_110.vfunc_1C(data_ov032_021223b4, 0x1000, 0x19A, 0x0); - - this->mTimerMax = 0xF; - this->mTimer = 0x0; - + this->mTimer.Set(0, 15); this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); } void ActorFleeingSpinut::func_ov032_0211bffc() { if (this->func_ov032_0211ca20()) { - if (this->mTimer >= this->mTimerMax) { + if (this->mTimer.HasReachedMaxU()) { this->SetState(ActorFleeingSpinutState_1); } else { this->SetState(ActorFleeingSpinutState_4); @@ -305,7 +302,7 @@ void ActorFleeingSpinut::func_ov032_0211bffc() { } } - this->IsTimerOut(); + this->mTimer.Update(); } void ActorFleeingSpinut::func_ov032_0211c07c() { @@ -378,7 +375,7 @@ void ActorFleeingSpinut::func_ov032_0211c2c4() { } void ActorFleeingSpinut::func_ov032_0211c340() { - this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle, &this->mVel, 0xF6, 0xE39, 0xF6); + this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle.angle_s, &this->mVel, 0xF6, 0xE39, 0xF6); if (this->func_ov032_0211c938() && this->func_ov032_0211ca20()) { this->SetState(ActorFleeingSpinutState_1); @@ -423,19 +420,18 @@ void ActorFleeingSpinut::func_ov032_0211c53c() { this->mUnk_224 = false; this->mUnk_1EC.func_ov032_0211d08c(&this->mPos); - this->mTimerMax = 0xA; - this->mTimer = 0x0; + this->mTimer.Set(0, 10); this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); } void ActorFleeingSpinut::func_ov032_0211c5cc() { - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->mUnk_224 = true; } - this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle, &this->mVel, 0x429, 0x429 + 0xA10, 0x429); + this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle.angle_s, &this->mVel, 0x429, 0x429 + 0xA10, 0x429); if (this->mUnk_1EC.mUnk_28 & 0x1) { this->SetState(ActorFleeingSpinutState_6); @@ -476,7 +472,7 @@ void ActorFleeingSpinut::func_ov032_0211c73c() { } void ActorFleeingSpinut::func_ov032_0211c7bc() { - this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle, &this->mVel, 0xF6, 0xE39, 0xF6); + this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle.angle_s, &this->mVel, 0xF6, 0xE39, 0xF6); if (this->func_ov032_0211ca6c() && this->mUnk_1EC.mUnk_28 & 0x2) { this->SetState(ActorFleeingSpinutState_3); @@ -650,7 +646,7 @@ u16 *ActorFleeingSpinut_1EC::func_ov032_0211cd60(VecFx32 *param1, s16 *param2, V func_01ff9258(sp1C.x - param1->x, sp1C.z - param1->z); UnkAngleStruct spm04; - spm04.angle = sp00; + spm04.angle_u = sp00; func_02017f54(param2, spm04); } diff --git a/src/032_MapA1/Actor/ActorKeese.cpp b/src/032_MapA1/Actor/ActorKeese.cpp index a05a30d4..90e97c3d 100644 --- a/src/032_MapA1/Actor/ActorKeese.cpp +++ b/src/032_MapA1/Actor/ActorKeese.cpp @@ -31,28 +31,28 @@ static const VecFx32 data_ov032_021224d8(FLOAT_TO_FX32(1.7f), FLOAT_TO_FX32(0.5f static ActorUnkZLSL_AnimationTag data_ov032_021224e4 = {.index = 0, .name = "fly"}; static ActorUnkZLSL_AnimationTag data_ov032_021224fc = {.index = 0, .name = "keeth", .unknown = 1}; static PTMF data_ov032_0212258c[ActorKeeseState_Max] = { - ActorKeese::func_ov032_0211e9ec, // ActorKeeseState_0 - ActorKeese::func_ov032_0211ece8, // ActorKeeseState_1 - ActorKeese::func_ov032_0211f1f0, // ActorKeeseState_2 - ActorKeese::func_ov032_0211f054, // ActorKeeseState_3 - ActorKeese::func_ov032_0211f300, // ActorKeeseState_4 - ActorKeese::func_ov032_0211f3ac, // ActorKeeseState_5 - ActorKeese::func_ov032_0211f4a4, // ActorKeeseState_6 - ActorKeese::func_ov032_0211f560, // ActorKeeseState_7 - ActorKeese::func_ov032_0211f604, // ActorKeeseState_8 - ActorKeese::func_ov032_0211f6bc, // ActorKeeseState_9 + &ActorKeese::func_ov032_0211e9ec, // ActorKeeseState_0 + &ActorKeese::func_ov032_0211ece8, // ActorKeeseState_1 + &ActorKeese::func_ov032_0211f1f0, // ActorKeeseState_2 + &ActorKeese::func_ov032_0211f054, // ActorKeeseState_3 + &ActorKeese::func_ov032_0211f300, // ActorKeeseState_4 + &ActorKeese::func_ov032_0211f3ac, // ActorKeeseState_5 + &ActorKeese::func_ov032_0211f4a4, // ActorKeeseState_6 + &ActorKeese::func_ov032_0211f560, // ActorKeeseState_7 + &ActorKeese::func_ov032_0211f604, // ActorKeeseState_8 + &ActorKeese::func_ov032_0211f6bc, // ActorKeeseState_9 }; static PTMF data_ov032_021225dc[ActorKeeseState_Max] = { - ActorKeese::func_ov032_0211eb60, // ActorKeeseState_0 - ActorKeese::func_ov032_0211ee5c, // ActorKeeseState_1 - ActorKeese::func_ov032_0211f1f4, // ActorKeeseState_2 - ActorKeese::func_ov032_0211f0a8, // ActorKeeseState_3 - ActorKeese::func_ov032_0211f310, // ActorKeeseState_4 - ActorKeese::func_ov032_0211f404, // ActorKeeseState_5 - ActorKeese::func_ov032_0211f50c, // ActorKeeseState_6 - ActorKeese::func_ov032_0211f58c, // ActorKeeseState_7 - ActorKeese::func_ov032_0211f614, // ActorKeeseState_8 - ActorKeese::func_ov032_0211f804, // ActorKeeseState_9 + &ActorKeese::func_ov032_0211eb60, // ActorKeeseState_0 + &ActorKeese::func_ov032_0211ee5c, // ActorKeeseState_1 + &ActorKeese::func_ov032_0211f1f4, // ActorKeeseState_2 + &ActorKeese::func_ov032_0211f0a8, // ActorKeeseState_3 + &ActorKeese::func_ov032_0211f310, // ActorKeeseState_4 + &ActorKeese::func_ov032_0211f404, // ActorKeeseState_5 + &ActorKeese::func_ov032_0211f50c, // ActorKeeseState_6 + &ActorKeese::func_ov032_0211f58c, // ActorKeeseState_7 + &ActorKeese::func_ov032_0211f614, // ActorKeeseState_8 + &ActorKeese::func_ov032_0211f804, // ActorKeeseState_9 }; DECL_PROFILE(ActorProfileKeese); @@ -116,7 +116,7 @@ bool ActorKeese_2AC::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 para // non-matching bool ActorKeese_2AC::vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) {} -bool ActorKeese::vfunc_18(unk32 param1) { +bool ActorKeese::Init(unk32 param1) { this->mUnk_0B0.func_ov000_02057c38(0x6, 0x2); this->mUnk_0B0.func_ov000_0209a7b8(this, &ActorKeese::func_ov032_0211faf0); @@ -258,7 +258,7 @@ void ActorKeese::SetState(ActorState state) { // non-matching void ActorKeese::func_ov032_0211e468() {} -void ActorKeese::vfunc_20() { +void ActorKeese::Update() { if (this->mState != ActorKeeseState_9 && !this->Actor_Derived2::func_ov017_020bef4c(0x4000) && this->mUnk_48 != 0x0) { bool noReturn = true; if (this->mState != ActorKeeseState_7 && this->mState != ActorKeeseState_6) { @@ -332,7 +332,7 @@ void ActorKeese::vfunc_2C(Actor_vfunc_30 *param1) { return; } - VecFx32 *og = this->mUnk_0B0.func_01ffc6d4(this->mAngleStruct, &this->mPos); + VecFx32 *og = this->mUnk_0B0.func_01ffc6d4(this->mAngle, &this->mPos); VecFx32 vec; VecFx32_Init(og->x, og->y, og->z, &vec); @@ -341,8 +341,7 @@ void ActorKeese::vfunc_2C(Actor_vfunc_30 *param1) { // non-matching void ActorKeese::func_ov032_0211e9ec() { - this->mTimerMax = gRandom.Next32(0x1F) + 0x1E; - this->mTimer = 0x0; + this->mTimer.Set(0, gRandom.Next32(31) + 30); u32 sp00; @@ -375,16 +374,16 @@ void ActorKeese::func_ov032_0211eb60() { this->mAngle += this->mUnk_2A8; - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->func_ov032_0211e380(); } func_01ff916c(&this->mUnk_2A0, this->mUnk_2A4, 0xA4); func_01ff916c(&this->mPos.y, this->mUnk_29C, 0xA4); - this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle); + this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle.angle_s); - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { if (func_01ff9258(this->mPos.x - this->mUnk_5C.mInitialPos.x, this->mPos.z - this->mUnk_5C.mInitialPos.z) > 0x2000) { this->SetState(ActorKeeseState_3); return; @@ -398,7 +397,7 @@ void ActorKeese::func_ov032_0211eb60() { VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); - if (!func_02016b8c(&this->mPos, vec, 0x3000, this->mAngleStruct, 0x1000, 0x1)) { + if (!func_02016b8c(&this->mPos, vec, 0x3000, this->mAngle, 0x1000, 0x1)) { return; } @@ -411,16 +410,15 @@ void ActorKeese::func_ov032_0211ece8() {} void ActorKeese::func_ov032_0211ee5c() {} void ActorKeese::func_ov032_0211f054() { - this->mTimerMax = gRandom.Next32(0x1F) + 0x1E; - this->mTimer = 0x0; + this->mTimer.Set(0, gRandom.Next32(31) + 30); } void ActorKeese::func_ov032_0211f0a8() { this->func_ov032_0211f93c(&this->mUnk_5C.mInitialPos, 0x38E); - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); - if (func_02016b8c(&this->mPos, vec, 0x3000, this->mAngleStruct, 0x1000, 0x1)) { + if (func_02016b8c(&this->mPos, vec, 0x3000, this->mAngle, 0x1000, 0x1)) { this->SetState(ActorKeeseState_2); } } @@ -428,7 +426,7 @@ void ActorKeese::func_ov032_0211f0a8() { if (this->func_ov032_0211f9c4()) { this->SetState(ActorKeeseState_8); } else { - if (this->IsTimerOut() && (this->mUnk_46 & 0x1C)) { + if (this->mTimer.HasExpired() && (this->mUnk_46 & 0x1C)) { this->mAngle = func_01ffbbe0(this->mUnk_2AC.mUnk_0C.x, this->mUnk_2AC.mUnk_0C.z); this->SetState(ActorKeeseState_0); } else if (func_01ff9258(this->mUnk_5C.mInitialPos.x - this->mPos.x, this->mUnk_5C.mInitialPos.z - this->mPos.z) < @@ -436,7 +434,7 @@ void ActorKeese::func_ov032_0211f0a8() { this->SetState(ActorKeeseState_0); } } - this->func_ov000_0209a008(this->mUnk_2A0, this->mAngle); + this->func_ov000_0209a008(this->mUnk_2A0, this->mAngle.angle_s); } // non-matching @@ -452,7 +450,7 @@ void ActorKeese::func_ov032_0211f1f4() { if (func_01ff9258(this->mPos.x - sp00.x, this->mPos.z - sp00.z) > 0x2000) { this->func_ov032_0211e380(); - this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle); + this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle.angle_s); return; } } @@ -460,7 +458,7 @@ void ActorKeese::func_ov032_0211f1f4() { if (func_01ff9258(this->mPos.x - this->mUnk_5C.mInitialPos.x, this->mPos.z - this->mUnk_5C.mInitialPos.z) > 0x2000) { this->SetState(ActorKeeseState_3); - this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle); + this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle.angle_s); return; } @@ -470,14 +468,13 @@ void ActorKeese::func_ov032_0211f1f4() { this->func_ov032_0211e380(); } - this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle); + this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle.angle_s); } void ActorKeese::func_ov032_0211f300() { this->mUnk_248.func_ov000_02097bec(); } -// non-matching (270 + 2) void ActorKeese::func_ov032_0211f310() { this->Actor_Derived2::func_ov000_020992dc(); @@ -485,7 +482,9 @@ void ActorKeese::func_ov032_0211f310() { if (this->mUnk_48 <= 0x0) { this->vfunc_54(0x0); } else { - if (this->mUnk_268.mUnk_08 >= this->mUnk_268.mUnk_0A) { + Timer *pTimer = &this->mUnk_268.mUnk_08; + + if (pTimer->HasReachedMaxU()) { this->func_ov032_0211e380(); } else { this->SetState(ActorKeeseState_6); @@ -602,12 +601,11 @@ void ActorKeese::func_ov032_0211f804() { } ++this->mUnk_228; - this->mTimerMax = 0x1E; - this->mTimer = 0x00; + this->mTimer.Set(0, 30); break; case 0x1: { - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { return; } @@ -617,13 +615,12 @@ void ActorKeese::func_ov032_0211f804() { func_ov017_020c26f8(0x1, &vec, 0x1, 0x2); ++this->mUnk_228; - this->mTimerMax = 0xA; - this->mTimer = 0x0; + this->mTimer.Set(0, 10); break; } case 0x2: - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { return; } diff --git a/src/032_MapA1/Actor/ActorSpinut.cpp b/src/032_MapA1/Actor/ActorSpinut.cpp index 17c49daa..be546782 100644 --- a/src/032_MapA1/Actor/ActorSpinut.cpp +++ b/src/032_MapA1/Actor/ActorSpinut.cpp @@ -34,36 +34,38 @@ extern "C" void func_ov017_020c2438(unk32 *, unk32, VecFx32 *, unk32, unk32); extern "C" void func_ov017_020c26f8(unk32, VecFx32 *, unk32, unk32); static const VecFx32 data_ov032_02122160(FLOAT_TO_FX32(1.7f), FLOAT_TO_FX32(0.5f), FLOAT_TO_FX32(1.7f)); -static ActorUnkZLSL_AnimationTag data_ov032_02122184 = {.index = 0, .name = "walk", .unknown = 0x0}; -static ActorUnkZLSL_AnimationTag data_ov032_0212219c = {.index = 1, .name = "discover", .unknown = 0x1}; -static ActorUnkZLSL_AnimationTag data_ov032_0212216c = {.index = 0, .name = "KURI", .unknown = 0x1}; +static ActorUnkZLSL_AnimationTag data_ov032_02122184 = {.index = 0, .name = "walk", .unknown = 0x0}; +static ActorUnkZLSL_AnimationTag data_ov032_0212219c = {.index = 1, .name = "discover", .unknown = 0x1}; +static ActorUnkZLSL_AnimationTag data_ov032_0212216c = {.index = 0, .name = "KURI", .unknown = 0x1}; + static PTMF data_ov032_02122288[ActorSpinutState_Max] = { - ActorSpinut::func_ov032_02119a0c, // ActorSpinutState_0 - ActorSpinut::func_ov032_02119c80, // ActorSpinutState_1 - ActorSpinut::func_ov032_02119df4, // ActorSpinutState_2 - ActorSpinut::func_ov032_02119f40, // ActorSpinutState_3 - ActorSpinut::func_ov032_0211a20c, // ActorSpinutState_4 - ActorSpinut::func_ov032_0211a52c, // ActorSpinutState_5 - ActorSpinut::func_ov032_0211a86c, // ActorSpinutState_6 - ActorSpinut::func_ov032_0211aac8, // ActorSpinutState_7 - ActorSpinut::func_ov032_0211abc0, // ActorSpinutState_8 - ActorSpinut::func_ov032_0211a9c8, // ActorSpinutState_9 - ActorSpinut::func_ov032_0211ac94, // ActorSpinutState_10 - ActorSpinut::func_ov032_0211adf4 // ActorSpinutState_11 + &ActorSpinut::func_ov032_02119a0c, // ActorSpinutState_0 + &ActorSpinut::func_ov032_02119c80, // ActorSpinutState_1 + &ActorSpinut::func_ov032_02119df4, // ActorSpinutState_2 + &ActorSpinut::func_ov032_02119f40, // ActorSpinutState_3 + &ActorSpinut::func_ov032_0211a20c, // ActorSpinutState_4 + &ActorSpinut::func_ov032_0211a52c, // ActorSpinutState_5 + &ActorSpinut::func_ov032_0211a86c, // ActorSpinutState_6 + &ActorSpinut::func_ov032_0211aac8, // ActorSpinutState_7 + &ActorSpinut::func_ov032_0211abc0, // ActorSpinutState_8 + &ActorSpinut::func_ov032_0211a9c8, // ActorSpinutState_9 + &ActorSpinut::func_ov032_0211ac94, // ActorSpinutState_10 + &ActorSpinut::func_ov032_0211adf4 // ActorSpinutState_11 }; + static PTMF data_ov032_02122348[ActorSpinutState_Max] = { - ActorSpinut::func_ov032_02119990, // ActorSpinutState_0 - ActorSpinut::func_ov032_02119be8, // ActorSpinutState_1 - ActorSpinut::func_ov032_02119d7c, // ActorSpinutState_2 - ActorSpinut::func_ov032_02119e90, // ActorSpinutState_3 - ActorSpinut::func_ov032_0211a140, // ActorSpinutState_4 - ActorSpinut::func_ov032_0211a484, // ActorSpinutState_5 - ActorSpinut::func_ov032_0211a7b8, // ActorSpinutState_6 - ActorSpinut::func_ov032_0211aa40, // ActorSpinutState_7 - ActorSpinut::func_ov032_0211ab20, // ActorSpinutState_8 - ActorSpinut::func_ov032_0211a950, // ActorSpinutState_9 - ActorSpinut::func_ov032_0211ac20, // ActorSpinutState_10 - ActorSpinut::func_ov032_0211ad40 // ActorSpinutState_11 + &ActorSpinut::func_ov032_02119990, // ActorSpinutState_0 + &ActorSpinut::func_ov032_02119be8, // ActorSpinutState_1 + &ActorSpinut::func_ov032_02119d7c, // ActorSpinutState_2 + &ActorSpinut::func_ov032_02119e90, // ActorSpinutState_3 + &ActorSpinut::func_ov032_0211a140, // ActorSpinutState_4 + &ActorSpinut::func_ov032_0211a484, // ActorSpinutState_5 + &ActorSpinut::func_ov032_0211a7b8, // ActorSpinutState_6 + &ActorSpinut::func_ov032_0211aa40, // ActorSpinutState_7 + &ActorSpinut::func_ov032_0211ab20, // ActorSpinutState_8 + &ActorSpinut::func_ov032_0211a950, // ActorSpinutState_9 + &ActorSpinut::func_ov032_0211ac20, // ActorSpinutState_10 + &ActorSpinut::func_ov032_0211ad40 // ActorSpinutState_11 }; DECL_PROFILE(ActorProfileSpinut); @@ -96,11 +98,11 @@ ActorSpinut::ActorSpinut() : VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mUnk_288); - Actor_38 *actor_38 = &this->mUnk_258.mUnk_00; - actor_38->mUnk_08 = 0x1; - this->mUnk_38 = actor_38; - this->mUnk_296 = 0x0; - this->mUnk_298 = 0x0; + this->mUnk_38 = &this->mUnk_258.mUnk_00; + this->mUnk_38->mUnk_08 = 0x01; + + this->mUnk_296.value = 0; + this->mUnk_296.max = 0; VecFx32_Init(FLOAT_TO_FX32(1.0f), FLOAT_TO_FX32(1.0f), FLOAT_TO_FX32(1.0f), &this->mUnk_27C); @@ -113,7 +115,7 @@ ActorSpinut::ActorSpinut() : ActorSpinut::~ActorSpinut() {} -bool ActorSpinut::vfunc_18(unk32 param1) { +bool ActorSpinut::Init(unk32 param1) { if (this->Actor::func_ov000_02098a60(0x1)) { this->func_ov000_020984d0(); return true; @@ -130,7 +132,7 @@ bool ActorSpinut::vfunc_18(unk32 param1) { } // non-matching -void ActorSpinut::vfunc_1C() { +void ActorSpinut::Setup() { if (this->mUnk_5C.mParams[0] == 0x2) { this->mUnk_294 = false; Actor *actor = func_02016fbc(ActorId_Soldier, &this->mPos, 0x0); @@ -174,7 +176,7 @@ void ActorSpinut::SetState(ActorState state) { CALL_PTMF(PTMF, data_ov032_02122348[this->mState]); } -void ActorSpinut::vfunc_20() { +void ActorSpinut::Update() { if (!this->Actor_Derived2::func_ov017_020bef4c(0x4000) && mUnk_48 != 0) { bool var_r1 = true; bool var_r2 = true; @@ -283,7 +285,7 @@ void ActorSpinut::vfunc_2C(Actor_vfunc_30 *param1) { VecFx32 sp08 = this->mPos; sp08.y += this->mUnk_288.y; - this->mUnk_0B0.func_01ffc634(&sp14, this->mAngleStruct, &sp08); + this->mUnk_0B0.func_01ffc634(&sp14, this->mAngle, &sp08); } void ActorSpinut::func_ov032_02119990() { @@ -300,24 +302,23 @@ void ActorSpinut::func_ov032_02119a0c() { switch (this->mUnk_218) { case 0x0: unk32 var; + if (gRandom.Next32(0) & 0x80000000) { var = 0x1; } else { var = -0x1; } + this->mUnk_21C = var; - - this->mTimerMax = gRandom.Next32(0x15) + 0x1E; - this->mTimer = 0x00; - + this->mTimer.Set(0, gRandom.Next32(21) + 30); ++this->mUnk_218; break; case 0x1: - this->mUnk_224 = this->mUnk_21C * gRandom.Next32(0x38E) + this->mAngle; + this->mUnk_224 = this->mUnk_21C * gRandom.Next32(0x38E) + this->mAngle.angle_s; - if (func_01ff930c(&this->mAngle, this->mUnk_224, 0x71C)) { - u16 angle = this->mAngle; + if (func_01ff930c(&this->mAngle.angle_s, this->mUnk_224, 0x71C)) { + u16 angle = this->mAngle.angle_u; this->mVel.x = MUL_FX32(SIN(angle), this->mUnk_220); this->mVel.z = MUL_FX32(COS(angle), this->mUnk_220); @@ -326,7 +327,7 @@ void ActorSpinut::func_ov032_02119a0c() { break; } - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->SetState(ActorSpinutState_0); } } @@ -380,16 +381,15 @@ void ActorSpinut::func_ov032_02119c80() { void ActorSpinut::func_ov032_02119d7c() { this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); - this->mTimerMax = 0x14; - this->mTimer = 0x00; - this->mVel.x = FLOAT_TO_FX32(0.0f); - this->mVel.z = FLOAT_TO_FX32(0.0f); + this->mTimer.Set(0, 20); + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); } // non-matching void ActorSpinut::func_ov032_02119df4() { s16 var; - s16 delta = this->mTimerMax - this->mTimer; + s16 delta = this->mTimer.GetRemainingTime(); func_ov000_020986b4(&var, this, 0x0); s16 val = var; @@ -397,7 +397,7 @@ void ActorSpinut::func_ov032_02119df4() { func_01ff9318(&this->mAngle, val, func_01ffb464(delta << 0xC)); } - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->SetState(ActorSpinutState_3); } this->func_ov032_0211b1e0(); @@ -406,11 +406,8 @@ void ActorSpinut::func_ov032_02119df4() { // non-matching void ActorSpinut::func_ov032_02119e90() { this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); - this->mUnk_288.x = func_01ffb66c(0x1800, func_01ffb428(0x148, 0x14) >> 0xC); - - this->mTimer = 0x0; - this->mTimerMax = 0xB4; + this->mTimer.Set(0, 180); if (this->mUnk_5C.mParams[0] == 0x2) { this->mUnk_264 = 0x14000; @@ -425,7 +422,7 @@ void ActorSpinut::func_ov032_02119e90() { // non-matching (case 1) void ActorSpinut::func_ov032_02119f40() { - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { this->mUnk_218 = 0x2; } @@ -449,7 +446,7 @@ void ActorSpinut::func_ov032_02119f40() { s16 var; s16 *r5 = &var; func_ov000_020986b4(r5, this, 0x0); - func_01ff930c(&this->mAngle, *r5, 0x2D8); + func_01ff930c(&this->mAngle.angle_s, *r5, 0x2D8); if (!this->func_ov032_0211b064(0x1)) { ++this->mUnk_218; @@ -478,7 +475,7 @@ void ActorSpinut::func_ov032_02119f40() { break; } - u16 angle = this->mAngle; + u16 angle = this->mAngle.angle_u; this->mVel.x = MUL_FX32(SIN(angle), this->mUnk_220); this->mVel.z = MUL_FX32(COS(angle), this->mUnk_220); @@ -499,10 +496,9 @@ void ActorSpinut::func_ov032_0211a140() { this->mUnk_21C = var; - this->mVel.x = FLOAT_TO_FX32(0.0f); - this->mVel.z = FLOAT_TO_FX32(0.0f); - this->mTimerMax = 0x1E; - this->mTimer = 0x00; + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); + this->mTimer.Set(0, 30); } // non-matching @@ -521,8 +517,8 @@ void ActorSpinut::func_ov032_0211a52c() { this->mUnk_110.vfunc_28()->mUnk_04 = this->mUnk_110.vfunc_28()->mUnk_04 + this->mUnk_288.x; unk32 val = this->mUnk_220 - 0x14; - fx32 sinValue = SIN((u16) this->mAngle); - fx32 cosValue = COS((u16) this->mAngle); + fx32 sinValue = SIN((u16) this->mAngle.angle_s); + fx32 cosValue = COS((u16) this->mAngle.angle_s); this->mUnk_220 = val; this->mVel.x = MUL_FX32(sinValue, val); @@ -605,7 +601,7 @@ void ActorSpinut::func_ov032_0211a86c() { return; } - if (this->mUnk_248.mUnk_08 < this->mUnk_248.mUnk_0A) { + if (!this->mUnk_248.mUnk_08.HasReachedMaxU()) { this->SetState(ActorSpinutState_7); return; } @@ -619,15 +615,13 @@ void ActorSpinut::func_ov032_0211a86c() { void ActorSpinut::func_ov032_0211a950() { this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); - - this->mTimerMax = 0x14; - this->mTimer = 0x00; - this->mVel.x = FLOAT_TO_FX32(0.0f); - this->mVel.z = FLOAT_TO_FX32(0.0f); + this->mTimer.Set(0, 20); + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); } void ActorSpinut::func_ov032_0211a9c8() { - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { if (this->func_ov032_0211b064(0x0) || this->mUnk_5C.mParams[0] == 0x2) { this->SetState(ActorSpinutState_1); } else { @@ -695,17 +689,14 @@ void ActorSpinut::func_ov032_0211abc0() { void ActorSpinut::func_ov032_0211ac20() { this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); - - this->mTimerMax = 0xA; - this->mTimer = 0x0; - + this->mTimer.Set(0, 10); this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); } void ActorSpinut::func_ov032_0211ac94() { this->mUnk_27C.y -= 0x199; - if (!this->IsTimerOut()) { + if (!this->mTimer.HasExpired()) { return; } @@ -724,19 +715,16 @@ void ActorSpinut::func_ov032_0211ac94() { void ActorSpinut::func_ov032_0211ad40() { this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); - this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); - - this->mUnk_298 = gRandom.Next32(0xE); - this->mUnk_296 = 0x0; + this->mUnk_296.Set(0, gRandom.Next32(14)); } // non-matching void ActorSpinut::func_ov032_0211adf4() { - this->IsTimerOut(); + this->mTimer.Update(); switch (this->mUnk_218) { case 0x0: - if (!this->IsInternalTimerOut()) { + if (!this->mUnk_296.HasExpired()) { break; } @@ -752,13 +740,12 @@ void ActorSpinut::func_ov032_0211adf4() { data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0); this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); - if (this->func_ov032_0211b064(0x0) || (this->mUnk_294 && this->mTimer >= this->mTimerMax)) { + if (this->func_ov032_0211b064(0x0) || (this->mUnk_294 && this->mTimer.HasReachedMaxU())) { this->SetState(ActorSpinutState_1); return; } - u16 random = gRandom.Next32(0); - this->mUnk_298 = random + 0xA; - this->mUnk_296 = 0x0; + u16 random = gRandom.Next32(0); + this->mUnk_296.Set(0, random + 10); this->mUnk_218 = 0x0; break; } @@ -786,7 +773,7 @@ bool ActorSpinut::func_ov032_0211b064(unk32 param1) { } if (param1 != 0x0) { - if (!ret || !func_02016ae0(&this->mPos, vec, this->mAngleStruct, 0x4E39, 0x1) == 0x0) { + if (!ret || !func_02016ae0(&this->mPos, vec, this->mAngle, 0x4E39, 0x1) == 0x0) { ret = true; } else { ret = false; @@ -850,21 +837,20 @@ void ActorSpinut::func_ov032_0211b298() { void ActorSpinut::func_ov032_0211b37c(Actor *thisx, Actor_vfunc_30 *param1) { if (thisx->GetActorId() == ActorId_Spinut) { ((ActorSpinut *) thisx)->mUnk_294 = true; - thisx->mTimerMax = (u16) param1; //! TODO: fake match - thisx->mTimer = 0x0; + thisx->mTimer.Set(0, (u16) param1); //! TODO: fake match } } void ActorSpinut::func_ov032_0211b3b0() { if (this->mUnk_5C.mUnk_1A[1] != 0x0) { - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); } else { this->Actor::func_ov000_020984d0(); } if (this->mUnk_5C.mParams[0] == 0x2) { this->Actor::func_ov000_02098a88(0x0, 0x1); - UNSET_FLAG(this->mFlags, ActorFlag_Alive); + this->Kill(); return; } this->Actor::func_ov000_020984d0(); diff --git a/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp b/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp index 653daf14..e3e0edf2 100644 --- a/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp +++ b/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp @@ -103,18 +103,16 @@ MapObjectUnkSWSW::MapObjectUnkSWSW() : mUnk_0EC(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.5f), FLOAT_TO_FX32(-0.4202f)), mUnk_0F8(NULL), mUnk_0FC(0x4), - mUnk_100(0x0), - mUnk_102(0x0), + mUnk_100(0, 0), mUnk_104(0x0), mUnk_105(0x0), mUnk_10C(0x0), - mUnk_10E(0x0), - mUnk_110(0x0), + mUnk_10E(0, 0), mUnk_114(NULL) { this->mUnk_10 = &data_ov032_02122b8c; } -bool MapObjectUnkSWSW::vfunc_00() { +bool MapObjectUnkSWSW::Init() { Vec2bCpp sp00; UnkStruct_027e0cd8_0C_Base *data_027e0cd8_0C = data_027e0cd8->mUnk_0C; @@ -196,7 +194,7 @@ void MapObjectUnkSWSW::vfunc_08() { break; case 0x2: { - if (this->mUnk_102 != 0x0 && this->mUnk_100 >= this->mUnk_102) { + if (this->mUnk_100.max != 0 && this->mUnk_100.HasReachedMax()) { this->MapObject::func_ov000_0209d2c4(0x0, true); if (this->mUnk_104 != 0x0) { @@ -227,8 +225,8 @@ void MapObjectUnkSWSW::vfunc_08() { func_01ff91b8(&this->mUnk_10C, 0x0, 0x333); } - if (var_r5 && this->mUnk_110 != 0x0) { - fx16 var_r3 = COS((u16) (this->mUnk_10E * 0xFFFF / this->mUnk_110)); + if (var_r5 && this->mUnk_10E.max != 0) { + fx16 var_r3 = COS((u16) (this->mUnk_10E.value * 0xFFFF / this->mUnk_10E.max)); if (var_r3 < 0) { var_r3 = -var_r3; @@ -236,26 +234,22 @@ void MapObjectUnkSWSW::vfunc_08() { this->mUnk_108 = var_r3; - if (this->mUnk_10E < this->mUnk_110) { - ++this->mUnk_10E; - } + this->mUnk_10E.Update(); - if (this->mUnk_10E >= this->mUnk_110) { - this->mUnk_110 = 0x0; - this->mUnk_10E = 0x0; + if (this->mUnk_10E.HasReachedMax()) { + this->mUnk_10E.Init(); } } else { if (gRandom.Next32(0x33) != 0x0) { - this->mUnk_110 = 0x0; + this->mUnk_10E.max = 0; } else { - this->mUnk_110 = gRandom.Next32(0x29) + 0xA; + this->mUnk_10E.max = gRandom.Next32(41) + 10; } - this->mUnk_10E = 0x0; + this->mUnk_10E.value = 0; if (!var_r5) { - this->mUnk_110 = 0x0; - this->mUnk_10E = 0x0; + this->mUnk_10E.Init(); func_01ff9218(&this->mUnk_108, 0x0, 0x800); } else { func_01ff9218(&this->mUnk_108, 0x1000, 0x800); @@ -269,7 +263,7 @@ void MapObjectUnkSWSW::vfunc_08() { VecFx32 sp24; VecFx32 sp18; VecFx32 sp0C; - if (this->mUnk_100 >= this->mUnk_102) { + if (this->mUnk_100.HasReachedMax()) { VecFx32_Init(this->mPos.x + this->mUnk_0EC.x, this->mPos.y + this->mUnk_0EC.y, this->mPos.z + this->mUnk_0EC.z, &sp30); sp18 = sp30; @@ -286,7 +280,7 @@ void MapObjectUnkSWSW::vfunc_08() { this->vfunc_3C(0x0); } else { fx32 z = this->mPos.z + this->mUnk_0EC.z + - func_02015a18(this->mUnk_100 << 0xC, 0, -0x1000, 0, this->mUnk_102 << 0xC, 0, 0); + func_02015a18(this->mUnk_100.max << 0xC, 0, -0x1000, 0, this->mUnk_100.value << 0xC, 0, 0); VecFx32_Init(this->mPos.x + this->mUnk_0EC.x, this->mPos.y + this->mUnk_0EC.y, z, &sp24); sp0C = sp24; @@ -307,7 +301,7 @@ void MapObjectUnkSWSW::vfunc_08() { break; } - this->IsInternalTimerOut(); + this->mUnk_100.Update(); this->mUnk_040.func_ov032_021210a0(this->mUnk_108); if (this->mUnk_10C > 0x2AAB) { @@ -349,8 +343,8 @@ bool MapObjectUnkSWSW::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) } UnkAngleStruct angle; - angle.angle = actorNSSW->mAngle; - VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); + angle.angle_s = actorNSSW->mAngle.angle_s; + VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); if (!func_02016ae0(&actorNSSW->mPos, vec, angle, 0x2AAB, 0x1)) { return false; @@ -402,8 +396,7 @@ void MapObjectUnkSWSW::vfunc_38() { this->vfunc_3C(0x2); - this->mUnk_102 = 0xF; - this->mUnk_100 = 0x0; + this->mUnk_100.Set(0, 15); this->mUnk_114 = NULL; } @@ -437,13 +430,11 @@ void MapObjectUnkSWSW::func_ov032_02121b90() { // non-matching (last copies) void MapObjectUnkSWSW::vfunc_3C(unk32 param1) { this->mUnk_0FC = param1; - this->mUnk_102 = 0xFFFF; - this->mUnk_100 = 0x0000; + this->mUnk_100.Reset(); switch (param1) { case 0x2: - this->mUnk_102 = 0x0; - this->mUnk_100 = 0x0; + this->mUnk_100.Init(); this->mUnk_0AC.func_ov000_020577f8(0x1000); break; @@ -459,9 +450,7 @@ void MapObjectUnkSWSW::vfunc_3C(unk32 param1) { this->mUnk_0F8 = actorNSSW; this->mUnk_114 = actorNSSW; - this->mUnk_102 = 0x28; - this->mUnk_100 = 0x00; - + this->mUnk_100.Set(0, 40); this->mUnk_0AC.func_ov000_020577f8(0x1000); VecFx32_Init(this->mPos.x + this->mUnk_0EC.x, this->mPos.y + this->mUnk_0EC.y, @@ -491,7 +480,7 @@ void MapObjectUnkSWSW::vfunc_14(unk32 param1) { VecFx32 vec; VecFx32_Init(this->mPos.x + this->mUnk_0EC.x, this->mPos.y + this->mUnk_0EC.y, this->mPos.z + this->mUnk_0EC.z, &vec); - this->mUnk_040.func_01ffc6d4(this->mAngleStruct, &vec); + this->mUnk_040.func_01ffc6d4(this->mAngle, &vec); } struct UnkStack_ov032_02121dc8 { @@ -508,7 +497,7 @@ ActorUnkNSSW *MapObjectUnkSWSW::func_ov032_02121dc8(VecFx32 *param1) { params.mUnk_28 = 0; params.func_ov000_020975f8(); - params.mInitialAngle = this->mAngle; + params.mInitialAngle = this->mAngle.angle_s; params.mUnk_28 = *(unk32 *) &this->mUnk_38; VecFx32_Init(param1->x, param1->y, param1->z, ¶ms.mInitialPos); diff --git a/src/063_Shrine/Actor/ActorUnkCANS.cpp b/src/063_Shrine/Actor/ActorUnkCANS.cpp index c015e6e4..f688eb50 100644 --- a/src/063_Shrine/Actor/ActorUnkCANS.cpp +++ b/src/063_Shrine/Actor/ActorUnkCANS.cpp @@ -82,17 +82,17 @@ const Cylinder data_ov063_02162e90(0, 0x99A, 0, 0x99A); DECL_PROFILE(ActorProfileUnkCANS); static PTMF data_ov063_02162f58[0xB] = { - ActorUnkCANS::func_ov063_02158b34, ActorUnkCANS::func_ov063_02158d40, ActorUnkCANS::func_ov063_021590c8, - ActorUnkCANS::func_ov063_021591f4, ActorUnkCANS::func_ov063_02159408, ActorUnkCANS::func_ov063_021595a4, - ActorUnkCANS::func_ov063_02159714, ActorUnkCANS::func_ov063_021598fc, ActorUnkCANS::func_ov063_02159ca8, - ActorUnkCANS::func_ov063_02159dfc, ActorUnkCANS::func_ov063_02159e20, + &ActorUnkCANS::func_ov063_02158b34, &ActorUnkCANS::func_ov063_02158d40, &ActorUnkCANS::func_ov063_021590c8, + &ActorUnkCANS::func_ov063_021591f4, &ActorUnkCANS::func_ov063_02159408, &ActorUnkCANS::func_ov063_021595a4, + &ActorUnkCANS::func_ov063_02159714, &ActorUnkCANS::func_ov063_021598fc, &ActorUnkCANS::func_ov063_02159ca8, + &ActorUnkCANS::func_ov063_02159dfc, &ActorUnkCANS::func_ov063_02159e20, }; static PTMF data_ov063_02162fb0[0xB] = { - ActorUnkCANS::func_ov063_02158b98, ActorUnkCANS::func_ov063_02158db0, ActorUnkCANS::func_ov063_02159100, - ActorUnkCANS::func_ov063_02159258, ActorUnkCANS::func_ov063_02159494, ActorUnkCANS::func_ov063_02159618, - ActorUnkCANS::func_ov063_02159784, ActorUnkCANS::func_ov063_021599e4, ActorUnkCANS::func_ov063_02159d68, - ActorUnkCANS::func_ov063_02159e1c, ActorUnkCANS::func_ov063_02159ec0, + &ActorUnkCANS::func_ov063_02158b98, &ActorUnkCANS::func_ov063_02158db0, &ActorUnkCANS::func_ov063_02159100, + &ActorUnkCANS::func_ov063_02159258, &ActorUnkCANS::func_ov063_02159494, &ActorUnkCANS::func_ov063_02159618, + &ActorUnkCANS::func_ov063_02159784, &ActorUnkCANS::func_ov063_021599e4, &ActorUnkCANS::func_ov063_02159d68, + &ActorUnkCANS::func_ov063_02159e1c, &ActorUnkCANS::func_ov063_02159ec0, }; Actor *ActorProfileUnkCANS::Create() { @@ -132,7 +132,7 @@ unk32 UnkStruct_ov063_02162e88::vfunc_04(ActorRef param1, unk32 param2, unk32 pa ActorShotArrow *ret4 = (ActorShotArrow *) gpActorManager->func_01fff3b4(param1); if (ret4 != NULL && ret4->GetActorId() == ActorId_ShotArrow) { - u16 angle = ((ActorUnkCANS *) mUnk_20)->mAngle; + u16 angle = ((ActorUnkCANS *) mUnk_20)->mAngle.angle_s; fx32 sin_val = MUL_FX32(SIN(angle), FLOAT_TO_FX32(1.f)); fx32 cos_val = MUL_FX32(COS(angle), FLOAT_TO_FX32(1.f)); VecFx32 vec; @@ -160,10 +160,8 @@ ActorUnkCANS::ActorUnkCANS() : mUnk_1F4(), mUnk_200(this), mUnk_224(), - mUnk_234(0), - mUnk_236(0), - mUnk_238(0), - mUnk_23A(0), + mUnk_234(0, 0), + mUnk_238(0, 0), mUnk_250(mUnk_5C.mInitialPos), mUnk_274(0), mUnk_270(0xCD) { @@ -178,7 +176,7 @@ ActorUnkCANS::ActorUnkCANS() : mUnk_270 *= mUnk_276; } -bool ActorUnkCANS::vfunc_18(unk32 param1) { +bool ActorUnkCANS::Init(unk32 param1) { this->mUnk_0B0.func_ov000_02057c38(6, 2); this->mUnk_0B0.func_ov000_0209a7b8(this, (UnkSystem4_UnkCallback) ActorUnkCANS::func_ov063_0215a678); @@ -191,7 +189,7 @@ bool ActorUnkCANS::vfunc_18(unk32 param1) { return true; } -void ActorUnkCANS::vfunc_1C(void) { +void ActorUnkCANS::Setup(void) { mUnk_26C = mUnk_5C.mInitialAngle; s16 var; @@ -219,8 +217,7 @@ void ActorUnkCANS::vfunc_1C(void) { void ActorUnkCANS::func_ov063_02158424(void) { mUnk_274 = 0; if (mState == 6) { - mUnk_23A = 0x14; - mUnk_238 = 0; + this->mUnk_238.Set(0, 20); } } @@ -238,15 +235,13 @@ void ActorUnkCANS::func_ov063_02158490(void) { void ActorUnkCANS::vfunc_24(void) { if (data_027e09b8->HasAdventureFlag(AdventureFlag_VisitedIslandSanctuaryFirstTime)) { - this->vfunc_20(); + this->Update(); } } // non-matching -void ActorUnkCANS::vfunc_20(void) { - if (mUnk_238 < mUnk_23A) { - mUnk_238++; - } +void ActorUnkCANS::Update(void) { + this->mUnk_238.Update(); if (!this->func_ov017_020bef4c(0x4000) && mUnk_48 != 0 && mState != 4) { return; @@ -262,7 +257,7 @@ void ActorUnkCANS::vfunc_20(void) { VecFx32_Add(&mPos, &mVel, &mPos); if (mUnk_268 != NULL) { - mUnk_268->func_ov063_0215b6c8(&mUnk_250, mAngleStruct); + mUnk_268->func_ov063_0215b6c8(&mUnk_250, mAngle); } this->func_ov000_02098b8c(1, &mUnk_23C); @@ -284,15 +279,7 @@ void ActorUnkCANS::vfunc_20(void) { unk32 iVar5; if (mUnk_48 > 0) { - unk32 var; - if ((mUnk_234 < mUnk_236)) { - mUnk_234++; - var = 0; - } else { - var = 1; - } - - if (var == 0) { + if (!this->mUnk_234.HasExpired()) { if (mUnk_268 != NULL) { mUnk_268->mUnk_1F4 = 0; } @@ -301,9 +288,7 @@ void ActorUnkCANS::vfunc_20(void) { this->func_ov000_020989e0(); if (((*(u32 *) &mUnk_200.mUnk_08) & 0x3FFFF) != 0) { - - mUnk_236 = func_ov000_02098d7c(this, &mUnk_200); - mUnk_234 = 0; + this->mUnk_234.Set(0, func_ov000_02098d7c(this, &this->mUnk_200)); iVar5 = this->func_ov063_0215a56c((unk16) func_01ffbbe0(mUnk_200.mUnk_10.x, mUnk_200.mUnk_10.z)); @@ -413,7 +398,7 @@ void ActorUnkCANS::vfunc_20(void) { VecFx32_Init(0x4CD, 0, 0, aPtr); - func_01ff9638(aPtr, mAngle); + func_01ff9638(aPtr, mAngle.angle_s); VecFx32_Add(aPtr, &mPos, aPtr); VecFx32_Copy(aPtr, &b.vec); @@ -447,18 +432,18 @@ void ActorUnkCANS::vfunc_2C(Actor_vfunc_30 *param1) { return; } - mUnk_0B0.func_01ffc6d4(mAngleStruct, &mPos); + mUnk_0B0.func_01ffc6d4(mAngle, &mPos); if (mUnk_268 != NULL) { VecFx32 vec; VecFx32_Init(0x4CD, 0, 0, &vec); - func_01ff9638(&vec, mAngle); + func_01ff9638(&vec, mAngle.angle_s); VecFx32_Add(&vec, &mPos, &vec); - this->func_ov017_020bf5c4(&vec, 0xD9A, 0x930 - 0x1F, 0x1F, mAngle); + this->func_ov017_020bf5c4(&vec, 0xD9A, 0x930 - 0x1F, 0x1F, mAngle.angle_s); } else { - this->func_ov017_020bf5c4(&mPos, 0x800, 0x555, 0x1F, mAngle); + this->func_ov017_020bf5c4(&mPos, 0x800, 0x555, 0x1F, mAngle.angle_s); } } @@ -505,9 +490,8 @@ void ActorUnkCANS::func_ov063_02158b98(void) { } void ActorUnkCANS::func_ov063_02158d40(void) { - mUnk_128.vfunc_1C(data_ov063_02163068, 0x1800, 0x19A, 0); - mUnk_23A = 0; - mUnk_238 = 0; + this->mUnk_128.vfunc_1C(data_ov063_02163068, 0x1800, 0x19A, 0); + this->mUnk_238.Init(); } // non-matching @@ -598,7 +582,7 @@ void ActorUnkCANS::func_ov063_02159100(void) { return; } - if (mAngle != mUnk_26C) { + if (mAngle.angle_s != mUnk_26C) { mState = 8; return; } @@ -640,7 +624,7 @@ void ActorUnkCANS::func_ov063_02159258(void) { if (!mUnk_270 && this->func_ov063_0215a514()) { this->func_ov063_02158448(8); - } else if (!mUnk_270 && mUnk_238 >= mUnk_23A && this->func_ov063_0215a474()) { + } else if (!mUnk_270 && this->mUnk_238.HasReachedMaxU() && this->func_ov063_0215a474()) { this->func_ov063_02158448(6); } else if (!this->func_ov063_0215a2c0()) { this->func_ov063_02158448(1); @@ -665,7 +649,7 @@ void ActorUnkCANS::func_ov063_02159494(void) { return; } - if (mAngle != mUnk_26C) { + if (mAngle.angle_s != mUnk_26C) { mUnk_128.vfunc_1C(data_ov063_02163068, 0x1333, 0x19A, 0); mState = 8; return; @@ -696,7 +680,7 @@ void ActorUnkCANS::func_ov063_02159618(void) { return; } - if (mAngle != mUnk_26C) { + if (mAngle.angle_s != mUnk_26C) { mUnk_128.vfunc_1C(data_ov063_02163068, 0x1333, 0x19A, 0); mState = 8; return; @@ -759,9 +743,8 @@ void ActorUnkCANS::func_ov063_02159784(void) { void ActorUnkCANS::func_ov063_021598fc(void) { mUnk_128.vfunc_1C(data_ov063_02163080, 0x1333, 0x19A, 0); - mTimerMax = gRandom.Next32(0x15) + 10; - mTimer = 0; - mUnk_276 = gRandom.Next32(0) & 0x80000000 ? 1 : -1; + this->mTimer.Set(0, gRandom.Next32(21) + 10); + mUnk_276 = gRandom.Next32(0) & 0x80000000 ? 1 : -1; } // non-matching @@ -776,16 +759,14 @@ void ActorUnkCANS::func_ov063_021599e4(void) { unk32 iVar9 = ABS((unk16) ((mUnk_26C * 0x4000 + mUnk_276) - ret1)); if (DEG_TO_ANG(90) < iVar9) { - mTimer = 0; mUnk_276 *= -1; - mTimerMax = 0x1E; + this->mTimer.Set(0, 30); } } - if (this->IsTimerOut()) { + if (this->mTimer.HasExpired()) { mUnk_276 *= -1; - mTimerMax = gRandom.Next32(0x15) + 10; - mTimer = 0; + this->mTimer.Set(0, gRandom.Next32(21) + 10); } func_01ff916c(&mUnk_270, mUnk_276 * 0x19A, 0xCD); @@ -826,7 +807,7 @@ void ActorUnkCANS::func_ov063_02159d68(void) { mUnk_26C += -FLOAT_TO_FX32(8.f); } - if (!func_01ff930c(&mAngle, mUnk_26C, 0x71C)) { + if (!func_01ff930c(&mAngle.angle_s, mUnk_26C, 0x71C)) { return; } @@ -1046,7 +1027,7 @@ unk32 ActorUnkCANS::func_ov063_0215a474(void) { func_ov000_020986b4((s16 *) &var, this, 0); - s32 val = ABS((s16) (var - mAngle)); + s32 val = ABS((s16) (var - mAngle.angle_s)); if (val >= DEG_TO_ANG(90)) { return false; } @@ -1084,7 +1065,7 @@ unk32 ActorUnkCANS::func_ov063_0215a56c(unk32 param1) { return false; } - return DEG_TO_ANG(90) <= ABS((s16) (param1 - mAngle)); + return DEG_TO_ANG(90) <= ABS((s16) (param1 - mAngle.angle_s)); } // non-matching @@ -1120,7 +1101,7 @@ void ActorUnkCANS::vfunc_10(Cylinder *param1) { VecFx32_Add(¶m1->pos, &this->mPos, ¶m1->pos); if (this->mUnk_268 != NULL) { - fx16 angle = this->mAngle; + fx16 angle = this->mAngle.angle_s; VecFx32 pos; VecFx32_Init(FLOAT_TO_FX32(0.25f), 0, 0, &pos); func_01ff9638(&pos, angle); @@ -1233,6 +1214,7 @@ bool UnkStruct_ov063_02162ea8::vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, } } } + return UnkStruct_027e0ce0_38_Base::vfunc_0C((const UnkStruct_ov031_020e54d4 *) param2Struct->mUnk_04, param2, param2Struct->mUnk_04); } diff --git a/src/063_Shrine/Actor/ActorUnkCASE.cpp b/src/063_Shrine/Actor/ActorUnkCASE.cpp index dbeb8867..aa65d524 100644 --- a/src/063_Shrine/Actor/ActorUnkCASE.cpp +++ b/src/063_Shrine/Actor/ActorUnkCASE.cpp @@ -58,13 +58,15 @@ struct UnkStruct_data_ov063_021630c8 { const UnkStruct_data_ov063_021630c8 data_ov063_021630c8(0x5EC, 0x785, 0xFFFFFD48, 0x7AE, 0x112, 0xFFFFECA4); -static PTMF data_ov063_021630e0[0x6] = {ActorUnkCASE::func_ov063_0215af58, ActorUnkCASE::func_ov063_0215af60, - ActorUnkCASE::func_ov063_0215afb8, ActorUnkCASE::func_ov063_0215b090, - ActorUnkCASE::func_ov063_0215b244, ActorUnkCASE::func_ov063_0215b2c4}; +static PTMF data_ov063_021630e0[0x6] = { + &ActorUnkCASE::func_ov063_0215af58, &ActorUnkCASE::func_ov063_0215af60, &ActorUnkCASE::func_ov063_0215afb8, + &ActorUnkCASE::func_ov063_0215b090, &ActorUnkCASE::func_ov063_0215b244, &ActorUnkCASE::func_ov063_0215b2c4, +}; -static PTMF data_ov063_02163110[0x6] = {ActorUnkCASE::func_ov063_0215af54, ActorUnkCASE::func_ov063_0215af5c, - ActorUnkCASE::func_ov063_0215afa4, ActorUnkCASE::func_ov063_0215b054, - ActorUnkCASE::func_ov063_0215b1bc, ActorUnkCASE::func_ov063_0215b2b0}; +static PTMF data_ov063_02163110[0x6] = { + &ActorUnkCASE::func_ov063_0215af54, &ActorUnkCASE::func_ov063_0215af5c, &ActorUnkCASE::func_ov063_0215afa4, + &ActorUnkCASE::func_ov063_0215b054, &ActorUnkCASE::func_ov063_0215b1bc, &ActorUnkCASE::func_ov063_0215b2b0, +}; DECL_PROFILE(ActorProfileUnkCASE); @@ -162,7 +164,7 @@ ActorUnkCASE::ActorUnkCASE() : mUnk_A8 = (Actor_Derived2_A8_PTR *) &data_ov063_02162558; } -bool ActorUnkCASE::vfunc_18(unk32 param1) { +bool ActorUnkCASE::Init(unk32 param1) { mUnk_14C = gpActorManager->func_01fff3b4(mUnk_5C.mUnk_28); mUnk_0B0.func_ov000_02057c38(6, 2); @@ -237,14 +239,13 @@ void ActorUnkCASE::func_ov063_0215b054(void) { mVel.y = 0; mVel.z = mUnk_1E0; UNSET_FLAG2(*(s16 *) &mUnk_44, ActorFlag_5); - this->mTimerMax = -1; - this->mTimer = 0; + this->mTimer.Reset(); } void ActorUnkCASE::func_ov063_0215b090(void) { - if (this->mTimer < 4) { + if (this->mTimer.value < 4) { this->func_ov063_0215afb8(); - this->IsTimerOut(); + this->mTimer.Update(); this->vfunc_10(&mUnk_174.mUnk_0C); data_027e09c0->func_ov000_0207e58c(mRef, 3, 4, &mUnk_174); return; @@ -305,11 +306,11 @@ void ActorUnkCASE::vfunc_24() { if (mState != 1 && mState != 2) { return; } - this->vfunc_20(); + this->Update(); } // non-matching -void ActorUnkCASE::vfunc_20() { +void ActorUnkCASE::Update() { mUnk_150.mUnk_1C = 1; if (!this->func_ov017_020bef4c(0x4000) && mUnk_48 != 0) { @@ -447,7 +448,7 @@ void ActorUnkCASE::func_ov063_0215b6c8(VecFx32 *param1, UnkAngleStruct angle) { VecFx32 vec = *param1; VecFx32_Copy(&vec, &mPos); VecFx32_Copy(&vec, &mPrevPos); - mAngle = *(s16 *) &angle.angle; + this->mAngle.angle_s = angle.angle_s; } void ActorUnkCASE::func_ov063_0215b724(void) { @@ -487,8 +488,7 @@ void ActorUnkCASE::func_ov063_0215b854(void) { VecFx32_Copy(&vec, &mPos); VecFx32_Copy(&vec, &mPrevPos); - actorCans->mUnk_236 = 20; - actorCans->mUnk_234 = 0; + actorCans->mUnk_234.Set(0, 20); actorCans = (ActorUnkCANS *) mUnk_14C; actorCans->func_ov063_02158b0c(); diff --git a/src/063_Shrine/Actor/ActorUnkRBLS.cpp b/src/063_Shrine/Actor/ActorUnkRBLS.cpp index cfeb3f0b..0f06fc57 100644 --- a/src/063_Shrine/Actor/ActorUnkRBLS.cpp +++ b/src/063_Shrine/Actor/ActorUnkRBLS.cpp @@ -22,7 +22,7 @@ ActorUnkRBLS::ActorUnkRBLS() : mUnk_94(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkRBLS)->mUnk_3C.mUnk_50)), mUnk_F4(&mUnk_94, GET_PROFILE(ActorProfileUnkRBLS)->vfunc_04()) {} -bool ActorUnkRBLS::vfunc_18(unk32 param1) { +bool ActorUnkRBLS::Init(unk32 param1) { this->mPos.x -= FLOAT_TO_FX32(0.5f); this->mPos.z -= FLOAT_TO_FX32(0.5f); this->mPos.y = 0; @@ -33,12 +33,12 @@ bool ActorUnkRBLS::vfunc_18(unk32 param1) { return true; } -void ActorUnkRBLS::vfunc_20(void) { +void ActorUnkRBLS::Update(void) { this->mUnk_F4.vfunc_34(); } void ActorUnkRBLS::vfunc_24(void) { - this->vfunc_20(); + this->Update(); } void ActorUnkRBLS::vfunc_2C(Actor_vfunc_30 *param1) { diff --git a/src/063_Shrine/Actor/ActorUnkRMSBase.cpp b/src/063_Shrine/Actor/ActorUnkRMSBase.cpp index 4d062ea0..f580ca1c 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSBase.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSBase.cpp @@ -7,21 +7,21 @@ ActorUnkRMSBase::ActorUnkRMSBase() : mUnk_154(0), mUnk_155(0) {} -bool ActorUnkRMSBase::vfunc_18(unk32 param1) { - bool res = UnkStruct_ov031_02114870::vfunc_18(param1); +bool ActorUnkRMSBase::Init(unk32 param1) { + bool res = UnkStruct_ov031_02114870::Init(param1); mUnk_F4.vfunc_08(this->vfunc_58()); data_027e0cd8->mUnk_0C->mUnk_12A = 1; return res; } // Matched -void ActorUnkRMSBase::vfunc_1C() {} +void ActorUnkRMSBase::Setup() {} // Matched -void ActorUnkRMSBase::vfunc_20() {} +void ActorUnkRMSBase::Update() {} void ActorUnkRMSBase::vfunc_24() { - this->vfunc_20(); + this->Update(); } void ActorUnkRMSBase::vfunc_2C(Actor_vfunc_30 *param1) { diff --git a/src/063_Shrine/Actor/ActorUnkRMSD.cpp b/src/063_Shrine/Actor/ActorUnkRMSD.cpp index 045a1d51..f97cdde6 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSD.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSD.cpp @@ -21,17 +21,17 @@ ActorProfileUnkRMSD::ActorProfileUnkRMSD() : ActorUnkRMSD::ActorUnkRMSD() : mUnk_158(&mUnk_94, GET_PROFILE(ActorProfileUnkRMSD)->vfunc_04()) {} -bool ActorUnkRMSD::vfunc_18(unk32 param1) { - bool res = ActorUnkRMSBase::vfunc_18(param1); +bool ActorUnkRMSD::Init(unk32 param1) { + bool res = ActorUnkRMSBase::Init(param1); this->mUnk_158.func_ov000_02099ff8(data_ov063_021634b0, 0x1000); return res; } -void ActorUnkRMSD::vfunc_20(void) { +void ActorUnkRMSD::Update(void) { this->mUnk_158.vfunc_34(); } void ActorUnkRMSD::vfunc_24(void) { - this->vfunc_20(); + this->Update(); } G3d_Model *ActorUnkRMSD::vfunc_54(void) { diff --git a/src/063_Shrine/Actor/ActorUnkRMSV.cpp b/src/063_Shrine/Actor/ActorUnkRMSV.cpp index 3b1e9a15..ff6c7de5 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSV.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSV.cpp @@ -31,8 +31,8 @@ ActorUnkRMSV::ActorUnkRMSV() : mUnk_158(&mUnk_94, GET_PROFILE(ActorProfileUnkRMSV)->vfunc_04()), mUnk_1D4(&mUnk_94, GET_PROFILE(ActorProfileUnkRMSV)->vfunc_04()) {} -bool ActorUnkRMSV::vfunc_18(unk32 param1) { - bool res = ActorUnkRMSBase::vfunc_18(param1); +bool ActorUnkRMSV::Init(unk32 param1) { + bool res = ActorUnkRMSBase::Init(param1); this->mUnk_158.func_ov000_02099ff8(data_ov063_021632ac, 0x1000); func_ov000_02099e58(&this->mUnk_1D4, data_ov063_021632c4, 0x1000); this->mUnk_1D4.vfunc_3C(); @@ -43,13 +43,13 @@ void UnkStruct_ov063_021632e4::vfunc_3C() { mUnk_08->func_ov000_02057c98(this->vfunc_10()); } -void ActorUnkRMSV::vfunc_20(void) { +void ActorUnkRMSV::Update(void) { this->mUnk_158.vfunc_34(); this->mUnk_1D4.vfunc_34(); } void ActorUnkRMSV::vfunc_24(void) { - this->vfunc_20(); + this->Update(); } G3d_Model *ActorUnkRMSV::vfunc_54(void) { diff --git a/src/063_Shrine/Actor/ActorUnkRMSW.cpp b/src/063_Shrine/Actor/ActorUnkRMSW.cpp index eba5f697..21dc7bdc 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSW.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSW.cpp @@ -21,18 +21,18 @@ ActorProfileUnkRMSW::ActorProfileUnkRMSW() : ActorUnkRMSW::ActorUnkRMSW() : mUnk_158(&mUnk_94, GET_PROFILE(ActorProfileUnkRMSW)->vfunc_04()) {} -bool ActorUnkRMSW::vfunc_18(unk32 param1) { - bool res = ActorUnkRMSBase::vfunc_18(param1); +bool ActorUnkRMSW::Init(unk32 param1) { + bool res = ActorUnkRMSBase::Init(param1); this->mUnk_158.func_ov000_02099ff8(data_ov063_02163388, 0x1000); return res; } -void ActorUnkRMSW::vfunc_20(void) { +void ActorUnkRMSW::Update(void) { this->mUnk_158.vfunc_34(); } void ActorUnkRMSW::vfunc_24(void) { - this->vfunc_20(); + this->Update(); } G3d_Model *ActorUnkRMSW::vfunc_54(void) { diff --git a/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp b/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp index b0120ecc..d1b09228 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp @@ -50,11 +50,10 @@ MapObjectProfileUnkLTRW::MapObjectProfileUnkLTRW() : MapObjectUnkLTRW::MapObjectUnkLTRW() : mUnk_40(G3d_GetModelPtr(GET_PROFILE_20_50(MapObjectProfileUnkLTRW))), mUnk_A0(1), - mUnk_A4(0), - mUnk_A6(0), + mUnk_A4(0, 0), mUnk_A8() {} -bool MapObjectUnkLTRW::vfunc_00() { +bool MapObjectUnkLTRW::Init() { mPos.x -= FLOAT_TO_FX32(.5f); mPos.z -= FLOAT_TO_FX32(.5f); mUnk_10 = GET_PROFILE_D4(MapObjectProfileUnkLTRW); @@ -67,9 +66,7 @@ bool MapObjectUnkLTRW::vfunc_00() { } void MapObjectUnkLTRW::vfunc_08() { - if (mUnk_A4 < mUnk_A6) { - mUnk_A4++; - } + this->mUnk_A4.Update(); } void MapObjectUnkLTRW::vfunc_14(unk32 param1) { @@ -112,9 +109,8 @@ unk32 MapObjectUnkLTRW::vfunc_28(unk32 param1, unk32 param2, unk32 param3) { } void MapObjectUnkLTRW::func_ov063_02160d18(unk32 param1) { - mUnk_A0 = param1; - mUnk_A6 = -1; - mUnk_A4 = 0; + this->mUnk_A0 = param1; + this->mUnk_A4.Reset(); } void UnkStruct_ov063_021639e4::vfunc2_04() { diff --git a/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp b/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp index 82dd0400..74bbbd7c 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp @@ -32,13 +32,12 @@ MapObjectProfileUnkMTJR::MapObjectProfileUnkMTJR() : MapObjectUnkMTJR::MapObjectUnkMTJR() : mUnk_40(G3d_GetModelPtr(GET_PROFILE_20_50(MapObjectProfileUnkMTJR))), mUnk_A0(2), - mUnk_A4(0), - mUnk_A6(0), + mUnk_A4(0, 0), mUnk_A8(NULL), mUnk_AC(-1), mUnk_B0(0) {} -bool MapObjectUnkMTJR::vfunc_00() { +bool MapObjectUnkMTJR::Init() { if (!this->func_ov000_0209d29c(0)) { return false; } @@ -62,9 +61,8 @@ void MapObjectUnkMTJR::vfunc_08() { VecFx32 stack_vec = {tmp_x, tmp_y, tmp_z}; data_027e0cec->func_ov000_020a0220(&mUnk_A8, &stack_vec); } - if (mUnk_A4 < mUnk_A6) { - mUnk_A4++; - } + + this->mUnk_A4.Update(); } void MapObjectUnkMTJR::vfunc_0C() { @@ -104,9 +102,9 @@ bool MapObjectUnkMTJR::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) } void MapObjectUnkMTJR::func_ov063_02161254(unk32 param1) { - mUnk_A0 = param1; - mUnk_A6 = -1; - mUnk_A4 = 0; + this->mUnk_A0 = param1; + this->mUnk_A4.Reset(); + if (param1 != 0 && param1 == 1) { this->func_ov063_02161288(); } diff --git a/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp b/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp index 76693b3b..e5cd37f6 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp @@ -44,8 +44,7 @@ MapObjectUnkSTAT::MapObjectUnkSTAT() : mUnk_50(-1), mUnk_54(0x8000), mUnk_58(500), - mUnk_5A(0), - mUnk_5C(0), + mUnk_5A(0, 0), mUnk_60(0), mUnk_64(0), mUnk_68(0) { @@ -53,7 +52,7 @@ MapObjectUnkSTAT::MapObjectUnkSTAT() : } // non-matching -bool MapObjectUnkSTAT::vfunc_00(void) { +bool MapObjectUnkSTAT::Init(void) { unk32 val; switch (mUnk_20.mParams[0]) { case 0: @@ -92,9 +91,7 @@ void MapObjectUnkSTAT::vfunc_08(void) { break; } - if (mUnk_5A < mUnk_5C) { - mUnk_5A++; - } + this->mUnk_5A.Update(); } void MapObjectUnkSTAT::vfunc_0C(void) { @@ -104,7 +101,7 @@ void MapObjectUnkSTAT::vfunc_0C(void) { void MapObjectUnkSTAT::vfunc_14(unk32 param1) { VecFx32 vec; VecFx32_Init(mPos.x + mUnk_60, mPos.y + mUnk_64, mPos.z + mUnk_68, &vec); - mUnk_40.func_01ffc6d4(mAngleStruct, &vec); + mUnk_40.func_01ffc6d4(this->mAngle, &vec); } // non-matching @@ -119,7 +116,7 @@ void MapObjectUnkSTAT::func_ov063_0215f7ac(void) { this->func_ov063_0215fc40(3); } - if (mUnk_5A == 35) { + if (this->mUnk_5A.value == 35) { VecFx32 vec = mPos; data_027e0cec->func_ov000_0209feac(0x87D, &vec, 4, 0, 0); @@ -127,7 +124,7 @@ void MapObjectUnkSTAT::func_ov063_0215f7ac(void) { data_027e09a8->func_ov000_02071b30(0x127, &vec, 0); } - u16 counter = mUnk_5A; + u16 counter = this->mUnk_5A.value; if (30 < counter && counter < 50) { u32 randomVal = gRandom.Next32(0x15); s32 gRandomVal = ((u32 *) gRandom.mRandomValue)[0]; @@ -179,8 +176,7 @@ void MapObjectUnkSTAT::func_ov063_0215f7ac(void) { VecFx32_Copy(&mPos, &stackStruct.mUnk_0C); mUnk_50 = data_027e09b8->func_ov000_02073388(&stackStruct, 0); - mUnk_5C = -1; - mUnk_5A = 0; + this->mUnk_5A.Reset(); data_027e09a8->func_ov000_02071bd4(0x126, &mPos, 0); return; } @@ -188,12 +184,11 @@ void MapObjectUnkSTAT::func_ov063_0215f7ac(void) { } void MapObjectUnkSTAT::func_ov063_0215fc40(unk32 param1) { - mUnk_4C = param1; - mUnk_5C = -1; - mUnk_5A = 0; - mUnk_60 = 0; - mUnk_64 = 0; - mUnk_68 = 0; + this->mUnk_4C = param1; + this->mUnk_5A.Reset(); + this->mUnk_60 = 0; + this->mUnk_64 = 0; + this->mUnk_68 = 0; switch (param1) { case 0: @@ -206,7 +201,7 @@ void MapObjectUnkSTAT::func_ov063_0215fc40(unk32 param1) { } unk32 MapObjectUnkSTAT::func_ov063_0215fce0(void) { - return func_02016b8c(&mPos, data_027e0ce0->func_01fff148(0), mUnk_54, mAngleStruct, mUnk_58, 1); + return func_02016b8c(&mPos, data_027e0ce0->func_01fff148(0), mUnk_54, mAngle, mUnk_58, 1); } MapObjectUnkSTAT::~MapObjectUnkSTAT() {} diff --git a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp index d9f3987d..d4e01bbc 100644 --- a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp +++ b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp @@ -43,7 +43,7 @@ void ActorUnkKEYN::func_ov070_021420a4(void) {} void ActorUnkKEYN::func_ov070_021420d8(void) {} void ActorUnkKEYN::func_ov070_02142140(void) { - this->IsTimerOut(); + this->mTimer.Update(); if (!data_027e09b8->func_01ffd420()) { if (data_027e0d34->TryItemGive(this->mItemId)) { diff --git a/src/071_Tower/Actor/ActorTearLight.cpp b/src/071_Tower/Actor/ActorTearLight.cpp index 63a130f5..b7c595d5 100644 --- a/src/071_Tower/Actor/ActorTearLight.cpp +++ b/src/071_Tower/Actor/ActorTearLight.cpp @@ -41,12 +41,12 @@ extern UnkStruct_ov019_020d24c8_28_258_00 data_ov071_02165150; static ActorUnkZLSL_AnimationTag data_ov071_02164be0 = {0x0, "szku"}; static const ActorTearLight_UnkStruct data_ov071_02164cd8 = {.fct = NULL}; -static ActorTearLight_UnkStruct data_ov071_02164ce0 = {.fct = ActorTearLight::func_ov071_0215fed4}; -static ActorTearLight_UnkStruct data_ov071_02164ce8 = {.fct = ActorTearLight::func_ov071_0215ff08}; -static ActorTearLight_UnkStruct data_ov071_02164cf0 = {.fct = ActorTearLight::func_ov071_0215ff3c}; -static ActorTearLight_UnkStruct data_ov071_02164cf8 = {.fct = ActorTearLight::func_ov071_0215ff3c}; -static ActorTearLight_UnkStruct data_ov071_02164d00 = {.fct = ActorTearLight::func_ov071_0215ffb8}; -static ActorTearLight_UnkStruct data_ov071_02164d08 = {.fct = ActorTearLight::func_ov071_0215ffbc}; +static ActorTearLight_UnkStruct data_ov071_02164ce0 = {.fct = &ActorTearLight::func_ov071_0215fed4}; +static ActorTearLight_UnkStruct data_ov071_02164ce8 = {.fct = &ActorTearLight::func_ov071_0215ff08}; +static ActorTearLight_UnkStruct data_ov071_02164cf0 = {.fct = &ActorTearLight::func_ov071_0215ff3c}; +static ActorTearLight_UnkStruct data_ov071_02164cf8 = {.fct = &ActorTearLight::func_ov071_0215ff3c}; +static ActorTearLight_UnkStruct data_ov071_02164d00 = {.fct = &ActorTearLight::func_ov071_0215ffb8}; +static ActorTearLight_UnkStruct data_ov071_02164d08 = {.fct = &ActorTearLight::func_ov071_0215ffbc}; DECL_PROFILE(ActorProfileTearLight); @@ -82,7 +82,7 @@ ActorTearLight::ActorTearLight() : } // non-matching -bool ActorTearLight::vfunc_18(unk32 param1) { +bool ActorTearLight::Init(unk32 param1) { SET_FLAG(this->mFlags, ActorFlag_11); this->mItemId = ItemId_ForceGem_60; @@ -98,14 +98,14 @@ bool ActorTearLight::vfunc_18(unk32 param1) { return true; } -void ActorTearLight::vfunc_1C() { +void ActorTearLight::Setup() { if (this->mUnk_5C.mParams[0] != 0x1) { return; } data_027e0cd8->mUnk_0C->func_ov000_02080a5c(&this->mUnk_1BC.mUnk_00); } -void ActorTearLight::vfunc_20() { +void ActorTearLight::Update() { this->func_ov071_0215f92c(); this->func_ov071_0215f824(); @@ -126,8 +126,8 @@ void ActorTearLight::vfunc_24() { if (this->mState == ActorUnkSZKUState_2) { if (this->mUnk_1B8 != 0x0) { - this->IsTimerOut(); - if (this->mTimer == 0x14) { + this->mTimer.Update(); + if (this->mTimer.value == 20) { this->func_ov071_0215fca4(); VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel); this->mUnk_1B8 = 0x0; @@ -151,7 +151,7 @@ void ActorTearLight::vfunc_2C(Actor_vfunc_30 *param1) { return; } Mat3p matrix; - Mat3p_InitYRotation(&matrix, SIN((u16) this->mAngle), COS((u16) this->mAngle)); + Mat3p_InitYRotation(&matrix, SIN((u16) this->mAngle.angle_s), COS((u16) this->mAngle.angle_s)); VecFx32 vecC = this->mPos; vecC.y += FLOAT_TO_FX32(0.5f); @@ -310,8 +310,7 @@ void ActorTearLight::func_ov071_0215fc54() { void ActorTearLight::func_ov071_0215fca4() { this->func_ov071_0215f7f4(ActorUnkSZKUState_1); - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0000; + this->mTimer.Reset(); VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.25f), FLOAT_TO_FX32(0.0f), &this->mVel); @@ -336,8 +335,7 @@ void ActorTearLight::func_ov071_0215fd04() { var_z = !this->mUnk_18D; } - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0000; + this->mTimer.Reset(); VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel); this->mUnk_44 = 0; if (var_z) { @@ -351,8 +349,7 @@ void ActorTearLight::func_ov071_0215fd04() { void ActorTearLight::func_ov071_0215fd80() { this->func_ov071_0215f7f4(ActorUnkSZKUState_3); - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0000; + this->mTimer.Reset(); VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel); this->mUnk_4A[0] = 0x0; @@ -365,8 +362,7 @@ void ActorTearLight::func_ov071_0215fd80() { void ActorTearLight::func_ov071_0215fdd4() { this->func_ov071_0215f7f4(ActorUnkSZKUState_4); - this->mTimerMax = 0xFFFF; - this->mTimer = 0x0000; + this->mTimer.Reset(); this->mUnk_4A[0] = 0x0; VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel); @@ -401,19 +397,19 @@ void ActorTearLight::func_ov071_0215fe94() { } void ActorTearLight::func_ov071_0215fed4() { - this->IsTimerOut(); + this->mTimer.Update(); this->func_ov000_02098838(); this->mUnk_3C = &this->mUnk_168; } void ActorTearLight::func_ov071_0215ff08() { - this->IsTimerOut(); + this->mTimer.Update(); this->mAngle += 0x222; // TODO DEG_ANGLE this->mUnk_3C = &this->mUnk_168; } void ActorTearLight::func_ov071_0215ff3c() { - this->IsTimerOut(); + this->mTimer.Update(); if (!data_027e09b8->func_01ffd420()) { if (data_027e0d34->TryItemGive(this->mItemId)) { diff --git a/src/102_CourseExecLand/ActorUnkMLCK_102.cpp b/src/102_CourseExecLand/ActorUnkMLCK_102.cpp index bd4ce8d0..fb7b2271 100644 --- a/src/102_CourseExecLand/ActorUnkMLCK_102.cpp +++ b/src/102_CourseExecLand/ActorUnkMLCK_102.cpp @@ -25,7 +25,7 @@ struct UnkStruct_ov102_02184a10 { }; static const UnkStruct_ov102_02184a10 data_ov102_02184a10; -void ActorUnkMLCK::vfunc_20() { +void ActorUnkMLCK::Update() { this->vfunc_70(); this->mUnk_F2 = gpMiscAdvManager->mSongs & (1 << this->mUnk_B8) ? 1 : 0; @@ -60,13 +60,11 @@ void ActorUnkMLCK::vfunc_20() { } } - if (this->mUnk_C0 < this->mUnk_C2) { - (*(volatile u16 *) &this->mUnk_C0)++; - } + this->mUnk_C0.Update(); } void ActorUnkMLCK::vfunc_24() { - this->vfunc_20(); + this->Update(); } bool ActorUnkMLCK_C4::func_ov102_021847e8(unk32 param1, unk32 param2) { diff --git a/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp b/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp index db8f2fb3..9754c959 100644 --- a/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp +++ b/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp @@ -122,7 +122,7 @@ void MapObjectUnkPTFL::vfunc_08() { } break; case 2: - if (this->mUnk_56 >= this->mUnk_58) { + if (this->mUnk_56.HasReachedMaxU()) { this->func_ov070_0214bbd0(MapObjectUnkPTFLState_0, false); } break; @@ -135,9 +135,7 @@ void MapObjectUnkPTFL::vfunc_08() { break; } - if (this->mUnk_56 < this->mUnk_58) { - this->mUnk_56++; - } + this->mUnk_56.Update(); } void MapObjectUnkPTFL::vfunc_0C() { diff --git a/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp b/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp index 1373f485..c78172e0 100644 --- a/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp +++ b/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp @@ -143,7 +143,7 @@ void MapObjectUnkSAND_40::func_ov102_021837a8(Vec2bCpp param1, VecFx32 *param2) const UnkStruct_ov102_021848b0 *ptr = &data_ov102_021848b0[var_r6]; UnkSystem6_Derived2 sp14( G3d_GetUnkPtr(data_ov031_021189d0.unk_70, data_ov102_021848f0[data_ov102_021848b0[var_r6].unk_00]), true); - sp6.angle_signed = ptr->unk_02; + sp6.angle_s = ptr->unk_02; sp14.func_01ffc6d4(sp6, param2); } diff --git a/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp b/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp index bb6bb179..c05fd98b 100644 --- a/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp +++ b/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp @@ -340,7 +340,7 @@ static inline bool UnknownInline2(PlayerLinkActor_A0_1C *param2, VecFx32 *param4 if (temp_r0_2 != NULL && temp_r0_2->GetActorId() == ActorId_IWTS) { s16 sp0; func_ov000_0205d65c(&sp0, param4, &((ActorUnkIWTS *) temp_r0_2)->mUnk_22F8, *param5); - param5->angle = sp0; + param5->angle_u = sp0; return true; } } @@ -373,19 +373,19 @@ void func_ov102_02183414(s16 *param1, PlayerLinkActor_A0_1C *param2, bool param3 if (var_r1_3) { if (!param2->mUnk_06) { func_ov095_0217aa88(&sp6, ¶m2->mUnk_04, param6, param5); - param5.angle = sp6; + param5.angle_u = sp6; } else { func_ov095_0217aaa8(&sp4, ¶m2->mUnk_04, param6); - param5.angle = sp4; + param5.angle_u = sp4; } } else { func_ov031_020dcea4(&sp2, param2->mUnk_00->GetUnk78(), param5); - param5.angle = sp2 + 0x4000; + param5.angle_u = sp2 + 0x4000; } } } } param2->mUnk_06 = var_r5; - *param1 = param5.angle_signed; + *param1 = param5.angle_s; } diff --git a/src/110_PlayerGet/PlayerGet.cpp b/src/110_PlayerGet/PlayerGet.cpp index feeb3ea6..f6d7021f 100644 --- a/src/110_PlayerGet/PlayerGet.cpp +++ b/src/110_PlayerGet/PlayerGet.cpp @@ -427,7 +427,7 @@ static const AdventureFlag sAdvFlagItemMap[] = { void UnkStruct_PlayerGet_74::vfunc_00(unk32 param1, unk32 param2) { PlayerGet *unk_14 = (PlayerGet *) this->mUnk_14; - func_01ffc5a0(&unk_14->mUnk_8C, unk_14->mUnk_6C, unk_14->mUnkAngleStruct, &this->mUnk_04); + func_01ffc5a0(&unk_14->mUnk_8C, unk_14->mUnk_6C, unk_14->mAngle, &this->mUnk_04); } PlayerGet::PlayerGet() : @@ -564,7 +564,7 @@ void PlayerGet::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { pActor->mUnk_4A[0] = 0; } break; - case 0x3A: + case 0x3A: { if (this->mUnk_54.mItemId != ItemId_Nothing) { u32 niVar10 = func_ov000_020a4c00(this->mUnk_54.mItemId); @@ -664,7 +664,8 @@ void PlayerGet::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { } break; - case 0x3B: + } + case 0x3B: { this->mUnk_72 = 0; if (this->mUnk_54.mItemId != ItemId_Nothing) { @@ -684,6 +685,7 @@ void PlayerGet::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { UnkTextStruct1 auStack_30(-1, 0); data_ov000_020b504c.func_ov000_02067cf8(ItemManager::GetBmgIDFromItem(this->mUnk_54.mItemId), 0, &auStack_30); break; + } default: break; } diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp index 767b204e..df85a689 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp @@ -18,11 +18,23 @@ PlayerSceneChange::PlayerSceneChange() : this->mUnk_68 = this->mUnk_2C->mUnk_14C; this->mUnk_6C = -1; +#if __MWERKS__ this->mUnk_70.coords = this->mUnk_34->coords; this->mUnk_7C = 0; this->mUnk_80.coords = this->mUnk_34->coords; this->mUnk_8C = 0; +#else + this->mUnk_70.x = this->mUnk_34->x; + this->mUnk_70.y = this->mUnk_34->y; + this->mUnk_70.z = this->mUnk_34->z; + this->mUnk_7C = 0; + + this->mUnk_80.x = this->mUnk_34->x; + this->mUnk_80.y = this->mUnk_34->y; + this->mUnk_80.z = this->mUnk_34->z; + this->mUnk_8C = 0; +#endif this->mUnk_90.Reset(); *((u32 *) this->mUnk_94) = 0; @@ -53,7 +65,7 @@ s16 PlayerSceneChange::func_ov112_02184bbc(s16 param1) { Actor *pActor = gpActorManager->func_01fff3b4(this->mUnk_90); if (pActor != NULL) { - return pActor->mAngle; + return pActor->mAngle.angle_s; } } else if (this->mUnk_94[0] == 0x1000) { return this->mUnk_AE; @@ -186,8 +198,8 @@ void PlayerSceneChange::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { if (temp_r0_6->GetActorId() == ActorId_GTTG) { this->mUnk_90.type_index = temp_r0_6->mRef.type_index; - this->mUnk_AA = temp_r0_6->mAngle; - this->mUnk_A8 = temp_r0_6->mAngle; + this->mUnk_AA = temp_r0_6->mAngle.angle_s; + this->mUnk_A8 = temp_r0_6->mAngle.angle_s; } } } diff --git a/src/112_PlayerSceneChange/PlayerSceneChange2.cpp b/src/112_PlayerSceneChange/PlayerSceneChange2.cpp index 6c65f538..a6f6c20e 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange2.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange2.cpp @@ -1,6 +1,5 @@ -#include "Actor/ActorManager.hpp" #include "Player/PlayerSceneChange.hpp" -#include "Unknown/UnkStruct_027e0cdc.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" extern "C" void func_ov000_0208ba10(void *, void *, unk32); extern "C" void func_ov000_02087ee8();