mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-27 16:13:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

PlayerLinkBase -> PlayerBase

Browse Source
This commit is contained in:
Aetias
2024-03-26 21:25:52 +01:00
parent f4e26837e2
commit ac47abfa46
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/ov12.inc
+1 -1
View File
@@ -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
asm/ov00/Player/LinkStateBase.s
+4 -4
View File
@@ -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
asm/ov12.s
+1 -1
View File
@@ -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
include/Player/LinkStateBase.hpp
+1 -1
View File
@@ -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();
include/Player/PlayerLinkBase.hpp → include/Player/PlayerBase.hpp
+1 -1
View File
@@ -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;
include/Player/PlayerLink.hpp
+2 -2
View File
@@ -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;
src/00_Core/Player/LinkStateBase.cpp
+1 -1
View File
@@ -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() {}