From 5739c36160430ecb777bc5a71065d00732353cfa Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 29 May 2025 12:38:15 +0200 Subject: [PATCH] `Actor::vfunc_08` -> `Actor::Init` --- config/eur/arm9/overlays/ov000/symbols.txt | 8 ++++---- config/eur/arm9/overlays/ov004/symbols.txt | 2 +- config/eur/arm9/overlays/ov014/symbols.txt | 14 +++++++------- config/eur/arm9/overlays/ov057/symbols.txt | 2 +- config/usa/arm9/overlays/ov000/symbols.txt | 8 ++++---- config/usa/arm9/overlays/ov004/symbols.txt | 2 +- config/usa/arm9/overlays/ov014/symbols.txt | 14 +++++++------- config/usa/arm9/overlays/ov057/symbols.txt | 2 +- include/Actor/Actor.hpp | 2 +- include/Actor/ActorRupee.hpp | 2 +- include/Actor/Dungeon/ActorActionObject.hpp | 2 +- include/Actor/Dungeon/ActorEventIcon.hpp | 2 +- include/Actor/Dungeon/ActorSwitchObject.hpp | 2 +- include/Actor/Navi/ActorNavi.hpp | 2 +- include/Actor/Navi/ActorNaviBase.hpp | 2 +- include/Actor/Player/ActorArrow.hpp | 2 +- include/Actor/Player/ActorBlast.hpp | 2 +- include/Actor/Player/ActorBomb.hpp | 2 +- include/Actor/Player/ActorRefill.hpp | 6 +++--- include/Actor/Player/ActorRope.hpp | 2 +- src/00_Core/Actor/Actor.cpp | 2 +- src/00_Core/Actor/ActorSpawner.cpp | 2 +- src/00_Core/Actor/Dungeon/ActorActionObject.cpp | 2 +- src/00_Core/Actor/Dungeon/ActorEventIcon.cpp | 2 +- src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp | 2 +- src/04_Load/Actor/Navi/ActorNaviBase.cpp | 2 +- src/14_Land/Actor/ActorRupee.cpp | 2 +- src/14_Land/Actor/Player/ActorArrow.cpp | 2 +- src/14_Land/Actor/Player/ActorBlast.cpp | 2 +- src/14_Land/Actor/Player/ActorBomb.cpp | 2 +- src/14_Land/Actor/Player/ActorRefill.cpp | 10 +++++----- src/57_Rope/Actor/Player/ActorRope.cpp | 2 +- 32 files changed, 56 insertions(+), 56 deletions(-) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 4d1e7b98..07354aa5 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -942,7 +942,7 @@ func_ov000_0208f9f0 kind:function(arm,size=0x1c) addr:0x208f9f0 func_ov000_0208fa0c kind:function(arm,size=0x5c) addr:0x208fa0c func_ov000_0208fa68 kind:function(arm,size=0x8) addr:0x208fa68 _ZN17ActorSwitchObject6CreateEv kind:function(arm,size=0x78) addr:0x208fa70 -_ZN17ActorSwitchObject8vfunc_08Ev kind:function(arm,size=0x24) addr:0x208fae8 +_ZN17ActorSwitchObject4InitEv kind:function(arm,size=0x24) addr:0x208fae8 _ZN17ActorSwitchObject8vfunc_0cEv kind:function(arm,size=0x34) addr:0x208fb0c _ZN17ActorSwitchObject8vfunc_14Ej kind:function(arm,size=0xbc) addr:0x208fb40 _ZN17ActorSwitchObject8vfunc_18Ej kind:function(arm,size=0x14) addr:0x208fbfc @@ -961,7 +961,7 @@ func_ov000_020904c4 kind:function(arm,size=0x14) addr:0x20904c4 func_ov000_020904d8 kind:function(arm,size=0x1c) addr:0x20904d8 _ZN14ActorEventIcon6CreateEv kind:function(arm,size=0x30) addr:0x20904f4 _ZN14ActorEventIconC2Ev kind:function(arm,size=0x5c) addr:0x2090524 -_ZN14ActorEventIcon8vfunc_08Ev kind:function(arm,size=0xb0) addr:0x2090580 +_ZN14ActorEventIcon4InitEv kind:function(arm,size=0xb0) addr:0x2090580 _ZN14ActorEventIcon8vfunc_14Ej kind:function(arm,size=0xc) addr:0x2090630 _ZN14ActorEventIcon8vfunc_18Ej kind:function(arm,size=0xc) addr:0x209063c _ZN14ActorEventIcon19func_ov000_02090648Ej kind:function(arm,size=0x12c) addr:0x2090648 @@ -2621,7 +2621,7 @@ _ZN17ActorActionObject6CreateEv kind:function(arm,size=0x30) addr:0x20be198 _ZN17ActorActionObjectC1Ev kind:function(arm,size=0x20) addr:0x20be1c8 _ZN17ActorActionObjectD1Ev kind:function(arm,size=0x14) addr:0x20be1e8 _ZN17ActorActionObjectD0Ev kind:function(arm,size=0x1c) addr:0x20be1fc -_ZN17ActorActionObject8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x20be218 +_ZN17ActorActionObject4InitEv kind:function(arm,size=0x7c) addr:0x20be218 _ZN17ActorActionObject8vfunc_14Ej kind:function(arm,size=0x178) addr:0x20be294 _ZN17ActorActionObject8vfunc_18Ej kind:function(arm,size=0xc) addr:0x20be40c func_ov000_020be418 kind:function(arm,size=0x4c) addr:0x20be418 @@ -2732,7 +2732,7 @@ _ZN5ActorC2Ev kind:function(arm,size=0x1c4) addr:0x20c1554 _ZN5ActorD1Ev kind:function(arm,size=0x4) addr:0x20c1718 _ZN5ActorD0Ev kind:function(arm,size=0x14) addr:0x20c171c _ZN5ActorD2Ev kind:function(arm,size=0x4) addr:0x20c1730 -_ZN5Actor8vfunc_08Ev kind:function(arm,size=0x8) addr:0x20c1734 +_ZN5Actor4InitEv kind:function(arm,size=0x8) addr:0x20c1734 _ZN5Actor8vfunc_0cEv kind:function(arm,size=0x4) addr:0x20c173c _ZN5Actor8vfunc_10Ej kind:function(arm,size=0x4) addr:0x20c1740 _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x20c1744 diff --git a/config/eur/arm9/overlays/ov004/symbols.txt b/config/eur/arm9/overlays/ov004/symbols.txt index 86bfd731..64c73de8 100644 --- a/config/eur/arm9/overlays/ov004/symbols.txt +++ b/config/eur/arm9/overlays/ov004/symbols.txt @@ -225,7 +225,7 @@ _ZN13ActorNaviBaseD1Ev kind:function(thumb,size=0x40) addr:0x210790c _ZN13ActorNaviBaseD0Ev kind:function(thumb,size=0x48) addr:0x210794c _ZN13ActorNaviBaseD2Ev kind:function(thumb,size=0x40) addr:0x2107994 _Z19func_ov004_021079d4Pi kind:function(thumb,size=0x6) addr:0x21079d4 -_ZN13ActorNaviBase8vfunc_08Ev kind:function(thumb,size=0xa4) addr:0x21079dc +_ZN13ActorNaviBase4InitEv kind:function(thumb,size=0xa4) addr:0x21079dc func_ov004_02107a80 kind:function(thumb,size=0x20) addr:0x2107a80 func_ov004_02107aa0 kind:function(thumb,size=0xc4) addr:0x2107aa0 func_ov004_02107b64 kind:function(thumb,size=0x9c) addr:0x2107b64 diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt index af3f2ed6..da54c8f2 100644 --- a/config/eur/arm9/overlays/ov014/symbols.txt +++ b/config/eur/arm9/overlays/ov014/symbols.txt @@ -15,7 +15,7 @@ _ZN10ActorArrow19func_ov014_0211fd90Ev kind:function(arm,size=0x14) addr:0x211fd _ZN10ActorArrowC2Ev kind:function(arm,size=0x108) addr:0x211fda4 _ZN10ActorArrowD1Ev kind:function(arm,size=0x28) addr:0x211feac _ZN10ActorArrowD0Ev kind:function(arm,size=0x30) addr:0x211fed4 -_ZN10ActorArrow8vfunc_08Ev kind:function(arm,size=0x148) addr:0x211ff04 +_ZN10ActorArrow4InitEv kind:function(arm,size=0x148) addr:0x211ff04 _ZN10ActorArrow12CollidesWithEP5Actor kind:function(arm,size=0x88) addr:0x212004c _ZN10ActorArrow19func_ov014_021200d4Ev kind:function(arm,size=0x44) addr:0x21200d4 _ZN10ActorArrow19func_ov014_02120118Ev kind:function(arm,size=0x68) addr:0x2120118 @@ -42,7 +42,7 @@ _ZN15ActorBlast_Unk18vfunc_10EPi kind:function(arm,size=0xa4) addr:0x212140c _ZN10ActorBlastC2Ev kind:function(arm,size=0x8c) addr:0x21214b0 _ZN10ActorBlastD1Ev kind:function(arm,size=0x14) addr:0x212153c _ZN10ActorBlastD0Ev kind:function(arm,size=0x1c) addr:0x2121550 -_ZN10ActorBlast8vfunc_08Ev kind:function(arm,size=0x260) addr:0x212156c +_ZN10ActorBlast4InitEv kind:function(arm,size=0x260) addr:0x212156c _ZN10ActorBlast8vfunc_14Ej kind:function(arm,size=0x218) addr:0x21217cc _ZN15ActorBlast_Unk1D1Ev kind:function(arm,size=0x14) addr:0x21219e4 _ZN10ActorBlast8vfunc_18Ej kind:function(arm,size=0x90) addr:0x21219f8 @@ -55,7 +55,7 @@ _ZN14ActorBomb_Unk2D1Ev kind:function(arm,size=0x1c) addr:0x2121cd8 _ZN9ActorBombD1Ev kind:function(arm,size=0x38) addr:0x2121cf4 _ZN9ActorBombD0Ev kind:function(arm,size=0x40) addr:0x2121d2c _ZN14ActorBomb_Unk2C1Ev kind:function(arm,size=0x14) addr:0x2121d6c -_ZN9ActorBomb8vfunc_08Ev kind:function(arm,size=0x134) addr:0x2121d80 +_ZN9ActorBomb4InitEv kind:function(arm,size=0x134) addr:0x2121d80 _ZN9ActorBomb8vfunc_14Ej kind:function(arm,size=0xc58) addr:0x2121eb4 _ZN14ActorBomb_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2122b0c _ZN9ActorBomb8vfunc_18Ej kind:function(arm,size=0x98) addr:0x2122b20 @@ -595,7 +595,7 @@ _ZN11ActorRefillC2Ei kind:function(arm,size=0x40) addr:0x2134f14 _ZN11ActorRefillD1Ev kind:function(arm,size=0x14) addr:0x2134f54 _ZN11ActorRefillD0Ev kind:function(arm,size=0x1c) addr:0x2134f68 _ZN11ActorRefillD2Ev kind:function(arm,size=0x14) addr:0x2134f84 -_ZN11ActorRefill8vfunc_08Ev kind:function(arm,size=0xf4) addr:0x2134f98 +_ZN11ActorRefill4InitEv kind:function(arm,size=0xf4) addr:0x2134f98 _ZN11ActorRefill8vfunc_14Ej kind:function(arm,size=0x2d8) addr:0x213508c _ZN11ActorRefill19func_ov014_02135364Ei kind:function(arm,size=0x54) addr:0x2135364 _ZN11ActorRefill8vfunc_20Eb kind:function(arm,size=0xbc) addr:0x21353b8 @@ -615,12 +615,12 @@ _ZN17ActorRefillArrows8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135634 _ZN15ActorRefillTimeC1Ev kind:function(arm,size=0x34) addr:0x213563c _ZN15ActorRefillTimeD1Ev kind:function(arm,size=0x14) addr:0x2135670 _ZN15ActorRefillTimeD0Ev kind:function(arm,size=0x1c) addr:0x2135684 -_ZN15ActorRefillTime8vfunc_08Ev kind:function(arm,size=0x114) addr:0x21356a0 +_ZN15ActorRefillTime4InitEv kind:function(arm,size=0x114) addr:0x21356a0 _ZN15ActorRefillTime8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x21357b4 _ZN9ActorLSTMC1Ev kind:function(arm,size=0x34) addr:0x21357bc _ZN9ActorLSTMD1Ev kind:function(arm,size=0x14) addr:0x21357f0 _ZN9ActorLSTMD0Ev kind:function(arm,size=0x1c) addr:0x2135804 -_ZN9ActorLSTM8vfunc_08Ev kind:function(arm,size=0x118) addr:0x2135820 +_ZN9ActorLSTM4InitEv kind:function(arm,size=0x118) addr:0x2135820 _ZN9ActorLSTM8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135938 func_ov014_02135940 kind:function(arm,size=0x34) addr:0x2135940 func_ov014_02135974 kind:function(arm,size=0xc4) addr:0x2135974 @@ -784,7 +784,7 @@ func_ov014_0213ae20 kind:function(arm,size=0x28) addr:0x213ae20 func_ov014_0213ae48 kind:function(arm,size=0x20) addr:0x213ae48 _ZN10ActorRupee6CreateEv kind:function(arm,size=0x30) addr:0x213ae68 _ZN10ActorRupeeC1Ev kind:function(arm,size=0x34) addr:0x213ae98 -_ZN10ActorRupee8vfunc_08Ev kind:function(arm,size=0x240) addr:0x213aecc +_ZN10ActorRupee4InitEv kind:function(arm,size=0x240) addr:0x213aecc _ZN10ActorRupee8vfunc_60Ev kind:function(arm,size=0x10) addr:0x213b10c _ZN10ActorRupee8vfunc_64Ev kind:function(arm,size=0x4) addr:0x213b11c _ZN10ActorRupee4MoveEv kind:function(arm,size=0x6c) addr:0x213b120 diff --git a/config/eur/arm9/overlays/ov057/symbols.txt b/config/eur/arm9/overlays/ov057/symbols.txt index 1da23918..9ded7bcd 100644 --- a/config/eur/arm9/overlays/ov057/symbols.txt +++ b/config/eur/arm9/overlays/ov057/symbols.txt @@ -36,7 +36,7 @@ _ZN13LinkStateItem19func_ov057_0219a364Ev kind:function(arm,size=0x4c) addr:0x21 _ZN22ActorRope_Unk_0219a3b08vfunc_08EPs kind:function(arm,size=0x4c) addr:0x219a3b0 _ZN22ActorRope_Unk_0219a3b08vfunc_10EPi kind:function(arm,size=0x64) addr:0x219a3fc _ZN9ActorRopeC2Ev kind:function(arm,size=0x108) addr:0x219a460 -_ZN9ActorRope8vfunc_08Ev kind:function(arm,size=0x44) addr:0x219a568 +_ZN9ActorRope4InitEv kind:function(arm,size=0x44) addr:0x219a568 _ZN9ActorRope19func_ov057_0219a5acEv kind:function(arm,size=0x10c) addr:0x219a5ac _ZN9ActorRope19func_ov057_0219a6b8Ev kind:function(arm,size=0x198) addr:0x219a6b8 _ZN9ActorRope19func_ov057_0219a850Ev kind:function(arm,size=0x114) addr:0x219a850 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 6d11f24b..3d96d716 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -942,7 +942,7 @@ func_ov000_0208f9f0 kind:function(arm,size=0x1c) addr:0x208f990 func_ov000_0208fa0c kind:function(arm,size=0x5c) addr:0x208f9ac func_ov000_0208fa68 kind:function(arm,size=0x8) addr:0x208fa08 _ZN17ActorSwitchObject6CreateEv kind:function(arm,size=0x78) addr:0x208fa10 -_ZN17ActorSwitchObject8vfunc_08Ev kind:function(arm,size=0x24) addr:0x208fa88 +_ZN17ActorSwitchObject4InitEv kind:function(arm,size=0x24) addr:0x208fa88 _ZN17ActorSwitchObject8vfunc_0cEv kind:function(arm,size=0x34) addr:0x208faac _ZN17ActorSwitchObject8vfunc_14Ej kind:function(arm,size=0xbc) addr:0x208fae0 _ZN17ActorSwitchObject8vfunc_18Ej kind:function(arm,size=0x14) addr:0x208fb9c @@ -961,7 +961,7 @@ func_ov000_020904c4 kind:function(arm,size=0x14) addr:0x2090464 func_ov000_020904d8 kind:function(arm,size=0x1c) addr:0x2090478 _ZN14ActorEventIcon6CreateEv kind:function(arm,size=0x30) addr:0x2090494 _ZN14ActorEventIconC2Ev kind:function(arm,size=0x5c) addr:0x20904c4 -_ZN14ActorEventIcon8vfunc_08Ev kind:function(arm,size=0xb0) addr:0x2090520 +_ZN14ActorEventIcon4InitEv kind:function(arm,size=0xb0) addr:0x2090520 _ZN14ActorEventIcon8vfunc_14Ej kind:function(arm,size=0xc) addr:0x20905d0 _ZN14ActorEventIcon8vfunc_18Ej kind:function(arm,size=0xc) addr:0x20905dc _ZN14ActorEventIcon19func_ov000_02090648Ej kind:function(arm,size=0x12c) addr:0x20905e8 @@ -2621,7 +2621,7 @@ _ZN17ActorActionObject6CreateEv kind:function(arm,size=0x30) addr:0x20be138 _ZN17ActorActionObjectC1Ev kind:function(arm,size=0x20) addr:0x20be168 _ZN17ActorActionObjectD1Ev kind:function(arm,size=0x14) addr:0x20be188 _ZN17ActorActionObjectD0Ev kind:function(arm,size=0x1c) addr:0x20be19c -_ZN17ActorActionObject8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x20be1b8 +_ZN17ActorActionObject4InitEv kind:function(arm,size=0x7c) addr:0x20be1b8 _ZN17ActorActionObject8vfunc_14Ej kind:function(arm,size=0x178) addr:0x20be234 _ZN17ActorActionObject8vfunc_18Ej kind:function(arm,size=0xc) addr:0x20be3ac func_ov000_020be418 kind:function(arm,size=0x4c) addr:0x20be3b8 @@ -2732,7 +2732,7 @@ _ZN5ActorC2Ev kind:function(arm,size=0x1c4) addr:0x20c14f4 _ZN5ActorD1Ev kind:function(arm,size=0x4) addr:0x20c16b8 _ZN5ActorD0Ev kind:function(arm,size=0x14) addr:0x20c16bc _ZN5ActorD2Ev kind:function(arm,size=0x4) addr:0x20c16d0 -_ZN5Actor8vfunc_08Ev kind:function(arm,size=0x8) addr:0x20c16d4 +_ZN5Actor4InitEv kind:function(arm,size=0x8) addr:0x20c16d4 _ZN5Actor8vfunc_0cEv kind:function(arm,size=0x4) addr:0x20c16dc _ZN5Actor8vfunc_10Ej kind:function(arm,size=0x4) addr:0x20c16e0 _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x20c16e4 diff --git a/config/usa/arm9/overlays/ov004/symbols.txt b/config/usa/arm9/overlays/ov004/symbols.txt index db3bb3bd..532f2002 100644 --- a/config/usa/arm9/overlays/ov004/symbols.txt +++ b/config/usa/arm9/overlays/ov004/symbols.txt @@ -225,7 +225,7 @@ _ZN13ActorNaviBaseD1Ev kind:function(thumb,size=0x40) addr:0x210788c _ZN13ActorNaviBaseD0Ev kind:function(thumb,size=0x48) addr:0x21078cc _ZN13ActorNaviBaseD2Ev kind:function(thumb,size=0x40) addr:0x2107914 _Z19func_ov004_021079d4Pi kind:function(thumb,size=0x6) addr:0x2107954 -_ZN13ActorNaviBase8vfunc_08Ev kind:function(thumb,size=0xa4) addr:0x210795c +_ZN13ActorNaviBase4InitEv kind:function(thumb,size=0xa4) addr:0x210795c func_ov004_02107a80 kind:function(thumb,size=0x20) addr:0x2107a00 func_ov004_02107aa0 kind:function(thumb,size=0xc4) addr:0x2107a20 func_ov004_02107b64 kind:function(thumb,size=0x9c) addr:0x2107ae4 diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt index ce1b6513..af30394f 100644 --- a/config/usa/arm9/overlays/ov014/symbols.txt +++ b/config/usa/arm9/overlays/ov014/symbols.txt @@ -15,7 +15,7 @@ _ZN10ActorArrow19func_ov014_0211fd90Ev kind:function(arm,size=0x14) addr:0x211fd _ZN10ActorArrowC2Ev kind:function(arm,size=0x108) addr:0x211fd24 _ZN10ActorArrowD1Ev kind:function(arm,size=0x28) addr:0x211fe2c _ZN10ActorArrowD0Ev kind:function(arm,size=0x30) addr:0x211fe54 -_ZN10ActorArrow8vfunc_08Ev kind:function(arm,size=0x148) addr:0x211fe84 +_ZN10ActorArrow4InitEv kind:function(arm,size=0x148) addr:0x211fe84 _ZN10ActorArrow12CollidesWithEP5Actor kind:function(arm,size=0x88) addr:0x211ffcc _ZN10ActorArrow19func_ov014_021200d4Ev kind:function(arm,size=0x44) addr:0x2120054 _ZN10ActorArrow19func_ov014_02120118Ev kind:function(arm,size=0x68) addr:0x2120098 @@ -42,7 +42,7 @@ _ZN15ActorBlast_Unk18vfunc_10EPi kind:function(arm,size=0xa4) addr:0x212138c _ZN10ActorBlastC2Ev kind:function(arm,size=0x8c) addr:0x2121430 _ZN10ActorBlastD1Ev kind:function(arm,size=0x14) addr:0x21214bc _ZN10ActorBlastD0Ev kind:function(arm,size=0x1c) addr:0x21214d0 -_ZN10ActorBlast8vfunc_08Ev kind:function(arm,size=0x260) addr:0x21214ec +_ZN10ActorBlast4InitEv kind:function(arm,size=0x260) addr:0x21214ec _ZN10ActorBlast8vfunc_14Ej kind:function(arm,size=0x218) addr:0x212174c _ZN15ActorBlast_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2121964 _ZN10ActorBlast8vfunc_18Ej kind:function(arm,size=0x90) addr:0x2121978 @@ -55,7 +55,7 @@ _ZN14ActorBomb_Unk2D1Ev kind:function(arm,size=0x1c) addr:0x2121c58 _ZN9ActorBombD1Ev kind:function(arm,size=0x38) addr:0x2121c74 _ZN9ActorBombD0Ev kind:function(arm,size=0x40) addr:0x2121cac _ZN14ActorBomb_Unk2C1Ev kind:function(arm,size=0x14) addr:0x2121cec -_ZN9ActorBomb8vfunc_08Ev kind:function(arm,size=0x134) addr:0x2121d00 +_ZN9ActorBomb4InitEv kind:function(arm,size=0x134) addr:0x2121d00 _ZN9ActorBomb8vfunc_14Ej kind:function(arm,size=0xc58) addr:0x2121e34 _ZN14ActorBomb_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2122a8c _ZN9ActorBomb8vfunc_18Ej kind:function(arm,size=0x98) addr:0x2122aa0 @@ -595,7 +595,7 @@ _ZN11ActorRefillC2Ei kind:function(arm,size=0x40) addr:0x2134e70 _ZN11ActorRefillD1Ev kind:function(arm,size=0x14) addr:0x2134eb0 _ZN11ActorRefillD0Ev kind:function(arm,size=0x1c) addr:0x2134ec4 _ZN11ActorRefillD2Ev kind:function(arm,size=0x14) addr:0x2134ee0 -_ZN11ActorRefill8vfunc_08Ev kind:function(arm,size=0xf4) addr:0x2134ef4 +_ZN11ActorRefill4InitEv kind:function(arm,size=0xf4) addr:0x2134ef4 _ZN11ActorRefill8vfunc_14Ej kind:function(arm,size=0x2d8) addr:0x2134fe8 _ZN11ActorRefill19func_ov014_02135364Ei kind:function(arm,size=0x54) addr:0x21352c0 _ZN11ActorRefill8vfunc_20Eb kind:function(arm,size=0xbc) addr:0x2135314 @@ -615,12 +615,12 @@ _ZN17ActorRefillArrows8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135590 _ZN15ActorRefillTimeC1Ev kind:function(arm,size=0x34) addr:0x2135598 _ZN15ActorRefillTimeD1Ev kind:function(arm,size=0x14) addr:0x21355cc _ZN15ActorRefillTimeD0Ev kind:function(arm,size=0x1c) addr:0x21355e0 -_ZN15ActorRefillTime8vfunc_08Ev kind:function(arm,size=0x114) addr:0x21355fc +_ZN15ActorRefillTime4InitEv kind:function(arm,size=0x114) addr:0x21355fc _ZN15ActorRefillTime8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135710 _ZN9ActorLSTMC1Ev kind:function(arm,size=0x34) addr:0x2135718 _ZN9ActorLSTMD1Ev kind:function(arm,size=0x14) addr:0x213574c _ZN9ActorLSTMD0Ev kind:function(arm,size=0x1c) addr:0x2135760 -_ZN9ActorLSTM8vfunc_08Ev kind:function(arm,size=0x118) addr:0x213577c +_ZN9ActorLSTM4InitEv kind:function(arm,size=0x118) addr:0x213577c _ZN9ActorLSTM8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135894 func_ov014_02135940 kind:function(arm,size=0x34) addr:0x213589c func_ov014_02135974 kind:function(arm,size=0xc4) addr:0x21358d0 @@ -784,7 +784,7 @@ func_ov014_0213ae20 kind:function(arm,size=0x28) addr:0x213ad7c func_ov014_0213ae48 kind:function(arm,size=0x20) addr:0x213ada4 _ZN10ActorRupee6CreateEv kind:function(arm,size=0x30) addr:0x213adc4 _ZN10ActorRupeeC1Ev kind:function(arm,size=0x34) addr:0x213adf4 -_ZN10ActorRupee8vfunc_08Ev kind:function(arm,size=0x240) addr:0x213ae28 +_ZN10ActorRupee4InitEv kind:function(arm,size=0x240) addr:0x213ae28 _ZN10ActorRupee8vfunc_60Ev kind:function(arm,size=0x10) addr:0x213b068 _ZN10ActorRupee8vfunc_64Ev kind:function(arm,size=0x4) addr:0x213b078 _ZN10ActorRupee4MoveEv kind:function(arm,size=0x6c) addr:0x213b07c diff --git a/config/usa/arm9/overlays/ov057/symbols.txt b/config/usa/arm9/overlays/ov057/symbols.txt index 190088e2..99d8cd1a 100644 --- a/config/usa/arm9/overlays/ov057/symbols.txt +++ b/config/usa/arm9/overlays/ov057/symbols.txt @@ -36,7 +36,7 @@ _ZN13LinkStateItem19func_ov057_0219a364Ev kind:function(arm,size=0x4c) addr:0x21 _ZN22ActorRope_Unk_0219a3b08vfunc_08EPs kind:function(arm,size=0x4c) addr:0x219a310 _ZN22ActorRope_Unk_0219a3b08vfunc_10EPi kind:function(arm,size=0x64) addr:0x219a35c _ZN9ActorRopeC2Ev kind:function(arm,size=0x108) addr:0x219a3c0 -_ZN9ActorRope8vfunc_08Ev kind:function(arm,size=0x44) addr:0x219a4c8 +_ZN9ActorRope4InitEv kind:function(arm,size=0x44) addr:0x219a4c8 _ZN9ActorRope19func_ov057_0219a5acEv kind:function(arm,size=0x10c) addr:0x219a50c _ZN9ActorRope19func_ov057_0219a6b8Ev kind:function(arm,size=0x198) addr:0x219a618 _ZN9ActorRope19func_ov057_0219a850Ev kind:function(arm,size=0x114) addr:0x219a7b0 diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 4d40a080..25bc9d8a 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -173,7 +173,7 @@ public: /* 158 */ /* 00 */ virtual ~Actor(); - /* 08 */ virtual bool vfunc_08(); + /* 08 */ virtual bool Init(); /* 0c */ virtual void vfunc_0c(); /* 10 */ virtual void vfunc_10(u32 param1); /* 14 */ virtual void vfunc_14(u32 param1); diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index a5fcbea3..983abaae 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -33,7 +33,7 @@ public: /* 160 */ /* 00 */ virtual ~ActorRupee() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; /* 20 */ virtual void vfunc_20(bool param1) override; diff --git a/include/Actor/Dungeon/ActorActionObject.hpp b/include/Actor/Dungeon/ActorActionObject.hpp index 0bf35dfb..c4e2add3 100644 --- a/include/Actor/Dungeon/ActorActionObject.hpp +++ b/include/Actor/Dungeon/ActorActionObject.hpp @@ -10,7 +10,7 @@ public: /* 158 */ /* 00 */ virtual ~ActorActionObject() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; /* b4 */ diff --git a/include/Actor/Dungeon/ActorEventIcon.hpp b/include/Actor/Dungeon/ActorEventIcon.hpp index ccef162d..a7a86751 100644 --- a/include/Actor/Dungeon/ActorEventIcon.hpp +++ b/include/Actor/Dungeon/ActorEventIcon.hpp @@ -17,7 +17,7 @@ public: /* 160 */ UnkStruct_02035064 mUnk_160; /* 00 */ virtual ~ActorEventIcon() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; /* 1c */ virtual void vfunc_1c(u16 *param1) override; diff --git a/include/Actor/Dungeon/ActorSwitchObject.hpp b/include/Actor/Dungeon/ActorSwitchObject.hpp index b2fa08d3..4142ff72 100644 --- a/include/Actor/Dungeon/ActorSwitchObject.hpp +++ b/include/Actor/Dungeon/ActorSwitchObject.hpp @@ -21,7 +21,7 @@ public: /* 198 */ /* 00 */ virtual ~ActorSwitchObject() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 0c */ virtual void vfunc_0c() override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; diff --git a/include/Actor/Navi/ActorNavi.hpp b/include/Actor/Navi/ActorNavi.hpp index 86774de4..f8a86acc 100644 --- a/include/Actor/Navi/ActorNavi.hpp +++ b/include/Actor/Navi/ActorNavi.hpp @@ -40,7 +40,7 @@ public: /* 3c8 */ /* 00 */ virtual ~ActorNavi() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 20 */ virtual void vfunc_20(bool param1) override; /* 8c */ virtual bool vfunc_8c() override; /* b4 */ virtual FairyId GetFairyId() override; diff --git a/include/Actor/Navi/ActorNaviBase.hpp b/include/Actor/Navi/ActorNaviBase.hpp index 59db230b..c7dd7cea 100644 --- a/include/Actor/Navi/ActorNaviBase.hpp +++ b/include/Actor/Navi/ActorNaviBase.hpp @@ -46,7 +46,7 @@ public: /* 294 */ /* 00 */ virtual ~ActorNaviBase() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 10 */ virtual void vfunc_10(u32 param1) override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; diff --git a/include/Actor/Player/ActorArrow.hpp b/include/Actor/Player/ActorArrow.hpp index a0ced1e3..021007f6 100644 --- a/include/Actor/Player/ActorArrow.hpp +++ b/include/Actor/Player/ActorArrow.hpp @@ -36,7 +36,7 @@ public: /* 1b8 */ /* 00 */ virtual ~ActorArrow() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 10 */ virtual void vfunc_10(u32 param1) override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; diff --git a/include/Actor/Player/ActorBlast.hpp b/include/Actor/Player/ActorBlast.hpp index a1e8b5fe..431cc1d7 100644 --- a/include/Actor/Player/ActorBlast.hpp +++ b/include/Actor/Player/ActorBlast.hpp @@ -19,7 +19,7 @@ public: /* 164 */ /* 00 */ virtual ~ActorBlast() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; /* b4 */ diff --git a/include/Actor/Player/ActorBomb.hpp b/include/Actor/Player/ActorBomb.hpp index 17538bf8..3817a73e 100644 --- a/include/Actor/Player/ActorBomb.hpp +++ b/include/Actor/Player/ActorBomb.hpp @@ -54,7 +54,7 @@ public: /* 26c */ /* 00 */ virtual ~ActorBomb() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; /* 20 */ virtual void vfunc_20(bool param1) override; diff --git a/include/Actor/Player/ActorRefill.hpp b/include/Actor/Player/ActorRefill.hpp index bdd334ff..a2c7ae52 100644 --- a/include/Actor/Player/ActorRefill.hpp +++ b/include/Actor/Player/ActorRefill.hpp @@ -20,7 +20,7 @@ public: ActorRefill(unk32 param1); /* 00 */ virtual ~ActorRefill() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 20 */ virtual void vfunc_20(bool param1) override; /* b4 */ virtual ItemFlag vfunc_b4() = 0; @@ -90,7 +90,7 @@ public: static ActorRefillTime *Create(); /* 00 */ virtual ~ActorRefillTime() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* b4 */ virtual ItemFlag vfunc_b4() override; /* b8 */ }; @@ -107,7 +107,7 @@ public: static ActorLSTM *Create(); /* 00 */ virtual ~ActorLSTM() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* b4 */ virtual ItemFlag vfunc_b4() override; /* b8 */ }; diff --git a/include/Actor/Player/ActorRope.hpp b/include/Actor/Player/ActorRope.hpp index 1d70a5fd..245a7851 100644 --- a/include/Actor/Player/ActorRope.hpp +++ b/include/Actor/Player/ActorRope.hpp @@ -46,7 +46,7 @@ public: /* 1a0 */ /* 00 */ virtual ~ActorRope() override; - /* 08 */ virtual bool vfunc_08() override; + /* 08 */ virtual bool Init() override; /* 10 */ virtual void vfunc_10(u32 param1) override; /* 14 */ virtual void vfunc_14(u32 param1) override; /* 18 */ virtual void vfunc_18(u32 param1) override; diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index db721414..20ba75ae 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -113,7 +113,7 @@ ARM Actor::Actor() : ARM Actor::~Actor() {} -ARM bool Actor::vfunc_08() { +ARM bool Actor::Init() { return true; } diff --git a/src/00_Core/Actor/ActorSpawner.cpp b/src/00_Core/Actor/ActorSpawner.cpp index c23babf2..60feae90 100644 --- a/src/00_Core/Actor/ActorSpawner.cpp +++ b/src/00_Core/Actor/ActorSpawner.cpp @@ -82,7 +82,7 @@ ARM s32 ActorSpawner::Spawn(ActorTypeId type, Vec3p *pos, ActorSpawnOptions *opt } actorManager->mNextActorId += 1; actorManager->mNumActors += 1; - if (!(*actorSlot)->vfunc_08()) { + if (!(*actorSlot)->Init()) { (*actorSlot)->mAlive = false; if (ref != NULL) { ref->Reset(); diff --git a/src/00_Core/Actor/Dungeon/ActorActionObject.cpp b/src/00_Core/Actor/Dungeon/ActorActionObject.cpp index 0a2c3970..ea2dfec2 100644 --- a/src/00_Core/Actor/Dungeon/ActorActionObject.cpp +++ b/src/00_Core/Actor/Dungeon/ActorActionObject.cpp @@ -18,7 +18,7 @@ ARM ActorActionObject::ActorActionObject() {} ARM ActorActionObject::~ActorActionObject() {} // non-matching -ARM bool ActorActionObject::vfunc_08() { +ARM bool ActorActionObject::Init() { mGravity = 0; mHitbox.pos = gVec3p_ZERO; mHitbox.size = -1; diff --git a/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp b/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp index 94e7381d..22e35d8e 100644 --- a/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp +++ b/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp @@ -4,7 +4,7 @@ ActorType ActorEventIcon::gType = ActorType(ActorTypeId_EventIcon, (ActorCreateF ActorEventIcon *ActorEventIcon::Create() {} ActorEventIcon::ActorEventIcon() {} -bool ActorEventIcon::vfunc_08() {} +bool ActorEventIcon::Init() {} void ActorEventIcon::vfunc_14(u32 param1) {} void ActorEventIcon::vfunc_18(u32 param1) {} u32 ActorEventIcon::func_ov000_02090648(u32 param1) {} diff --git a/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp b/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp index 37c4511c..016b2330 100644 --- a/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp +++ b/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp @@ -3,7 +3,7 @@ ActorType ActorSwitchObject::gType = ActorType(ActorTypeId_SwitchObject, (ActorCreateFunc) ActorSwitchObject::Create, NULL); ActorSwitchObject *ActorSwitchObject::Create() {} -bool ActorSwitchObject::vfunc_08() {} +bool ActorSwitchObject::Init() {} void ActorSwitchObject::vfunc_0c() {} void ActorSwitchObject::vfunc_14(u32 param1) {} void ActorSwitchObject::vfunc_18(u32 param1) {} diff --git a/src/04_Load/Actor/Navi/ActorNaviBase.cpp b/src/04_Load/Actor/Navi/ActorNaviBase.cpp index c4f5a069..21d91459 100644 --- a/src/04_Load/Actor/Navi/ActorNaviBase.cpp +++ b/src/04_Load/Actor/Navi/ActorNaviBase.cpp @@ -3,4 +3,4 @@ ActorNaviBase::ActorNaviBase() {} ActorNaviBase::~ActorNaviBase() {} void func_ov004_021079d4(unk32 *param1) {} -bool ActorNaviBase::vfunc_08() {} +bool ActorNaviBase::Init() {} diff --git a/src/14_Land/Actor/ActorRupee.cpp b/src/14_Land/Actor/ActorRupee.cpp index 32a95333..23ac82dc 100644 --- a/src/14_Land/Actor/ActorRupee.cpp +++ b/src/14_Land/Actor/ActorRupee.cpp @@ -36,7 +36,7 @@ ActorRupee::ActorRupee() { } // https://decomp.me/scratch/1qjCc -bool ActorRupee::vfunc_08() { +bool ActorRupee::Init() { u32 dVar5; u32 iVar7; diff --git a/src/14_Land/Actor/Player/ActorArrow.cpp b/src/14_Land/Actor/Player/ActorArrow.cpp index 48d27797..96529bf4 100644 --- a/src/14_Land/Actor/Player/ActorArrow.cpp +++ b/src/14_Land/Actor/Player/ActorArrow.cpp @@ -11,7 +11,7 @@ void ActorArrow::func_ov014_0211fd80(unk32 param1) {} void ActorArrow::func_ov014_0211fd90() {} ActorArrow::ActorArrow() {} ActorArrow::~ActorArrow() {} -bool ActorArrow::vfunc_08() {} +bool ActorArrow::Init() {} bool ActorArrow::CollidesWith(Actor *other) {} void ActorArrow::func_ov014_021200d4() {} void ActorArrow::func_ov014_02120118() {} diff --git a/src/14_Land/Actor/Player/ActorBlast.cpp b/src/14_Land/Actor/Player/ActorBlast.cpp index 0f892335..06f82f63 100644 --- a/src/14_Land/Actor/Player/ActorBlast.cpp +++ b/src/14_Land/Actor/Player/ActorBlast.cpp @@ -6,7 +6,7 @@ ActorBlast *ActorBlast::Create() {} void ActorBlast_Unk1::vfunc_10(s32 *param1) {} ActorBlast::ActorBlast() {} ActorBlast::~ActorBlast() {} -bool ActorBlast::vfunc_08() {} +bool ActorBlast::Init() {} void ActorBlast::vfunc_14(u32 param1) {} ActorBlast_Unk1::~ActorBlast_Unk1() {} void ActorBlast::vfunc_18(u32 param1) {} diff --git a/src/14_Land/Actor/Player/ActorBomb.cpp b/src/14_Land/Actor/Player/ActorBomb.cpp index 1ee7c1bc..91224f12 100644 --- a/src/14_Land/Actor/Player/ActorBomb.cpp +++ b/src/14_Land/Actor/Player/ActorBomb.cpp @@ -9,7 +9,7 @@ ActorBomb::ActorBomb() {} ActorBomb_Unk2::~ActorBomb_Unk2() {} ActorBomb::~ActorBomb() {} ActorBomb_Unk2::ActorBomb_Unk2() {} -bool ActorBomb::vfunc_08() {} +bool ActorBomb::Init() {} void ActorBomb::vfunc_14(u32 param1) {} ActorBomb_Unk1::~ActorBomb_Unk1() {} void ActorBomb::vfunc_18(u32 param1) {} diff --git a/src/14_Land/Actor/Player/ActorRefill.cpp b/src/14_Land/Actor/Player/ActorRefill.cpp index 0e6a9edf..75e2c2c4 100644 --- a/src/14_Land/Actor/Player/ActorRefill.cpp +++ b/src/14_Land/Actor/Player/ActorRefill.cpp @@ -41,7 +41,7 @@ ARM ActorRefill::ActorRefill(unk32 param1) : ARM ActorRefill::~ActorRefill() {} -ARM bool ActorRefill::vfunc_08() { +ARM bool ActorRefill::Init() { ItemManager *itemManager; if (this->vfunc_b4() == ItemFlag_None) { @@ -263,8 +263,8 @@ ARM ActorRefillTime::ActorRefillTime() : ARM ActorRefillTime::~ActorRefillTime() {} -ARM bool ActorRefillTime::vfunc_08() { - if (!ActorRefill::vfunc_08()) { +ARM bool ActorRefillTime::Init() { + if (!ActorRefill::Init()) { return false; } switch (mUnk_020.mUnk_00[0]) { @@ -305,8 +305,8 @@ ARM ActorLSTM::ActorLSTM() : ARM ActorLSTM::~ActorLSTM() {} -ARM bool ActorLSTM::vfunc_08() { - if (!ActorRefill::vfunc_08()) { +ARM bool ActorLSTM::Init() { + if (!ActorRefill::Init()) { return false; } switch (mUnk_020.mUnk_00[0]) { diff --git a/src/57_Rope/Actor/Player/ActorRope.cpp b/src/57_Rope/Actor/Player/ActorRope.cpp index 023f134b..40ab1aa4 100644 --- a/src/57_Rope/Actor/Player/ActorRope.cpp +++ b/src/57_Rope/Actor/Player/ActorRope.cpp @@ -5,7 +5,7 @@ ActorRope_Unk_0219a3b0 gUnk_0219a3b0; void ActorRope_Unk_0219a3b0::vfunc_08(unk16 *param1) {} void ActorRope_Unk_0219a3b0::vfunc_10(s32 *param1) {} ActorRope::ActorRope() {} -bool ActorRope::vfunc_08() {} +bool ActorRope::Init() {} q20 ActorRope::func_ov057_0219a5ac() {} void ActorRope::func_ov057_0219a6b8() {} void ActorRope::func_ov057_0219a850() {}