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

Remangle ActorManager::func_ov00_020c39ac

Browse Source
This commit is contained in:
Aetias
2024-05-25 10:16:04 +02:00
parent b91c1fe36d
commit 0429948e80
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -12,7 +12,7 @@
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c398cEj
.extern _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder
.extern _ZN12ActorManager18func_ov00_020c39acEjPjb
.extern _ZN12ActorManager18func_ov00_020c39acEjPKjb
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
asm/ov00/Actor/Actor.s
+3 -3
View File
@@ -1340,7 +1340,7 @@ _ZN5Actor18func_ov00_020c243cEPjPPS_: ; 0x020c243c
ldr r0, [r0]
mov r2, r5
mov r3, r4
bl _ZN12ActorManager18func_ov00_020c39acEjPjb
bl _ZN12ActorManager18func_ov00_020c39acEjPKjb
movs r5, r0
beq _020c26e4
mov r0, #0xb
@@ -1956,7 +1956,7 @@ _ZN5Actor18func_ov00_020c2c0cEv: ; 0x020c2c0c
ldr r1, [r0, #0xc]
ldr r0, [r3]
mov r3, #0
bl _ZN12ActorManager18func_ov00_020c39acEjPjb
bl _ZN12ActorManager18func_ov00_020c39acEjPKjb
cmp r0, #0
addne sp, sp, #8
movne r0, #1
@@ -2061,7 +2061,7 @@ _ZN5Actor18func_ov00_020c2d54Ev: ; 0x020c2d54
ldr r1, [r4, #0xc]
ldr r0, [r0]
mov r3, #0
bl _ZN12ActorManager18func_ov00_020c39acEjPjb
bl _ZN12ActorManager18func_ov00_020c39acEjPKjb
movs r5, r0
beq _020c2dd0
bl _ZN10EquipSword12GetEquipRopeEv
asm/ov00/Actor/ActorManager.s
+4 -4
View File
@@ -459,9 +459,9 @@ _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder: ; 0x020c399c
_020c39a8: .word func_ov00_020c3f3c
arm_func_end _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder
.global _ZN12ActorManager18func_ov00_020c39acEjPjb
arm_func_start _ZN12ActorManager18func_ov00_020c39acEjPjb
_ZN12ActorManager18func_ov00_020c39acEjPjb: ; 0x020c39ac
.global _ZN12ActorManager18func_ov00_020c39acEjPKjb
arm_func_start _ZN12ActorManager18func_ov00_020c39acEjPKjb
_ZN12ActorManager18func_ov00_020c39acEjPKjb: ; 0x020c39ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
movs r8, r2
@@ -563,7 +563,7 @@ _020c3b20:
mov r0, r4
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPjb
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPKjb
.global _ZN12ActorManager18func_ov00_020c3b2cEPi
arm_func_start _ZN12ActorManager18func_ov00_020c3b2cEPi
include/Actor/ActorManager.hpp
+1 -1
View File
@@ -87,7 +87,7 @@ public:
static void FindNearestActorOfType(ActorRef *ref, ActorManager *manager, ActorTypeId type, Vec3p *pos);
bool func_ov00_020c398c(u32 index);
void func_ov00_020c399c(u32 index, Cylinder *cylinder);
Actor* func_ov00_020c39ac(u32 index, ActorTypeId *actorTypes, bool param3);
Actor* func_ov00_020c39ac(u32 index, const ActorTypeId *actorTypes, bool param3);
s32 func_ov00_020c3b2c(s32 *param1);
s32 func_ov00_020c3bb0(unk32 param1, s32 *param2);
void func_ov00_020c3ce8(unk32 param1, unk32 param2);
src/00_Core/Actor/ActorManager.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ void ActorManager::FindActorByType(ActorRef *ref, ActorManager *manager, ActorTy
void ActorManager::FindNearestActorOfType(ActorRef *ref, ActorManager *manager, ActorTypeId type, Vec3p *pos) {}
bool ActorManager::func_ov00_020c398c(u32 index) {}
void ActorManager::func_ov00_020c399c(u32 index, Cylinder *cylinder) {}
Actor* ActorManager::func_ov00_020c39ac(u32 index, ActorTypeId *actorTypes, bool param3) {}
Actor* ActorManager::func_ov00_020c39ac(u32 index, const ActorTypeId *actorTypes, bool param3) {}
s32 ActorManager::func_ov00_020c3b2c(s32 *param1) {}
s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) {}
void ActorManager::func_ov00_020c3ce8(unk32 param1, unk32 param2) {}