mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-16 14:49:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename PlayerBase::CollidesWith

Browse Source
This commit is contained in:
Aetias
2024-05-19 13:04:14 +02:00
parent b5764f424a
commit 135436ed81
35 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -6,7 +6,7 @@
.extern _ZN10MapManager18func_ov00_02084c5cEii
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
asm/ov00/Actor/Actor.s
+3 -3
View File
@@ -905,7 +905,7 @@ _020c1e9c:
ldr r0, _020c1ef4 ; =gPlayer
add r1, sp, #0
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
addeq sp, sp, #0x1c
moveq r0, #0
@@ -939,7 +939,7 @@ _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii: ; 0x020c1ef8
ldr r0, _020c1f58 ; =gPlayer
mov r1, r6
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
@@ -1212,7 +1212,7 @@ _ZN5Actor18CollidesWithPlayerEj: ; 0x020c22b8
ldr r0, _020c23bc ; =gPlayer
add r1, sp, #0
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
addne sp, sp, #0x10
movne r0, #1
asm/ov00/Player/PlayerBase.s
+4 -4
View File
@@ -128,9 +128,9 @@ _ZN10PlayerBase18func_ov00_020a7c00Ei: ; 0x020a7c00
_020a7c18: .word data_027e0c54
arm_func_end _ZN10PlayerBase18func_ov00_020a7c00Ei
.global _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
arm_func_start _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
_ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder: ; 0x020a7c1c
.global _ZN10PlayerBase12CollidesWithEP8Cylinder
arm_func_start _ZN10PlayerBase12CollidesWithEP8Cylinder
_ZN10PlayerBase12CollidesWithEP8Cylinder: ; 0x020a7c1c
stmdb sp!, {r4, lr}
sub sp, sp, #0x10
ldr r2, [r0]
@@ -148,7 +148,7 @@ _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder: ; 0x020a7c1c
bl func_01ffec34
add sp, sp, #0x10
ldmia sp!, {r4, pc}
arm_func_end _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
arm_func_end _ZN10PlayerBase12CollidesWithEP8Cylinder
.global _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
arm_func_start _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -29,7 +29,7 @@
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern _ZN10PlayerBase18TeleportToEntranceEib
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern _ZN10PlayerBase8vfunc_04Ev
.extern _ZN10PlayerBase9AddHealthEs
asm/ov00/ov00_020b1498.s
+1 -1
View File
@@ -14591,7 +14591,7 @@ func_ov00_020bcc2c: ; 0x020bcc2c
ldrsh r2, [r2, #0x5a]
cmp r2, #4
bne _020bcc60
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
ldmia sp!, {r3, pc}
_020bcc60:
mov r0, #0
asm/ov12.inc
+1 -1
View File
@@ -21,7 +21,7 @@
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase9AddHealthEs
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager15Shield_vfunc_38Ei
asm/ov12.s
+1 -1
View File
@@ -38118,7 +38118,7 @@ _02131c18:
ldr r0, _02131d74 ; =gPlayer
add r1, sp, #0
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
bne _02131c88
ldr r0, [r4, #0x748]
asm/ov15.inc
+1 -1
View File
@@ -41,7 +41,7 @@
.extern _ZN10PlayerBase10GetEquipIdEv
.extern _ZN10PlayerBase18TeleportToEntranceEib
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase7CanMoveEv
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern _ZN10PlayerBase8vfunc_04Ev
asm/ov15.s
+2 -2
View File
@@ -17385,7 +17385,7 @@ _0212dbf4:
ldr r0, _0212dd1c ; =gPlayer
add r1, sp, #0
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _0212dcf8
_0212dcdc:
@@ -97265,7 +97265,7 @@ func_ov15_021724d0: ; 0x021724d0
ldr r0, _021725c4 ; =gPlayer
add r1, sp, #0x1c
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
addeq sp, sp, #0x2c
ldmeqia sp!, {r3, r4, pc}
asm/ov19.inc
+1 -1
View File
@@ -10,7 +10,7 @@
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
asm/ov19.s
+1 -1
View File
@@ -9179,7 +9179,7 @@ _02174f38:
ldr r0, _0217558c ; =gPlayer
add r1, sp, #0x38
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _02174fa8
mov r0, r4
asm/ov23.inc
+1 -1
View File
@@ -23,7 +23,7 @@
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
asm/ov23.s
+2 -2
View File
@@ -6380,7 +6380,7 @@ func_ov23_02172928: ; 0x02172928
ldr r0, [r0]
mov r1, r3
str r2, [sp, #0xc]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _02172984
mov r0, r4
@@ -6514,7 +6514,7 @@ func_ov23_02172b18: ; 0x02172b18
add r1, r4, #0x184
ldr r0, [r0]
add r1, r1, #0x400
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _02172b54
mov r0, r4
asm/ov25.inc
+1 -1
View File
@@ -11,7 +11,7 @@
.extern _ZN10MapManager18func_ov00_02084164Ev
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
asm/ov25.s
+1 -1
View File
@@ -13686,7 +13686,7 @@ func_ov25_02178d0c: ; 0x02178d0c
ldr r0, _02178d88 ; =gPlayer
add r1, r4, #0x34c
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
addeq sp, sp, #0xc
moveq r0, #0
asm/ov30.inc
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
asm/ov30.s
+1 -1
View File
@@ -8644,7 +8644,7 @@ func_ov30_02182ae4: ; 0x02182ae4
ldr r0, _02182b44 ; =gPlayer
mov r1, r6
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
asm/ov32.inc
+1 -1
View File
@@ -7,7 +7,7 @@
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov32.s
+1 -1
View File
@@ -3858,7 +3858,7 @@ _0217ee34:
add r3, r9, r3
mov r2, r1
str r3, [r2, #8]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _0217ef50
ldr r0, _0217efd0 ; =data_027e0fac
asm/ov37.inc
+1 -1
View File
@@ -5,7 +5,7 @@
.extern _ZN10MapManager18Set_MapData_Unk_16Eci
.extern _ZN10MapManager18func_ov00_02083908EcPi
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov37.s
+2 -2
View File
@@ -13800,7 +13800,7 @@ func_ov37_02187c5c: ; 0x02187c5c
str lr, [sp, #0x14]
str r3, [sp, #0x10]
str r2, [sp, #0x18]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
addeq sp, sp, #0x28
moveq r0, #0
@@ -13841,7 +13841,7 @@ func_ov37_02187cec: ; 0x02187cec
str lr, [sp, #0x10]
str ip, [sp, #0x14]
str r2, [sp, #0x18]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _02187d78
mov r0, r4
asm/ov41.inc
+1 -1
View File
@@ -4,7 +4,7 @@
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags3GetEj
asm/ov41.s
+1 -1
View File
@@ -4803,7 +4803,7 @@ func_ov41_0218d324: ; 0x0218d324
ldr r0, [r1]
mov r1, r3
str r2, [sp, #0xc]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _0218d388
mov r0, r4
asm/ov43.inc
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov43.s
+1 -1
View File
@@ -1344,7 +1344,7 @@ func_ov43_0218a674: ; 0x0218a674
str r9, [sp, #0x1c]
add r2, r9, r3
str r2, [r1, #8]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _0218a7ac
ldr r0, _0218a858 ; =data_027e0fac
asm/ov47.inc
+1 -1
View File
@@ -1,5 +1,5 @@
#pragma once
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
asm/ov47.s
+1 -1
View File
@@ -4816,7 +4816,7 @@ _02194028:
ldr r0, _0219410c ; =gPlayer
add r1, sp, #0
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _0219407c
ldr r0, _0219410c ; =gPlayer
asm/ov48.inc
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern _ZN10PlayerBase6LookAtEP5Vec3p
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
asm/ov48.s
+2 -2
View File
@@ -782,7 +782,7 @@ func_ov48_021908ac: ; 0x021908ac
ldr r0, [r0]
add r1, sp, #0
str r2, [sp, #0xc]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
addeq sp, sp, #0x1c
moveq r0, #0
@@ -3568,7 +3568,7 @@ _02192b5c:
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [r10]
mov r1, r4
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _02192bc4
add r0, sp, #0x6c
asm/ov49.inc
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
.extern Divide
.extern _ZN10ActorRupee18func_ov14_0213b5f4EjiP5Vec3pb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager10GiveRupeesEsb
.extern _ZN11ItemManager10RemoveItemEi
.extern _ZN11ItemManager12GetItemModelEj
asm/ov49.s
+2 -2
View File
@@ -1368,7 +1368,7 @@ func_ov49_02196710: ; 0x02196710
ldr r0, [r0]
add r1, sp, #0x98
str r2, [sp, #0xa4]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _02196788
mov r0, r5
@@ -1679,7 +1679,7 @@ _02196bec:
ldr r0, _02196ff0 ; =gPlayer
add r1, sp, #0x70
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _02196c54
mov r0, r5
asm/ov50.inc
+1 -1
View File
@@ -5,7 +5,7 @@
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_020840dcEv
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
asm/ov50.s
+1 -1
View File
@@ -1919,7 +1919,7 @@ func_ov50_02196ee4: ; 0x02196ee4
ldr r0, _02196f70 ; =gPlayer
add r1, sp, #0x18
ldr r0, [r0]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
addne sp, sp, #0x28
movne r0, #1
include/Player/PlayerBase.hpp
+1 -1
View File
@@ -53,7 +53,7 @@ public:
EquipShield* GetEquipShield();
void LookAt(Vec3p *target);
bool func_ov00_020a7c00(s32 param1);
bool func_ov00_020a7c1c(Cylinder *cylinder);
bool CollidesWith(Cylinder *cylinder);
bool func_ov00_020a7c60(Vec3p *param1, Vec3p *param2, s32 param3);
void EquipItem_vfunc_3c(Cylinder *cylinder, ItemFlag equipId);
void EquipItem_vfunc_2c();
src/00_Core/Player/PlayerBase.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ EquipSword* PlayerBase::GetEquipSword() {}
EquipShield* PlayerBase::GetEquipShield() {}
void PlayerBase::LookAt(Vec3p *target) {}
bool PlayerBase::func_ov00_020a7c00(s32 param1) {}
bool PlayerBase::func_ov00_020a7c1c(Cylinder *cylinder) {}
bool PlayerBase::CollidesWith(Cylinder *cylinder) {}
bool PlayerBase::func_ov00_020a7c60(Vec3p *param1, Vec3p *param2, s32 param3) {}
void PlayerBase::EquipItem_vfunc_3c(Cylinder *cylinder, ItemFlag equipId) {}
void PlayerBase::EquipItem_vfunc_2c() {}