diff --git a/config/eur/arm9/itcm/symbols.txt b/config/eur/arm9/itcm/symbols.txt index ae287c81..46a22912 100644 --- a/config/eur/arm9/itcm/symbols.txt +++ b/config/eur/arm9/itcm/symbols.txt @@ -200,7 +200,7 @@ func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc _ZN12ActorManager13func_01fff2fcEPFvP5ActorP14Actor_vfunc_30EPv kind:function(arm,size=0x54) addr:0x01fff2fc _ZN12ActorManager13func_01fff350EP29UnkStruct_ov000_020b3000_BasePP5Actor kind:function(arm,size=0x64) addr:0x01fff350 -_ZN12ActorManager13func_01fff3b4E8ActorRef kind:function(arm,size=0x8c) addr:0x01fff3b4 +_ZN12ActorManager13func_01fff3b4E9RefStruct kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 _ZN5Actor8vfunc_10EP8Cylinder kind:function(arm,size=0x34) addr:0x01fff464 diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 8dee066e..079ac260 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -486,7 +486,7 @@ _ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) func_ov000_0206176c kind:function(thumb,size=0xbc) addr:0x0206176c func_ov000_02061828 kind:function(thumb,size=0x28) addr:0x02061828 _ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02061850 -_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x02061868 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x1e0) addr:0x02061868 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a48EP7VecFx32P5Vec2sS3_ kind:function(arm,size=0x28) addr:0x02061a48 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02061a70 func_ov000_02061a7c kind:function(arm,size=0x10) addr:0x02061a7c @@ -1414,8 +1414,8 @@ _ZN24UnkStruct_ov000_020b28388vfunc_00Ev kind:function(arm,size=0x4) addr:0x0207 _ZN24UnkStruct_ov000_020b2838D0Ev kind:function(arm,size=0x14) addr:0x0207bfe8 _ZN29UnkStruct_ov031_Items_00_BaseD2Ev kind:function(arm,size=0x4) addr:0x0207bffc _ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x8) addr:0x0207c000 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x8) addr:0x0207c008 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E8ActorRefi kind:function(arm,size=0x8) addr:0x0207c010 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x8) addr:0x0207c008 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E9RefStructi kind:function(arm,size=0x8) addr:0x0207c010 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207c018 func_ov000_0207c048 kind:function(arm,size=0x30) addr:0x0207c048 func_ov000_0207c078 kind:function(arm,size=0x38) addr:0x0207c078 @@ -1458,7 +1458,7 @@ _ZN18UnkStruct_027e09c019func_ov000_0207da40Ev kind:function(arm,size=0x20c) add func_ov000_0207dc4c kind:function(arm,size=0x18) addr:0x0207dc4c func_ov000_0207dc64 kind:function(arm,size=0x24) addr:0x0207dc64 func_ov000_0207dc88 kind:function(arm,size=0x210) addr:0x0207dc88 -_ZN18UnkStruct_027e09c019func_ov000_0207de98E8ActorRefP24UnkStruct_ov000_0207de98P8Actor_38 kind:function(arm,size=0xc0) addr:0x0207de98 +_ZN18UnkStruct_027e09c019func_ov000_0207de98E9RefStructP24UnkStruct_ov000_0207de98P8Actor_38 kind:function(arm,size=0xc0) addr:0x0207de98 func_ov000_0207df58 kind:function(arm,size=0x30) addr:0x0207df58 _ZN5Actor19func_ov000_0207df88EP8Cylinderi kind:function(arm,size=0xd8) addr:0x0207df88 func_ov000_0207e060 kind:function(arm,size=0x68) addr:0x0207e060 @@ -1471,10 +1471,10 @@ _ZN18UnkStruct_027e09c019func_ov000_0207e254EP15ActorUnkSCCN_B8 kind:function(ar func_ov000_0207e268 kind:function(arm,size=0x2c) addr:0x0207e268 _ZN5Actor19func_ov000_0207e294EP8Cylinder kind:function(arm,size=0x118) addr:0x0207e294 func_ov000_0207e3ac kind:function(arm,size=0xac) addr:0x0207e3ac -_ZN18UnkStruct_027e09c019func_ov000_0207e458EiiP7VecFx32iS1_8ActorRef kind:function(arm,size=0x84) addr:0x0207e458 +_ZN18UnkStruct_027e09c019func_ov000_0207e458EiiP7VecFx32iS1_9RefStruct kind:function(arm,size=0x84) addr:0x0207e458 func_ov000_0207e4dc kind:function(arm,size=0x84) addr:0x0207e4dc func_ov000_0207e560 kind:function(arm,size=0x2c) addr:0x0207e560 -_ZN18UnkStruct_027e09c019func_ov000_0207e58cE8ActorRefihP24UnkStruct_ov031_Items_01 kind:function(arm,size=0xa4) addr:0x0207e58c +_ZN18UnkStruct_027e09c019func_ov000_0207e58cE9RefStructihP24UnkStruct_ov031_Items_01 kind:function(arm,size=0xa4) addr:0x0207e58c func_ov000_0207e630 kind:function(arm,size=0x38) addr:0x0207e630 func_ov000_0207e668 kind:function(arm,size=0x50) addr:0x0207e668 func_ov000_0207e6b8 kind:function(arm,size=0x14) addr:0x0207e6b8 @@ -1881,7 +1881,7 @@ _ZN18UnkStruct_027e0ce019func_ov000_0208a318Eiii kind:function(arm,size=0x74) ad func_ov000_0208a38c kind:function(arm,size=0x30) addr:0x0208a38c func_ov000_0208a3bc kind:function(arm,size=0x328) addr:0x0208a3bc func_ov000_0208a6e4 kind:function(arm,size=0x48) addr:0x0208a6e4 -_ZN37UnkStruct_027e0ce0_40_Base_94_50_BaseC2EiiP12ActorRefElemi kind:function(thumb,size=0xe) addr:0x0208a72c +_ZN37UnkStruct_027e0ce0_40_Base_94_50_BaseC2EiiP7RefElemi kind:function(thumb,size=0xe) addr:0x0208a72c func_ov000_0208a73c kind:function(arm,size=0x68) addr:0x0208a73c func_ov000_0208a7a4 kind:function(arm,size=0x28) addr:0x0208a7a4 func_ov000_0208a7cc kind:function(arm,size=0x60) addr:0x0208a7cc @@ -1943,7 +1943,7 @@ func_ov000_0208bdb4 kind:function(arm,size=0x20) addr:0x0208bdb4 func_ov000_0208bdd4 kind:function(arm,size=0x10) addr:0x0208bdd4 func_ov000_0208bde4 kind:function(arm,size=0x18) addr:0x0208bde4 func_ov000_0208bdfc kind:function(arm,size=0x10) addr:0x0208bdfc -_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE8ActorRef kind:function(arm,size=0x3c) addr:0x0208be0c +_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE9RefStruct kind:function(arm,size=0x3c) addr:0x0208be0c func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be48 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208be70 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208be9c @@ -2254,7 +2254,7 @@ func_ov000_02097244 kind:function(arm,size=0x44) addr:0x02097244 func_ov000_02097288 kind:function(arm,size=0x154) addr:0x02097288 _ZN24UnkStruct_ov000_020b539c18func_ov000_02073dcEv kind:function(arm,size=0xc) addr:0x020973dc _ZN24UnkStruct_ov000_020b539c18func_ov000_02073e8Ev kind:function(arm,size=0xc) addr:0x020973e8 -_ZN5Actor19func_ov000_020973f4EP8ActorRefP24UnkStruct_ov000_020b539cjP11ActorParamsi kind:function(arm,size=0x50) addr:0x020973f4 +_ZN5Actor19func_ov000_020973f4EP9RefStructP24UnkStruct_ov000_020b539cjP11ActorParamsi kind:function(arm,size=0x50) addr:0x020973f4 _ZN24UnkStruct_ov000_020b539c19func_ov000_02097444EjP11ActorParamsi kind:function(arm,size=0x98) addr:0x02097444 _ZN24UnkStruct_ov000_020b539c16GetProfileFromIdEj kind:function(arm,size=0x4c) addr:0x020974dc func_ov000_02097528 kind:function(arm,size=0x20) addr:0x02097528 @@ -2292,7 +2292,7 @@ _ZN8Actor_9CC2Ev kind:function(arm,size=0x34) addr:0x02097b84 _ZN8Actor_9CC1Ev kind:function(arm,size=0x34) addr:0x02097bb8 _ZN8Actor_9C19func_ov000_02097becEv kind:function(arm,size=0x28) addr:0x02097bec _ZN8Actor_9C8vfunc_00Ev kind:function(arm,size=0xc) addr:0x02097c14 -_ZN8Actor_9C8vfunc_04E8ActorRefiiPi kind:function(arm,size=0x80) addr:0x02097c20 +_ZN8Actor_9C8vfunc_04E9RefStructiiPi kind:function(arm,size=0x80) addr:0x02097c20 func_ov000_02097ca0 kind:function(arm,size=0x7c) addr:0x02097ca0 _ZN19func_ov000_02097d1cD1Ev kind:function(arm,size=0x14) addr:0x02097d1c _ZN19func_ov000_02097d30D0Ev kind:function(arm,size=0x1c) addr:0x02097d30 @@ -2372,7 +2372,7 @@ _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x020997f0 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x02099804 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099820 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x02099870 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E8ActorRefP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998f0 +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998f0 _ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a0c func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x02099a1c _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x02099a28 @@ -2557,7 +2557,7 @@ _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) ad _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d114 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d12c _ZN9MapObject19func_ov000_0209d144EP5Vec2siP21UnkStruct_027e09bc_0C kind:function(arm,size=0x88) addr:0x0209d144 -_ZN9MapObject8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d1cc +_ZN9MapObject8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d1cc _ZN9MapObject8vfunc_20Ei kind:function(arm,size=0x4) addr:0x0209d1d4 _ZN9MapObject8vfunc_24EPS_7VecFx32 kind:function(arm,size=0xc) addr:0x0209d1d8 _ZN9MapObject8vfunc_28Eiii kind:function(arm,size=0x8) addr:0x0209d1e4 @@ -2570,8 +2570,8 @@ _ZN9MapObject19func_ov000_0209d2f0EiiP8Vec2bCpp kind:function(arm,size=0xc4) add _ZN9MapObject19func_ov000_0209d3b4Eii kind:function(arm,size=0x80) addr:0x0209d3b4 _ZN9MapObject19func_ov000_0209d434EPcP34UnkStruct_ov019_020d24c8_28_258_00i kind:function(arm,size=0xe4) addr:0x0209d434 _ZN9MapObject19func_ov000_0209d518EP7VecFx32iih kind:function(arm,size=0x34) addr:0x0209d518 -_ZN9MapObject19func_ov000_0209d54cEP8ActorRefPS_tPK7VecFx32st kind:function(arm,size=0x7c) addr:0x0209d54c -_ZN9MapObject19func_ov000_0209d5c8E8ActorRef kind:function(arm,size=0x4c) addr:0x0209d5c8 +_ZN9MapObject19func_ov000_0209d54cEP9RefStructPS_tPK7VecFx32st kind:function(arm,size=0x7c) addr:0x0209d54c +_ZN9MapObject19func_ov000_0209d5c8E9RefStruct kind:function(arm,size=0x4c) addr:0x0209d5c8 _ZN9MapObject19func_ov000_0209d614Ei kind:function(arm,size=0x54) addr:0x0209d614 _ZN9MapObject19func_ov000_0209d668Ev kind:function(arm,size=0x44) addr:0x0209d668 _ZN9MapObject19func_ov000_0209d6acEP7VecFx32 kind:function(arm,size=0x54) addr:0x0209d6ac @@ -2587,7 +2587,7 @@ _ZN17MapObjectPot_Base8vfunc_48Ev kind:function(arm,size=0x4) addr:0x0209da60 _ZN17MapObjectPot_Base8vfunc_54Ev kind:function(arm,size=0xc) addr:0x0209da64 _ZN17MapObjectPot_Base8vfunc_4CEv kind:function(arm,size=0x8) addr:0x0209da70 _ZN17MapObjectPot_Base19func_ov000_0209da78Eii kind:function(arm,size=0x48) addr:0x0209da78 -_ZN17MapObjectPot_Base8vfunc_50EP8ActorRefPS_ kind:function(arm,size=0xb4) addr:0x0209dac0 +_ZN17MapObjectPot_Base8vfunc_50EP9RefStructPS_ kind:function(arm,size=0xb4) addr:0x0209dac0 _ZN17MapObjectPot_Base8vfunc_3CEv kind:function(arm,size=0x8) addr:0x0209db74 _ZN17MapObjectPot_Base8vfunc_40Ev kind:function(arm,size=0x8) addr:0x0209db7c func_ov000_0209db84 kind:function(arm,size=0x8c) addr:0x0209db84 @@ -3033,7 +3033,7 @@ _ZN14Actor_Derived18vfunc_54Ei kind:function(arm,size=0x4) addr:0x020a8da0 _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 +_ZN14Actor_Derived119func_ov000_020a8df0E9RefStructi kind:function(arm,size=0x94) addr:0x020a8df0 _ZN14Actor_Derived18vfunc_B4Ev kind:function(arm,size=0x18) addr:0x020a8e84 _ZN14Actor_Derived119func_ov000_020a8e9cEP7VecFx32 kind:function(arm,size=0x24) addr:0x020a8e9c _ZN14Actor_Derived18vfunc_B0Ev kind:function(arm,size=0x94) addr:0x020a8ec0 diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt index 157172b4..5b413b41 100644 --- a/config/eur/arm9/overlays/ov017/symbols.txt +++ b/config/eur/arm9/overlays/ov017/symbols.txt @@ -127,11 +127,11 @@ _ZN18UnkStruct_027e0cec19func_ov017_020c1e54Eii kind:function(arm,size=0x48) add _ZN18UnkStruct_027e0cec19func_ov017_020c1e9cEii kind:function(arm,size=0x124) addr:0x020c1e9c _ZN18UnkStruct_027e0cec19func_ov017_020c1fc0Eii kind:function(arm,size=0x5c) addr:0x020c1fc0 _ZN21UnkStruct_027e0cec_008vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020c201c -_ZN5Actor19func_ov017_020c2038EP8ActorRefiiPK7VecFx32i kind:function(arm,size=0x164) addr:0x020c2038 +_ZN5Actor19func_ov017_020c2038EP9RefStructiiPK7VecFx32i kind:function(arm,size=0x164) addr:0x020c2038 _ZN5Actor19func_ov017_020c219cEiPK7VecFx32ib kind:function(arm,size=0x174) addr:0x020c219c _ZN5Actor19func_ov017_020c2310EPK7VecFx32i kind:function(arm,size=0x94) addr:0x020c2310 _ZN5Actor19func_ov017_020c23a4EiPK7VecFx32ib kind:function(arm,size=0x94) addr:0x020c23a4 -_ZN5Actor19func_ov017_020c2438EP8ActorRefiPK7VecFx32ib kind:function(arm,size=0x2c0) addr:0x020c2438 +_ZN5Actor19func_ov017_020c2438EP9RefStructiPK7VecFx32ib kind:function(arm,size=0x2c0) addr:0x020c2438 _ZN5Actor19func_ov017_020c26f8EiPK7VecFx32ib kind:function(arm,size=0x1bc) addr:0x020c26f8 _ZN5Actor19func_ov017_020c28b4EP7VecFx3214UnkAngleStructi kind:function(arm,size=0xc8) addr:0x020c28b4 _ZN21UnkStruct_027e0cec_1819func_ov017_020c297cEii kind:function(arm,size=0x15c) addr:0x020c297c diff --git a/config/eur/arm9/overlays/ov024/symbols.txt b/config/eur/arm9/overlays/ov024/symbols.txt index 478120d5..bd1816a8 100644 --- a/config/eur/arm9/overlays/ov024/symbols.txt +++ b/config/eur/arm9/overlays/ov024/symbols.txt @@ -109,10 +109,10 @@ _ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c6f08 _ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c6f34 _ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c6f48 _ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c6f68 -_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x020c6f8c +_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x1e0) addr:0x020c6f8c _ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c716c -_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x68) addr:0x020c7214 -_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP8ActorRef kind:function(arm,size=0x84) addr:0x020c727c +_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x68) addr:0x020c7214 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP9RefStruct kind:function(arm,size=0x84) addr:0x020c727c _ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c7300 _ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c7354 _ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c7390 diff --git a/config/eur/arm9/overlays/ov026/symbols.txt b/config/eur/arm9/overlays/ov026/symbols.txt index 2181f89e..a85dd3e2 100644 --- a/config/eur/arm9/overlays/ov026/symbols.txt +++ b/config/eur/arm9/overlays/ov026/symbols.txt @@ -47,7 +47,7 @@ func_ov026_020d9778 kind:function(arm,size=0x10) addr:0x020d9778 func_ov026_020d9788 kind:function(arm,size=0x148) addr:0x020d9788 func_ov026_020d98d0 kind:function(arm,size=0xe8) addr:0x020d98d0 func_ov026_020d99b8 kind:function(arm,size=0x25c) addr:0x020d99b8 -_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E8ActorRefP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9c14 +_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E9RefStructP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9c14 func_ov026_020da074 kind:function(arm,size=0x114) addr:0x020da074 func_ov026_020da188 kind:function(arm,size=0x114) addr:0x020da188 func_ov026_020da29c kind:function(arm,size=0x164) addr:0x020da29c diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index f04cb81b..84f3950c 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -35,10 +35,10 @@ _ZN19func_ov031_020d9568D1Ev kind:function(arm,size=0x14) addr:0x020d9568 _ZN19func_ov031_020d957cD0Ev kind:function(arm,size=0x1c) addr:0x020d957c _ZN27UnkStruct_ItemManager_20_0419func_ov031_020d9598Ev kind:function(thumb,size=0x1a) addr:0x020d9598 _ZN18UnkStruct_027e0d2c19func_ov031_020d95b4Ev kind:function(arm,size=0x14) addr:0x020d95b4 -_ZN18UnkStruct_027e0d2c19func_ov031_020d95c8E8ActorRef kind:function(arm,size=0x24) addr:0x020d95c8 +_ZN18UnkStruct_027e0d2c19func_ov031_020d95c8E9RefStruct kind:function(arm,size=0x24) addr:0x020d95c8 func_ov031_020d95ec kind:function(arm,size=0x30) addr:0x020d95ec func_ov031_020d961c kind:function(arm,size=0x10) addr:0x020d961c -_ZN18UnkStruct_027e0d2c19func_ov031_020d962cEP7VecFx32iS1_P8ActorRef kind:function(arm,size=0x1c) addr:0x020d962c +_ZN18UnkStruct_027e0d2c19func_ov031_020d962cEP7VecFx32iS1_P9RefStruct kind:function(arm,size=0x1c) addr:0x020d962c func_ov031_020d9648 kind:function(arm,size=0x10) addr:0x020d9648 _ZN27UnkStruct_ItemManager_20_0819func_ov031_020d9658Ev kind:function(thumb,size=0x1a) addr:0x020d9658 func_ov031_020d9674 kind:function(arm,size=0x10) addr:0x020d9674 @@ -359,8 +359,8 @@ _ZN13ActorBomb_180C1EP5Actor kind:function(arm,size=0x3c) addr:0x020e2d78 _ZN13ActorBomb_180D1Ev kind:function(arm,size=0x1c) addr:0x020e2db4 _ZN13ActorBomb_180D0Ev kind:function(arm,size=0x24) addr:0x020e2dd0 _ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x48) addr:0x020e2df4 -_ZN13ActorBomb_1808vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x450) addr:0x020e2e3c -_ZN13ActorBomb_1808vfunc_10E8ActorRefi kind:function(arm,size=0x84) addr:0x020e328c +_ZN13ActorBomb_1808vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x450) addr:0x020e2e3c +_ZN13ActorBomb_1808vfunc_10E9RefStructi kind:function(arm,size=0x84) addr:0x020e328c _ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e3310 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3340 _ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e337c @@ -373,7 +373,7 @@ _ZN16ActorProfileBombD1Ev kind:function(arm,size=0x14) addr:0x020e34a0 _ZN17ActorProfileBlast10GetProfileEv kind:function(arm,size=0xc) addr:0x020e34b4 _ZN17ActorProfileBlast6CreateEv kind:function(arm,size=0x24) addr:0x020e34c0 _ZN17ActorProfileBlastC1Ev kind:function(arm,size=0x38) addr:0x020e34e4 -_ZN13ActorBlast_E88vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1a4) addr:0x020e351c +_ZN13ActorBlast_E88vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1a4) addr:0x020e351c _ZN10ActorBlastC1Ev kind:function(arm,size=0x7c) addr:0x020e36c0 _ZN13ActorBlast_E8D1Ev kind:function(arm,size=0x14) addr:0x020e373c _ZN10ActorBlast4InitEi kind:function(arm,size=0x274) addr:0x020e3750 @@ -444,13 +444,13 @@ _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5474 _ZN22ActorItemBoomerang_11CD0Ev kind:function(arm,size=0x1c) addr:0x020e5488 _ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e54a4 -_ZN22ActorItemBoomerang_11C8vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x230) addr:0x020e54d4 +_ZN22ActorItemBoomerang_11C8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x230) addr:0x020e54d4 _ZN26ActorItemBoomerang_Unknown19func_ov031_020e5704Ev kind:function(arm,size=0xc) addr:0x020e5704 _ZN21ActorItemBoomerang_A0D0Ev kind:function(arm,size=0x1c) addr:0x020e5710 _ZN21ActorItemBoomerang_CCD0Ev kind:function(arm,size=0x1c) addr:0x020e572c _ZN25ActorProfileItemBoomerangD1Ev kind:function(arm,size=0x14) addr:0x020e5748 _ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e575c -_ZN24UnkStruct_ov031_02112ff48vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x114) addr:0x020e5784 +_ZN24UnkStruct_ov031_02112ff48vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x114) addr:0x020e5784 _ZN20ActorItemTornado_17C8vfunc_00Eii kind:function(arm,size=0x30) addr:0x020e5898 _ZN23ActorProfileItemTornado10GetProfileEv kind:function(arm,size=0xc) addr:0x020e58c8 _ZN23ActorProfileItemTornado6CreateEv kind:function(arm,size=0x24) addr:0x020e58d4 @@ -482,7 +482,7 @@ func_ov031_020e67dc kind:function(arm,size=0x7c) addr:0x020e67dc func_ov031_020e6858 kind:function(arm,size=0x64) addr:0x020e6858 _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e68bc _ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e68d8 -_ZN15ActorUnkSWBM_948vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e6900 +_ZN15ActorUnkSWBM_948vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e6900 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e691c _ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6974 _ZN15ActorUnkSWBM_C88vfunc_00Eii kind:function(arm,size=0x168) addr:0x020e69cc @@ -559,7 +559,7 @@ _ZN19ActorProfileUnkROCKD1Ev kind:function(arm,size=0x14) addr:0x020e8ca4 _ZN17ActorProfileRupee10GetProfileEv kind:function(arm,size=0xc) addr:0x020e8cb8 _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 +_ZN10ActorRupee19func_ov031_020e8d2cEP9RefStructPK7VecFx32jjS0_ kind:function(arm,size=0x7c) addr:0x020e8d2c _ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020e8da8 _ZN10ActorRupee4InitEi kind:function(arm,size=0x1d0) addr:0x020e8e1c _ZN10ActorRupee19func_ov031_020e8fecEv kind:function(arm,size=0x7c) addr:0x020e8fec @@ -599,7 +599,7 @@ _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9d94 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9e5c _ZN13ActorRupee_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020e9ef0 -_ZN13ActorRupee_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020e9f28 +_ZN13ActorRupee_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020e9f28 _ZN13ActorRupee_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020e9f6c _ZN13ActorRupee_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020e9f8c _ZN13ActorRupee_C48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020e9fb4 @@ -731,7 +731,7 @@ _ZN17ActorUnkZLSL_169019func_ov031_020eece8Ev kind:function(arm,size=0xc) addr:0 _ZN17ActorProfileHeart10GetProfileEv kind:function(arm,size=0xc) addr:0x020eecf4 _ZN17ActorProfileHeart6CreateEv kind:function(arm,size=0x24) addr:0x020eed00 _ZN17ActorProfileHeartC1Ev kind:function(arm,size=0x40) addr:0x020eed24 -_ZN10ActorHeart19func_ov031_020eed64EP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020eed64 +_ZN10ActorHeart19func_ov031_020eed64EP9RefStructPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020eed64 _ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020eede0 _ZN10ActorHeart4InitEi kind:function(arm,size=0x10) addr:0x020eeed8 _ZN10ActorHeart6UpdateEv kind:function(arm,size=0x2cc) addr:0x020eeee8 @@ -755,7 +755,7 @@ _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef _ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef5e8 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef698 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef6f8 -_ZN13ActorHeart_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020ef730 +_ZN13ActorHeart_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020ef730 _ZN13ActorHeart_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020ef774 _ZN13ActorHeart_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020ef794 _ZN13ActorHeart_C48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020ef7bc @@ -924,7 +924,7 @@ _ZN18ActorShotArrow_178D1Ev kind:function(arm,size=0x1c) addr:0x020f32c4 _ZN18ActorShotArrow_178D0Ev kind:function(arm,size=0x24) addr:0x020f32e0 _ZN18ActorShotArrow_17819func_ov031_020f3304Ev kind:function(arm,size=0xc) addr:0x020f3304 _ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0xac) addr:0x020f3310 -_ZN18ActorShotArrow_1788vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f33bc +_ZN18ActorShotArrow_1788vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f33bc _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f370c _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f374c _ZN18ActorShotArrow_1948vfunc_10EP5Actor kind:function(arm,size=0x388) addr:0x020f38b0 @@ -1004,7 +1004,7 @@ _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6240 _ZN12ActorUnkNTTZD0Ev kind:function(arm,size=0x1c) addr:0x020f6254 _ZN19ActorProfileUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6270 _ZN13Actor_C4_BaseC2EPvi kind:function(arm,size=0x60) addr:0x020f6284 -_ZN8Actor_C48vfunc_00E8ActorRefi kind:function(arm,size=0x90) addr:0x020f62e4 +_ZN8Actor_C48vfunc_00E9RefStructi kind:function(arm,size=0x90) addr:0x020f62e4 _ZN8Actor_C48vfunc_04Ev kind:function(arm,size=0x8) addr:0x020f6374 _ZN8Actor_C48vfunc_08Ev kind:function(arm,size=0x8) addr:0x020f637c _ZN8Actor_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x8) addr:0x020f6384 @@ -1025,8 +1025,8 @@ _ZN24ActorUnkTGTZ_ModelRenderD1Ev kind:function(arm,size=0x14) addr:0x020f6984 _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 +_ZN12ActorUnkTGTZ19func_ov031_020f6e5cE9RefStruct kind:function(arm,size=0x4c) addr:0x020f6e5c +_ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP9RefStructtPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6ea8 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f6f20 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f7170 _ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f72a8 @@ -1110,8 +1110,8 @@ _ZN19ActorProfileUnkFLEND1Ev kind:function(arm,size=0x14) addr:0x020f82cc _ZN24ActorProfileRollingStone10GetProfileEv kind:function(arm,size=0xc) addr:0x020f82e0 _ZN24ActorProfileRollingStone6CreateEv kind:function(arm,size=0x24) addr:0x020f82ec _ZN24ActorProfileRollingStoneC1Ev kind:function(arm,size=0x44) addr:0x020f8310 -_ZN21ActorRollingStone_1048vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8354 -_ZN21ActorRollingStone_1048vfunc_10E8ActorRefi kind:function(arm,size=0xb8) addr:0x020f83e4 +_ZN21ActorRollingStone_1048vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8354 +_ZN21ActorRollingStone_1048vfunc_10E9RefStructi kind:function(arm,size=0xb8) addr:0x020f83e4 _ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x020f849c _ZN17ActorRollingStoneC1Ev kind:function(arm,size=0x194) addr:0x020f84e0 _ZN20ActorRollingStone_D4D1Ev kind:function(arm,size=0x14) addr:0x020f8674 @@ -1167,7 +1167,7 @@ _ZN25ActorProfileRedPotionDropC1Ev kind:function(arm,size=0x40) addr:0x020f9edc _ZN24ActorProfileTreasureDrop10GetProfileEv kind:function(arm,size=0xc) addr:0x020f9f1c _ZN24ActorProfileTreasureDrop6CreateEv kind:function(arm,size=0x24) addr:0x020f9f28 _ZN24ActorProfileTreasureDropC1Ev kind:function(arm,size=0x40) addr:0x020f9f4c -_ZN13ActorItemDrop19func_ov031_020f9f8cEP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020f9f8c +_ZN13ActorItemDrop19func_ov031_020f9f8cEP9RefStructPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020f9f8c _ZN13ActorItemDropC1Ev kind:function(arm,size=0x200) addr:0x020fa00c _ZN13ActorItemDrop4InitEi kind:function(arm,size=0x30) addr:0x020fa20c _ZN13ActorItemDrop6UpdateEv kind:function(arm,size=0xc) addr:0x020fa23c @@ -1191,7 +1191,7 @@ _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x0 _ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa83c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fa900 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fa9f8 -_ZN16ActorItemDrop_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020faa30 +_ZN16ActorItemDrop_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020faa30 _ZN16ActorItemDrop_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020faa74 _ZN16ActorItemDrop_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020faa94 _ZN16ActorItemDrop_C48vfunc_08Ev kind:function(arm,size=0x20) addr:0x020faabc @@ -1267,10 +1267,10 @@ _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbaec _ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbb88 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbb8c -_ZN12ActorUnkNFSP19func_ov031_020fbba0E8ActorRef kind:function(arm,size=0x40) addr:0x020fbba0 +_ZN12ActorUnkNFSP19func_ov031_020fbba0E9RefStruct kind:function(arm,size=0x40) addr:0x020fbba0 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbbe0 _ZN15ActorUnkNFSP_C0C1EP12ActorUnkNFSP kind:function(arm,size=0x38) addr:0x020fbc04 -_ZN15ActorUnkNFSP_C08vfunc_00E8ActorRefi kind:function(arm,size=0x58) addr:0x020fbc3c +_ZN15ActorUnkNFSP_C08vfunc_00E9RefStructi kind:function(arm,size=0x58) addr:0x020fbc3c _ZN15ActorUnkNFSP_C08vfunc_04Ev kind:function(arm,size=0x2c) addr:0x020fbc94 _ZN15ActorUnkNFSP_C08vfunc_08Ev kind:function(arm,size=0x30) addr:0x020fbcc0 _ZN15ActorUnkNFSP_C08vfunc_0CEP7VecFx32 kind:function(arm,size=0x38) addr:0x020fbcf0 @@ -1481,7 +1481,7 @@ _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x02101578 _ZN14MapObjectGrass19func_ov031_021016b4Ev kind:function(arm,size=0x88) addr:0x021016b4 _ZN14MapObjectGrass8vfunc_3CEP7VecFx32 kind:function(arm,size=0x3c) addr:0x0210173c _ZN14MapObjectGrass19func_ov031_02101778Ev kind:function(arm,size=0x74) addr:0x02101778 -_ZN14MapObjectGrass8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0xb8) addr:0x021017ec +_ZN14MapObjectGrass8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0xb8) addr:0x021017ec _ZN14MapObjectGrass19func_ov031_021018a4Es kind:function(arm,size=0xac) addr:0x021018a4 _ZN14MapObjectGrass19func_ov031_02101950Ev kind:function(arm,size=0x18) addr:0x02101950 _ZN14MapObjectGrass19func_ov031_02101968Ei kind:function(arm,size=0x10) addr:0x02101968 @@ -1502,7 +1502,7 @@ _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101e1c _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02101f88 _ZN16MapObjectUnkSWHT8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02101f94 -_ZN16MapObjectUnkSWHT8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x138) addr:0x02101fb4 +_ZN16MapObjectUnkSWHT8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x138) addr:0x02101fb4 _ZN16MapObjectUnkSWHT19func_ov031_021020ecEv kind:function(arm,size=0xd4) addr:0x021020ec _ZN16MapObjectUnkSWHT19func_ov031_021021c0Esi kind:function(arm,size=0x1f0) addr:0x021021c0 _ZN16MapObjectUnkSWHT19func_ov031_021023b0Ev kind:function(arm,size=0x74) addr:0x021023b0 @@ -1511,7 +1511,7 @@ _ZN26MapObjectProfileBombFlower10GetProfileEv kind:function(arm,size=0xc) addr:0 _ZN26MapObjectProfileBombFlower6CreateEv kind:function(arm,size=0x24) addr:0x02102444 _ZN26MapObjectProfileBombFlowerC1Ev kind:function(arm,size=0x44) addr:0x02102468 _ZN19MapObjectBombFlowerC1Ev kind:function(arm,size=0x118) addr:0x021024ac -_ZN19MapObjectBombFlower8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x144) addr:0x021025c4 +_ZN19MapObjectBombFlower8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x144) addr:0x021025c4 _ZN19MapObjectBombFlower8vfunc_48Ev kind:function(arm,size=0x10) addr:0x02102708 _ZN19MapObjectBombFlower8vfunc_58Ev kind:function(arm,size=0x10) addr:0x02102718 _ZN19MapObjectBombFlower19func_ov031_02102728Ei kind:function(arm,size=0x7c) addr:0x02102728 @@ -1520,7 +1520,7 @@ _ZN19MapObjectBombFlower8SetStateEsi kind:function(arm,size=0x15c) addr:0x021028 _ZN19MapObjectBombFlower8vfunc_14Ei kind:function(arm,size=0x50) addr:0x021029f0 _ZN19MapObjectBombFlower8vfunc_38Ev kind:function(arm,size=0x98) addr:0x02102a40 _ZN19MapObjectBombFlower8vfunc_28Eiii kind:function(arm,size=0x1c) addr:0x02102ad8 -_ZN19MapObjectBombFlower8vfunc_50EP8ActorRefP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102af4 +_ZN19MapObjectBombFlower8vfunc_50EP9RefStructP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102af4 _ZN19MapObjectBombFlowerD1Ev kind:function(arm,size=0x20) addr:0x02102b64 _ZN19MapObjectBombFlowerD0Ev kind:function(arm,size=0x28) addr:0x02102b84 _ZN26MapObjectProfileBombFlowerD1Ev kind:function(arm,size=0x14) addr:0x02102bac @@ -1626,7 +1626,7 @@ _ZN19MapObjectProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x02104f3c _ZN19MapObjectProfilePotC1Ev kind:function(arm,size=0x8c) addr:0x02104f60 _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02104fec _ZN12MapObjectPot5SetupEv kind:function(arm,size=0x2c) addr:0x02105088 -_ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x021050b4 +_ZN12MapObjectPot8vfunc_1CE9RefStructiP7VecFx32 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 _ZN12MapObjectPot8vfunc_54Ev kind:function(arm,size=0x38) addr:0x02105310 @@ -1673,7 +1673,7 @@ _ZN16MapObjectUnkSKDI8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021063dc _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr:0x0210643c _ZN16MapObjectUnkSKDI19func_ov031_02106678Esi kind:function(arm,size=0x3f8) addr:0x02106678 _ZN16MapObjectUnkSKDI19func_ov031_02106a70Ev kind:function(arm,size=0x14) addr:0x02106a70 -_ZN16MapObjectUnkSKDI8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106a84 +_ZN16MapObjectUnkSKDI8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106a84 _ZN16MapObjectUnkSKDI8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02106c78 _ZN16MapObjectUnkSKDI8vfunc_38Ev kind:function(arm,size=0x8) addr:0x02106c98 _ZN16MapObjectUnkSKDI8vfunc_3CEv kind:function(arm,size=0x8) addr:0x02106ca0 diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt index b7b91453..f6bccce2 100644 --- a/config/eur/arm9/overlays/ov032/symbols.txt +++ b/config/eur/arm9/overlays/ov032/symbols.txt @@ -123,7 +123,7 @@ _ZN14ActorKeese_2ACC1EP10ActorKeese kind:function(arm,size=0x38) addr:0x0211de34 _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_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x144) addr:0x0211ded0 +_ZN14ActorKeese_2AC8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x144) addr:0x0211ded0 _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 @@ -206,7 +206,7 @@ _ZN16MapObjectUnkSWSWC1Ev kind:function(arm,size=0xc4) addr:0x02121104 _ZN19MapObjectUnkSWSW_40D1Ev kind:function(arm,size=0x14) addr:0x021211c8 _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_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x278) addr:0x021218d0 _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121b48 _ZN16MapObjectUnkSWSW19func_ov032_02121b90Ev kind:function(arm,size=0x88) addr:0x02121b90 _ZN16MapObjectUnkSWSW8vfunc_3CEi kind:function(arm,size=0x158) addr:0x02121c18 diff --git a/config/eur/arm9/overlays/ov063/symbols.txt b/config/eur/arm9/overlays/ov063/symbols.txt index 1b4dfe0f..6d3d935b 100644 --- a/config/eur/arm9/overlays/ov063/symbols.txt +++ b/config/eur/arm9/overlays/ov063/symbols.txt @@ -3,7 +3,7 @@ _ZN19ActorProfileUnkCANS6CreateEv kind:function(arm,size=0x24) addr:0x02157eac _ZN19ActorProfileUnkCANSC1Ev kind:function(arm,size=0x50) addr:0x02157ed0 _ZN24UnkStruct_ov063_02162ee8C1EP10G3d_Model_ kind:function(arm,size=0x5c) addr:0x02157f20 _ZN24UnkStruct_ov063_02162e88C1EPv kind:function(arm,size=0x28) addr:0x02157f7c -_ZN24UnkStruct_ov063_02162e888vfunc_04E8ActorRefiiPi kind:function(arm,size=0x178) addr:0x02157fa4 +_ZN24UnkStruct_ov063_02162e888vfunc_04E9RefStructiiPi kind:function(arm,size=0x178) addr:0x02157fa4 _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 @@ -54,7 +54,7 @@ _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a7d4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a804 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a818 _ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x4c) addr:0x0215a834 -_ZN24UnkStruct_ov063_02162ea88vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0xcc) addr:0x0215a880 +_ZN24UnkStruct_ov063_02162ea88vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0xcc) addr:0x0215a880 _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215a94c _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215a970 _ZN24UnkStruct_ov063_02162ee8D0Ev kind:function(arm,size=0x1c) addr:0x0215a99c @@ -67,12 +67,12 @@ _ZN19ActorProfileUnkCASE6CreateEv kind:function(arm,size=0x24) addr:0x0215ab04 _ZN19ActorProfileUnkCASEC1Ev kind:function(arm,size=0x48) addr:0x0215ab28 _ZN24UnkStruct_ov063_021631a0C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0215ab70 _ZN16ActorUnkCASE_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215aba4 -_ZN16ActorUnkCASE_1508vfunc_00E8ActorRefi kind:function(arm,size=0x74) addr:0x0215abd8 +_ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215abd8 _ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ac4c _ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ac68 _ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ac8c _ZN16ActorUnkCASE_1748vfunc_10EP5Actor kind:function(arm,size=0x24) addr:0x0215acc8 -_ZN12ActorUnkCASE19func_ov063_0215acecEP8ActorRefS0_ kind:function(arm,size=0x5c) addr:0x0215acec +_ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215acec _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ad48 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215ae6c _ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215ae80 @@ -96,7 +96,7 @@ _ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6c8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b724 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7cc -_ZN12ActorUnkCASE19func_ov063_0215b814E8ActorRef kind:function(arm,size=0x40) addr:0x0215b814 +_ZN12ActorUnkCASE19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b814 _ZN12ActorUnkCASE19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b854 _ZN12ActorUnkCASE19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215b8e8 _ZN12ActorUnkCASE19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215b99c @@ -310,7 +310,7 @@ _ZN23MapObjectProfileUnkLTRWC1Ev kind:function(arm,size=0xd0) addr:0x02160b00 _ZN16MapObjectUnkLTRWC1Ev kind:function(arm,size=0x9c) addr:0x02160bd0 _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 +_ZN16MapObjectUnkLTRW8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x34) addr:0x02160ce4 _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02160d18 _ZN16MapObjectUnkLTRW8vfunc_28Eiii kind:function(arm,size=0xc4) addr:0x02160d34 _ZN16MapObjectUnkLTRW8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02160df8 @@ -325,7 +325,7 @@ _ZN16MapObjectUnkMTJRC1Ev kind:function(arm,size=0x98) addr:0x02160f64 _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 +_ZN16MapObjectUnkMTJR8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x94) addr:0x021611c0 _ZN16MapObjectUnkMTJR19func_ov063_02161254Ei kind:function(arm,size=0x34) addr:0x02161254 _ZN16MapObjectUnkMTJR19func_ov063_02161288Ev kind:function(arm,size=0xf8) addr:0x02161288 _ZN16MapObjectUnkMTJR8vfunc_14Ei kind:function(arm,size=0x44) addr:0x02161380 diff --git a/config/eur/arm9/overlays/ov070/symbols.txt b/config/eur/arm9/overlays/ov070/symbols.txt index 061e3b78..7f1afe70 100644 --- a/config/eur/arm9/overlays/ov070/symbols.txt +++ b/config/eur/arm9/overlays/ov070/symbols.txt @@ -98,7 +98,7 @@ func_ov070_02141264 kind:function(arm,size=0x150) addr:0x02141264 _ZN19ActorProfileUnkKEYN10GetProfileEv kind:function(arm,size=0xc) addr:0x021413b4 _ZN19ActorProfileUnkKEYN6CreateEv kind:function(arm,size=0x24) addr:0x021413c0 _ZN19ActorProfileUnkKEYNC1Ev kind:function(arm,size=0x58) addr:0x021413e4 -_ZN12ActorUnkKEYN19func_ov070_0214143cEP8ActorRefP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x0214143c +_ZN12ActorUnkKEYN19func_ov070_0214143cEP9RefStructP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x0214143c _ZN12ActorUnkKEYNC1Ev kind:function(arm,size=0x130) addr:0x021414e8 _ZN12ActorUnkKEYN19func_ov070_02141618Ev kind:function(arm,size=0x14) addr:0x02141618 _ZN12ActorUnkKEYN19func_ov070_0214162cEv kind:function(arm,size=0x124) addr:0x0214162c diff --git a/config/eur/arm9/overlays/ov071/symbols.txt b/config/eur/arm9/overlays/ov071/symbols.txt index f2dad1f1..d0143274 100644 --- a/config/eur/arm9/overlays/ov071/symbols.txt +++ b/config/eur/arm9/overlays/ov071/symbols.txt @@ -319,7 +319,7 @@ _ZN14ActorTearLight19func_ov071_0215ff3cEv kind:function(arm,size=0x7c) addr:0x0 _ZN14ActorTearLight19func_ov071_0215ffb8Ev kind:function(arm,size=0x4) addr:0x0215ffb8 _ZN14ActorTearLight19func_ov071_0215ffbcEv kind:function(arm,size=0x44) addr:0x0215ffbc _ZN18ActorTearLight_194C2EP14ActorTearLight kind:function(arm,size=0x38) addr:0x02160000 -_ZN18ActorTearLight_1948vfunc_00E8ActorRefi kind:function(arm,size=0x40) addr:0x02160038 +_ZN18ActorTearLight_1948vfunc_00E9RefStructi kind:function(arm,size=0x40) addr:0x02160038 _ZN18ActorTearLight_1948vfunc_04Ev kind:function(arm,size=0x1c) addr:0x02160078 _ZN18ActorTearLight_1948vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x02160094 _ZN18ActorTearLight_1948vfunc_08Ev kind:function(arm,size=0x1c) addr:0x021600b8 diff --git a/config/eur/arm9/overlays/ov075/symbols.txt b/config/eur/arm9/overlays/ov075/symbols.txt index 4df8c255..f820c897 100644 --- a/config/eur/arm9/overlays/ov075/symbols.txt +++ b/config/eur/arm9/overlays/ov075/symbols.txt @@ -160,7 +160,7 @@ _ZN12ActorUnkMRD219func_ov075_0215b4dcEv kind:function(arm,size=0x9c) addr:0x021 _ZN12ActorUnkMRD219func_ov075_0215b578Ev kind:function(arm,size=0x39c) addr:0x0215b578 _ZN12ActorUnkMRD219func_ov075_0215b914Ev kind:function(arm,size=0x2d4) addr:0x0215b914 _ZN12ActorUnkMRD219func_ov075_0215bbe8Ev kind:function(arm,size=0x8) addr:0x0215bbe8 -_ZN12ActorUnkMRD219func_ov075_0215bbf0EP8ActorRefPi kind:function(arm,size=0x60) addr:0x0215bbf0 +_ZN12ActorUnkMRD219func_ov075_0215bbf0EP9RefStructPi kind:function(arm,size=0x60) addr:0x0215bbf0 _ZN12ActorUnkMRD219func_ov075_0215bc50Ev kind:function(arm,size=0xf0) addr:0x0215bc50 _ZN12ActorUnkMRD219func_ov075_0215bd40Ev kind:function(arm,size=0x10) addr:0x0215bd40 _ZN12ActorUnkMRD219func_ov075_0215bd50Ev kind:function(arm,size=0xc0) addr:0x0215bd50 diff --git a/config/eur/arm9/overlays/ov084/symbols.txt b/config/eur/arm9/overlays/ov084/symbols.txt index 316012db..d99aa095 100644 --- a/config/eur/arm9/overlays/ov084/symbols.txt +++ b/config/eur/arm9/overlays/ov084/symbols.txt @@ -38,7 +38,7 @@ _ZN12ActorUnkIWTS19func_ov084_02152cecEv kind:function(arm,size=0x24) addr:0x021 _ZN12ActorUnkIWTS19func_ov084_02152d10Ev kind:function(arm,size=0x180) addr:0x02152d10 _ZN12ActorUnkIWTSD0Ev kind:function(arm,size=0x188) addr:0x02152e90 _ZN12ActorUnkIWTS19func_ov084_02153018Ev kind:function(arm,size=0x4c) addr:0x02153018 -_ZN12ActorUnkIWTS19func_ov084_02153064EP8ActorRefPP7MtxFx43 kind:function(arm,size=0x70) addr:0x02153064 +_ZN12ActorUnkIWTS19func_ov084_02153064EP9RefStructPP7MtxFx43 kind:function(arm,size=0x70) addr:0x02153064 _ZN12ActorUnkIWTS19func_ov084_021530d4Ev kind:function(arm,size=0x88) addr:0x021530d4 _ZN12ActorUnkIWTS19func_ov084_0215315cEv kind:function(arm,size=0x38) addr:0x0215315c _ZN12ActorUnkIWTS19func_ov084_02153194Ev kind:function(arm,size=0x50) addr:0x02153194 diff --git a/config/eur/arm9/overlays/ov093/symbols.txt b/config/eur/arm9/overlays/ov093/symbols.txt index e4f4a21c..d85cbd1d 100644 --- a/config/eur/arm9/overlays/ov093/symbols.txt +++ b/config/eur/arm9/overlays/ov093/symbols.txt @@ -11,7 +11,7 @@ func_ov093_02166048 kind:function(arm,size=0x10) addr:0x02166048 _ZN18UnkStruct_027e0d8c19func_ov093_02166058Ev kind:function(arm,size=0x10) addr:0x02166058 _ZN18UnkStruct_027e0d8c19func_ov093_02166068Ev kind:function(arm,size=0x10) addr:0x02166068 func_ov093_02166078 kind:function(arm,size=0x30) addr:0x02166078 -_ZN18UnkStruct_027e0d8c19func_ov093_021660a8E8ActorRef kind:function(arm,size=0x20) addr:0x021660a8 +_ZN18UnkStruct_027e0d8c19func_ov093_021660a8E9RefStruct kind:function(arm,size=0x20) addr:0x021660a8 func_ov093_021660c8 kind:function(arm,size=0x10) addr:0x021660c8 func_ov093_021660d8 kind:function(arm,size=0x10) addr:0x021660d8 func_ov093_021660e8 kind:function(arm,size=0x10) addr:0x021660e8 @@ -26,7 +26,7 @@ func_ov093_02166178 kind:function(arm,size=0x10) addr:0x02166178 func_ov093_02166188 kind:function(arm,size=0x14) addr:0x02166188 func_ov093_0216619c kind:function(arm,size=0x14) addr:0x0216619c func_ov093_021661b0 kind:function(arm,size=0x10) addr:0x021661b0 -_ZN18UnkStruct_027e0d8c19func_ov093_021661c0E8ActorRef kind:function(arm,size=0x20) addr:0x021661c0 +_ZN18UnkStruct_027e0d8c19func_ov093_021661c0E9RefStruct kind:function(arm,size=0x20) addr:0x021661c0 func_ov093_021661e0 kind:function(arm,size=0x10) addr:0x021661e0 func_ov093_021661f0 kind:function(arm,size=0x10) addr:0x021661f0 func_ov093_02166200 kind:function(arm,size=0x10) addr:0x02166200 diff --git a/config/eur1/arm9/itcm/symbols.txt b/config/eur1/arm9/itcm/symbols.txt index ae287c81..46a22912 100644 --- a/config/eur1/arm9/itcm/symbols.txt +++ b/config/eur1/arm9/itcm/symbols.txt @@ -200,7 +200,7 @@ func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc _ZN12ActorManager13func_01fff2fcEPFvP5ActorP14Actor_vfunc_30EPv kind:function(arm,size=0x54) addr:0x01fff2fc _ZN12ActorManager13func_01fff350EP29UnkStruct_ov000_020b3000_BasePP5Actor kind:function(arm,size=0x64) addr:0x01fff350 -_ZN12ActorManager13func_01fff3b4E8ActorRef kind:function(arm,size=0x8c) addr:0x01fff3b4 +_ZN12ActorManager13func_01fff3b4E9RefStruct kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 _ZN5Actor8vfunc_10EP8Cylinder kind:function(arm,size=0x34) addr:0x01fff464 diff --git a/config/eur1/arm9/overlays/ov000/symbols.txt b/config/eur1/arm9/overlays/ov000/symbols.txt index b0cf19fe..3a88c065 100644 --- a/config/eur1/arm9/overlays/ov000/symbols.txt +++ b/config/eur1/arm9/overlays/ov000/symbols.txt @@ -486,7 +486,7 @@ _ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) func_ov000_0206176c kind:function(thumb,size=0xbc) addr:0x0206176c func_ov000_02061828 kind:function(thumb,size=0x28) addr:0x02061828 _ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02061850 -_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x02061868 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x1e0) addr:0x02061868 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a48EP7VecFx32P5Vec2sS3_ kind:function(arm,size=0x28) addr:0x02061a48 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02061a70 func_ov000_02061a7c kind:function(arm,size=0x10) addr:0x02061a7c @@ -1414,8 +1414,8 @@ _ZN24UnkStruct_ov000_020b28388vfunc_00Ev kind:function(arm,size=0x4) addr:0x0207 _ZN24UnkStruct_ov000_020b2838D0Ev kind:function(arm,size=0x14) addr:0x0207c01c _ZN29UnkStruct_ov031_Items_00_BaseD2Ev kind:function(arm,size=0x4) addr:0x0207c030 _ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x8) addr:0x0207c034 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x8) addr:0x0207c03c -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E8ActorRefi kind:function(arm,size=0x8) addr:0x0207c044 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x8) addr:0x0207c03c +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E9RefStructi kind:function(arm,size=0x8) addr:0x0207c044 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207c04c func_ov000_0207c048 kind:function(arm,size=0x30) addr:0x0207c07c func_ov000_0207c078 kind:function(arm,size=0x38) addr:0x0207c0ac @@ -1458,7 +1458,7 @@ _ZN18UnkStruct_027e09c019func_ov000_0207da40Ev kind:function(arm,size=0x20c) add func_ov000_0207dc4c kind:function(arm,size=0x18) addr:0x0207dc80 func_ov000_0207dc64 kind:function(arm,size=0x24) addr:0x0207dc98 func_ov000_0207dc88 kind:function(arm,size=0x210) addr:0x0207dcbc -_ZN18UnkStruct_027e09c019func_ov000_0207de98E8ActorRefP24UnkStruct_ov000_0207de98P8Actor_38 kind:function(arm,size=0xc0) addr:0x0207decc +_ZN18UnkStruct_027e09c019func_ov000_0207de98E9RefStructP24UnkStruct_ov000_0207de98P8Actor_38 kind:function(arm,size=0xc0) addr:0x0207decc func_ov000_0207df58 kind:function(arm,size=0x30) addr:0x0207df8c _ZN5Actor19func_ov000_0207df88EP8Cylinderi kind:function(arm,size=0xd8) addr:0x0207dfbc func_ov000_0207e060 kind:function(arm,size=0x68) addr:0x0207e094 @@ -1471,10 +1471,10 @@ _ZN18UnkStruct_027e09c019func_ov000_0207e254EP15ActorUnkSCCN_B8 kind:function(ar func_ov000_0207e268 kind:function(arm,size=0x2c) addr:0x0207e29c _ZN5Actor19func_ov000_0207e294EP8Cylinder kind:function(arm,size=0x118) addr:0x0207e2c8 func_ov000_0207e3ac kind:function(arm,size=0xac) addr:0x0207e3e0 -_ZN18UnkStruct_027e09c019func_ov000_0207e458EiiP7VecFx32iS1_8ActorRef kind:function(arm,size=0x84) addr:0x0207e48c +_ZN18UnkStruct_027e09c019func_ov000_0207e458EiiP7VecFx32iS1_9RefStruct kind:function(arm,size=0x84) addr:0x0207e48c func_ov000_0207e4dc kind:function(arm,size=0x84) addr:0x0207e510 func_ov000_0207e560 kind:function(arm,size=0x2c) addr:0x0207e594 -_ZN18UnkStruct_027e09c019func_ov000_0207e58cE8ActorRefihP24UnkStruct_ov031_Items_01 kind:function(arm,size=0xa4) addr:0x0207e5c0 +_ZN18UnkStruct_027e09c019func_ov000_0207e58cE9RefStructihP24UnkStruct_ov031_Items_01 kind:function(arm,size=0xa4) addr:0x0207e5c0 func_ov000_0207e630 kind:function(arm,size=0x38) addr:0x0207e664 func_ov000_0207e668 kind:function(arm,size=0x50) addr:0x0207e69c func_ov000_0207e6b8 kind:function(arm,size=0x14) addr:0x0207e6ec @@ -1881,7 +1881,7 @@ _ZN18UnkStruct_027e0ce019func_ov000_0208a318Eiii kind:function(arm,size=0x74) ad func_ov000_0208a38c kind:function(arm,size=0x30) addr:0x0208a3d8 func_ov000_0208a3bc kind:function(arm,size=0x328) addr:0x0208a408 func_ov000_0208a6e4 kind:function(arm,size=0x48) addr:0x0208a730 -_ZN37UnkStruct_027e0ce0_40_Base_94_50_BaseC2EiiP12ActorRefElemi kind:function(thumb,size=0xe) addr:0x0208a778 +_ZN37UnkStruct_027e0ce0_40_Base_94_50_BaseC2EiiP7RefElemi kind:function(thumb,size=0xe) addr:0x0208a778 func_ov000_0208a73c kind:function(arm,size=0x68) addr:0x0208a788 func_ov000_0208a7a4 kind:function(arm,size=0x28) addr:0x0208a7f0 func_ov000_0208a7cc kind:function(arm,size=0x60) addr:0x0208a818 @@ -1943,7 +1943,7 @@ func_ov000_0208bdb4 kind:function(arm,size=0x20) addr:0x0208be04 func_ov000_0208bdd4 kind:function(arm,size=0x10) addr:0x0208be24 func_ov000_0208bde4 kind:function(arm,size=0x18) addr:0x0208be34 func_ov000_0208bdfc kind:function(arm,size=0x10) addr:0x0208be4c -_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE8ActorRef kind:function(arm,size=0x3c) addr:0x0208be5c +_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE9RefStruct kind:function(arm,size=0x3c) addr:0x0208be5c func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be98 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208bec0 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208beec @@ -2254,7 +2254,7 @@ func_ov000_02097244 kind:function(arm,size=0x44) addr:0x02097298 func_ov000_02097288 kind:function(arm,size=0x154) addr:0x020972dc _ZN24UnkStruct_ov000_020b539c18func_ov000_02073dcEv kind:function(arm,size=0xc) addr:0x02097430 _ZN24UnkStruct_ov000_020b539c18func_ov000_02073e8Ev kind:function(arm,size=0xc) addr:0x0209743c -_ZN5Actor19func_ov000_020973f4EP8ActorRefP24UnkStruct_ov000_020b539cjP11ActorParamsi kind:function(arm,size=0x50) addr:0x02097448 +_ZN5Actor19func_ov000_020973f4EP9RefStructP24UnkStruct_ov000_020b539cjP11ActorParamsi kind:function(arm,size=0x50) addr:0x02097448 _ZN24UnkStruct_ov000_020b539c19func_ov000_02097444EjP11ActorParamsi kind:function(arm,size=0x98) addr:0x02097498 _ZN24UnkStruct_ov000_020b539c16GetProfileFromIdEj kind:function(arm,size=0x4c) addr:0x02097530 func_ov000_02097528 kind:function(arm,size=0x20) addr:0x0209757c @@ -2292,7 +2292,7 @@ _ZN8Actor_9CC2Ev kind:function(arm,size=0x34) addr:0x02097bd8 _ZN8Actor_9CC1Ev kind:function(arm,size=0x34) addr:0x02097c0c _ZN8Actor_9C19func_ov000_02097becEv kind:function(arm,size=0x28) addr:0x02097c40 _ZN8Actor_9C8vfunc_00Ev kind:function(arm,size=0xc) addr:0x02097c68 -_ZN8Actor_9C8vfunc_04E8ActorRefiiPi kind:function(arm,size=0x80) addr:0x02097c74 +_ZN8Actor_9C8vfunc_04E9RefStructiiPi kind:function(arm,size=0x80) addr:0x02097c74 func_ov000_02097ca0 kind:function(arm,size=0x7c) addr:0x02097cf4 _ZN19func_ov000_02097d1cD1Ev kind:function(arm,size=0x14) addr:0x02097d70 _ZN19func_ov000_02097d30D0Ev kind:function(arm,size=0x1c) addr:0x02097d84 @@ -2372,7 +2372,7 @@ _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x02099844 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x02099858 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099874 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x020998c4 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E8ActorRefP7VecFx32 kind:function(arm,size=0x11c) addr:0x02099944 +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x02099944 _ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a60 func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x02099a70 _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x02099a7c @@ -2557,7 +2557,7 @@ _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) ad _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d168 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d180 _ZN9MapObject19func_ov000_0209d144EP5Vec2siP21UnkStruct_027e09bc_0C kind:function(arm,size=0x88) addr:0x0209d198 -_ZN9MapObject8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d220 +_ZN9MapObject8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d220 _ZN9MapObject8vfunc_20Ei kind:function(arm,size=0x4) addr:0x0209d228 _ZN9MapObject8vfunc_24EPS_7VecFx32 kind:function(arm,size=0xc) addr:0x0209d22c _ZN9MapObject8vfunc_28Eiii kind:function(arm,size=0x8) addr:0x0209d238 @@ -2570,8 +2570,8 @@ _ZN9MapObject19func_ov000_0209d2f0EiiP8Vec2bCpp kind:function(arm,size=0xc4) add _ZN9MapObject19func_ov000_0209d3b4Eii kind:function(arm,size=0x80) addr:0x0209d408 _ZN9MapObject19func_ov000_0209d434EPcP34UnkStruct_ov019_020d24c8_28_258_00i kind:function(arm,size=0xe4) addr:0x0209d488 _ZN9MapObject19func_ov000_0209d518EP7VecFx32iih kind:function(arm,size=0x34) addr:0x0209d56c -_ZN9MapObject19func_ov000_0209d54cEP8ActorRefPS_tPK7VecFx32st kind:function(arm,size=0x7c) addr:0x0209d5a0 -_ZN9MapObject19func_ov000_0209d5c8E8ActorRef kind:function(arm,size=0x4c) addr:0x0209d61c +_ZN9MapObject19func_ov000_0209d54cEP9RefStructPS_tPK7VecFx32st kind:function(arm,size=0x7c) addr:0x0209d5a0 +_ZN9MapObject19func_ov000_0209d5c8E9RefStruct kind:function(arm,size=0x4c) addr:0x0209d61c _ZN9MapObject19func_ov000_0209d614Ei kind:function(arm,size=0x54) addr:0x0209d668 _ZN9MapObject19func_ov000_0209d668Ev kind:function(arm,size=0x44) addr:0x0209d6bc _ZN9MapObject19func_ov000_0209d6acEP7VecFx32 kind:function(arm,size=0x54) addr:0x0209d700 @@ -3033,7 +3033,7 @@ _ZN14Actor_Derived18vfunc_54Ei kind:function(arm,size=0x4) addr:0x020a8df4 _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 +_ZN14Actor_Derived119func_ov000_020a8df0E9RefStructi kind:function(arm,size=0x94) addr:0x020a8e44 _ZN14Actor_Derived18vfunc_B4Ev kind:function(arm,size=0x18) addr:0x020a8ed8 _ZN14Actor_Derived119func_ov000_020a8e9cEP7VecFx32 kind:function(arm,size=0x24) addr:0x020a8ef0 _ZN14Actor_Derived18vfunc_B0Ev kind:function(arm,size=0x94) addr:0x020a8f14 diff --git a/config/eur1/arm9/overlays/ov017/symbols.txt b/config/eur1/arm9/overlays/ov017/symbols.txt index bca338d2..b0117729 100644 --- a/config/eur1/arm9/overlays/ov017/symbols.txt +++ b/config/eur1/arm9/overlays/ov017/symbols.txt @@ -127,11 +127,11 @@ _ZN18UnkStruct_027e0cec19func_ov017_020c1e54Eii kind:function(arm,size=0x48) add _ZN18UnkStruct_027e0cec19func_ov017_020c1e9cEii kind:function(arm,size=0x124) addr:0x020c1edc _ZN18UnkStruct_027e0cec19func_ov017_020c1fc0Eii kind:function(arm,size=0x5c) addr:0x020c2000 _ZN21UnkStruct_027e0cec_008vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020c205c -_ZN5Actor19func_ov017_020c2038EP8ActorRefiiPK7VecFx32i kind:function(arm,size=0x164) addr:0x020c2078 +_ZN5Actor19func_ov017_020c2038EP9RefStructiiPK7VecFx32i kind:function(arm,size=0x164) addr:0x020c2078 _ZN5Actor19func_ov017_020c219cEiPK7VecFx32ib kind:function(arm,size=0x174) addr:0x020c21dc _ZN5Actor19func_ov017_020c2310EPK7VecFx32i kind:function(arm,size=0x94) addr:0x020c2350 _ZN5Actor19func_ov017_020c23a4EiPK7VecFx32ib kind:function(arm,size=0x94) addr:0x020c23e4 -_ZN5Actor19func_ov017_020c2438EP8ActorRefiPK7VecFx32ib kind:function(arm,size=0x2c0) addr:0x020c2478 +_ZN5Actor19func_ov017_020c2438EP9RefStructiPK7VecFx32ib kind:function(arm,size=0x2c0) addr:0x020c2478 _ZN5Actor19func_ov017_020c26f8EiPK7VecFx32ib kind:function(arm,size=0x1bc) addr:0x020c2738 _ZN5Actor19func_ov017_020c28b4EP7VecFx3214UnkAngleStructi kind:function(arm,size=0xc8) addr:0x020c28f4 _ZN21UnkStruct_027e0cec_1819func_ov017_020c297cEii kind:function(arm,size=0x15c) addr:0x020c29bc diff --git a/config/eur1/arm9/overlays/ov024/symbols.txt b/config/eur1/arm9/overlays/ov024/symbols.txt index 0608fbf0..3f6c0734 100644 --- a/config/eur1/arm9/overlays/ov024/symbols.txt +++ b/config/eur1/arm9/overlays/ov024/symbols.txt @@ -109,10 +109,10 @@ _ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c6f44 _ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c6f70 _ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c6f84 _ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c6fa4 -_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x020c6fc8 +_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x1e0) addr:0x020c6fc8 _ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c71a8 -_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x68) addr:0x020c7250 -_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP8ActorRef kind:function(arm,size=0x84) addr:0x020c72b8 +_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x68) addr:0x020c7250 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP9RefStruct kind:function(arm,size=0x84) addr:0x020c72b8 _ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c733c _ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c7390 _ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c73cc diff --git a/config/eur1/arm9/overlays/ov026/symbols.txt b/config/eur1/arm9/overlays/ov026/symbols.txt index 60bc0954..a21ef4fb 100644 --- a/config/eur1/arm9/overlays/ov026/symbols.txt +++ b/config/eur1/arm9/overlays/ov026/symbols.txt @@ -47,7 +47,7 @@ func_ov026_020d9778 kind:function(arm,size=0x10) addr:0x020d9898 func_ov026_020d9788 kind:function(arm,size=0x148) addr:0x020d98a8 func_ov026_020d98d0 kind:function(arm,size=0xe8) addr:0x020d99f0 func_ov026_020d99b8 kind:function(arm,size=0x25c) addr:0x020d9ad8 -_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E8ActorRefP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9d34 +_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E9RefStructP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9d34 func_ov026_020da074 kind:function(arm,size=0x114) addr:0x020da194 func_ov026_020da188 kind:function(arm,size=0x114) addr:0x020da2a8 func_ov026_020da29c kind:function(arm,size=0x164) addr:0x020da3bc diff --git a/config/eur1/arm9/overlays/ov031/symbols.txt b/config/eur1/arm9/overlays/ov031/symbols.txt index 259f8e12..88e5dcb0 100644 --- a/config/eur1/arm9/overlays/ov031/symbols.txt +++ b/config/eur1/arm9/overlays/ov031/symbols.txt @@ -35,10 +35,10 @@ _ZN19func_ov031_020d9568D1Ev kind:function(arm,size=0x14) addr:0x020d9688 _ZN19func_ov031_020d957cD0Ev kind:function(arm,size=0x1c) addr:0x020d969c _ZN27UnkStruct_ItemManager_20_0419func_ov031_020d9598Ev kind:function(thumb,size=0x1a) addr:0x020d96b8 _ZN18UnkStruct_027e0d2c19func_ov031_020d95b4Ev kind:function(arm,size=0x14) addr:0x020d96d4 -_ZN18UnkStruct_027e0d2c19func_ov031_020d95c8E8ActorRef kind:function(arm,size=0x24) addr:0x020d96e8 +_ZN18UnkStruct_027e0d2c19func_ov031_020d95c8E9RefStruct kind:function(arm,size=0x24) addr:0x020d96e8 func_ov031_020d95ec kind:function(arm,size=0x30) addr:0x020d970c func_ov031_020d961c kind:function(arm,size=0x10) addr:0x020d973c -_ZN18UnkStruct_027e0d2c19func_ov031_020d962cEP7VecFx32iS1_P8ActorRef kind:function(arm,size=0x1c) addr:0x020d974c +_ZN18UnkStruct_027e0d2c19func_ov031_020d962cEP7VecFx32iS1_P9RefStruct kind:function(arm,size=0x1c) addr:0x020d974c func_ov031_020d9648 kind:function(arm,size=0x10) addr:0x020d9768 _ZN27UnkStruct_ItemManager_20_0819func_ov031_020d9658Ev kind:function(thumb,size=0x1a) addr:0x020d9778 func_ov031_020d9674 kind:function(arm,size=0x10) addr:0x020d9794 @@ -359,8 +359,8 @@ _ZN13ActorBomb_180C1EP5Actor kind:function(arm,size=0x3c) addr:0x020e2e98 _ZN13ActorBomb_180D1Ev kind:function(arm,size=0x1c) addr:0x020e2ed4 _ZN13ActorBomb_180D0Ev kind:function(arm,size=0x24) addr:0x020e2ef0 _ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x48) addr:0x020e2f14 -_ZN13ActorBomb_1808vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x450) addr:0x020e2f5c -_ZN13ActorBomb_1808vfunc_10E8ActorRefi kind:function(arm,size=0x84) addr:0x020e33ac +_ZN13ActorBomb_1808vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x450) addr:0x020e2f5c +_ZN13ActorBomb_1808vfunc_10E9RefStructi kind:function(arm,size=0x84) addr:0x020e33ac _ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e3430 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3460 _ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e349c @@ -373,7 +373,7 @@ _ZN16ActorProfileBombD1Ev kind:function(arm,size=0x14) addr:0x020e35c0 _ZN17ActorProfileBlast10GetProfileEv kind:function(arm,size=0xc) addr:0x020e35d4 _ZN17ActorProfileBlast6CreateEv kind:function(arm,size=0x24) addr:0x020e35e0 _ZN17ActorProfileBlastC1Ev kind:function(arm,size=0x38) addr:0x020e3604 -_ZN13ActorBlast_E88vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1a4) addr:0x020e363c +_ZN13ActorBlast_E88vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1a4) addr:0x020e363c _ZN10ActorBlastC1Ev kind:function(arm,size=0x7c) addr:0x020e37e0 _ZN13ActorBlast_E8D1Ev kind:function(arm,size=0x14) addr:0x020e385c _ZN10ActorBlast4InitEi kind:function(arm,size=0x274) addr:0x020e3870 @@ -444,13 +444,13 @@ _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5594 _ZN22ActorItemBoomerang_11CD0Ev kind:function(arm,size=0x1c) addr:0x020e55a8 _ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e55c4 -_ZN22ActorItemBoomerang_11C8vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x230) addr:0x020e55f4 +_ZN22ActorItemBoomerang_11C8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x230) addr:0x020e55f4 _ZN26ActorItemBoomerang_Unknown19func_ov031_020e5704Ev kind:function(arm,size=0xc) addr:0x020e5824 _ZN21ActorItemBoomerang_A0D0Ev kind:function(arm,size=0x1c) addr:0x020e5830 _ZN21ActorItemBoomerang_CCD0Ev kind:function(arm,size=0x1c) addr:0x020e584c _ZN25ActorProfileItemBoomerangD1Ev kind:function(arm,size=0x14) addr:0x020e5868 _ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e587c -_ZN24UnkStruct_ov031_02112ff48vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x114) addr:0x020e58a4 +_ZN24UnkStruct_ov031_02112ff48vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x114) addr:0x020e58a4 _ZN20ActorItemTornado_17C8vfunc_00Eii kind:function(arm,size=0x30) addr:0x020e59b8 _ZN23ActorProfileItemTornado10GetProfileEv kind:function(arm,size=0xc) addr:0x020e59e8 _ZN23ActorProfileItemTornado6CreateEv kind:function(arm,size=0x24) addr:0x020e59f4 @@ -482,7 +482,7 @@ func_ov031_020e67dc kind:function(arm,size=0x7c) addr:0x020e68fc func_ov031_020e6858 kind:function(arm,size=0x64) addr:0x020e6978 _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e69dc _ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e69f8 -_ZN15ActorUnkSWBM_948vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e6a20 +_ZN15ActorUnkSWBM_948vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e6a20 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e6a3c _ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6a94 _ZN15ActorUnkSWBM_C88vfunc_00Eii kind:function(arm,size=0x168) addr:0x020e6aec @@ -559,7 +559,7 @@ _ZN19ActorProfileUnkROCKD1Ev kind:function(arm,size=0x14) addr:0x020e8dc4 _ZN17ActorProfileRupee10GetProfileEv kind:function(arm,size=0xc) addr:0x020e8dd8 _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 +_ZN10ActorRupee19func_ov031_020e8d2cEP9RefStructPK7VecFx32jjS0_ kind:function(arm,size=0x7c) addr:0x020e8e4c _ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020e8ec8 _ZN10ActorRupee4InitEi kind:function(arm,size=0x1d0) addr:0x020e8f3c _ZN10ActorRupee19func_ov031_020e8fecEv kind:function(arm,size=0x7c) addr:0x020e910c @@ -599,7 +599,7 @@ _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9eb4 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9f7c _ZN13ActorRupee_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ea010 -_ZN13ActorRupee_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020ea048 +_ZN13ActorRupee_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020ea048 _ZN13ActorRupee_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020ea08c _ZN13ActorRupee_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020ea0ac _ZN13ActorRupee_C48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020ea0d4 @@ -731,7 +731,7 @@ _ZN17ActorUnkZLSL_169019func_ov031_020eece8Ev kind:function(arm,size=0xc) addr:0 _ZN17ActorProfileHeart10GetProfileEv kind:function(arm,size=0xc) addr:0x020eee14 _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 +_ZN10ActorHeart19func_ov031_020eed64EP9RefStructPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020eee84 _ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020eef00 _ZN10ActorHeart4InitEi kind:function(arm,size=0x10) addr:0x020eeff8 _ZN10ActorHeart6UpdateEv kind:function(arm,size=0x2cc) addr:0x020ef008 @@ -755,7 +755,7 @@ _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef _ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef718 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef7c8 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef828 -_ZN13ActorHeart_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020ef860 +_ZN13ActorHeart_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020ef860 _ZN13ActorHeart_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020ef8a4 _ZN13ActorHeart_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020ef8c4 _ZN13ActorHeart_C48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020ef8ec @@ -924,7 +924,7 @@ _ZN18ActorShotArrow_178D1Ev kind:function(arm,size=0x1c) addr:0x020f33f4 _ZN18ActorShotArrow_178D0Ev kind:function(arm,size=0x24) addr:0x020f3410 _ZN18ActorShotArrow_17819func_ov031_020f3304Ev kind:function(arm,size=0xc) addr:0x020f3434 _ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0xac) addr:0x020f3440 -_ZN18ActorShotArrow_1788vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f34ec +_ZN18ActorShotArrow_1788vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f34ec _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f383c _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f387c _ZN18ActorShotArrow_1948vfunc_10EP5Actor kind:function(arm,size=0x388) addr:0x020f39e0 @@ -1004,7 +1004,7 @@ _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6370 _ZN12ActorUnkNTTZD0Ev kind:function(arm,size=0x1c) addr:0x020f6384 _ZN19ActorProfileUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f63a0 _ZN13Actor_C4_BaseC2EPvi kind:function(arm,size=0x60) addr:0x020f63b4 -_ZN8Actor_C48vfunc_00E8ActorRefi kind:function(arm,size=0x90) addr:0x020f6414 +_ZN8Actor_C48vfunc_00E9RefStructi kind:function(arm,size=0x90) addr:0x020f6414 _ZN8Actor_C48vfunc_04Ev kind:function(arm,size=0x8) addr:0x020f64a4 _ZN8Actor_C48vfunc_08Ev kind:function(arm,size=0x8) addr:0x020f64ac _ZN8Actor_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x8) addr:0x020f64b4 @@ -1025,8 +1025,8 @@ _ZN24ActorUnkTGTZ_ModelRenderD1Ev kind:function(arm,size=0x14) addr:0x020f6ab4 _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 +_ZN12ActorUnkTGTZ19func_ov031_020f6e5cE9RefStruct kind:function(arm,size=0x4c) addr:0x020f6f8c +_ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP9RefStructtPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6fd8 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f7050 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f72a0 _ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f73d8 @@ -1110,8 +1110,8 @@ _ZN19ActorProfileUnkFLEND1Ev kind:function(arm,size=0x14) addr:0x020f83fc _ZN24ActorProfileRollingStone10GetProfileEv kind:function(arm,size=0xc) addr:0x020f8410 _ZN24ActorProfileRollingStone6CreateEv kind:function(arm,size=0x24) addr:0x020f841c _ZN24ActorProfileRollingStoneC1Ev kind:function(arm,size=0x44) addr:0x020f8440 -_ZN21ActorRollingStone_1048vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8484 -_ZN21ActorRollingStone_1048vfunc_10E8ActorRefi kind:function(arm,size=0xb8) addr:0x020f8514 +_ZN21ActorRollingStone_1048vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8484 +_ZN21ActorRollingStone_1048vfunc_10E9RefStructi kind:function(arm,size=0xb8) addr:0x020f8514 _ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x020f85cc _ZN17ActorRollingStoneC1Ev kind:function(arm,size=0x194) addr:0x020f8610 _ZN20ActorRollingStone_D4D1Ev kind:function(arm,size=0x14) addr:0x020f87a4 @@ -1167,7 +1167,7 @@ _ZN25ActorProfileRedPotionDropC1Ev kind:function(arm,size=0x40) addr:0x020fa00c _ZN24ActorProfileTreasureDrop10GetProfileEv kind:function(arm,size=0xc) addr:0x020fa04c _ZN24ActorProfileTreasureDrop6CreateEv kind:function(arm,size=0x24) addr:0x020fa058 _ZN24ActorProfileTreasureDropC1Ev kind:function(arm,size=0x40) addr:0x020fa07c -_ZN13ActorItemDrop19func_ov031_020f9f8cEP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020fa0bc +_ZN13ActorItemDrop19func_ov031_020f9f8cEP9RefStructPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020fa0bc _ZN13ActorItemDropC1Ev kind:function(arm,size=0x200) addr:0x020fa13c _ZN13ActorItemDrop4InitEi kind:function(arm,size=0x30) addr:0x020fa33c _ZN13ActorItemDrop6UpdateEv kind:function(arm,size=0xc) addr:0x020fa36c @@ -1191,7 +1191,7 @@ _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x0 _ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa96c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020faa30 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fab28 -_ZN16ActorItemDrop_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020fab60 +_ZN16ActorItemDrop_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020fab60 _ZN16ActorItemDrop_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020faba4 _ZN16ActorItemDrop_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020fabc4 _ZN16ActorItemDrop_C48vfunc_08Ev kind:function(arm,size=0x20) addr:0x020fabec @@ -1267,10 +1267,10 @@ _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbc1c _ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbcb8 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbcbc -_ZN12ActorUnkNFSP19func_ov031_020fbba0E8ActorRef kind:function(arm,size=0x40) addr:0x020fbcd0 +_ZN12ActorUnkNFSP19func_ov031_020fbba0E9RefStruct kind:function(arm,size=0x40) addr:0x020fbcd0 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbd10 _ZN15ActorUnkNFSP_C0C1EP12ActorUnkNFSP kind:function(arm,size=0x38) addr:0x020fbd34 -_ZN15ActorUnkNFSP_C08vfunc_00E8ActorRefi kind:function(arm,size=0x58) addr:0x020fbd6c +_ZN15ActorUnkNFSP_C08vfunc_00E9RefStructi kind:function(arm,size=0x58) addr:0x020fbd6c _ZN15ActorUnkNFSP_C08vfunc_04Ev kind:function(arm,size=0x2c) addr:0x020fbdc4 _ZN15ActorUnkNFSP_C08vfunc_08Ev kind:function(arm,size=0x30) addr:0x020fbdf0 _ZN15ActorUnkNFSP_C08vfunc_0CEP7VecFx32 kind:function(arm,size=0x38) addr:0x020fbe20 @@ -1481,7 +1481,7 @@ _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x021016a8 _ZN14MapObjectGrass19func_ov031_021016b4Ev kind:function(arm,size=0x88) addr:0x021017e4 _ZN14MapObjectGrass8vfunc_3CEP7VecFx32 kind:function(arm,size=0x3c) addr:0x0210186c _ZN14MapObjectGrass19func_ov031_02101778Ev kind:function(arm,size=0x74) addr:0x021018a8 -_ZN14MapObjectGrass8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0xb8) addr:0x0210191c +_ZN14MapObjectGrass8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0xb8) addr:0x0210191c _ZN14MapObjectGrass19func_ov031_021018a4Es kind:function(arm,size=0xac) addr:0x021019d4 _ZN14MapObjectGrass19func_ov031_02101950Ev kind:function(arm,size=0x18) addr:0x02101a80 _ZN14MapObjectGrass19func_ov031_02101968Ei kind:function(arm,size=0x10) addr:0x02101a98 @@ -1502,7 +1502,7 @@ _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101f4c _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x021020b8 _ZN16MapObjectUnkSWHT8vfunc_14Ei kind:function(arm,size=0x20) addr:0x021020c4 -_ZN16MapObjectUnkSWHT8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x138) addr:0x021020e4 +_ZN16MapObjectUnkSWHT8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x138) addr:0x021020e4 _ZN16MapObjectUnkSWHT19func_ov031_021020ecEv kind:function(arm,size=0xd4) addr:0x0210221c _ZN16MapObjectUnkSWHT19func_ov031_021021c0Esi kind:function(arm,size=0x1f0) addr:0x021022f0 _ZN16MapObjectUnkSWHT19func_ov031_021023b0Ev kind:function(arm,size=0x74) addr:0x021024e0 @@ -1511,7 +1511,7 @@ _ZN26MapObjectProfileBombFlower10GetProfileEv kind:function(arm,size=0xc) addr:0 _ZN26MapObjectProfileBombFlower6CreateEv kind:function(arm,size=0x24) addr:0x02102574 _ZN26MapObjectProfileBombFlowerC1Ev kind:function(arm,size=0x44) addr:0x02102598 _ZN19MapObjectBombFlowerC1Ev kind:function(arm,size=0x118) addr:0x021025dc -_ZN19MapObjectBombFlower8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x144) addr:0x021026f4 +_ZN19MapObjectBombFlower8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x144) addr:0x021026f4 _ZN19MapObjectBombFlower8vfunc_48Ev kind:function(arm,size=0x10) addr:0x02102838 _ZN19MapObjectBombFlower8vfunc_58Ev kind:function(arm,size=0x10) addr:0x02102848 _ZN19MapObjectBombFlower19func_ov031_02102728Ei kind:function(arm,size=0x7c) addr:0x02102858 @@ -1520,7 +1520,7 @@ _ZN19MapObjectBombFlower8SetStateEsi kind:function(arm,size=0x15c) addr:0x021029 _ZN19MapObjectBombFlower8vfunc_14Ei kind:function(arm,size=0x50) addr:0x02102b20 _ZN19MapObjectBombFlower8vfunc_38Ev kind:function(arm,size=0x98) addr:0x02102b70 _ZN19MapObjectBombFlower8vfunc_28Eiii kind:function(arm,size=0x1c) addr:0x02102c08 -_ZN19MapObjectBombFlower8vfunc_50EP8ActorRefP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102c24 +_ZN19MapObjectBombFlower8vfunc_50EP9RefStructP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102c24 _ZN19MapObjectBombFlowerD1Ev kind:function(arm,size=0x20) addr:0x02102c94 _ZN19MapObjectBombFlowerD0Ev kind:function(arm,size=0x28) addr:0x02102cb4 _ZN26MapObjectProfileBombFlowerD1Ev kind:function(arm,size=0x14) addr:0x02102cdc @@ -1626,7 +1626,7 @@ _ZN19MapObjectProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x0210506c _ZN19MapObjectProfilePotC1Ev kind:function(arm,size=0x8c) addr:0x02105090 _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x0210511c _ZN12MapObjectPot5SetupEv kind:function(arm,size=0x2c) addr:0x021051b8 -_ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x021051e4 +_ZN12MapObjectPot8vfunc_1CE9RefStructiP7VecFx32 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 _ZN12MapObjectPot8vfunc_54Ev kind:function(arm,size=0x38) addr:0x02105440 @@ -1673,7 +1673,7 @@ _ZN16MapObjectUnkSKDI8vfunc_0CEv kind:function(arm,size=0x60) addr:0x0210650c _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr:0x0210656c _ZN16MapObjectUnkSKDI19func_ov031_02106678Esi kind:function(arm,size=0x3f8) addr:0x021067a8 _ZN16MapObjectUnkSKDI19func_ov031_02106a70Ev kind:function(arm,size=0x14) addr:0x02106ba0 -_ZN16MapObjectUnkSKDI8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106bb4 +_ZN16MapObjectUnkSKDI8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106bb4 _ZN16MapObjectUnkSKDI8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02106da8 _ZN16MapObjectUnkSKDI8vfunc_38Ev kind:function(arm,size=0x8) addr:0x02106dc8 _ZN16MapObjectUnkSKDI8vfunc_3CEv kind:function(arm,size=0x8) addr:0x02106dd0 diff --git a/config/eur1/arm9/overlays/ov032/symbols.txt b/config/eur1/arm9/overlays/ov032/symbols.txt index 9361e866..97b6efe7 100644 --- a/config/eur1/arm9/overlays/ov032/symbols.txt +++ b/config/eur1/arm9/overlays/ov032/symbols.txt @@ -123,7 +123,7 @@ _ZN14ActorKeese_2ACC1EP10ActorKeese kind:function(arm,size=0x38) addr:0x0211df74 _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_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x144) addr:0x0211e010 +_ZN14ActorKeese_2AC8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x144) addr:0x0211e010 _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 @@ -206,7 +206,7 @@ _ZN16MapObjectUnkSWSWC1Ev kind:function(arm,size=0xc4) addr:0x021212c0 _ZN19MapObjectUnkSWSW_40D1Ev kind:function(arm,size=0x14) addr:0x02121384 _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_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x278) addr:0x02121a8c _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121d04 _ZN16MapObjectUnkSWSW19func_ov032_02121b90Ev kind:function(arm,size=0x88) addr:0x02121d4c _ZN16MapObjectUnkSWSW8vfunc_3CEi kind:function(arm,size=0x158) addr:0x02121dd4 diff --git a/config/eur1/arm9/overlays/ov063/symbols.txt b/config/eur1/arm9/overlays/ov063/symbols.txt index 827ba9c7..0a7e5072 100644 --- a/config/eur1/arm9/overlays/ov063/symbols.txt +++ b/config/eur1/arm9/overlays/ov063/symbols.txt @@ -3,7 +3,7 @@ _ZN19ActorProfileUnkCANS6CreateEv kind:function(arm,size=0x24) addr:0x02157fcc _ZN19ActorProfileUnkCANSC1Ev kind:function(arm,size=0x50) addr:0x02157ff0 _ZN24UnkStruct_ov063_02162ee8C1EP10G3d_Model_ kind:function(arm,size=0x5c) addr:0x02158040 _ZN24UnkStruct_ov063_02162e88C1EPv kind:function(arm,size=0x28) addr:0x0215809c -_ZN24UnkStruct_ov063_02162e888vfunc_04E8ActorRefiiPi kind:function(arm,size=0x178) addr:0x021580c4 +_ZN24UnkStruct_ov063_02162e888vfunc_04E9RefStructiiPi kind:function(arm,size=0x178) addr:0x021580c4 _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 @@ -54,7 +54,7 @@ _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a8f4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a924 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a938 _ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x4c) addr:0x0215a954 -_ZN24UnkStruct_ov063_02162ea88vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0xcc) addr:0x0215a9a0 +_ZN24UnkStruct_ov063_02162ea88vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0xcc) addr:0x0215a9a0 _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215aa6c _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215aa90 _ZN24UnkStruct_ov063_02162ee8D0Ev kind:function(arm,size=0x1c) addr:0x0215aabc @@ -67,12 +67,12 @@ _ZN19ActorProfileUnkCASE6CreateEv kind:function(arm,size=0x24) addr:0x0215ac24 _ZN19ActorProfileUnkCASEC1Ev kind:function(arm,size=0x48) addr:0x0215ac48 _ZN24UnkStruct_ov063_021631a0C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0215ac90 _ZN16ActorUnkCASE_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215acc4 -_ZN16ActorUnkCASE_1508vfunc_00E8ActorRefi kind:function(arm,size=0x74) addr:0x0215acf8 +_ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215acf8 _ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ad6c _ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ad88 _ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215adac _ZN16ActorUnkCASE_1748vfunc_10EP5Actor kind:function(arm,size=0x24) addr:0x0215ade8 -_ZN12ActorUnkCASE19func_ov063_0215acecEP8ActorRefS0_ kind:function(arm,size=0x5c) addr:0x0215ae0c +_ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215ae0c _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ae68 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215af8c _ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215afa0 @@ -96,7 +96,7 @@ _ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b7e8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b844 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b8ec -_ZN12ActorUnkCASE19func_ov063_0215b814E8ActorRef kind:function(arm,size=0x40) addr:0x0215b934 +_ZN12ActorUnkCASE19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b934 _ZN12ActorUnkCASE19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b974 _ZN12ActorUnkCASE19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215ba08 _ZN12ActorUnkCASE19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215babc @@ -311,7 +311,7 @@ _ZN23MapObjectProfileUnkLTRWC1Ev kind:function(arm,size=0xd0) addr:0x02160c64 _ZN16MapObjectUnkLTRWC1Ev kind:function(arm,size=0x9c) addr:0x02160d34 _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 +_ZN16MapObjectUnkLTRW8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x34) addr:0x02160e48 _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02160e7c _ZN16MapObjectUnkLTRW8vfunc_28Eiii kind:function(arm,size=0xc4) addr:0x02160e98 _ZN16MapObjectUnkLTRW8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02160f5c diff --git a/config/eur1/arm9/overlays/ov070/symbols.txt b/config/eur1/arm9/overlays/ov070/symbols.txt index 44c70257..4f2c45d0 100644 --- a/config/eur1/arm9/overlays/ov070/symbols.txt +++ b/config/eur1/arm9/overlays/ov070/symbols.txt @@ -98,7 +98,7 @@ func_ov070_02141264 kind:function(arm,size=0x150) addr:0x02141384 _ZN19ActorProfileUnkKEYN10GetProfileEv kind:function(arm,size=0xc) addr:0x021414d4 _ZN19ActorProfileUnkKEYN6CreateEv kind:function(arm,size=0x24) addr:0x021414e0 _ZN19ActorProfileUnkKEYNC1Ev kind:function(arm,size=0x58) addr:0x02141504 -_ZN12ActorUnkKEYN19func_ov070_0214143cEP8ActorRefP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x0214155c +_ZN12ActorUnkKEYN19func_ov070_0214143cEP9RefStructP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x0214155c _ZN12ActorUnkKEYNC1Ev kind:function(arm,size=0x130) addr:0x02141608 _ZN12ActorUnkKEYN19func_ov070_02141618Ev kind:function(arm,size=0x14) addr:0x02141738 _ZN12ActorUnkKEYN19func_ov070_0214162cEv kind:function(arm,size=0x124) addr:0x0214174c diff --git a/config/eur1/arm9/overlays/ov071/symbols.txt b/config/eur1/arm9/overlays/ov071/symbols.txt index 10336e25..7c9618ba 100644 --- a/config/eur1/arm9/overlays/ov071/symbols.txt +++ b/config/eur1/arm9/overlays/ov071/symbols.txt @@ -319,7 +319,7 @@ _ZN14ActorTearLight19func_ov071_0215ff3cEv kind:function(arm,size=0x7c) addr:0x0 _ZN14ActorTearLight19func_ov071_0215ffb8Ev kind:function(arm,size=0x4) addr:0x02160138 _ZN14ActorTearLight19func_ov071_0215ffbcEv kind:function(arm,size=0x44) addr:0x0216013c _ZN18ActorTearLight_194C2EP14ActorTearLight kind:function(arm,size=0x38) addr:0x02160180 -_ZN18ActorTearLight_1948vfunc_00E8ActorRefi kind:function(arm,size=0x40) addr:0x021601b8 +_ZN18ActorTearLight_1948vfunc_00E9RefStructi kind:function(arm,size=0x40) addr:0x021601b8 _ZN18ActorTearLight_1948vfunc_04Ev kind:function(arm,size=0x1c) addr:0x021601f8 _ZN18ActorTearLight_1948vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x02160214 _ZN18ActorTearLight_1948vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02160238 diff --git a/config/eur1/arm9/overlays/ov075/symbols.txt b/config/eur1/arm9/overlays/ov075/symbols.txt index 90282803..35741321 100644 --- a/config/eur1/arm9/overlays/ov075/symbols.txt +++ b/config/eur1/arm9/overlays/ov075/symbols.txt @@ -160,7 +160,7 @@ _ZN12ActorUnkMRD219func_ov075_0215b4dcEv kind:function(arm,size=0x9c) addr:0x021 _ZN12ActorUnkMRD219func_ov075_0215b578Ev kind:function(arm,size=0x39c) addr:0x0215b6b8 _ZN12ActorUnkMRD219func_ov075_0215b914Ev kind:function(arm,size=0x2d4) addr:0x0215ba54 _ZN12ActorUnkMRD219func_ov075_0215bbe8Ev kind:function(arm,size=0x8) addr:0x0215bd28 -_ZN12ActorUnkMRD219func_ov075_0215bbf0EP8ActorRefPi kind:function(arm,size=0x60) addr:0x0215bd30 +_ZN12ActorUnkMRD219func_ov075_0215bbf0EP9RefStructPi kind:function(arm,size=0x60) addr:0x0215bd30 _ZN12ActorUnkMRD219func_ov075_0215bc50Ev kind:function(arm,size=0xf0) addr:0x0215bd90 _ZN12ActorUnkMRD219func_ov075_0215bd40Ev kind:function(arm,size=0x10) addr:0x0215be80 _ZN12ActorUnkMRD219func_ov075_0215bd50Ev kind:function(arm,size=0xc0) addr:0x0215be90 diff --git a/config/eur1/arm9/overlays/ov084/symbols.txt b/config/eur1/arm9/overlays/ov084/symbols.txt index 421dd4dd..ff81dbe5 100644 --- a/config/eur1/arm9/overlays/ov084/symbols.txt +++ b/config/eur1/arm9/overlays/ov084/symbols.txt @@ -38,7 +38,7 @@ _ZN12ActorUnkIWTS19func_ov084_02152cecEv kind:function(arm,size=0x24) addr:0x021 _ZN12ActorUnkIWTS19func_ov084_02152d10Ev kind:function(arm,size=0x180) addr:0x02152e90 _ZN12ActorUnkIWTSD0Ev kind:function(arm,size=0x188) addr:0x02153010 _ZN12ActorUnkIWTS19func_ov084_02153018Ev kind:function(arm,size=0x4c) addr:0x02153198 -_ZN12ActorUnkIWTS19func_ov084_02153064EP8ActorRefPP7MtxFx43 kind:function(arm,size=0x70) addr:0x021531e4 +_ZN12ActorUnkIWTS19func_ov084_02153064EP9RefStructPP7MtxFx43 kind:function(arm,size=0x70) addr:0x021531e4 _ZN12ActorUnkIWTS19func_ov084_021530d4Ev kind:function(arm,size=0x88) addr:0x02153254 _ZN12ActorUnkIWTS19func_ov084_0215315cEv kind:function(arm,size=0x38) addr:0x021532dc _ZN12ActorUnkIWTS19func_ov084_02153194Ev kind:function(arm,size=0x50) addr:0x02153314 diff --git a/config/eur1/arm9/overlays/ov093/symbols.txt b/config/eur1/arm9/overlays/ov093/symbols.txt index 3d2e601b..db15caa6 100644 --- a/config/eur1/arm9/overlays/ov093/symbols.txt +++ b/config/eur1/arm9/overlays/ov093/symbols.txt @@ -11,7 +11,7 @@ func_ov093_02166048 kind:function(arm,size=0x10) addr:0x021661c8 _ZN18UnkStruct_027e0d8c19func_ov093_02166058Ev kind:function(arm,size=0x10) addr:0x021661d8 _ZN18UnkStruct_027e0d8c19func_ov093_02166068Ev kind:function(arm,size=0x10) addr:0x021661e8 func_ov093_02166078 kind:function(arm,size=0x30) addr:0x021661f8 -_ZN18UnkStruct_027e0d8c19func_ov093_021660a8E8ActorRef kind:function(arm,size=0x20) addr:0x02166228 +_ZN18UnkStruct_027e0d8c19func_ov093_021660a8E9RefStruct kind:function(arm,size=0x20) addr:0x02166228 func_ov093_021660c8 kind:function(arm,size=0x10) addr:0x02166248 func_ov093_021660d8 kind:function(arm,size=0x10) addr:0x02166258 func_ov093_021660e8 kind:function(arm,size=0x10) addr:0x02166268 @@ -26,7 +26,7 @@ func_ov093_02166178 kind:function(arm,size=0x10) addr:0x021662f8 func_ov093_02166188 kind:function(arm,size=0x14) addr:0x02166308 func_ov093_0216619c kind:function(arm,size=0x14) addr:0x0216631c func_ov093_021661b0 kind:function(arm,size=0x10) addr:0x02166330 -_ZN18UnkStruct_027e0d8c19func_ov093_021661c0E8ActorRef kind:function(arm,size=0x20) addr:0x02166340 +_ZN18UnkStruct_027e0d8c19func_ov093_021661c0E9RefStruct kind:function(arm,size=0x20) addr:0x02166340 func_ov093_021661e0 kind:function(arm,size=0x10) addr:0x02166360 func_ov093_021661f0 kind:function(arm,size=0x10) addr:0x02166370 func_ov093_02166200 kind:function(arm,size=0x10) addr:0x02166380 diff --git a/config/jp/arm9/itcm/symbols.txt b/config/jp/arm9/itcm/symbols.txt index ae287c81..46a22912 100644 --- a/config/jp/arm9/itcm/symbols.txt +++ b/config/jp/arm9/itcm/symbols.txt @@ -200,7 +200,7 @@ func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc _ZN12ActorManager13func_01fff2fcEPFvP5ActorP14Actor_vfunc_30EPv kind:function(arm,size=0x54) addr:0x01fff2fc _ZN12ActorManager13func_01fff350EP29UnkStruct_ov000_020b3000_BasePP5Actor kind:function(arm,size=0x64) addr:0x01fff350 -_ZN12ActorManager13func_01fff3b4E8ActorRef kind:function(arm,size=0x8c) addr:0x01fff3b4 +_ZN12ActorManager13func_01fff3b4E9RefStruct kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 _ZN5Actor8vfunc_10EP8Cylinder kind:function(arm,size=0x34) addr:0x01fff464 diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index 6c7fa46c..3331f124 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -486,7 +486,7 @@ _ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) func_ov000_0206176c kind:function(thumb,size=0xbc) addr:0x02062cf4 func_ov000_02061828 kind:function(thumb,size=0x28) addr:0x02062db0 _ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02062dd8 -_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x02062df0 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x1e0) addr:0x02062df0 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a48EP7VecFx32P5Vec2sS3_ kind:function(arm,size=0x28) addr:0x02062fd0 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02062ff8 func_ov000_02061a7c kind:function(arm,size=0x10) addr:0x02063004 @@ -1415,8 +1415,8 @@ _ZN24UnkStruct_ov000_020b28388vfunc_00Ev kind:function(arm,size=0x4) addr:0x0207 _ZN24UnkStruct_ov000_020b2838D0Ev kind:function(arm,size=0x14) addr:0x0207d6a0 _ZN29UnkStruct_ov031_Items_00_BaseD2Ev kind:function(arm,size=0x4) addr:0x0207d6b4 _ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x8) addr:0x0207d6b8 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x8) addr:0x0207d6c0 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E8ActorRefi kind:function(arm,size=0x8) addr:0x0207d6c8 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x8) addr:0x0207d6c0 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E9RefStructi kind:function(arm,size=0x8) addr:0x0207d6c8 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207d6d0 func_ov000_0207c048 kind:function(arm,size=0x30) addr:0x0207d700 func_ov000_0207c078 kind:function(arm,size=0x38) addr:0x0207d730 @@ -1459,7 +1459,7 @@ _ZN18UnkStruct_027e09c019func_ov000_0207da40Ev kind:function(arm,size=0x20c) add func_ov000_0207dc4c kind:function(arm,size=0x18) addr:0x0207f304 func_ov000_0207dc64 kind:function(arm,size=0x24) addr:0x0207f31c func_ov000_0207dc88 kind:function(arm,size=0x210) addr:0x0207f340 -_ZN18UnkStruct_027e09c019func_ov000_0207de98E8ActorRefP24UnkStruct_ov000_0207de98P8Actor_38 kind:function(arm,size=0xc0) addr:0x0207f550 +_ZN18UnkStruct_027e09c019func_ov000_0207de98E9RefStructP24UnkStruct_ov000_0207de98P8Actor_38 kind:function(arm,size=0xc0) addr:0x0207f550 func_ov000_0207df58 kind:function(arm,size=0x30) addr:0x0207f610 _ZN5Actor19func_ov000_0207df88EP8Cylinderi kind:function(arm,size=0xd8) addr:0x0207f640 func_ov000_0207e060 kind:function(arm,size=0x68) addr:0x0207f718 @@ -1472,10 +1472,10 @@ _ZN18UnkStruct_027e09c019func_ov000_0207e254EP15ActorUnkSCCN_B8 kind:function(ar func_ov000_0207e268 kind:function(arm,size=0x2c) addr:0x0207f920 _ZN5Actor19func_ov000_0207e294EP8Cylinder kind:function(arm,size=0x118) addr:0x0207f94c func_ov000_0207e3ac kind:function(arm,size=0xac) addr:0x0207fa64 -_ZN18UnkStruct_027e09c019func_ov000_0207e458EiiP7VecFx32iS1_8ActorRef kind:function(arm,size=0x84) addr:0x0207fb10 +_ZN18UnkStruct_027e09c019func_ov000_0207e458EiiP7VecFx32iS1_9RefStruct kind:function(arm,size=0x84) addr:0x0207fb10 func_ov000_0207e4dc kind:function(arm,size=0x84) addr:0x0207fb94 func_ov000_0207e560 kind:function(arm,size=0x2c) addr:0x0207fc18 -_ZN18UnkStruct_027e09c019func_ov000_0207e58cE8ActorRefihP24UnkStruct_ov031_Items_01 kind:function(arm,size=0xa4) addr:0x0207fc44 +_ZN18UnkStruct_027e09c019func_ov000_0207e58cE9RefStructihP24UnkStruct_ov031_Items_01 kind:function(arm,size=0xa4) addr:0x0207fc44 func_ov000_0207e630 kind:function(arm,size=0x38) addr:0x0207fce8 func_ov000_0207e668 kind:function(arm,size=0x50) addr:0x0207fd20 func_ov000_0207e6b8 kind:function(arm,size=0x14) addr:0x0207fd70 @@ -1882,7 +1882,7 @@ _ZN18UnkStruct_027e0ce019func_ov000_0208a318Eiii kind:function(arm,size=0x74) ad func_ov000_0208a38c kind:function(arm,size=0x30) addr:0x0208ba60 func_ov000_0208a3bc kind:function(arm,size=0x328) addr:0x0208ba90 func_ov000_0208a6e4 kind:function(arm,size=0x48) addr:0x0208bdb8 -_ZN37UnkStruct_027e0ce0_40_Base_94_50_BaseC2EiiP12ActorRefElemi kind:function(thumb,size=0xe) addr:0x0208be00 +_ZN37UnkStruct_027e0ce0_40_Base_94_50_BaseC2EiiP7RefElemi kind:function(thumb,size=0xe) addr:0x0208be00 func_ov000_0208a73c kind:function(arm,size=0x68) addr:0x0208be10 func_ov000_0208a7a4 kind:function(arm,size=0x28) addr:0x0208be78 func_ov000_0208a7cc kind:function(arm,size=0x60) addr:0x0208bea0 @@ -1944,7 +1944,7 @@ func_ov000_0208bdb4 kind:function(arm,size=0x20) addr:0x0208d48c func_ov000_0208bdd4 kind:function(arm,size=0x10) addr:0x0208d4ac func_ov000_0208bde4 kind:function(arm,size=0x18) addr:0x0208d4bc func_ov000_0208bdfc kind:function(arm,size=0x10) addr:0x0208d4d4 -_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE8ActorRef kind:function(arm,size=0x3c) addr:0x0208d4e4 +_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE9RefStruct kind:function(arm,size=0x3c) addr:0x0208d4e4 func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208d520 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208d548 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208d574 @@ -2255,7 +2255,7 @@ func_ov000_02097244 kind:function(arm,size=0x44) addr:0x020989f8 func_ov000_02097288 kind:function(arm,size=0x154) addr:0x02098a3c _ZN24UnkStruct_ov000_020b539c18func_ov000_02073dcEv kind:function(arm,size=0xc) addr:0x02098b90 _ZN24UnkStruct_ov000_020b539c18func_ov000_02073e8Ev kind:function(arm,size=0xc) addr:0x02098b9c -_ZN5Actor19func_ov000_020973f4EP8ActorRefP24UnkStruct_ov000_020b539cjP11ActorParamsi kind:function(arm,size=0x50) addr:0x02098ba8 +_ZN5Actor19func_ov000_020973f4EP9RefStructP24UnkStruct_ov000_020b539cjP11ActorParamsi kind:function(arm,size=0x50) addr:0x02098ba8 _ZN24UnkStruct_ov000_020b539c19func_ov000_02097444EjP11ActorParamsi kind:function(arm,size=0x98) addr:0x02098bf8 _ZN24UnkStruct_ov000_020b539c16GetProfileFromIdEj kind:function(arm,size=0x4c) addr:0x02098c90 func_ov000_02097528 kind:function(arm,size=0x20) addr:0x02098cdc @@ -2292,7 +2292,7 @@ _ZN8Actor_9CC2Ev kind:function(arm,size=0x34) addr:0x0209932c _ZN8Actor_9CC1Ev kind:function(arm,size=0x34) addr:0x02099360 _ZN8Actor_9C19func_ov000_02097becEv kind:function(arm,size=0x28) addr:0x02099394 _ZN8Actor_9C8vfunc_00Ev kind:function(arm,size=0xc) addr:0x020993bc -_ZN8Actor_9C8vfunc_04E8ActorRefiiPi kind:function(arm,size=0x80) addr:0x020993c8 +_ZN8Actor_9C8vfunc_04E9RefStructiiPi kind:function(arm,size=0x80) addr:0x020993c8 func_ov000_02097ca0 kind:function(arm,size=0x7c) addr:0x02099448 _ZN19func_ov000_02097d1cD1Ev kind:function(arm,size=0x14) addr:0x020994c4 _ZN19func_ov000_02097d30D0Ev kind:function(arm,size=0x1c) addr:0x020994d8 @@ -2372,7 +2372,7 @@ _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x0209afbc _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x0209afd0 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x0209afec func_ov000_02099870 kind:function(arm,size=0x80) addr:0x0209b03c -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E8ActorRefP7VecFx32 kind:function(arm,size=0x11c) addr:0x0209b0bc +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x0209b0bc _ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x0209b1d8 func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x0209b1e8 _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x0209b1f4 @@ -2556,7 +2556,7 @@ _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) ad _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209e8d8 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209e8f0 _ZN9MapObject19func_ov000_0209d144EP5Vec2siP21UnkStruct_027e09bc_0C kind:function(arm,size=0x88) addr:0x0209e908 -_ZN9MapObject8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209e990 +_ZN9MapObject8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209e990 _ZN9MapObject8vfunc_20Ei kind:function(arm,size=0x4) addr:0x0209e998 _ZN9MapObject8vfunc_24EPS_7VecFx32 kind:function(arm,size=0xc) addr:0x0209e99c _ZN9MapObject8vfunc_28Eiii kind:function(arm,size=0x8) addr:0x0209e9a8 @@ -2569,8 +2569,8 @@ _ZN9MapObject19func_ov000_0209d2f0EiiP8Vec2bCpp kind:function(arm,size=0xc4) add _ZN9MapObject19func_ov000_0209d3b4Eii kind:function(arm,size=0x80) addr:0x0209eb78 _ZN9MapObject19func_ov000_0209d434EPcP34UnkStruct_ov019_020d24c8_28_258_00i kind:function(arm,size=0xe4) addr:0x0209ebf8 _ZN9MapObject19func_ov000_0209d518EP7VecFx32iih kind:function(arm,size=0x34) addr:0x0209ecdc -_ZN9MapObject19func_ov000_0209d54cEP8ActorRefPS_tPK7VecFx32st kind:function(arm,size=0x7c) addr:0x0209ed10 -_ZN9MapObject19func_ov000_0209d5c8E8ActorRef kind:function(arm,size=0x4c) addr:0x0209ed8c +_ZN9MapObject19func_ov000_0209d54cEP9RefStructPS_tPK7VecFx32st kind:function(arm,size=0x7c) addr:0x0209ed10 +_ZN9MapObject19func_ov000_0209d5c8E9RefStruct kind:function(arm,size=0x4c) addr:0x0209ed8c _ZN9MapObject19func_ov000_0209d614Ei kind:function(arm,size=0x54) addr:0x0209edd8 _ZN9MapObject19func_ov000_0209d668Ev kind:function(arm,size=0x44) addr:0x0209ee2c _ZN9MapObject19func_ov000_0209d6acEP7VecFx32 kind:function(arm,size=0x54) addr:0x0209ee70 @@ -2586,7 +2586,7 @@ _ZN17MapObjectPot_Base8vfunc_48Ev kind:function(arm,size=0x4) addr:0x0209f224 _ZN17MapObjectPot_Base8vfunc_54Ev kind:function(arm,size=0xc) addr:0x0209f228 _ZN17MapObjectPot_Base8vfunc_4CEv kind:function(arm,size=0x8) addr:0x0209f234 _ZN17MapObjectPot_Base19func_ov000_0209da78Eii kind:function(arm,size=0x48) addr:0x0209f23c -_ZN17MapObjectPot_Base8vfunc_50EP8ActorRefPS_ kind:function(arm,size=0xb4) addr:0x0209f284 +_ZN17MapObjectPot_Base8vfunc_50EP9RefStructPS_ kind:function(arm,size=0xb4) addr:0x0209f284 _ZN17MapObjectPot_Base8vfunc_3CEv kind:function(arm,size=0x8) addr:0x0209f338 _ZN17MapObjectPot_Base8vfunc_40Ev kind:function(arm,size=0x8) addr:0x0209f340 func_ov000_0209db84 kind:function(arm,size=0x8c) addr:0x0209f348 @@ -3035,7 +3035,7 @@ _ZN14Actor_Derived18vfunc_54Ei kind:function(arm,size=0x4) addr:0x020aa5a0 _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 +_ZN14Actor_Derived119func_ov000_020a8df0E9RefStructi kind:function(arm,size=0x94) addr:0x020aa5f0 _ZN14Actor_Derived18vfunc_B4Ev kind:function(arm,size=0x18) addr:0x020aa684 _ZN14Actor_Derived119func_ov000_020a8e9cEP7VecFx32 kind:function(arm,size=0x24) addr:0x020aa69c _ZN14Actor_Derived18vfunc_B0Ev kind:function(arm,size=0x94) addr:0x020aa6c0 diff --git a/config/jp/arm9/overlays/ov017/symbols.txt b/config/jp/arm9/overlays/ov017/symbols.txt index b9cacdc8..eb8e308d 100644 --- a/config/jp/arm9/overlays/ov017/symbols.txt +++ b/config/jp/arm9/overlays/ov017/symbols.txt @@ -127,11 +127,11 @@ _ZN18UnkStruct_027e0cec19func_ov017_020c1e54Eii kind:function(arm,size=0x48) add _ZN18UnkStruct_027e0cec19func_ov017_020c1e9cEii kind:function(arm,size=0x124) addr:0x020c36c8 _ZN18UnkStruct_027e0cec19func_ov017_020c1fc0Eii kind:function(arm,size=0x5c) addr:0x020c37ec _ZN21UnkStruct_027e0cec_008vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020c3848 -_ZN5Actor19func_ov017_020c2038EP8ActorRefiiPK7VecFx32i kind:function(arm,size=0x164) addr:0x020c3864 +_ZN5Actor19func_ov017_020c2038EP9RefStructiiPK7VecFx32i kind:function(arm,size=0x164) addr:0x020c3864 _ZN5Actor19func_ov017_020c219cEiPK7VecFx32ib kind:function(arm,size=0x174) addr:0x020c39c8 _ZN5Actor19func_ov017_020c2310EPK7VecFx32i kind:function(arm,size=0x94) addr:0x020c3b3c _ZN5Actor19func_ov017_020c23a4EiPK7VecFx32ib kind:function(arm,size=0x94) addr:0x020c3bd0 -_ZN5Actor19func_ov017_020c2438EP8ActorRefiPK7VecFx32ib kind:function(arm,size=0x2c0) addr:0x020c3c64 +_ZN5Actor19func_ov017_020c2438EP9RefStructiPK7VecFx32ib kind:function(arm,size=0x2c0) addr:0x020c3c64 _ZN5Actor19func_ov017_020c26f8EiPK7VecFx32ib kind:function(arm,size=0x1bc) addr:0x020c3f24 _ZN5Actor19func_ov017_020c28b4EP7VecFx3214UnkAngleStructi kind:function(arm,size=0xc8) addr:0x020c40e0 _ZN21UnkStruct_027e0cec_1819func_ov017_020c297cEii kind:function(arm,size=0x15c) addr:0x020c41a8 diff --git a/config/jp/arm9/overlays/ov024/symbols.txt b/config/jp/arm9/overlays/ov024/symbols.txt index d0c9d6e4..3a4f36c2 100644 --- a/config/jp/arm9/overlays/ov024/symbols.txt +++ b/config/jp/arm9/overlays/ov024/symbols.txt @@ -109,10 +109,10 @@ _ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c8758 _ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c8784 _ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c8798 _ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c87b8 -_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x020c87dc +_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x1e0) addr:0x020c87dc _ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c89bc -_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x68) addr:0x020c8a64 -_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP8ActorRef kind:function(arm,size=0x84) addr:0x020c8acc +_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x68) addr:0x020c8a64 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP9RefStruct kind:function(arm,size=0x84) addr:0x020c8acc _ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c8b50 _ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c8ba4 _ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c8be0 diff --git a/config/jp/arm9/overlays/ov026/symbols.txt b/config/jp/arm9/overlays/ov026/symbols.txt index b15799ee..4ce1392d 100644 --- a/config/jp/arm9/overlays/ov026/symbols.txt +++ b/config/jp/arm9/overlays/ov026/symbols.txt @@ -47,7 +47,7 @@ func_ov026_020db118 kind:function(arm,size=0x10) addr:0x020db118 func_ov026_020db128 kind:function(arm,size=0x148) addr:0x020db128 func_ov026_020db270 kind:function(arm,size=0xe8) addr:0x020db270 func_ov026_020db358 kind:function(arm,size=0x25c) addr:0x020db358 -_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E8ActorRefP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020db5b4 +_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E9RefStructP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020db5b4 func_ov026_020dba14 kind:function(arm,size=0x114) addr:0x020dba14 func_ov026_020dbb28 kind:function(arm,size=0x114) addr:0x020dbb28 func_ov026_020dbc3c kind:function(arm,size=0x164) addr:0x020dbc3c diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index f0fcc113..071847c7 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -35,10 +35,10 @@ _ZN19func_ov031_020daf08D1Ev kind:function(arm,size=0x14) addr:0x020daf08 _ZN19func_ov031_020daf1cD0Ev kind:function(arm,size=0x1c) addr:0x020daf1c _ZN27UnkStruct_ItemManager_20_0419func_ov031_020d9598Ev kind:function(thumb,size=0x1a) addr:0x020daf38 _ZN18UnkStruct_027e0d2c19func_ov031_020d95b4Ev kind:function(arm,size=0x14) addr:0x020daf54 -_ZN18UnkStruct_027e0d2c19func_ov031_020d95c8E8ActorRef kind:function(arm,size=0x24) addr:0x020daf68 +_ZN18UnkStruct_027e0d2c19func_ov031_020d95c8E9RefStruct kind:function(arm,size=0x24) addr:0x020daf68 func_ov031_020daf8c kind:function(arm,size=0x30) addr:0x020daf8c func_ov031_020dafbc kind:function(arm,size=0x10) addr:0x020dafbc -_ZN18UnkStruct_027e0d2c19func_ov031_020d962cEP7VecFx32iS1_P8ActorRef kind:function(arm,size=0x1c) addr:0x020dafcc +_ZN18UnkStruct_027e0d2c19func_ov031_020d962cEP7VecFx32iS1_P9RefStruct kind:function(arm,size=0x1c) addr:0x020dafcc func_ov031_020dafe8 kind:function(arm,size=0x10) addr:0x020dafe8 _ZN27UnkStruct_ItemManager_20_0819func_ov031_020d9658Ev kind:function(thumb,size=0x1a) addr:0x020daff8 func_ov031_020db014 kind:function(arm,size=0x10) addr:0x020db014 @@ -359,8 +359,8 @@ _ZN13ActorBomb_180C1EP5Actor kind:function(arm,size=0x3c) addr:0x020e4764 _ZN13ActorBomb_180D1Ev kind:function(arm,size=0x1c) addr:0x020e47a0 _ZN13ActorBomb_180D0Ev kind:function(arm,size=0x24) addr:0x020e47bc _ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x48) addr:0x020e47e0 -_ZN13ActorBomb_1808vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x450) addr:0x020e4828 -_ZN13ActorBomb_1808vfunc_10E8ActorRefi kind:function(arm,size=0x84) addr:0x020e4c78 +_ZN13ActorBomb_1808vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x450) addr:0x020e4828 +_ZN13ActorBomb_1808vfunc_10E9RefStructi kind:function(arm,size=0x84) addr:0x020e4c78 _ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e4cfc _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e4d2c _ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e4d68 @@ -373,7 +373,7 @@ _ZN16ActorProfileBombD1Ev kind:function(arm,size=0x14) addr:0x020e4e8c _ZN17ActorProfileBlast10GetProfileEv kind:function(arm,size=0xc) addr:0x020e4ea0 _ZN17ActorProfileBlast6CreateEv kind:function(arm,size=0x24) addr:0x020e4eac _ZN17ActorProfileBlastC1Ev kind:function(arm,size=0x38) addr:0x020e4ed0 -_ZN13ActorBlast_E88vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1a4) addr:0x020e4f08 +_ZN13ActorBlast_E88vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1a4) addr:0x020e4f08 _ZN10ActorBlastC1Ev kind:function(arm,size=0x7c) addr:0x020e50ac _ZN13ActorBlast_E8D1Ev kind:function(arm,size=0x14) addr:0x020e5128 _ZN10ActorBlast4InitEi kind:function(arm,size=0x274) addr:0x020e513c @@ -444,13 +444,13 @@ _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e6e60 _ZN22ActorItemBoomerang_11CD0Ev kind:function(arm,size=0x1c) addr:0x020e6e74 _ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e6e90 -_ZN22ActorItemBoomerang_11C8vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x230) addr:0x020e6ec0 +_ZN22ActorItemBoomerang_11C8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x230) addr:0x020e6ec0 _ZN26ActorItemBoomerang_Unknown19func_ov031_020e5704Ev kind:function(arm,size=0xc) addr:0x020e70f0 _ZN21ActorItemBoomerang_A0D0Ev kind:function(arm,size=0x1c) addr:0x020e70fc _ZN21ActorItemBoomerang_CCD0Ev kind:function(arm,size=0x1c) addr:0x020e7118 _ZN25ActorProfileItemBoomerangD1Ev kind:function(arm,size=0x14) addr:0x020e7134 _ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e7148 -_ZN24UnkStruct_ov031_02112ff48vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x114) addr:0x020e7170 +_ZN24UnkStruct_ov031_02112ff48vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x114) addr:0x020e7170 _ZN20ActorItemTornado_17C8vfunc_00Eii kind:function(arm,size=0x30) addr:0x020e7284 _ZN23ActorProfileItemTornado10GetProfileEv kind:function(arm,size=0xc) addr:0x020e72b4 _ZN23ActorProfileItemTornado6CreateEv kind:function(arm,size=0x24) addr:0x020e72c0 @@ -482,7 +482,7 @@ func_ov031_020e81c8 kind:function(arm,size=0x7c) addr:0x020e81c8 func_ov031_020e8244 kind:function(arm,size=0x64) addr:0x020e8244 _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e82a8 _ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e82c4 -_ZN15ActorUnkSWBM_948vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e82ec +_ZN15ActorUnkSWBM_948vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e82ec _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e8308 _ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e8360 _ZN15ActorUnkSWBM_C88vfunc_00Eii kind:function(arm,size=0x168) addr:0x020e83b8 @@ -559,7 +559,7 @@ _ZN19ActorProfileUnkROCKD1Ev kind:function(arm,size=0x14) addr:0x020ea690 _ZN17ActorProfileRupee10GetProfileEv kind:function(arm,size=0xc) addr:0x020ea6a4 _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 +_ZN10ActorRupee19func_ov031_020e8d2cEP9RefStructPK7VecFx32jjS0_ kind:function(arm,size=0x7c) addr:0x020ea718 _ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020ea794 _ZN10ActorRupee4InitEi kind:function(arm,size=0x1d0) addr:0x020ea808 _ZN10ActorRupee19func_ov031_020e8fecEv kind:function(arm,size=0x7c) addr:0x020ea9d8 @@ -599,7 +599,7 @@ _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020eb _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020eb780 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020eb848 _ZN13ActorRupee_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020eb8dc -_ZN13ActorRupee_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020eb914 +_ZN13ActorRupee_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020eb914 _ZN13ActorRupee_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020eb958 _ZN13ActorRupee_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020eb978 _ZN13ActorRupee_C48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020eb9a0 @@ -731,7 +731,7 @@ _ZN17ActorUnkZLSL_169019func_ov031_020eece8Ev kind:function(arm,size=0xc) addr:0 _ZN17ActorProfileHeart10GetProfileEv kind:function(arm,size=0xc) addr:0x020f06e0 _ZN17ActorProfileHeart6CreateEv kind:function(arm,size=0x24) addr:0x020f06ec _ZN17ActorProfileHeartC1Ev kind:function(arm,size=0x40) addr:0x020f0710 -_ZN10ActorHeart19func_ov031_020eed64EP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020f0750 +_ZN10ActorHeart19func_ov031_020eed64EP9RefStructPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020f0750 _ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020f07cc _ZN10ActorHeart4InitEi kind:function(arm,size=0x10) addr:0x020f08c4 _ZN10ActorHeart6UpdateEv kind:function(arm,size=0x2cc) addr:0x020f08d4 @@ -755,7 +755,7 @@ _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020f0 _ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f0fe4 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020f1094 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020f10f4 -_ZN13ActorHeart_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020f112c +_ZN13ActorHeart_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020f112c _ZN13ActorHeart_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020f1170 _ZN13ActorHeart_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020f1190 _ZN13ActorHeart_C48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020f11b8 @@ -924,7 +924,7 @@ _ZN18ActorShotArrow_178D1Ev kind:function(arm,size=0x1c) addr:0x020f4cc0 _ZN18ActorShotArrow_178D0Ev kind:function(arm,size=0x24) addr:0x020f4cdc _ZN18ActorShotArrow_17819func_ov031_020f3304Ev kind:function(arm,size=0xc) addr:0x020f4d00 _ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0xac) addr:0x020f4d0c -_ZN18ActorShotArrow_1788vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x3f8) addr:0x020f4db8 +_ZN18ActorShotArrow_1788vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x3f8) addr:0x020f4db8 _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f51b0 _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f51f0 _ZN18ActorShotArrow_1948vfunc_10EP5Actor kind:function(arm,size=0x388) addr:0x020f5354 @@ -1004,7 +1004,7 @@ _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f7ce0 _ZN12ActorUnkNTTZD0Ev kind:function(arm,size=0x1c) addr:0x020f7cf4 _ZN19ActorProfileUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f7d10 _ZN13Actor_C4_BaseC2EPvi kind:function(arm,size=0x60) addr:0x020f7d24 -_ZN8Actor_C48vfunc_00E8ActorRefi kind:function(arm,size=0x90) addr:0x020f7d84 +_ZN8Actor_C48vfunc_00E9RefStructi kind:function(arm,size=0x90) addr:0x020f7d84 _ZN8Actor_C48vfunc_04Ev kind:function(arm,size=0x8) addr:0x020f7e14 _ZN8Actor_C48vfunc_08Ev kind:function(arm,size=0x8) addr:0x020f7e1c _ZN8Actor_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x8) addr:0x020f7e24 @@ -1024,8 +1024,8 @@ _ZN12ActorUnkTGTZC1Ev kind:function(arm,size=0xd4) addr:0x020f8348 _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 +_ZN12ActorUnkTGTZ19func_ov031_020f6e5cE9RefStruct kind:function(arm,size=0x4c) addr:0x020f88cc +_ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP9RefStructtPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f8918 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x22c) addr:0x020f8990 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f8bbc _ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f8cf4 @@ -1109,8 +1109,8 @@ _ZN19ActorProfileUnkFLEND1Ev kind:function(arm,size=0x14) addr:0x020f9d10 _ZN24ActorProfileRollingStone10GetProfileEv kind:function(arm,size=0xc) addr:0x020f9d24 _ZN24ActorProfileRollingStone6CreateEv kind:function(arm,size=0x24) addr:0x020f9d30 _ZN24ActorProfileRollingStoneC1Ev kind:function(arm,size=0x44) addr:0x020f9d54 -_ZN21ActorRollingStone_1048vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f9d98 -_ZN21ActorRollingStone_1048vfunc_10E8ActorRefi kind:function(arm,size=0xb8) addr:0x020f9e28 +_ZN21ActorRollingStone_1048vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f9d98 +_ZN21ActorRollingStone_1048vfunc_10E9RefStructi kind:function(arm,size=0xb8) addr:0x020f9e28 _ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x020f9ee0 _ZN17ActorRollingStoneC1Ev kind:function(arm,size=0x194) addr:0x020f9f24 _ZN20ActorRollingStone_D4D1Ev kind:function(arm,size=0x14) addr:0x020fa0b8 @@ -1166,7 +1166,7 @@ _ZN25ActorProfileRedPotionDropC1Ev kind:function(arm,size=0x40) addr:0x020fb920 _ZN24ActorProfileTreasureDrop10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb960 _ZN24ActorProfileTreasureDrop6CreateEv kind:function(arm,size=0x24) addr:0x020fb96c _ZN24ActorProfileTreasureDropC1Ev kind:function(arm,size=0x40) addr:0x020fb990 -_ZN13ActorItemDrop19func_ov031_020f9f8cEP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020fb9d0 +_ZN13ActorItemDrop19func_ov031_020f9f8cEP9RefStructPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020fb9d0 _ZN13ActorItemDropC1Ev kind:function(arm,size=0x200) addr:0x020fba50 _ZN13ActorItemDrop4InitEi kind:function(arm,size=0x30) addr:0x020fbc50 _ZN13ActorItemDrop6UpdateEv kind:function(arm,size=0xc) addr:0x020fbc80 @@ -1190,7 +1190,7 @@ _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x0 _ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fc294 _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fc358 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fc450 -_ZN16ActorItemDrop_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020fc488 +_ZN16ActorItemDrop_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020fc488 _ZN16ActorItemDrop_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020fc4cc _ZN16ActorItemDrop_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020fc4ec _ZN16ActorItemDrop_C48vfunc_08Ev kind:function(arm,size=0x20) addr:0x020fc514 @@ -1266,10 +1266,10 @@ _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x84) addr:0x020 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fd534 _ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fd5d0 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fd5d4 -_ZN12ActorUnkNFSP19func_ov031_020fbba0E8ActorRef kind:function(arm,size=0x40) addr:0x020fd5e8 +_ZN12ActorUnkNFSP19func_ov031_020fbba0E9RefStruct kind:function(arm,size=0x40) addr:0x020fd5e8 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fd628 _ZN15ActorUnkNFSP_C0C1EP12ActorUnkNFSP kind:function(arm,size=0x38) addr:0x020fd64c -_ZN15ActorUnkNFSP_C08vfunc_00E8ActorRefi kind:function(arm,size=0x58) addr:0x020fd684 +_ZN15ActorUnkNFSP_C08vfunc_00E9RefStructi kind:function(arm,size=0x58) addr:0x020fd684 _ZN15ActorUnkNFSP_C08vfunc_04Ev kind:function(arm,size=0x2c) addr:0x020fd6dc _ZN15ActorUnkNFSP_C08vfunc_08Ev kind:function(arm,size=0x30) addr:0x020fd708 _ZN15ActorUnkNFSP_C08vfunc_0CEP7VecFx32 kind:function(arm,size=0x38) addr:0x020fd738 @@ -1480,7 +1480,7 @@ _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x021032c0 _ZN14MapObjectGrass19func_ov031_021016b4Ev kind:function(arm,size=0x88) addr:0x021033fc _ZN14MapObjectGrass8vfunc_3CEP7VecFx32 kind:function(arm,size=0x3c) addr:0x02103484 _ZN14MapObjectGrass19func_ov031_02101778Ev kind:function(arm,size=0x74) addr:0x021034c0 -_ZN14MapObjectGrass8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0xb8) addr:0x02103534 +_ZN14MapObjectGrass8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0xb8) addr:0x02103534 _ZN14MapObjectGrass19func_ov031_021018a4Es kind:function(arm,size=0xac) addr:0x021035ec _ZN14MapObjectGrass19func_ov031_02101950Ev kind:function(arm,size=0x18) addr:0x02103698 _ZN14MapObjectGrass19func_ov031_02101968Ei kind:function(arm,size=0x10) addr:0x021036b0 @@ -1501,7 +1501,7 @@ _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02103b64 _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02103cd0 _ZN16MapObjectUnkSWHT8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02103cdc -_ZN16MapObjectUnkSWHT8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x138) addr:0x02103cfc +_ZN16MapObjectUnkSWHT8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x138) addr:0x02103cfc _ZN16MapObjectUnkSWHT19func_ov031_021020ecEv kind:function(arm,size=0xd4) addr:0x02103e34 _ZN16MapObjectUnkSWHT19func_ov031_021021c0Esi kind:function(arm,size=0x204) addr:0x02103f08 _ZN16MapObjectUnkSWHT19func_ov031_021023b0Ev kind:function(arm,size=0x74) addr:0x0210410c @@ -1510,7 +1510,7 @@ _ZN26MapObjectProfileBombFlower10GetProfileEv kind:function(arm,size=0xc) addr:0 _ZN26MapObjectProfileBombFlower6CreateEv kind:function(arm,size=0x24) addr:0x021041a0 _ZN26MapObjectProfileBombFlowerC1Ev kind:function(arm,size=0x44) addr:0x021041c4 _ZN19MapObjectBombFlowerC1Ev kind:function(arm,size=0x118) addr:0x02104208 -_ZN19MapObjectBombFlower8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x144) addr:0x02104320 +_ZN19MapObjectBombFlower8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x144) addr:0x02104320 _ZN19MapObjectBombFlower8vfunc_48Ev kind:function(arm,size=0x10) addr:0x02104464 _ZN19MapObjectBombFlower8vfunc_58Ev kind:function(arm,size=0x10) addr:0x02104474 _ZN19MapObjectBombFlower19func_ov031_02102728Ei kind:function(arm,size=0x7c) addr:0x02104484 @@ -1519,7 +1519,7 @@ _ZN19MapObjectBombFlower8SetStateEsi kind:function(arm,size=0x15c) addr:0x021045 _ZN19MapObjectBombFlower8vfunc_14Ei kind:function(arm,size=0x50) addr:0x0210474c _ZN19MapObjectBombFlower8vfunc_38Ev kind:function(arm,size=0x98) addr:0x0210479c _ZN19MapObjectBombFlower8vfunc_28Eiii kind:function(arm,size=0x1c) addr:0x02104834 -_ZN19MapObjectBombFlower8vfunc_50EP8ActorRefP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02104850 +_ZN19MapObjectBombFlower8vfunc_50EP9RefStructP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02104850 _ZN19MapObjectBombFlowerD1Ev kind:function(arm,size=0x20) addr:0x021048c0 _ZN19MapObjectBombFlowerD0Ev kind:function(arm,size=0x28) addr:0x021048e0 _ZN26MapObjectProfileBombFlowerD1Ev kind:function(arm,size=0x14) addr:0x02104908 @@ -1625,7 +1625,7 @@ _ZN19MapObjectProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x02106c98 _ZN19MapObjectProfilePotC1Ev kind:function(arm,size=0x8c) addr:0x02106cbc _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02106d48 _ZN12MapObjectPot5SetupEv kind:function(arm,size=0x2c) addr:0x02106de4 -_ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x02106e10 +_ZN12MapObjectPot8vfunc_1CE9RefStructiP7VecFx32 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 _ZN12MapObjectPot8vfunc_54Ev kind:function(arm,size=0x38) addr:0x0210706c @@ -1672,7 +1672,7 @@ _ZN16MapObjectUnkSKDI8vfunc_0CEv kind:function(arm,size=0x60) addr:0x02108138 _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr:0x02108198 _ZN16MapObjectUnkSKDI19func_ov031_02106678Esi kind:function(arm,size=0x3f8) addr:0x021083d4 _ZN16MapObjectUnkSKDI19func_ov031_02106a70Ev kind:function(arm,size=0x14) addr:0x021087cc -_ZN16MapObjectUnkSKDI8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x021087e0 +_ZN16MapObjectUnkSKDI8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x021087e0 _ZN16MapObjectUnkSKDI8vfunc_14Ei kind:function(arm,size=0x20) addr:0x021089d4 _ZN16MapObjectUnkSKDI8vfunc_38Ev kind:function(arm,size=0x8) addr:0x021089f4 _ZN16MapObjectUnkSKDI8vfunc_3CEv kind:function(arm,size=0x8) addr:0x021089fc diff --git a/config/jp/arm9/overlays/ov032/symbols.txt b/config/jp/arm9/overlays/ov032/symbols.txt index d210b39c..830b6d18 100644 --- a/config/jp/arm9/overlays/ov032/symbols.txt +++ b/config/jp/arm9/overlays/ov032/symbols.txt @@ -123,7 +123,7 @@ _ZN14ActorKeese_2ACC1EP10ActorKeese kind:function(arm,size=0x38) addr:0x0211fbd4 _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_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x144) addr:0x0211fc70 +_ZN14ActorKeese_2AC8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x144) addr:0x0211fc70 _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 @@ -210,7 +210,7 @@ _ZN16MapObjectUnkSWSWC1Ev kind:function(arm,size=0xc4) addr:0x021230dc _ZN19MapObjectUnkSWSW_40D1Ev kind:function(arm,size=0x14) addr:0x021231a0 _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_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x278) addr:0x021238a8 _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02123b20 _ZN16MapObjectUnkSWSW19func_ov032_02121b90Ev kind:function(arm,size=0x88) addr:0x02123b68 _ZN16MapObjectUnkSWSW8vfunc_3CEi kind:function(arm,size=0x158) addr:0x02123bf0 diff --git a/config/jp/arm9/overlays/ov063/symbols.txt b/config/jp/arm9/overlays/ov063/symbols.txt index 9f1794bf..407d9502 100644 --- a/config/jp/arm9/overlays/ov063/symbols.txt +++ b/config/jp/arm9/overlays/ov063/symbols.txt @@ -3,7 +3,7 @@ _ZN19ActorProfileUnkCANS6CreateEv kind:function(arm,size=0x24) addr:0x02159bec _ZN19ActorProfileUnkCANSC1Ev kind:function(arm,size=0x50) addr:0x02159c10 _ZN24UnkStruct_ov063_02162ee8C1EP10G3d_Model_ kind:function(arm,size=0x5c) addr:0x02159c60 _ZN24UnkStruct_ov063_02162e88C1EPv kind:function(arm,size=0x28) addr:0x02159cbc -_ZN24UnkStruct_ov063_02162e888vfunc_04E8ActorRefiiPi kind:function(arm,size=0x178) addr:0x02159ce4 +_ZN24UnkStruct_ov063_02162e888vfunc_04E9RefStructiiPi kind:function(arm,size=0x178) addr:0x02159ce4 _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 @@ -54,7 +54,7 @@ _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215c570 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215c5a0 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215c5b4 _ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x4c) addr:0x0215c5d0 -_ZN24UnkStruct_ov063_02162ea88vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0xcc) addr:0x0215c61c +_ZN24UnkStruct_ov063_02162ea88vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0xcc) addr:0x0215c61c _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215c6e8 _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215c70c _ZN24UnkStruct_ov063_02162ee8D0Ev kind:function(arm,size=0x1c) addr:0x0215c738 @@ -67,12 +67,12 @@ _ZN19ActorProfileUnkCASE6CreateEv kind:function(arm,size=0x24) addr:0x0215c8a0 _ZN19ActorProfileUnkCASEC1Ev kind:function(arm,size=0x48) addr:0x0215c8c4 _ZN24UnkStruct_ov063_021631a0C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0215c90c _ZN16ActorUnkCASE_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215c940 -_ZN16ActorUnkCASE_1508vfunc_00E8ActorRefi kind:function(arm,size=0x74) addr:0x0215c974 +_ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215c974 _ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215c9e8 _ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ca04 _ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ca28 _ZN16ActorUnkCASE_1748vfunc_10EP5Actor kind:function(arm,size=0x24) addr:0x0215ca64 -_ZN12ActorUnkCASE19func_ov063_0215acecEP8ActorRefS0_ kind:function(arm,size=0x5c) addr:0x0215ca88 +_ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215ca88 _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215cae4 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215cc08 _ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215cc1c @@ -96,7 +96,7 @@ _ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215d464 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215d4c0 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215d568 -_ZN12ActorUnkCASE19func_ov063_0215b814E8ActorRef kind:function(arm,size=0x40) addr:0x0215d5b0 +_ZN12ActorUnkCASE19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215d5b0 _ZN12ActorUnkCASE19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215d5f0 _ZN12ActorUnkCASE19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xac) addr:0x0215d684 _ZN12ActorUnkCASE19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215d730 @@ -312,7 +312,7 @@ _ZN23MapObjectProfileUnkLTRWC1Ev kind:function(arm,size=0xd0) addr:0x02162918 _ZN16MapObjectUnkLTRWC1Ev kind:function(arm,size=0x9c) addr:0x021629e8 _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 +_ZN16MapObjectUnkLTRW8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x34) addr:0x02162afc _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02162b30 _ZN16MapObjectUnkLTRW8vfunc_28Eiii kind:function(arm,size=0xc4) addr:0x02162b4c _ZN16MapObjectUnkLTRW8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02162c10 @@ -327,7 +327,7 @@ _ZN16MapObjectUnkMTJRC1Ev kind:function(arm,size=0x98) addr:0x02162d7c _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 +_ZN16MapObjectUnkMTJR8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x94) addr:0x02162fd8 _ZN16MapObjectUnkMTJR19func_ov063_02161254Ei kind:function(arm,size=0x34) addr:0x0216306c _ZN16MapObjectUnkMTJR19func_ov063_02161288Ev kind:function(arm,size=0xf8) addr:0x021630a0 _ZN16MapObjectUnkMTJR8vfunc_14Ei kind:function(arm,size=0x44) addr:0x02163198 diff --git a/config/jp/arm9/overlays/ov070/symbols.txt b/config/jp/arm9/overlays/ov070/symbols.txt index 7d95488e..37bfe01a 100644 --- a/config/jp/arm9/overlays/ov070/symbols.txt +++ b/config/jp/arm9/overlays/ov070/symbols.txt @@ -98,7 +98,7 @@ func_ov070_02141264 kind:function(arm,size=0x150) addr:0x02142fec _ZN19ActorProfileUnkKEYN10GetProfileEv kind:function(arm,size=0xc) addr:0x0214313c _ZN19ActorProfileUnkKEYN6CreateEv kind:function(arm,size=0x24) addr:0x02143148 _ZN19ActorProfileUnkKEYNC1Ev kind:function(arm,size=0x58) addr:0x0214316c -_ZN12ActorUnkKEYN19func_ov070_0214143cEP8ActorRefP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x021431c4 +_ZN12ActorUnkKEYN19func_ov070_0214143cEP9RefStructP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x021431c4 _ZN12ActorUnkKEYNC1Ev kind:function(arm,size=0x130) addr:0x02143270 _ZN12ActorUnkKEYN19func_ov070_02141618Ev kind:function(arm,size=0x14) addr:0x021433a0 _ZN12ActorUnkKEYN19func_ov070_0214162cEv kind:function(arm,size=0x124) addr:0x021433b4 diff --git a/config/jp/arm9/overlays/ov071/symbols.txt b/config/jp/arm9/overlays/ov071/symbols.txt index 46b89488..ef62cc48 100644 --- a/config/jp/arm9/overlays/ov071/symbols.txt +++ b/config/jp/arm9/overlays/ov071/symbols.txt @@ -320,7 +320,7 @@ _ZN14ActorTearLight19func_ov071_0215ff3cEv kind:function(arm,size=0x7c) addr:0x0 _ZN14ActorTearLight19func_ov071_0215ffb8Ev kind:function(arm,size=0x4) addr:0x021621f8 _ZN14ActorTearLight19func_ov071_0215ffbcEv kind:function(arm,size=0x44) addr:0x021621fc _ZN18ActorTearLight_194C2EP14ActorTearLight kind:function(arm,size=0x38) addr:0x02162240 -_ZN18ActorTearLight_1948vfunc_00E8ActorRefi kind:function(arm,size=0x40) addr:0x02162278 +_ZN18ActorTearLight_1948vfunc_00E9RefStructi kind:function(arm,size=0x40) addr:0x02162278 _ZN18ActorTearLight_1948vfunc_04Ev kind:function(arm,size=0x1c) addr:0x021622b8 _ZN18ActorTearLight_1948vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x021622d4 _ZN18ActorTearLight_1948vfunc_08Ev kind:function(arm,size=0x1c) addr:0x021622f8 diff --git a/config/jp/arm9/overlays/ov075/symbols.txt b/config/jp/arm9/overlays/ov075/symbols.txt index 1ec2ce3a..c503aa80 100644 --- a/config/jp/arm9/overlays/ov075/symbols.txt +++ b/config/jp/arm9/overlays/ov075/symbols.txt @@ -160,7 +160,7 @@ _ZN12ActorUnkMRD219func_ov075_0215b4dcEv kind:function(arm,size=0x9c) addr:0x021 _ZN12ActorUnkMRD219func_ov075_0215b578Ev kind:function(arm,size=0x39c) addr:0x0215d55c _ZN12ActorUnkMRD219func_ov075_0215b914Ev kind:function(arm,size=0x2d4) addr:0x0215d8f8 _ZN12ActorUnkMRD219func_ov075_0215bbe8Ev kind:function(arm,size=0x8) addr:0x0215dbcc -_ZN12ActorUnkMRD219func_ov075_0215bbf0EP8ActorRefPi kind:function(arm,size=0x60) addr:0x0215dbd4 +_ZN12ActorUnkMRD219func_ov075_0215bbf0EP9RefStructPi kind:function(arm,size=0x60) addr:0x0215dbd4 _ZN12ActorUnkMRD219func_ov075_0215bc50Ev kind:function(arm,size=0xf0) addr:0x0215dc34 _ZN12ActorUnkMRD219func_ov075_0215bd40Ev kind:function(arm,size=0x10) addr:0x0215dd24 _ZN12ActorUnkMRD219func_ov075_0215bd50Ev kind:function(arm,size=0xc0) addr:0x0215dd34 diff --git a/config/jp/arm9/overlays/ov084/symbols.txt b/config/jp/arm9/overlays/ov084/symbols.txt index 0f24d046..6469d6fe 100644 --- a/config/jp/arm9/overlays/ov084/symbols.txt +++ b/config/jp/arm9/overlays/ov084/symbols.txt @@ -39,7 +39,7 @@ _ZN12ActorUnkIWTS19func_ov084_02152cecEv kind:function(arm,size=0x24) addr:0x021 _ZN12ActorUnkIWTS19func_ov084_02152d10Ev kind:function(arm,size=0x188) addr:0x02154e28 _ZN12ActorUnkIWTSD0Ev kind:function(arm,size=0x190) addr:0x02154fb0 _ZN12ActorUnkIWTS19func_ov084_02153018Ev kind:function(arm,size=0x4c) addr:0x02155140 -_ZN12ActorUnkIWTS19func_ov084_02153064EP8ActorRefPP7MtxFx43 kind:function(arm,size=0x70) addr:0x0215518c +_ZN12ActorUnkIWTS19func_ov084_02153064EP9RefStructPP7MtxFx43 kind:function(arm,size=0x70) addr:0x0215518c _ZN12ActorUnkIWTS19func_ov084_021530d4Ev kind:function(arm,size=0x88) addr:0x021551fc _ZN12ActorUnkIWTS19func_ov084_0215315cEv kind:function(arm,size=0x38) addr:0x02155284 _ZN12ActorUnkIWTS19func_ov084_02153194Ev kind:function(arm,size=0x50) addr:0x021552bc diff --git a/config/jp/arm9/overlays/ov093/symbols.txt b/config/jp/arm9/overlays/ov093/symbols.txt index dd817e19..0f57f42b 100644 --- a/config/jp/arm9/overlays/ov093/symbols.txt +++ b/config/jp/arm9/overlays/ov093/symbols.txt @@ -26,7 +26,7 @@ func_ov093_021683d8 kind:function(arm,size=0x10) addr:0x021683d8 func_ov093_021683e8 kind:function(arm,size=0x14) addr:0x021683e8 func_ov093_021683fc kind:function(arm,size=0x14) addr:0x021683fc func_ov093_02168410 kind:function(arm,size=0x10) addr:0x02168410 -_ZN18UnkStruct_027e0d8c19func_ov093_021661c0E8ActorRef kind:function(arm,size=0x20) addr:0x02168420 +_ZN18UnkStruct_027e0d8c19func_ov093_021661c0E9RefStruct kind:function(arm,size=0x20) addr:0x02168420 func_ov093_02168440 kind:function(arm,size=0x10) addr:0x02168440 func_ov093_02168450 kind:function(arm,size=0x10) addr:0x02168450 func_ov093_02168460 kind:function(arm,size=0x10) addr:0x02168460 diff --git a/config/usa/arm9/itcm/symbols.txt b/config/usa/arm9/itcm/symbols.txt index ae287c81..46a22912 100644 --- a/config/usa/arm9/itcm/symbols.txt +++ b/config/usa/arm9/itcm/symbols.txt @@ -200,7 +200,7 @@ func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc _ZN12ActorManager13func_01fff2fcEPFvP5ActorP14Actor_vfunc_30EPv kind:function(arm,size=0x54) addr:0x01fff2fc _ZN12ActorManager13func_01fff350EP29UnkStruct_ov000_020b3000_BasePP5Actor kind:function(arm,size=0x64) addr:0x01fff350 -_ZN12ActorManager13func_01fff3b4E8ActorRef kind:function(arm,size=0x8c) addr:0x01fff3b4 +_ZN12ActorManager13func_01fff3b4E9RefStruct kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 _ZN5Actor8vfunc_10EP8Cylinder kind:function(arm,size=0x34) addr:0x01fff464 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 6862f300..57713abb 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -486,7 +486,7 @@ _ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) func_ov000_0206176c kind:function(thumb,size=0xbc) addr:0x0206174c func_ov000_02061828 kind:function(thumb,size=0x28) addr:0x02061808 _ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02061830 -_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x02061848 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x1e0) addr:0x02061848 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a48EP7VecFx32P5Vec2sS3_ kind:function(arm,size=0x28) addr:0x02061a28 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02061a50 func_ov000_02061a7c kind:function(arm,size=0x10) addr:0x02061a5c @@ -1414,8 +1414,8 @@ _ZN24UnkStruct_ov000_020b28388vfunc_00Ev kind:function(arm,size=0x4) addr:0x0207 _ZN24UnkStruct_ov000_020b2838D0Ev kind:function(arm,size=0x14) addr:0x0207bfc8 _ZN29UnkStruct_ov031_Items_00_BaseD2Ev kind:function(arm,size=0x4) addr:0x0207bfdc _ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x8) addr:0x0207bfe0 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x8) addr:0x0207bfe8 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E8ActorRefi kind:function(arm,size=0x8) addr:0x0207bff0 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x8) addr:0x0207bfe8 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E9RefStructi kind:function(arm,size=0x8) addr:0x0207bff0 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207bff8 func_ov000_0207c048 kind:function(arm,size=0x30) addr:0x0207c028 func_ov000_0207c078 kind:function(arm,size=0x38) addr:0x0207c058 @@ -1458,7 +1458,7 @@ _ZN18UnkStruct_027e09c019func_ov000_0207da40Ev kind:function(arm,size=0x20c) add func_ov000_0207dc4c kind:function(arm,size=0x18) addr:0x0207dc2c func_ov000_0207dc64 kind:function(arm,size=0x24) addr:0x0207dc44 func_ov000_0207dc88 kind:function(arm,size=0x210) addr:0x0207dc68 -_ZN18UnkStruct_027e09c019func_ov000_0207de98E8ActorRefP24UnkStruct_ov000_0207de98P8Actor_38 kind:function(arm,size=0xc0) addr:0x0207de78 +_ZN18UnkStruct_027e09c019func_ov000_0207de98E9RefStructP24UnkStruct_ov000_0207de98P8Actor_38 kind:function(arm,size=0xc0) addr:0x0207de78 func_ov000_0207df58 kind:function(arm,size=0x30) addr:0x0207df38 _ZN5Actor19func_ov000_0207df88EP8Cylinderi kind:function(arm,size=0xd8) addr:0x0207df68 func_ov000_0207e060 kind:function(arm,size=0x68) addr:0x0207e040 @@ -1471,10 +1471,10 @@ _ZN18UnkStruct_027e09c019func_ov000_0207e254EP15ActorUnkSCCN_B8 kind:function(ar func_ov000_0207e268 kind:function(arm,size=0x2c) addr:0x0207e248 _ZN5Actor19func_ov000_0207e294EP8Cylinder kind:function(arm,size=0x118) addr:0x0207e274 func_ov000_0207e3ac kind:function(arm,size=0xac) addr:0x0207e38c -_ZN18UnkStruct_027e09c019func_ov000_0207e458EiiP7VecFx32iS1_8ActorRef kind:function(arm,size=0x84) addr:0x0207e438 +_ZN18UnkStruct_027e09c019func_ov000_0207e458EiiP7VecFx32iS1_9RefStruct kind:function(arm,size=0x84) addr:0x0207e438 func_ov000_0207e4dc kind:function(arm,size=0x84) addr:0x0207e4bc func_ov000_0207e560 kind:function(arm,size=0x2c) addr:0x0207e540 -_ZN18UnkStruct_027e09c019func_ov000_0207e58cE8ActorRefihP24UnkStruct_ov031_Items_01 kind:function(arm,size=0xa4) addr:0x0207e56c +_ZN18UnkStruct_027e09c019func_ov000_0207e58cE9RefStructihP24UnkStruct_ov031_Items_01 kind:function(arm,size=0xa4) addr:0x0207e56c func_ov000_0207e630 kind:function(arm,size=0x38) addr:0x0207e610 func_ov000_0207e668 kind:function(arm,size=0x50) addr:0x0207e648 func_ov000_0207e6b8 kind:function(arm,size=0x14) addr:0x0207e698 @@ -1881,7 +1881,7 @@ _ZN18UnkStruct_027e0ce019func_ov000_0208a318Eiii kind:function(arm,size=0x74) ad func_ov000_0208a38c kind:function(arm,size=0x30) addr:0x0208a36c func_ov000_0208a3bc kind:function(arm,size=0x328) addr:0x0208a39c func_ov000_0208a6e4 kind:function(arm,size=0x48) addr:0x0208a6c4 -_ZN37UnkStruct_027e0ce0_40_Base_94_50_BaseC2EiiP12ActorRefElemi kind:function(thumb,size=0xe) addr:0x0208a70c +_ZN37UnkStruct_027e0ce0_40_Base_94_50_BaseC2EiiP7RefElemi kind:function(thumb,size=0xe) addr:0x0208a70c func_ov000_0208a73c kind:function(arm,size=0x68) addr:0x0208a71c func_ov000_0208a7a4 kind:function(arm,size=0x28) addr:0x0208a784 func_ov000_0208a7cc kind:function(arm,size=0x60) addr:0x0208a7ac @@ -1943,7 +1943,7 @@ func_ov000_0208bdb4 kind:function(arm,size=0x20) addr:0x0208bd94 func_ov000_0208bdd4 kind:function(arm,size=0x10) addr:0x0208bdb4 func_ov000_0208bde4 kind:function(arm,size=0x18) addr:0x0208bdc4 func_ov000_0208bdfc kind:function(arm,size=0x10) addr:0x0208bddc -_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE8ActorRef kind:function(arm,size=0x3c) addr:0x0208bdec +_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE9RefStruct kind:function(arm,size=0x3c) addr:0x0208bdec func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be28 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208be50 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208be7c @@ -2254,7 +2254,7 @@ func_ov000_02097244 kind:function(arm,size=0x44) addr:0x02097224 func_ov000_02097288 kind:function(arm,size=0x154) addr:0x02097268 _ZN24UnkStruct_ov000_020b539c18func_ov000_02073dcEv kind:function(arm,size=0xc) addr:0x020973bc _ZN24UnkStruct_ov000_020b539c18func_ov000_02073e8Ev kind:function(arm,size=0xc) addr:0x020973c8 -_ZN5Actor19func_ov000_020973f4EP8ActorRefP24UnkStruct_ov000_020b539cjP11ActorParamsi kind:function(arm,size=0x50) addr:0x020973d4 +_ZN5Actor19func_ov000_020973f4EP9RefStructP24UnkStruct_ov000_020b539cjP11ActorParamsi kind:function(arm,size=0x50) addr:0x020973d4 _ZN24UnkStruct_ov000_020b539c19func_ov000_02097444EjP11ActorParamsi kind:function(arm,size=0x98) addr:0x02097424 _ZN24UnkStruct_ov000_020b539c16GetProfileFromIdEj kind:function(arm,size=0x4c) addr:0x020974bc func_ov000_02097528 kind:function(arm,size=0x20) addr:0x02097508 @@ -2292,7 +2292,7 @@ _ZN8Actor_9CC2Ev kind:function(arm,size=0x34) addr:0x02097b64 _ZN8Actor_9CC1Ev kind:function(arm,size=0x34) addr:0x02097b98 _ZN8Actor_9C19func_ov000_02097becEv kind:function(arm,size=0x28) addr:0x02097bcc _ZN8Actor_9C8vfunc_00Ev kind:function(arm,size=0xc) addr:0x02097bf4 -_ZN8Actor_9C8vfunc_04E8ActorRefiiPi kind:function(arm,size=0x80) addr:0x02097c00 +_ZN8Actor_9C8vfunc_04E9RefStructiiPi kind:function(arm,size=0x80) addr:0x02097c00 func_ov000_02097ca0 kind:function(arm,size=0x7c) addr:0x02097c80 _ZN19func_ov000_02097d1cD1Ev kind:function(arm,size=0x14) addr:0x02097cfc _ZN19func_ov000_02097d30D0Ev kind:function(arm,size=0x1c) addr:0x02097d10 @@ -2372,7 +2372,7 @@ _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x020997d0 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x020997e4 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099800 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x02099850 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E8ActorRefP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998d0 +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998d0 _ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x020999ec func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x020999fc _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x02099a08 @@ -2557,7 +2557,7 @@ _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) ad _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d0f4 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d10c _ZN9MapObject19func_ov000_0209d144EP5Vec2siP21UnkStruct_027e09bc_0C kind:function(arm,size=0x88) addr:0x0209d124 -_ZN9MapObject8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d1ac +_ZN9MapObject8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d1ac _ZN9MapObject8vfunc_20Ei kind:function(arm,size=0x4) addr:0x0209d1b4 _ZN9MapObject8vfunc_24EPS_7VecFx32 kind:function(arm,size=0xc) addr:0x0209d1b8 _ZN9MapObject8vfunc_28Eiii kind:function(arm,size=0x8) addr:0x0209d1c4 @@ -2570,8 +2570,8 @@ _ZN9MapObject19func_ov000_0209d2f0EiiP8Vec2bCpp kind:function(arm,size=0xc4) add _ZN9MapObject19func_ov000_0209d3b4Eii kind:function(arm,size=0x80) addr:0x0209d394 _ZN9MapObject19func_ov000_0209d434EPcP34UnkStruct_ov019_020d24c8_28_258_00i kind:function(arm,size=0xe4) addr:0x0209d414 _ZN9MapObject19func_ov000_0209d518EP7VecFx32iih kind:function(arm,size=0x34) addr:0x0209d4f8 -_ZN9MapObject19func_ov000_0209d54cEP8ActorRefPS_tPK7VecFx32st kind:function(arm,size=0x7c) addr:0x0209d52c -_ZN9MapObject19func_ov000_0209d5c8E8ActorRef kind:function(arm,size=0x4c) addr:0x0209d5a8 +_ZN9MapObject19func_ov000_0209d54cEP9RefStructPS_tPK7VecFx32st kind:function(arm,size=0x7c) addr:0x0209d52c +_ZN9MapObject19func_ov000_0209d5c8E9RefStruct kind:function(arm,size=0x4c) addr:0x0209d5a8 _ZN9MapObject19func_ov000_0209d614Ei kind:function(arm,size=0x54) addr:0x0209d5f4 _ZN9MapObject19func_ov000_0209d668Ev kind:function(arm,size=0x44) addr:0x0209d648 _ZN9MapObject19func_ov000_0209d6acEP7VecFx32 kind:function(arm,size=0x54) addr:0x0209d68c @@ -3033,7 +3033,7 @@ _ZN14Actor_Derived18vfunc_54Ei kind:function(arm,size=0x4) addr:0x020a8d80 _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 +_ZN14Actor_Derived119func_ov000_020a8df0E9RefStructi kind:function(arm,size=0x94) addr:0x020a8dd0 _ZN14Actor_Derived18vfunc_B4Ev kind:function(arm,size=0x18) addr:0x020a8e64 _ZN14Actor_Derived119func_ov000_020a8e9cEP7VecFx32 kind:function(arm,size=0x24) addr:0x020a8e7c _ZN14Actor_Derived18vfunc_B0Ev kind:function(arm,size=0x94) addr:0x020a8ea0 diff --git a/config/usa/arm9/overlays/ov017/symbols.txt b/config/usa/arm9/overlays/ov017/symbols.txt index 014eb8b4..d7692214 100644 --- a/config/usa/arm9/overlays/ov017/symbols.txt +++ b/config/usa/arm9/overlays/ov017/symbols.txt @@ -127,11 +127,11 @@ _ZN18UnkStruct_027e0cec19func_ov017_020c1e54Eii kind:function(arm,size=0x48) add _ZN18UnkStruct_027e0cec19func_ov017_020c1e9cEii kind:function(arm,size=0x124) addr:0x020c1e7c _ZN18UnkStruct_027e0cec19func_ov017_020c1fc0Eii kind:function(arm,size=0x5c) addr:0x020c1fa0 _ZN21UnkStruct_027e0cec_008vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020c1ffc -_ZN5Actor19func_ov017_020c2038EP8ActorRefiiPK7VecFx32i kind:function(arm,size=0x164) addr:0x020c2018 +_ZN5Actor19func_ov017_020c2038EP9RefStructiiPK7VecFx32i kind:function(arm,size=0x164) addr:0x020c2018 _ZN5Actor19func_ov017_020c219cEiPK7VecFx32ib kind:function(arm,size=0x174) addr:0x020c217c _ZN5Actor19func_ov017_020c2310EPK7VecFx32i kind:function(arm,size=0x94) addr:0x020c22f0 _ZN5Actor19func_ov017_020c23a4EiPK7VecFx32ib kind:function(arm,size=0x94) addr:0x020c2384 -_ZN5Actor19func_ov017_020c2438EP8ActorRefiPK7VecFx32ib kind:function(arm,size=0x2c0) addr:0x020c2418 +_ZN5Actor19func_ov017_020c2438EP9RefStructiPK7VecFx32ib kind:function(arm,size=0x2c0) addr:0x020c2418 _ZN5Actor19func_ov017_020c26f8EiPK7VecFx32ib kind:function(arm,size=0x1bc) addr:0x020c26d8 _ZN5Actor19func_ov017_020c28b4EP7VecFx3214UnkAngleStructi kind:function(arm,size=0xc8) addr:0x020c2894 _ZN21UnkStruct_027e0cec_1819func_ov017_020c297cEii kind:function(arm,size=0x15c) addr:0x020c295c diff --git a/config/usa/arm9/overlays/ov024/symbols.txt b/config/usa/arm9/overlays/ov024/symbols.txt index 807a44a6..f4265798 100644 --- a/config/usa/arm9/overlays/ov024/symbols.txt +++ b/config/usa/arm9/overlays/ov024/symbols.txt @@ -109,10 +109,10 @@ _ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c6ee8 _ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c6f14 _ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c6f28 _ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c6f48 -_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x020c6f6c +_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x1e0) addr:0x020c6f6c _ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c714c -_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x68) addr:0x020c71f4 -_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP8ActorRef kind:function(arm,size=0x84) addr:0x020c725c +_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP9RefStruct kind:function(arm,size=0x68) addr:0x020c71f4 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP9RefStruct kind:function(arm,size=0x84) addr:0x020c725c _ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c72e0 _ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c7334 _ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c7370 diff --git a/config/usa/arm9/overlays/ov026/symbols.txt b/config/usa/arm9/overlays/ov026/symbols.txt index 222fe495..03e7f56c 100644 --- a/config/usa/arm9/overlays/ov026/symbols.txt +++ b/config/usa/arm9/overlays/ov026/symbols.txt @@ -47,7 +47,7 @@ func_ov026_020d9778 kind:function(arm,size=0x10) addr:0x020d9758 func_ov026_020d9788 kind:function(arm,size=0x148) addr:0x020d9768 func_ov026_020d98d0 kind:function(arm,size=0xe8) addr:0x020d98b0 func_ov026_020d99b8 kind:function(arm,size=0x25c) addr:0x020d9998 -_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E8ActorRefP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9bf4 +_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E9RefStructP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9bf4 func_ov026_020da074 kind:function(arm,size=0x114) addr:0x020da054 func_ov026_020da188 kind:function(arm,size=0x114) addr:0x020da168 func_ov026_020da29c kind:function(arm,size=0x164) addr:0x020da27c diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt index 638d8ae5..c002d799 100644 --- a/config/usa/arm9/overlays/ov031/symbols.txt +++ b/config/usa/arm9/overlays/ov031/symbols.txt @@ -35,10 +35,10 @@ _ZN19func_ov031_020d9568D1Ev kind:function(arm,size=0x14) addr:0x020d9548 _ZN19func_ov031_020d957cD0Ev kind:function(arm,size=0x1c) addr:0x020d955c _ZN27UnkStruct_ItemManager_20_0419func_ov031_020d9598Ev kind:function(thumb,size=0x1a) addr:0x020d9578 _ZN18UnkStruct_027e0d2c19func_ov031_020d95b4Ev kind:function(arm,size=0x14) addr:0x020d9594 -_ZN18UnkStruct_027e0d2c19func_ov031_020d95c8E8ActorRef kind:function(arm,size=0x24) addr:0x020d95a8 +_ZN18UnkStruct_027e0d2c19func_ov031_020d95c8E9RefStruct kind:function(arm,size=0x24) addr:0x020d95a8 func_ov031_020d95ec kind:function(arm,size=0x30) addr:0x020d95cc func_ov031_020d961c kind:function(arm,size=0x10) addr:0x020d95fc -_ZN18UnkStruct_027e0d2c19func_ov031_020d962cEP7VecFx32iS1_P8ActorRef kind:function(arm,size=0x1c) addr:0x020d960c +_ZN18UnkStruct_027e0d2c19func_ov031_020d962cEP7VecFx32iS1_P9RefStruct kind:function(arm,size=0x1c) addr:0x020d960c func_ov031_020d9648 kind:function(arm,size=0x10) addr:0x020d9628 _ZN27UnkStruct_ItemManager_20_0819func_ov031_020d9658Ev kind:function(thumb,size=0x1a) addr:0x020d9638 func_ov031_020d9674 kind:function(arm,size=0x10) addr:0x020d9654 @@ -359,8 +359,8 @@ _ZN13ActorBomb_180C1EP5Actor kind:function(arm,size=0x3c) addr:0x020e2d58 _ZN13ActorBomb_180D1Ev kind:function(arm,size=0x1c) addr:0x020e2d94 _ZN13ActorBomb_180D0Ev kind:function(arm,size=0x24) addr:0x020e2db0 _ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x48) addr:0x020e2dd4 -_ZN13ActorBomb_1808vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x450) addr:0x020e2e1c -_ZN13ActorBomb_1808vfunc_10E8ActorRefi kind:function(arm,size=0x84) addr:0x020e326c +_ZN13ActorBomb_1808vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x450) addr:0x020e2e1c +_ZN13ActorBomb_1808vfunc_10E9RefStructi kind:function(arm,size=0x84) addr:0x020e326c _ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e32f0 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3320 _ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e335c @@ -373,7 +373,7 @@ _ZN16ActorProfileBombD1Ev kind:function(arm,size=0x14) addr:0x020e3480 _ZN17ActorProfileBlast10GetProfileEv kind:function(arm,size=0xc) addr:0x020e3494 _ZN17ActorProfileBlast6CreateEv kind:function(arm,size=0x24) addr:0x020e34a0 _ZN17ActorProfileBlastC1Ev kind:function(arm,size=0x38) addr:0x020e34c4 -_ZN13ActorBlast_E88vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1a4) addr:0x020e34fc +_ZN13ActorBlast_E88vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1a4) addr:0x020e34fc _ZN10ActorBlastC1Ev kind:function(arm,size=0x7c) addr:0x020e36a0 _ZN13ActorBlast_E8D1Ev kind:function(arm,size=0x14) addr:0x020e371c _ZN10ActorBlast4InitEi kind:function(arm,size=0x274) addr:0x020e3730 @@ -444,13 +444,13 @@ _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5454 _ZN22ActorItemBoomerang_11CD0Ev kind:function(arm,size=0x1c) addr:0x020e5468 _ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e5484 -_ZN22ActorItemBoomerang_11C8vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x230) addr:0x020e54b4 +_ZN22ActorItemBoomerang_11C8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x230) addr:0x020e54b4 _ZN26ActorItemBoomerang_Unknown19func_ov031_020e5704Ev kind:function(arm,size=0xc) addr:0x020e56e4 _ZN21ActorItemBoomerang_A0D0Ev kind:function(arm,size=0x1c) addr:0x020e56f0 _ZN21ActorItemBoomerang_CCD0Ev kind:function(arm,size=0x1c) addr:0x020e570c _ZN25ActorProfileItemBoomerangD1Ev kind:function(arm,size=0x14) addr:0x020e5728 _ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e573c -_ZN24UnkStruct_ov031_02112ff48vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x114) addr:0x020e5764 +_ZN24UnkStruct_ov031_02112ff48vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x114) addr:0x020e5764 _ZN20ActorItemTornado_17C8vfunc_00Eii kind:function(arm,size=0x30) addr:0x020e5878 _ZN23ActorProfileItemTornado10GetProfileEv kind:function(arm,size=0xc) addr:0x020e58a8 _ZN23ActorProfileItemTornado6CreateEv kind:function(arm,size=0x24) addr:0x020e58b4 @@ -482,7 +482,7 @@ func_ov031_020e67dc kind:function(arm,size=0x7c) addr:0x020e67bc func_ov031_020e6858 kind:function(arm,size=0x64) addr:0x020e6838 _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e689c _ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e68b8 -_ZN15ActorUnkSWBM_948vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e68e0 +_ZN15ActorUnkSWBM_948vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x1c) addr:0x020e68e0 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e68fc _ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6954 _ZN15ActorUnkSWBM_C88vfunc_00Eii kind:function(arm,size=0x168) addr:0x020e69ac @@ -559,7 +559,7 @@ _ZN19ActorProfileUnkROCKD1Ev kind:function(arm,size=0x14) addr:0x020e8c84 _ZN17ActorProfileRupee10GetProfileEv kind:function(arm,size=0xc) addr:0x020e8c98 _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 +_ZN10ActorRupee19func_ov031_020e8d2cEP9RefStructPK7VecFx32jjS0_ kind:function(arm,size=0x7c) addr:0x020e8d0c _ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020e8d88 _ZN10ActorRupee4InitEi kind:function(arm,size=0x1d0) addr:0x020e8dfc _ZN10ActorRupee19func_ov031_020e8fecEv kind:function(arm,size=0x7c) addr:0x020e8fcc @@ -599,7 +599,7 @@ _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9d74 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9e3c _ZN13ActorRupee_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020e9ed0 -_ZN13ActorRupee_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020e9f08 +_ZN13ActorRupee_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020e9f08 _ZN13ActorRupee_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020e9f4c _ZN13ActorRupee_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020e9f6c _ZN13ActorRupee_C48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020e9f94 @@ -731,7 +731,7 @@ _ZN17ActorUnkZLSL_169019func_ov031_020eece8Ev kind:function(arm,size=0xc) addr:0 _ZN17ActorProfileHeart10GetProfileEv kind:function(arm,size=0xc) addr:0x020eecd4 _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 +_ZN10ActorHeart19func_ov031_020eed64EP9RefStructPK7VecFx32jS0_ kind:function(arm,size=0x7c) addr:0x020eed44 _ZN10ActorHeartC1Ev kind:function(arm,size=0xf8) addr:0x020eedc0 _ZN10ActorHeart4InitEi kind:function(arm,size=0x10) addr:0x020eeeb8 _ZN10ActorHeart6UpdateEv kind:function(arm,size=0x2cc) addr:0x020eeec8 @@ -755,7 +755,7 @@ _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef _ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef5c8 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef678 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef6d8 -_ZN13ActorHeart_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020ef710 +_ZN13ActorHeart_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020ef710 _ZN13ActorHeart_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020ef754 _ZN13ActorHeart_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020ef774 _ZN13ActorHeart_C48vfunc_08Ev kind:function(arm,size=0x1c) addr:0x020ef79c @@ -924,7 +924,7 @@ _ZN18ActorShotArrow_178D1Ev kind:function(arm,size=0x1c) addr:0x020f32a4 _ZN18ActorShotArrow_178D0Ev kind:function(arm,size=0x24) addr:0x020f32c0 _ZN18ActorShotArrow_17819func_ov031_020f3304Ev kind:function(arm,size=0xc) addr:0x020f32e4 _ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0xac) addr:0x020f32f0 -_ZN18ActorShotArrow_1788vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f339c +_ZN18ActorShotArrow_1788vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x350) addr:0x020f339c _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f36ec _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f372c _ZN18ActorShotArrow_1948vfunc_10EP5Actor kind:function(arm,size=0x388) addr:0x020f3890 @@ -1004,7 +1004,7 @@ _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6220 _ZN12ActorUnkNTTZD0Ev kind:function(arm,size=0x1c) addr:0x020f6234 _ZN19ActorProfileUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6250 _ZN13Actor_C4_BaseC2EPvi kind:function(arm,size=0x60) addr:0x020f6264 -_ZN8Actor_C48vfunc_00E8ActorRefi kind:function(arm,size=0x90) addr:0x020f62c4 +_ZN8Actor_C48vfunc_00E9RefStructi kind:function(arm,size=0x90) addr:0x020f62c4 _ZN8Actor_C48vfunc_04Ev kind:function(arm,size=0x8) addr:0x020f6354 _ZN8Actor_C48vfunc_08Ev kind:function(arm,size=0x8) addr:0x020f635c _ZN8Actor_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x8) addr:0x020f6364 @@ -1025,8 +1025,8 @@ _ZN24ActorUnkTGTZ_ModelRenderD1Ev kind:function(arm,size=0x14) addr:0x020f6964 _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 +_ZN12ActorUnkTGTZ19func_ov031_020f6e5cE9RefStruct kind:function(arm,size=0x4c) addr:0x020f6e3c +_ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP9RefStructtPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6e88 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f6f00 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f7150 _ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f7288 @@ -1110,8 +1110,8 @@ _ZN19ActorProfileUnkFLEND1Ev kind:function(arm,size=0x14) addr:0x020f82ac _ZN24ActorProfileRollingStone10GetProfileEv kind:function(arm,size=0xc) addr:0x020f82c0 _ZN24ActorProfileRollingStone6CreateEv kind:function(arm,size=0x24) addr:0x020f82cc _ZN24ActorProfileRollingStoneC1Ev kind:function(arm,size=0x44) addr:0x020f82f0 -_ZN21ActorRollingStone_1048vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8334 -_ZN21ActorRollingStone_1048vfunc_10E8ActorRefi kind:function(arm,size=0xb8) addr:0x020f83c4 +_ZN21ActorRollingStone_1048vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x90) addr:0x020f8334 +_ZN21ActorRollingStone_1048vfunc_10E9RefStructi kind:function(arm,size=0xb8) addr:0x020f83c4 _ZN20ActorRollingStone_D48vfunc_10EP5Actor kind:function(arm,size=0x44) addr:0x020f847c _ZN17ActorRollingStoneC1Ev kind:function(arm,size=0x194) addr:0x020f84c0 _ZN20ActorRollingStone_D4D1Ev kind:function(arm,size=0x14) addr:0x020f8654 @@ -1167,7 +1167,7 @@ _ZN25ActorProfileRedPotionDropC1Ev kind:function(arm,size=0x40) addr:0x020f9ebc _ZN24ActorProfileTreasureDrop10GetProfileEv kind:function(arm,size=0xc) addr:0x020f9efc _ZN24ActorProfileTreasureDrop6CreateEv kind:function(arm,size=0x24) addr:0x020f9f08 _ZN24ActorProfileTreasureDropC1Ev kind:function(arm,size=0x40) addr:0x020f9f2c -_ZN13ActorItemDrop19func_ov031_020f9f8cEP8ActorRefPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020f9f6c +_ZN13ActorItemDrop19func_ov031_020f9f8cEP9RefStructPK7VecFx32jS0_ kind:function(arm,size=0x80) addr:0x020f9f6c _ZN13ActorItemDropC1Ev kind:function(arm,size=0x200) addr:0x020f9fec _ZN13ActorItemDrop4InitEi kind:function(arm,size=0x30) addr:0x020fa1ec _ZN13ActorItemDrop6UpdateEv kind:function(arm,size=0xc) addr:0x020fa21c @@ -1191,7 +1191,7 @@ _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x0 _ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa81c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fa8e0 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fa9d8 -_ZN16ActorItemDrop_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020faa10 +_ZN16ActorItemDrop_C48vfunc_00E9RefStructi kind:function(arm,size=0x44) addr:0x020faa10 _ZN16ActorItemDrop_C48vfunc_04Ev kind:function(arm,size=0x20) addr:0x020faa54 _ZN16ActorItemDrop_C48vfunc_0CEP7VecFx32 kind:function(arm,size=0x28) addr:0x020faa74 _ZN16ActorItemDrop_C48vfunc_08Ev kind:function(arm,size=0x20) addr:0x020faa9c @@ -1267,10 +1267,10 @@ _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbacc _ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbb68 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbb6c -_ZN12ActorUnkNFSP19func_ov031_020fbba0E8ActorRef kind:function(arm,size=0x40) addr:0x020fbb80 +_ZN12ActorUnkNFSP19func_ov031_020fbba0E9RefStruct kind:function(arm,size=0x40) addr:0x020fbb80 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbbc0 _ZN15ActorUnkNFSP_C0C1EP12ActorUnkNFSP kind:function(arm,size=0x38) addr:0x020fbbe4 -_ZN15ActorUnkNFSP_C08vfunc_00E8ActorRefi kind:function(arm,size=0x58) addr:0x020fbc1c +_ZN15ActorUnkNFSP_C08vfunc_00E9RefStructi kind:function(arm,size=0x58) addr:0x020fbc1c _ZN15ActorUnkNFSP_C08vfunc_04Ev kind:function(arm,size=0x2c) addr:0x020fbc74 _ZN15ActorUnkNFSP_C08vfunc_08Ev kind:function(arm,size=0x30) addr:0x020fbca0 _ZN15ActorUnkNFSP_C08vfunc_0CEP7VecFx32 kind:function(arm,size=0x38) addr:0x020fbcd0 @@ -1481,7 +1481,7 @@ _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x02101558 _ZN14MapObjectGrass19func_ov031_021016b4Ev kind:function(arm,size=0x88) addr:0x02101694 _ZN14MapObjectGrass8vfunc_3CEP7VecFx32 kind:function(arm,size=0x3c) addr:0x0210171c _ZN14MapObjectGrass19func_ov031_02101778Ev kind:function(arm,size=0x74) addr:0x02101758 -_ZN14MapObjectGrass8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0xb8) addr:0x021017cc +_ZN14MapObjectGrass8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0xb8) addr:0x021017cc _ZN14MapObjectGrass19func_ov031_021018a4Es kind:function(arm,size=0xac) addr:0x02101884 _ZN14MapObjectGrass19func_ov031_02101950Ev kind:function(arm,size=0x18) addr:0x02101930 _ZN14MapObjectGrass19func_ov031_02101968Ei kind:function(arm,size=0x10) addr:0x02101948 @@ -1502,7 +1502,7 @@ _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101dfc _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02101f68 _ZN16MapObjectUnkSWHT8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02101f74 -_ZN16MapObjectUnkSWHT8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x138) addr:0x02101f94 +_ZN16MapObjectUnkSWHT8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x138) addr:0x02101f94 _ZN16MapObjectUnkSWHT19func_ov031_021020ecEv kind:function(arm,size=0xd4) addr:0x021020cc _ZN16MapObjectUnkSWHT19func_ov031_021021c0Esi kind:function(arm,size=0x1f0) addr:0x021021a0 _ZN16MapObjectUnkSWHT19func_ov031_021023b0Ev kind:function(arm,size=0x74) addr:0x02102390 @@ -1511,7 +1511,7 @@ _ZN26MapObjectProfileBombFlower10GetProfileEv kind:function(arm,size=0xc) addr:0 _ZN26MapObjectProfileBombFlower6CreateEv kind:function(arm,size=0x24) addr:0x02102424 _ZN26MapObjectProfileBombFlowerC1Ev kind:function(arm,size=0x44) addr:0x02102448 _ZN19MapObjectBombFlowerC1Ev kind:function(arm,size=0x118) addr:0x0210248c -_ZN19MapObjectBombFlower8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x144) addr:0x021025a4 +_ZN19MapObjectBombFlower8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x144) addr:0x021025a4 _ZN19MapObjectBombFlower8vfunc_48Ev kind:function(arm,size=0x10) addr:0x021026e8 _ZN19MapObjectBombFlower8vfunc_58Ev kind:function(arm,size=0x10) addr:0x021026f8 _ZN19MapObjectBombFlower19func_ov031_02102728Ei kind:function(arm,size=0x7c) addr:0x02102708 @@ -1520,7 +1520,7 @@ _ZN19MapObjectBombFlower8SetStateEsi kind:function(arm,size=0x15c) addr:0x021028 _ZN19MapObjectBombFlower8vfunc_14Ei kind:function(arm,size=0x50) addr:0x021029d0 _ZN19MapObjectBombFlower8vfunc_38Ev kind:function(arm,size=0x98) addr:0x02102a20 _ZN19MapObjectBombFlower8vfunc_28Eiii kind:function(arm,size=0x1c) addr:0x02102ab8 -_ZN19MapObjectBombFlower8vfunc_50EP8ActorRefP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102ad4 +_ZN19MapObjectBombFlower8vfunc_50EP9RefStructP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102ad4 _ZN19MapObjectBombFlowerD1Ev kind:function(arm,size=0x20) addr:0x02102b44 _ZN19MapObjectBombFlowerD0Ev kind:function(arm,size=0x28) addr:0x02102b64 _ZN26MapObjectProfileBombFlowerD1Ev kind:function(arm,size=0x14) addr:0x02102b8c @@ -1626,7 +1626,7 @@ _ZN19MapObjectProfilePot6CreateEv kind:function(arm,size=0x24) addr:0x02104f1c _ZN19MapObjectProfilePotC1Ev kind:function(arm,size=0x8c) addr:0x02104f40 _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02104fcc _ZN12MapObjectPot5SetupEv kind:function(arm,size=0x2c) addr:0x02105068 -_ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x02105094 +_ZN12MapObjectPot8vfunc_1CE9RefStructiP7VecFx32 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 _ZN12MapObjectPot8vfunc_54Ev kind:function(arm,size=0x38) addr:0x021052f0 @@ -1673,7 +1673,7 @@ _ZN16MapObjectUnkSKDI8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021063bc _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr:0x0210641c _ZN16MapObjectUnkSKDI19func_ov031_02106678Esi kind:function(arm,size=0x3f8) addr:0x02106658 _ZN16MapObjectUnkSKDI19func_ov031_02106a70Ev kind:function(arm,size=0x14) addr:0x02106a50 -_ZN16MapObjectUnkSKDI8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106a64 +_ZN16MapObjectUnkSKDI8vfunc_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106a64 _ZN16MapObjectUnkSKDI8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02106c58 _ZN16MapObjectUnkSKDI8vfunc_38Ev kind:function(arm,size=0x8) addr:0x02106c78 _ZN16MapObjectUnkSKDI8vfunc_3CEv kind:function(arm,size=0x8) addr:0x02106c80 diff --git a/config/usa/arm9/overlays/ov032/symbols.txt b/config/usa/arm9/overlays/ov032/symbols.txt index 4acb2d74..d97cb42a 100644 --- a/config/usa/arm9/overlays/ov032/symbols.txt +++ b/config/usa/arm9/overlays/ov032/symbols.txt @@ -123,7 +123,7 @@ _ZN14ActorKeese_2ACC1EP10ActorKeese kind:function(arm,size=0x38) addr:0x0211de14 _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_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x144) addr:0x0211deb0 +_ZN14ActorKeese_2AC8vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0x144) addr:0x0211deb0 _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 @@ -206,7 +206,7 @@ _ZN16MapObjectUnkSWSWC1Ev kind:function(arm,size=0xc4) addr:0x021210e4 _ZN19MapObjectUnkSWSW_40D1Ev kind:function(arm,size=0x14) addr:0x021211a8 _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_1CE9RefStructiP7VecFx32 kind:function(arm,size=0x278) addr:0x021218b0 _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121b28 _ZN16MapObjectUnkSWSW19func_ov032_02121b90Ev kind:function(arm,size=0x88) addr:0x02121b70 _ZN16MapObjectUnkSWSW8vfunc_3CEi kind:function(arm,size=0x158) addr:0x02121bf8 diff --git a/config/usa/arm9/overlays/ov063/symbols.txt b/config/usa/arm9/overlays/ov063/symbols.txt index 2786b8f6..0f3e03c2 100644 --- a/config/usa/arm9/overlays/ov063/symbols.txt +++ b/config/usa/arm9/overlays/ov063/symbols.txt @@ -3,7 +3,7 @@ _ZN19ActorProfileUnkCANS6CreateEv kind:function(arm,size=0x24) addr:0x02157e8c _ZN19ActorProfileUnkCANSC1Ev kind:function(arm,size=0x50) addr:0x02157eb0 _ZN24UnkStruct_ov063_02162ee8C1EP10G3d_Model_ kind:function(arm,size=0x5c) addr:0x02157f00 _ZN24UnkStruct_ov063_02162e88C1EPv kind:function(arm,size=0x28) addr:0x02157f5c -_ZN24UnkStruct_ov063_02162e888vfunc_04E8ActorRefiiPi kind:function(arm,size=0x178) addr:0x02157f84 +_ZN24UnkStruct_ov063_02162e888vfunc_04E9RefStructiiPi kind:function(arm,size=0x178) addr:0x02157f84 _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 @@ -54,7 +54,7 @@ _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a7b4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a7e4 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a7f8 _ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x4c) addr:0x0215a814 -_ZN24UnkStruct_ov063_02162ea88vfunc_0CE9MapObjRefP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0xcc) addr:0x0215a860 +_ZN24UnkStruct_ov063_02162ea88vfunc_0CE9RefStructP24UnkStruct_ov031_020e54d4PK7VecFx32S5_ kind:function(arm,size=0xcc) addr:0x0215a860 _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215a92c _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215a950 _ZN24UnkStruct_ov063_02162ee8D0Ev kind:function(arm,size=0x1c) addr:0x0215a97c @@ -67,12 +67,12 @@ _ZN19ActorProfileUnkCASE6CreateEv kind:function(arm,size=0x24) addr:0x0215aae4 _ZN19ActorProfileUnkCASEC1Ev kind:function(arm,size=0x48) addr:0x0215ab08 _ZN24UnkStruct_ov063_021631a0C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0215ab50 _ZN16ActorUnkCASE_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215ab84 -_ZN16ActorUnkCASE_1508vfunc_00E8ActorRefi kind:function(arm,size=0x74) addr:0x0215abb8 +_ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215abb8 _ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ac2c _ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ac48 _ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ac6c _ZN16ActorUnkCASE_1748vfunc_10EP5Actor kind:function(arm,size=0x24) addr:0x0215aca8 -_ZN12ActorUnkCASE19func_ov063_0215acecEP8ActorRefS0_ kind:function(arm,size=0x5c) addr:0x0215accc +_ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215accc _ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ad28 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215ae4c _ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215ae60 @@ -96,7 +96,7 @@ _ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6a8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b704 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7ac -_ZN12ActorUnkCASE19func_ov063_0215b814E8ActorRef kind:function(arm,size=0x40) addr:0x0215b7f4 +_ZN12ActorUnkCASE19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b7f4 _ZN12ActorUnkCASE19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b834 _ZN12ActorUnkCASE19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215b8c8 _ZN12ActorUnkCASE19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215b97c diff --git a/config/usa/arm9/overlays/ov070/symbols.txt b/config/usa/arm9/overlays/ov070/symbols.txt index f8d5f8fd..08ce3d8c 100644 --- a/config/usa/arm9/overlays/ov070/symbols.txt +++ b/config/usa/arm9/overlays/ov070/symbols.txt @@ -98,7 +98,7 @@ func_ov070_02141264 kind:function(arm,size=0x150) addr:0x02141244 _ZN19ActorProfileUnkKEYN10GetProfileEv kind:function(arm,size=0xc) addr:0x02141394 _ZN19ActorProfileUnkKEYN6CreateEv kind:function(arm,size=0x24) addr:0x021413a0 _ZN19ActorProfileUnkKEYNC1Ev kind:function(arm,size=0x58) addr:0x021413c4 -_ZN12ActorUnkKEYN19func_ov070_0214143cEP8ActorRefP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x0214141c +_ZN12ActorUnkKEYN19func_ov070_0214143cEP9RefStructP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x0214141c _ZN12ActorUnkKEYNC1Ev kind:function(arm,size=0x130) addr:0x021414c8 _ZN12ActorUnkKEYN19func_ov070_02141618Ev kind:function(arm,size=0x14) addr:0x021415f8 _ZN12ActorUnkKEYN19func_ov070_0214162cEv kind:function(arm,size=0x124) addr:0x0214160c diff --git a/config/usa/arm9/overlays/ov071/symbols.txt b/config/usa/arm9/overlays/ov071/symbols.txt index 8e1cf8d3..016d15b8 100644 --- a/config/usa/arm9/overlays/ov071/symbols.txt +++ b/config/usa/arm9/overlays/ov071/symbols.txt @@ -319,7 +319,7 @@ _ZN14ActorTearLight19func_ov071_0215ff3cEv kind:function(arm,size=0x7c) addr:0x0 _ZN14ActorTearLight19func_ov071_0215ffb8Ev kind:function(arm,size=0x4) addr:0x0215ff98 _ZN14ActorTearLight19func_ov071_0215ffbcEv kind:function(arm,size=0x44) addr:0x0215ff9c _ZN18ActorTearLight_194C2EP14ActorTearLight kind:function(arm,size=0x38) addr:0x0215ffe0 -_ZN18ActorTearLight_1948vfunc_00E8ActorRefi kind:function(arm,size=0x40) addr:0x02160018 +_ZN18ActorTearLight_1948vfunc_00E9RefStructi kind:function(arm,size=0x40) addr:0x02160018 _ZN18ActorTearLight_1948vfunc_04Ev kind:function(arm,size=0x1c) addr:0x02160058 _ZN18ActorTearLight_1948vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x02160074 _ZN18ActorTearLight_1948vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02160098 diff --git a/config/usa/arm9/overlays/ov075/symbols.txt b/config/usa/arm9/overlays/ov075/symbols.txt index 2e0aae2b..acb45107 100644 --- a/config/usa/arm9/overlays/ov075/symbols.txt +++ b/config/usa/arm9/overlays/ov075/symbols.txt @@ -160,7 +160,7 @@ _ZN12ActorUnkMRD219func_ov075_0215b4dcEv kind:function(arm,size=0x9c) addr:0x021 _ZN12ActorUnkMRD219func_ov075_0215b578Ev kind:function(arm,size=0x39c) addr:0x0215b558 _ZN12ActorUnkMRD219func_ov075_0215b914Ev kind:function(arm,size=0x2d4) addr:0x0215b8f4 _ZN12ActorUnkMRD219func_ov075_0215bbe8Ev kind:function(arm,size=0x8) addr:0x0215bbc8 -_ZN12ActorUnkMRD219func_ov075_0215bbf0EP8ActorRefPi kind:function(arm,size=0x60) addr:0x0215bbd0 +_ZN12ActorUnkMRD219func_ov075_0215bbf0EP9RefStructPi kind:function(arm,size=0x60) addr:0x0215bbd0 _ZN12ActorUnkMRD219func_ov075_0215bc50Ev kind:function(arm,size=0xf0) addr:0x0215bc30 _ZN12ActorUnkMRD219func_ov075_0215bd40Ev kind:function(arm,size=0x10) addr:0x0215bd20 _ZN12ActorUnkMRD219func_ov075_0215bd50Ev kind:function(arm,size=0xc0) addr:0x0215bd30 diff --git a/config/usa/arm9/overlays/ov084/symbols.txt b/config/usa/arm9/overlays/ov084/symbols.txt index 6b8ecf19..02a2f584 100644 --- a/config/usa/arm9/overlays/ov084/symbols.txt +++ b/config/usa/arm9/overlays/ov084/symbols.txt @@ -38,7 +38,7 @@ _ZN12ActorUnkIWTS19func_ov084_02152cecEv kind:function(arm,size=0x24) addr:0x021 _ZN12ActorUnkIWTS19func_ov084_02152d10Ev kind:function(arm,size=0x180) addr:0x02152cf0 _ZN12ActorUnkIWTSD0Ev kind:function(arm,size=0x188) addr:0x02152e70 _ZN12ActorUnkIWTS19func_ov084_02153018Ev kind:function(arm,size=0x4c) addr:0x02152ff8 -_ZN12ActorUnkIWTS19func_ov084_02153064EP8ActorRefPP7MtxFx43 kind:function(arm,size=0x70) addr:0x02153044 +_ZN12ActorUnkIWTS19func_ov084_02153064EP9RefStructPP7MtxFx43 kind:function(arm,size=0x70) addr:0x02153044 _ZN12ActorUnkIWTS19func_ov084_021530d4Ev kind:function(arm,size=0x88) addr:0x021530b4 _ZN12ActorUnkIWTS19func_ov084_0215315cEv kind:function(arm,size=0x38) addr:0x0215313c _ZN12ActorUnkIWTS19func_ov084_02153194Ev kind:function(arm,size=0x50) addr:0x02153174 diff --git a/config/usa/arm9/overlays/ov093/symbols.txt b/config/usa/arm9/overlays/ov093/symbols.txt index 168c2a38..9c541bd9 100644 --- a/config/usa/arm9/overlays/ov093/symbols.txt +++ b/config/usa/arm9/overlays/ov093/symbols.txt @@ -11,7 +11,7 @@ func_ov093_02166048 kind:function(arm,size=0x10) addr:0x02166028 _ZN18UnkStruct_027e0d8c19func_ov093_02166058Ev kind:function(arm,size=0x10) addr:0x02166038 _ZN18UnkStruct_027e0d8c19func_ov093_02166068Ev kind:function(arm,size=0x10) addr:0x02166048 func_ov093_02166078 kind:function(arm,size=0x30) addr:0x02166058 -_ZN18UnkStruct_027e0d8c19func_ov093_021660a8E8ActorRef kind:function(arm,size=0x20) addr:0x02166088 +_ZN18UnkStruct_027e0d8c19func_ov093_021660a8E9RefStruct kind:function(arm,size=0x20) addr:0x02166088 func_ov093_021660c8 kind:function(arm,size=0x10) addr:0x021660a8 func_ov093_021660d8 kind:function(arm,size=0x10) addr:0x021660b8 func_ov093_021660e8 kind:function(arm,size=0x10) addr:0x021660c8 @@ -26,7 +26,7 @@ func_ov093_02166178 kind:function(arm,size=0x10) addr:0x02166158 func_ov093_02166188 kind:function(arm,size=0x14) addr:0x02166168 func_ov093_0216619c kind:function(arm,size=0x14) addr:0x0216617c func_ov093_021661b0 kind:function(arm,size=0x10) addr:0x02166190 -_ZN18UnkStruct_027e0d8c19func_ov093_021661c0E8ActorRef kind:function(arm,size=0x20) addr:0x021661a0 +_ZN18UnkStruct_027e0d8c19func_ov093_021661c0E9RefStruct kind:function(arm,size=0x20) addr:0x021661a0 func_ov093_021661e0 kind:function(arm,size=0x10) addr:0x021661c0 func_ov093_021661f0 kind:function(arm,size=0x10) addr:0x021661d0 func_ov093_02166200 kind:function(arm,size=0x10) addr:0x021661e0 diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index aabf5bf3..d5afa5b4 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -2,9 +2,9 @@ #include "Actor/ActorId.hpp" #include "Actor/ActorProfile.hpp" -#include "Actor/ActorRef.hpp" #include "Physics/AABB.hpp" #include "Physics/Cylinder.hpp" +#include "RefStruct.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_ov031_Items.hpp" #include "flags.h" @@ -39,7 +39,7 @@ public: unk8 mUnk_26_0; unk8 mUnk_26_1; }; - /* 28 */ ActorRef mUnk_28; + /* 28 */ RefStruct mUnk_28; /* 2C */ u32 mUnk_2C; /* 30 */ @@ -101,14 +101,14 @@ public: /* 00 (vtable) */ /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0C */ ActorRef mUnk_0C; + /* 0C */ RefStruct mUnk_0C; /* 10 */ VecFx32 mUnk_10; /* 1C */ u16 mUnk_1C; /* 1E */ u16 mUnk_1E; /* 20 */ /* 00 */ virtual void vfunc_00(); // corresponds to func_ov000_02097c14 - /* 04 */ virtual unk32 vfunc_04(ActorRef param1, unk32 param2, unk32 param3, + /* 04 */ virtual unk32 vfunc_04(RefStruct param1, unk32 param2, unk32 param3, unk32 *param4) override; // corresponds to func_ov000_02097c20 /* 08 */ @@ -161,7 +161,7 @@ public: this->mUnk_08.Init(); } - void func_ov000_020998f0(ActorRef ref, VecFx32 *pPos); + void func_ov000_020998f0(RefStruct ref, VecFx32 *pPos); void func_ov000_02099a0c(); }; @@ -192,7 +192,7 @@ public: /* 54 */ UnkStruct_ActorUnkCANS_224 *mUnk_54; /* 58 */ ActorFlags mFlags[1]; /* 5C */ ActorParams mUnk_5C; - /* 8C */ ActorRef mRef; + /* 8C */ RefStruct mRef; /* 90 */ ActorProfile *mpProfile; /* 94 */ @@ -302,8 +302,8 @@ public: void func_ov000_0209a008(unk32 param1, fx16 param2); u32 func_ov000_02098ab4(u8 param1, unk32 param2, unk32 param3, VecFx32 *param4); - static void func_ov000_020973f4(ActorRef *pOutRef, UnkStruct_ov000_020b539c *param2, ActorId actorId, ActorParams *pParams, - int param5); + static void func_ov000_020973f4(RefStruct *pOutRef, UnkStruct_ov000_020b539c *param2, ActorId actorId, + ActorParams *pParams, int param5); // overlay 17 bool func_ov017_020beeec(unk32 param1); @@ -331,11 +331,11 @@ public: bool func_ov017_020bfd9c(Vec2s *param1, unk32 param2, UnkStruct_027e09bc_0C *param3, AABB *param4); //! TODO: param4's type not confirmed but probably correct - static void func_ov017_020c2038(ActorRef *pRef, unk32 param2, unk32 param3, const VecFx32 *param4, unk32 param5); + static void func_ov017_020c2038(RefStruct *pRef, unk32 param2, unk32 param3, const VecFx32 *param4, unk32 param5); static bool func_ov017_020c219c(unk32 param1, const VecFx32 *param2, unk32 param3, bool param4); static bool func_ov017_020c2310(const VecFx32 *param1, unk32 param2); static bool func_ov017_020c23a4(unk32 param1, const VecFx32 *param2, unk32 param3, bool param4); - static void func_ov017_020c2438(ActorRef *pRef, unk32 param2, const VecFx32 *param3, unk32 param4, bool param5); + static void func_ov017_020c2438(RefStruct *pRef, unk32 param2, const VecFx32 *param3, unk32 param4, bool param5); static void func_ov017_020c26f8(unk32 param1, const VecFx32 *param2, unk32 param3, bool param4); static void func_ov017_020c28b4(VecFx32 *param1, UnkAngleStruct param2, unk32 param3); @@ -365,7 +365,7 @@ public: /* 20 */ Actor *mUnk_20; /* 24 */ - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2); + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2); /* 04 */ virtual bool vfunc_04(); /* 08 */ virtual void vfunc_08(); /* 0C */ virtual void vfunc_0C(VecFx32 *param1); diff --git a/include/Actor/ActorBlast.hpp b/include/Actor/ActorBlast.hpp index 284214f1..0b995914 100644 --- a/include/Actor/ActorBlast.hpp +++ b/include/Actor/ActorBlast.hpp @@ -2,7 +2,7 @@ #include "Actor/Actor.hpp" #include "Actor/ActorProfile.hpp" -#include "MapObject/MapObjectRef.hpp" +#include "RefStruct.hpp" #include "global.h" #include "types.h" @@ -18,7 +18,7 @@ public: mUnk_04(param1) {} // data_ov031_02112d4c - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; }; diff --git a/include/Actor/ActorBomb.hpp b/include/Actor/ActorBomb.hpp index b3549a8f..76b9a714 100644 --- a/include/Actor/ActorBomb.hpp +++ b/include/Actor/ActorBomb.hpp @@ -3,7 +3,7 @@ #include "Actor/Actor.hpp" #include "Actor/ActorProfile.hpp" #include "Actor_Derived1.hpp" -#include "MapObject/MapObjectRef.hpp" +#include "RefStruct.hpp" #include "global.h" #include "nns/g3d/sbc.h" #include "types.h" @@ -47,7 +47,7 @@ public: /* 04 */ u16 mUnk_04; /* 08 */ Actor *mUnk_08; /* 0C */ VecFx32 mUnk_0C; // cylinder ? - /* 18 */ unk32 mUnk_18; + /* 18 */ RefStruct mUnk_18; /* 1C */ ActorBomb_180(Actor *param1); @@ -55,9 +55,9 @@ public: // data_ov031_02112c78 /* 00 */ virtual ~ActorBomb_180() override; /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; - /* 10 */ virtual bool vfunc_10(ActorRef param1, unk32 param2) override; + /* 10 */ virtual bool vfunc_10(RefStruct param1, unk32 param2) override; }; class ActorBomb_ov031_020e2134 : public UnkStruct_ov031_Items_00 { @@ -88,8 +88,8 @@ public: /* 1CC */ VecFx32 mUnk_1CC; /* 1D8 */ unk32 mUnk_1D8; /* 1D8 */ unk32 mUnk_1DC; - /* 1E0 */ ActorRef mUnk_1E0; - /* 1E4 */ ActorRef mUnk_1E4; + /* 1E0 */ RefStruct mUnk_1E0; + /* 1E4 */ RefStruct mUnk_1E4; /* 1E8 */ u8 mUnk_1E8; /* 1E8 */ u8 mUnk_1E9; /* 1EA */ Timer mUnk_1EA; diff --git a/include/Actor/ActorHeart.hpp b/include/Actor/ActorHeart.hpp index cd16232a..fe88f1ce 100644 --- a/include/Actor/ActorHeart.hpp +++ b/include/Actor/ActorHeart.hpp @@ -20,7 +20,7 @@ class ActorHeart_C4 : public Actor_C4 { public: ActorHeart_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(VecFx32 *param1) override; @@ -37,8 +37,8 @@ public: /* BC */ unk16 mUnk_BC; /* BE */ bool mUnk_BE; /* BF */ PAD(0xBF, 0xC0); - /* C0 */ ActorRef mUnk_C0; - /* C4 */ ActorRef mUnk_C4; + /* C0 */ RefStruct mUnk_C0; + /* C4 */ RefStruct mUnk_C4; /* C8 */ ActorHeart_C4 mUnk_C8; /* EC */ VecFx32 mUnk_EC; @@ -57,7 +57,7 @@ public: void func_ov031_020ef570(); void func_ov031_020ef698(); - static void func_ov031_020eed64(ActorRef *pOutRef, const VecFx32 *pPos, u32 params, ActorRef ref); + static void func_ov031_020eed64(RefStruct *pOutRef, const VecFx32 *pPos, u32 params, RefStruct ref); // data_ov031_02113d74 void func_ov031_020ef2f8(); diff --git a/include/Actor/ActorItemBoomerang.hpp b/include/Actor/ActorItemBoomerang.hpp index 73cb2305..0aec2b16 100644 --- a/include/Actor/ActorItemBoomerang.hpp +++ b/include/Actor/ActorItemBoomerang.hpp @@ -2,7 +2,7 @@ #include "Actor/Actor.hpp" #include "Actor/ActorProfile.hpp" -#include "MapObject/MapObjectRef.hpp" +#include "RefStruct.hpp" #include "Render/ModelRender.hpp" #include "Unknown/UnkStruct_ov031_Items.hpp" #include "global.h" @@ -37,7 +37,7 @@ public: /* 00 */ virtual ~ActorItemBoomerang_11C() override; /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; }; @@ -52,7 +52,7 @@ public: class ActorItemBoomerang_CC : public UnkStruct_ov031_Items_01 { public: /* 00 (vtable) */ - /* 2C */ ActorRef mUnk_2C; + /* 2C */ RefStruct mUnk_2C; /* 30 */ ActorItemBoomerang_Unknown mUnk_30; /* 40 */ diff --git a/include/Actor/ActorItemDrop.hpp b/include/Actor/ActorItemDrop.hpp index 7b4892c6..54e52bcf 100644 --- a/include/Actor/ActorItemDrop.hpp +++ b/include/Actor/ActorItemDrop.hpp @@ -37,7 +37,7 @@ public: // func_ov031_020fa9f8 ActorItemDrop_C4(Actor *param1); - virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + virtual bool vfunc_00(RefStruct ref, unk32 param2) override; virtual bool vfunc_04() override; virtual void vfunc_08() override; virtual void vfunc_0C(VecFx32 *param1) override; @@ -51,8 +51,8 @@ public: /* 0B4 */ Actor_9C mUnk_B4; /* 0D4 */ ItemDropType mItemTypeId; /* 0D8 */ fx32 mUnk_D8; - /* 0DC */ ActorRef mUnk_DC; - /* 0E0 */ ActorRef mUnk_E0; + /* 0DC */ RefStruct mUnk_DC; + /* 0E0 */ RefStruct mUnk_E0; /* 0E4 */ ActorItemDrop_C4 mUnk_E4; /* 108 */ unk16 mUnk_108; /* 10A */ PAD(0x10A, 0x10C); @@ -71,7 +71,7 @@ public: void SetState(ActorState state); void func_ov031_020fa900(); - static void func_ov031_020f9f8c(ActorRef *pOutRef, const VecFx32 *pPos, u32 params, ActorRef ref); + static void func_ov031_020f9f8c(RefStruct *pOutRef, const VecFx32 *pPos, u32 params, RefStruct ref); // data_ov031_02114bb0 void func_ov031_020fa46c(); diff --git a/include/Actor/ActorItemTornado.hpp b/include/Actor/ActorItemTornado.hpp index 355f4628..6de29434 100644 --- a/include/Actor/ActorItemTornado.hpp +++ b/include/Actor/ActorItemTornado.hpp @@ -18,7 +18,7 @@ public: // data_ov031_02112ff4 /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2); - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; }; diff --git a/include/Actor/ActorKeese.hpp b/include/Actor/ActorKeese.hpp index fd31ca8f..143840f2 100644 --- a/include/Actor/ActorKeese.hpp +++ b/include/Actor/ActorKeese.hpp @@ -4,6 +4,7 @@ #include "Actor/ActorProfile.hpp" #include "ActorSpinut.hpp" #include "Map/MapObjectId.hpp" +#include "Unknown/UnkStruct_ov000_020b34c4.hpp" #include "global.h" #include "types.h" @@ -49,7 +50,7 @@ public: // data_ov032_02122528 /* 00 */ virtual ~ActorKeese_2AC() override; /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; }; @@ -101,7 +102,7 @@ public: /* 2AC */ ActorKeese_2AC mUnk_2AC; /* 2C4 */ VecFx32Cpp mUnk_2C4; /* 2D0 */ Actor_38 *mUnk_2D0; - /* 2D4 */ ActorRef mUnk_2D4; + /* 2D4 */ RefStruct mUnk_2D4; /* 2D8 */ ActorKeese(); diff --git a/include/Actor/ActorManager.hpp b/include/Actor/ActorManager.hpp index 5e741481..a44740da 100644 --- a/include/Actor/ActorManager.hpp +++ b/include/Actor/ActorManager.hpp @@ -1,7 +1,7 @@ #pragma once -#include "Actor/ActorRef.hpp" #include "Actor/Actor_Derived1.hpp" +#include "RefStruct.hpp" #include "System/SysNew.hpp" #include "Unknown/Common.hpp" #include "Unknown/UnkStruct_ov000_020b3000.hpp" @@ -45,7 +45,7 @@ public: // itcm void func_01fff2fc(UnkCallback1 callback, void *param2); Actor **func_01fff350(UnkStruct_ov000_020b3000_Base *param1, Actor **ppActorTable); - Actor *func_01fff3b4(ActorRef ref); + Actor *func_01fff3b4(RefStruct ref); // overlay 0 void func_ov000_02096e44(int index); diff --git a/include/Actor/ActorRollingStone.hpp b/include/Actor/ActorRollingStone.hpp index 60372aab..66625e4a 100644 --- a/include/Actor/ActorRollingStone.hpp +++ b/include/Actor/ActorRollingStone.hpp @@ -33,9 +33,9 @@ public: /* 04 */ // data_ov031_02114a5c - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; - /* 10 */ virtual bool vfunc_10(ActorRef param1, unk32 param2) override; // func_ov031_020f83e4 + /* 10 */ virtual bool vfunc_10(RefStruct param1, unk32 param2) override; // func_ov031_020f83e4 /* 14 */ }; diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index 13fa8c87..419a01ba 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -41,7 +41,7 @@ class ActorRupee_C4 : public Actor_C4 { public: ActorRupee_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(VecFx32 *param1) override; @@ -55,8 +55,8 @@ public: /* 98 */ u16 mUnk_98; /* 9A */ u16 mUnk_9A; /* 9C */ Actor_9C mUnk_9C; - /* BC */ ActorRef mUnk_BC; - /* C0 */ ActorRef mUnk_C0; + /* BC */ RefStruct mUnk_BC; + /* C0 */ RefStruct mUnk_C0; /* C4 */ ActorRupee_C4 mUnk_C4; /* E8 */ unk32 mUnk_E8; /* EC */ s16 mUnk_EC; @@ -109,7 +109,7 @@ public: void func_ov031_020e9d94(); bool func_ov031_020e9e5c(); - static void func_ov031_020e8d2c(ActorRef *pOutRef, const VecFx32 *pPos, u32 params, u32 unk_2C, ActorRef ref); + static void func_ov031_020e8d2c(RefStruct *pOutRef, const VecFx32 *pPos, u32 params, u32 unk_2C, RefStruct ref); }; class ActorProfileRupee : public ActorProfile { diff --git a/include/Actor/ActorShotArrow.hpp b/include/Actor/ActorShotArrow.hpp index 33f932a1..00120abb 100644 --- a/include/Actor/ActorShotArrow.hpp +++ b/include/Actor/ActorShotArrow.hpp @@ -50,7 +50,7 @@ public: // data_ov031_02114288 /* 00 */ virtual ~ActorShotArrow_178() override; /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; void func_ov031_020f3304(); diff --git a/include/Actor/ActorTearLight.hpp b/include/Actor/ActorTearLight.hpp index 328077f0..fd791f93 100644 --- a/include/Actor/ActorTearLight.hpp +++ b/include/Actor/ActorTearLight.hpp @@ -37,7 +37,7 @@ public: ActorTearLight_194(ActorTearLight *param1); // data_ov071_02164c00 - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(VecFx32 *param1) override; @@ -98,7 +98,7 @@ public: /* 188 */ unk32 mUnk_188; /* 18C */ bool mUnk_18C; /* 18D */ bool mUnk_18D; - /* 190 */ ActorRef mUnk_190; + /* 190 */ RefStruct mUnk_190; /* 194 */ ActorTearLight_194 mUnk_194; /* 1B8 */ u8 mUnk_1B8; /* 1B9 */ unk8 mUnk_1B9; diff --git a/include/Actor/ActorUnkAJAI.hpp b/include/Actor/ActorUnkAJAI.hpp index c32e506a..2d2ab0bc 100644 --- a/include/Actor/ActorUnkAJAI.hpp +++ b/include/Actor/ActorUnkAJAI.hpp @@ -11,7 +11,7 @@ class ActorUnkAJAI_C4 : public Actor_C4 { public: ActorUnkAJAI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkAJBS.hpp b/include/Actor/ActorUnkAJBS.hpp index ea640c31..a5701e2e 100644 --- a/include/Actor/ActorUnkAJBS.hpp +++ b/include/Actor/ActorUnkAJBS.hpp @@ -11,7 +11,7 @@ class ActorUnkAJBS_C4 : public Actor_C4 { public: ActorUnkAJBS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkAJCR.hpp b/include/Actor/ActorUnkAJCR.hpp index e7e8d937..6788bc77 100644 --- a/include/Actor/ActorUnkAJCR.hpp +++ b/include/Actor/ActorUnkAJCR.hpp @@ -11,7 +11,7 @@ class ActorUnkAJCR_C4 : public Actor_C4 { public: ActorUnkAJCR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkAJEM.hpp b/include/Actor/ActorUnkAJEM.hpp index 746ea181..a37d92ba 100644 --- a/include/Actor/ActorUnkAJEM.hpp +++ b/include/Actor/ActorUnkAJEM.hpp @@ -11,7 +11,7 @@ class ActorUnkAJEM_C4 : public Actor_C4 { public: ActorUnkAJEM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkAJET.hpp b/include/Actor/ActorUnkAJET.hpp index afb1d8d5..38ff80d9 100644 --- a/include/Actor/ActorUnkAJET.hpp +++ b/include/Actor/ActorUnkAJET.hpp @@ -11,7 +11,7 @@ class ActorUnkAJET_C4 : public Actor_C4 { public: ActorUnkAJET_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkAJMN.hpp b/include/Actor/ActorUnkAJMN.hpp index 77b7a236..45ffe7f9 100644 --- a/include/Actor/ActorUnkAJMN.hpp +++ b/include/Actor/ActorUnkAJMN.hpp @@ -11,7 +11,7 @@ class ActorUnkAJMN_C4 : public Actor_C4 { public: ActorUnkAJMN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkAJNP.hpp b/include/Actor/ActorUnkAJNP.hpp index b81089d1..8202edcf 100644 --- a/include/Actor/ActorUnkAJNP.hpp +++ b/include/Actor/ActorUnkAJNP.hpp @@ -11,7 +11,7 @@ class ActorUnkAJNP_C4 : public Actor_C4 { public: ActorUnkAJNP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkAJSP.hpp b/include/Actor/ActorUnkAJSP.hpp index 242481f2..dadac459 100644 --- a/include/Actor/ActorUnkAJSP.hpp +++ b/include/Actor/ActorUnkAJSP.hpp @@ -11,7 +11,7 @@ class ActorUnkAJSP_C4 : public Actor_C4 { public: ActorUnkAJSP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkAJTM.hpp b/include/Actor/ActorUnkAJTM.hpp index c0306862..67207a71 100644 --- a/include/Actor/ActorUnkAJTM.hpp +++ b/include/Actor/ActorUnkAJTM.hpp @@ -11,7 +11,7 @@ class ActorUnkAJTM_C4 : public Actor_C4 { public: ActorUnkAJTM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkALEV.hpp b/include/Actor/ActorUnkALEV.hpp index 11665559..cc276642 100644 --- a/include/Actor/ActorUnkALEV.hpp +++ b/include/Actor/ActorUnkALEV.hpp @@ -11,7 +11,7 @@ class ActorUnkALEV_C4 : public Actor_C4 { public: ActorUnkALEV_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkASBA.hpp b/include/Actor/ActorUnkASBA.hpp index 81b1d81d..44509d41 100644 --- a/include/Actor/ActorUnkASBA.hpp +++ b/include/Actor/ActorUnkASBA.hpp @@ -11,7 +11,7 @@ class ActorUnkASBA_C4 : public Actor_C4 { public: ActorUnkASBA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkASYU.hpp b/include/Actor/ActorUnkASYU.hpp index b064ba97..786fc6fd 100644 --- a/include/Actor/ActorUnkASYU.hpp +++ b/include/Actor/ActorUnkASYU.hpp @@ -11,7 +11,7 @@ class ActorUnkASYU_C4 : public Actor_C4 { public: ActorUnkASYU_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBAEY.hpp b/include/Actor/ActorUnkBAEY.hpp index 284e5129..62cdbd6d 100644 --- a/include/Actor/ActorUnkBAEY.hpp +++ b/include/Actor/ActorUnkBAEY.hpp @@ -11,7 +11,7 @@ class ActorUnkBAEY_C4 : public Actor_C4 { public: ActorUnkBAEY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBAFO.hpp b/include/Actor/ActorUnkBAFO.hpp index 5138e35d..44c9052b 100644 --- a/include/Actor/ActorUnkBAFO.hpp +++ b/include/Actor/ActorUnkBAFO.hpp @@ -11,7 +11,7 @@ class ActorUnkBAFO_C4 : public Actor_C4 { public: ActorUnkBAFO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBANI.hpp b/include/Actor/ActorUnkBANI.hpp index 59bebe24..d9670425 100644 --- a/include/Actor/ActorUnkBANI.hpp +++ b/include/Actor/ActorUnkBANI.hpp @@ -11,7 +11,7 @@ class ActorUnkBANI_C4 : public Actor_C4 { public: ActorUnkBANI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBAPH.hpp b/include/Actor/ActorUnkBAPH.hpp index 856a036d..07f93c57 100644 --- a/include/Actor/ActorUnkBAPH.hpp +++ b/include/Actor/ActorUnkBAPH.hpp @@ -11,7 +11,7 @@ class ActorUnkBAPH_C4 : public Actor_C4 { public: ActorUnkBAPH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBBLE.hpp b/include/Actor/ActorUnkBBLE.hpp index de17f777..8cb70007 100644 --- a/include/Actor/ActorUnkBBLE.hpp +++ b/include/Actor/ActorUnkBBLE.hpp @@ -11,7 +11,7 @@ class ActorUnkBBLE_C4 : public Actor_C4 { public: ActorUnkBBLE_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBDBA.hpp b/include/Actor/ActorUnkBDBA.hpp index d741c0c1..cc0ef75b 100644 --- a/include/Actor/ActorUnkBDBA.hpp +++ b/include/Actor/ActorUnkBDBA.hpp @@ -11,7 +11,7 @@ class ActorUnkBDBA_C4 : public Actor_C4 { public: ActorUnkBDBA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBDEA.hpp b/include/Actor/ActorUnkBDEA.hpp index 3037ae19..3a81b638 100644 --- a/include/Actor/ActorUnkBDEA.hpp +++ b/include/Actor/ActorUnkBDEA.hpp @@ -11,7 +11,7 @@ class ActorUnkBDEA_C4 : public Actor_C4 { public: ActorUnkBDEA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBDEM.hpp b/include/Actor/ActorUnkBDEM.hpp index e7748a8d..650ef15f 100644 --- a/include/Actor/ActorUnkBDEM.hpp +++ b/include/Actor/ActorUnkBDEM.hpp @@ -11,7 +11,7 @@ class ActorUnkBDEM_C4 : public Actor_C4 { public: ActorUnkBDEM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBDGA.hpp b/include/Actor/ActorUnkBDGA.hpp index 575802c1..b774a959 100644 --- a/include/Actor/ActorUnkBDGA.hpp +++ b/include/Actor/ActorUnkBDGA.hpp @@ -11,7 +11,7 @@ class ActorUnkBDGA_C4 : public Actor_C4 { public: ActorUnkBDGA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBDLB.hpp b/include/Actor/ActorUnkBDLB.hpp index 43cb19c1..f190f61d 100644 --- a/include/Actor/ActorUnkBDLB.hpp +++ b/include/Actor/ActorUnkBDLB.hpp @@ -11,7 +11,7 @@ class ActorUnkBDLB_C4 : public Actor_C4 { public: ActorUnkBDLB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBEEE.hpp b/include/Actor/ActorUnkBEEE.hpp index 8c9a1349..28db1eac 100644 --- a/include/Actor/ActorUnkBEEE.hpp +++ b/include/Actor/ActorUnkBEEE.hpp @@ -11,7 +11,7 @@ class ActorUnkBEEE_C4 : public Actor_C4 { public: ActorUnkBEEE_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBEEH.hpp b/include/Actor/ActorUnkBEEH.hpp index 3cb91a98..3b5492b9 100644 --- a/include/Actor/ActorUnkBEEH.hpp +++ b/include/Actor/ActorUnkBEEH.hpp @@ -11,7 +11,7 @@ class ActorUnkBEEH_C4 : public Actor_C4 { public: ActorUnkBEEH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBFFN.hpp b/include/Actor/ActorUnkBFFN.hpp index ef584829..f5742e37 100644 --- a/include/Actor/ActorUnkBFFN.hpp +++ b/include/Actor/ActorUnkBFFN.hpp @@ -11,7 +11,7 @@ class ActorUnkBFFN_C4 : public Actor_C4 { public: ActorUnkBFFN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBGOK.hpp b/include/Actor/ActorUnkBGOK.hpp index 5621923c..23a01875 100644 --- a/include/Actor/ActorUnkBGOK.hpp +++ b/include/Actor/ActorUnkBGOK.hpp @@ -11,7 +11,7 @@ class ActorUnkBGOK_C4 : public Actor_C4 { public: ActorUnkBGOK_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBKST.hpp b/include/Actor/ActorUnkBKST.hpp index 5f915453..35889d6f 100644 --- a/include/Actor/ActorUnkBKST.hpp +++ b/include/Actor/ActorUnkBKST.hpp @@ -11,7 +11,7 @@ class ActorUnkBKST_C4 : public Actor_C4 { public: ActorUnkBKST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBLBL.hpp b/include/Actor/ActorUnkBLBL.hpp index 78c854d1..d2147523 100644 --- a/include/Actor/ActorUnkBLBL.hpp +++ b/include/Actor/ActorUnkBLBL.hpp @@ -11,7 +11,7 @@ class ActorUnkBLBL_C4 : public Actor_C4 { public: ActorUnkBLBL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBLBR.hpp b/include/Actor/ActorUnkBLBR.hpp index 87987b81..06ea61af 100644 --- a/include/Actor/ActorUnkBLBR.hpp +++ b/include/Actor/ActorUnkBLBR.hpp @@ -11,7 +11,7 @@ class ActorUnkBLBR_C4 : public Actor_C4 { public: ActorUnkBLBR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBLJF.hpp b/include/Actor/ActorUnkBLJF.hpp index 639de1cb..df29bba4 100644 --- a/include/Actor/ActorUnkBLJF.hpp +++ b/include/Actor/ActorUnkBLJF.hpp @@ -11,7 +11,7 @@ class ActorUnkBLJF_C4 : public Actor_C4 { public: ActorUnkBLJF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBLON.hpp b/include/Actor/ActorUnkBLON.hpp index 210a38b1..a195567b 100644 --- a/include/Actor/ActorUnkBLON.hpp +++ b/include/Actor/ActorUnkBLON.hpp @@ -11,7 +11,7 @@ class ActorUnkBLON_C4 : public Actor_C4 { public: ActorUnkBLON_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBMHN.hpp b/include/Actor/ActorUnkBMHN.hpp index e038b738..6077a666 100644 --- a/include/Actor/ActorUnkBMHN.hpp +++ b/include/Actor/ActorUnkBMHN.hpp @@ -11,7 +11,7 @@ class ActorUnkBMHN_C4 : public Actor_C4 { public: ActorUnkBMHN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBMOC.hpp b/include/Actor/ActorUnkBMOC.hpp index 9dcc665b..1e7ac483 100644 --- a/include/Actor/ActorUnkBMOC.hpp +++ b/include/Actor/ActorUnkBMOC.hpp @@ -11,7 +11,7 @@ class ActorUnkBMOC_C4 : public Actor_C4 { public: ActorUnkBMOC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBPAP.hpp b/include/Actor/ActorUnkBPAP.hpp index b716f749..dba08103 100644 --- a/include/Actor/ActorUnkBPAP.hpp +++ b/include/Actor/ActorUnkBPAP.hpp @@ -11,7 +11,7 @@ class ActorUnkBPAP_C4 : public Actor_C4 { public: ActorUnkBPAP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBPBS.hpp b/include/Actor/ActorUnkBPBS.hpp index be03c8c6..ab2668ec 100644 --- a/include/Actor/ActorUnkBPBS.hpp +++ b/include/Actor/ActorUnkBPBS.hpp @@ -11,7 +11,7 @@ class ActorUnkBPBS_C4 : public Actor_C4 { public: ActorUnkBPBS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBROW.hpp b/include/Actor/ActorUnkBROW.hpp index 4d971e0b..8594d36b 100644 --- a/include/Actor/ActorUnkBROW.hpp +++ b/include/Actor/ActorUnkBROW.hpp @@ -11,7 +11,7 @@ class ActorUnkBROW_C4 : public Actor_C4 { public: ActorUnkBROW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBSFC.hpp b/include/Actor/ActorUnkBSFC.hpp index fd6c102c..6bd566a3 100644 --- a/include/Actor/ActorUnkBSFC.hpp +++ b/include/Actor/ActorUnkBSFC.hpp @@ -11,7 +11,7 @@ class ActorUnkBSFC_C4 : public Actor_C4 { public: ActorUnkBSFC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBSKM.hpp b/include/Actor/ActorUnkBSKM.hpp index c1a76179..fcd0d972 100644 --- a/include/Actor/ActorUnkBSKM.hpp +++ b/include/Actor/ActorUnkBSKM.hpp @@ -11,7 +11,7 @@ class ActorUnkBSKM_C4 : public Actor_C4 { public: ActorUnkBSKM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBSTG.hpp b/include/Actor/ActorUnkBSTG.hpp index b03bc5e0..11983ee7 100644 --- a/include/Actor/ActorUnkBSTG.hpp +++ b/include/Actor/ActorUnkBSTG.hpp @@ -11,7 +11,7 @@ class ActorUnkBSTG_C4 : public Actor_C4 { public: ActorUnkBSTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkBTIR.hpp b/include/Actor/ActorUnkBTIR.hpp index 756e77bb..c721282e 100644 --- a/include/Actor/ActorUnkBTIR.hpp +++ b/include/Actor/ActorUnkBTIR.hpp @@ -11,7 +11,7 @@ class ActorUnkBTIR_C4 : public Actor_C4 { public: ActorUnkBTIR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCAGE.hpp b/include/Actor/ActorUnkCAGE.hpp index 0b393add..ba3e4b0a 100644 --- a/include/Actor/ActorUnkCAGE.hpp +++ b/include/Actor/ActorUnkCAGE.hpp @@ -11,7 +11,7 @@ class ActorUnkCAGE_C4 : public Actor_C4 { public: ActorUnkCAGE_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCAMA_CAMB_CAMS.hpp b/include/Actor/ActorUnkCAMA_CAMB_CAMS.hpp index 76d2f1bb..2827f9d8 100644 --- a/include/Actor/ActorUnkCAMA_CAMB_CAMS.hpp +++ b/include/Actor/ActorUnkCAMA_CAMB_CAMS.hpp @@ -13,7 +13,7 @@ class ActorUnkCAMA_C4 : public Actor_C4 { public: ActorUnkCAMA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkCAMB_C4 : public Actor_C4 { public: ActorUnkCAMB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -81,7 +81,7 @@ class ActorUnkCAMS_C4 : public Actor_C4 { public: ActorUnkCAMS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCAMY.hpp b/include/Actor/ActorUnkCAMY.hpp index 6d5bd9d6..d7319012 100644 --- a/include/Actor/ActorUnkCAMY.hpp +++ b/include/Actor/ActorUnkCAMY.hpp @@ -11,7 +11,7 @@ class ActorUnkCAMY_C4 : public Actor_C4 { public: ActorUnkCAMY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCANS.hpp b/include/Actor/ActorUnkCANS.hpp index e1b0cf0a..4fb854c7 100644 --- a/include/Actor/ActorUnkCANS.hpp +++ b/include/Actor/ActorUnkCANS.hpp @@ -42,7 +42,7 @@ public: /* 00 */ virtual ~UnkStruct_ov063_02162ea8(); /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; }; @@ -88,7 +88,7 @@ public: UnkStruct_ov063_02162e88(void *param1); - /* 04 */ virtual unk32 vfunc_04(ActorRef param1, unk32 param2, unk32 param3, unk32 *param4) override; + /* 04 */ virtual unk32 vfunc_04(RefStruct param1, unk32 param2, unk32 param3, unk32 *param4) override; }; class ActorUnkCANS : public Actor_Derived2 { diff --git a/include/Actor/ActorUnkCASE.hpp b/include/Actor/ActorUnkCASE.hpp index 8d20b411..ee30316d 100644 --- a/include/Actor/ActorUnkCASE.hpp +++ b/include/Actor/ActorUnkCASE.hpp @@ -4,9 +4,9 @@ #include "Actor/Actor.hpp" #include "Actor/ActorProfile.hpp" -#include "Actor/ActorRef.hpp" #include "Actor/ActorShotArrow.hpp" #include "Actor/Actor_Derived1.hpp" +#include "RefStruct.hpp" #include "Unknown/UnkStruct_ov000_020b3268.hpp" #include "Unknown/UnkStruct_ov031_Items.hpp" #include "global.h" @@ -44,7 +44,7 @@ public: ActorUnkCASE_150(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 0C */ virtual void vfunc_0C(VecFx32 *param1) override; }; @@ -78,7 +78,7 @@ public: /* 1D8 */ unk32 mUnk_1D8; /* 1DC */ unk32 mUnk_1DC; /* 1E0 */ unk32 mUnk_1E0; - /* 1E4 */ ActorRef mUnk_1E4; + /* 1E4 */ RefStruct mUnk_1E4; /* 1E8 */ Actor_Derived1_94 mUnk_1E8; /* 1F4 */ u8 mUnk_1F4; /* 1F5 */ @@ -98,7 +98,7 @@ public: void func_ov063_0215ac68(void); void func_ov063_0215ac8c(void); void func_ov063_0215acc8(void); - static void func_ov063_0215acec(ActorRef *ref1, ActorRef ref2); // copy ? + static void func_ov063_0215acec(RefStruct *ref1, RefStruct ref2); // copy ? void func_ov063_0215ae6c(void); void func_ov063_0215ae80(void); void func_ov063_0215aefc(ActorState param2); @@ -116,7 +116,7 @@ public: void func_ov063_0215b2c4(void); void func_ov063_0215b6c8(VecFx32 *param1, UnkAngleStruct angle); void func_ov063_0215b724(void); - void func_ov063_0215b814(ActorRef ref); + void func_ov063_0215b814(RefStruct ref); void func_ov063_0215b854(void); void func_ov063_0215b8e8(VecFx32 *param1); static void func_ov063_0215b99c(ActorUnkCASE *param1, UnkStruct_func_ov063_0215a678 *param2); diff --git a/include/Actor/ActorUnkCASL.hpp b/include/Actor/ActorUnkCASL.hpp index 0d436c3c..8ce09874 100644 --- a/include/Actor/ActorUnkCASL.hpp +++ b/include/Actor/ActorUnkCASL.hpp @@ -11,7 +11,7 @@ class ActorUnkCASL_C4 : public Actor_C4 { public: ActorUnkCASL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCAST.hpp b/include/Actor/ActorUnkCAST.hpp index d783020c..ed790713 100644 --- a/include/Actor/ActorUnkCAST.hpp +++ b/include/Actor/ActorUnkCAST.hpp @@ -11,7 +11,7 @@ class ActorUnkCAST_C4 : public Actor_C4 { public: ActorUnkCAST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCAWA.hpp b/include/Actor/ActorUnkCAWA.hpp index fa9aa2f0..7f45a20c 100644 --- a/include/Actor/ActorUnkCAWA.hpp +++ b/include/Actor/ActorUnkCAWA.hpp @@ -11,7 +11,7 @@ class ActorUnkCAWA_C4 : public Actor_C4 { public: ActorUnkCAWA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.hpp b/include/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.hpp index 7c21a331..60522462 100644 --- a/include/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.hpp +++ b/include/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.hpp @@ -13,7 +13,7 @@ class ActorUnkCAWB_C4 : public Actor_C4 { public: ActorUnkCAWB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkCRFP_C4 : public Actor_C4 { public: ActorUnkCRFP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -81,7 +81,7 @@ class ActorUnkFOMA_C4 : public Actor_C4 { public: ActorUnkFOMA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -115,7 +115,7 @@ class ActorUnkFOMB_C4 : public Actor_C4 { public: ActorUnkFOMB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -149,7 +149,7 @@ class ActorUnkFOMC_C4 : public Actor_C4 { public: ActorUnkFOMC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -183,7 +183,7 @@ class ActorUnkFOMR_C4 : public Actor_C4 { public: ActorUnkFOMR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -217,7 +217,7 @@ class ActorUnkFOMS_C4 : public Actor_C4 { public: ActorUnkFOMS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -251,7 +251,7 @@ class ActorUnkFOPD_C4 : public Actor_C4 { public: ActorUnkFOPD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -285,7 +285,7 @@ class ActorUnkGOCP_C4 : public Actor_C4 { public: ActorUnkGOCP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -319,7 +319,7 @@ class ActorUnkGORP_C4 : public Actor_C4 { public: ActorUnkGORP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -353,7 +353,7 @@ class ActorUnkNCCA_C4 : public Actor_C4 { public: ActorUnkNCCA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -387,7 +387,7 @@ class ActorUnkNCCS_C4 : public Actor_C4 { public: ActorUnkNCCS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -421,7 +421,7 @@ class ActorUnkWAMA_C4 : public Actor_C4 { public: ActorUnkWAMA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCHUC.hpp b/include/Actor/ActorUnkCHUC.hpp index f378b630..15f9442a 100644 --- a/include/Actor/ActorUnkCHUC.hpp +++ b/include/Actor/ActorUnkCHUC.hpp @@ -11,7 +11,7 @@ class ActorUnkCHUC_C4 : public Actor_C4 { public: ActorUnkCHUC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCLBT.hpp b/include/Actor/ActorUnkCLBT.hpp index c91cc027..bb23a9cd 100644 --- a/include/Actor/ActorUnkCLBT.hpp +++ b/include/Actor/ActorUnkCLBT.hpp @@ -11,7 +11,7 @@ class ActorUnkCLBT_C4 : public Actor_C4 { public: ActorUnkCLBT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCLZN.hpp b/include/Actor/ActorUnkCLZN.hpp index 74c197a7..a4488082 100644 --- a/include/Actor/ActorUnkCLZN.hpp +++ b/include/Actor/ActorUnkCLZN.hpp @@ -11,7 +11,7 @@ class ActorUnkCLZN_C4 : public Actor_C4 { public: ActorUnkCLZN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCNBL.hpp b/include/Actor/ActorUnkCNBL.hpp index ec0fd1e9..d6d1fcb2 100644 --- a/include/Actor/ActorUnkCNBL.hpp +++ b/include/Actor/ActorUnkCNBL.hpp @@ -11,7 +11,7 @@ class ActorUnkCNBL_C4 : public Actor_C4 { public: ActorUnkCNBL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCOMM.hpp b/include/Actor/ActorUnkCOMM.hpp index a3750778..e087daa0 100644 --- a/include/Actor/ActorUnkCOMM.hpp +++ b/include/Actor/ActorUnkCOMM.hpp @@ -11,7 +11,7 @@ class ActorUnkCOMM_C4 : public Actor_C4 { public: ActorUnkCOMM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCRCH.hpp b/include/Actor/ActorUnkCRCH.hpp index 37d38192..878a138a 100644 --- a/include/Actor/ActorUnkCRCH.hpp +++ b/include/Actor/ActorUnkCRCH.hpp @@ -11,7 +11,7 @@ class ActorUnkCRCH_C4 : public Actor_C4 { public: ActorUnkCRCH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCRFT.hpp b/include/Actor/ActorUnkCRFT.hpp index aa05aea0..173a5052 100644 --- a/include/Actor/ActorUnkCRFT.hpp +++ b/include/Actor/ActorUnkCRFT.hpp @@ -11,7 +11,7 @@ class ActorUnkCRFT_C4 : public Actor_C4 { public: ActorUnkCRFT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCROW.hpp b/include/Actor/ActorUnkCROW.hpp index 97c39683..4a42823d 100644 --- a/include/Actor/ActorUnkCROW.hpp +++ b/include/Actor/ActorUnkCROW.hpp @@ -11,7 +11,7 @@ class ActorUnkCROW_C4 : public Actor_C4 { public: ActorUnkCROW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkCTFS.hpp b/include/Actor/ActorUnkCTFS.hpp index 39228448..4506f0ff 100644 --- a/include/Actor/ActorUnkCTFS.hpp +++ b/include/Actor/ActorUnkCTFS.hpp @@ -11,7 +11,7 @@ class ActorUnkCTFS_C4 : public Actor_C4 { public: ActorUnkCTFS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDGPC.hpp b/include/Actor/ActorUnkDGPC.hpp index 2b455b08..0ea07c81 100644 --- a/include/Actor/ActorUnkDGPC.hpp +++ b/include/Actor/ActorUnkDGPC.hpp @@ -11,7 +11,7 @@ class ActorUnkDGPC_C4 : public Actor_C4 { public: ActorUnkDGPC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDKCB.hpp b/include/Actor/ActorUnkDKCB.hpp index efc37942..173b0103 100644 --- a/include/Actor/ActorUnkDKCB.hpp +++ b/include/Actor/ActorUnkDKCB.hpp @@ -11,7 +11,7 @@ class ActorUnkDKCB_C4 : public Actor_C4 { public: ActorUnkDKCB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDKCL.hpp b/include/Actor/ActorUnkDKCL.hpp index 371cd2b4..e0d876c3 100644 --- a/include/Actor/ActorUnkDKCL.hpp +++ b/include/Actor/ActorUnkDKCL.hpp @@ -11,7 +11,7 @@ class ActorUnkDKCL_C4 : public Actor_C4 { public: ActorUnkDKCL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDKTR.hpp b/include/Actor/ActorUnkDKTR.hpp index c0043fac..c12ea8ba 100644 --- a/include/Actor/ActorUnkDKTR.hpp +++ b/include/Actor/ActorUnkDKTR.hpp @@ -11,7 +11,7 @@ class ActorUnkDKTR_C4 : public Actor_C4 { public: ActorUnkDKTR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDLPN.hpp b/include/Actor/ActorUnkDLPN.hpp index 70319e13..6776d3ac 100644 --- a/include/Actor/ActorUnkDLPN.hpp +++ b/include/Actor/ActorUnkDLPN.hpp @@ -11,7 +11,7 @@ class ActorUnkDLPN_C4 : public Actor_C4 { public: ActorUnkDLPN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDLTG.hpp b/include/Actor/ActorUnkDLTG.hpp index 6ea7885d..bbbc7e0f 100644 --- a/include/Actor/ActorUnkDLTG.hpp +++ b/include/Actor/ActorUnkDLTG.hpp @@ -11,7 +11,7 @@ class ActorUnkDLTG_C4 : public Actor_C4 { public: ActorUnkDLTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMCH.hpp b/include/Actor/ActorUnkDMCH.hpp index 777cac8d..f726e410 100644 --- a/include/Actor/ActorUnkDMCH.hpp +++ b/include/Actor/ActorUnkDMCH.hpp @@ -11,7 +11,7 @@ class ActorUnkDMCH_C4 : public Actor_C4 { public: ActorUnkDMCH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMEQ.hpp b/include/Actor/ActorUnkDMEQ.hpp index 949c2495..c263a21f 100644 --- a/include/Actor/ActorUnkDMEQ.hpp +++ b/include/Actor/ActorUnkDMEQ.hpp @@ -11,7 +11,7 @@ class ActorUnkDMEQ_C4 : public Actor_C4 { public: ActorUnkDMEQ_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMET.hpp b/include/Actor/ActorUnkDMET.hpp index c3be65b1..560f2a5f 100644 --- a/include/Actor/ActorUnkDMET.hpp +++ b/include/Actor/ActorUnkDMET.hpp @@ -11,7 +11,7 @@ class ActorUnkDMET_C4 : public Actor_C4 { public: ActorUnkDMET_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMFR.hpp b/include/Actor/ActorUnkDMFR.hpp index 5a078425..2cacda1d 100644 --- a/include/Actor/ActorUnkDMFR.hpp +++ b/include/Actor/ActorUnkDMFR.hpp @@ -11,7 +11,7 @@ class ActorUnkDMFR_C4 : public Actor_C4 { public: ActorUnkDMFR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMFT.hpp b/include/Actor/ActorUnkDMFT.hpp index 18edb0e6..6fde9409 100644 --- a/include/Actor/ActorUnkDMFT.hpp +++ b/include/Actor/ActorUnkDMFT.hpp @@ -11,7 +11,7 @@ class ActorUnkDMFT_C4 : public Actor_C4 { public: ActorUnkDMFT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMGM.hpp b/include/Actor/ActorUnkDMGM.hpp index 2952e681..681540d4 100644 --- a/include/Actor/ActorUnkDMGM.hpp +++ b/include/Actor/ActorUnkDMGM.hpp @@ -11,7 +11,7 @@ class ActorUnkDMGM_C4 : public Actor_C4 { public: ActorUnkDMGM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMGN.hpp b/include/Actor/ActorUnkDMGN.hpp index 49196598..6c211001 100644 --- a/include/Actor/ActorUnkDMGN.hpp +++ b/include/Actor/ActorUnkDMGN.hpp @@ -11,7 +11,7 @@ class ActorUnkDMGN_C4 : public Actor_C4 { public: ActorUnkDMGN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMMM.hpp b/include/Actor/ActorUnkDMMM.hpp index 1c901980..3b74a73c 100644 --- a/include/Actor/ActorUnkDMMM.hpp +++ b/include/Actor/ActorUnkDMMM.hpp @@ -11,7 +11,7 @@ class ActorUnkDMMM_C4 : public Actor_C4 { public: ActorUnkDMMM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMMS.hpp b/include/Actor/ActorUnkDMMS.hpp index 9b2f59f0..363c1aa3 100644 --- a/include/Actor/ActorUnkDMMS.hpp +++ b/include/Actor/ActorUnkDMMS.hpp @@ -11,7 +11,7 @@ class ActorUnkDMMS_C4 : public Actor_C4 { public: ActorUnkDMMS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMMT.hpp b/include/Actor/ActorUnkDMMT.hpp index 7e7f1d2a..2cf73f16 100644 --- a/include/Actor/ActorUnkDMMT.hpp +++ b/include/Actor/ActorUnkDMMT.hpp @@ -11,7 +11,7 @@ class ActorUnkDMMT_C4 : public Actor_C4 { public: ActorUnkDMMT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMPK.hpp b/include/Actor/ActorUnkDMPK.hpp index 595f7250..a2244c63 100644 --- a/include/Actor/ActorUnkDMPK.hpp +++ b/include/Actor/ActorUnkDMPK.hpp @@ -11,7 +11,7 @@ class ActorUnkDMPK_C4 : public Actor_C4 { public: ActorUnkDMPK_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMPS.hpp b/include/Actor/ActorUnkDMPS.hpp index 45dfccaa..6019bcf9 100644 --- a/include/Actor/ActorUnkDMPS.hpp +++ b/include/Actor/ActorUnkDMPS.hpp @@ -11,7 +11,7 @@ class ActorUnkDMPS_C4 : public Actor_C4 { public: ActorUnkDMPS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMSS.hpp b/include/Actor/ActorUnkDMSS.hpp index a8bd02a1..f1a01407 100644 --- a/include/Actor/ActorUnkDMSS.hpp +++ b/include/Actor/ActorUnkDMSS.hpp @@ -11,7 +11,7 @@ class ActorUnkDMSS_C4 : public Actor_C4 { public: ActorUnkDMSS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMST.hpp b/include/Actor/ActorUnkDMST.hpp index dfb89d48..7c9de0ac 100644 --- a/include/Actor/ActorUnkDMST.hpp +++ b/include/Actor/ActorUnkDMST.hpp @@ -11,7 +11,7 @@ class ActorUnkDMST_C4 : public Actor_C4 { public: ActorUnkDMST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMT2.hpp b/include/Actor/ActorUnkDMT2.hpp index 94251169..f0ea1238 100644 --- a/include/Actor/ActorUnkDMT2.hpp +++ b/include/Actor/ActorUnkDMT2.hpp @@ -11,7 +11,7 @@ class ActorUnkDMT2_C4 : public Actor_C4 { public: ActorUnkDMT2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMTR.hpp b/include/Actor/ActorUnkDMTR.hpp index f3578774..7a90a8a8 100644 --- a/include/Actor/ActorUnkDMTR.hpp +++ b/include/Actor/ActorUnkDMTR.hpp @@ -11,7 +11,7 @@ class ActorUnkDMTR_C4 : public Actor_C4 { public: ActorUnkDMTR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMWS.hpp b/include/Actor/ActorUnkDMWS.hpp index 7ee905e7..63a5a10a 100644 --- a/include/Actor/ActorUnkDMWS.hpp +++ b/include/Actor/ActorUnkDMWS.hpp @@ -11,7 +11,7 @@ class ActorUnkDMWS_C4 : public Actor_C4 { public: ActorUnkDMWS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMWT.hpp b/include/Actor/ActorUnkDMWT.hpp index 600177ff..b736c9a3 100644 --- a/include/Actor/ActorUnkDMWT.hpp +++ b/include/Actor/ActorUnkDMWT.hpp @@ -11,7 +11,7 @@ class ActorUnkDMWT_C4 : public Actor_C4 { public: ActorUnkDMWT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDMZS.hpp b/include/Actor/ActorUnkDMZS.hpp index 6a7947a0..e337ab28 100644 --- a/include/Actor/ActorUnkDMZS.hpp +++ b/include/Actor/ActorUnkDMZS.hpp @@ -11,7 +11,7 @@ class ActorUnkDMZS_C4 : public Actor_C4 { public: ActorUnkDMZS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDSBB.hpp b/include/Actor/ActorUnkDSBB.hpp index f2dc20e6..eed690ef 100644 --- a/include/Actor/ActorUnkDSBB.hpp +++ b/include/Actor/ActorUnkDSBB.hpp @@ -11,7 +11,7 @@ class ActorUnkDSBB_C4 : public Actor_C4 { public: ActorUnkDSBB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDSBH.hpp b/include/Actor/ActorUnkDSBH.hpp index 75998db7..a6aa8df1 100644 --- a/include/Actor/ActorUnkDSBH.hpp +++ b/include/Actor/ActorUnkDSBH.hpp @@ -11,7 +11,7 @@ class ActorUnkDSBH_C4 : public Actor_C4 { public: ActorUnkDSBH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDSBN.hpp b/include/Actor/ActorUnkDSBN.hpp index 38ad4345..ae7b5024 100644 --- a/include/Actor/ActorUnkDSBN.hpp +++ b/include/Actor/ActorUnkDSBN.hpp @@ -11,7 +11,7 @@ class ActorUnkDSBN_C4 : public Actor_C4 { public: ActorUnkDSBN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDSDS.hpp b/include/Actor/ActorUnkDSDS.hpp index 471957be..0d47d875 100644 --- a/include/Actor/ActorUnkDSDS.hpp +++ b/include/Actor/ActorUnkDSDS.hpp @@ -11,7 +11,7 @@ class ActorUnkDSDS_C4 : public Actor_C4 { public: ActorUnkDSDS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDSFR.hpp b/include/Actor/ActorUnkDSFR.hpp index 30af34ba..8a230961 100644 --- a/include/Actor/ActorUnkDSFR.hpp +++ b/include/Actor/ActorUnkDSFR.hpp @@ -11,7 +11,7 @@ class ActorUnkDSFR_C4 : public Actor_C4 { public: ActorUnkDSFR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDSSN.hpp b/include/Actor/ActorUnkDSSN.hpp index 80d9cb13..0eed6fcb 100644 --- a/include/Actor/ActorUnkDSSN.hpp +++ b/include/Actor/ActorUnkDSSN.hpp @@ -11,7 +11,7 @@ class ActorUnkDSSN_C4 : public Actor_C4 { public: ActorUnkDSSN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDSVC.hpp b/include/Actor/ActorUnkDSVC.hpp index 6cf1c1c5..2404ee73 100644 --- a/include/Actor/ActorUnkDSVC.hpp +++ b/include/Actor/ActorUnkDSVC.hpp @@ -11,7 +11,7 @@ class ActorUnkDSVC_C4 : public Actor_C4 { public: ActorUnkDSVC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkDSWT.hpp b/include/Actor/ActorUnkDSWT.hpp index 03b80514..6161d0f7 100644 --- a/include/Actor/ActorUnkDSWT.hpp +++ b/include/Actor/ActorUnkDSWT.hpp @@ -11,7 +11,7 @@ class ActorUnkDSWT_C4 : public Actor_C4 { public: ActorUnkDSWT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkE3GL.hpp b/include/Actor/ActorUnkE3GL.hpp index e682f788..f9a24b01 100644 --- a/include/Actor/ActorUnkE3GL.hpp +++ b/include/Actor/ActorUnkE3GL.hpp @@ -11,7 +11,7 @@ class ActorUnkE3GL_C4 : public Actor_C4 { public: ActorUnkE3GL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkE3LV.hpp b/include/Actor/ActorUnkE3LV.hpp index 36c47ca4..4cb0a6aa 100644 --- a/include/Actor/ActorUnkE3LV.hpp +++ b/include/Actor/ActorUnkE3LV.hpp @@ -11,7 +11,7 @@ class ActorUnkE3LV_C4 : public Actor_C4 { public: ActorUnkE3LV_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkE3ST.hpp b/include/Actor/ActorUnkE3ST.hpp index af874e56..937e3e5d 100644 --- a/include/Actor/ActorUnkE3ST.hpp +++ b/include/Actor/ActorUnkE3ST.hpp @@ -11,7 +11,7 @@ class ActorUnkE3ST_C4 : public Actor_C4 { public: ActorUnkE3ST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkE3TT.hpp b/include/Actor/ActorUnkE3TT.hpp index 94914a84..2b43a608 100644 --- a/include/Actor/ActorUnkE3TT.hpp +++ b/include/Actor/ActorUnkE3TT.hpp @@ -11,7 +11,7 @@ class ActorUnkE3TT_C4 : public Actor_C4 { public: ActorUnkE3TT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFOC.hpp b/include/Actor/ActorUnkEFOC.hpp index 65389140..50d632b8 100644 --- a/include/Actor/ActorUnkEFOC.hpp +++ b/include/Actor/ActorUnkEFOC.hpp @@ -11,7 +11,7 @@ class ActorUnkEFOC_C4 : public Actor_C4 { public: ActorUnkEFOC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFR2.hpp b/include/Actor/ActorUnkEFR2.hpp index 05f5d691..7df95774 100644 --- a/include/Actor/ActorUnkEFR2.hpp +++ b/include/Actor/ActorUnkEFR2.hpp @@ -11,7 +11,7 @@ class ActorUnkEFR2_C4 : public Actor_C4 { public: ActorUnkEFR2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFR3.hpp b/include/Actor/ActorUnkEFR3.hpp index 0f18490d..96f9f474 100644 --- a/include/Actor/ActorUnkEFR3.hpp +++ b/include/Actor/ActorUnkEFR3.hpp @@ -11,7 +11,7 @@ class ActorUnkEFR3_C4 : public Actor_C4 { public: ActorUnkEFR3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFRI.hpp b/include/Actor/ActorUnkEFRI.hpp index c763a7fb..47f1484c 100644 --- a/include/Actor/ActorUnkEFRI.hpp +++ b/include/Actor/ActorUnkEFRI.hpp @@ -11,7 +11,7 @@ class ActorUnkEFRI_C4 : public Actor_C4 { public: ActorUnkEFRI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFRL.hpp b/include/Actor/ActorUnkEFRL.hpp index d14fbafd..511253dc 100644 --- a/include/Actor/ActorUnkEFRL.hpp +++ b/include/Actor/ActorUnkEFRL.hpp @@ -11,7 +11,7 @@ class ActorUnkEFRL_C4 : public Actor_C4 { public: ActorUnkEFRL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFRP.hpp b/include/Actor/ActorUnkEFRP.hpp index 239e6c9f..6015127f 100644 --- a/include/Actor/ActorUnkEFRP.hpp +++ b/include/Actor/ActorUnkEFRP.hpp @@ -11,7 +11,7 @@ class ActorUnkEFRP_C4 : public Actor_C4 { public: ActorUnkEFRP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFSC.hpp b/include/Actor/ActorUnkEFSC.hpp index bc2758ba..df7e519c 100644 --- a/include/Actor/ActorUnkEFSC.hpp +++ b/include/Actor/ActorUnkEFSC.hpp @@ -11,7 +11,7 @@ class ActorUnkEFSC_C4 : public Actor_C4 { public: ActorUnkEFSC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFW2.hpp b/include/Actor/ActorUnkEFW2.hpp index b8efb4be..d935bca5 100644 --- a/include/Actor/ActorUnkEFW2.hpp +++ b/include/Actor/ActorUnkEFW2.hpp @@ -11,7 +11,7 @@ class ActorUnkEFW2_C4 : public Actor_C4 { public: ActorUnkEFW2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFW3.hpp b/include/Actor/ActorUnkEFW3.hpp index 7461c01d..ab6a23dc 100644 --- a/include/Actor/ActorUnkEFW3.hpp +++ b/include/Actor/ActorUnkEFW3.hpp @@ -11,7 +11,7 @@ class ActorUnkEFW3_C4 : public Actor_C4 { public: ActorUnkEFW3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFWI.hpp b/include/Actor/ActorUnkEFWI.hpp index f2dc18ba..330a304e 100644 --- a/include/Actor/ActorUnkEFWI.hpp +++ b/include/Actor/ActorUnkEFWI.hpp @@ -11,7 +11,7 @@ class ActorUnkEFWI_C4 : public Actor_C4 { public: ActorUnkEFWI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFWL.hpp b/include/Actor/ActorUnkEFWL.hpp index be6e2880..149da197 100644 --- a/include/Actor/ActorUnkEFWL.hpp +++ b/include/Actor/ActorUnkEFWL.hpp @@ -11,7 +11,7 @@ class ActorUnkEFWL_C4 : public Actor_C4 { public: ActorUnkEFWL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEFWV.hpp b/include/Actor/ActorUnkEFWV.hpp index 6a87937f..f45f104f 100644 --- a/include/Actor/ActorUnkEFWV.hpp +++ b/include/Actor/ActorUnkEFWV.hpp @@ -11,7 +11,7 @@ class ActorUnkEFWV_C4 : public Actor_C4 { public: ActorUnkEFWV_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkELVT.hpp b/include/Actor/ActorUnkELVT.hpp index 1e09fca4..4b61d6ef 100644 --- a/include/Actor/ActorUnkELVT.hpp +++ b/include/Actor/ActorUnkELVT.hpp @@ -11,7 +11,7 @@ class ActorUnkELVT_C4 : public Actor_C4 { public: ActorUnkELVT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkENGE.hpp b/include/Actor/ActorUnkENGE.hpp index 2451e017..bb9345a0 100644 --- a/include/Actor/ActorUnkENGE.hpp +++ b/include/Actor/ActorUnkENGE.hpp @@ -11,7 +11,7 @@ class ActorUnkENGE_C4 : public Actor_C4 { public: ActorUnkENGE_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEVCH.hpp b/include/Actor/ActorUnkEVCH.hpp index f713f215..186526fb 100644 --- a/include/Actor/ActorUnkEVCH.hpp +++ b/include/Actor/ActorUnkEVCH.hpp @@ -11,7 +11,7 @@ class ActorUnkEVCH_C4 : public Actor_C4 { public: ActorUnkEVCH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkEWHI.hpp b/include/Actor/ActorUnkEWHI.hpp index 4d33ec5e..9cd6c61c 100644 --- a/include/Actor/ActorUnkEWHI.hpp +++ b/include/Actor/ActorUnkEWHI.hpp @@ -11,7 +11,7 @@ class ActorUnkEWHI_C4 : public Actor_C4 { public: ActorUnkEWHI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFBBF.hpp b/include/Actor/ActorUnkFBBF.hpp index 5afe8944..110b0ca9 100644 --- a/include/Actor/ActorUnkFBBF.hpp +++ b/include/Actor/ActorUnkFBBF.hpp @@ -11,7 +11,7 @@ class ActorUnkFBBF_C4 : public Actor_C4 { public: ActorUnkFBBF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFBBH.hpp b/include/Actor/ActorUnkFBBH.hpp index 5b8f114b..0150febe 100644 --- a/include/Actor/ActorUnkFBBH.hpp +++ b/include/Actor/ActorUnkFBBH.hpp @@ -11,7 +11,7 @@ class ActorUnkFBBH_C4 : public Actor_C4 { public: ActorUnkFBBH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFBCH.hpp b/include/Actor/ActorUnkFBCH.hpp index 812c818c..a134bb66 100644 --- a/include/Actor/ActorUnkFBCH.hpp +++ b/include/Actor/ActorUnkFBCH.hpp @@ -11,7 +11,7 @@ class ActorUnkFBCH_C4 : public Actor_C4 { public: ActorUnkFBCH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFBRD.hpp b/include/Actor/ActorUnkFBRD.hpp index 6fde350f..071b9619 100644 --- a/include/Actor/ActorUnkFBRD.hpp +++ b/include/Actor/ActorUnkFBRD.hpp @@ -11,7 +11,7 @@ class ActorUnkFBRD_C4 : public Actor_C4 { public: ActorUnkFBRD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFBRG.hpp b/include/Actor/ActorUnkFBRG.hpp index 1171b31d..61c11bf7 100644 --- a/include/Actor/ActorUnkFBRG.hpp +++ b/include/Actor/ActorUnkFBRG.hpp @@ -11,7 +11,7 @@ class ActorUnkFBRG_C4 : public Actor_C4 { public: ActorUnkFBRG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFBSC.hpp b/include/Actor/ActorUnkFBSC.hpp index dc3d75da..62a0fb81 100644 --- a/include/Actor/ActorUnkFBSC.hpp +++ b/include/Actor/ActorUnkFBSC.hpp @@ -11,7 +11,7 @@ class ActorUnkFBSC_C4 : public Actor_C4 { public: ActorUnkFBSC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFCHL.hpp b/include/Actor/ActorUnkFCHL.hpp index f06d045b..a5d93301 100644 --- a/include/Actor/ActorUnkFCHL.hpp +++ b/include/Actor/ActorUnkFCHL.hpp @@ -11,7 +11,7 @@ class ActorUnkFCHL_C4 : public Actor_C4 { public: ActorUnkFCHL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFDKY.hpp b/include/Actor/ActorUnkFDKY.hpp index 77d1adb0..effe44b8 100644 --- a/include/Actor/ActorUnkFDKY.hpp +++ b/include/Actor/ActorUnkFDKY.hpp @@ -11,7 +11,7 @@ class ActorUnkFDKY_C4 : public Actor_C4 { public: ActorUnkFDKY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFIBB.hpp b/include/Actor/ActorUnkFIBB.hpp index 224bf231..ae4be186 100644 --- a/include/Actor/ActorUnkFIBB.hpp +++ b/include/Actor/ActorUnkFIBB.hpp @@ -11,7 +11,7 @@ class ActorUnkFIBB_C4 : public Actor_C4 { public: ActorUnkFIBB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFIFI.hpp b/include/Actor/ActorUnkFIFI.hpp index db234eab..fbb7d47e 100644 --- a/include/Actor/ActorUnkFIFI.hpp +++ b/include/Actor/ActorUnkFIFI.hpp @@ -11,7 +11,7 @@ class ActorUnkFIFI_C4 : public Actor_C4 { public: ActorUnkFIFI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFIMA.hpp b/include/Actor/ActorUnkFIMA.hpp index 434dea8b..ee5ca5c4 100644 --- a/include/Actor/ActorUnkFIMA.hpp +++ b/include/Actor/ActorUnkFIMA.hpp @@ -11,7 +11,7 @@ class ActorUnkFIMA_C4 : public Actor_C4 { public: ActorUnkFIMA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFIML.hpp b/include/Actor/ActorUnkFIML.hpp index 8a3f0ea6..ffbfca46 100644 --- a/include/Actor/ActorUnkFIML.hpp +++ b/include/Actor/ActorUnkFIML.hpp @@ -11,7 +11,7 @@ class ActorUnkFIML_C4 : public Actor_C4 { public: ActorUnkFIML_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFIRB.hpp b/include/Actor/ActorUnkFIRB.hpp index f24729fb..a1f1dd27 100644 --- a/include/Actor/ActorUnkFIRB.hpp +++ b/include/Actor/ActorUnkFIRB.hpp @@ -11,7 +11,7 @@ class ActorUnkFIRB_C4 : public Actor_C4 { public: ActorUnkFIRB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFKTR.hpp b/include/Actor/ActorUnkFKTR.hpp index ca796913..e559410b 100644 --- a/include/Actor/ActorUnkFKTR.hpp +++ b/include/Actor/ActorUnkFKTR.hpp @@ -11,7 +11,7 @@ class ActorUnkFKTR_C4 : public Actor_C4 { public: ActorUnkFKTR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFLCT.hpp b/include/Actor/ActorUnkFLCT.hpp index 4f4791aa..38676da8 100644 --- a/include/Actor/ActorUnkFLCT.hpp +++ b/include/Actor/ActorUnkFLCT.hpp @@ -11,7 +11,7 @@ class ActorUnkFLCT_C4 : public Actor_C4 { public: ActorUnkFLCT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFLDK.hpp b/include/Actor/ActorUnkFLDK.hpp index 269ac3d1..8814f1ff 100644 --- a/include/Actor/ActorUnkFLDK.hpp +++ b/include/Actor/ActorUnkFLDK.hpp @@ -11,7 +11,7 @@ class ActorUnkFLDK_C4 : public Actor_C4 { public: ActorUnkFLDK_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFMAS_FMLS.hpp b/include/Actor/ActorUnkFMAS_FMLS.hpp index 8a89fa15..5b1c0882 100644 --- a/include/Actor/ActorUnkFMAS_FMLS.hpp +++ b/include/Actor/ActorUnkFMAS_FMLS.hpp @@ -13,7 +13,7 @@ class ActorUnkFMAS_C4 : public Actor_C4 { public: ActorUnkFMAS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkFMLS_C4 : public Actor_C4 { public: ActorUnkFMLS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFOFA.hpp b/include/Actor/ActorUnkFOFA.hpp index ae0c1160..882ba9e0 100644 --- a/include/Actor/ActorUnkFOFA.hpp +++ b/include/Actor/ActorUnkFOFA.hpp @@ -11,7 +11,7 @@ class ActorUnkFOFA_C4 : public Actor_C4 { public: ActorUnkFOFA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFOMD.hpp b/include/Actor/ActorUnkFOMD.hpp index 2a08ed07..5ef3cdc0 100644 --- a/include/Actor/ActorUnkFOMD.hpp +++ b/include/Actor/ActorUnkFOMD.hpp @@ -11,7 +11,7 @@ class ActorUnkFOMD_C4 : public Actor_C4 { public: ActorUnkFOMD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFOMY.hpp b/include/Actor/ActorUnkFOMY.hpp index a00b3b50..efee639b 100644 --- a/include/Actor/ActorUnkFOMY.hpp +++ b/include/Actor/ActorUnkFOMY.hpp @@ -11,7 +11,7 @@ class ActorUnkFOMY_C4 : public Actor_C4 { public: ActorUnkFOMY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFRBS.hpp b/include/Actor/ActorUnkFRBS.hpp index 483b70b3..d0aef9b2 100644 --- a/include/Actor/ActorUnkFRBS.hpp +++ b/include/Actor/ActorUnkFRBS.hpp @@ -11,7 +11,7 @@ class ActorUnkFRBS_C4 : public Actor_C4 { public: ActorUnkFRBS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFRTN.hpp b/include/Actor/ActorUnkFRTN.hpp index b386cc88..09df2e73 100644 --- a/include/Actor/ActorUnkFRTN.hpp +++ b/include/Actor/ActorUnkFRTN.hpp @@ -11,7 +11,7 @@ class ActorUnkFRTN_C4 : public Actor_C4 { public: ActorUnkFRTN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFSIR.hpp b/include/Actor/ActorUnkFSIR.hpp index 21016d5b..b4323cd7 100644 --- a/include/Actor/ActorUnkFSIR.hpp +++ b/include/Actor/ActorUnkFSIR.hpp @@ -11,7 +11,7 @@ class ActorUnkFSIR_C4 : public Actor_C4 { public: ActorUnkFSIR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFSSF.hpp b/include/Actor/ActorUnkFSSF.hpp index e2d01b15..743bf1ba 100644 --- a/include/Actor/ActorUnkFSSF.hpp +++ b/include/Actor/ActorUnkFSSF.hpp @@ -11,7 +11,7 @@ class ActorUnkFSSF_C4 : public Actor_C4 { public: ActorUnkFSSF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFSST.hpp b/include/Actor/ActorUnkFSST.hpp index f42f94eb..0f202080 100644 --- a/include/Actor/ActorUnkFSST.hpp +++ b/include/Actor/ActorUnkFSST.hpp @@ -11,7 +11,7 @@ class ActorUnkFSST_C4 : public Actor_C4 { public: ActorUnkFSST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkFTRN.hpp b/include/Actor/ActorUnkFTRN.hpp index 2b48e3b1..15f90b01 100644 --- a/include/Actor/ActorUnkFTRN.hpp +++ b/include/Actor/ActorUnkFTRN.hpp @@ -11,7 +11,7 @@ class ActorUnkFTRN_C4 : public Actor_C4 { public: ActorUnkFTRN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGHOS.hpp b/include/Actor/ActorUnkGHOS.hpp index 694f098b..5abc0d56 100644 --- a/include/Actor/ActorUnkGHOS.hpp +++ b/include/Actor/ActorUnkGHOS.hpp @@ -11,7 +11,7 @@ class ActorUnkGHOS_C4 : public Actor_C4 { public: ActorUnkGHOS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGOCA_GOCB_GORK_GORM.hpp b/include/Actor/ActorUnkGOCA_GOCB_GORK_GORM.hpp index 5bcee0be..d2e964b2 100644 --- a/include/Actor/ActorUnkGOCA_GOCB_GORK_GORM.hpp +++ b/include/Actor/ActorUnkGOCA_GOCB_GORK_GORM.hpp @@ -13,7 +13,7 @@ class ActorUnkGOCA_C4 : public Actor_C4 { public: ActorUnkGOCA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkGOCB_C4 : public Actor_C4 { public: ActorUnkGOCB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -81,7 +81,7 @@ class ActorUnkGORK_C4 : public Actor_C4 { public: ActorUnkGORK_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -115,7 +115,7 @@ class ActorUnkGORM_C4 : public Actor_C4 { public: ActorUnkGORM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGOKI.hpp b/include/Actor/ActorUnkGOKI.hpp index ad36ddce..98bcf758 100644 --- a/include/Actor/ActorUnkGOKI.hpp +++ b/include/Actor/ActorUnkGOKI.hpp @@ -11,7 +11,7 @@ class ActorUnkGOKI_C4 : public Actor_C4 { public: ActorUnkGOKI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGORS.hpp b/include/Actor/ActorUnkGORS.hpp index bcd51bcf..163272c0 100644 --- a/include/Actor/ActorUnkGORS.hpp +++ b/include/Actor/ActorUnkGORS.hpp @@ -11,7 +11,7 @@ class ActorUnkGORS_C4 : public Actor_C4 { public: ActorUnkGORS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGORY.hpp b/include/Actor/ActorUnkGORY.hpp index c0a66df3..c1cb3ef0 100644 --- a/include/Actor/ActorUnkGORY.hpp +++ b/include/Actor/ActorUnkGORY.hpp @@ -12,7 +12,7 @@ class ActorUnkGORY_C4 : public Actor_C4 { public: ActorUnkGORY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGOVT.hpp b/include/Actor/ActorUnkGOVT.hpp index 10348784..03e01032 100644 --- a/include/Actor/ActorUnkGOVT.hpp +++ b/include/Actor/ActorUnkGOVT.hpp @@ -11,7 +11,7 @@ class ActorUnkGOVT_C4 : public Actor_C4 { public: ActorUnkGOVT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGRCF.hpp b/include/Actor/ActorUnkGRCF.hpp index 24226b66..37174177 100644 --- a/include/Actor/ActorUnkGRCF.hpp +++ b/include/Actor/ActorUnkGRCF.hpp @@ -11,7 +11,7 @@ class ActorUnkGRCF_C4 : public Actor_C4 { public: ActorUnkGRCF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGRCM.hpp b/include/Actor/ActorUnkGRCM.hpp index 355d95f3..148d5fe7 100644 --- a/include/Actor/ActorUnkGRCM.hpp +++ b/include/Actor/ActorUnkGRCM.hpp @@ -11,7 +11,7 @@ class ActorUnkGRCM_C4 : public Actor_C4 { public: ActorUnkGRCM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGTTG.hpp b/include/Actor/ActorUnkGTTG.hpp index c13b23be..b4514889 100644 --- a/include/Actor/ActorUnkGTTG.hpp +++ b/include/Actor/ActorUnkGTTG.hpp @@ -11,7 +11,7 @@ class ActorUnkGTTG_C4 : public Actor_C4 { public: ActorUnkGTTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkGYAM.hpp b/include/Actor/ActorUnkGYAM.hpp index 1b61d579..7cc7b263 100644 --- a/include/Actor/ActorUnkGYAM.hpp +++ b/include/Actor/ActorUnkGYAM.hpp @@ -11,7 +11,7 @@ class ActorUnkGYAM_C4 : public Actor_C4 { public: ActorUnkGYAM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkHAMN.hpp b/include/Actor/ActorUnkHAMN.hpp index 03f8582b..7aaa1797 100644 --- a/include/Actor/ActorUnkHAMN.hpp +++ b/include/Actor/ActorUnkHAMN.hpp @@ -11,7 +11,7 @@ class ActorUnkHAMN_C4 : public Actor_C4 { public: ActorUnkHAMN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkHELA.hpp b/include/Actor/ActorUnkHELA.hpp index 83f746d0..4f3856d5 100644 --- a/include/Actor/ActorUnkHELA.hpp +++ b/include/Actor/ActorUnkHELA.hpp @@ -11,7 +11,7 @@ class ActorUnkHELA_C4 : public Actor_C4 { public: ActorUnkHELA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkHLMG.hpp b/include/Actor/ActorUnkHLMG.hpp index 32f63cc5..d9a41349 100644 --- a/include/Actor/ActorUnkHLMG.hpp +++ b/include/Actor/ActorUnkHLMG.hpp @@ -11,7 +11,7 @@ class ActorUnkHLMG_C4 : public Actor_C4 { public: ActorUnkHLMG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkHYSW.hpp b/include/Actor/ActorUnkHYSW.hpp index 94de0cc7..bcdfd6ee 100644 --- a/include/Actor/ActorUnkHYSW.hpp +++ b/include/Actor/ActorUnkHYSW.hpp @@ -11,7 +11,7 @@ class ActorUnkHYSW_C4 : public Actor_C4 { public: ActorUnkHYSW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkIBBA.hpp b/include/Actor/ActorUnkIBBA.hpp index b87f983d..1dd23386 100644 --- a/include/Actor/ActorUnkIBBA.hpp +++ b/include/Actor/ActorUnkIBBA.hpp @@ -11,7 +11,7 @@ class ActorUnkIBBA_C4 : public Actor_C4 { public: ActorUnkIBBA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkIBSP.hpp b/include/Actor/ActorUnkIBSP.hpp index fb62afdc..738ca101 100644 --- a/include/Actor/ActorUnkIBSP.hpp +++ b/include/Actor/ActorUnkIBSP.hpp @@ -11,7 +11,7 @@ class ActorUnkIBSP_C4 : public Actor_C4 { public: ActorUnkIBSP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkICBA.hpp b/include/Actor/ActorUnkICBA.hpp index 79cc5b75..97667ec8 100644 --- a/include/Actor/ActorUnkICBA.hpp +++ b/include/Actor/ActorUnkICBA.hpp @@ -11,7 +11,7 @@ class ActorUnkICBA_C4 : public Actor_C4 { public: ActorUnkICBA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkICBB.hpp b/include/Actor/ActorUnkICBB.hpp index 04a59d06..42611ed1 100644 --- a/include/Actor/ActorUnkICBB.hpp +++ b/include/Actor/ActorUnkICBB.hpp @@ -11,7 +11,7 @@ class ActorUnkICBB_C4 : public Actor_C4 { public: ActorUnkICBB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkICBS.hpp b/include/Actor/ActorUnkICBS.hpp index 1fbf9ff1..2df85369 100644 --- a/include/Actor/ActorUnkICBS.hpp +++ b/include/Actor/ActorUnkICBS.hpp @@ -11,7 +11,7 @@ class ActorUnkICBS_C4 : public Actor_C4 { public: ActorUnkICBS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkITSC.hpp b/include/Actor/ActorUnkITSC.hpp index 9b1619ce..df8f66a3 100644 --- a/include/Actor/ActorUnkITSC.hpp +++ b/include/Actor/ActorUnkITSC.hpp @@ -11,7 +11,7 @@ class ActorUnkITSC_C4 : public Actor_C4 { public: ActorUnkITSC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkITWP.hpp b/include/Actor/ActorUnkITWP.hpp index 5889dbeb..0f6cbc48 100644 --- a/include/Actor/ActorUnkITWP.hpp +++ b/include/Actor/ActorUnkITWP.hpp @@ -12,7 +12,7 @@ class ActorUnkITWP_C4 : public Actor_C4 { public: ActorUnkITWP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkIWTS.hpp b/include/Actor/ActorUnkIWTS.hpp index 77b8bf57..ec4d55af 100644 --- a/include/Actor/ActorUnkIWTS.hpp +++ b/include/Actor/ActorUnkIWTS.hpp @@ -11,7 +11,7 @@ class ActorUnkIWTS_C4 : public Actor_C4 { public: ActorUnkIWTS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -62,7 +62,7 @@ public: void func_ov084_02152cec(void); void func_ov084_02152d10(void); void func_ov084_02153018(void); - bool func_ov084_02153064(ActorRef *pRef, MtxFx43 **param2); + bool func_ov084_02153064(RefStruct *pRef, MtxFx43 **param2); void func_ov084_021530d4(void); void func_ov084_0215315c(void); void func_ov084_02153194(void); diff --git a/include/Actor/ActorUnkJOLN.hpp b/include/Actor/ActorUnkJOLN.hpp index 385762e1..89653d60 100644 --- a/include/Actor/ActorUnkJOLN.hpp +++ b/include/Actor/ActorUnkJOLN.hpp @@ -11,7 +11,7 @@ class ActorUnkJOLN_C4 : public Actor_C4 { public: ActorUnkJOLN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKEYB.hpp b/include/Actor/ActorUnkKEYB.hpp index 5e673407..baf748b9 100644 --- a/include/Actor/ActorUnkKEYB.hpp +++ b/include/Actor/ActorUnkKEYB.hpp @@ -11,7 +11,7 @@ class ActorUnkKEYB_C4 : public Actor_C4 { public: ActorUnkKEYB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKEYN.hpp b/include/Actor/ActorUnkKEYN.hpp index 07ce1ae6..1ffb4503 100644 --- a/include/Actor/ActorUnkKEYN.hpp +++ b/include/Actor/ActorUnkKEYN.hpp @@ -12,7 +12,7 @@ class ActorUnkKEYN_C4 : public Actor_C4 { public: ActorUnkKEYN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -28,7 +28,7 @@ public: /* 4C */ virtual ~ActorUnkKEYN() override; - static void func_ov070_0214143c(ActorRef *param1, VecFx32 *param2, ActorRef param3, s16 param4, u8 param5, u16 param6); + static void func_ov070_0214143c(RefStruct *param1, VecFx32 *param2, RefStruct param3, s16 param4, u8 param5, u16 param6); void func_ov070_02141618(void); void func_ov070_0214162c(void); void func_ov070_02141750(void); diff --git a/include/Actor/ActorUnkKEYT.hpp b/include/Actor/ActorUnkKEYT.hpp index 93adb301..f9b86a62 100644 --- a/include/Actor/ActorUnkKEYT.hpp +++ b/include/Actor/ActorUnkKEYT.hpp @@ -11,7 +11,7 @@ class ActorUnkKEYT_C4 : public Actor_C4 { public: ActorUnkKEYT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKGDB.hpp b/include/Actor/ActorUnkKGDB.hpp index dafad56e..73d06793 100644 --- a/include/Actor/ActorUnkKGDB.hpp +++ b/include/Actor/ActorUnkKGDB.hpp @@ -11,7 +11,7 @@ class ActorUnkKGDB_C4 : public Actor_C4 { public: ActorUnkKGDB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKGDN.hpp b/include/Actor/ActorUnkKGDN.hpp index dab0e0df..74110d1c 100644 --- a/include/Actor/ActorUnkKGDN.hpp +++ b/include/Actor/ActorUnkKGDN.hpp @@ -11,7 +11,7 @@ class ActorUnkKGDN_C4 : public Actor_C4 { public: ActorUnkKGDN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKIMA.hpp b/include/Actor/ActorUnkKIMA.hpp index 0ee43e11..5bf19d71 100644 --- a/include/Actor/ActorUnkKIMA.hpp +++ b/include/Actor/ActorUnkKIMA.hpp @@ -11,7 +11,7 @@ class ActorUnkKIMA_C4 : public Actor_C4 { public: ActorUnkKIMA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKIMB.hpp b/include/Actor/ActorUnkKIMB.hpp index ad0dc1b7..96f9968a 100644 --- a/include/Actor/ActorUnkKIMB.hpp +++ b/include/Actor/ActorUnkKIMB.hpp @@ -11,7 +11,7 @@ class ActorUnkKIMB_C4 : public Actor_C4 { public: ActorUnkKIMB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKLTR.hpp b/include/Actor/ActorUnkKLTR.hpp index 0db7b79f..afe78aad 100644 --- a/include/Actor/ActorUnkKLTR.hpp +++ b/include/Actor/ActorUnkKLTR.hpp @@ -11,7 +11,7 @@ class ActorUnkKLTR_C4 : public Actor_C4 { public: ActorUnkKLTR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKMOH.hpp b/include/Actor/ActorUnkKMOH.hpp index 6579df94..027ce1ca 100644 --- a/include/Actor/ActorUnkKMOH.hpp +++ b/include/Actor/ActorUnkKMOH.hpp @@ -11,7 +11,7 @@ class ActorUnkKMOH_C4 : public Actor_C4 { public: ActorUnkKMOH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKMOS.hpp b/include/Actor/ActorUnkKMOS.hpp index f9f408d9..59dbbd4a 100644 --- a/include/Actor/ActorUnkKMOS.hpp +++ b/include/Actor/ActorUnkKMOS.hpp @@ -11,7 +11,7 @@ class ActorUnkKMOS_C4 : public Actor_C4 { public: ActorUnkKMOS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKMSO.hpp b/include/Actor/ActorUnkKMSO.hpp index 1d81190b..aaba87c4 100644 --- a/include/Actor/ActorUnkKMSO.hpp +++ b/include/Actor/ActorUnkKMSO.hpp @@ -11,7 +11,7 @@ class ActorUnkKMSO_C4 : public Actor_C4 { public: ActorUnkKMSO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKOAT.hpp b/include/Actor/ActorUnkKOAT.hpp index 8b8e700b..61520a37 100644 --- a/include/Actor/ActorUnkKOAT.hpp +++ b/include/Actor/ActorUnkKOAT.hpp @@ -11,7 +11,7 @@ class ActorUnkKOAT_C4 : public Actor_C4 { public: ActorUnkKOAT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKOCH.hpp b/include/Actor/ActorUnkKOCH.hpp index 56e84615..c012737c 100644 --- a/include/Actor/ActorUnkKOCH.hpp +++ b/include/Actor/ActorUnkKOCH.hpp @@ -11,7 +11,7 @@ class ActorUnkKOCH_C4 : public Actor_C4 { public: ActorUnkKOCH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKOKO.hpp b/include/Actor/ActorUnkKOKO.hpp index 5439c4e1..ea0f37a9 100644 --- a/include/Actor/ActorUnkKOKO.hpp +++ b/include/Actor/ActorUnkKOKO.hpp @@ -11,7 +11,7 @@ class ActorUnkKOKO_C4 : public Actor_C4 { public: ActorUnkKOKO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkKOTA.hpp b/include/Actor/ActorUnkKOTA.hpp index 306365a0..d8b62add 100644 --- a/include/Actor/ActorUnkKOTA.hpp +++ b/include/Actor/ActorUnkKOTA.hpp @@ -11,7 +11,7 @@ class ActorUnkKOTA_C4 : public Actor_C4 { public: ActorUnkKOTA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkL2MT.hpp b/include/Actor/ActorUnkL2MT.hpp index a8928add..f3e3fac9 100644 --- a/include/Actor/ActorUnkL2MT.hpp +++ b/include/Actor/ActorUnkL2MT.hpp @@ -11,7 +11,7 @@ class ActorUnkL2MT_C4 : public Actor_C4 { public: ActorUnkL2MT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkL2V1.hpp b/include/Actor/ActorUnkL2V1.hpp index d1946dba..4430f80a 100644 --- a/include/Actor/ActorUnkL2V1.hpp +++ b/include/Actor/ActorUnkL2V1.hpp @@ -11,7 +11,7 @@ class ActorUnkL2V1_C4 : public Actor_C4 { public: ActorUnkL2V1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkL2V2.hpp b/include/Actor/ActorUnkL2V2.hpp index b815f6ae..e598dabb 100644 --- a/include/Actor/ActorUnkL2V2.hpp +++ b/include/Actor/ActorUnkL2V2.hpp @@ -11,7 +11,7 @@ class ActorUnkL2V2_C4 : public Actor_C4 { public: ActorUnkL2V2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLAVA.hpp b/include/Actor/ActorUnkLAVA.hpp index 11db99f5..9055002c 100644 --- a/include/Actor/ActorUnkLAVA.hpp +++ b/include/Actor/ActorUnkLAVA.hpp @@ -11,7 +11,7 @@ class ActorUnkLAVA_C4 : public Actor_C4 { public: ActorUnkLAVA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLBCK.hpp b/include/Actor/ActorUnkLBCK.hpp index cc051f51..6667846f 100644 --- a/include/Actor/ActorUnkLBCK.hpp +++ b/include/Actor/ActorUnkLBCK.hpp @@ -11,7 +11,7 @@ class ActorUnkLBCK_C4 : public Actor_C4 { public: ActorUnkLBCK_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLBRC.hpp b/include/Actor/ActorUnkLBRC.hpp index 9cd7b892..ac0f041c 100644 --- a/include/Actor/ActorUnkLBRC.hpp +++ b/include/Actor/ActorUnkLBRC.hpp @@ -11,7 +11,7 @@ class ActorUnkLBRC_C4 : public Actor_C4 { public: ActorUnkLBRC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLIKE.hpp b/include/Actor/ActorUnkLIKE.hpp index 80b590e9..4a0bdbd4 100644 --- a/include/Actor/ActorUnkLIKE.hpp +++ b/include/Actor/ActorUnkLIKE.hpp @@ -11,7 +11,7 @@ class ActorUnkLIKE_C4 : public Actor_C4 { public: ActorUnkLIKE_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLIRA.hpp b/include/Actor/ActorUnkLIRA.hpp index 0c648dc5..deaee58e 100644 --- a/include/Actor/ActorUnkLIRA.hpp +++ b/include/Actor/ActorUnkLIRA.hpp @@ -11,7 +11,7 @@ class ActorUnkLIRA_C4 : public Actor_C4 { public: ActorUnkLIRA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLOCK.hpp b/include/Actor/ActorUnkLOCK.hpp index e19e7499..547a3b97 100644 --- a/include/Actor/ActorUnkLOCK.hpp +++ b/include/Actor/ActorUnkLOCK.hpp @@ -11,7 +11,7 @@ class ActorUnkLOCK_C4 : public Actor_C4 { public: ActorUnkLOCK_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLVBD.hpp b/include/Actor/ActorUnkLVBD.hpp index 573a697f..092971ea 100644 --- a/include/Actor/ActorUnkLVBD.hpp +++ b/include/Actor/ActorUnkLVBD.hpp @@ -11,7 +11,7 @@ class ActorUnkLVBD_C4 : public Actor_C4 { public: ActorUnkLVBD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLVOF.hpp b/include/Actor/ActorUnkLVOF.hpp index 04619a06..1e761a4e 100644 --- a/include/Actor/ActorUnkLVOF.hpp +++ b/include/Actor/ActorUnkLVOF.hpp @@ -11,7 +11,7 @@ class ActorUnkLVOF_C4 : public Actor_C4 { public: ActorUnkLVOF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkLZET.hpp b/include/Actor/ActorUnkLZET.hpp index b3464c6a..2ee3a00f 100644 --- a/include/Actor/ActorUnkLZET.hpp +++ b/include/Actor/ActorUnkLZET.hpp @@ -11,7 +11,7 @@ class ActorUnkLZET_C4 : public Actor_C4 { public: ActorUnkLZET_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMABC.hpp b/include/Actor/ActorUnkMABC.hpp index 86ebd828..7785750e 100644 --- a/include/Actor/ActorUnkMABC.hpp +++ b/include/Actor/ActorUnkMABC.hpp @@ -11,7 +11,7 @@ class ActorUnkMABC_C4 : public Actor_C4 { public: ActorUnkMABC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMABL.hpp b/include/Actor/ActorUnkMABL.hpp index 2193a83c..07bd660b 100644 --- a/include/Actor/ActorUnkMABL.hpp +++ b/include/Actor/ActorUnkMABL.hpp @@ -11,7 +11,7 @@ class ActorUnkMABL_C4 : public Actor_C4 { public: ActorUnkMABL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMAFI.hpp b/include/Actor/ActorUnkMAFI.hpp index 25400f8c..394aae62 100644 --- a/include/Actor/ActorUnkMAFI.hpp +++ b/include/Actor/ActorUnkMAFI.hpp @@ -11,7 +11,7 @@ class ActorUnkMAFI_C4 : public Actor_C4 { public: ActorUnkMAFI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMAGR.hpp b/include/Actor/ActorUnkMAGR.hpp index c23344e5..4b03f130 100644 --- a/include/Actor/ActorUnkMAGR.hpp +++ b/include/Actor/ActorUnkMAGR.hpp @@ -11,7 +11,7 @@ class ActorUnkMAGR_C4 : public Actor_C4 { public: ActorUnkMAGR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMARG.hpp b/include/Actor/ActorUnkMARG.hpp index 3924794b..05c06e12 100644 --- a/include/Actor/ActorUnkMARG.hpp +++ b/include/Actor/ActorUnkMARG.hpp @@ -11,7 +11,7 @@ class ActorUnkMARG_C4 : public Actor_C4 { public: ActorUnkMARG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMATR.hpp b/include/Actor/ActorUnkMATR.hpp index bf343894..5d89330a 100644 --- a/include/Actor/ActorUnkMATR.hpp +++ b/include/Actor/ActorUnkMATR.hpp @@ -11,7 +11,7 @@ class ActorUnkMATR_C4 : public Actor_C4 { public: ActorUnkMATR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMBCC.hpp b/include/Actor/ActorUnkMBCC.hpp index 519be66c..3cf56909 100644 --- a/include/Actor/ActorUnkMBCC.hpp +++ b/include/Actor/ActorUnkMBCC.hpp @@ -11,7 +11,7 @@ class ActorUnkMBCC_C4 : public Actor_C4 { public: ActorUnkMBCC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMDYG.hpp b/include/Actor/ActorUnkMDYG.hpp index 0af13acd..44adf053 100644 --- a/include/Actor/ActorUnkMDYG.hpp +++ b/include/Actor/ActorUnkMDYG.hpp @@ -11,7 +11,7 @@ class ActorUnkMDYG_C4 : public Actor_C4 { public: ActorUnkMDYG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMGAJ.hpp b/include/Actor/ActorUnkMGAJ.hpp index ccd1400f..faee9016 100644 --- a/include/Actor/ActorUnkMGAJ.hpp +++ b/include/Actor/ActorUnkMGAJ.hpp @@ -11,7 +11,7 @@ class ActorUnkMGAJ_C4 : public Actor_C4 { public: ActorUnkMGAJ_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMIFR.hpp b/include/Actor/ActorUnkMIFR.hpp index 4fa69f4a..fd357c0c 100644 --- a/include/Actor/ActorUnkMIFR.hpp +++ b/include/Actor/ActorUnkMIFR.hpp @@ -11,7 +11,7 @@ class ActorUnkMIFR_C4 : public Actor_C4 { public: ActorUnkMIFR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMNCB.hpp b/include/Actor/ActorUnkMNCB.hpp index a9153542..a47aa95d 100644 --- a/include/Actor/ActorUnkMNCB.hpp +++ b/include/Actor/ActorUnkMNCB.hpp @@ -11,7 +11,7 @@ class ActorUnkMNCB_C4 : public Actor_C4 { public: ActorUnkMNCB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMOCT.hpp b/include/Actor/ActorUnkMOCT.hpp index 928a7694..71517036 100644 --- a/include/Actor/ActorUnkMOCT.hpp +++ b/include/Actor/ActorUnkMOCT.hpp @@ -11,7 +11,7 @@ class ActorUnkMOCT_C4 : public Actor_C4 { public: ActorUnkMOCT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMRD2.hpp b/include/Actor/ActorUnkMRD2.hpp index 613ecf51..bbfa2e87 100644 --- a/include/Actor/ActorUnkMRD2.hpp +++ b/include/Actor/ActorUnkMRD2.hpp @@ -11,7 +11,7 @@ class ActorUnkMRD2_C4 : public Actor_C4 { public: ActorUnkMRD2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -115,7 +115,7 @@ public: void func_ov075_0215b578(void); void func_ov075_0215b914(void); void func_ov075_0215bbe8(void); - bool func_ov075_0215bbf0(ActorRef *param1, unk32 *param2); + bool func_ov075_0215bbf0(RefStruct *param1, unk32 *param2); void func_ov075_0215bc50(void); void func_ov075_0215bd40(void); void func_ov075_0215bd50(void); diff --git a/include/Actor/ActorUnkMRDA_MRDO.hpp b/include/Actor/ActorUnkMRDA_MRDO.hpp index 0fc2de22..8e691d37 100644 --- a/include/Actor/ActorUnkMRDA_MRDO.hpp +++ b/include/Actor/ActorUnkMRDA_MRDO.hpp @@ -13,7 +13,7 @@ class ActorUnkMRDA_C4 : public Actor_C4 { public: ActorUnkMRDA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkMRDO_C4 : public Actor_C4 { public: ActorUnkMRDO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMRDL.hpp b/include/Actor/ActorUnkMRDL.hpp index db3ff21d..2078a5ef 100644 --- a/include/Actor/ActorUnkMRDL.hpp +++ b/include/Actor/ActorUnkMRDL.hpp @@ -11,7 +11,7 @@ class ActorUnkMRDL_C4 : public Actor_C4 { public: ActorUnkMRDL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMTFB.hpp b/include/Actor/ActorUnkMTFB.hpp index 913df680..7cfc0231 100644 --- a/include/Actor/ActorUnkMTFB.hpp +++ b/include/Actor/ActorUnkMTFB.hpp @@ -11,7 +11,7 @@ class ActorUnkMTFB_C4 : public Actor_C4 { public: ActorUnkMTFB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMTFL.hpp b/include/Actor/ActorUnkMTFL.hpp index b0e10b9f..6393b073 100644 --- a/include/Actor/ActorUnkMTFL.hpp +++ b/include/Actor/ActorUnkMTFL.hpp @@ -11,7 +11,7 @@ class ActorUnkMTFL_C4 : public Actor_C4 { public: ActorUnkMTFL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMTWP.hpp b/include/Actor/ActorUnkMTWP.hpp index eab0f66c..234c8988 100644 --- a/include/Actor/ActorUnkMTWP.hpp +++ b/include/Actor/ActorUnkMTWP.hpp @@ -11,7 +11,7 @@ class ActorUnkMTWP_C4 : public Actor_C4 { public: ActorUnkMTWP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkMZCT.hpp b/include/Actor/ActorUnkMZCT.hpp index 2e163fcd..8334ff99 100644 --- a/include/Actor/ActorUnkMZCT.hpp +++ b/include/Actor/ActorUnkMZCT.hpp @@ -11,7 +11,7 @@ class ActorUnkMZCT_C4 : public Actor_C4 { public: ActorUnkMZCT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNAVI.hpp b/include/Actor/ActorUnkNAVI.hpp index 1f857e77..74df7546 100644 --- a/include/Actor/ActorUnkNAVI.hpp +++ b/include/Actor/ActorUnkNAVI.hpp @@ -11,7 +11,7 @@ class ActorUnkNAVI_C4 : public Actor_C4 { public: ActorUnkNAVI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNCCB_NCMB.hpp b/include/Actor/ActorUnkNCCB_NCMB.hpp index 79e19e4a..59330a7b 100644 --- a/include/Actor/ActorUnkNCCB_NCMB.hpp +++ b/include/Actor/ActorUnkNCCB_NCMB.hpp @@ -13,7 +13,7 @@ class ActorUnkNCCB_C4 : public Actor_C4 { public: ActorUnkNCCB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkNCMB_C4 : public Actor_C4 { public: ActorUnkNCMB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNCWA.hpp b/include/Actor/ActorUnkNCWA.hpp index cdde9b47..579eeeee 100644 --- a/include/Actor/ActorUnkNCWA.hpp +++ b/include/Actor/ActorUnkNCWA.hpp @@ -11,7 +11,7 @@ class ActorUnkNCWA_C4 : public Actor_C4 { public: ActorUnkNCWA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNFSP.hpp b/include/Actor/ActorUnkNFSP.hpp index 333ad5cb..e084eda8 100644 --- a/include/Actor/ActorUnkNFSP.hpp +++ b/include/Actor/ActorUnkNFSP.hpp @@ -14,7 +14,7 @@ class ActorUnkNFSP_C0 : public Actor_C4 { public: ActorUnkNFSP_C0(ActorUnkNFSP *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(VecFx32 *param1) override; @@ -28,7 +28,7 @@ public: /* 9C */ MapObjectUnkSWFS *mUnk_9C; /* A0 */ Actor_9C mUnk_A0; /* C0 */ ActorUnkNFSP_C0 mUnk_C0; - /* E4 */ ActorRef mUnk_E4; + /* E4 */ RefStruct mUnk_E4; /* E8 */ ActorUnkNFSP(); @@ -43,7 +43,7 @@ public: void func_ov031_020fb9b4(); void func_ov031_020fba60(); void func_ov031_020fbb8c(); - void func_ov031_020fbba0(ActorRef ref); + void func_ov031_020fbba0(RefStruct ref); void func_ov031_020fbbe0(); }; diff --git a/include/Actor/ActorUnkNICO.hpp b/include/Actor/ActorUnkNICO.hpp index 6e49c971..f38ce8cb 100644 --- a/include/Actor/ActorUnkNICO.hpp +++ b/include/Actor/ActorUnkNICO.hpp @@ -11,7 +11,7 @@ class ActorUnkNICO_C4 : public Actor_C4 { public: ActorUnkNICO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNLTR.hpp b/include/Actor/ActorUnkNLTR.hpp index 9bde21bd..eef6ba1a 100644 --- a/include/Actor/ActorUnkNLTR.hpp +++ b/include/Actor/ActorUnkNLTR.hpp @@ -11,7 +11,7 @@ class ActorUnkNLTR_C4 : public Actor_C4 { public: ActorUnkNLTR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNPWC.hpp b/include/Actor/ActorUnkNPWC.hpp index c3ae5125..452f7219 100644 --- a/include/Actor/ActorUnkNPWC.hpp +++ b/include/Actor/ActorUnkNPWC.hpp @@ -11,7 +11,7 @@ class ActorUnkNPWC_C4 : public Actor_C4 { public: ActorUnkNPWC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNSHD.hpp b/include/Actor/ActorUnkNSHD.hpp index dfcdcf7b..059bd7a4 100644 --- a/include/Actor/ActorUnkNSHD.hpp +++ b/include/Actor/ActorUnkNSHD.hpp @@ -11,7 +11,7 @@ class ActorUnkNSHD_C4 : public Actor_C4 { public: ActorUnkNSHD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNSSW.hpp b/include/Actor/ActorUnkNSSW.hpp index 7d022881..32cf4b31 100644 --- a/include/Actor/ActorUnkNSSW.hpp +++ b/include/Actor/ActorUnkNSSW.hpp @@ -12,7 +12,7 @@ class ActorUnkNSSW_C4 : public Actor_C4 { public: ActorUnkNSSW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkNSTN.hpp b/include/Actor/ActorUnkNSTN.hpp index b40421e8..a5d8a479 100644 --- a/include/Actor/ActorUnkNSTN.hpp +++ b/include/Actor/ActorUnkNSTN.hpp @@ -11,7 +11,7 @@ class ActorUnkNSTN_C4 : public Actor_C4 { public: ActorUnkNSTN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOCGS.hpp b/include/Actor/ActorUnkOCGS.hpp index cfe16972..8dc8d82b 100644 --- a/include/Actor/ActorUnkOCGS.hpp +++ b/include/Actor/ActorUnkOCGS.hpp @@ -11,7 +11,7 @@ class ActorUnkOCGS_C4 : public Actor_C4 { public: ActorUnkOCGS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOCTA.hpp b/include/Actor/ActorUnkOCTA.hpp index cb417afc..9d089ca5 100644 --- a/include/Actor/ActorUnkOCTA.hpp +++ b/include/Actor/ActorUnkOCTA.hpp @@ -11,7 +11,7 @@ class ActorUnkOCTA_C4 : public Actor_C4 { public: ActorUnkOCTA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOCTG.hpp b/include/Actor/ActorUnkOCTG.hpp index 0a217efe..12bf9a12 100644 --- a/include/Actor/ActorUnkOCTG.hpp +++ b/include/Actor/ActorUnkOCTG.hpp @@ -11,7 +11,7 @@ class ActorUnkOCTG_C4 : public Actor_C4 { public: ActorUnkOCTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOCTS.hpp b/include/Actor/ActorUnkOCTS.hpp index 14af9b86..a307a707 100644 --- a/include/Actor/ActorUnkOCTS.hpp +++ b/include/Actor/ActorUnkOCTS.hpp @@ -11,7 +11,7 @@ class ActorUnkOCTS_C4 : public Actor_C4 { public: ActorUnkOCTS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOCTW.hpp b/include/Actor/ActorUnkOCTW.hpp index 4375edda..1dccff68 100644 --- a/include/Actor/ActorUnkOCTW.hpp +++ b/include/Actor/ActorUnkOCTW.hpp @@ -11,7 +11,7 @@ class ActorUnkOCTW_C4 : public Actor_C4 { public: ActorUnkOCTW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOCWS.hpp b/include/Actor/ActorUnkOCWS.hpp index 934a668d..355ddced 100644 --- a/include/Actor/ActorUnkOCWS.hpp +++ b/include/Actor/ActorUnkOCWS.hpp @@ -11,7 +11,7 @@ class ActorUnkOCWS_C4 : public Actor_C4 { public: ActorUnkOCWS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOFSW.hpp b/include/Actor/ActorUnkOFSW.hpp index 16d112fc..90dd3ebe 100644 --- a/include/Actor/ActorUnkOFSW.hpp +++ b/include/Actor/ActorUnkOFSW.hpp @@ -11,7 +11,7 @@ class ActorUnkOFSW_C4 : public Actor_C4 { public: ActorUnkOFSW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOLDM.hpp b/include/Actor/ActorUnkOLDM.hpp index 6bf17896..139ccab6 100644 --- a/include/Actor/ActorUnkOLDM.hpp +++ b/include/Actor/ActorUnkOLDM.hpp @@ -11,7 +11,7 @@ class ActorUnkOLDM_C4 : public Actor_C4 { public: ActorUnkOLDM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkOLDS.hpp b/include/Actor/ActorUnkOLDS.hpp index 7381a427..4f65933e 100644 --- a/include/Actor/ActorUnkOLDS.hpp +++ b/include/Actor/ActorUnkOLDS.hpp @@ -11,7 +11,7 @@ class ActorUnkOLDS_C4 : public Actor_C4 { public: ActorUnkOLDS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPASS.hpp b/include/Actor/ActorUnkPASS.hpp index a5239623..fb3e9fa8 100644 --- a/include/Actor/ActorUnkPASS.hpp +++ b/include/Actor/ActorUnkPASS.hpp @@ -11,7 +11,7 @@ class ActorUnkPASS_C4 : public Actor_C4 { public: ActorUnkPASS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPBK2.hpp b/include/Actor/ActorUnkPBK2.hpp index f563bc93..8fdb49da 100644 --- a/include/Actor/ActorUnkPBK2.hpp +++ b/include/Actor/ActorUnkPBK2.hpp @@ -11,7 +11,7 @@ class ActorUnkPBK2_C4 : public Actor_C4 { public: ActorUnkPBK2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPBSP.hpp b/include/Actor/ActorUnkPBSP.hpp index 334d9498..040a7748 100644 --- a/include/Actor/ActorUnkPBSP.hpp +++ b/include/Actor/ActorUnkPBSP.hpp @@ -11,7 +11,7 @@ class ActorUnkPBSP_C4 : public Actor_C4 { public: ActorUnkPBSP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPCTG.hpp b/include/Actor/ActorUnkPCTG.hpp index 16a71618..42417691 100644 --- a/include/Actor/ActorUnkPCTG.hpp +++ b/include/Actor/ActorUnkPCTG.hpp @@ -11,7 +11,7 @@ class ActorUnkPCTG_C4 : public Actor_C4 { public: ActorUnkPCTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPHEY.hpp b/include/Actor/ActorUnkPHEY.hpp index f3f43a14..d015cb40 100644 --- a/include/Actor/ActorUnkPHEY.hpp +++ b/include/Actor/ActorUnkPHEY.hpp @@ -11,7 +11,7 @@ class ActorUnkPHEY_C4 : public Actor_C4 { public: ActorUnkPHEY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPHTM.hpp b/include/Actor/ActorUnkPHTM.hpp index 304c36ca..001d8a17 100644 --- a/include/Actor/ActorUnkPHTM.hpp +++ b/include/Actor/ActorUnkPHTM.hpp @@ -11,7 +11,7 @@ class ActorUnkPHTM_C4 : public Actor_C4 { public: ActorUnkPHTM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPLSR.hpp b/include/Actor/ActorUnkPLSR.hpp index be39eaa0..195568e0 100644 --- a/include/Actor/ActorUnkPLSR.hpp +++ b/include/Actor/ActorUnkPLSR.hpp @@ -11,7 +11,7 @@ class ActorUnkPLSR_C4 : public Actor_C4 { public: ActorUnkPLSR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPMST.hpp b/include/Actor/ActorUnkPMST.hpp index 7f17e24c..a8bc6dbb 100644 --- a/include/Actor/ActorUnkPMST.hpp +++ b/include/Actor/ActorUnkPMST.hpp @@ -11,7 +11,7 @@ class ActorUnkPMST_C4 : public Actor_C4 { public: ActorUnkPMST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPMTB.hpp b/include/Actor/ActorUnkPMTB.hpp index 0f071011..d24d7ee5 100644 --- a/include/Actor/ActorUnkPMTB.hpp +++ b/include/Actor/ActorUnkPMTB.hpp @@ -11,7 +11,7 @@ class ActorUnkPMTB_C4 : public Actor_C4 { public: ActorUnkPMTB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPMTC.hpp b/include/Actor/ActorUnkPMTC.hpp index 3fd91fab..89384fea 100644 --- a/include/Actor/ActorUnkPMTC.hpp +++ b/include/Actor/ActorUnkPMTC.hpp @@ -11,7 +11,7 @@ class ActorUnkPMTC_C4 : public Actor_C4 { public: ActorUnkPMTC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPMTD.hpp b/include/Actor/ActorUnkPMTD.hpp index 21e63bab..e390f729 100644 --- a/include/Actor/ActorUnkPMTD.hpp +++ b/include/Actor/ActorUnkPMTD.hpp @@ -11,7 +11,7 @@ class ActorUnkPMTD_C4 : public Actor_C4 { public: ActorUnkPMTD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPMTT.hpp b/include/Actor/ActorUnkPMTT.hpp index f84eb48f..c2936f95 100644 --- a/include/Actor/ActorUnkPMTT.hpp +++ b/include/Actor/ActorUnkPMTT.hpp @@ -11,7 +11,7 @@ class ActorUnkPMTT_C4 : public Actor_C4 { public: ActorUnkPMTT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPOST.hpp b/include/Actor/ActorUnkPOST.hpp index 371e3167..31e0b729 100644 --- a/include/Actor/ActorUnkPOST.hpp +++ b/include/Actor/ActorUnkPOST.hpp @@ -11,7 +11,7 @@ class ActorUnkPOST_C4 : public Actor_C4 { public: ActorUnkPOST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPPPM.hpp b/include/Actor/ActorUnkPPPM.hpp index 3d2aba84..25287b94 100644 --- a/include/Actor/ActorUnkPPPM.hpp +++ b/include/Actor/ActorUnkPPPM.hpp @@ -11,7 +11,7 @@ class ActorUnkPPPM_C4 : public Actor_C4 { public: ActorUnkPPPM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPRPL.hpp b/include/Actor/ActorUnkPRPL.hpp index 570d58f9..629e5e09 100644 --- a/include/Actor/ActorUnkPRPL.hpp +++ b/include/Actor/ActorUnkPRPL.hpp @@ -11,7 +11,7 @@ class ActorUnkPRPL_C4 : public Actor_C4 { public: ActorUnkPRPL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPRPP.hpp b/include/Actor/ActorUnkPRPP.hpp index 90574e8a..7e69a7f0 100644 --- a/include/Actor/ActorUnkPRPP.hpp +++ b/include/Actor/ActorUnkPRPP.hpp @@ -11,7 +11,7 @@ class ActorUnkPRPP_C4 : public Actor_C4 { public: ActorUnkPRPP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPRSP.hpp b/include/Actor/ActorUnkPRSP.hpp index cb3fb0fe..a97ac99c 100644 --- a/include/Actor/ActorUnkPRSP.hpp +++ b/include/Actor/ActorUnkPRSP.hpp @@ -11,7 +11,7 @@ class ActorUnkPRSP_C4 : public Actor_C4 { public: ActorUnkPRSP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPSBK.hpp b/include/Actor/ActorUnkPSBK.hpp index 690111bd..26121b02 100644 --- a/include/Actor/ActorUnkPSBK.hpp +++ b/include/Actor/ActorUnkPSBK.hpp @@ -11,7 +11,7 @@ class ActorUnkPSBK_C4 : public Actor_C4 { public: ActorUnkPSBK_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPSBL.hpp b/include/Actor/ActorUnkPSBL.hpp index d62d2efc..ee020707 100644 --- a/include/Actor/ActorUnkPSBL.hpp +++ b/include/Actor/ActorUnkPSBL.hpp @@ -11,7 +11,7 @@ class ActorUnkPSBL_C4 : public Actor_C4 { public: ActorUnkPSBL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPSBS.hpp b/include/Actor/ActorUnkPSBS.hpp index 5e3b094f..cd2edf96 100644 --- a/include/Actor/ActorUnkPSBS.hpp +++ b/include/Actor/ActorUnkPSBS.hpp @@ -11,7 +11,7 @@ class ActorUnkPSBS_C4 : public Actor_C4 { public: ActorUnkPSBS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPSEM.hpp b/include/Actor/ActorUnkPSEM.hpp index 7858b039..0e0ca6ad 100644 --- a/include/Actor/ActorUnkPSEM.hpp +++ b/include/Actor/ActorUnkPSEM.hpp @@ -11,7 +11,7 @@ class ActorUnkPSEM_C4 : public Actor_C4 { public: ActorUnkPSEM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPSNP.hpp b/include/Actor/ActorUnkPSNP.hpp index 2293ea43..0eeedd9e 100644 --- a/include/Actor/ActorUnkPSNP.hpp +++ b/include/Actor/ActorUnkPSNP.hpp @@ -11,7 +11,7 @@ class ActorUnkPSNP_C4 : public Actor_C4 { public: ActorUnkPSNP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPSWB.hpp b/include/Actor/ActorUnkPSWB.hpp index 0594dace..e9f1afd2 100644 --- a/include/Actor/ActorUnkPSWB.hpp +++ b/include/Actor/ActorUnkPSWB.hpp @@ -11,7 +11,7 @@ class ActorUnkPSWB_C4 : public Actor_C4 { public: ActorUnkPSWB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPTMN.hpp b/include/Actor/ActorUnkPTMN.hpp index 65d61f1a..da149b49 100644 --- a/include/Actor/ActorUnkPTMN.hpp +++ b/include/Actor/ActorUnkPTMN.hpp @@ -11,7 +11,7 @@ class ActorUnkPTMN_C4 : public Actor_C4 { public: ActorUnkPTMN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkPTSW.hpp b/include/Actor/ActorUnkPTSW.hpp index 7b902d71..8ce40e2d 100644 --- a/include/Actor/ActorUnkPTSW.hpp +++ b/include/Actor/ActorUnkPTSW.hpp @@ -11,7 +11,7 @@ class ActorUnkPTSW_C4 : public Actor_C4 { public: ActorUnkPTSW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkQKSD.hpp b/include/Actor/ActorUnkQKSD.hpp index 9ee95dc4..5ee4414e 100644 --- a/include/Actor/ActorUnkQKSD.hpp +++ b/include/Actor/ActorUnkQKSD.hpp @@ -11,7 +11,7 @@ class ActorUnkQKSD_C4 : public Actor_C4 { public: ActorUnkQKSD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkQKTG.hpp b/include/Actor/ActorUnkQKTG.hpp index d2497ed0..213ec1f8 100644 --- a/include/Actor/ActorUnkQKTG.hpp +++ b/include/Actor/ActorUnkQKTG.hpp @@ -11,7 +11,7 @@ class ActorUnkQKTG_C4 : public Actor_C4 { public: ActorUnkQKTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRAT0.hpp b/include/Actor/ActorUnkRAT0.hpp index 0cf6bd03..3ffc9e5e 100644 --- a/include/Actor/ActorUnkRAT0.hpp +++ b/include/Actor/ActorUnkRAT0.hpp @@ -16,7 +16,7 @@ class ActorUnkRAT0_C4 : public Actor_C4 { public: ActorUnkRAT0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRB1F.hpp b/include/Actor/ActorUnkRB1F.hpp index e59bf277..db207b78 100644 --- a/include/Actor/ActorUnkRB1F.hpp +++ b/include/Actor/ActorUnkRB1F.hpp @@ -11,7 +11,7 @@ class ActorUnkRB1F_C4 : public Actor_C4 { public: ActorUnkRB1F_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRB1T.hpp b/include/Actor/ActorUnkRB1T.hpp index 81472f83..a4e59b75 100644 --- a/include/Actor/ActorUnkRB1T.hpp +++ b/include/Actor/ActorUnkRB1T.hpp @@ -12,7 +12,7 @@ class ActorUnkRB1T_C4 : public Actor_C4 { public: ActorUnkRB1T_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBD2.hpp b/include/Actor/ActorUnkRBD2.hpp index 0c7efd2b..754fd7ec 100644 --- a/include/Actor/ActorUnkRBD2.hpp +++ b/include/Actor/ActorUnkRBD2.hpp @@ -11,7 +11,7 @@ class ActorUnkRBD2_C4 : public Actor_C4 { public: ActorUnkRBD2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBDS.hpp b/include/Actor/ActorUnkRBDS.hpp index 82a643cd..d4cc47a4 100644 --- a/include/Actor/ActorUnkRBDS.hpp +++ b/include/Actor/ActorUnkRBDS.hpp @@ -11,7 +11,7 @@ class ActorUnkRBDS_C4 : public Actor_C4 { public: ActorUnkRBDS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBFR.hpp b/include/Actor/ActorUnkRBFR.hpp index 8e61dd2b..68f94fe4 100644 --- a/include/Actor/ActorUnkRBFR.hpp +++ b/include/Actor/ActorUnkRBFR.hpp @@ -11,7 +11,7 @@ class ActorUnkRBFR_C4 : public Actor_C4 { public: ActorUnkRBFR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBL1.hpp b/include/Actor/ActorUnkRBL1.hpp index 1f21876a..989f955d 100644 --- a/include/Actor/ActorUnkRBL1.hpp +++ b/include/Actor/ActorUnkRBL1.hpp @@ -11,7 +11,7 @@ class ActorUnkRBL1_C4 : public Actor_C4 { public: ActorUnkRBL1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBL2.hpp b/include/Actor/ActorUnkRBL2.hpp index eb68b077..98a73662 100644 --- a/include/Actor/ActorUnkRBL2.hpp +++ b/include/Actor/ActorUnkRBL2.hpp @@ -11,7 +11,7 @@ class ActorUnkRBL2_C4 : public Actor_C4 { public: ActorUnkRBL2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBNT.hpp b/include/Actor/ActorUnkRBNT.hpp index 962ff4a5..a65a8686 100644 --- a/include/Actor/ActorUnkRBNT.hpp +++ b/include/Actor/ActorUnkRBNT.hpp @@ -11,7 +11,7 @@ class ActorUnkRBNT_C4 : public Actor_C4 { public: ActorUnkRBNT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBRP.hpp b/include/Actor/ActorUnkRBRP.hpp index 5290b800..fe88b3f2 100644 --- a/include/Actor/ActorUnkRBRP.hpp +++ b/include/Actor/ActorUnkRBRP.hpp @@ -11,7 +11,7 @@ class ActorUnkRBRP_C4 : public Actor_C4 { public: ActorUnkRBRP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBRT.hpp b/include/Actor/ActorUnkRBRT.hpp index 3cb934f4..5b332b89 100644 --- a/include/Actor/ActorUnkRBRT.hpp +++ b/include/Actor/ActorUnkRBRT.hpp @@ -11,7 +11,7 @@ class ActorUnkRBRT_C4 : public Actor_C4 { public: ActorUnkRBRT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBSN.hpp b/include/Actor/ActorUnkRBSN.hpp index c3fa9a0b..3e239642 100644 --- a/include/Actor/ActorUnkRBSN.hpp +++ b/include/Actor/ActorUnkRBSN.hpp @@ -11,7 +11,7 @@ class ActorUnkRBSN_C4 : public Actor_C4 { public: ActorUnkRBSN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBVC.hpp b/include/Actor/ActorUnkRBVC.hpp index daf0f1a1..cd26a5cf 100644 --- a/include/Actor/ActorUnkRBVC.hpp +++ b/include/Actor/ActorUnkRBVC.hpp @@ -11,7 +11,7 @@ class ActorUnkRBVC_C4 : public Actor_C4 { public: ActorUnkRBVC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBWS.hpp b/include/Actor/ActorUnkRBWS.hpp index cc9ca9e7..46f4230e 100644 --- a/include/Actor/ActorUnkRBWS.hpp +++ b/include/Actor/ActorUnkRBWS.hpp @@ -11,7 +11,7 @@ class ActorUnkRBWS_C4 : public Actor_C4 { public: ActorUnkRBWS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRBWT.hpp b/include/Actor/ActorUnkRBWT.hpp index 6987c87c..d1075c33 100644 --- a/include/Actor/ActorUnkRBWT.hpp +++ b/include/Actor/ActorUnkRBWT.hpp @@ -11,7 +11,7 @@ class ActorUnkRBWT_C4 : public Actor_C4 { public: ActorUnkRBWT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRCFO.hpp b/include/Actor/ActorUnkRCFO.hpp index ada98099..8bfb1d69 100644 --- a/include/Actor/ActorUnkRCFO.hpp +++ b/include/Actor/ActorUnkRCFO.hpp @@ -11,7 +11,7 @@ class ActorUnkRCFO_C4 : public Actor_C4 { public: ActorUnkRCFO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRCHU.hpp b/include/Actor/ActorUnkRCHU.hpp index ce86920c..73a1d77e 100644 --- a/include/Actor/ActorUnkRCHU.hpp +++ b/include/Actor/ActorUnkRCHU.hpp @@ -11,7 +11,7 @@ class ActorUnkRCHU_C4 : public Actor_C4 { public: ActorUnkRCHU_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRCMS.hpp b/include/Actor/ActorUnkRCMS.hpp index c830fbad..089094e4 100644 --- a/include/Actor/ActorUnkRCMS.hpp +++ b/include/Actor/ActorUnkRCMS.hpp @@ -11,7 +11,7 @@ class ActorUnkRCMS_C4 : public Actor_C4 { public: ActorUnkRCMS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRCSG.hpp b/include/Actor/ActorUnkRCSG.hpp index d2992769..e3f8602a 100644 --- a/include/Actor/ActorUnkRCSG.hpp +++ b/include/Actor/ActorUnkRCSG.hpp @@ -11,7 +11,7 @@ class ActorUnkRCSG_C4 : public Actor_C4 { public: ActorUnkRCSG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMA0.hpp b/include/Actor/ActorUnkRMA0.hpp index 4360ac99..5e7fba71 100644 --- a/include/Actor/ActorUnkRMA0.hpp +++ b/include/Actor/ActorUnkRMA0.hpp @@ -11,7 +11,7 @@ class ActorUnkRMA0_C4 : public Actor_C4 { public: ActorUnkRMA0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMA1.hpp b/include/Actor/ActorUnkRMA1.hpp index 4882f80d..db6bfff8 100644 --- a/include/Actor/ActorUnkRMA1.hpp +++ b/include/Actor/ActorUnkRMA1.hpp @@ -11,7 +11,7 @@ class ActorUnkRMA1_C4 : public Actor_C4 { public: ActorUnkRMA1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMA2.hpp b/include/Actor/ActorUnkRMA2.hpp index 93eab52d..7436747c 100644 --- a/include/Actor/ActorUnkRMA2.hpp +++ b/include/Actor/ActorUnkRMA2.hpp @@ -11,7 +11,7 @@ class ActorUnkRMA2_C4 : public Actor_C4 { public: ActorUnkRMA2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMA3.hpp b/include/Actor/ActorUnkRMA3.hpp index 3730986d..abee118b 100644 --- a/include/Actor/ActorUnkRMA3.hpp +++ b/include/Actor/ActorUnkRMA3.hpp @@ -11,7 +11,7 @@ class ActorUnkRMA3_C4 : public Actor_C4 { public: ActorUnkRMA3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMAJ.hpp b/include/Actor/ActorUnkRMAJ.hpp index 018003fb..53935b88 100644 --- a/include/Actor/ActorUnkRMAJ.hpp +++ b/include/Actor/ActorUnkRMAJ.hpp @@ -11,7 +11,7 @@ class ActorUnkRMAJ_C4 : public Actor_C4 { public: ActorUnkRMAJ_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMBC.hpp b/include/Actor/ActorUnkRMBC.hpp index 7dfd8ec8..5cb17363 100644 --- a/include/Actor/ActorUnkRMBC.hpp +++ b/include/Actor/ActorUnkRMBC.hpp @@ -11,7 +11,7 @@ class ActorUnkRMBC_C4 : public Actor_C4 { public: ActorUnkRMBC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMBD.hpp b/include/Actor/ActorUnkRMBD.hpp index 1d9d6b4f..cda27830 100644 --- a/include/Actor/ActorUnkRMBD.hpp +++ b/include/Actor/ActorUnkRMBD.hpp @@ -11,7 +11,7 @@ class ActorUnkRMBD_C4 : public Actor_C4 { public: ActorUnkRMBD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMC0.hpp b/include/Actor/ActorUnkRMC0.hpp index e4217250..59a374ab 100644 --- a/include/Actor/ActorUnkRMC0.hpp +++ b/include/Actor/ActorUnkRMC0.hpp @@ -11,7 +11,7 @@ class ActorUnkRMC0_C4 : public Actor_C4 { public: ActorUnkRMC0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMC1.hpp b/include/Actor/ActorUnkRMC1.hpp index 120d5464..4cfc41a8 100644 --- a/include/Actor/ActorUnkRMC1.hpp +++ b/include/Actor/ActorUnkRMC1.hpp @@ -11,7 +11,7 @@ class ActorUnkRMC1_C4 : public Actor_C4 { public: ActorUnkRMC1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMC2.hpp b/include/Actor/ActorUnkRMC2.hpp index 415641c4..fd7ca18a 100644 --- a/include/Actor/ActorUnkRMC2.hpp +++ b/include/Actor/ActorUnkRMC2.hpp @@ -11,7 +11,7 @@ class ActorUnkRMC2_C4 : public Actor_C4 { public: ActorUnkRMC2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMC3.hpp b/include/Actor/ActorUnkRMC3.hpp index af9bcdd3..8eb1d224 100644 --- a/include/Actor/ActorUnkRMC3.hpp +++ b/include/Actor/ActorUnkRMC3.hpp @@ -11,7 +11,7 @@ class ActorUnkRMC3_C4 : public Actor_C4 { public: ActorUnkRMC3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMC4.hpp b/include/Actor/ActorUnkRMC4.hpp index 1c16e064..8eea985f 100644 --- a/include/Actor/ActorUnkRMC4.hpp +++ b/include/Actor/ActorUnkRMC4.hpp @@ -11,7 +11,7 @@ class ActorUnkRMC4_C4 : public Actor_C4 { public: ActorUnkRMC4_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMC5.hpp b/include/Actor/ActorUnkRMC5.hpp index ee6d2a13..b6c7e771 100644 --- a/include/Actor/ActorUnkRMC5.hpp +++ b/include/Actor/ActorUnkRMC5.hpp @@ -11,7 +11,7 @@ class ActorUnkRMC5_C4 : public Actor_C4 { public: ActorUnkRMC5_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMC6.hpp b/include/Actor/ActorUnkRMC6.hpp index 172f1d2a..36279a50 100644 --- a/include/Actor/ActorUnkRMC6.hpp +++ b/include/Actor/ActorUnkRMC6.hpp @@ -11,7 +11,7 @@ class ActorUnkRMC6_C4 : public Actor_C4 { public: ActorUnkRMC6_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMDO.hpp b/include/Actor/ActorUnkRMDO.hpp index 084fd7a7..e5e27e61 100644 --- a/include/Actor/ActorUnkRMDO.hpp +++ b/include/Actor/ActorUnkRMDO.hpp @@ -11,7 +11,7 @@ class ActorUnkRMDO_C4 : public Actor_C4 { public: ActorUnkRMDO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMDS.hpp b/include/Actor/ActorUnkRMDS.hpp index 1e788186..ce9efb18 100644 --- a/include/Actor/ActorUnkRMDS.hpp +++ b/include/Actor/ActorUnkRMDS.hpp @@ -11,7 +11,7 @@ class ActorUnkRMDS_C4 : public Actor_C4 { public: ActorUnkRMDS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMF0.hpp b/include/Actor/ActorUnkRMF0.hpp index 030538ff..111a7de7 100644 --- a/include/Actor/ActorUnkRMF0.hpp +++ b/include/Actor/ActorUnkRMF0.hpp @@ -11,7 +11,7 @@ class ActorUnkRMF0_C4 : public Actor_C4 { public: ActorUnkRMF0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMF1.hpp b/include/Actor/ActorUnkRMF1.hpp index 86494a98..173f3e5f 100644 --- a/include/Actor/ActorUnkRMF1.hpp +++ b/include/Actor/ActorUnkRMF1.hpp @@ -11,7 +11,7 @@ class ActorUnkRMF1_C4 : public Actor_C4 { public: ActorUnkRMF1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMFK.hpp b/include/Actor/ActorUnkRMFK.hpp index cf49c56e..13d39016 100644 --- a/include/Actor/ActorUnkRMFK.hpp +++ b/include/Actor/ActorUnkRMFK.hpp @@ -11,7 +11,7 @@ class ActorUnkRMFK_C4 : public Actor_C4 { public: ActorUnkRMFK_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRML0.hpp b/include/Actor/ActorUnkRML0.hpp index a3f0fa74..56fd0dd3 100644 --- a/include/Actor/ActorUnkRML0.hpp +++ b/include/Actor/ActorUnkRML0.hpp @@ -11,7 +11,7 @@ class ActorUnkRML0_C4 : public Actor_C4 { public: ActorUnkRML0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRML1.hpp b/include/Actor/ActorUnkRML1.hpp index 3100666f..7df3dbd6 100644 --- a/include/Actor/ActorUnkRML1.hpp +++ b/include/Actor/ActorUnkRML1.hpp @@ -11,7 +11,7 @@ class ActorUnkRML1_C4 : public Actor_C4 { public: ActorUnkRML1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRML2.hpp b/include/Actor/ActorUnkRML2.hpp index 137ec68c..2bdf497b 100644 --- a/include/Actor/ActorUnkRML2.hpp +++ b/include/Actor/ActorUnkRML2.hpp @@ -11,7 +11,7 @@ class ActorUnkRML2_C4 : public Actor_C4 { public: ActorUnkRML2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRML3.hpp b/include/Actor/ActorUnkRML3.hpp index b69544dc..a9780311 100644 --- a/include/Actor/ActorUnkRML3.hpp +++ b/include/Actor/ActorUnkRML3.hpp @@ -11,7 +11,7 @@ class ActorUnkRML3_C4 : public Actor_C4 { public: ActorUnkRML3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMLF.hpp b/include/Actor/ActorUnkRMLF.hpp index 955470aa..9c789850 100644 --- a/include/Actor/ActorUnkRMLF.hpp +++ b/include/Actor/ActorUnkRMLF.hpp @@ -11,7 +11,7 @@ class ActorUnkRMLF_C4 : public Actor_C4 { public: ActorUnkRMLF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMM0.hpp b/include/Actor/ActorUnkRMM0.hpp index 9322d1f4..d70d4419 100644 --- a/include/Actor/ActorUnkRMM0.hpp +++ b/include/Actor/ActorUnkRMM0.hpp @@ -11,7 +11,7 @@ class ActorUnkRMM0_C4 : public Actor_C4 { public: ActorUnkRMM0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMM1.hpp b/include/Actor/ActorUnkRMM1.hpp index 39873178..28f12eea 100644 --- a/include/Actor/ActorUnkRMM1.hpp +++ b/include/Actor/ActorUnkRMM1.hpp @@ -11,7 +11,7 @@ class ActorUnkRMM1_C4 : public Actor_C4 { public: ActorUnkRMM1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMM2.hpp b/include/Actor/ActorUnkRMM2.hpp index 91aa6968..e01941d0 100644 --- a/include/Actor/ActorUnkRMM2.hpp +++ b/include/Actor/ActorUnkRMM2.hpp @@ -11,7 +11,7 @@ class ActorUnkRMM2_C4 : public Actor_C4 { public: ActorUnkRMM2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMM3.hpp b/include/Actor/ActorUnkRMM3.hpp index 3c94f817..07587e15 100644 --- a/include/Actor/ActorUnkRMM3.hpp +++ b/include/Actor/ActorUnkRMM3.hpp @@ -11,7 +11,7 @@ class ActorUnkRMM3_C4 : public Actor_C4 { public: ActorUnkRMM3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMM4.hpp b/include/Actor/ActorUnkRMM4.hpp index 9d539741..9dfc5cd3 100644 --- a/include/Actor/ActorUnkRMM4.hpp +++ b/include/Actor/ActorUnkRMM4.hpp @@ -11,7 +11,7 @@ class ActorUnkRMM4_C4 : public Actor_C4 { public: ActorUnkRMM4_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMS0.hpp b/include/Actor/ActorUnkRMS0.hpp index 5101edb2..aa31aa5e 100644 --- a/include/Actor/ActorUnkRMS0.hpp +++ b/include/Actor/ActorUnkRMS0.hpp @@ -11,7 +11,7 @@ class ActorUnkRMS0_C4 : public Actor_C4 { public: ActorUnkRMS0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMS1.hpp b/include/Actor/ActorUnkRMS1.hpp index aa824ad1..d34b62b5 100644 --- a/include/Actor/ActorUnkRMS1.hpp +++ b/include/Actor/ActorUnkRMS1.hpp @@ -11,7 +11,7 @@ class ActorUnkRMS1_C4 : public Actor_C4 { public: ActorUnkRMS1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMS2.hpp b/include/Actor/ActorUnkRMS2.hpp index 9b6e614d..7d1c4c4c 100644 --- a/include/Actor/ActorUnkRMS2.hpp +++ b/include/Actor/ActorUnkRMS2.hpp @@ -11,7 +11,7 @@ class ActorUnkRMS2_C4 : public Actor_C4 { public: ActorUnkRMS2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMS3.hpp b/include/Actor/ActorUnkRMS3.hpp index d9689a59..42bc8f89 100644 --- a/include/Actor/ActorUnkRMS3.hpp +++ b/include/Actor/ActorUnkRMS3.hpp @@ -11,7 +11,7 @@ class ActorUnkRMS3_C4 : public Actor_C4 { public: ActorUnkRMS3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMS4.hpp b/include/Actor/ActorUnkRMS4.hpp index 587388e9..db0e75d7 100644 --- a/include/Actor/ActorUnkRMS4.hpp +++ b/include/Actor/ActorUnkRMS4.hpp @@ -11,7 +11,7 @@ class ActorUnkRMS4_C4 : public Actor_C4 { public: ActorUnkRMS4_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMS5.hpp b/include/Actor/ActorUnkRMS5.hpp index 9b1c7752..c27586e4 100644 --- a/include/Actor/ActorUnkRMS5.hpp +++ b/include/Actor/ActorUnkRMS5.hpp @@ -11,7 +11,7 @@ class ActorUnkRMS5_C4 : public Actor_C4 { public: ActorUnkRMS5_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMST.hpp b/include/Actor/ActorUnkRMST.hpp index f8e236b1..02307e2e 100644 --- a/include/Actor/ActorUnkRMST.hpp +++ b/include/Actor/ActorUnkRMST.hpp @@ -11,7 +11,7 @@ class ActorUnkRMST_C4 : public Actor_C4 { public: ActorUnkRMST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMT0.hpp b/include/Actor/ActorUnkRMT0.hpp index c30f6e56..c091c1b2 100644 --- a/include/Actor/ActorUnkRMT0.hpp +++ b/include/Actor/ActorUnkRMT0.hpp @@ -11,7 +11,7 @@ class ActorUnkRMT0_C4 : public Actor_C4 { public: ActorUnkRMT0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMT1.hpp b/include/Actor/ActorUnkRMT1.hpp index fa5dbba0..a7cec496 100644 --- a/include/Actor/ActorUnkRMT1.hpp +++ b/include/Actor/ActorUnkRMT1.hpp @@ -11,7 +11,7 @@ class ActorUnkRMT1_C4 : public Actor_C4 { public: ActorUnkRMT1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMT2.hpp b/include/Actor/ActorUnkRMT2.hpp index 82476cd4..f1308948 100644 --- a/include/Actor/ActorUnkRMT2.hpp +++ b/include/Actor/ActorUnkRMT2.hpp @@ -11,7 +11,7 @@ class ActorUnkRMT2_C4 : public Actor_C4 { public: ActorUnkRMT2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMT3.hpp b/include/Actor/ActorUnkRMT3.hpp index ed9df382..1b0fb162 100644 --- a/include/Actor/ActorUnkRMT3.hpp +++ b/include/Actor/ActorUnkRMT3.hpp @@ -11,7 +11,7 @@ class ActorUnkRMT3_C4 : public Actor_C4 { public: ActorUnkRMT3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMT4.hpp b/include/Actor/ActorUnkRMT4.hpp index 088aa37e..73c8318b 100644 --- a/include/Actor/ActorUnkRMT4.hpp +++ b/include/Actor/ActorUnkRMT4.hpp @@ -11,7 +11,7 @@ class ActorUnkRMT4_C4 : public Actor_C4 { public: ActorUnkRMT4_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMTB.hpp b/include/Actor/ActorUnkRMTB.hpp index 41033d70..89d7ee02 100644 --- a/include/Actor/ActorUnkRMTB.hpp +++ b/include/Actor/ActorUnkRMTB.hpp @@ -11,7 +11,7 @@ class ActorUnkRMTB_C4 : public Actor_C4 { public: ActorUnkRMTB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMTE.hpp b/include/Actor/ActorUnkRMTE.hpp index e72c07db..adef222e 100644 --- a/include/Actor/ActorUnkRMTE.hpp +++ b/include/Actor/ActorUnkRMTE.hpp @@ -11,7 +11,7 @@ class ActorUnkRMTE_C4 : public Actor_C4 { public: ActorUnkRMTE_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMTR.hpp b/include/Actor/ActorUnkRMTR.hpp index cddcad65..81efdc99 100644 --- a/include/Actor/ActorUnkRMTR.hpp +++ b/include/Actor/ActorUnkRMTR.hpp @@ -11,7 +11,7 @@ class ActorUnkRMTR_C4 : public Actor_C4 { public: ActorUnkRMTR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMTZ.hpp b/include/Actor/ActorUnkRMTZ.hpp index 12c0cfc3..27b69a2c 100644 --- a/include/Actor/ActorUnkRMTZ.hpp +++ b/include/Actor/ActorUnkRMTZ.hpp @@ -11,7 +11,7 @@ class ActorUnkRMTZ_C4 : public Actor_C4 { public: ActorUnkRMTZ_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMV0.hpp b/include/Actor/ActorUnkRMV0.hpp index 3662c95b..f0904aee 100644 --- a/include/Actor/ActorUnkRMV0.hpp +++ b/include/Actor/ActorUnkRMV0.hpp @@ -11,7 +11,7 @@ class ActorUnkRMV0_C4 : public Actor_C4 { public: ActorUnkRMV0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMV1.hpp b/include/Actor/ActorUnkRMV1.hpp index 81ddaed2..8142ea1d 100644 --- a/include/Actor/ActorUnkRMV1.hpp +++ b/include/Actor/ActorUnkRMV1.hpp @@ -11,7 +11,7 @@ class ActorUnkRMV1_C4 : public Actor_C4 { public: ActorUnkRMV1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMVD.hpp b/include/Actor/ActorUnkRMVD.hpp index 9ee69470..0b96fef7 100644 --- a/include/Actor/ActorUnkRMVD.hpp +++ b/include/Actor/ActorUnkRMVD.hpp @@ -11,7 +11,7 @@ class ActorUnkRMVD_C4 : public Actor_C4 { public: ActorUnkRMVD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMVF.hpp b/include/Actor/ActorUnkRMVF.hpp index 23ddc82a..0ce2c652 100644 --- a/include/Actor/ActorUnkRMVF.hpp +++ b/include/Actor/ActorUnkRMVF.hpp @@ -11,7 +11,7 @@ class ActorUnkRMVF_C4 : public Actor_C4 { public: ActorUnkRMVF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMVS.hpp b/include/Actor/ActorUnkRMVS.hpp index c5e83fb3..34374075 100644 --- a/include/Actor/ActorUnkRMVS.hpp +++ b/include/Actor/ActorUnkRMVS.hpp @@ -11,7 +11,7 @@ class ActorUnkRMVS_C4 : public Actor_C4 { public: ActorUnkRMVS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMVT.hpp b/include/Actor/ActorUnkRMVT.hpp index a509ee54..951f5628 100644 --- a/include/Actor/ActorUnkRMVT.hpp +++ b/include/Actor/ActorUnkRMVT.hpp @@ -11,7 +11,7 @@ class ActorUnkRMVT_C4 : public Actor_C4 { public: ActorUnkRMVT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMVV.hpp b/include/Actor/ActorUnkRMVV.hpp index e3582381..6579a04f 100644 --- a/include/Actor/ActorUnkRMVV.hpp +++ b/include/Actor/ActorUnkRMVV.hpp @@ -11,7 +11,7 @@ class ActorUnkRMVV_C4 : public Actor_C4 { public: ActorUnkRMVV_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMVW.hpp b/include/Actor/ActorUnkRMVW.hpp index cc4c49a7..fb1b69fb 100644 --- a/include/Actor/ActorUnkRMVW.hpp +++ b/include/Actor/ActorUnkRMVW.hpp @@ -11,7 +11,7 @@ class ActorUnkRMVW_C4 : public Actor_C4 { public: ActorUnkRMVW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMW0.hpp b/include/Actor/ActorUnkRMW0.hpp index e847bd29..8cc6f6fa 100644 --- a/include/Actor/ActorUnkRMW0.hpp +++ b/include/Actor/ActorUnkRMW0.hpp @@ -11,7 +11,7 @@ class ActorUnkRMW0_C4 : public Actor_C4 { public: ActorUnkRMW0_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRMW1.hpp b/include/Actor/ActorUnkRMW1.hpp index dd6e77f7..7758e859 100644 --- a/include/Actor/ActorUnkRMW1.hpp +++ b/include/Actor/ActorUnkRMW1.hpp @@ -11,7 +11,7 @@ class ActorUnkRMW1_C4 : public Actor_C4 { public: ActorUnkRMW1_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRNTN.hpp b/include/Actor/ActorUnkRNTN.hpp index f35c4226..05ccd02a 100644 --- a/include/Actor/ActorUnkRNTN.hpp +++ b/include/Actor/ActorUnkRNTN.hpp @@ -11,7 +11,7 @@ class ActorUnkRNTN_C4 : public Actor_C4 { public: ActorUnkRNTN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRPMT.hpp b/include/Actor/ActorUnkRPMT.hpp index 5942bbcc..41843b28 100644 --- a/include/Actor/ActorUnkRPMT.hpp +++ b/include/Actor/ActorUnkRPMT.hpp @@ -11,7 +11,7 @@ class ActorUnkRPMT_C4 : public Actor_C4 { public: ActorUnkRPMT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkRYAW.hpp b/include/Actor/ActorUnkRYAW.hpp index 8c3990f5..f6c9797d 100644 --- a/include/Actor/ActorUnkRYAW.hpp +++ b/include/Actor/ActorUnkRYAW.hpp @@ -11,7 +11,7 @@ class ActorUnkRYAW_C4 : public Actor_C4 { public: ActorUnkRYAW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSCCN.hpp b/include/Actor/ActorUnkSCCN.hpp index 4fc151ca..6df8d81d 100644 --- a/include/Actor/ActorUnkSCCN.hpp +++ b/include/Actor/ActorUnkSCCN.hpp @@ -9,7 +9,7 @@ class ActorUnkSCCN_B8 { public: /* 00 (vtable) */ - /* 04 */ ActorRef mUnk_04; + /* 04 */ RefStruct mUnk_04; /* 08 */ VecFx32 *mUnk_08; /* 0C */ MapObject_10_Base *mUnk_0C; /* 10 */ diff --git a/include/Actor/ActorUnkSEAT.hpp b/include/Actor/ActorUnkSEAT.hpp index 17f05f7b..80edf4b3 100644 --- a/include/Actor/ActorUnkSEAT.hpp +++ b/include/Actor/ActorUnkSEAT.hpp @@ -11,7 +11,7 @@ class ActorUnkSEAT_C4 : public Actor_C4 { public: ActorUnkSEAT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSEFS.hpp b/include/Actor/ActorUnkSEFS.hpp index c296e1a0..976ef418 100644 --- a/include/Actor/ActorUnkSEFS.hpp +++ b/include/Actor/ActorUnkSEFS.hpp @@ -11,7 +11,7 @@ class ActorUnkSEFS_C4 : public Actor_C4 { public: ActorUnkSEFS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSGMG.hpp b/include/Actor/ActorUnkSGMG.hpp index e7370d24..2086e7d7 100644 --- a/include/Actor/ActorUnkSGMG.hpp +++ b/include/Actor/ActorUnkSGMG.hpp @@ -11,7 +11,7 @@ class ActorUnkSGMG_C4 : public Actor_C4 { public: ActorUnkSGMG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSHDL.hpp b/include/Actor/ActorUnkSHDL.hpp index 104dc092..1315ec6b 100644 --- a/include/Actor/ActorUnkSHDL.hpp +++ b/include/Actor/ActorUnkSHDL.hpp @@ -11,7 +11,7 @@ class ActorUnkSHDL_C4 : public Actor_C4 { public: ActorUnkSHDL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSHIT.hpp b/include/Actor/ActorUnkSHIT.hpp index 86290596..ad4d51f7 100644 --- a/include/Actor/ActorUnkSHIT.hpp +++ b/include/Actor/ActorUnkSHIT.hpp @@ -12,7 +12,7 @@ class ActorUnkSHIT_C4 : public Actor_C4 { public: ActorUnkSHIT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.hpp b/include/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.hpp index 77858038..65387600 100644 --- a/include/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.hpp +++ b/include/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.hpp @@ -13,7 +13,7 @@ class ActorUnkSIRO_C4 : public Actor_C4 { public: ActorUnkSIRO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkSIRS_C4 : public Actor_C4 { public: ActorUnkSIRS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -81,7 +81,7 @@ class ActorUnkSRNM_C4 : public Actor_C4 { public: ActorUnkSRNM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -115,7 +115,7 @@ class ActorUnkSRSL_C4 : public Actor_C4 { public: ActorUnkSRSL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSMCT.hpp b/include/Actor/ActorUnkSMCT.hpp index d884cdc3..50695abc 100644 --- a/include/Actor/ActorUnkSMCT.hpp +++ b/include/Actor/ActorUnkSMCT.hpp @@ -11,7 +11,7 @@ class ActorUnkSMCT_C4 : public Actor_C4 { public: ActorUnkSMCT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSNMA.hpp b/include/Actor/ActorUnkSNMA.hpp index a50580a6..fce7edda 100644 --- a/include/Actor/ActorUnkSNMA.hpp +++ b/include/Actor/ActorUnkSNMA.hpp @@ -11,7 +11,7 @@ class ActorUnkSNMA_C4 : public Actor_C4 { public: ActorUnkSNMA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSNMB.hpp b/include/Actor/ActorUnkSNMB.hpp index cce13b37..3c99de26 100644 --- a/include/Actor/ActorUnkSNMB.hpp +++ b/include/Actor/ActorUnkSNMB.hpp @@ -11,7 +11,7 @@ class ActorUnkSNMB_C4 : public Actor_C4 { public: ActorUnkSNMB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSNOW.hpp b/include/Actor/ActorUnkSNOW.hpp index d236d97d..b1b620a8 100644 --- a/include/Actor/ActorUnkSNOW.hpp +++ b/include/Actor/ActorUnkSNOW.hpp @@ -11,7 +11,7 @@ class ActorUnkSNOW_C4 : public Actor_C4 { public: ActorUnkSNOW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSNST.hpp b/include/Actor/ActorUnkSNST.hpp index 48e1293a..fd381f7f 100644 --- a/include/Actor/ActorUnkSNST.hpp +++ b/include/Actor/ActorUnkSNST.hpp @@ -11,7 +11,7 @@ class ActorUnkSNST_C4 : public Actor_C4 { public: ActorUnkSNST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSOGB_SOGC_SOLG.hpp b/include/Actor/ActorUnkSOGB_SOGC_SOLG.hpp index 36268532..396418d8 100644 --- a/include/Actor/ActorUnkSOGB_SOGC_SOLG.hpp +++ b/include/Actor/ActorUnkSOGB_SOGC_SOLG.hpp @@ -13,7 +13,7 @@ class ActorUnkSOGB_C4 : public Actor_C4 { public: ActorUnkSOGB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkSOGC_C4 : public Actor_C4 { public: ActorUnkSOGC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -81,7 +81,7 @@ class ActorUnkSOLG_C4 : public Actor_C4 { public: ActorUnkSOLG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSOLB_SOLC_SOLD.hpp b/include/Actor/ActorUnkSOLB_SOLC_SOLD.hpp index 585563d1..3130447d 100644 --- a/include/Actor/ActorUnkSOLB_SOLC_SOLD.hpp +++ b/include/Actor/ActorUnkSOLB_SOLC_SOLD.hpp @@ -13,7 +13,7 @@ class ActorUnkSOLB_C4 : public Actor_C4 { public: ActorUnkSOLB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkSOLC_C4 : public Actor_C4 { public: ActorUnkSOLC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -81,7 +81,7 @@ class ActorUnkSOLD_C4 : public Actor_C4 { public: ActorUnkSOLD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSOLF.hpp b/include/Actor/ActorUnkSOLF.hpp index 3a485c39..309ab52f 100644 --- a/include/Actor/ActorUnkSOLF.hpp +++ b/include/Actor/ActorUnkSOLF.hpp @@ -11,7 +11,7 @@ class ActorUnkSOLF_C4 : public Actor_C4 { public: ActorUnkSOLF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSOLT.hpp b/include/Actor/ActorUnkSOLT.hpp index be79124d..1fedc859 100644 --- a/include/Actor/ActorUnkSOLT.hpp +++ b/include/Actor/ActorUnkSOLT.hpp @@ -11,7 +11,7 @@ class ActorUnkSOLT_C4 : public Actor_C4 { public: ActorUnkSOLT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSPID.hpp b/include/Actor/ActorUnkSPID.hpp index acd5041f..9bc5c091 100644 --- a/include/Actor/ActorUnkSPID.hpp +++ b/include/Actor/ActorUnkSPID.hpp @@ -11,7 +11,7 @@ class ActorUnkSPID_C4 : public Actor_C4 { public: ActorUnkSPID_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSPTG.hpp b/include/Actor/ActorUnkSPTG.hpp index 7f2dc4fe..9357d29f 100644 --- a/include/Actor/ActorUnkSPTG.hpp +++ b/include/Actor/ActorUnkSPTG.hpp @@ -11,7 +11,7 @@ class ActorUnkSPTG_C4 : public Actor_C4 { public: ActorUnkSPTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSPTT.hpp b/include/Actor/ActorUnkSPTT.hpp index 3d216468..da3c595d 100644 --- a/include/Actor/ActorUnkSPTT.hpp +++ b/include/Actor/ActorUnkSPTT.hpp @@ -11,7 +11,7 @@ class ActorUnkSPTT_C4 : public Actor_C4 { public: ActorUnkSPTT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSRST.hpp b/include/Actor/ActorUnkSRST.hpp index 73c0bc07..963a60bb 100644 --- a/include/Actor/ActorUnkSRST.hpp +++ b/include/Actor/ActorUnkSRST.hpp @@ -11,7 +11,7 @@ class ActorUnkSRST_C4 : public Actor_C4 { public: ActorUnkSRST_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSSFC.hpp b/include/Actor/ActorUnkSSFC.hpp index 98fa216a..e8da6696 100644 --- a/include/Actor/ActorUnkSSFC.hpp +++ b/include/Actor/ActorUnkSSFC.hpp @@ -11,7 +11,7 @@ class ActorUnkSSFC_C4 : public Actor_C4 { public: ActorUnkSSFC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSTCT.hpp b/include/Actor/ActorUnkSTCT.hpp index 88aa5b9f..e0cd2b6b 100644 --- a/include/Actor/ActorUnkSTCT.hpp +++ b/include/Actor/ActorUnkSTCT.hpp @@ -11,7 +11,7 @@ class ActorUnkSTCT_C4 : public Actor_C4 { public: ActorUnkSTCT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSTFB.hpp b/include/Actor/ActorUnkSTFB.hpp index 2e242891..63f29a2e 100644 --- a/include/Actor/ActorUnkSTFB.hpp +++ b/include/Actor/ActorUnkSTFB.hpp @@ -11,7 +11,7 @@ class ActorUnkSTFB_C4 : public Actor_C4 { public: ActorUnkSTFB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSTFH.hpp b/include/Actor/ActorUnkSTFH.hpp index 7a266171..5706d939 100644 --- a/include/Actor/ActorUnkSTFH.hpp +++ b/include/Actor/ActorUnkSTFH.hpp @@ -11,7 +11,7 @@ class ActorUnkSTFH_C4 : public Actor_C4 { public: ActorUnkSTFH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSTLF.hpp b/include/Actor/ActorUnkSTLF.hpp index 4777c52a..1ed3b769 100644 --- a/include/Actor/ActorUnkSTLF.hpp +++ b/include/Actor/ActorUnkSTLF.hpp @@ -11,7 +11,7 @@ class ActorUnkSTLF_C4 : public Actor_C4 { public: ActorUnkSTLF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSTLW.hpp b/include/Actor/ActorUnkSTLW.hpp index 6247ffeb..c8d02296 100644 --- a/include/Actor/ActorUnkSTLW.hpp +++ b/include/Actor/ActorUnkSTLW.hpp @@ -11,7 +11,7 @@ class ActorUnkSTLW_C4 : public Actor_C4 { public: ActorUnkSTLW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSTTG.hpp b/include/Actor/ActorUnkSTTG.hpp index 8d24c51b..b31fe2e7 100644 --- a/include/Actor/ActorUnkSTTG.hpp +++ b/include/Actor/ActorUnkSTTG.hpp @@ -11,7 +11,7 @@ class ActorUnkSTTG_C4 : public Actor_C4 { public: ActorUnkSTTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSTWH.hpp b/include/Actor/ActorUnkSTWH.hpp index be31b3a4..0001443f 100644 --- a/include/Actor/ActorUnkSTWH.hpp +++ b/include/Actor/ActorUnkSTWH.hpp @@ -11,7 +11,7 @@ class ActorUnkSTWH_C4 : public Actor_C4 { public: ActorUnkSTWH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSWBM.hpp b/include/Actor/ActorUnkSWBM.hpp index 9b6c0bc3..91411670 100644 --- a/include/Actor/ActorUnkSWBM.hpp +++ b/include/Actor/ActorUnkSWBM.hpp @@ -21,7 +21,7 @@ public: // data_ov031_02113148 /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) override; }; diff --git a/include/Actor/ActorUnkSWDS.hpp b/include/Actor/ActorUnkSWDS.hpp index f24dd157..a9fa0d51 100644 --- a/include/Actor/ActorUnkSWDS.hpp +++ b/include/Actor/ActorUnkSWDS.hpp @@ -11,7 +11,7 @@ class ActorUnkSWDS_C4 : public Actor_C4 { public: ActorUnkSWDS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSWHI.hpp b/include/Actor/ActorUnkSWHI.hpp index 8b20d84d..be501404 100644 --- a/include/Actor/ActorUnkSWHI.hpp +++ b/include/Actor/ActorUnkSWHI.hpp @@ -11,7 +11,7 @@ class ActorUnkSWHI_C4 : public Actor_C4 { public: ActorUnkSWHI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSWOB.hpp b/include/Actor/ActorUnkSWOB.hpp index bfba013c..098df939 100644 --- a/include/Actor/ActorUnkSWOB.hpp +++ b/include/Actor/ActorUnkSWOB.hpp @@ -2,7 +2,7 @@ #include "Actor/Actor.hpp" #include "Actor/ActorProfile.hpp" -#include "Actor/ActorRef.hpp" +#include "RefStruct.hpp" #include "global.h" #include "types.h" @@ -22,7 +22,7 @@ public: /* 9C */ unk16 mUnk_9E; /* A0 */ unk16 mUnk_A0; /* A0 */ unk16 mUnk_A2; - /* A4 */ ActorRefElem mUnk_A4[5]; + /* A4 */ RefElem mUnk_A4[5]; /* B8 */ ActorUnkSWOB(); diff --git a/include/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.hpp b/include/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.hpp index d43333eb..aa491858 100644 --- a/include/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.hpp +++ b/include/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.hpp @@ -13,7 +13,7 @@ class ActorUnkSYDE_C4 : public Actor_C4 { public: ActorUnkSYDE_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkSYDL_C4 : public Actor_C4 { public: ActorUnkSYDL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -81,7 +81,7 @@ class ActorUnkSYDS_C4 : public Actor_C4 { public: ActorUnkSYDS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -115,7 +115,7 @@ class ActorUnkSYFI_C4 : public Actor_C4 { public: ActorUnkSYFI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -149,7 +149,7 @@ class ActorUnkSYFO_C4 : public Actor_C4 { public: ActorUnkSYFO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -183,7 +183,7 @@ class ActorUnkSYIL_C4 : public Actor_C4 { public: ActorUnkSYIL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -217,7 +217,7 @@ class ActorUnkSYIS_C4 : public Actor_C4 { public: ActorUnkSYIS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -251,7 +251,7 @@ class ActorUnkSYOL_C4 : public Actor_C4 { public: ActorUnkSYOL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -285,7 +285,7 @@ class ActorUnkSYOS_C4 : public Actor_C4 { public: ActorUnkSYOS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -319,7 +319,7 @@ class ActorUnkSYSL_C4 : public Actor_C4 { public: ActorUnkSYSL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -353,7 +353,7 @@ class ActorUnkSYSN_C4 : public Actor_C4 { public: ActorUnkSYSN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -387,7 +387,7 @@ class ActorUnkSYSS_C4 : public Actor_C4 { public: ActorUnkSYSS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -421,7 +421,7 @@ class ActorUnkSYWA_C4 : public Actor_C4 { public: ActorUnkSYWA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -455,7 +455,7 @@ class ActorUnkSYWL_C4 : public Actor_C4 { public: ActorUnkSYWL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -489,7 +489,7 @@ class ActorUnkSYWS_C4 : public Actor_C4 { public: ActorUnkSYWS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSYRN.hpp b/include/Actor/ActorUnkSYRN.hpp index d5b96ef5..268e7b49 100644 --- a/include/Actor/ActorUnkSYRN.hpp +++ b/include/Actor/ActorUnkSYRN.hpp @@ -11,7 +11,7 @@ class ActorUnkSYRN_C4 : public Actor_C4 { public: ActorUnkSYRN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSZKL.hpp b/include/Actor/ActorUnkSZKL.hpp index 00fff7d2..b53805e3 100644 --- a/include/Actor/ActorUnkSZKL.hpp +++ b/include/Actor/ActorUnkSZKL.hpp @@ -11,7 +11,7 @@ class ActorUnkSZKL_C4 : public Actor_C4 { public: ActorUnkSZKL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkSZRD.hpp b/include/Actor/ActorUnkSZRD.hpp index 8e85c0c0..21b768b7 100644 --- a/include/Actor/ActorUnkSZRD.hpp +++ b/include/Actor/ActorUnkSZRD.hpp @@ -11,7 +11,7 @@ class ActorUnkSZRD_C4 : public Actor_C4 { public: ActorUnkSZRD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTBRD.hpp b/include/Actor/ActorUnkTBRD.hpp index 7d0080e5..b69cf447 100644 --- a/include/Actor/ActorUnkTBRD.hpp +++ b/include/Actor/ActorUnkTBRD.hpp @@ -11,7 +11,7 @@ class ActorUnkTBRD_C4 : public Actor_C4 { public: ActorUnkTBRD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTCAM.hpp b/include/Actor/ActorUnkTCAM.hpp index 9d721e07..157caa5a 100644 --- a/include/Actor/ActorUnkTCAM.hpp +++ b/include/Actor/ActorUnkTCAM.hpp @@ -11,7 +11,7 @@ class ActorUnkTCAM_C4 : public Actor_C4 { public: ActorUnkTCAM_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTCOW_WCAS.hpp b/include/Actor/ActorUnkTCOW_WCAS.hpp index c0a7317f..165ded5f 100644 --- a/include/Actor/ActorUnkTCOW_WCAS.hpp +++ b/include/Actor/ActorUnkTCOW_WCAS.hpp @@ -13,7 +13,7 @@ class ActorUnkTCOW_C4 : public Actor_C4 { public: ActorUnkTCOW_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkWCAS_C4 : public Actor_C4 { public: ActorUnkWCAS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTDKT.hpp b/include/Actor/ActorUnkTDKT.hpp index b9a0aa72..c4949f5f 100644 --- a/include/Actor/ActorUnkTDKT.hpp +++ b/include/Actor/ActorUnkTDKT.hpp @@ -11,7 +11,7 @@ class ActorUnkTDKT_C4 : public Actor_C4 { public: ActorUnkTDKT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTEHT.hpp b/include/Actor/ActorUnkTEHT.hpp index a624e314..c433b473 100644 --- a/include/Actor/ActorUnkTEHT.hpp +++ b/include/Actor/ActorUnkTEHT.hpp @@ -11,7 +11,7 @@ class ActorUnkTEHT_C4 : public Actor_C4 { public: ActorUnkTEHT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTERY.hpp b/include/Actor/ActorUnkTERY.hpp index 787b7361..e41a9d36 100644 --- a/include/Actor/ActorUnkTERY.hpp +++ b/include/Actor/ActorUnkTERY.hpp @@ -11,7 +11,7 @@ class ActorUnkTERY_C4 : public Actor_C4 { public: ActorUnkTERY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTEVT.hpp b/include/Actor/ActorUnkTEVT.hpp index 8d64fdfc..aeb8cc5a 100644 --- a/include/Actor/ActorUnkTEVT.hpp +++ b/include/Actor/ActorUnkTEVT.hpp @@ -11,7 +11,7 @@ class ActorUnkTEVT_C4 : public Actor_C4 { public: ActorUnkTEVT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTFAT.hpp b/include/Actor/ActorUnkTFAT.hpp index 7465d85e..5900a9b9 100644 --- a/include/Actor/ActorUnkTFAT.hpp +++ b/include/Actor/ActorUnkTFAT.hpp @@ -11,7 +11,7 @@ class ActorUnkTFAT_C4 : public Actor_C4 { public: ActorUnkTFAT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTGTZ.hpp b/include/Actor/ActorUnkTGTZ.hpp index a60d2a64..26c50641 100644 --- a/include/Actor/ActorUnkTGTZ.hpp +++ b/include/Actor/ActorUnkTGTZ.hpp @@ -37,7 +37,7 @@ public: /* 1D4 */ u16 mUnk_1D4; /* 1D6 */ u16 mUnk_1D6; /* 1D8 */ bool mUnk_1D8; - /* 1DC */ ActorRef mUnk_1DC; + /* 1DC */ RefStruct mUnk_1DC; /* 1E0 */ ActorUnkTGTZ(); @@ -49,8 +49,8 @@ public: /* 34 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; 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); + static void func_ov031_020f6e5c(RefStruct param1); + static void func_ov031_020f6ea8(RefStruct *param0, u16 param1, const VecFx32 *param2, s16 param3, u16 param4); void func_ov031_020f6f20(unk32 param1); void func_ov031_020f7358(); void func_ov031_020f73e4(); diff --git a/include/Actor/ActorUnkTHER.hpp b/include/Actor/ActorUnkTHER.hpp index ad135a3e..5d2b2952 100644 --- a/include/Actor/ActorUnkTHER.hpp +++ b/include/Actor/ActorUnkTHER.hpp @@ -11,7 +11,7 @@ class ActorUnkTHER_C4 : public Actor_C4 { public: ActorUnkTHER_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTKYT.hpp b/include/Actor/ActorUnkTKYT.hpp index f9013e27..897c75e8 100644 --- a/include/Actor/ActorUnkTKYT.hpp +++ b/include/Actor/ActorUnkTKYT.hpp @@ -11,7 +11,7 @@ class ActorUnkTKYT_C4 : public Actor_C4 { public: ActorUnkTKYT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTMNA.hpp b/include/Actor/ActorUnkTMNA.hpp index 14c8e337..4d9d2384 100644 --- a/include/Actor/ActorUnkTMNA.hpp +++ b/include/Actor/ActorUnkTMNA.hpp @@ -11,7 +11,7 @@ class ActorUnkTMNA_C4 : public Actor_C4 { public: ActorUnkTMNA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTMNC.hpp b/include/Actor/ActorUnkTMNC.hpp index f18a9c7a..53183632 100644 --- a/include/Actor/ActorUnkTMNC.hpp +++ b/include/Actor/ActorUnkTMNC.hpp @@ -11,7 +11,7 @@ class ActorUnkTMNC_C4 : public Actor_C4 { public: ActorUnkTMNC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTMNP.hpp b/include/Actor/ActorUnkTMNP.hpp index c9159b69..ce19778f 100644 --- a/include/Actor/ActorUnkTMNP.hpp +++ b/include/Actor/ActorUnkTMNP.hpp @@ -11,7 +11,7 @@ class ActorUnkTMNP_C4 : public Actor_C4 { public: ActorUnkTMNP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTPDO.hpp b/include/Actor/ActorUnkTPDO.hpp index cc55c580..6b835439 100644 --- a/include/Actor/ActorUnkTPDO.hpp +++ b/include/Actor/ActorUnkTPDO.hpp @@ -11,7 +11,7 @@ class ActorUnkTPDO_C4 : public Actor_C4 { public: ActorUnkTPDO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRAP.hpp b/include/Actor/ActorUnkTRAP.hpp index 136b7770..06ebf5d5 100644 --- a/include/Actor/ActorUnkTRAP.hpp +++ b/include/Actor/ActorUnkTRAP.hpp @@ -11,7 +11,7 @@ class ActorUnkTRAP_C4 : public Actor_C4 { public: ActorUnkTRAP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRBC.hpp b/include/Actor/ActorUnkTRBC.hpp index 2a76f06a..58f48f89 100644 --- a/include/Actor/ActorUnkTRBC.hpp +++ b/include/Actor/ActorUnkTRBC.hpp @@ -11,7 +11,7 @@ class ActorUnkTRBC_C4 : public Actor_C4 { public: ActorUnkTRBC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRCB.hpp b/include/Actor/ActorUnkTRCB.hpp index 02b1c3be..c08907bd 100644 --- a/include/Actor/ActorUnkTRCB.hpp +++ b/include/Actor/ActorUnkTRCB.hpp @@ -11,7 +11,7 @@ class ActorUnkTRCB_C4 : public Actor_C4 { public: ActorUnkTRCB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRER.hpp b/include/Actor/ActorUnkTRER.hpp index 2748f3eb..4c9eb926 100644 --- a/include/Actor/ActorUnkTRER.hpp +++ b/include/Actor/ActorUnkTRER.hpp @@ -11,7 +11,7 @@ class ActorUnkTRER_C4 : public Actor_C4 { public: ActorUnkTRER_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRIC.hpp b/include/Actor/ActorUnkTRIC.hpp index 80b68b13..7d5ae816 100644 --- a/include/Actor/ActorUnkTRIC.hpp +++ b/include/Actor/ActorUnkTRIC.hpp @@ -11,7 +11,7 @@ class ActorUnkTRIC_C4 : public Actor_C4 { public: ActorUnkTRIC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRLY.hpp b/include/Actor/ActorUnkTRLY.hpp index 722156ce..24ec9ea2 100644 --- a/include/Actor/ActorUnkTRLY.hpp +++ b/include/Actor/ActorUnkTRLY.hpp @@ -11,7 +11,7 @@ class ActorUnkTRLY_C4 : public Actor_C4 { public: ActorUnkTRLY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRRL.hpp b/include/Actor/ActorUnkTRRL.hpp index e8df2200..7419c7ff 100644 --- a/include/Actor/ActorUnkTRRL.hpp +++ b/include/Actor/ActorUnkTRRL.hpp @@ -11,7 +11,7 @@ class ActorUnkTRRL_C4 : public Actor_C4 { public: ActorUnkTRRL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRSG.hpp b/include/Actor/ActorUnkTRSG.hpp index efd2a1aa..d1089604 100644 --- a/include/Actor/ActorUnkTRSG.hpp +++ b/include/Actor/ActorUnkTRSG.hpp @@ -11,7 +11,7 @@ class ActorUnkTRSG_C4 : public Actor_C4 { public: ActorUnkTRSG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRSP.hpp b/include/Actor/ActorUnkTRSP.hpp index bfd0c7ec..d88fdce9 100644 --- a/include/Actor/ActorUnkTRSP.hpp +++ b/include/Actor/ActorUnkTRSP.hpp @@ -11,7 +11,7 @@ class ActorUnkTRSP_C4 : public Actor_C4 { public: ActorUnkTRSP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRTT.hpp b/include/Actor/ActorUnkTRTT.hpp index 3d575c1b..2a271cc1 100644 --- a/include/Actor/ActorUnkTRTT.hpp +++ b/include/Actor/ActorUnkTRTT.hpp @@ -11,7 +11,7 @@ class ActorUnkTRTT_C4 : public Actor_C4 { public: ActorUnkTRTT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTRUP.hpp b/include/Actor/ActorUnkTRUP.hpp index be58599b..de0c05c8 100644 --- a/include/Actor/ActorUnkTRUP.hpp +++ b/include/Actor/ActorUnkTRUP.hpp @@ -11,7 +11,7 @@ class ActorUnkTRUP_C4 : public Actor_C4 { public: ActorUnkTRUP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTSCN.hpp b/include/Actor/ActorUnkTSCN.hpp index 807f4d36..6f237788 100644 --- a/include/Actor/ActorUnkTSCN.hpp +++ b/include/Actor/ActorUnkTSCN.hpp @@ -11,7 +11,7 @@ class ActorUnkTSCN_C4 : public Actor_C4 { public: ActorUnkTSCN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTSLB.hpp b/include/Actor/ActorUnkTSLB.hpp index d383d6f5..af887c58 100644 --- a/include/Actor/ActorUnkTSLB.hpp +++ b/include/Actor/ActorUnkTSLB.hpp @@ -11,7 +11,7 @@ class ActorUnkTSLB_C4 : public Actor_C4 { public: ActorUnkTSLB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTSMT.hpp b/include/Actor/ActorUnkTSMT.hpp index f66db9e2..159e3243 100644 --- a/include/Actor/ActorUnkTSMT.hpp +++ b/include/Actor/ActorUnkTSMT.hpp @@ -11,7 +11,7 @@ class ActorUnkTSMT_C4 : public Actor_C4 { public: ActorUnkTSMT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTTET.hpp b/include/Actor/ActorUnkTTET.hpp index c5fdb77e..adebdbed 100644 --- a/include/Actor/ActorUnkTTET.hpp +++ b/include/Actor/ActorUnkTTET.hpp @@ -11,7 +11,7 @@ class ActorUnkTTET_C4 : public Actor_C4 { public: ActorUnkTTET_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTTFT.hpp b/include/Actor/ActorUnkTTFT.hpp index bb1d6abf..2ecbe2bb 100644 --- a/include/Actor/ActorUnkTTFT.hpp +++ b/include/Actor/ActorUnkTTFT.hpp @@ -11,7 +11,7 @@ class ActorUnkTTFT_C4 : public Actor_C4 { public: ActorUnkTTFT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTTKB.hpp b/include/Actor/ActorUnkTTKB.hpp index f8ff9ab9..03439e3c 100644 --- a/include/Actor/ActorUnkTTKB.hpp +++ b/include/Actor/ActorUnkTTKB.hpp @@ -11,7 +11,7 @@ class ActorUnkTTKB_C4 : public Actor_C4 { public: ActorUnkTTKB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTTUT.hpp b/include/Actor/ActorUnkTTUT.hpp index ea9370ac..4daef67e 100644 --- a/include/Actor/ActorUnkTTUT.hpp +++ b/include/Actor/ActorUnkTTUT.hpp @@ -11,7 +11,7 @@ class ActorUnkTTUT_C4 : public Actor_C4 { public: ActorUnkTTUT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTUTO.hpp b/include/Actor/ActorUnkTUTO.hpp index 91257772..b561ae73 100644 --- a/include/Actor/ActorUnkTUTO.hpp +++ b/include/Actor/ActorUnkTUTO.hpp @@ -11,7 +11,7 @@ class ActorUnkTUTO_C4 : public Actor_C4 { public: ActorUnkTUTO_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkTVLR.hpp b/include/Actor/ActorUnkTVLR.hpp index 99302bcf..9b84dc7b 100644 --- a/include/Actor/ActorUnkTVLR.hpp +++ b/include/Actor/ActorUnkTVLR.hpp @@ -11,7 +11,7 @@ class ActorUnkTVLR_C4 : public Actor_C4 { public: ActorUnkTVLR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkVCCH.hpp b/include/Actor/ActorUnkVCCH.hpp index 66bd9bef..cf09b4d7 100644 --- a/include/Actor/ActorUnkVCCH.hpp +++ b/include/Actor/ActorUnkVCCH.hpp @@ -11,7 +11,7 @@ class ActorUnkVCCH_C4 : public Actor_C4 { public: ActorUnkVCCH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkVCFT.hpp b/include/Actor/ActorUnkVCFT.hpp index 58cc6685..c2445663 100644 --- a/include/Actor/ActorUnkVCFT.hpp +++ b/include/Actor/ActorUnkVCFT.hpp @@ -11,7 +11,7 @@ class ActorUnkVCFT_C4 : public Actor_C4 { public: ActorUnkVCFT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkVLCR.hpp b/include/Actor/ActorUnkVLCR.hpp index e6b228ac..a11cbdac 100644 --- a/include/Actor/ActorUnkVLCR.hpp +++ b/include/Actor/ActorUnkVLCR.hpp @@ -11,7 +11,7 @@ class ActorUnkVLCR_C4 : public Actor_C4 { public: ActorUnkVLCR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkVOLV.hpp b/include/Actor/ActorUnkVOLV.hpp index 392b6c71..cb473e56 100644 --- a/include/Actor/ActorUnkVOLV.hpp +++ b/include/Actor/ActorUnkVOLV.hpp @@ -11,7 +11,7 @@ class ActorUnkVOLV_C4 : public Actor_C4 { public: ActorUnkVOLV_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkVRGN.hpp b/include/Actor/ActorUnkVRGN.hpp index ef41ac18..9d32e1c2 100644 --- a/include/Actor/ActorUnkVRGN.hpp +++ b/include/Actor/ActorUnkVRGN.hpp @@ -11,7 +11,7 @@ class ActorUnkVRGN_C4 : public Actor_C4 { public: ActorUnkVRGN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWAWA_WAWC.hpp b/include/Actor/ActorUnkWAWA_WAWC.hpp index e84c774c..402a15dc 100644 --- a/include/Actor/ActorUnkWAWA_WAWC.hpp +++ b/include/Actor/ActorUnkWAWA_WAWC.hpp @@ -13,7 +13,7 @@ class ActorUnkWAWA_C4 : public Actor_C4 { public: ActorUnkWAWA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkWAWC_C4 : public Actor_C4 { public: ActorUnkWAWC_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWAWB_WAWS.hpp b/include/Actor/ActorUnkWAWB_WAWS.hpp index 3bcf778b..8b0d9024 100644 --- a/include/Actor/ActorUnkWAWB_WAWS.hpp +++ b/include/Actor/ActorUnkWAWB_WAWS.hpp @@ -13,7 +13,7 @@ class ActorUnkWAWB_C4 : public Actor_C4 { public: ActorUnkWAWB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkWAWS_C4 : public Actor_C4 { public: ActorUnkWAWS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWAWY.hpp b/include/Actor/ActorUnkWAWY.hpp index 75256e8a..ad500f83 100644 --- a/include/Actor/ActorUnkWAWY.hpp +++ b/include/Actor/ActorUnkWAWY.hpp @@ -11,7 +11,7 @@ class ActorUnkWAWY_C4 : public Actor_C4 { public: ActorUnkWAWY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWBEF.hpp b/include/Actor/ActorUnkWBEF.hpp index b552f8b4..a4ab2f8c 100644 --- a/include/Actor/ActorUnkWBEF.hpp +++ b/include/Actor/ActorUnkWBEF.hpp @@ -11,7 +11,7 @@ class ActorUnkWBEF_C4 : public Actor_C4 { public: ActorUnkWBEF_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWBN2.hpp b/include/Actor/ActorUnkWBN2.hpp index 46ca14d3..81c80a5d 100644 --- a/include/Actor/ActorUnkWBN2.hpp +++ b/include/Actor/ActorUnkWBN2.hpp @@ -11,7 +11,7 @@ class ActorUnkWBN2_C4 : public Actor_C4 { public: ActorUnkWBN2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWBPS.hpp b/include/Actor/ActorUnkWBPS.hpp index 9bf6cc7e..5936f6c2 100644 --- a/include/Actor/ActorUnkWBPS.hpp +++ b/include/Actor/ActorUnkWBPS.hpp @@ -11,7 +11,7 @@ class ActorUnkWBPS_C4 : public Actor_C4 { public: ActorUnkWBPS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWBTN.hpp b/include/Actor/ActorUnkWBTN.hpp index 37de34b9..9b7e48cd 100644 --- a/include/Actor/ActorUnkWBTN.hpp +++ b/include/Actor/ActorUnkWBTN.hpp @@ -11,7 +11,7 @@ class ActorUnkWBTN_C4 : public Actor_C4 { public: ActorUnkWBTN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWDBA.hpp b/include/Actor/ActorUnkWDBA.hpp index fae1407a..4d4e4459 100644 --- a/include/Actor/ActorUnkWDBA.hpp +++ b/include/Actor/ActorUnkWDBA.hpp @@ -11,7 +11,7 @@ class ActorUnkWDBA_C4 : public Actor_C4 { public: ActorUnkWDBA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWDRD.hpp b/include/Actor/ActorUnkWDRD.hpp index d6a4fc66..557469e3 100644 --- a/include/Actor/ActorUnkWDRD.hpp +++ b/include/Actor/ActorUnkWDRD.hpp @@ -11,7 +11,7 @@ class ActorUnkWDRD_C4 : public Actor_C4 { public: ActorUnkWDRD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWHMA.hpp b/include/Actor/ActorUnkWHMA.hpp index 4969af92..2364c040 100644 --- a/include/Actor/ActorUnkWHMA.hpp +++ b/include/Actor/ActorUnkWHMA.hpp @@ -11,7 +11,7 @@ class ActorUnkWHMA_C4 : public Actor_C4 { public: ActorUnkWHMA_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWIDR.hpp b/include/Actor/ActorUnkWIDR.hpp index f7f8f168..b92334ec 100644 --- a/include/Actor/ActorUnkWIDR.hpp +++ b/include/Actor/ActorUnkWIDR.hpp @@ -11,7 +11,7 @@ class ActorUnkWIDR_C4 : public Actor_C4 { public: ActorUnkWIDR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWIDT.hpp b/include/Actor/ActorUnkWIDT.hpp index a34ba4e8..f163f849 100644 --- a/include/Actor/ActorUnkWIDT.hpp +++ b/include/Actor/ActorUnkWIDT.hpp @@ -11,7 +11,7 @@ class ActorUnkWIDT_C4 : public Actor_C4 { public: ActorUnkWIDT_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWKTR.hpp b/include/Actor/ActorUnkWKTR.hpp index 971edb12..d2f799fb 100644 --- a/include/Actor/ActorUnkWKTR.hpp +++ b/include/Actor/ActorUnkWKTR.hpp @@ -11,7 +11,7 @@ class ActorUnkWKTR_C4 : public Actor_C4 { public: ActorUnkWKTR_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWPBD.hpp b/include/Actor/ActorUnkWPBD.hpp index dc62f2fb..3da5b07b 100644 --- a/include/Actor/ActorUnkWPBD.hpp +++ b/include/Actor/ActorUnkWPBD.hpp @@ -11,7 +11,7 @@ class ActorUnkWPBD_C4 : public Actor_C4 { public: ActorUnkWPBD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWPCH.hpp b/include/Actor/ActorUnkWPCH.hpp index 5c578a3a..05c0cf75 100644 --- a/include/Actor/ActorUnkWPCH.hpp +++ b/include/Actor/ActorUnkWPCH.hpp @@ -11,7 +11,7 @@ class ActorUnkWPCH_C4 : public Actor_C4 { public: ActorUnkWPCH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWPCL.hpp b/include/Actor/ActorUnkWPCL.hpp index 53f6f38b..6077960c 100644 --- a/include/Actor/ActorUnkWPCL.hpp +++ b/include/Actor/ActorUnkWPCL.hpp @@ -11,7 +11,7 @@ class ActorUnkWPCL_C4 : public Actor_C4 { public: ActorUnkWPCL_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWTBS.hpp b/include/Actor/ActorUnkWTBS.hpp index 1ca96047..e366c53f 100644 --- a/include/Actor/ActorUnkWTBS.hpp +++ b/include/Actor/ActorUnkWTBS.hpp @@ -11,7 +11,7 @@ class ActorUnkWTBS_C4 : public Actor_C4 { public: ActorUnkWTBS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWTH2.hpp b/include/Actor/ActorUnkWTH2.hpp index 9acae050..3786d841 100644 --- a/include/Actor/ActorUnkWTH2.hpp +++ b/include/Actor/ActorUnkWTH2.hpp @@ -11,7 +11,7 @@ class ActorUnkWTH2_C4 : public Actor_C4 { public: ActorUnkWTH2_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWTH3.hpp b/include/Actor/ActorUnkWTH3.hpp index f870981d..a409d120 100644 --- a/include/Actor/ActorUnkWTH3.hpp +++ b/include/Actor/ActorUnkWTH3.hpp @@ -11,7 +11,7 @@ class ActorUnkWTH3_C4 : public Actor_C4 { public: ActorUnkWTH3_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWTTH.hpp b/include/Actor/ActorUnkWTTH.hpp index 6634817b..2bc803f8 100644 --- a/include/Actor/ActorUnkWTTH.hpp +++ b/include/Actor/ActorUnkWTTH.hpp @@ -11,7 +11,7 @@ class ActorUnkWTTH_C4 : public Actor_C4 { public: ActorUnkWTTH_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkWWFS.hpp b/include/Actor/ActorUnkWWFS.hpp index 17889929..7e8e5dba 100644 --- a/include/Actor/ActorUnkWWFS.hpp +++ b/include/Actor/ActorUnkWWFS.hpp @@ -11,7 +11,7 @@ class ActorUnkWWFS_C4 : public Actor_C4 { public: ActorUnkWWFS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkYKAP_YKCP_YKEP.hpp b/include/Actor/ActorUnkYKAP_YKCP_YKEP.hpp index 6a7a1653..e6415934 100644 --- a/include/Actor/ActorUnkYKAP_YKCP_YKEP.hpp +++ b/include/Actor/ActorUnkYKAP_YKCP_YKEP.hpp @@ -13,7 +13,7 @@ class ActorUnkYKAP_C4 : public Actor_C4 { public: ActorUnkYKAP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -47,7 +47,7 @@ class ActorUnkYKCP_C4 : public Actor_C4 { public: ActorUnkYKCP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; @@ -81,7 +81,7 @@ class ActorUnkYKEP_C4 : public Actor_C4 { public: ActorUnkYKEP_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkYUKI.hpp b/include/Actor/ActorUnkYUKI.hpp index 18649842..13162ca0 100644 --- a/include/Actor/ActorUnkYUKI.hpp +++ b/include/Actor/ActorUnkYUKI.hpp @@ -11,7 +11,7 @@ class ActorUnkYUKI_C4 : public Actor_C4 { public: ActorUnkYUKI_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkYUKY.hpp b/include/Actor/ActorUnkYUKY.hpp index e9a928a7..e885f874 100644 --- a/include/Actor/ActorUnkYUKY.hpp +++ b/include/Actor/ActorUnkYUKY.hpp @@ -11,7 +11,7 @@ class ActorUnkYUKY_C4 : public Actor_C4 { public: ActorUnkYUKY_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkYWIS.hpp b/include/Actor/ActorUnkYWIS.hpp index 8d340d0b..f7352cd7 100644 --- a/include/Actor/ActorUnkYWIS.hpp +++ b/include/Actor/ActorUnkYWIS.hpp @@ -11,7 +11,7 @@ class ActorUnkYWIS_C4 : public Actor_C4 { public: ActorUnkYWIS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkZELD.hpp b/include/Actor/ActorUnkZELD.hpp index e003ceb9..2713a127 100644 --- a/include/Actor/ActorUnkZELD.hpp +++ b/include/Actor/ActorUnkZELD.hpp @@ -11,7 +11,7 @@ class ActorUnkZELD_C4 : public Actor_C4 { public: ActorUnkZELD_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkZLBB.hpp b/include/Actor/ActorUnkZLBB.hpp index 4d5728a4..18a1e1ad 100644 --- a/include/Actor/ActorUnkZLBB.hpp +++ b/include/Actor/ActorUnkZLBB.hpp @@ -11,7 +11,7 @@ class ActorUnkZLBB_C4 : public Actor_C4 { public: ActorUnkZLBB_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkZLBS.hpp b/include/Actor/ActorUnkZLBS.hpp index 691d4eec..4c64747c 100644 --- a/include/Actor/ActorUnkZLBS.hpp +++ b/include/Actor/ActorUnkZLBS.hpp @@ -11,7 +11,7 @@ class ActorUnkZLBS_C4 : public Actor_C4 { public: ActorUnkZLBS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkZLSL_ZSRS.hpp b/include/Actor/ActorUnkZLSL_ZSRS.hpp index 9f713470..65028ca3 100644 --- a/include/Actor/ActorUnkZLSL_ZSRS.hpp +++ b/include/Actor/ActorUnkZLSL_ZSRS.hpp @@ -264,7 +264,7 @@ public: /* 28C4 */ unk32 mUnk_28C4; /* 28C8 */ unk32 mUnk_28C8; /* 2894 */ PAD(0x28CC, 0x28DC); - /* 28DC */ ActorRef mUnk_28DC; + /* 28DC */ RefStruct mUnk_28DC; /* 28E0 */ PAD(0x28E0, 0x28E4); /* 28E4 */ unk16 mUnk_28E4; /* 28E6 */ PAD(0x28E6, 0x28E8); diff --git a/include/Actor/ActorUnkZLSN.hpp b/include/Actor/ActorUnkZLSN.hpp index 0eb85040..ab5db227 100644 --- a/include/Actor/ActorUnkZLSN.hpp +++ b/include/Actor/ActorUnkZLSN.hpp @@ -11,7 +11,7 @@ class ActorUnkZLSN_C4 : public Actor_C4 { public: ActorUnkZLSN_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkZLSS.hpp b/include/Actor/ActorUnkZLSS.hpp index 7b4429e8..fcfb7764 100644 --- a/include/Actor/ActorUnkZLSS.hpp +++ b/include/Actor/ActorUnkZLSS.hpp @@ -11,7 +11,7 @@ class ActorUnkZLSS_C4 : public Actor_C4 { public: ActorUnkZLSS_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/ActorUnkZSTG.hpp b/include/Actor/ActorUnkZSTG.hpp index 4b91bced..4342c409 100644 --- a/include/Actor/ActorUnkZSTG.hpp +++ b/include/Actor/ActorUnkZSTG.hpp @@ -11,7 +11,7 @@ class ActorUnkZSTG_C4 : public Actor_C4 { public: ActorUnkZSTG_C4(Actor *param1); - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; + /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; diff --git a/include/Actor/Actor_Derived1.hpp b/include/Actor/Actor_Derived1.hpp index 8f00972a..0d5f7c4a 100644 --- a/include/Actor/Actor_Derived1.hpp +++ b/include/Actor/Actor_Derived1.hpp @@ -134,7 +134,7 @@ public: /* 0B0 */ u16 mUnk_0B0; /* 0B4 */ unk32 mUnk_0B4; /* 0B8 */ unk32 mUnk_0B8; - /* 0BC */ ActorRef mUnk_0BC; + /* 0BC */ RefStruct mUnk_0BC; /* 0C0 */ VecFx32Cpp mUnk_0C0; /* 0CC */ unk16 mUnk_0CC; /* 0CC */ unk16 mUnk_0CE; @@ -195,7 +195,7 @@ public: void func_ov000_020a8ae0(fx32 param1); bool func_ov000_020a8db0(); bool func_ov000_020a8dd0(); - void func_ov000_020a8df0(ActorRef param1, unk32 param2); + void func_ov000_020a8df0(RefStruct param1, unk32 param2); void func_ov000_020a8e9c(VecFx32 *param1); bool func_ov000_020a8ff4(VecFx32 *param1); void func_ov000_020a91b8(VecFx32 *param1, unk32 param2); diff --git a/include/CommonFuncs.hpp b/include/CommonFuncs.hpp index ac9869df..f507f345 100644 --- a/include/CommonFuncs.hpp +++ b/include/CommonFuncs.hpp @@ -21,7 +21,7 @@ struct ModelRender; struct Cylinder; struct UnkStruct_ov031_020eeee8; struct Actor; -struct ActorRef; +struct RefStruct; struct UnkStruct_ov031_Items_00; struct UnkStruct_ov031_Items_00_Base; struct UnkStruct_027e0ce0; @@ -102,7 +102,7 @@ int func_01ffcea0(unk32, UnkStruct_ov031_020eeee8 *); void func_01ffcfcc(VecFx32 *, VecFx32 *, VecFx32 *); void func_01ffd054(VecFx32 *, VecFx32 *); void func_01ffd1b4(VecFx32 *, VecFx32 *); -void func_01ffe6c4(Actor **, ActorRef, VecFx32 *, VecFx32 *, s32, VecFx32 *, UnkStruct_ov031_Items_00_Base *); +void func_01ffe6c4(Actor **, RefStruct, VecFx32 *, VecFx32 *, s32, VecFx32 *, UnkStruct_ov031_Items_00_Base *); fx32 func_01ffe868(VecFx32 *, unk32, unk32); bool func_01ffecdc(unk32 param1, Cylinder *param2); void func_01ffedac(Vec2bCpp *, VecFx32 *); @@ -165,7 +165,7 @@ unk16 func_02016958(VecFx32 *, VecFx32 *); void func_020169d4(VecFx32 *, VecFx32 *, unk16 *, const char *); bool func_02016ae0(VecFx32 *, VecFx32 *, UnkAngleStruct, unk32, unk32); bool func_02016b8c(VecFx32 *, VecFx32 *, unk32, UnkAngleStruct, u16, unk32); -bool func_02016c68(VecFx32 *, VecFx32 *, ActorRef); +bool func_02016c68(VecFx32 *, VecFx32 *, RefStruct); Actor *func_02016fbc(ActorId, VecFx32 *, unk32); unk32 func_02017158(); bool func_02017930(UnkStruct_027e0960_TableEntry_04_Base *, UnkStruct_027e0960_TableEntry_04_Base *); @@ -306,7 +306,7 @@ void func_ov000_02087ee8(); unk32 func_ov000_0208832c(s16, unk32); void func_ov000_02089bbc(void *, unk32); void func_ov000_0208a7a4(void *, void *); -void func_ov000_0208abc4(ActorRef *, void *, Vec2s *); +void func_ov000_0208abc4(RefStruct *, void *, Vec2s *); void func_ov000_0208ba10(void *, void *, unk32); void func_ov000_0208bc00(UnkStruct_027e0ce0 *, unk16, unk16 *); void func_ov000_0208bd20(UnkStruct_027e0ce0 *param1, unk32 param2, unk32 param3, unk32 param4); @@ -331,7 +331,7 @@ void func_ov000_02099870(UnkStruct_ActorUnkCANS_224 *, VecFx32 *, u16); void func_ov000_02099e58(UnkStruct_ov063_021632e4 *param1, ActorUnkZLSL_AnimationTag param2, unk32 param8); void func_ov000_02099f64(UnkStruct_ov063_02163784 *param1, ActorUnkZLSL_AnimationTag param2, unk32 param3); bool func_ov000_020a0a90(size_t, unk32, size_t); -void func_ov000_020a1330(u16, ActorRef, VecFx32, UnkAngleStruct, unk32, unk32); +void func_ov000_020a1330(u16, RefStruct, VecFx32, UnkAngleStruct, unk32, unk32); void func_ov000_020a14e4(unk8, VecFx32 *); u8 func_ov000_020a9a50(); void func_ov000_0205bedc(void *param1, void *param2, void *param3, void *param4, unk32 param5, int); @@ -395,7 +395,7 @@ unk32 func_ov026_0212e54c(); // overlay 31 void func_ov031_020dcea4(void *, UnkStruct_027e0ce0_40_Base_78 *, UnkAngleStruct); -void func_ov031_020e0f30(ActorRef); +void func_ov031_020e0f30(RefStruct); unk16 func_ov031_020e3dd0(Actor *param0); void func_ov031_020f439c(void *, Vec3s *, unk32); bool func_ov031_020f7538(Actor *param1, unk32 param2); diff --git a/include/MapObject/MapObject.hpp b/include/MapObject/MapObject.hpp index f9888037..ae3ebe80 100644 --- a/include/MapObject/MapObject.hpp +++ b/include/MapObject/MapObject.hpp @@ -1,10 +1,9 @@ #pragma once -#include "Actor/ActorRef.hpp" #include "Map/MapObjectId.hpp" #include "MapObject/MapObjectProfile.hpp" -#include "MapObject/MapObjectRef.hpp" #include "Physics/Cylinder.hpp" +#include "RefStruct.hpp" #include "Render/ModelRender.hpp" #include "System/SysNew.hpp" #include "flags.h" @@ -135,7 +134,7 @@ public: /* 1C */ MapObjFlags mFlags[1]; /* 1E */ unk16 mUnk_1E; /* 20 */ MapObject_20 mUnk_20; // parameters - /* 38 */ MapObjRef mRef; + /* 38 */ RefStruct mRef; /* 3C */ MapObjectProfile *mpProfile; /* 40 */ @@ -147,7 +146,7 @@ public: /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(unk32 param1); /* 18 */ virtual void vfunc_18(s8 *param1); - /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3); + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3); /* 20 */ virtual void vfunc_20(unk32 param1); /* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2); /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3); @@ -226,13 +225,13 @@ public: unk32 func_ov000_0209d3b4(unk32 param1, fx32 size); void func_ov000_0209d434(s8 *param1, UnkStruct_ov019_020d24c8_28_258_00 *param2, unk32 param3); void func_ov000_0209d518(VecFx32 *param1, unk32 param2, unk32 param3, u8 param4); - void func_ov000_0209d5c8(ActorRef ref); + void func_ov000_0209d5c8(RefStruct ref); void func_ov000_0209d614(unk32 param1); bool func_ov000_0209d668(); void func_ov000_0209d6ac(VecFx32 *param1); static void func_ov000_0209d0bc(Vec2bCpp *param1, MapObject *thisx); static void func_ov000_0209d22c(unk16 *param1, MapObject *thisx, unk32 param2); - static void func_ov000_0209d54c(ActorRef *param1, MapObject *thisx, u16 param2, const VecFx32 *pPos, s16 param3, + static void func_ov000_0209d54c(RefStruct *param1, MapObject *thisx, u16 param2, const VecFx32 *pPos, s16 param3, u16 param4); }; diff --git a/include/MapObject/MapObjectBombFlower.hpp b/include/MapObject/MapObjectBombFlower.hpp index e642c5e1..e661e41e 100644 --- a/include/MapObject/MapObjectBombFlower.hpp +++ b/include/MapObject/MapObjectBombFlower.hpp @@ -35,12 +35,12 @@ public: /* 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; + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) override; /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override; /* 38 */ virtual void vfunc_38() override; /* 44 */ virtual bool SetState(MapObjState state, unk32) override; /* 48 */ virtual void vfunc_48() override; - /* 50 */ virtual void vfunc_50(ActorRef *param1, MapObjectPot_Base *thisx) override; + /* 50 */ virtual void vfunc_50(RefStruct *param1, MapObjectPot_Base *thisx) override; /* 58 */ virtual void vfunc_58(); void func_ov031_02102728(unk32 param1); diff --git a/include/MapObject/MapObjectGrass.hpp b/include/MapObject/MapObjectGrass.hpp index 4f8f9f9f..9db4e108 100644 --- a/include/MapObject/MapObjectGrass.hpp +++ b/include/MapObject/MapObjectGrass.hpp @@ -40,7 +40,7 @@ public: /* 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; + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) override; /* 38 */ virtual bool vfunc_38(MapObjState state, unk32 param2); /* 3C */ virtual void vfunc_3C(VecFx32 *param1); diff --git a/include/MapObject/MapObjectPot.hpp b/include/MapObject/MapObjectPot.hpp index 9e11b091..7bf51b71 100644 --- a/include/MapObject/MapObjectPot.hpp +++ b/include/MapObject/MapObjectPot.hpp @@ -13,14 +13,14 @@ public: MapObjectPot(); - /* 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 - /* 3C */ virtual bool vfunc_3C() override; // func_ov031_021053b4 - /* 40 */ virtual bool vfunc_40() override; // func_ov031_021053fc - /* 48 */ virtual void vfunc_48() override; // func_ov031_021051d4 - /* 54 */ virtual unk32 vfunc_54() override; // func_ov031_02105310 + /* 04 */ virtual void Setup() override; // func_ov031_02105088 + /* 14 */ virtual void vfunc_14(unk32 param1) override; // func_ov031_021052cc + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3); // func_ov031_021050b4 + /* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2) override; // func_ov031_02105348 + /* 3C */ virtual bool vfunc_3C() override; // func_ov031_021053b4 + /* 40 */ virtual bool vfunc_40() override; // func_ov031_021053fc + /* 48 */ virtual void vfunc_48() override; // func_ov031_021051d4 + /* 54 */ virtual unk32 vfunc_54() override; // func_ov031_02105310 }; class MapObjectProfilePot : public MapObjectProfilePot_Base { diff --git a/include/MapObject/MapObjectPot_Base.hpp b/include/MapObject/MapObjectPot_Base.hpp index 17b4d25f..dabd2e2e 100644 --- a/include/MapObject/MapObjectPot_Base.hpp +++ b/include/MapObject/MapObjectPot_Base.hpp @@ -30,7 +30,7 @@ public: /* 44 */ virtual bool SetState(MapObjState state, unk32 param2) override; /* 48 */ virtual void vfunc_48() override; /* 4C */ virtual bool vfunc_4C() override; - /* 50 */ virtual void vfunc_50(ActorRef *param1, MapObjectPot_Base *thisx) override; + /* 50 */ virtual void vfunc_50(RefStruct *param1, MapObjectPot_Base *thisx) override; /* 54 */ virtual unk32 vfunc_54() override; void func_ov000_0209da78(unk32 param1, unk32 param2); diff --git a/include/MapObject/MapObjectRef.hpp b/include/MapObject/MapObjectRef.hpp deleted file mode 100644 index 9cc1b29c..00000000 --- a/include/MapObject/MapObjectRef.hpp +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include "MapObject/MapObjectManager.hpp" -#include "global.h" -#include "math.hpp" -#include "types.h" - -struct MapObject; - -struct MapObjRef { - union { - struct { - union { - struct { - /* 00 */ u8 unk_00; - /* 01 */ u8 unk_01; - }; - u16 unk_00_u16; - }; - /* 02 */ Vec2b unk_02; - /* 04 */ - }; - u32 data; - }; - - MapObjRef() {} - - MapObjRef(u32 value) { - this->data = value; - } - - void Reset() { - this->data = 0; - } - - const bool operator==(const MapObjRef &other) const { - return other.data == this->data; - } - - const bool operator!=(const MapObjRef &other) const { - return !(*this == other); - } - - void operator=(const MapObjRef &other) { - this->data = other.data; - } - - const u32 Get32() const { - return this->data; - } - - Vec2bCpp &GetUnk02() { - return *(Vec2bCpp *) &this->unk_02; - } -}; - -// for arrays -struct MapObjRefElem { - MapObjRef ref; - - MapObjRefElem() { - this->ref.Reset(); - } -}; diff --git a/include/MapObject/MapObjectUnkLTRW.hpp b/include/MapObject/MapObjectUnkLTRW.hpp index 936d033c..479c72a3 100644 --- a/include/MapObject/MapObjectUnkLTRW.hpp +++ b/include/MapObject/MapObjectUnkLTRW.hpp @@ -33,7 +33,7 @@ public: /* 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; + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) override; /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override; void func_ov063_02160d18(unk32 param1); diff --git a/include/MapObject/MapObjectUnkMTJR.hpp b/include/MapObject/MapObjectUnkMTJR.hpp index 27c52344..05c50029 100644 --- a/include/MapObject/MapObjectUnkMTJR.hpp +++ b/include/MapObject/MapObjectUnkMTJR.hpp @@ -24,7 +24,7 @@ public: /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) override; void func_ov063_02161254(unk32 param1); void func_ov063_02161288(void); diff --git a/include/MapObject/MapObjectUnkSKDI.hpp b/include/MapObject/MapObjectUnkSKDI.hpp index 780b7432..f8994249 100644 --- a/include/MapObject/MapObjectUnkSKDI.hpp +++ b/include/MapObject/MapObjectUnkSKDI.hpp @@ -45,7 +45,7 @@ public: /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) override; /* 38 */ virtual unk32 vfunc_38(); /* 3C */ virtual unk32 vfunc_3C(); /* 40 */ virtual s16 vfunc_40(); diff --git a/include/MapObject/MapObjectUnkSWHT.hpp b/include/MapObject/MapObjectUnkSWHT.hpp index 1b7311af..310681fc 100644 --- a/include/MapObject/MapObjectUnkSWHT.hpp +++ b/include/MapObject/MapObjectUnkSWHT.hpp @@ -35,7 +35,7 @@ public: /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) override; /* 30 */ virtual ~MapObjectUnkSWHT() override; void func_ov031_02101dd8(); diff --git a/include/MapObject/MapObjectUnkSWSW.hpp b/include/MapObject/MapObjectUnkSWSW.hpp index 0fa005bf..2acc19cd 100644 --- a/include/MapObject/MapObjectUnkSWSW.hpp +++ b/include/MapObject/MapObjectUnkSWSW.hpp @@ -50,7 +50,7 @@ public: /* 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; + /* 1C */ virtual bool vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) override; /* 38 */ virtual void vfunc_38(); /* 3C */ virtual void vfunc_3C(unk32 param1); diff --git a/include/Player/PlayerActorBase.hpp b/include/Player/PlayerActorBase.hpp index fc0d6795..976d799d 100644 --- a/include/Player/PlayerActorBase.hpp +++ b/include/Player/PlayerActorBase.hpp @@ -1,6 +1,6 @@ #pragma once -#include "Actor/ActorRef.hpp" +#include "RefStruct.hpp" #include "Render/ModelRender.hpp" #include "Unknown/Common.hpp" #include "global.h" @@ -23,7 +23,7 @@ extern "C" void func_ov000_0205d500(ActorGrabParams *, unk32, unk32); bool PlayerCharacter_IsNotLink(s32 character); struct ActorGrabParams { - /* 00 */ ActorRef mUnk_00; + /* 00 */ RefStruct mUnk_00; /* 04 */ ActorGrabParams() {} @@ -106,7 +106,7 @@ inline bool PlayerCharacter_IsNotLink2(PlayerCharacter character) { class UnkStruct_PlayerGet_64 { public: - /* 00 */ ActorRef *mUnk_00; + /* 00 */ RefStruct *mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ u16 mUnk_08; // makes link invisible when set /* 0A */ unk16 mUnk_0A; @@ -458,7 +458,7 @@ class PlayerLinkActor_9C { public: /* 000 (vtable) */ /* 004 */ PAD(0x04, 0x08); - /* 008 */ ActorRef mUnk_008; //! TODO: confirm type + /* 008 */ RefStruct mUnk_008; //! TODO: confirm type /* 00C */ PAD(0x0C, 0x34); /* 034 */ PlayerLinkActor_9C_34 mUnk_034; /* 004 */ PAD(0x50, 0x5A); @@ -523,7 +523,7 @@ public: /* 30 */ UnkAngleStruct mAngle; /* 32 */ u8 mInvincibilityTimer; /* 33 */ u8 mInvincibilityIconTimer; // the blinking icon on top-screen - /* 34 */ ActorRef mGrabActor; + /* 34 */ RefStruct mGrabActor; /* 38 */ PlayerActorBase_38 mUnk_38; /* 44 */ unk32 mUnk_44; /* 48 */ PlayerCharacter mCharacter; diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp index 3423b5db..56c4acac 100644 --- a/include/Player/PlayerLink.hpp +++ b/include/Player/PlayerLink.hpp @@ -50,7 +50,7 @@ public: /* 04 */ unk16 mUnk_04; /* 06 */ bool mUnk_06; /* 07 */ PAD(0x07, 0x0C); - /* 0C */ ActorRef mUnk_0C; + /* 0C */ RefStruct mUnk_0C; /* 10 */ PlayerLinkActor_A0_1C(UnkStruct_027e0ce0_40 *param1); diff --git a/include/Player/PlayerSceneChange.hpp b/include/Player/PlayerSceneChange.hpp index bffabc85..57267bfa 100644 --- a/include/Player/PlayerSceneChange.hpp +++ b/include/Player/PlayerSceneChange.hpp @@ -4,7 +4,7 @@ #include "types.h" #include "versions.h" -#include "Actor/ActorRef.hpp" +#include "RefStruct.hpp" #include "Unknown/UnkStruct_027e09a4.hpp" #include "Unknown/UnkStruct_ov000_0208f820.hpp" #include "math.hpp" @@ -22,7 +22,7 @@ public: /* 7C */ unk32 mUnk_7C; /* 80 */ volatile VecFx32 mUnk_80; /* 8C */ unk32 mUnk_8C; - /* 90 */ ActorRef mUnk_90; + /* 90 */ RefStruct mUnk_90; /* 94 */ u16 mUnk_94[2]; /* 98 */ unk32 mUnk_98; /* 9C */ VecFx32 mUnk_9C; diff --git a/include/Actor/ActorRef.hpp b/include/RefStruct.hpp similarity index 67% rename from include/Actor/ActorRef.hpp rename to include/RefStruct.hpp index 59157561..a6542233 100644 --- a/include/Actor/ActorRef.hpp +++ b/include/RefStruct.hpp @@ -1,7 +1,7 @@ #pragma once #include "global.h" -#include "types.h" +#include "math.hpp" // mapping: // 0011 1111 1111 1111 = index @@ -29,61 +29,21 @@ enum ActorRefId_ { //! TODO: more ids? }; -//! TODO: remove ActorRef and MapObjRef in favor of this -struct RefStruct { - union { - // common - struct { - /* 00 */ u16 index : 14; - /* 00 */ u16 type : 2; - /* 02 */ u16 id : 12; - /* 02 */ u16 unk : 4; - /* 04 */ - }; - - // ActorRef - struct { - /* 00 */ u16 type_index; - /* 02 */ u16 unk_id; - /* 04 */ - } acRef; - - // MapObjRef - struct { - union { - struct { - /* 00 */ u8 unk_00; - /* 01 */ u8 unk_01; - }; - u16 unk_00_u16; - }; - /* 02 */ Vec2b unk_02; - /* 04 */ - } moRef; - - u32 data; +union RefCommon { + struct { + /* 00 */ u16 index : 14; + /* 00 */ u16 type : 2; + /* 02 */ u16 id : 12; + /* 02 */ u16 unk : 4; + /* 04 */ }; - - RefStruct() {} - - RefStruct(u32 value) { - this->data = value; - } - - void Reset() { - this->data = 0; - } + /* 00 */ u16 unk_00; + /* 02 */ u16 unk_02; + /* 04 */ }; struct ActorRef { union { - struct { - /* 00 */ u16 index : 14; - /* 00 */ u16 type : 2; - /* 02 */ u16 id : 12; - /* 02 */ u16 unk : 4; - /* 04 */ - }; struct { /* 00 */ u16 type_index; /* 02 */ u16 unk_id; @@ -92,32 +52,6 @@ struct ActorRef { u32 data; }; - ActorRef() {} - - ActorRef(u32 value) { - this->data = value; - } - - void Reset() { - this->data = 0; - } - - const bool operator==(const ActorRef &other) const { - return other.data == this->data; - } - - const bool operator!=(const ActorRef &other) const { - return !(*this == other); - } - - void operator=(const ActorRef &other) { - this->data = other.data; - } - - const u32 Get32() const { - return this->data; - } - const u16 GetTypeIndex1() { if (this->type_index == REF_TYPE_INDEX(ActorRefType_0, 0x101)) { return 0x00; @@ -162,11 +96,67 @@ struct ActorRef { } }; -// for arrays -struct ActorRefElem { - ActorRef ref; +struct MapObjRef { + union { + struct { + /* 00 */ union { + struct { + u8 unk_00; + u8 unk_01; + }; + u16 unk_00_u16; + }; + /* 02 */ Vec2b unk_02; + /* 04 */ + }; + u32 data; + }; - ActorRefElem() { + Vec2bCpp &GetUnk02() { + return *(Vec2bCpp *) &this->unk_02; + } +}; + +struct RefStruct { + union { + RefCommon common; // use this when the kind is undetermined + ActorRef acRef; // use this when the kind is clearly an actor ref + MapObjRef moRef; // use this when the kind is clearly a map object ref + u32 data; // raw data as a u32 + }; + + RefStruct() {} + + RefStruct(u32 value) { + this->data = value; + } + + void Reset() { + this->data = 0; + } + + const bool operator==(const RefStruct &other) const { + return other.data == this->data; + } + + const bool operator!=(const RefStruct &other) const { + return !(*this == other); + } + + void operator=(const RefStruct &other) { + this->data = other.data; + } + + const u32 Get32() const { + return this->data; + } +}; + +// for arrays +struct RefElem { + RefStruct ref; + + RefElem() { this->ref.Reset(); } }; diff --git a/include/Unknown/UnkStruct_027e0998.hpp b/include/Unknown/UnkStruct_027e0998.hpp index 990971c5..6240bdc0 100644 --- a/include/Unknown/UnkStruct_027e0998.hpp +++ b/include/Unknown/UnkStruct_027e0998.hpp @@ -1,6 +1,6 @@ #pragma once -#include "Actor/ActorRef.hpp" +#include "RefStruct.hpp" #include "global.h" #include "math.hpp" #include "types.h" @@ -17,7 +17,7 @@ public: UnkStruct_027e0998_Base(); // data_ov000_020b1e08 - /* 00 */ virtual bool vfunc_00(VecFx32 *pPos, Vec2s *param2, ActorRef *param3); + /* 00 */ virtual bool vfunc_00(VecFx32 *pPos, Vec2s *param2, RefStruct *param3); /* 04 */ void func_ov000_02061760(); @@ -38,12 +38,12 @@ public: ~UnkStruct_027e0998(); // ClearInstance // data_ov024_020d7c98 - /* 00 */ virtual bool vfunc_00(VecFx32 *pPos, Vec2s *param2, ActorRef *param3) override; + /* 00 */ virtual bool vfunc_00(VecFx32 *pPos, Vec2s *param2, RefStruct *param3) override; /* 04 */ bool func_ov024_020c716c(); - bool func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, ActorRef *param3); - bool func_ov024_020c727c(Vec2s *param1, ActorRef *param2); + bool func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, RefStruct *param3); + bool func_ov024_020c727c(Vec2s *param1, RefStruct *param2); bool func_ov024_020c7300(unk32 param1); bool func_ov024_020c7354(); diff --git a/include/Unknown/UnkStruct_027e09c0.hpp b/include/Unknown/UnkStruct_027e09c0.hpp index 47bedb73..4d09b5f4 100644 --- a/include/Unknown/UnkStruct_027e09c0.hpp +++ b/include/Unknown/UnkStruct_027e09c0.hpp @@ -1,8 +1,8 @@ #pragma once -#include "Actor/ActorRef.hpp" #include "Actor/ActorShotArrow.hpp" #include "Actor/ActorUnkSCCN.hpp" +#include "RefStruct.hpp" #include "Unknown/UnkFileSystem.hpp" #include "global.h" #include "types.h" @@ -70,11 +70,11 @@ public: // overlay 0 void func_ov000_0207da40(); s16 func_ov000_0207dc88(Actor **, Actor_38 *); - void func_ov000_0207de98(ActorRef param1, UnkStruct_ov000_0207de98 *param2, Actor_38 *param3); + void func_ov000_0207de98(RefStruct param1, UnkStruct_ov000_0207de98 *param2, Actor_38 *param3); void func_ov000_0207e240(ActorUnkSCCN_B8 *param1); void func_ov000_0207e254(ActorUnkSCCN_B8 *param1); - void func_ov000_0207e58c(ActorRef param1, unk32 param2, u8 param3, UnkStruct_ov031_Items_01 *param4); - bool func_ov000_0207e458(unk32 param1, unk32 param2, VecFx32 *param3, unk32 param4, VecFx32 *param5, ActorRef param6); + void func_ov000_0207e58c(RefStruct param1, unk32 param2, u8 param3, UnkStruct_ov031_Items_01 *param4); + bool func_ov000_0207e458(unk32 param1, unk32 param2, VecFx32 *param3, unk32 param4, VecFx32 *param5, RefStruct param6); // overlay 1 void func_ov001_020be394(); diff --git a/include/Unknown/UnkStruct_027e0ce0.hpp b/include/Unknown/UnkStruct_027e0ce0.hpp index 8eaee272..d58f5074 100644 --- a/include/Unknown/UnkStruct_027e0ce0.hpp +++ b/include/Unknown/UnkStruct_027e0ce0.hpp @@ -7,13 +7,12 @@ #include "nitro/fx.h" #include "types.h" -#include "Actor/ActorRef.hpp" #include "Item/ItemManager.hpp" #include "LinkList.hpp" -#include "MapObject/MapObjectRef.hpp" #include "Player/PlayerLink.hpp" #include "Player/PlayerZelda.hpp" #include "Player/TouchControl.hpp" +#include "RefStruct.hpp" #include "Save/SaveManager.hpp" #include "input.hpp" @@ -346,9 +345,9 @@ public: // data_ov000_020b2838 /* 00 */ virtual ~UnkStruct_027e0ce0_38_Base(); /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2); - /* 0C */ virtual bool vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, + /* 0C */ virtual bool vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4); - /* 10 */ virtual bool vfunc_10(ActorRef param1, unk32 param2); + /* 10 */ virtual bool vfunc_10(RefStruct param1, unk32 param2); /* 14 */ }; @@ -555,7 +554,7 @@ public: class UnkStruct_027e0ce0_40_Base_78 { public: - /* 00 */ ActorRef mRef; + /* 00 */ RefStruct mRef; /* 04 */ const bool HasValue() const { @@ -564,7 +563,7 @@ public: } const bool UnkCheck1() { - return this->mRef.UnkCheck2(); + return this->mRef.acRef.UnkCheck2(); } UnkStruct_027e0ce0_40_Base_78(); @@ -622,13 +621,13 @@ public: /* 10 */ unk32 mUnk_10; /* 14 */ - UnkStruct_027e0ce0_40_Base_94_50_Base(unk32 param1, unk32 param2, ActorRefElem *param3, unk32 param4); + UnkStruct_027e0ce0_40_Base_94_50_Base(unk32 param1, unk32 param2, RefElem *param3, unk32 param4); }; class UnkStruct_027e0ce0_40_Base_94_50 : public UnkStruct_027e0ce0_40_Base_94_50_Base { public: /* 00 (base) */ - /* 14 */ ActorRefElem mUnk_14[4]; + /* 14 */ RefElem mUnk_14[4]; /* 24 */ unk32 mUnk_24; /* 28 */ unk32 mUnk_28; /* 2C */ unk32 *mUnk_2C; @@ -643,13 +642,13 @@ public: class UnkStruct_027e0ce0_40_Base_94_Base : public UnkStruct_027e0ce0_40_Base_94_50_Base { public: /* 00 (base) */ - /* 14 */ ActorRef mUnk_14; - /* 18 */ ActorRef mUnk_18; - /* 1C */ ActorRef mUnk_1C; + /* 14 */ RefStruct mUnk_14; + /* 18 */ RefStruct mUnk_18; + /* 1C */ RefStruct mUnk_1C; /* 20 */ Vec2s mTouchPosLast; /* 24 */ unk32 mUnk_24; /* 28 */ PAD(0x28, 0x48); - /* 48 */ ActorRef mUnk_48; + /* 48 */ RefStruct mUnk_48; /* 4C */ u16 mUnk_4C; /* 50 */ @@ -935,7 +934,7 @@ public: void func_ov000_0208bc9c(unk32 param1, unk32 param2); void func_ov000_0208bd20(bool param1, unk32 param2, unk32 param3); void func_ov000_0208bd30(bool param1, unk32 param2, unk32 param3, unk32 param4); - bool func_ov000_0208be0c(ActorRef param1); + bool func_ov000_0208be0c(RefStruct param1); bool func_ov000_0208be70(VecFx32 param1); bool func_ov000_0208bf34(unk32 param1); diff --git a/include/Unknown/UnkStruct_027e0d2c.hpp b/include/Unknown/UnkStruct_027e0d2c.hpp index 8936f08f..1dbb7553 100644 --- a/include/Unknown/UnkStruct_027e0d2c.hpp +++ b/include/Unknown/UnkStruct_027e0d2c.hpp @@ -1,6 +1,6 @@ #pragma once -#include "Actor/ActorRef.hpp" +#include "RefStruct.hpp" #include "math.hpp" #include "types.h" @@ -8,8 +8,8 @@ class UnkStruct_027e0d2c : public AutoInstance { public: // overlay 31 void func_ov031_020d95b4(); - void func_ov031_020d95c8(ActorRef param1); - bool func_ov031_020d962c(VecFx32 *param1, unk32 param2, VecFx32 *param3, ActorRef *param4); + void func_ov031_020d95c8(RefStruct param1); + bool func_ov031_020d962c(VecFx32 *param1, unk32 param2, VecFx32 *param3, RefStruct *param4); // overlay 101 static void Destroy(); diff --git a/include/Unknown/UnkStruct_027e0d38.hpp b/include/Unknown/UnkStruct_027e0d38.hpp index 1317dd0c..4a1b74b3 100644 --- a/include/Unknown/UnkStruct_027e0d38.hpp +++ b/include/Unknown/UnkStruct_027e0d38.hpp @@ -1,6 +1,6 @@ #pragma once -#include "Actor/ActorRef.hpp" +#include "RefStruct.hpp" #include "global.h" #include "nitro/fx.h" #include "types.h" @@ -12,7 +12,7 @@ public: UnkStruct_027e0d38(); // overlay 26 - unk32 func_ov026_020d9c14(ActorRef ref, VecFx32 *pPos, VecFx32 *pVel); + unk32 func_ov026_020d9c14(RefStruct ref, VecFx32 *pPos, VecFx32 *pVel); // overlay 31 bool func_ov031_020d9bec(); diff --git a/include/Unknown/UnkStruct_027e0d8c.hpp b/include/Unknown/UnkStruct_027e0d8c.hpp index 71dede95..2b691186 100644 --- a/include/Unknown/UnkStruct_027e0d8c.hpp +++ b/include/Unknown/UnkStruct_027e0d8c.hpp @@ -16,10 +16,10 @@ public: // overlay 93 void func_ov093_02166058(); void func_ov093_02166068(); - void func_ov093_021660a8(ActorRef param1); + void func_ov093_021660a8(RefStruct param1); void func_ov093_021660f8(); void func_ov093_02166108(); - void func_ov093_021661c0(ActorRef param1); + void func_ov093_021661c0(RefStruct param1); void func_ov093_02166220(); }; diff --git a/include/Unknown/UnkStruct_ov000_0208f820.hpp b/include/Unknown/UnkStruct_ov000_0208f820.hpp index 4eb49ea2..4d632e0c 100644 --- a/include/Unknown/UnkStruct_ov000_0208f820.hpp +++ b/include/Unknown/UnkStruct_ov000_0208f820.hpp @@ -3,9 +3,9 @@ #include "global.h" #include "types.h" -#include "Actor/ActorRef.hpp" #include "Item/ItemManager.hpp" #include "Player/PlayerActorBase.hpp" +#include "RefStruct.hpp" #include "math.hpp" class PlayerLinkActor_A0; @@ -84,7 +84,7 @@ public: /* A0 */ PAD(0xA0, 0x148); /* 148 */ u32 mUnk_148; /* 14C */ unk32 mUnk_14C; - /* 150 */ ActorRef mUnk_150; + /* 150 */ RefStruct mUnk_150; }; class UnkStruct_PlayerGet_vfunc_0C_param1 { @@ -99,8 +99,8 @@ public: class UnkStruct_ov000_0208f820_04 { public: - /* 00 */ ActorRef mUnk_00; - /* 04 */ ActorRef mUnk_04; + /* 00 */ RefStruct mUnk_00; + /* 04 */ RefStruct mUnk_04; /* 08 */ unk32 mUnk_08; /* 0C */ ItemId mItemId; /* 10 */ diff --git a/include/Unknown/UnkStruct_ov031_Items.hpp b/include/Unknown/UnkStruct_ov031_Items.hpp index ca901d61..ed866dec 100644 --- a/include/Unknown/UnkStruct_ov031_Items.hpp +++ b/include/Unknown/UnkStruct_ov031_Items.hpp @@ -27,7 +27,7 @@ public: class UnkStruct_ov031_Items_01_Base { public: /* 00 (vtable) */ - /* 04 */ ActorRef mUnk_04; + /* 04 */ RefStruct mUnk_04; /* 08 */ unk16 mUnk_08; /* 0C */ diff --git a/include/Unknown/UnkSystem1.hpp b/include/Unknown/UnkSystem1.hpp index cae69a63..acbbc7f8 100644 --- a/include/Unknown/UnkSystem1.hpp +++ b/include/Unknown/UnkSystem1.hpp @@ -1,7 +1,7 @@ #pragma once -#include "Actor/ActorRef.hpp" #include "Message/BMG.hpp" +#include "RefStruct.hpp" #include "global.h" #include "types.h" @@ -75,8 +75,8 @@ public: /* 20 */ unk32 mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ unk8 mUnk_28; - /* 2C */ ActorRef mUnk_2C; - /* 30 */ ActorRef mUnk_30; + /* 2C */ RefStruct mUnk_2C; + /* 30 */ RefStruct mUnk_30; /* 34 */ UnkSystem1_ov000_Derived2(unk32 param1); diff --git a/src/000_Second/Actor/Actor.cpp b/src/000_Second/Actor/Actor.cpp index f5a9d696..6e83b7f1 100644 --- a/src/000_Second/Actor/Actor.cpp +++ b/src/000_Second/Actor/Actor.cpp @@ -108,12 +108,12 @@ bool Actor::Grab(ActorGrabParams grabParams) { SET_FLAG(this->mFlags, ActorFlag_Grabbed); - switch (grabParams.mUnk_00.type_index) { + switch (grabParams.mUnk_00.acRef.type_index) { case 0x100: case 0x101: { - u16 var_r3 = grabParams.mUnk_00.unk_id; + u16 var_r3 = grabParams.mUnk_00.acRef.unk_id; - if (grabParams.mUnk_00.type_index == 0x101) { + if (grabParams.mUnk_00.acRef.type_index == 0x101) { var_r3 = 0; } diff --git a/src/000_Second/Actor/Actor_Derived1.cpp b/src/000_Second/Actor/Actor_Derived1.cpp index e1893184..579b06e4 100644 --- a/src/000_Second/Actor/Actor_Derived1.cpp +++ b/src/000_Second/Actor/Actor_Derived1.cpp @@ -76,7 +76,7 @@ bool Actor_Derived1::func_ov000_020a8dd0() { } // non-matching -void Actor_Derived1::func_ov000_020a8df0(ActorRef param1, unk32 param2) { +void Actor_Derived1::func_ov000_020a8df0(RefStruct param1, unk32 param2) { if (!((u32) (((param2 + 8) - param2) / 2) < 2)) { this->mUnk_0B0 |= 2; } else { diff --git a/src/000_Second/MapObject/MapObject.cpp b/src/000_Second/MapObject/MapObject.cpp index 021140ab..3aee5200 100644 --- a/src/000_Second/MapObject/MapObject.cpp +++ b/src/000_Second/MapObject/MapObject.cpp @@ -98,7 +98,7 @@ bool MapObject::func_ov000_0209d144(Vec2s *param1, unk32 param2, UnkStruct_027e0 return false; } -bool MapObject::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { +bool MapObject::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { return true; } @@ -144,24 +144,24 @@ void MapObject::func_ov000_0209d2f0(unk32 param1, unk32 param2, Vec2bCpp *param3 UnkStruct_027e0cd8_0C_Base *temp_r5 = data_027e0cd8->mUnk_0C; Vec2bCpp sp0(0, 0); - sp0.x = this->mRef.unk_02.x; + sp0.x = this->mRef.moRef.unk_02.x; s32 tempX = param3->x; - tempX += this->mRef.unk_02.x; + tempX += this->mRef.moRef.unk_02.x; - if (this->mRef.unk_02.x < tempX) { + if (this->mRef.moRef.unk_02.x < tempX) { do { - sp0.y = this->mRef.unk_02.y; + sp0.y = this->mRef.moRef.unk_02.y; s32 tempY = param3->y; - tempY += this->mRef.unk_02.y; + tempY += this->mRef.moRef.unk_02.y; - if (this->mRef.unk_02.y < tempY) { + if (this->mRef.moRef.unk_02.y < tempY) { do { temp_r5->func_ov000_020801b0(&sp0, param1, param2); - } while (++sp0.y < param3->y + this->mRef.unk_02.y); + } while (++sp0.y < param3->y + this->mRef.moRef.unk_02.y); } - } while (++sp0.x < param3->x + this->mRef.unk_02.x); + } while (++sp0.x < param3->x + this->mRef.moRef.unk_02.x); } } @@ -208,7 +208,7 @@ void MapObject::func_ov000_0209d434(s8 *param1, UnkStruct_ov019_020d24c8_28_258_ return; } - if (data_027e0998->vfunc_00(&this->mPos, &sp10, (ActorRef *) &this->mRef)) { //! TODO: ref conflicts + if (data_027e0998->vfunc_00(&this->mPos, &sp10, (RefStruct *) &this->mRef)) { //! TODO: ref conflicts spC.mUnk_06 = 0x00; MI_CpuFill32(0, &spC, sizeof(spC)); spC.mUnk_05 = -1; @@ -222,7 +222,7 @@ void MapObject::func_ov000_0209d518(VecFx32 *param1, unk32 param2, unk32 param3, data_027e09b4->func_01fff60c(param1, param2, param3, param4, 0, 0); } -void MapObject::func_ov000_0209d54c(ActorRef *param1, MapObject *thisx, u16 param2, const VecFx32 *pPos, s16 param3, +void MapObject::func_ov000_0209d54c(RefStruct *param1, MapObject *thisx, u16 param2, const VecFx32 *pPos, s16 param3, u16 param4) { ActorParams params; @@ -240,8 +240,8 @@ void MapObject::func_ov000_0209d54c(ActorRef *param1, MapObject *thisx, u16 para Actor::func_ov000_020973f4(param1, &data_ov000_020b539c_eur, ActorId_EventIcon, ¶ms, 0); } -void MapObject::func_ov000_0209d5c8(ActorRef ref) { - if (ref.type_index != 0) { +void MapObject::func_ov000_0209d5c8(RefStruct ref) { + if (ref.common.unk_00 != 0) { Actor *pActor = gpActorManager->func_01fff3b4(ref); if (pActor != NULL) { diff --git a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp index f1923ec5..eb6c4d86 100644 --- a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp +++ b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp @@ -39,7 +39,7 @@ bool MapObjectMiniBlocks::Init(void) { u8 uVar6; if (this->mUnk_20.mParams[1] != MiniBlocksVariant_BLKF) { - Vec2bCpp vec(this->mRef.unk_02.x, this->mRef.unk_02.y); + Vec2bCpp vec(this->mRef.moRef.unk_02.x, this->mRef.moRef.unk_02.y); this->mPos.y = pUnkStruct_027e0cd8_0C->func_01ffedf4(&vec); } diff --git a/src/000_Second/MapObject/MapObjectPot_Base.cpp b/src/000_Second/MapObject/MapObjectPot_Base.cpp index 0b3d18c0..87aa41e2 100644 --- a/src/000_Second/MapObject/MapObjectPot_Base.cpp +++ b/src/000_Second/MapObject/MapObjectPot_Base.cpp @@ -28,7 +28,7 @@ bool MapObjectPot_Base::SetState(MapObjState state, unk32 param2) { case MapObjPot_BaseState_1: this->vfunc_48(); if (this->vfunc_40()) { - func_ov000_020a14e4(this->mRef.unk_00, &this->mPos); + func_ov000_020a14e4(this->mRef.moRef.unk_00, &this->mPos); } else { if (this->vfunc_4C()) { unk32 val = this->vfunc_54(); @@ -72,4 +72,4 @@ bool MapObjectPot_Base::vfunc_4C() { // non-matching void MapObjectPot_Base::func_ov000_0209da78(unk32 param1, unk32 param2) {} // non-matching -void MapObjectPot_Base::vfunc_50(ActorRef *param1, MapObjectPot_Base *thisx) {} +void MapObjectPot_Base::vfunc_50(RefStruct *param1, MapObjectPot_Base *thisx) {} diff --git a/src/000_Second/MapObject/MapObjectSwitchStep.cpp b/src/000_Second/MapObject/MapObjectSwitchStep.cpp index fef8b05b..f0ea1f1f 100644 --- a/src/000_Second/MapObject/MapObjectSwitchStep.cpp +++ b/src/000_Second/MapObject/MapObjectSwitchStep.cpp @@ -191,10 +191,10 @@ void MapObjectSwitchStep::vfunc_18(s8 *param1) { if (data_027e09a4->mUnk_00.sceneIndex >= SceneIndex_battle01 && data_027e09a4->mUnk_00.sceneIndex < SceneIndex_Max) { Vec2s sp10; stack_struct sp8; - ActorRef sp4; + RefStruct sp4; //! TODO: fake match? - sp4 = *(ActorRef *) &this->mRef; + sp4 = *(RefStruct *) &this->mRef; if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4)) { sp8.mUnk_06 = 0x00; diff --git a/src/017_CourseExec/Actor/Actor_017.cpp b/src/017_CourseExec/Actor/Actor_017.cpp index 2c78d806..97640f5c 100644 --- a/src/017_CourseExec/Actor/Actor_017.cpp +++ b/src/017_CourseExec/Actor/Actor_017.cpp @@ -3,12 +3,12 @@ #include "Actor/ActorItemBoomerang.hpp" #include "Actor/ActorItemDrop.hpp" #include "Actor/ActorManager.hpp" -#include "Actor/ActorRef.hpp" #include "Actor/ActorRupee.hpp" #include "Actor/ActorUnkKEYN.hpp" #include "Actor/ActorUnkSWBM.hpp" #include "CommonFuncs.hpp" #include "Physics/Cylinder.hpp" +#include "RefStruct.hpp" #include "Unknown/UnkStruct_0204af1c.hpp" #include "Unknown/UnkStruct_027e0998.hpp" #include "Unknown/UnkStruct_027e09a4.hpp" @@ -161,15 +161,15 @@ void Actor::func_ov017_020bf2d8(Actor_9C *param1, unk32 param2) { var_r3 = 1; var_lr = false; - if (param1->mUnk_0C.UnkCheck1() && param1->mUnk_0C.GetTypeIndex1() == 0x01) { + if (param1->mUnk_0C.acRef.UnkCheck1() && param1->mUnk_0C.acRef.GetTypeIndex1() == 0x01) { var_lr = true; } if (!var_lr) { var_ip_2 = 0; - if (param1->mUnk_0C.type_index == 0x102) { - temp_r0 = param1->mUnk_0C.unk_id; + if (param1->mUnk_0C.acRef.type_index == 0x102) { + temp_r0 = param1->mUnk_0C.acRef.unk_id; if (temp_r0 != 1 && temp_r0 != 3) { @@ -262,24 +262,24 @@ void Actor::func_ov017_020bf3e0(unk32 param1, fx32 param2) { void Actor::func_ov017_020bf4b0(unk32 param1) { if (param1 >= 0 && param1 < 8) { - ActorRef ref; + RefStruct ref; ActorRupee::func_ov031_020e8d2c(&ref, &this->mPos, param1, 2, this->mRef); return; } switch (param1) { case 8: { - ActorRef ref; + RefStruct ref; ActorHeart::func_ov031_020eed64(&ref, &this->mPos, 1, this->mRef); break; } case 13: { - ActorRef ref; + RefStruct ref; ActorUnkKEYN::func_ov070_0214143c(&ref, &this->mPos, this->mRef, -1, 0, 0); break; } case 14: { - ActorRef ref; + RefStruct ref; ActorItemDrop::func_ov031_020f9f8c(&ref, &this->mPos, TreasureManager::func_ov000_020a9d78(-1), this->mRef); break; } @@ -460,8 +460,8 @@ void Actor::func_ov017_020bfad4() { void Actor::func_ov017_020bfb18(Actor_9C *param1) { switch (param1->mUnk_1C) { case 8: - if (param1->mUnk_0C.HasTypeIndexValue(0x102)) { - data_027e0ce0->func_ov000_0208bd20(param1->mUnk_0C.UnkCheck3(0x102), 0x8C98, 0); + if (param1->mUnk_0C.acRef.HasTypeIndexValue(0x102)) { + data_027e0ce0->func_ov000_0208bd20(param1->mUnk_0C.acRef.UnkCheck3(0x102), 0x8C98, 0); } break; diff --git a/src/017_CourseExec/Actor/code_020c201c_017.cpp b/src/017_CourseExec/Actor/code_020c201c_017.cpp index 6ab4c4ef..20288e1e 100644 --- a/src/017_CourseExec/Actor/code_020c201c_017.cpp +++ b/src/017_CourseExec/Actor/code_020c201c_017.cpp @@ -1,7 +1,7 @@ #include "Actor/Actor.hpp" #include "Actor/ActorId.hpp" #include "Actor/ActorManager.hpp" -#include "Actor/ActorRef.hpp" +#include "RefStruct.hpp" #include "Unknown/UnkStruct_027e09a4.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" @@ -20,7 +20,7 @@ struct ActorEffectBase { /* 1D4 */ unk32 mUnk_1D4; }; -void Actor::func_ov017_020c2038(ActorRef *pRef, unk32 param2, unk32 param3, const VecFx32 *param4, unk32 param5) { +void Actor::func_ov017_020c2038(RefStruct *pRef, unk32 param2, unk32 param3, const VecFx32 *param4, unk32 param5) { #pragma unused(param2, param3) ActorParams params; @@ -105,7 +105,7 @@ bool Actor::func_ov017_020c219c(unk32 param1, const VecFx32 *param2, unk32 param break; } - ActorRef ref; + RefStruct ref; Actor::func_ov000_020973f4(&ref, &data_ov000_020b539c_eur, actorId, ¶ms, 0x00); Actor *pActor = gpActorManager->func_01fff3b4(ref); @@ -127,7 +127,7 @@ bool Actor::func_ov017_020c2310(const VecFx32 *param1, unk32 param2) { params.func_ov000_020975f8(); VecFx32_Copy(param1, ¶ms.mInitialPos); - ActorRef sp4; + RefStruct sp4; Actor::func_ov000_020973f4(&sp4, &data_ov000_020b539c_eur, ActorId_EFWL, ¶ms, 0x00); Actor *pActor = gpActorManager->func_01fff3b4(sp4); @@ -151,7 +151,7 @@ bool Actor::func_ov017_020c23a4(unk32 param1, const VecFx32 *param2, unk32 param params.func_ov000_020975f8(); VecFx32_Copy(param2, ¶ms.mInitialPos); - ActorRef sp4; + RefStruct sp4; Actor::func_ov000_020973f4(&sp4, &data_ov000_020b539c_eur, ActorId_EFRL, ¶ms, 0x00); Actor *pActor = gpActorManager->func_01fff3b4(sp4); @@ -167,7 +167,7 @@ bool Actor::func_ov017_020c23a4(unk32 param1, const VecFx32 *param2, unk32 param return true; } -void Actor::func_ov017_020c2438(ActorRef *pRef, unk32 param2, const VecFx32 *param3, unk32 param4, bool param5) { +void Actor::func_ov017_020c2438(RefStruct *pRef, unk32 param2, const VecFx32 *param3, unk32 param4, bool param5) { #pragma unused(param4) pRef->Reset(); @@ -184,7 +184,7 @@ void Actor::func_ov017_020c2438(ActorRef *pRef, unk32 param2, const VecFx32 *par switch (param2) { case 0: { - ActorRef sp14; + RefStruct sp14; Actor::func_ov017_020c2038(&sp14, NULL, 0, &sp18, 0xE66); *pRef = sp14; Actor::func_ov017_020c219c(NULL, &sp18, 0xE66, param5); @@ -193,7 +193,7 @@ void Actor::func_ov017_020c2438(ActorRef *pRef, unk32 param2, const VecFx32 *par break; } case 1: { - ActorRef sp10; + RefStruct sp10; Actor::func_ov017_020c2038(&sp10, NULL, 0, &sp18, 0xB33); *pRef = sp10; Actor::func_ov017_020c219c(NULL, &sp18, 0xB33, param5); @@ -202,7 +202,7 @@ void Actor::func_ov017_020c2438(ActorRef *pRef, unk32 param2, const VecFx32 *par break; } case 2: { - ActorRef spC; + RefStruct spC; Actor::func_ov017_020c2038(&spC, NULL, 0, &sp18, 0x800); *pRef = spC; Actor::func_ov017_020c219c(NULL, &sp18, 0x800, param5); @@ -211,7 +211,7 @@ void Actor::func_ov017_020c2438(ActorRef *pRef, unk32 param2, const VecFx32 *par break; } case 3: { - ActorRef sp8; + RefStruct sp8; Actor::func_ov017_020c2038(&sp8, NULL, 0, &sp18, 0x4CD); *pRef = sp8; Actor::func_ov017_020c219c(NULL, &sp18, 0x4CD, param5); diff --git a/src/017_CourseExec/UnkStruct_027e0ce0_40_017.cpp b/src/017_CourseExec/UnkStruct_027e0ce0_40_017.cpp index 60d54071..90690253 100644 --- a/src/017_CourseExec/UnkStruct_027e0ce0_40_017.cpp +++ b/src/017_CourseExec/UnkStruct_027e0ce0_40_017.cpp @@ -115,25 +115,25 @@ bool PlayerLinkActor_9C::func_ov017_020bc640(u32 param1, bool param2, bool param if (temp_r6 == NULL) { data_027e0ce0->func_ov000_0208bc1c(0, this->mUnk_13A, this->mUnk_138, 0, &this->mUnk_13C, 0); } else { - ActorRef sp14 = this->mUnk_008.Get32(); - ActorRef *ptr = &sp14; + RefStruct sp14 = this->mUnk_008.Get32(); + RefStruct *ptr = &sp14; - if (sp14.type_index == 0x100) { + if (sp14.acRef.type_index == 0x100) { *(u32 *) &var_r1 = -1; } else { - var_r1 = ptr->unk_id; + var_r1 = ptr->acRef.unk_id; } if (!(temp_r6->mUnk_70[var_r1] & 0x01) && temp_r6->func_ov021_020eb870(var_r1, this->mUnk_138, 0, &this->mUnk_13C) != 0) { - ActorRef sp10 = this->mUnk_008.Get32(); - ActorRef *ptr = &sp10; + RefStruct sp10 = this->mUnk_008.Get32(); + RefStruct *ptr = &sp10; - if (sp10.type_index == 0x100) { + if (sp10.acRef.type_index == 0x100) { var_r1_2 = -1; } else { - var_r1_2 = ptr->unk_id; + var_r1_2 = ptr->acRef.unk_id; } data_027e0cf4->func_ov021_020f6f58(var_r1_2, 0x1E, &this->mUnk_13C, 0, 0); diff --git a/src/017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp b/src/017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp index c2d1513f..64a6b5e6 100644 --- a/src/017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp +++ b/src/017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp @@ -7,7 +7,7 @@ extern unk16 data_ov000_020ab3c8; // https://decomp.me/scratch/6j77v void UnkStruct_027e0ce0_40_Base_94::func_ov017_020bd300(UnkStruct_027e0ce0_40_Base_14 *param1, unk32 param2, bool param3) { - ActorRef sp0; + RefStruct sp0; s16 temp_r0_2; s16 temp_r2; s16 temp_r3; diff --git a/src/024_MainGame/Unknown/UnkStruct_027e0998_024.cpp b/src/024_MainGame/Unknown/UnkStruct_027e0998_024.cpp index 0cf12c27..24ac174a 100644 --- a/src/024_MainGame/Unknown/UnkStruct_027e0998_024.cpp +++ b/src/024_MainGame/Unknown/UnkStruct_027e0998_024.cpp @@ -25,7 +25,7 @@ UnkStruct_027e0998 *UnkStruct_027e0998::Create() { return new(HeapIndex_1) UnkStruct_027e0998(); } -bool UnkStruct_027e0998::vfunc_00(VecFx32 *pPos, Vec2s *param2, ActorRef *param3) { +bool UnkStruct_027e0998::vfunc_00(VecFx32 *pPos, Vec2s *param2, RefStruct *param3) { if (data_027e09a4->IsCutscene()) { CutsceneParamsEntry *pEntry = Cutscene_GetParamEntry(data_027e09a4->CurrentCSIndex()); @@ -71,7 +71,7 @@ bool UnkStruct_027e0998::vfunc_00(VecFx32 *pPos, Vec2s *param2, ActorRef *param3 } if (data_027e0cd8->func_ov000_02082124()) { - if (!param3->UnkCheck1()) { + if (!param3->acRef.UnkCheck1()) { return false; } @@ -95,7 +95,7 @@ bool UnkStruct_027e0998::func_ov024_020c716c() { return false; } -bool UnkStruct_027e0998::func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, ActorRef *param3) { +bool UnkStruct_027e0998::func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, RefStruct *param3) { bool temp_r4 = this->UnkStruct_027e0998_Base::vfunc_00(pPos, param2, param3); if (data_027e09a4->IsTrain()) { @@ -109,8 +109,8 @@ bool UnkStruct_027e0998::func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, Actor return temp_r4; } -bool UnkStruct_027e0998::func_ov024_020c727c(Vec2s *param1, ActorRef *param2) { - if (!param2->UnkCheck1()) { +bool UnkStruct_027e0998::func_ov024_020c727c(Vec2s *param1, RefStruct *param2) { + if (!param2->acRef.UnkCheck1()) { return false; } diff --git a/src/031_Land/Actor/ActorBlast.cpp b/src/031_Land/Actor/ActorBlast.cpp index 7502a6de..b1f60469 100644 --- a/src/031_Land/Actor/ActorBlast.cpp +++ b/src/031_Land/Actor/ActorBlast.cpp @@ -2,6 +2,7 @@ #include "CommonFuncs.hpp" #include "Actor/ActorManager.hpp" +#include "MapObject/MapObjectManager.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" #include "Unknown/UnkStruct_027e09bc.hpp" @@ -25,7 +26,7 @@ ActorProfileBlast::ActorProfileBlast() : VecFx32_Init(FX_F32_TO_FX32(0.0f), FX_F32_TO_FX32(0.0f), FX_F32_TO_FX32(0.0f), &this->mUnk_04.pos); } -bool ActorBlast_E8::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { +bool ActorBlast_E8::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { struct { VecFx32 unk_00; int pad; @@ -44,8 +45,8 @@ bool ActorBlast_E8::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, co param2->vfunc_10(&sp24.unk_00); - if (((ActorRef *) &ref)->type != 0) { - temp_r0 = gpActorManager->func_01fff3b4(*(ActorRef *) &ref); + if (ref.common.type != 0) { + temp_r0 = gpActorManager->func_01fff3b4(ref); if (temp_r0 != NULL) { var_r0 = this->mUnk_04->mPos.y - (sp24.unk_00.y + temp_r0->mPos.y); @@ -58,9 +59,9 @@ bool ActorBlast_E8::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, co return false; } } - } else if (ref.unk_00_u16 & 0x1000) { - MapObjRef sp8 = ref; - Vec2bCpp sp4 = sp8.GetUnk02(); + } else if (ref.moRef.unk_00_u16 & 0x1000) { + RefStruct sp8 = ref; + Vec2bCpp sp4 = sp8.moRef.GetUnk02(); temp_r0_2 = gpMapObjManager->func_01fff498(sp4); if (temp_r0_2 != NULL) { @@ -132,7 +133,7 @@ bool ActorBlast::Init(unk32 param1) { UnkStruct_027e0cd8_0C_Base *data = data_027e0cd8->mUnk_0C; if (data->mUnk_110 == 0x7 && data->func_ov000_0208217c(&this->mPos, 0x1)) { ActorParams actorParams; - ActorRef actorRef; + RefStruct actorRef; actorParams.mUnk_28 = 0x0; actorParams.func_ov000_020975f8(); @@ -206,7 +207,7 @@ fx32 ActorBlast::func_ov031_020e3b94() { void ActorBlast::func_ov031_020e3b9c(Actor *spawner, unk16 param1, unk16 param2) { ActorParams actorParams; - ActorRef ref; + RefStruct ref; actorParams.mUnk_28 = 0x0; actorParams.func_ov000_020975f8(); diff --git a/src/031_Land/Actor/ActorBomb.cpp b/src/031_Land/Actor/ActorBomb.cpp index 9a466c97..eed3231f 100644 --- a/src/031_Land/Actor/ActorBomb.cpp +++ b/src/031_Land/Actor/ActorBomb.cpp @@ -234,7 +234,7 @@ void ActorBomb::Update() { return; } - if (this->mUnk_1E4.type == 0x1) { + if (this->mUnk_1E4.common.type == 0x1) { if (!this->func_ov031_020e25bc()) { return; } @@ -305,7 +305,7 @@ void ActorBomb::func_ov031_020e1b7c() { if (this->mState == ActorBombState_6) { ActorParams params; - ActorRef ref; + RefStruct ref; params.mUnk_28 = 0; params.func_ov000_020975f8(); @@ -379,14 +379,14 @@ void ActorBomb::func_ov031_020e1ebc() { } void ActorBomb::func_ov031_020e1ed8() { - if (this->mUnk_1E0.type_index != 0x100) { + if (this->mUnk_1E0.acRef.type_index != 0x100) { return; } unk32 param1 = 0x101; - if (this->mUnk_1E0.type_index == param1) { + if (this->mUnk_1E0.acRef.type_index == param1) { param1 = 0x0; } else { - param1 = this->mUnk_1E0.unk_id; + param1 = this->mUnk_1E0.acRef.unk_id; } data_027e0ce0->func_ov000_0208bacc(param1, &this->mPos); } @@ -394,7 +394,7 @@ void ActorBomb::func_ov031_020e1ed8() { void ActorBomb::func_ov031_020e1f18() { if (!this->mUnk_1EF) { bool var = true; - if (this->mUnk_1E0.type_index != 0x100 && this->mUnk_1E0.type_index != 0x101) { + if (this->mUnk_1E0.acRef.type_index != 0x100 && this->mUnk_1E0.acRef.type_index != 0x101) { var = false; } if (var) { @@ -588,12 +588,12 @@ bool ActorBomb::Drop(ActorGrabParams grabParams, const VecFx32 *pVel) { this->mUnk_1E4 = this->mUnk_1E0; this->mUnk_1E0 = 0x0; - if (!(grabParams.mUnk_00.type_index != 0x100 && grabParams.mUnk_00.type_index != 0x2 + 0xFF)) { + if (!(grabParams.mUnk_00.acRef.type_index != 0x100 && grabParams.mUnk_00.acRef.type_index != 0x2 + 0xFF)) { unk32 param1; - if (grabParams.mUnk_00.type_index == 0x101) { + if (grabParams.mUnk_00.acRef.type_index == 0x101) { param1 = 0x0; } else { - param1 = grabParams.mUnk_00.unk_id; + param1 = grabParams.mUnk_00.acRef.unk_id; } VecFx32 sp0C = *this->Actor::func_ov000_0209853c(param1); @@ -790,7 +790,7 @@ void ActorBomb::func_ov031_020e2a9c() { func_01ffe6c4(&s0C.mUnk_00, this->mRef, &this->mPos, &this->mPrevPos, (s16) this->mUnk_44, &this->mPos, &this->mUnk_180); unk32 value = this->func_ov031_020e295c(&this->mUnk_180) | this->func_ov031_020e2820(&this->mUnk_180); - if (this->mUnk_1E0.type_index != 0x0) { + if (this->mUnk_1E0.acRef.type_index != 0x0) { this->mUnk_154.pos.y = 0x4CC; } else { func_01ff916c(&this->mUnk_154.pos.y, 0x4CC, 0x333); @@ -809,7 +809,7 @@ bool ActorBomb::func_ov031_020e2b40() { } if (this->mUnk_180.mUnk_04 & 0x2) { - ActorRef ref; + RefStruct ref; Actor::func_ov017_020c2438(&ref, 0x2, &this->mPos, 0x1, true); data_027e09a8->func_ov000_02071b30(0xEA, &this->mPos, 0x0); @@ -887,7 +887,7 @@ bool ActorBomb_180::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param return this->UnkStruct_ov031_Items_00::vfunc_08(param1, param2); } -bool ActorBomb_180::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { +bool ActorBomb_180::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { MapObjRef sp54; VecFx32 sp24; VecFx32 sp18; @@ -908,8 +908,8 @@ bool ActorBomb_180::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, co var_r4 = 0; - if (ref.unk_00_u16 == 0x1000) { - sp54 = ref; + if (ref.moRef.unk_00_u16 == 0x1000) { + sp54 = ref.moRef; sp0 = sp54.GetUnk02(); MapObject *temp_r0 = gpMapObjManager->func_01fff498(sp0); @@ -1033,13 +1033,12 @@ bool ActorBomb_180::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, co this->mUnk_0C.z = sp24.z; } - MapObjRef reffffff = ref; - u32 refdata = ref.Get32(); - if (this->mUnk_18 == reffffff.Get32()) { + RefStruct refCopy = ref; + if (refCopy == this->mUnk_18) { return true; } - this->mUnk_18 = refdata; + this->mUnk_18.data = ref.data; if (var_r5 != 0) { if (((ActorBomb *) this->mUnk_08)->func_ov031_020e1d58()) { @@ -1052,8 +1051,8 @@ bool ActorBomb_180::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, co return true; } -bool ActorBomb_180::vfunc_10(ActorRef param1, unk32 param2) { - if (param1.type == 0x1) { +bool ActorBomb_180::vfunc_10(RefStruct param1, unk32 param2) { + if (param1.common.type == 0x1) { Actor *actor = gpActorManager->func_01fff3b4(param1); if (actor != NULL && actor->GetActorId() == ActorId_Bomb) { ActorBlast::func_ov031_020e3b9c(this->mUnk_08, 0x0, 0x0); diff --git a/src/031_Land/Actor/ActorHeart.cpp b/src/031_Land/Actor/ActorHeart.cpp index 9a4cdf0d..04d9537a 100644 --- a/src/031_Land/Actor/ActorHeart.cpp +++ b/src/031_Land/Actor/ActorHeart.cpp @@ -36,7 +36,7 @@ ActorProfileHeart::ActorProfileHeart() : this->mUnk_04.Init(FX_F32_TO_FX32(0.25)); } -void ActorHeart::func_ov031_020eed64(ActorRef *pOutRef, const VecFx32 *pPos, u32 params, ActorRef ref) { +void ActorHeart::func_ov031_020eed64(RefStruct *pOutRef, const VecFx32 *pPos, u32 params, RefStruct ref) { ActorParams actorParams; actorParams.mUnk_28.Reset(); @@ -420,7 +420,7 @@ ActorHeart_C4::ActorHeart_C4(Actor *param1) : this->mUnk_04 = 1; } -bool ActorHeart_C4::vfunc_00(ActorRef ref, unk32 param3) { +bool ActorHeart_C4::vfunc_00(RefStruct ref, unk32 param3) { if (param3 != 0) { ActorHeart *pHeart = this->GetActorPtr(); pHeart->mUnk_C4 = ref; diff --git a/src/031_Land/Actor/ActorItemBoomerang.cpp b/src/031_Land/Actor/ActorItemBoomerang.cpp index 6b8b70a0..d242f210 100644 --- a/src/031_Land/Actor/ActorItemBoomerang.cpp +++ b/src/031_Land/Actor/ActorItemBoomerang.cpp @@ -153,7 +153,7 @@ void ActorItemBoomerang::Update() { sp14.Reset(); - if (!data_027e0d2c->func_ov031_020d962c(&this->mPos, 0x4CD, &sp6C, (ActorRef *) &sp14)) { + if (!data_027e0d2c->func_ov031_020d962c(&this->mPos, 0x4CD, &sp6C, (RefStruct *) &sp14)) { this->SetState(ActorItemBoomerangState_1); } else { @@ -164,7 +164,7 @@ void ActorItemBoomerang::Update() { func_01ff97c8(&this->mVel, sp18.unk_00 + 0x200); } - if (sp14.type != 0) { + if (sp14.common.type != 0) { this->mUnk_CC.mUnk_0C.pos.z = this->mPos.z; this->mUnk_CC.mUnk_0C.pos.y = this->mPos.y + FX_F32_TO_FX32(-0.1003f); this->mUnk_CC.mUnk_0C.size = 0xA000; @@ -177,7 +177,7 @@ void ActorItemBoomerang::Update() { return; } - sp20 = sp14.data; + sp20 = sp14.moRef; spE = sp20.GetUnk02(); MapObject *temp_r0_5 = gpMapObjManager->func_01fff498(spE); @@ -396,7 +396,7 @@ bool ActorItemBoomerang_11C::vfunc_08(const UnkStruct_ov031_020f3310 *param1, un return this->UnkStruct_ov031_Items_00::vfunc_08(param1, param2); } -bool ActorItemBoomerang_11C::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, +bool ActorItemBoomerang_11C::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { u32 val = (param2->mUnk_08 >> 9) & 7; @@ -411,9 +411,9 @@ bool ActorItemBoomerang_11C::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *p } if (this->mUnk_08->mState == ActorItemBoomerangState_1) { - if (ref.unk_00_u16 & 0x1000) { - MapObjRef ref2 = ref; - Vec2bCpp pos = ref2.GetUnk02(); + if (ref.moRef.unk_00_u16 & 0x1000) { + MapObjRef moRef = ref.moRef; + Vec2bCpp pos = moRef.GetUnk02(); MapObject *mapObject = gpMapObjManager->func_01fff498(pos); @@ -433,9 +433,9 @@ bool ActorItemBoomerang_11C::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *p return false; } - if (ref.unk_00_u16 & 0x1000) { - MapObjRef ref2 = ref; - Vec2bCpp pos = ref2.GetUnk02(); + if (ref.moRef.unk_00_u16 & 0x1000) { + MapObjRef moRef = ref.moRef; + Vec2bCpp pos = moRef.GetUnk02(); MapObject *mapObject = gpMapObjManager->func_01fff498(pos); @@ -446,7 +446,7 @@ bool ActorItemBoomerang_11C::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *p switch (mapObject->GetMapObjectId()) { case MapObjectId_SKDI: case MapObjectId_SWHT: - data_027e0d2c->func_ov031_020d95c8(*(ActorRef *) &ref); //! TODO: ref conflicts + data_027e0d2c->func_ov031_020d95c8(*(RefStruct *) &ref); //! TODO: ref conflicts case MapObjectId_Pot: mapObject->vfunc_1C(this->mUnk_08->mRef, 0xC, &this->mUnk_08->mVel); return false; diff --git a/src/031_Land/Actor/ActorItemDrop.cpp b/src/031_Land/Actor/ActorItemDrop.cpp index 0346b511..aedfcee2 100644 --- a/src/031_Land/Actor/ActorItemDrop.cpp +++ b/src/031_Land/Actor/ActorItemDrop.cpp @@ -69,7 +69,7 @@ ActorProfileTreasureDrop::ActorProfileTreasureDrop() : this->mUnk_04.Init(0x400); } -void ActorItemDrop::func_ov031_020f9f8c(ActorRef *pOutRef, const VecFx32 *pPos, u32 params, ActorRef ref) { +void ActorItemDrop::func_ov031_020f9f8c(RefStruct *pOutRef, const VecFx32 *pPos, u32 params, RefStruct ref) { ActorParams actorParams; actorParams.mUnk_28.Reset(); @@ -213,15 +213,15 @@ void ActorItemDrop::func_ov031_020fa260() { if (this->mUnk_119) { bool var_r1_3 = false; - if (this->mUnk_B4.mUnk_0C.type_index == 0x100 && this->mUnk_B4.mUnk_0C.unk_id == 0) { + if (this->mUnk_B4.mUnk_0C.acRef.type_index == 0x100 && this->mUnk_B4.mUnk_0C.acRef.unk_id == 0) { var_r1_3 = true; } - if (var_r1_3 || (this->mUnk_B4.mUnk_0C.type_index == 0x100 && this->mUnk_B4.mUnk_0C.unk_id == 1 && - data_027e0ce0->func_01fff1e0())) { + if (var_r1_3 || (this->mUnk_B4.mUnk_0C.acRef.type_index == 0x100 && + this->mUnk_B4.mUnk_0C.acRef.unk_id == 1 && data_027e0ce0->func_01fff1e0())) { this->SetState(ActorItemDropState_6); } - } else if (this->mUnk_B4.mUnk_0C.type_index & 0x100) { + } else if (this->mUnk_B4.mUnk_0C.acRef.type_index & 0x100) { this->SetState(ActorItemDropState_6); } break; @@ -523,7 +523,7 @@ ActorItemDrop_C4::ActorItemDrop_C4(Actor *param1) : this->mUnk_04 = 0x1; } -bool ActorItemDrop_C4::vfunc_00(ActorRef ref, unk32 param2) { +bool ActorItemDrop_C4::vfunc_00(RefStruct ref, unk32 param2) { if (param2 != 0) { ActorItemDrop *actorDroppedItem = this->GetActorPtr(); actorDroppedItem->mUnk_E0 = ref; diff --git a/src/031_Land/Actor/ActorItemTornado.cpp b/src/031_Land/Actor/ActorItemTornado.cpp index fece3b2e..0f53ed97 100644 --- a/src/031_Land/Actor/ActorItemTornado.cpp +++ b/src/031_Land/Actor/ActorItemTornado.cpp @@ -1,8 +1,9 @@ #include "Actor/ActorItemTornado.hpp" -#include "Actor/ActorRef.hpp" #include "CommonFuncs.hpp" #include "Map/MapObjectId.hpp" +#include "MapObject/MapObjectManager.hpp" #include "Physics/Cylinder.hpp" +#include "RefStruct.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e0958.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" @@ -25,7 +26,7 @@ bool UnkStruct_ov031_02112ff4::vfunc_08(const UnkStruct_ov031_020f3310 *param1, return ((param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06] >> 0x1A) & 0x01) != 0x01; } -bool UnkStruct_ov031_02112ff4::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, +bool UnkStruct_ov031_02112ff4::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { #pragma unused(param3, param4) @@ -33,8 +34,8 @@ bool UnkStruct_ov031_02112ff4::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 return false; } - if (ref.unk_00_u16 == 0x1000) { - MapObjRef sp4 = ref; + if (ref.moRef.unk_00_u16 == 0x1000) { + MapObjRef sp4 = ref.moRef; Vec2bCpp sp0 = sp4.GetUnk02(); MapObject *temp_r5 = gpMapObjManager->func_01fff498(sp0); diff --git a/src/031_Land/Actor/ActorRollingStone.cpp b/src/031_Land/Actor/ActorRollingStone.cpp index dccf33dd..ce1d81e2 100644 --- a/src/031_Land/Actor/ActorRollingStone.cpp +++ b/src/031_Land/Actor/ActorRollingStone.cpp @@ -59,11 +59,11 @@ ActorProfileRollingStone::ActorProfileRollingStone() : } // non-matching -bool ActorRollingStone_104::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, +bool ActorRollingStone_104::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) {} -bool ActorRollingStone_104::vfunc_10(ActorRef param1, unk32 param2) { - if (param1.type != 0x0) { +bool ActorRollingStone_104::vfunc_10(RefStruct param1, unk32 param2) { + if (param1.common.type != 0x0) { Actor *actor = gpActorManager->func_01fff3b4(param1); if (actor != NULL) { switch (actor->GetActorId()) { @@ -396,7 +396,7 @@ void ActorRollingStone::func_ov031_020f8f30() { sp14.mInitialAngle = this->mAngle.angle_s; sp14.mParams[0] = 0x1; - ActorRef ref; + RefStruct ref; this->func_ov000_020973f4(&ref, &data_ov000_020b539c_eur, ActorId_RollingStone, &sp14, 0x0); this->mUnk_150.Set(0, this->mUnk_5C.mParams[1]); } diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index b6d8ca57..9d363df1 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -57,7 +57,7 @@ ActorProfileRupee::ActorProfileRupee() : this->mUnk_04.size = 0x556; } -void ActorRupee::func_ov031_020e8d2c(ActorRef *pOutRef, const VecFx32 *pPos, u32 params, u32 unk_2C, ActorRef ref) { +void ActorRupee::func_ov031_020e8d2c(RefStruct *pOutRef, const VecFx32 *pPos, u32 params, u32 unk_2C, RefStruct ref) { ActorParams actorParams; actorParams.mUnk_28.Reset(); @@ -605,7 +605,7 @@ void ActorRupee::Update() { switch (this->mUnk_9C.mUnk_1C) { case 0x08: case 0x10: - if ((this->mUnk_9C.mUnk_0C.type_index & 0x100) != 0) { + if ((this->mUnk_9C.mUnk_0C.acRef.type_index & 0x100) != 0) { this->func_ov031_020e9068(); uVar3 = uStack_18; } @@ -822,7 +822,7 @@ ActorRupee_C4::ActorRupee_C4(Actor *param1) : this->mUnk_04 = 1; } -bool ActorRupee_C4::vfunc_00(ActorRef ref, unk32 param2) { +bool ActorRupee_C4::vfunc_00(RefStruct ref, unk32 param2) { if (param2 != 0) { ActorRupee *pRupee = this->GetActorPtr(); pRupee->mUnk_C0 = ref.Get32(); diff --git a/src/031_Land/Actor/ActorShotArrow.cpp b/src/031_Land/Actor/ActorShotArrow.cpp index 6817ef33..67253cdd 100644 --- a/src/031_Land/Actor/ActorShotArrow.cpp +++ b/src/031_Land/Actor/ActorShotArrow.cpp @@ -35,7 +35,7 @@ typedef struct { typedef struct { /* 00 */ PAD(0x00, 0x04); - /* 04 */ ActorRef mUnk_04; + /* 04 */ RefStruct mUnk_04; /* 08 */ unk32 mUnk_08; /* 0C */ MtxFx43 *mUnk_0C; /* 10 */ VecFx32 mUnk_10; @@ -636,9 +636,9 @@ void ActorShotArrow::func_ov031_020f28ac() { switch (this->mUnk_140.mUnk_1C) { case 0x8: - if ((s16) this->mUnk_140.mUnk_0C.index == 0x102) { + if (this->mUnk_140.mUnk_0C.acRef.unk_id == 0x102) { bool var = false; - if ((s16) this->mUnk_140.mUnk_0C.index == 0x102) { + if (this->mUnk_140.mUnk_0C.acRef.unk_id == 0x102) { if (this->mUnk_140.mUnk_0C.data == 0x1 || this->mUnk_140.mUnk_0C.data == 0x3) { var = true; } @@ -674,10 +674,10 @@ void ActorShotArrow::func_ov031_020f28ac() { break; } case 0xE: - if (this->mUnk_140.mUnk_0C.index == 0x102) { + if (this->mUnk_140.mUnk_0C.acRef.unk_id == 0x102) { bool var = false; - if (this->mUnk_140.mUnk_0C.index == 0x102) { + if (this->mUnk_140.mUnk_0C.acRef.unk_id == 0x102) { if (this->mUnk_140.mUnk_0C.data == 0x1 || this->mUnk_140.mUnk_0C.data == 0x3) { var = true; } @@ -708,7 +708,7 @@ void ActorShotArrow::func_ov031_020f28ac() { break; } case 0x3: - if (this->mUnk_140.mUnk_0C.type != ActorRefType_0) { + if (this->mUnk_140.mUnk_0C.common.type != ActorRefType_0) { Actor *actor = gpActorManager->func_01fff3b4(this->mUnk_140.mUnk_0C); if (actor) { func_01ffb714(&actor->mPos, &actor->mPrevPos, &vec1); @@ -965,7 +965,7 @@ bool ActorShotArrow_178::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 } // non-matching -bool ActorShotArrow_178::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, +bool ActorShotArrow_178::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) {} ActorShotArrow_194::ActorShotArrow_194(ActorShotArrow *param1) { @@ -1065,7 +1065,7 @@ void ActorShotArrow_194::vfunc_10(Actor *actor) { case ActorId_LOCK: stack.mUnk_04 = actor->mUnk_5C.mUnk_28; - if (stack.mUnk_04.data != 0 && stack.mUnk_04.type != ActorRefType_0) { + if (stack.mUnk_04.data != 0 && stack.mUnk_04.common.type != ActorRefType_0) { ActorUnkGYAM *lockedActor = (ActorUnkGYAM *) gpActorManager->func_01fff3b4(actor->mUnk_5C.mUnk_28); if (lockedActor != NULL && lockedActor->GetActorId() == ActorId_GYAM) { diff --git a/src/031_Land/Actor/ActorUnkFLEN.cpp b/src/031_Land/Actor/ActorUnkFLEN.cpp index f830b168..f97a27c4 100644 --- a/src/031_Land/Actor/ActorUnkFLEN.cpp +++ b/src/031_Land/Actor/ActorUnkFLEN.cpp @@ -79,7 +79,7 @@ void ActorUnkFLEN::SetState(ActorState state) { bool ActorUnkFLEN::func_ov031_020f81f8() { ActorParams actorParams; - ActorRef actorRef; + RefStruct actorRef; actorParams.mUnk_28 = 0; actorParams.func_ov000_020975f8(); @@ -94,5 +94,5 @@ bool ActorUnkFLEN::func_ov031_020f81f8() { Actor::func_ov000_020973f4(&actorRef, &data_ov000_020b539c_eur, data_ov031_02110b94[index], &actorParams, 0x0); - return actorRef.type_index != 0; + return actorRef.common.unk_00 != 0; } diff --git a/src/031_Land/Actor/ActorUnkNFSP.cpp b/src/031_Land/Actor/ActorUnkNFSP.cpp index b994909a..0b3fd574 100644 --- a/src/031_Land/Actor/ActorUnkNFSP.cpp +++ b/src/031_Land/Actor/ActorUnkNFSP.cpp @@ -176,7 +176,7 @@ void ActorUnkNFSP::func_ov031_020fbb8c() { this->func_ov000_020989e0(); } -void ActorUnkNFSP::func_ov031_020fbba0(ActorRef ref) { +void ActorUnkNFSP::func_ov031_020fbba0(RefStruct ref) { if (this->mUnk_94 == 0x2) { return; } @@ -195,7 +195,7 @@ ActorUnkNFSP_C0::ActorUnkNFSP_C0(ActorUnkNFSP *actor) : this->mUnk_04 = 0x1; } -bool ActorUnkNFSP_C0::vfunc_00(ActorRef ref, unk32 param2) { +bool ActorUnkNFSP_C0::vfunc_00(RefStruct ref, unk32 param2) { if (this->GetActorPtr()->mUnk_94 != 0x0) { return false; } diff --git a/src/031_Land/Actor/ActorUnkNTTZ.cpp b/src/031_Land/Actor/ActorUnkNTTZ.cpp index 3bb31e55..3965a402 100644 --- a/src/031_Land/Actor/ActorUnkNTTZ.cpp +++ b/src/031_Land/Actor/ActorUnkNTTZ.cpp @@ -30,7 +30,7 @@ void ActorUnkNTTZ::Update() {} void ActorUnkNTTZ::vfunc_2C(Actor_vfunc_30 *param1) {} void ActorUnkNTTZ::func_ov031_020f61a0() { - if (this->mUnk_5C.mUnk_28.type == 0x0) { + if (this->mUnk_5C.mUnk_28.common.type == 0x0) { return; } @@ -43,7 +43,7 @@ void ActorUnkNTTZ::func_ov031_020f61a0() { } void ActorUnkNTTZ::func_ov031_020f61f0() { - if (this->mUnk_5C.mUnk_28.type == 0x0) { + if (this->mUnk_5C.mUnk_28.common.type == 0x0) { return; } diff --git a/src/031_Land/Actor/ActorUnkROCK.cpp b/src/031_Land/Actor/ActorUnkROCK.cpp index 3da5f842..86929e0e 100644 --- a/src/031_Land/Actor/ActorUnkROCK.cpp +++ b/src/031_Land/Actor/ActorUnkROCK.cpp @@ -108,7 +108,7 @@ void ActorUnkROCK::vfunc_2C(Actor_vfunc_30 *param1) { } bool ActorUnkROCK::Grab(ActorGrabParams param1) { - if (param1.mUnk_00.type_index != 0x100 || param1.mUnk_00.unk_id != 1) { + if (param1.mUnk_00.acRef.type_index != 0x100 || param1.mUnk_00.acRef.unk_id != 1) { return false; } if (!this->Actor::Grab(param1)) { diff --git a/src/031_Land/Actor/ActorUnkSWBM.cpp b/src/031_Land/Actor/ActorUnkSWBM.cpp index c9be5570..6fd70a20 100644 --- a/src/031_Land/Actor/ActorUnkSWBM.cpp +++ b/src/031_Land/Actor/ActorUnkSWBM.cpp @@ -16,7 +16,7 @@ bool ActorUnkSWBM_94::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 par return (((u32) param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06] >> 0x16) & 0x1) != 0x1; } -bool ActorUnkSWBM_94::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { +bool ActorUnkSWBM_94::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { #pragma unused(ref, param3, param4) return ((param2->mUnk_08 >> 0x16) & 0x1) != 0x1; } diff --git a/src/031_Land/Actor/ActorUnkTGTZ.cpp b/src/031_Land/Actor/ActorUnkTGTZ.cpp index 15deddac..62a735b1 100644 --- a/src/031_Land/Actor/ActorUnkTGTZ.cpp +++ b/src/031_Land/Actor/ActorUnkTGTZ.cpp @@ -216,8 +216,8 @@ void ActorUnkTGTZ::vfunc_24() { this->Update(); } -void ActorUnkTGTZ::func_ov031_020f6e5c(ActorRef param1) { - if (param1.type_index == 0x0) { +void ActorUnkTGTZ::func_ov031_020f6e5c(RefStruct param1) { + if (param1.common.unk_00 == 0x0) { return; } Actor *actor = gpActorManager->func_01fff3b4(param1); @@ -226,7 +226,7 @@ void ActorUnkTGTZ::func_ov031_020f6e5c(ActorRef param1) { } } -void ActorUnkTGTZ::func_ov031_020f6ea8(ActorRef *param0, u16 param1, const VecFx32 *param2, s16 param3, u16 param4) { +void ActorUnkTGTZ::func_ov031_020f6ea8(RefStruct *param0, u16 param1, const VecFx32 *param2, s16 param3, u16 param4) { ActorParams params; params.mUnk_28 = 0; @@ -258,7 +258,7 @@ void ActorUnkTGTZ::func_ov031_020f6f20(unk32 param1) { case 0x1: { this->mUnk_1C0.Set(0, 30); SET_FLAG(this->mFlags, ActorFlag_Visible); - ActorRef ref; + RefStruct ref; this->func_ov031_020f6ea8(&ref, 0x0, &this->mPos, 0x0, 0x1); this->mUnk_1DC = ref; break; @@ -383,7 +383,7 @@ void ActorUnkTGTZ::vfunc_2C(Actor_vfunc_30 *param1) { void ActorUnkTGTZ::func_ov031_020f7358() { ActorParams params; - ActorRef ref; + RefStruct ref; params.mUnk_28 = 0x0; params.func_ov000_020975f8(); diff --git a/src/031_Land/MapObject/MapObjectBombFlower.cpp b/src/031_Land/MapObject/MapObjectBombFlower.cpp index 8d796f93..37e78159 100644 --- a/src/031_Land/MapObject/MapObjectBombFlower.cpp +++ b/src/031_Land/MapObject/MapObjectBombFlower.cpp @@ -1,6 +1,6 @@ #include "MapObject/MapObjectBombFlower.hpp" -#include "Actor/ActorRef.hpp" #include "CommonFuncs.hpp" +#include "RefStruct.hpp" #include "Actor/ActorBomb.hpp" #include "Actor/ActorManager.hpp" @@ -10,7 +10,7 @@ #include "profile.hpp" struct UnkStruct_ov031_02102728 { - ActorRef ref; + RefStruct ref; unk32 mUnk_04; }; @@ -50,7 +50,7 @@ MapObjectBombFlower::MapObjectBombFlower() : SET_FLAG(this->mFlags, MapObjFlag_6); } -bool MapObjectBombFlower::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { +bool MapObjectBombFlower::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { this->mUnk_BC = false; switch (param2) { case 0xD: @@ -104,7 +104,7 @@ void MapObjectBombFlower::func_ov031_02102728(unk32 param1) { params.mUnk_28 = 0; params.func_ov000_020975f8(); - params.mUnk_28 = *(ActorRef *) &this->mRef; //! TODO: ref conflicts + params.mUnk_28 = *(RefStruct *) &this->mRef; //! TODO: ref conflicts VecFx32_Copy(&this->mPos, ¶ms.mInitialPos); params.mParams[0] = 0x0; @@ -220,7 +220,7 @@ void MapObjectBombFlower::vfunc_38() { VecFx32_Copy(&this->mPos, ¶ms.mInitialPos); params.mParams[0] = 0x1; - ActorRef ref; + RefStruct ref; Actor::func_ov000_020973f4(&ref, &data_ov000_020b539c_eur, this->mUnk_40, ¶ms, 0x0); ActorBomb *bomb = (ActorBomb *) gpActorManager->func_01fff3b4(ref); @@ -239,7 +239,7 @@ unk32 MapObjectBombFlower::vfunc_28(unk32 param1, unk32 param2, unk32 param3) { // non-matching // https://decomp.me/scratch/WRLuY -void MapObjectBombFlower::vfunc_50(ActorRef *param1, MapObjectPot_Base *thisx) { +void MapObjectBombFlower::vfunc_50(RefStruct *param1, MapObjectPot_Base *thisx) { ActorParams params; params.mUnk_28 = 0; diff --git a/src/031_Land/MapObject/MapObjectChestBase.cpp b/src/031_Land/MapObject/MapObjectChestBase.cpp index 9f6e4efa..85ebf197 100644 --- a/src/031_Land/MapObject/MapObjectChestBase.cpp +++ b/src/031_Land/MapObject/MapObjectChestBase.cpp @@ -60,7 +60,7 @@ bool MapObjectChestBase::Init() { if (this->mUnk_20.mParams[3] == 1) { this->mPos.x += 0x7FC; - Vec2bCpp sp48(this->mRef.unk_02.x, this->mRef.unk_02.y); + Vec2bCpp sp48(this->mRef.moRef.unk_02.x, this->mRef.moRef.unk_02.y); pUVar2->func_ov000_020801b0(&sp48, 7, 1); sp48.x++; @@ -111,12 +111,12 @@ void MapObjectChestBase::Setup() { VecFx32_Add((VecFx32 *) &sp3C, &spC, (VecFx32 *) &sp3C); - local_68.x = this->mRef.unk_02.x; - local_68.y = this->mRef.unk_02.y; + local_68.x = this->mRef.moRef.unk_02.x; + local_68.y = this->mRef.moRef.unk_02.y; iVar2 = pUVar5->func_01ffedf4((Vec2bCpp *) &local_68); if (this->mUnk_20.mParams[3] == 1) { - Vec2bCpp temp_r0(this->mRef.unk_02.x, this->mRef.unk_02.y); + Vec2bCpp temp_r0(this->mRef.moRef.unk_02.x, this->mRef.moRef.unk_02.y); temp_r0.x--; if (pUVar5->func_01ffedf4((Vec2bCpp *) &temp_r0) > iVar2 || gpMapObjManager->func_01fff498(local_5e) != NULL) { @@ -128,10 +128,10 @@ void MapObjectChestBase::Setup() { sp3C.x += FX_F32_TO_FX32(0.5f); } } else { - Vec2bCpp temp_r0(this->mRef.unk_02.x, this->mRef.unk_02.y); + Vec2bCpp temp_r0(this->mRef.moRef.unk_02.x, this->mRef.moRef.unk_02.y); temp_r0.x--; temp_r0.y += 2; - // local_5e.y = this->mRef.unk_02.y + (this->mRef.unk_02.x - 1); + // local_5e.y = this->mRef.moRef.unk_02.y + (this->mRef.moRef.unk_02.x - 1); // local_6c.y += local_5e.y; // local_5e.y += 2; @@ -145,7 +145,7 @@ void MapObjectChestBase::Setup() { } } - local_62.x = (this->mRef.unk_02.y - 1) + this->mRef.unk_02.x; + local_62.x = (this->mRef.moRef.unk_02.y - 1) + this->mRef.moRef.unk_02.x; if (gpMapObjManager->func_ov000_0209c3a8(&local_62) == MapObjectId_MiniBlocks && iVar2 == pUVar5->func_01ffedf4(&local_62)) { @@ -153,8 +153,8 @@ void MapObjectChestBase::Setup() { } if (data_027e09a4->CurrentSceneIndex() == SceneIndex_d_flame) { - local_64.x = this->mRef.unk_02.x; - local_66.y = this->mRef.unk_02.y; + local_64.x = this->mRef.moRef.unk_02.x; + local_66.y = this->mRef.moRef.unk_02.y; local_66.x = local_64.x - 1; local_64.y = local_66.y - 1; diff --git a/src/031_Land/MapObject/MapObjectDoorBase.cpp b/src/031_Land/MapObject/MapObjectDoorBase.cpp index 06bad4a4..81c35c40 100644 --- a/src/031_Land/MapObject/MapObjectDoorBase.cpp +++ b/src/031_Land/MapObject/MapObjectDoorBase.cpp @@ -475,7 +475,7 @@ void MapObjectDoorBase::vfunc_5C(MapObjState state, unk32 param2) { } if (this->mUnk_87) { - ActorRef sp8; + RefStruct sp8; MapObject::func_ov000_0209d54c(&sp8, this, 1, &this->mPos, var_r1_2, var_r5); } } @@ -534,7 +534,7 @@ extern fx16 data_0203f964[]; void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1) { Vec2s sp10; stack_struct sp8; - ActorRef sp4; + RefStruct sp4; bool var_r2; if (!GET_FLAG(this->mFlags, MapObjFlag_5)) { @@ -550,7 +550,7 @@ void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1) { bool uVar4 = (this->mUnk_84 % 0x1A) >= 0x0D ? true : false; //! TODO: fake match? - sp4 = *(ActorRef *) &this->mRef; //! TODO: ref conflicts + sp4 = *(RefStruct *) &this->mRef; //! TODO: ref conflicts if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4) && uVar4 != 0) { MtxFx22 m; diff --git a/src/031_Land/MapObject/MapObjectGrass.cpp b/src/031_Land/MapObject/MapObjectGrass.cpp index 0380eb91..8539b669 100644 --- a/src/031_Land/MapObject/MapObjectGrass.cpp +++ b/src/031_Land/MapObject/MapObjectGrass.cpp @@ -118,7 +118,7 @@ bool MapObjectGrass::func_ov031_02101778() { return false; } -bool MapObjectGrass::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { +bool MapObjectGrass::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { if (this->mUnk_64 != -0x1) { return false; } diff --git a/src/031_Land/MapObject/MapObjectPot.cpp b/src/031_Land/MapObject/MapObjectPot.cpp index 88a05c1c..c608b643 100644 --- a/src/031_Land/MapObject/MapObjectPot.cpp +++ b/src/031_Land/MapObject/MapObjectPot.cpp @@ -53,7 +53,7 @@ void MapObjectPot::Setup() { this->mPos.y = func_01ffe868(&this->mPos, 0x1, 0x0); } -bool MapObjectPot::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { +bool MapObjectPot::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { switch (param2) { case 0xD: this->SetState(0x1, 0x0); diff --git a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp index 44cb1d26..bb3fc0f6 100644 --- a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp @@ -321,14 +321,14 @@ public: /* 12C */ }; -bool MapObjectUnkSKDI::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { +bool MapObjectUnkSKDI::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { bool var_r1 = false; - if (param1.type_index == 0x102) { - if (param1.unk_id == 1 || param1.unk_id == 3) { + if (param1.acRef.type_index == 0x102) { + if (param1.acRef.unk_id == 1 || param1.acRef.unk_id == 3) { var_r1 = true; } } - if (var_r1 != 0 && param1.unk_id == 1) { + if (var_r1 != 0 && param1.acRef.unk_id == 1) { if (data_027e0ce0->mEquippedItem != ActorId_PMTB) { return false; } diff --git a/src/031_Land/MapObject/MapObjectUnkSWHT.cpp b/src/031_Land/MapObject/MapObjectUnkSWHT.cpp index 51ce49e1..24f6d6c4 100644 --- a/src/031_Land/MapObject/MapObjectUnkSWHT.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSWHT.cpp @@ -199,8 +199,8 @@ void MapObjectUnkSWHT::vfunc_14(unk32 param1) { this->mUnk_054.vfunc_18(&this->mPos); } -bool MapObjectUnkSWHT::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { - if (param1.type != 0x0) { +bool MapObjectUnkSWHT::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { + if (param1.common.type != 0x0) { Actor *actor = gpActorManager->func_01fff3b4(param1); if (actor != NULL) { if (actor->GetActorId() == ActorId_SRST) { @@ -223,7 +223,7 @@ bool MapObjectUnkSWHT::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) this->func_ov031_021020ec(); return false; case 0xA: - if (param1.type != 0x0) { + if (param1.common.type != 0x0) { Actor *actor = gpActorManager->func_01fff3b4(param1); if (actor != NULL) { if (actor->GetActorId() == ActorId_KEYB) { diff --git a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp index f20bf3c6..12d20a1e 100644 --- a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp +++ b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp @@ -260,7 +260,7 @@ void ActorFleeingSpinut::func_ov032_0211bea8() { this->Actor::func_ov017_020bf3e0(0x1, 0x0); if (this->func_ov032_0211be04()) { - ActorRef ref; + RefStruct ref; ActorUnkKEYN::func_ov070_0214143c(&ref, &this->mPos, this->mRef, this->mUnk_5C.mUnk_24, this->mUnk_5C.mUnk_18[0], this->mUnk_5C.mUnk_1A[0]); return; diff --git a/src/032_MapA1/Actor/ActorKeese.cpp b/src/032_MapA1/Actor/ActorKeese.cpp index c0cf6c60..5403e021 100644 --- a/src/032_MapA1/Actor/ActorKeese.cpp +++ b/src/032_MapA1/Actor/ActorKeese.cpp @@ -105,7 +105,7 @@ bool ActorKeese_2AC::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 para } // non-matching -bool ActorKeese_2AC::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) {} +bool ActorKeese_2AC::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) {} bool ActorKeese::Init(unk32 param1) { this->mUnk_0B0.func_ov000_02057c38(0x6, 0x2); diff --git a/src/032_MapA1/Actor/ActorSpinut.cpp b/src/032_MapA1/Actor/ActorSpinut.cpp index d81773b4..fe6f55a4 100644 --- a/src/032_MapA1/Actor/ActorSpinut.cpp +++ b/src/032_MapA1/Actor/ActorSpinut.cpp @@ -853,7 +853,7 @@ void ActorSpinut::vfunc_54(unk32 param1) { break; case 0x3: { - ActorRef ref; + RefStruct ref; Actor::func_ov017_020c2438(&ref, this->mUnk_A8->mUnk_08, &this->mPos, 0x1, true); data_027e09a8->func_ov000_02071b30(0xEA, &this->mPos, 0x0); diff --git a/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp b/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp index 9b617038..24ba6f6e 100644 --- a/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp +++ b/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp @@ -312,9 +312,9 @@ void MapObjectUnkSWSW::vfunc_08() { this->mAngle = this->mUnk_10C; } -bool MapObjectUnkSWSW::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { +bool MapObjectUnkSWSW::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { if (this->mUnk_0FC != 0x2) { - if (param1.type != 0x0) { + if (param1.common.type != 0x0) { Actor *actor = gpActorManager->func_01fff3b4(param1); if (actor != NULL) { @@ -327,7 +327,7 @@ bool MapObjectUnkSWSW::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) return true; } - if (param1.type != 0x0) { + if (param1.common.type != 0x0) { ActorUnkNSSW *actorNSSW = (ActorUnkNSSW *) gpActorManager->func_01fff3b4(param1); if (actorNSSW != NULL) { @@ -479,7 +479,7 @@ void MapObjectUnkSWSW::vfunc_14(unk32 param1) { } struct UnkStack_ov032_02121dc8 { - /* 00 */ ActorRef ref; + /* 00 */ RefStruct ref; /* 04 */ PAD(0x04, 0x08); /* 08 */ }; diff --git a/src/063_Shrine/Actor/ActorUnkCANS.cpp b/src/063_Shrine/Actor/ActorUnkCANS.cpp index f0d7574d..50012ecd 100644 --- a/src/063_Shrine/Actor/ActorUnkCANS.cpp +++ b/src/063_Shrine/Actor/ActorUnkCANS.cpp @@ -3,7 +3,6 @@ #include "Actor/ActorId.hpp" #include "Actor/ActorItemBoomerang.hpp" #include "Actor/ActorManager.hpp" -#include "Actor/ActorRef.hpp" #include "Actor/ActorShotArrow.hpp" #include "Actor/ActorUnkCASE.hpp" #include "CommonFuncs.hpp" @@ -11,6 +10,7 @@ #include "MapObject/MapObject.hpp" #include "MapObject/MapObjectManager.hpp" #include "Physics/Cylinder.hpp" +#include "RefStruct.hpp" #include "Render/ModelRender.hpp" #include "Save/AdventureFlags.hpp" #include "System/Random.hpp" @@ -96,7 +96,7 @@ UnkStruct_ov063_02162ee8::UnkStruct_ov063_02162ee8(G3d_Model *pModel) : UnkStruct_ov063_02162e88::UnkStruct_ov063_02162e88(void *param1) : mUnk_20(param1) {} -unk32 UnkStruct_ov063_02162e88::vfunc_04(ActorRef param1, unk32 param2, unk32 param3, unk32 *param4) { +unk32 UnkStruct_ov063_02162e88::vfunc_04(RefStruct param1, unk32 param2, unk32 param3, unk32 *param4) { unk32 ret1 = Actor_9C::vfunc_04(param1, param2, param3, param4); @@ -109,7 +109,7 @@ unk32 UnkStruct_ov063_02162e88::vfunc_04(ActorRef param1, unk32 param2, unk32 pa } if (((ActorUnkCANS *) mUnk_20)->func_ov063_0215a56c((unk16) func_01ffbbe0(param4[0], param4[2])) != 0 && - param1.type != 0) { + param1.common.type != 0) { ActorShotArrow *ret4 = (ActorShotArrow *) gpActorManager->func_01fff3b4(param1); if (ret4 != NULL && ret4->GetActorId() == ActorId_ShotArrow) { @@ -161,7 +161,7 @@ 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); - ActorRef var; + RefStruct var; ActorManager *actorManager = gpActorManager; ActorUnkCASE::func_ov063_0215acec(&var, this->mRef); @@ -309,10 +309,10 @@ void ActorUnkCANS::Update(void) { break; case 8: if (iVar5 != 0) { - if (mUnk_200.mUnk_0C.type_index == 0x102) { + if (mUnk_200.mUnk_0C.acRef.type_index == 0x102) { unk32 uVar1 = 0; - if (mUnk_200.mUnk_0C.type_index == 0x102) { - if (mUnk_200.mUnk_0C.unk_id == 1 || mUnk_200.mUnk_0C.unk_id == 3) { + if (mUnk_200.mUnk_0C.acRef.type_index == 0x102) { + if (mUnk_200.mUnk_0C.acRef.unk_id == 1 || mUnk_200.mUnk_0C.acRef.unk_id == 3) { uVar1 = 1; }; } @@ -1173,11 +1173,11 @@ bool UnkStruct_ov063_02162ea8::vfunc_08(const UnkStruct_ov031_020f3310 *param1, return retVal; } -bool UnkStruct_ov063_02162ea8::vfunc_0C(MapObjRef ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, +bool UnkStruct_ov063_02162ea8::vfunc_0C(RefStruct ref, UnkStruct_ov031_020e54d4 *param2, const VecFx32 *param3, const VecFx32 *param4) { - if (ref.unk_00_u16 & 0x1000) { - MapObjRef ref2 = ref; - Vec2bCpp pos = ref2.GetUnk02(); + if (ref.moRef.unk_00_u16 & 0x1000) { + MapObjRef moRef = ref.moRef; + Vec2bCpp pos = moRef.GetUnk02(); MapObject *mapObject = gpMapObjManager->func_01fff498(pos); diff --git a/src/063_Shrine/Actor/ActorUnkCASE.cpp b/src/063_Shrine/Actor/ActorUnkCASE.cpp index 3f557bfc..6f089bf1 100644 --- a/src/063_Shrine/Actor/ActorUnkCASE.cpp +++ b/src/063_Shrine/Actor/ActorUnkCASE.cpp @@ -2,12 +2,12 @@ #include "Actor/Actor.hpp" #include "Actor/ActorId.hpp" #include "Actor/ActorManager.hpp" -#include "Actor/ActorRef.hpp" #include "Actor/ActorShotArrow.hpp" #include "Actor/ActorUnkCANS.hpp" #include "Actor/ActorUnkITWP.hpp" #include "CommonFuncs.hpp" #include "Physics/Cylinder.hpp" +#include "RefStruct.hpp" #include "Render/ModelRender.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" #include "Unknown/UnkStruct_027e09c0.hpp" @@ -83,7 +83,7 @@ ActorUnkCASE_150::ActorUnkCASE_150(Actor *param1) : mUnk_04 = 1; } -bool ActorUnkCASE_150::vfunc_00(ActorRef ref, unk32 param2) { +bool ActorUnkCASE_150::vfunc_00(RefStruct ref, unk32 param2) { ActorUnkCASE *actor = (ActorUnkCASE *) mUnk_20; if (actor->mUnk_1F4 == 0) { bool cond = true; @@ -123,7 +123,7 @@ void ActorUnkCASE_174::vfunc_10(Actor *actor) { } // Static -void ActorUnkCASE::func_ov063_0215acec(ActorRef *ref1, ActorRef ref2) { +void ActorUnkCASE::func_ov063_0215acec(RefStruct *ref1, RefStruct ref2) { ActorParams params; params.mUnk_28 = 0; @@ -461,7 +461,7 @@ void ActorUnkCASE::vfunc_10(Cylinder *param1) { param1->size = 0x800; } -void ActorUnkCASE::func_ov063_0215b814(ActorRef ref) { +void ActorUnkCASE::func_ov063_0215b814(RefStruct ref) { mUnk_1E4 = ref; if (mUnk_14C != NULL) { diff --git a/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp b/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp index 8c3cbb85..1c5a4a10 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp @@ -73,7 +73,7 @@ void MapObjectUnkLTRW::vfunc_14(unk32 param1) { mUnk_40.vfunc_18(&mPos); } -bool MapObjectUnkLTRW::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { +bool MapObjectUnkLTRW::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { if (param2 == 0xD) { func_ov031_020e0f30(param1); return false; diff --git a/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp b/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp index 4346e3b8..f3195879 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp @@ -69,7 +69,7 @@ void MapObjectUnkMTJR::vfunc_0C() { this->vfunc_08(); } -bool MapObjectUnkMTJR::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { +bool MapObjectUnkMTJR::vfunc_1C(RefStruct param1, unk32 param2, VecFx32 *param3) { switch (param2) { case 13: this->func_ov063_02161254(1); diff --git a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp index d4e01bbc..586bd5f3 100644 --- a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp +++ b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp @@ -16,8 +16,8 @@ ActorProfileUnkKEYN::ActorProfileUnkKEYN() : ActorUnkKEYN::ActorUnkKEYN() {} -void ActorUnkKEYN::func_ov070_0214143c(ActorRef *param1, VecFx32 *param2, ActorRef param3, s16 param4, u8 param5, u16 param6) { -} +void ActorUnkKEYN::func_ov070_0214143c(RefStruct *param1, VecFx32 *param2, RefStruct param3, s16 param4, u8 param5, + u16 param6) {} void ActorUnkKEYN::func_ov070_02141618(void) {} void ActorUnkKEYN::func_ov070_0214162c(void) {} void ActorUnkKEYN::func_ov070_02141750(void) {} diff --git a/src/071_Tower/Actor/ActorTearLight.cpp b/src/071_Tower/Actor/ActorTearLight.cpp index 9857f681..320a50b7 100644 --- a/src/071_Tower/Actor/ActorTearLight.cpp +++ b/src/071_Tower/Actor/ActorTearLight.cpp @@ -269,7 +269,7 @@ void ActorTearLight::func_ov071_0215f92c() { this->func_ov071_0215fdd4(); break; case 16: - if (this->mUnk_168.mUnk_0C.type_index == 0x100 && this->mUnk_168.mUnk_0C.unk_id == 0) { + if (this->mUnk_168.mUnk_0C.acRef.type_index == 0x100 && this->mUnk_168.mUnk_0C.acRef.unk_id == 0) { this->func_ov071_0215fd80(); break; } @@ -433,7 +433,7 @@ ActorTearLight_194::ActorTearLight_194(ActorTearLight *param1) : this->mUnk_04 = 0x1; } -bool ActorTearLight_194::vfunc_00(ActorRef ref, unk32 param2) { +bool ActorTearLight_194::vfunc_00(RefStruct ref, unk32 param2) { if (param2 != 0x0) { ActorTearLight *actor = this->GetActorPtr(); actor->mUnk_190 = ref; diff --git a/src/075_BossLast2/Actor/ActorUnkMRD2.cpp b/src/075_BossLast2/Actor/ActorUnkMRD2.cpp index 0b3fe779..ec4f9efe 100644 --- a/src/075_BossLast2/Actor/ActorUnkMRD2.cpp +++ b/src/075_BossLast2/Actor/ActorUnkMRD2.cpp @@ -102,7 +102,7 @@ void ActorUnkMRD2::func_ov075_0215b4dc(void) {} void ActorUnkMRD2::func_ov075_0215b578(void) {} void ActorUnkMRD2::func_ov075_0215b914(void) {} void ActorUnkMRD2::func_ov075_0215bbe8(void) {} -bool ActorUnkMRD2::func_ov075_0215bbf0(ActorRef *param1, unk32 *param2) { +bool ActorUnkMRD2::func_ov075_0215bbf0(RefStruct *param1, unk32 *param2) { return false; } void ActorUnkMRD2::func_ov075_0215bc50(void) {} diff --git a/src/084_BossFlame/Actor/ActorUnkIWTS.cpp b/src/084_BossFlame/Actor/ActorUnkIWTS.cpp index e0a634c2..84221afd 100644 --- a/src/084_BossFlame/Actor/ActorUnkIWTS.cpp +++ b/src/084_BossFlame/Actor/ActorUnkIWTS.cpp @@ -49,7 +49,7 @@ void ActorUnkIWTS::func_ov084_02152cd8(void) {} void ActorUnkIWTS::func_ov084_02152cec(void) {} void ActorUnkIWTS::func_ov084_02152d10(void) {} void ActorUnkIWTS::func_ov084_02153018(void) {} -bool ActorUnkIWTS::func_ov084_02153064(ActorRef *, MtxFx43 **) {} +bool ActorUnkIWTS::func_ov084_02153064(RefStruct *, MtxFx43 **) {} void ActorUnkIWTS::func_ov084_021530d4(void) {} void ActorUnkIWTS::func_ov084_0215315c(void) {} void ActorUnkIWTS::func_ov084_02153194(void) {} diff --git a/src/101_SceneInitLand/Player/PlayerLinkActor_A0_1C_101.cpp b/src/101_SceneInitLand/Player/PlayerLinkActor_A0_1C_101.cpp index dd61ef64..34233a6a 100644 --- a/src/101_SceneInitLand/Player/PlayerLinkActor_A0_1C_101.cpp +++ b/src/101_SceneInitLand/Player/PlayerLinkActor_A0_1C_101.cpp @@ -18,7 +18,7 @@ void PlayerLinkActor_A0_1C::func_ov101_02183290() { // why is this a loop while (ppActor != gpActorManager->mUnk_08) { - ActorRef ref = (*ppActor)->mRef; + RefStruct ref = (*ppActor)->mRef; this->mUnk_0C = ref; break; } diff --git a/src/101_SceneInitLand/UnkStruct_027e0cd8_0C_101.cpp b/src/101_SceneInitLand/UnkStruct_027e0cd8_0C_101.cpp index 773bfe40..f3e5c0d1 100644 --- a/src/101_SceneInitLand/UnkStruct_027e0cd8_0C_101.cpp +++ b/src/101_SceneInitLand/UnkStruct_027e0cd8_0C_101.cpp @@ -97,7 +97,7 @@ void func_ov101_02183884(int index, unk32 param2, unk32 param3); void UnkStruct_027e0cd8_0C_1D0::func_ov101_021837a0() { ActorParams sp14; - ActorRef sp10; + RefStruct sp10; bool spC; struct { @@ -163,7 +163,7 @@ void UnkStruct_027e0cd8_0C_1D0::func_ov101_021837a0() { void func_ov101_02183884(int index, unk32 param2, unk32 param3) { ActorParams params; - ActorRef ref; + RefStruct ref; params.mUnk_28.Reset(); params.func_ov000_020975f8(); diff --git a/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp b/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp index 81b79602..6e49f5f9 100644 --- a/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp +++ b/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp @@ -218,7 +218,7 @@ void MapObjectUnkSAND::vfunc_0C() { void MapObjectUnkSAND::vfunc_14(unk32 param1) { VecFx32 sp4 = this->mPos; - Vec2bCpp sp0 = this->mRef.GetUnk02(); + Vec2bCpp sp0 = this->mRef.moRef.GetUnk02(); for (int var_r7 = 0; var_r7 < ARRAY_LEN(this->mUnk_40); var_r7++) { if (this->mUnk_40[var_r7].mUnk_00 != 0) { diff --git a/src/110_PlayerGet/PlayerGet.cpp b/src/110_PlayerGet/PlayerGet.cpp index fda61dcb..07f4dfcc 100644 --- a/src/110_PlayerGet/PlayerGet.cpp +++ b/src/110_PlayerGet/PlayerGet.cpp @@ -536,7 +536,7 @@ void PlayerGet::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { pUnk_3c->y = 0; pUnk_3c->z = 0; - if (this->mUnk_54.mUnk_04.type != ActorRefType_1) { + if (this->mUnk_54.mUnk_04.common.type != ActorRefType_1) { return; } @@ -812,7 +812,7 @@ void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { case ItemId_AncientShield: this->mUnk_30->func_ov000_020936ec(); - if (this->mUnk_54.mUnk_04.type == ActorRefType_1) { + if (this->mUnk_54.mUnk_04.common.type == ActorRefType_1) { temp_r0_3 = (ActorUnkNSHD *) gpActorManager->func_01fff3b4(this->mUnk_54.mUnk_00); if ((temp_r0_3 != NULL) && (temp_r0_3->GetActorId() == ActorId_NormalShield)) { @@ -851,10 +851,10 @@ void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { break; } - if (this->mUnk_54.mUnk_00.type_index == REF_TYPE_INDEX(ActorRefType_0, 0x1000)) { + if (this->mUnk_54.mUnk_00.acRef.type_index == REF_TYPE_INDEX(ActorRefType_0, 0x1000)) { Vec2bCpp stack; - stack.x = this->mUnk_54.mUnk_00.type_index; - stack.y = this->mUnk_54.mUnk_00.unk_id; + stack.x = this->mUnk_54.mUnk_00.acRef.type_index; + stack.y = this->mUnk_54.mUnk_00.acRef.unk_id; MapObject *pMapObj = gpMapObjManager->func_01fff498(stack); @@ -909,7 +909,7 @@ void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { break; } - if (this->mUnk_54.mUnk_04.type == ActorRefType_1 && data_027e09b8->func_ov000_020732dc(2) != 0) { + if (this->mUnk_54.mUnk_04.common.type == ActorRefType_1 && data_027e09b8->func_ov000_020732dc(2) != 0) { this->mUnk_04.mUnk_00 = this->mUnk_54.mUnk_04; this->mUnk_30->func_ov000_020921e4(0x57); break; diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp index 1bbda5d9..7c132ea7 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp @@ -62,7 +62,7 @@ PlayerSceneChange::~PlayerSceneChange() { } s16 PlayerSceneChange::func_ov112_02184bbc(s16 param1) { - if (this->mUnk_90.type == ActorRefType_1) { + if (this->mUnk_90.common.type == ActorRefType_1) { Actor *pActor = gpActorManager->func_01fff3b4(this->mUnk_90); if (pActor != NULL) { @@ -152,11 +152,9 @@ void PlayerSceneChange::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { this->mUnk_70.z = temp_r8->z + FX_MUL(data_0203f964[1], FX_F32_TO_FX32(2.0f)); break; default: - if (this->mUnk_2C->mUnk_150.type_index == 0x1000) { - stack2.y = this->mUnk_2C->mUnk_150.type_index; - stack2.x = 0; - - MapObjectUnkDRTY *pDRTY = (MapObjectUnkDRTY *) gpMapObjManager->func_01fff498(stack2); + if (this->mUnk_2C->mUnk_150.moRef.unk_00_u16 == 0x1000) { + Vec2bCpp pos = this->mUnk_2C->mUnk_150.moRef.GetUnk02(); + MapObjectUnkDRTY *pDRTY = (MapObjectUnkDRTY *) gpMapObjManager->func_01fff498(pos); if (pDRTY != NULL) { pDRTY->func_ov000_0209d6ac((VecFx32 *) &this->mUnk_70); @@ -181,7 +179,7 @@ void PlayerSceneChange::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { } } } else { - if (this->mUnk_2C->mUnk_150.type == ActorRefType_1) { + if (this->mUnk_2C->mUnk_150.common.type == ActorRefType_1) { Actor_Derived1 *temp_r0_6 = (Actor_Derived1 *) gpActorManager->func_01fff3b4(this->mUnk_2C->mUnk_150); @@ -191,9 +189,9 @@ void PlayerSceneChange::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { this->mUnk_70.z = temp_r0_6->mPos.z; 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.angle_s; - this->mUnk_A8 = temp_r0_6->mAngle.angle_s; + this->mUnk_90.acRef.type_index = temp_r0_6->mRef.acRef.type_index; + this->mUnk_AA = temp_r0_6->mAngle.angle_s; + this->mUnk_A8 = temp_r0_6->mAngle.angle_s; } } } diff --git a/src/ITCM/ITCM_ActorManager.cpp b/src/ITCM/ITCM_ActorManager.cpp index b47f4af6..6c670fa5 100644 --- a/src/ITCM/ITCM_ActorManager.cpp +++ b/src/ITCM/ITCM_ActorManager.cpp @@ -1,12 +1,12 @@ #include "Actor/ActorManager.hpp" -Actor *ActorManager::func_01fff3b4(ActorRef ref) { - if (ref.type == 1) { +Actor *ActorManager::func_01fff3b4(RefStruct ref) { + if (ref.common.type == 1) { int size = this->mActorTableEnd - this->mActorTable; Actor *pActor; // Affectation directement dans la condition - if (size != 0 && (pActor = this->mActorTable[ref.index]) != NULL) { + if (size != 0 && (pActor = this->mActorTable[ref.common.index]) != NULL) { if (pActor->IsAlive() && pActor->mRef == ref) { return pActor; }