mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-08-22 06:29:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mangle EquipRope::func_ov14_0213defc

Browse Source
This commit is contained in:
Aetias
2024-05-25 10:14:28 +02:00
parent b30d1aca74
commit b91c1fe36d
8 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -71,6 +71,6 @@
.extern func_ov14_0213d91c .extern func_ov14_0213d91c
.extern func_ov14_0213dadc .extern func_ov14_0213dadc
.extern func_ov14_0213ddd4 .extern func_ov14_0213ddd4
.extern func_ov14_0213defc .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor
.extern gAdventureFlags .extern gAdventureFlags
.extern gItemManager .extern gItemManager
asm/ov00/Actor/Actor.s
+1 -1
View File
@@ -2160,7 +2160,7 @@ _ZN5Actor18func_ov00_020c2ebcEv: ; 0x020c2ebc
mov r4, r0 mov r4, r0
bl _ZN10EquipSword12GetEquipRopeEv bl _ZN10EquipSword12GetEquipRopeEv
mov r1, r4 mov r1, r4
bl func_ov14_0213defc bl _ZN9EquipRope18func_ov14_0213defcEP5Actor
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
arm_func_end _ZN5Actor18func_ov00_020c2ebcEv arm_func_end _ZN5Actor18func_ov00_020c2ebcEv
asm/ov14/ov14_0213b778.s
+4 -4
View File
@@ -3400,9 +3400,9 @@ _0213def0:
ldmia sp!, {r3, r4, r5, r6, pc} ldmia sp!, {r3, r4, r5, r6, pc}
arm_func_end func_ov14_0213ddd4 arm_func_end func_ov14_0213ddd4
.global func_ov14_0213defc .global _ZN9EquipRope18func_ov14_0213defcEP5Actor
arm_func_start func_ov14_0213defc arm_func_start _ZN9EquipRope18func_ov14_0213defcEP5Actor
func_ov14_0213defc: ; 0x0213defc _ZN9EquipRope18func_ov14_0213defcEP5Actor: ; 0x0213defc
stmdb sp!, {r3, r4, r5, lr} stmdb sp!, {r3, r4, r5, lr}
mov r2, #0 mov r2, #0
mov r3, r2 mov r3, r2
@@ -3455,7 +3455,7 @@ _0213df8c:
_0213dfb4: _0213dfb4:
mov r0, r2 mov r0, r2
ldmia sp!, {r3, r4, r5, pc} ldmia sp!, {r3, r4, r5, pc}
arm_func_end func_ov14_0213defc arm_func_end _ZN9EquipRope18func_ov14_0213defcEP5Actor
.global func_ov14_0213dfbc .global func_ov14_0213dfbc
arm_func_start func_ov14_0213dfbc arm_func_start func_ov14_0213dfbc
asm/ov34.inc
+1 -1
View File
@@ -240,7 +240,7 @@
.extern func_ov14_0213dadc .extern func_ov14_0213dadc
.extern func_ov14_0213dba4 .extern func_ov14_0213dba4
.extern func_ov14_0213ddd4 .extern func_ov14_0213ddd4
.extern func_ov14_0213defc .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor
.extern func_ov14_0213dfbc .extern func_ov14_0213dfbc
.extern func_ov14_0213e144 .extern func_ov14_0213e144
.extern func_ov17_02168660 .extern func_ov17_02168660
asm/ov34.s
+1 -1
View File
@@ -4708,7 +4708,7 @@ _0217ffc8:
blt _02180038 blt _02180038
mov r0, r4 mov r0, r4
mov r1, r5 mov r1, r5
bl func_ov14_0213defc bl _ZN9EquipRope18func_ov14_0213defcEP5Actor
_02180038: _02180038:
mov r0, r5 mov r0, r5
mov r1, #0xa mov r1, #0xa
asm/ov38.inc
+1 -1
View File
@@ -238,7 +238,7 @@
.extern func_ov14_0213d91c .extern func_ov14_0213d91c
.extern func_ov14_0213dadc .extern func_ov14_0213dadc
.extern func_ov14_0213ddd4 .extern func_ov14_0213ddd4
.extern func_ov14_0213defc .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor
.extern func_ov29_0216d74c .extern func_ov29_0216d74c
.extern func_ov29_0216d77c .extern func_ov29_0216d77c
.extern func_ov29_0216d86c .extern func_ov29_0216d86c
asm/ov38.s
+1 -1
View File
@@ -4370,7 +4370,7 @@ _0217fa8c:
blt _0217fae8 blt _0217fae8
mov r0, r5 mov r0, r5
mov r1, r4 mov r1, r4
bl func_ov14_0213defc bl _ZN9EquipRope18func_ov14_0213defcEP5Actor
_0217fae8: _0217fae8:
add r0, r4, #0x2c8 add r0, r4, #0x2c8
mov r1, #2 mov r1, #2
include/Player/EquipRope.hpp
+3 -2
View File
@@ -7,7 +7,7 @@
#include "Player/EquipItem.hpp" #include "Player/EquipItem.hpp"
class EquipRope : public EquipItem { class EquipRope : public EquipItem {
private: public:
/* 00 (base) */ /* 00 (base) */
/* 09 */ unk8 mUnk_09; /* 09 */ unk8 mUnk_09;
/* 0a */ unk16 mUnk_0a; /* 0a */ unk16 mUnk_0a;
@@ -23,7 +23,6 @@ private:
/* a0 */ unk32 mUnk_a0; /* a0 */ unk32 mUnk_a0;
/* a4 */ /* a4 */
public:
EquipRope(); EquipRope();
/* 04 */ virtual ~EquipRope() override; /* 04 */ virtual ~EquipRope() override;
@@ -41,4 +40,6 @@ public:
Actor* func_ov14_0213d420(); Actor* func_ov14_0213d420();
s32 func_ov14_0213d480(s32 actorId); s32 func_ov14_0213d480(s32 actorId);
s32 func_ov14_0213ddd4(Actor *actor);
bool func_ov14_0213defc(Actor *actor);
}; };