From ac47abfa46fc49181ac10724af48904e28f386d6 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 26 Mar 2024 21:25:52 +0100 Subject: [PATCH] `PlayerLinkBase` -> `PlayerBase` --- asm/include/ov12.inc | 2 +- asm/ov00/Player/LinkStateBase.s | 8 ++++---- asm/ov12.s | 2 +- include/Player/LinkStateBase.hpp | 2 +- include/Player/{PlayerLinkBase.hpp => PlayerBase.hpp} | 2 +- include/Player/PlayerLink.hpp | 4 ++-- src/00_Core/Player/LinkStateBase.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename include/Player/{PlayerLinkBase.hpp => PlayerBase.hpp} (89%) diff --git a/asm/include/ov12.inc b/asm/include/ov12.inc index c62abafb..4171f69a 100644 --- a/asm/include/ov12.inc +++ b/asm/include/ov12.inc @@ -2512,7 +2512,7 @@ .extern func_ov00_020d716c .extern data_ov00_020eec68 .extern func_ov00_020838e8 -.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_38EP5Vec3p +.extern _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p .extern data_027e0e60 .extern func_ov00_02097738 .extern _ZN13LinkStateBase19PlayerLink_vfunc_74Ev diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index 67ddd511..519578d3 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -587,9 +587,9 @@ _ZN13LinkStateBase8TeleportEP5Vec3psibb: ; 0x020a85ac ldmia sp!, {r3, pc} arm_func_end _ZN13LinkStateBase8TeleportEP5Vec3psibb - .global _ZN13LinkStateBase23PlayerLinkBase_vfunc_38EP5Vec3p - arm_func_start _ZN13LinkStateBase23PlayerLinkBase_vfunc_38EP5Vec3p -_ZN13LinkStateBase23PlayerLinkBase_vfunc_38EP5Vec3p: ; 0x020a85e0 + .global _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p + arm_func_start _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p +_ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p: ; 0x020a85e0 stmdb sp!, {r3, lr} ldr r0, [r0, #8] mov r2, #0 @@ -597,7 +597,7 @@ _ZN13LinkStateBase23PlayerLinkBase_vfunc_38EP5Vec3p: ; 0x020a85e0 ldr r3, [r3, #0x38] blx r3 ldmia sp!, {r3, pc} - arm_func_end _ZN13LinkStateBase23PlayerLinkBase_vfunc_38EP5Vec3p + arm_func_end _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p .global _ZN13LinkStateBase19PlayerLink_vfunc_74Ev arm_func_start _ZN13LinkStateBase19PlayerLink_vfunc_74Ev diff --git a/asm/ov12.s b/asm/ov12.s index 50248f12..4d058200 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -41108,7 +41108,7 @@ func_ov12_02134300: ; 0x02134300 ldmeqia sp!, {r4, pc} ldrb r1, [sp, #0x13] mov r0, r4 - bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_38EP5Vec3p + bl _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p add sp, sp, #0x18 ldmia sp!, {r4, pc} .align 2, 0 diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp index 3811e6bc..3cd9d7cb 100644 --- a/include/Player/LinkStateBase.hpp +++ b/include/Player/LinkStateBase.hpp @@ -75,7 +75,7 @@ public: void func_ov00_020a8508(); void func_ov00_020a853c(Vec3p *param1); void Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5); - void PlayerLinkBase_vfunc_38(Vec3p *pos); + void PlayerBase_vfunc_38(Vec3p *pos); void PlayerLink_vfunc_74(); void PlayerLink_vfunc_88(); unk16 Get_PlayerLink_Unk48(); diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerBase.hpp similarity index 89% rename from include/Player/PlayerLinkBase.hpp rename to include/Player/PlayerBase.hpp index 8a3ccd2b..9db3724d 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -5,7 +5,7 @@ #include "System/SysNew.hpp" -class PlayerLinkBase : public SysObject { +class PlayerBase : public SysObject { /* 00 (vtable) */ /* 04 */ void *mUnk_04; /* 08 */ s16 mUnk_08; diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp index 8ba08d44..4b5ff1e5 100644 --- a/include/Player/PlayerLink.hpp +++ b/include/Player/PlayerLink.hpp @@ -4,7 +4,7 @@ #include "types.h" #include "lib/math.h" -#include "Player/PlayerLinkBase.hpp" +#include "Player/PlayerBase.hpp" #include "Player/MotionParams.hpp" #include "Actor/ActorManager.hpp" @@ -17,7 +17,7 @@ enum PlayerCharacter_ { PlayerCharacter_Gongoron = 1, }; -class PlayerLink: public PlayerLinkBase { +class PlayerLink: public PlayerBase { /* 00 (base) */ /* 14 */ Vec3p mPos; /* 20 */ Vec3p mVel; diff --git a/src/00_Core/Player/LinkStateBase.cpp b/src/00_Core/Player/LinkStateBase.cpp index 5a7a4187..85566588 100644 --- a/src/00_Core/Player/LinkStateBase.cpp +++ b/src/00_Core/Player/LinkStateBase.cpp @@ -32,7 +32,7 @@ void LinkStateBase::func_ov00_020a84bc(s32 param1) {} void LinkStateBase::func_ov00_020a8508() {} void LinkStateBase::func_ov00_020a853c(Vec3p *param1) {} void LinkStateBase::Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) {} -void LinkStateBase::PlayerLinkBase_vfunc_38(Vec3p *pos) {} +void LinkStateBase::PlayerBase_vfunc_38(Vec3p *pos) {} void LinkStateBase::PlayerLink_vfunc_74() {} void LinkStateBase::PlayerLink_vfunc_88() {} unk16 LinkStateBase::Get_PlayerLink_Unk48() {}