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

Rename PlayerLinkBase::GongoronCollidesWith

Browse Source
This commit is contained in:
Aetias
2024-05-23 19:02:40 +02:00
parent c779b21215
commit e0285dbb76
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -56,7 +56,7 @@
.extern func_ov00_020bc46c
.extern func_ov00_020bc7f8
.extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
.extern func_ov00_020bcc2c
.extern _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
.extern func_ov00_020bd304
.extern func_ov00_020bff70
.extern func_ov00_020c1500
asm/ov00/Actor/Actor.s
+1 -1
View File
@@ -1246,7 +1246,7 @@ _020c2358:
cmpne r0, #0
beq _020c2384
add r1, sp, #0
bl func_ov00_020bcc2c
bl _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
cmp r0, #0
addne sp, sp, #0x10
movne r0, #1
asm/ov00/ov00_020b1498.s
+4 -4
View File
@@ -14577,9 +14577,9 @@ func_ov00_020bcc24: ; 0x020bcc24
_020bcc28: .word func_ov00_020bcdb8
thumb_func_end func_ov00_020bcc24
.global func_ov00_020bcc2c
arm_func_start func_ov00_020bcc2c
func_ov00_020bcc2c: ; 0x020bcc2c
.global _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
arm_func_start _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
_ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder: ; 0x020bcc2c
stmdb sp!, {r3, lr}
ldr r2, _020bcc68 ; =data_027e0fd8
ldr r2, [r2]
@@ -14599,7 +14599,7 @@ _020bcc60:
.align 2, 0
_020bcc68: .word data_027e0fd8
_020bcc6c: .word data_027e0fd4
arm_func_end func_ov00_020bcc2c
arm_func_end _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
.global func_ov00_020bcc70
arm_func_start func_ov00_020bcc70