mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-28 08:25:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mangle EquipBoomerang::GetActor

Browse Source
This commit is contained in:
Aetias
2024-05-23 23:51:15 +02:00
parent 9579c4c9bf
commit 23bbb6fe5b
8 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -63,7 +63,7 @@
.extern func_ov00_020c5924
.extern func_ov00_020c8398
.extern func_ov05_02103f4c
.extern func_ov14_0213d15c
.extern _ZN14EquipBoomerang8GetActorEv
.extern func_ov14_0213d420
.extern func_ov14_0213d440
.extern func_ov14_0213d480
asm/ov00/Actor/Actor.s
+1 -1
View File
@@ -1977,7 +1977,7 @@ _ZN5Actor18func_ov00_020c2c70Ev: ; 0x020c2c70
sub sp, sp, #0x18
mov r5, r0
bl _ZN5Actor17GetEquipBoomerangEv
bl func_ov14_0213d15c
bl _ZN14EquipBoomerang8GetActorEv
movs r4, r0
beq _020c2cbc
add r2, sp, #0xc
asm/ov14/ov14_0213b778.s
+4 -4
View File
@@ -2192,9 +2192,9 @@ _0213d154: .word gActorManager
_0213d158: .word 0x504c444d
arm_func_end func_ov14_0213d0bc
.global func_ov14_0213d15c
arm_func_start func_ov14_0213d15c
func_ov14_0213d15c: ; 0x0213d15c
.global _ZN14EquipBoomerang8GetActorEv
arm_func_start _ZN14EquipBoomerang8GetActorEv
_ZN14EquipBoomerang8GetActorEv: ; 0x0213d15c
ldr r1, _0213d174 ; =gActorManager
mov r2, r0
ldr r0, [r1]
@@ -2204,7 +2204,7 @@ func_ov14_0213d15c: ; 0x0213d15c
.align 2, 0
_0213d174: .word gActorManager
_0213d178: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end func_ov14_0213d15c
arm_func_end _ZN14EquipBoomerang8GetActorEv
.global func_ov14_0213d17c
arm_func_start func_ov14_0213d17c
asm/ov20.inc
+1 -1
View File
@@ -365,7 +365,7 @@
.extern func_ov14_02127984
.extern func_ov14_02127a14
.extern func_ov14_02127ac4
.extern func_ov14_0213d15c
.extern _ZN14EquipBoomerang8GetActorEv
.extern func_ov14_0213d184
.extern func_ov14_021448d4
.extern func_ov14_021448dc
asm/ov20.s
+2 -2
View File
@@ -1144,7 +1144,7 @@ _0216e6bc:
cmp r0, #0
beq _0216e6fc
bl func_ov20_0216f4b4
bl func_ov14_0213d15c
bl _ZN14EquipBoomerang8GetActorEv
bl func_ov14_021231e0
mov r0, r4
bl func_ov20_0216f9d0
@@ -4424,7 +4424,7 @@ _0217128c:
cmp r0, #0x2000
bge _02171360
bl func_ov20_0216f4b4
bl func_ov14_0213d15c
bl _ZN14EquipBoomerang8GetActorEv
ldr r0, [r0, #0x130]
cmp r0, #0
beq _02171360
asm/ov53.inc
+1 -1
View File
@@ -73,6 +73,6 @@
.extern func_ov14_021235bc
.extern func_ov14_0213d098
.extern func_ov14_0213d0bc
.extern func_ov14_0213d15c
.extern _ZN14EquipBoomerang8GetActorEv
.extern func_ov14_0213d1b0
.extern gItemManager
asm/ov53.s
+2 -2
View File
@@ -336,7 +336,7 @@ _021990cc: .word data_ov53_0219a1b0
func_ov53_021990d0: ; 0x021990d0
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov14_0213d15c
bl _ZN14EquipBoomerang8GetActorEv
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -380,7 +380,7 @@ _02199138: .word data_ov53_0219a5e4
func_ov53_0219913c: ; 0x0219913c
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov14_0213d15c
bl _ZN14EquipBoomerang8GetActorEv
cmp r0, #0
bne _02199158
mov r0, r4
include/Player/EquipBoomerang.hpp
+9 -2
View File
@@ -1,15 +1,20 @@
#pragma once
#include "global.h"
#include "types.h"
#include "Actor/ActorRef.hpp"
#include "Player/EquipItem.hpp"
class Actor;
class EquipBoomerang : public EquipItem {
private:
/* 00 (base) */
/* 09 */ u8 mUnk_09[3];
/* 0c */ void *mUnk_0c;
/* 10 */ u32 mUnk_10;
/* 14 */ u8 mUnk_18[8];
/* 10 */ ActorRef mRef;
/* 18 */ u8 mUnk_18[8];
/* 20 */ u32 mUnk_20;
/* 24 */ u32 mUnk_24;
/* 28 */ u32 mUnk_28;
@@ -29,4 +34,6 @@ public:
/* 30 */ virtual void vfunc_30() override; // func_ov53_0219913c
/* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov53_02199318
/* 50 */
Actor* GetActor();
};