From 135436ed81d155faff26d6969b39ad9c6c77cb73 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 19 May 2024 13:04:14 +0200 Subject: [PATCH] Rename `PlayerBase::CollidesWith` --- asm/ov00/Actor/Actor.inc | 2 +- asm/ov00/Actor/Actor.s | 6 +++--- asm/ov00/Player/PlayerBase.s | 8 ++++---- asm/ov00/ov00_020b1498.inc | 2 +- asm/ov00/ov00_020b1498.s | 2 +- asm/ov12.inc | 2 +- asm/ov12.s | 2 +- asm/ov15.inc | 2 +- asm/ov15.s | 4 ++-- asm/ov19.inc | 2 +- asm/ov19.s | 2 +- asm/ov23.inc | 2 +- asm/ov23.s | 4 ++-- asm/ov25.inc | 2 +- asm/ov25.s | 2 +- asm/ov30.inc | 2 +- asm/ov30.s | 2 +- asm/ov32.inc | 2 +- asm/ov32.s | 2 +- asm/ov37.inc | 2 +- asm/ov37.s | 4 ++-- asm/ov41.inc | 2 +- asm/ov41.s | 2 +- asm/ov43.inc | 2 +- asm/ov43.s | 2 +- asm/ov47.inc | 2 +- asm/ov47.s | 2 +- asm/ov48.inc | 2 +- asm/ov48.s | 4 ++-- asm/ov49.inc | 2 +- asm/ov49.s | 4 ++-- asm/ov50.inc | 2 +- asm/ov50.s | 2 +- include/Player/PlayerBase.hpp | 2 +- src/00_Core/Player/PlayerBase.cpp | 2 +- 35 files changed, 45 insertions(+), 45 deletions(-) diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 4b002127..427baa76 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -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 diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 7807db83..1b32e94e 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -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 diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index 95f37637..e9549241 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -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 diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index e3de343c..c26e3c38 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -29,7 +29,7 @@ .extern _ZN10PlayerBase13GetEquipSwordEv .extern _ZN10PlayerBase14GetEquipShieldEv .extern _ZN10PlayerBase18TeleportToEntranceEib -.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +.extern _ZN10PlayerBase12CollidesWithEP8Cylinder .extern _ZN10PlayerBase8TeleportEP5Vec3psibb .extern _ZN10PlayerBase8vfunc_04Ev .extern _ZN10PlayerBase9AddHealthEs diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 90bd8b7b..591927fe 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -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 diff --git a/asm/ov12.inc b/asm/ov12.inc index 6ef3b88f..a55f576a 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -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 diff --git a/asm/ov12.s b/asm/ov12.s index ecc4dd72..9fe97c0e 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -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] diff --git a/asm/ov15.inc b/asm/ov15.inc index 6e42b4f3..12afe334 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -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 diff --git a/asm/ov15.s b/asm/ov15.s index fb28ddd9..a43e025f 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -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} diff --git a/asm/ov19.inc b/asm/ov19.inc index 5611e3bb..3998823c 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -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 diff --git a/asm/ov19.s b/asm/ov19.s index c57e32f6..84534dbb 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -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 diff --git a/asm/ov23.inc b/asm/ov23.inc index 7d816ea9..54aacb98 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -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 diff --git a/asm/ov23.s b/asm/ov23.s index 21cd1359..8c1392eb 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -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 diff --git a/asm/ov25.inc b/asm/ov25.inc index 69a3e3d2..fdd8d363 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -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 diff --git a/asm/ov25.s b/asm/ov25.s index c7b3f645..501b6756 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -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 diff --git a/asm/ov30.inc b/asm/ov30.inc index 8a268eb4..403319b1 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -1,6 +1,6 @@ #pragma once .extern Divide -.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +.extern _ZN10PlayerBase12CollidesWithEP8Cylinder .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p diff --git a/asm/ov30.s b/asm/ov30.s index 84d705e8..97f20741 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -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} diff --git a/asm/ov32.inc b/asm/ov32.inc index 455bd3c3..97cfad9d 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -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 diff --git a/asm/ov32.s b/asm/ov32.s index f5e580ee..58bacd82 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -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 diff --git a/asm/ov37.inc b/asm/ov37.inc index ad008db5..242f8ae0 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -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 diff --git a/asm/ov37.s b/asm/ov37.s index 36b327e1..44908421 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -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 diff --git a/asm/ov41.inc b/asm/ov41.inc index 48edc350..cf85084e 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -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 diff --git a/asm/ov41.s b/asm/ov41.s index 603a9055..bc532d27 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -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 diff --git a/asm/ov43.inc b/asm/ov43.inc index 61919eea..54c5f95b 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -1,6 +1,6 @@ #pragma once .extern Divide -.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +.extern _ZN10PlayerBase12CollidesWithEP8Cylinder .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef diff --git a/asm/ov43.s b/asm/ov43.s index 80f80bdb..f58d0bf7 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -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 diff --git a/asm/ov47.inc b/asm/ov47.inc index a82a6dc6..4ed510ff 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -1,5 +1,5 @@ #pragma once -.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +.extern _ZN10PlayerBase12CollidesWithEP8Cylinder .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv diff --git a/asm/ov47.s b/asm/ov47.s index 8ed604f6..abfd79ad 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -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 diff --git a/asm/ov48.inc b/asm/ov48.inc index cf870256..7218e2b3 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -1,6 +1,6 @@ #pragma once .extern Divide -.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +.extern _ZN10PlayerBase12CollidesWithEP8Cylinder .extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i .extern _ZN10PlayerBase6LookAtEP5Vec3p .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList diff --git a/asm/ov48.s b/asm/ov48.s index 0c9085fd..9b07ade1 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -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 diff --git a/asm/ov49.inc b/asm/ov49.inc index a0cb1521..6d45ec05 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -1,7 +1,7 @@ #pragma once .extern Divide .extern _ZN10ActorRupee18func_ov14_0213b5f4EjiP5Vec3pb -.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +.extern _ZN10PlayerBase12CollidesWithEP8Cylinder .extern _ZN11ItemManager10GiveRupeesEsb .extern _ZN11ItemManager10RemoveItemEi .extern _ZN11ItemManager12GetItemModelEj diff --git a/asm/ov49.s b/asm/ov49.s index 765d2064..af9d34a9 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -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 diff --git a/asm/ov50.inc b/asm/ov50.inc index 695d3d8e..2898298a 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -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 diff --git a/asm/ov50.s b/asm/ov50.s index 8b498597..5724e332 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -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 diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index d00fbf88..3272af25 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -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(); diff --git a/src/00_Core/Player/PlayerBase.cpp b/src/00_Core/Player/PlayerBase.cpp index 24619493..c5a93674 100644 --- a/src/00_Core/Player/PlayerBase.cpp +++ b/src/00_Core/Player/PlayerBase.cpp @@ -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() {}