mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 15:01:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename gPlayerVel and gPlayerAngle

Browse Source
This commit is contained in:
Aetias
2024-05-23 18:32:24 +02:00
parent ae6b47f0fd
commit ec8aae7d54
72 changed files with 529 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dtcm.s
+7 -12
View File
@@ -3974,18 +3974,13 @@ gPlayer:
.global gPlayerPos
gPlayerPos:
.space 0xc
.global data_027e0fa0
data_027e0fa0:
.space 0x4
.global data_027e0fa4
data_027e0fa4:
.space 0x4
.global data_027e0fa8
data_027e0fa8:
.space 0x4
.global data_027e0fac
data_027e0fac:
.space 0x4
.global gPlayerVel
gPlayerVel:
.space 0xc
.global gPlayerAngle
gPlayerAngle:
.space 0x2
.space 0x2
.global data_027e0fb0
data_027e0fb0:
.space 0x4
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -28,7 +28,7 @@
.extern gMapManager
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern gActorManager
asm/ov00/Actor/Actor.s
+2 -2
View File
@@ -1165,7 +1165,7 @@ _ZN5Actor18CollidesWithShieldEP8Cylinder: ; 0x020c2238
add r2, sp, #0
add r0, r0, #0x48
bl Vec3p_Sub
ldr r1, _020c22b0 ; =data_027e0fac
ldr r1, _020c22b0 ; =gPlayerAngle
ldr r0, [sp]
ldrsh r4, [r1]
ldr r1, [sp, #8]
@@ -1190,7 +1190,7 @@ _020c22a0:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020c22ac: .word gPlayerPos
_020c22b0: .word data_027e0fac
_020c22b0: .word gPlayerAngle
_020c22b4: .word gPlayer
arm_func_end _ZN5Actor18CollidesWithShieldEP8Cylinder
asm/ov00/Player/LinkStateBase.inc
+2 -2
View File
@@ -15,8 +15,8 @@
.extern data_027e0f64
.extern gAdventureFlags
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb0
.extern data_027e0fb8
.extern data_027e0fcc
asm/ov00/Player/LinkStateBase.s
+7 -7
View File
@@ -292,11 +292,11 @@ _020a8234: .word func_ov00_020bbbd0
arm_func_start _ZN13LinkStateBase6TurnToEsii
_ZN13LinkStateBase6TurnToEsii: ; 0x020a8238
stmdb sp!, {r4, lr}
ldr r0, _020a8274 ; =data_027e0fac
ldr r0, _020a8274 ; =gPlayerAngle
mov r4, r2
mov r2, r3
bl func_0202b154
ldr r0, _020a8274 ; =data_027e0fac
ldr r0, _020a8274 ; =gPlayerAngle
ldr r1, _020a8278 ; =data_027e0fcc
ldrsh r3, [r0]
ldr r0, [r1]
@@ -307,7 +307,7 @@ _ZN13LinkStateBase6TurnToEsii: ; 0x020a8238
bl func_ov00_020b4558
ldmia sp!, {r4, pc}
.align 2, 0
_020a8274: .word data_027e0fac
_020a8274: .word gPlayerAngle
_020a8278: .word data_027e0fcc
arm_func_end _ZN13LinkStateBase6TurnToEsii
@@ -1195,10 +1195,10 @@ _020a8c54: .word gPlayerPos
.global _ZN13LinkStateBase12GetPlayerVelEv
arm_func_start _ZN13LinkStateBase12GetPlayerVelEv
_ZN13LinkStateBase12GetPlayerVelEv: ; 0x020a8c58
ldr r0, _020a8c60 ; =data_027e0fa0
ldr r0, _020a8c60 ; =gPlayerVel
bx lr
.align 2, 0
_020a8c60: .word data_027e0fa0
_020a8c60: .word gPlayerVel
arm_func_end _ZN13LinkStateBase12GetPlayerVelEv
.global _ZN13LinkStateBase18func_ov00_020a8c64Ev
@@ -1215,10 +1215,10 @@ _020a8c74: .word data_027e0fd4
.global _ZN13LinkStateBase14GetPlayerAngleEv
arm_func_start _ZN13LinkStateBase14GetPlayerAngleEv
_ZN13LinkStateBase14GetPlayerAngleEv: ; 0x020a8c78
ldr r0, _020a8c80 ; =data_027e0fac
ldr r0, _020a8c80 ; =gPlayerAngle
bx lr
.align 2, 0
_020a8c80: .word data_027e0fac
_020a8c80: .word gPlayerAngle
arm_func_end _ZN13LinkStateBase14GetPlayerAngleEv
.global _ZN13LinkStateBase15GetPlayer_Unk18Ev
asm/ov00/Player/PlayerBase.inc
+2 -2
View File
@@ -10,8 +10,8 @@
.extern data_027e0f64
.extern gAdventureFlags
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb0
.extern data_027e0fb8
.extern gActorManager
asm/ov00/Player/PlayerBase.s
+6 -6
View File
@@ -106,13 +106,13 @@ _ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac
ldr r0, [sp]
ldr r1, [sp, #8]
bl func_01ffa0f4
ldr r1, _020a7bfc ; =data_027e0fac
ldr r1, _020a7bfc ; =gPlayerAngle
strh r0, [r1]
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020a7bf8: .word gPlayerPos
_020a7bfc: .word data_027e0fac
_020a7bfc: .word gPlayerAngle
arm_func_end _ZN10PlayerBase6LookAtEP5Vec3p
.global _ZN10PlayerBase18func_ov00_020a7c00Ei
@@ -343,11 +343,11 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
str r3, [sp, #8]
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr ip, [r5, #4]
ldr r2, _020a7f6c ; =data_027e0fac
ldr r2, _020a7f6c ; =gPlayerAngle
cmp ip, r0
movle ip, r0
ldr r3, _020a7f64 ; =gPlayerPos
ldr r1, _020a7f70 ; =data_027e0fa0
ldr r1, _020a7f70 ; =gPlayerVel
mov r5, #0
ldr r0, _020a7f74 ; =data_027e0fb0
str r5, [r1]
@@ -386,8 +386,8 @@ _020a7f58:
.align 2, 0
_020a7f64: .word gPlayerPos
_020a7f68: .word gMapManager
_020a7f6c: .word data_027e0fac
_020a7f70: .word data_027e0fa0
_020a7f6c: .word gPlayerAngle
_020a7f70: .word gPlayerVel
_020a7f74: .word data_027e0fb0
_020a7f78: .word data_027e0fb8
_020a7f7c: .word gActorManager
asm/ov00/Player/PlayerControl.inc
+1 -1
View File
@@ -30,7 +30,7 @@
.extern data_027e0f64
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fcc
.extern gActorManager
asm/ov00/Player/PlayerControl.s
+6 -6
View File
@@ -634,7 +634,7 @@ _020af5c4:
ldreqb r0, [r4, #0x81]
cmpeq r0, #0
beq _020af620
ldr r1, _020af6cc ; =data_027e0fac
ldr r1, _020af6cc ; =gPlayerAngle
ldr r0, _020af6d0 ; =data_027e0ffc
ldrsh r2, [r1]
ldr r1, _020af6d4 ; =0x0000010a
@@ -691,7 +691,7 @@ _020af694:
.align 2, 0
_020af6c4: .word gAdventureFlags
_020af6c8: .word data_027e0c68
_020af6cc: .word data_027e0fac
_020af6cc: .word gPlayerAngle
_020af6d0: .word data_027e0ffc
_020af6d4: .word 0x0000010a
_020af6d8: .word gMapManager
@@ -1740,7 +1740,7 @@ _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb: ; 0x020b049c
cmp r0, #0x400
bge _020b05bc
ldr r1, _020b05dc ; =data_027e0d0c
ldr r0, _020b05e0 ; =data_027e0fac
ldr r0, _020b05e0 ; =gPlayerAngle
ldr r2, [r1]
ldr ip, _020b05e4 ; =data_02050f54
str r2, [r4]
@@ -1794,7 +1794,7 @@ _020b05d0:
.align 2, 0
_020b05d8: .word gPlayerPos
_020b05dc: .word data_027e0d0c
_020b05e0: .word data_027e0fac
_020b05e0: .word gPlayerAngle
_020b05e4: .word data_02050f54
arm_func_end _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb
@@ -1830,7 +1830,7 @@ _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p: ; 0x020b05e8
ldmgtia sp!, {r4, r5, r6, pc}
cmp r0, #0x400
bge _020b06e0
ldr r1, _020b076c ; =data_027e0fac
ldr r1, _020b076c ; =gPlayerAngle
ldr r0, [r4, #4]
ldrh r2, [r1]
ldr r3, _020b0770 ; =data_02050f54
@@ -1901,7 +1901,7 @@ _020b0758:
.align 2, 0
_020b0764: .word 0x00000333
_020b0768: .word gPlayerPos
_020b076c: .word data_027e0fac
_020b076c: .word gPlayerAngle
_020b0770: .word data_02050f54
_020b0774: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
asm/ov00/ov00_0207afa0.inc
+1 -1
View File
@@ -37,7 +37,7 @@
.extern data_027e0f64
.extern data_027e0f7c
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fcc
.extern gActorManager
.extern data_027e103c
asm/ov00/ov00_0207afa0.s
+2 -2
View File
@@ -813,7 +813,7 @@ _0207b62c:
ldr r1, [r0, #4]
str r1, [r5, #0x60]
ldr r0, [r0, #8]
ldr r1, _0207b810 ; =data_027e0fac
ldr r1, _0207b810 ; =gPlayerAngle
str r0, [r5, #0x64]
mov r0, #0
ldrsh r1, [r1, r0]
@@ -1022,7 +1022,7 @@ _0207b800: .word gActorManager
_0207b804: .word 0x414e4353
_0207b808: .word gMapManager
_0207b80c: .word gPlayerPos
_0207b810: .word data_027e0fac
_0207b810: .word gPlayerAngle
_0207b814: .word data_027e0f7c
_0207b818: .word gItemManager
_0207b81c: .word data_ov09_0211f5dc
asm/ov00/ov00_02086cd0.inc
+2 -2
View File
@@ -126,8 +126,8 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov00/ov00_02086cd0.s
+9 -9
View File
@@ -13371,7 +13371,7 @@ func_ov00_020917b8: ; 0x020917b8
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0x18c
ldr r1, _02091d3c ; =gPlayerPos
ldr r2, _02091d40 ; =data_027e0fac
ldr r2, _02091d40 ; =gPlayerAngle
ldr r4, [r1]
ldr r3, [r1, #4]
str r4, [sp, #0x50]
@@ -13747,7 +13747,7 @@ _02091d34:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02091d3c: .word gPlayerPos
_02091d40: .word data_027e0fac
_02091d40: .word gPlayerAngle
_02091d44: .word data_027e10a4
_02091d48: .word data_027e0d38
_02091d4c: .word gMapManager
@@ -14296,7 +14296,7 @@ func_ov00_020924b8: ; 0x020924b8
mov r0, r4
mov r2, #0
bl func_ov00_020933d4
ldr r0, _020931dc ; =data_027e0fa0
ldr r0, _020931dc ; =gPlayerVel
add r1, sp, #0xf4
ldr r6, [r0]
ldr r2, [r0, #4]
@@ -14308,7 +14308,7 @@ func_ov00_020924b8: ; 0x020924b8
ldmia r1, {r0, r1, r2}
stmia r5, {r0, r1, r2}
ldr r0, [r4, #4]
ldr r3, _020931e0 ; =data_027e0fac
ldr r3, _020931e0 ; =gPlayerAngle
ldr r0, [r0, #0x15c]
mov r6, #0x1c000
cmp r0, #0x54
@@ -14552,7 +14552,7 @@ _02092824:
ldrsh r1, [sp, #0x14]
mov r0, r4
bl func_ov00_02090c88
ldr r0, _020931dc ; =data_027e0fa0
ldr r0, _020931dc ; =gPlayerVel
ldr r2, [r0]
ldr r1, [r0, #4]
ldr r0, [r0, #8]
@@ -15176,8 +15176,8 @@ _020931bc:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_020931d8: .word gPlayer
_020931dc: .word data_027e0fa0
_020931e0: .word data_027e0fac
_020931dc: .word gPlayerVel
_020931e0: .word gPlayerAngle
_020931e4: .word 0x0000028f
_020931e8: .word data_ov00_020e2fa8
_020931ec: .word 0x0000019a
@@ -15530,7 +15530,7 @@ _02093670:
mov r7, r0, asr #0x10
b _0209369c
_02093680:
ldr r0, _020936d4 ; =data_027e0fac
ldr r0, _020936d4 ; =gPlayerAngle
ldrsh r7, [r0]
b _0209369c
_0209368c:
@@ -15555,7 +15555,7 @@ _020936bc:
bl func_ov00_020908f8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020936d4: .word data_027e0fac
_020936d4: .word gPlayerAngle
arm_func_end func_ov00_02093634
.global func_ov00_020936d8
asm/ov00/ov00_020980f4.inc
+2 -2
View File
@@ -105,8 +105,8 @@
.extern data_027e0f8c
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov00/ov00_020980f4.s
+17 -17
View File
@@ -4795,7 +4795,7 @@ func_ov00_0209be6c: ; 0x0209be6c
mov r3, #0
mov r4, r0
bl func_ov00_020908f8
ldr r1, _0209be9c ; =data_027e0fac
ldr r1, _0209be9c ; =gPlayerAngle
mov r0, r4
ldrsh r1, [r1]
sub r1, r1, #0x8000
@@ -4804,7 +4804,7 @@ func_ov00_0209be6c: ; 0x0209be6c
bl func_ov00_02090ac8
ldmia sp!, {r4, pc}
.align 2, 0
_0209be9c: .word data_027e0fac
_0209be9c: .word gPlayerAngle
arm_func_end func_ov00_0209be6c
.global func_ov00_0209bea0
@@ -4813,7 +4813,7 @@ func_ov00_0209bea0: ; 0x0209bea0
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x18
ldr r2, _0209bf44 ; =gPlayerPos
ldr r1, _0209bf48 ; =data_027e0fa0
ldr r1, _0209bf48 ; =gPlayerVel
ldr r4, [r2]
ldr r3, [r2, #4]
str r4, [sp, #0xc]
@@ -4829,7 +4829,7 @@ func_ov00_0209bea0: ; 0x0209bea0
mov r4, r0
str r3, [sp, #4]
bl func_ov00_02090e10
ldr r2, _0209bf4c ; =data_027e0fac
ldr r2, _0209bf4c ; =gPlayerAngle
ldr r0, [sp]
ldr r1, [sp, #8]
ldrsh r5, [r2]
@@ -4853,8 +4853,8 @@ func_ov00_0209bea0: ; 0x0209bea0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0209bf44: .word gPlayerPos
_0209bf48: .word data_027e0fa0
_0209bf4c: .word data_027e0fac
_0209bf48: .word gPlayerVel
_0209bf4c: .word gPlayerAngle
arm_func_end func_ov00_0209bea0
.global func_ov00_0209bf50
@@ -6106,7 +6106,7 @@ func_ov00_0209ce78: ; 0x0209ce78
mov r0, r4
bl func_ov00_02090b68
_0209cee4:
ldr r1, _0209cf60 ; =data_027e0fac
ldr r1, _0209cf60 ; =gPlayerAngle
mov r0, r4
ldrsh r1, [r1]
sub r1, r1, #0x8000
@@ -6138,7 +6138,7 @@ _0209cee4:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0209cf5c: .word gPlayerPos
_0209cf60: .word data_027e0fac
_0209cf60: .word gPlayerAngle
arm_func_end func_ov00_0209ce78
.global func_ov00_0209cf64
@@ -6147,7 +6147,7 @@ func_ov00_0209cf64: ; 0x0209cf64
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x48
ldr r2, _0209d098 ; =gPlayerPos
ldr r1, _0209d09c ; =data_027e0fa0
ldr r1, _0209d09c ; =gPlayerVel
ldr r4, [r2]
ldr r3, [r2, #4]
str r4, [sp, #0x3c]
@@ -6223,7 +6223,7 @@ func_ov00_0209cf64: ; 0x0209cf64
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0209d098: .word gPlayerPos
_0209d09c: .word data_027e0fa0
_0209d09c: .word gPlayerVel
_0209d0a0: .word data_ov00_020e2fa8
arm_func_end func_ov00_0209cf64
@@ -6324,7 +6324,7 @@ _0209d1b8:
_0209d1cc:
cmp r5, #1
bne _0209d1ec
ldr r0, _0209d284 ; =data_027e0fac
ldr r0, _0209d284 ; =gPlayerAngle
ldrsh r0, [r0]
sub r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -6336,7 +6336,7 @@ _0209d1ec:
mov r8, r0, asr #0x10
b _0209d210
_0209d1fc:
ldr r0, _0209d284 ; =data_027e0fac
ldr r0, _0209d284 ; =gPlayerAngle
ldrsh r0, [r0]
sub r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -6374,7 +6374,7 @@ _0209d26c:
bl func_ov00_020908f8
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0209d284: .word data_027e0fac
_0209d284: .word gPlayerAngle
arm_func_end func_ov00_0209d134
.global func_ov00_0209d288
@@ -12660,7 +12660,7 @@ func_ov00_020a1fd0: ; 0x020a1fd0
ldr r3, [r7, #0x1c]
ldr r2, [r7, #0x20]
ldr r0, [r7, #0x18]
ldr r1, _020a2220 ; =data_027e0fac
ldr r1, _020a2220 ; =gPlayerAngle
str r4, [sp, #4]
str r2, [sp, #8]
str r0, [sp]
@@ -12804,7 +12804,7 @@ _020a21d0:
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_020a2220: .word data_027e0fac
_020a2220: .word gPlayerAngle
_020a2224: .word gMapManager
arm_func_end func_ov00_020a1fd0
@@ -12886,7 +12886,7 @@ func_ov00_020a22d0: ; 0x020a22d0
ldr r1, _020a239c ; =gPlayerPos
str r0, [r5, #0x1c]
ldr r0, [r1]
ldr r3, _020a23a0 ; =data_027e0fac
ldr r3, _020a23a0 ; =gPlayerAngle
str r0, [r5, #0x20]
ldr r2, [r1, #4]
mov r0, r5
@@ -12931,7 +12931,7 @@ _020a238c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020a239c: .word gPlayerPos
_020a23a0: .word data_027e0fac
_020a23a0: .word gPlayerAngle
arm_func_end func_ov00_020a22d0
.global func_ov00_020a23a4
asm/ov00/ov00_020b1498.inc
+2 -2
View File
@@ -190,8 +190,8 @@
.extern data_027e0f78
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb8
.extern gHealthManager
.extern data_027e0fc4
asm/ov00/ov00_020b1498.s
+40 -40
View File
@@ -7427,7 +7427,7 @@ _020b74f4:
bl func_ov00_0208b73c
cmp r0, #0
beq _020b7528
ldr r0, _020b774c ; =data_027e0fa0
ldr r0, _020b774c ; =gPlayerVel
ldr r0, [r0, #4]
cmp r0, #0
bgt _020b7528
@@ -7579,7 +7579,7 @@ _020b7714:
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020b774c: .word data_027e0fa0
_020b774c: .word gPlayerVel
_020b7750: .word gMapManager
arm_func_end func_ov00_020b73b0
@@ -11274,7 +11274,7 @@ func_ov00_020ba4e4: ; 0x020ba4e4
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _020ba534 ; =data_ov00_020dc83c
ldr r3, _020ba538 ; =data_027e0fac
ldr r3, _020ba538 ; =gPlayerAngle
mov r4, r0
add ip, sp, #0
ldmia r1, {r0, r1, r2}
@@ -11293,7 +11293,7 @@ func_ov00_020ba4e4: ; 0x020ba4e4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020ba534: .word data_ov00_020dc83c
_020ba538: .word data_027e0fac
_020ba538: .word gPlayerAngle
arm_func_end func_ov00_020ba4e4
.global func_ov00_020ba53c
@@ -11302,7 +11302,7 @@ func_ov00_020ba53c: ; 0x020ba53c
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _020ba5a8 ; =data_ov00_020dc848
ldr r3, _020ba5ac ; =data_027e0fac
ldr r3, _020ba5ac ; =gPlayerAngle
mov r4, r0
add ip, sp, #0
ldmia r1, {r0, r1, r2}
@@ -11331,7 +11331,7 @@ _020ba58c:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020ba5a8: .word data_ov00_020dc848
_020ba5ac: .word data_027e0fac
_020ba5ac: .word gPlayerAngle
arm_func_end func_ov00_020ba53c
.global func_ov00_020ba5b0
@@ -12836,7 +12836,7 @@ func_ov00_020bb6d4: ; 0x020bb6d4
ldr r0, [r4, #0x50]
cmp r1, r0
bge _020bb7f4
ldr r0, _020bb804 ; =data_027e0fac
ldr r0, _020bb804 ; =gPlayerAngle
ldrsh r1, [sp, #4]
ldrsh r0, [r0]
sub r1, r1, r0
@@ -12886,7 +12886,7 @@ _020bb7f4:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020bb800: .word data_027e0fd0
_020bb804: .word data_027e0fac
_020bb804: .word gPlayerAngle
_020bb808: .word 0x000031c7
_020bb80c: .word data_027e0fcc
arm_func_end func_ov00_020bb6d4
@@ -12906,7 +12906,7 @@ func_ov00_020bb810: ; 0x020bb810
cmp r0, #0
addlt sp, sp, #0x10
ldmltia sp!, {r4, pc}
ldr r0, _020bb8bc ; =data_027e0fac
ldr r0, _020bb8bc ; =gPlayerAngle
ldrsh ip, [sp, #4]
ldrsh r3, [r0]
ldr r1, _020bb8c0 ; =data_027e0fcc
@@ -12938,7 +12938,7 @@ func_ov00_020bb810: ; 0x020bb810
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_020bb8bc: .word data_027e0fac
_020bb8bc: .word gPlayerAngle
_020bb8c0: .word data_027e0fcc
arm_func_end func_ov00_020bb810
@@ -12958,7 +12958,7 @@ func_ov00_020bb8c4: ; 0x020bb8c4
ldmltia sp!, {r3, pc}
ldr r0, _020bb940 ; =data_027e0fcc
ldrsh ip, [sp, #4]
ldr r3, _020bb944 ; =data_027e0fac
ldr r3, _020bb944 ; =gPlayerAngle
ldr r0, [r0]
mov r1, #0
mov r2, #0x1000
@@ -12978,7 +12978,7 @@ func_ov00_020bb8c4: ; 0x020bb8c4
ldmia sp!, {r3, pc}
.align 2, 0
_020bb940: .word data_027e0fcc
_020bb944: .word data_027e0fac
_020bb944: .word gPlayerAngle
arm_func_end func_ov00_020bb8c4
.global func_ov00_020bb948
@@ -12996,7 +12996,7 @@ func_ov00_020bb948: ; 0x020bb948
ldr r1, [sp, #8]
bl func_01ffa0f4
mov r1, r0, lsl #0x10
ldr r0, _020bb9a4 ; =data_027e0fac
ldr r0, _020bb9a4 ; =gPlayerAngle
ldr r2, _020bb9a8 ; =0x0000071c
mov r1, r1, asr #0x10
bl func_0202b154
@@ -13008,7 +13008,7 @@ func_ov00_020bb948: ; 0x020bb948
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020bb9a0: .word gPlayerPos
_020bb9a4: .word data_027e0fac
_020bb9a4: .word gPlayerAngle
_020bb9a8: .word 0x0000071c
_020bb9ac: .word 0x000004cd
arm_func_end func_ov00_020bb948
@@ -13572,7 +13572,7 @@ _020bbfd4:
moveq r0, #1
ldmeqia sp!, {r4, r5, r6, r7, pc}
_020bbff4:
ldr r0, _020bc080 ; =data_027e0fa0
ldr r0, _020bc080 ; =gPlayerVel
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -13610,7 +13610,7 @@ _020bc060:
.align 2, 0
_020bc078: .word data_027e0fcc
_020bc07c: .word gPlayerPos
_020bc080: .word data_027e0fa0
_020bc080: .word gPlayerVel
_020bc084: .word data_027e0fb8
arm_func_end func_ov00_020bbed4
@@ -13675,7 +13675,7 @@ _020bc114:
addeq sp, sp, #0x18
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldr r0, _020bc1bc ; =data_027e0fa0
ldr r0, _020bc1bc ; =gPlayerVel
add r3, sp, #0xc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -13708,7 +13708,7 @@ _020bc114:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_020bc1b8: .word gAdventureFlags
_020bc1bc: .word data_027e0fa0
_020bc1bc: .word gPlayerVel
_020bc1c0: .word data_ov00_020dc858
_020bc1c4: .word data_027e0fb8
arm_func_end func_ov00_020bc0a8
@@ -13725,16 +13725,16 @@ func_ov00_020bc1c8: ; 0x020bc1c8
mov r2, r5
mov r3, r4
bl func_ov05_02107b74
ldr r1, _020bc208 ; =data_027e0fa0
ldr r1, _020bc208 ; =gPlayerVel
mov r2, #0
str r2, [r1]
ldr r0, _020bc20c ; =data_027e0fac
ldr r0, _020bc20c ; =gPlayerAngle
str r2, [r1, #8]
strh r2, [r0]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020bc208: .word data_027e0fa0
_020bc20c: .word data_027e0fac
_020bc208: .word gPlayerVel
_020bc20c: .word gPlayerAngle
arm_func_end func_ov00_020bc1c8
.global func_ov00_020bc210
@@ -13753,7 +13753,7 @@ func_ov00_020bc210: ; 0x020bc210
func_ov00_020bc228: ; 0x020bc228
stmdb sp!, {r3, lr}
ldr r3, [r1]
ldr r0, _020bc274 ; =data_027e0fa0
ldr r0, _020bc274 ; =gPlayerVel
cmp r2, #0
str r3, [r0]
ldr r2, [r1, #4]
@@ -13766,13 +13766,13 @@ func_ov00_020bc228: ; 0x020bc228
bl func_01ffa0f4
mov r0, r0, lsl #0x10
mov r1, r0, asr #0x10
ldr r0, _020bc278 ; =data_027e0fac
ldr r0, _020bc278 ; =gPlayerAngle
sub r1, r1, #0x8000
strh r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_020bc274: .word data_027e0fa0
_020bc278: .word data_027e0fac
_020bc274: .word gPlayerVel
_020bc278: .word gPlayerAngle
arm_func_end func_ov00_020bc228
.global func_ov00_020bc27c
@@ -13920,7 +13920,7 @@ _020bc40c:
str ip, [sp, #4]
str r3, [sp, #8]
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
ldr r1, _020bc468 ; =data_027e0fac
ldr r1, _020bc468 ; =gPlayerAngle
ldr r3, [sp, #0x10]
ldrsh r2, [r1]
add r3, r3, r0
@@ -13933,7 +13933,7 @@ _020bc40c:
.align 2, 0
_020bc460: .word gPlayerPos
_020bc464: .word gMapManager
_020bc468: .word data_027e0fac
_020bc468: .word gPlayerAngle
arm_func_end func_ov00_020bc398
.global func_ov00_020bc46c
@@ -14041,7 +14041,7 @@ func_ov00_020bc520: ; 0x020bc520
addge sp, sp, #0x18
movge r0, #0
ldmgeia sp!, {r3, r4, r5, r6, r7, pc}
ldr r1, _020bc6c4 ; =data_027e0fac
ldr r1, _020bc6c4 ; =gPlayerAngle
ldr r0, [sp]
ldrsh r6, [r1]
ldr r1, [sp, #8]
@@ -14120,7 +14120,7 @@ _020bc6b4:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020bc6c0: .word gPlayerPos
_020bc6c4: .word data_027e0fac
_020bc6c4: .word gPlayerAngle
_020bc6c8: .word 0x66666667
_020bc6cc: .word 0x0b60b60b
_020bc6d0: .word data_02050f54
@@ -14742,14 +14742,14 @@ func_ov00_020bcdec: ; 0x020bcdec
ldr r2, [r1, #0xc]
mov r1, ip
blx func_ov00_020b4c4c
ldr r0, _020bce44 ; =data_027e0fac
ldr r0, _020bce44 ; =gPlayerAngle
strh r4, [r0]
ldmia sp!, {r4, pc}
.align 2, 0
_020bce38: .word gPlayerPos
_020bce3c: .word data_027e0fcc
_020bce40: .word data_027e0fd4
_020bce44: .word data_027e0fac
_020bce44: .word gPlayerAngle
arm_func_end func_ov00_020bcdec
.global func_ov00_020bce48
@@ -15049,7 +15049,7 @@ _020bd138:
str r1, [sp, #4]
_020bd1ec:
ldr r1, [sp]
ldr r0, _020bd25c ; =data_027e0fa0
ldr r0, _020bd25c ; =gPlayerVel
ldr r2, [sp, #4]
str r1, [r0]
ldr r1, [sp, #8]
@@ -15078,7 +15078,7 @@ _020bd234:
_020bd250: .word gPlayerPos
_020bd254: .word 0x0000099a
_020bd258: .word data_027e0fcc
_020bd25c: .word data_027e0fa0
_020bd25c: .word gPlayerVel
_020bd260: .word data_027e0fb8
_020bd264: .word data_027e0fd4
arm_func_end func_ov00_020bd0bc
@@ -15277,14 +15277,14 @@ _020bd484:
bl func_ov00_020bb544
_020bd4b8:
bl func_020385b8
ldr r1, _020bd4d4 ; =data_027e0fa0
ldr r1, _020bd4d4 ; =gPlayerVel
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
mov r0, #1
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020bd4d0: .word data_027e103c
_020bd4d4: .word data_027e0fa0
_020bd4d4: .word gPlayerVel
arm_func_end func_ov00_020bd3b0
.global func_ov00_020bd4d8
@@ -15306,11 +15306,11 @@ _020bd4f8: .word gPlayerPos
arm_func_start func_ov00_020bd4fc
func_ov00_020bd4fc: ; 0x020bd4fc
ldrsh r1, [r1]
ldr r0, _020bd50c ; =data_027e0fac
ldr r0, _020bd50c ; =gPlayerAngle
strh r1, [r0]
bx lr
.align 2, 0
_020bd50c: .word data_027e0fac
_020bd50c: .word gPlayerAngle
arm_func_end func_ov00_020bd4fc
.global func_ov00_020bd510
@@ -21552,7 +21552,7 @@ func_ov00_020e1290: ; 0x020e1290
ldr r3, _020e12d0 ; =gPlayerPos
ldmia ip, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r3, _020e12d4 ; =data_027e0fa0
ldr r3, _020e12d4 ; =gPlayerVel
ldmia ip, {r0, r1, r2}
stmia r3, {r0, r1, r2}
add sp, sp, #0xc
@@ -21561,7 +21561,7 @@ func_ov00_020e1290: ; 0x020e1290
.align 2, 0
_020e12cc: .word data_027e0d0c
_020e12d0: .word gPlayerPos
_020e12d4: .word data_027e0fa0
_020e12d4: .word gPlayerVel
arm_func_end func_ov00_020e1290
.global func_ov00_020e12d8
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -146,7 +146,7 @@
.extern data_027e0f88
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fd4
asm/ov00/ov00_020c3e54.s
+4 -4
View File
@@ -21503,7 +21503,7 @@ _020d4998:
beq _020d4a44
cmp r0, #0
beq _020d4a84
ldr r0, _020d4aa4 ; =data_027e0fac
ldr r0, _020d4aa4 ; =gPlayerAngle
ldr r1, _020d4aa8 ; =gPlayerPos
ldrsh r2, [r0]
mov r0, r5
@@ -21568,7 +21568,7 @@ _020d4a8c:
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020d4aa4: .word data_027e0fac
_020d4aa4: .word gPlayerAngle
_020d4aa8: .word gPlayerPos
_020d4aac: .word gPlayerLink
_020d4ab0: .word data_027e0fd4
@@ -21593,7 +21593,7 @@ func_ov00_020d4ac4: ; 0x020d4ac4
cmp r2, #0
beq _020d4af0
bl _ZN5Actor18func_ov00_020c195cEv
ldr r0, _020d4b4c ; =data_027e0fac
ldr r0, _020d4b4c ; =gPlayerAngle
ldrsh r0, [r0]
strh r0, [r5, #0x78]
b _020d4b38
@@ -21624,7 +21624,7 @@ _020d4b38:
bl func_ov00_0207a1c8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020d4b4c: .word data_027e0fac
_020d4b4c: .word gPlayerAngle
_020d4b50: .word 0x0000019a
arm_func_end func_ov00_020d4ac4
asm/ov04.inc
+1 -1
View File
@@ -135,7 +135,7 @@
.extern data_027e0f7c
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gHealthManager
.extern data_027e0fc0
asm/ov04.s
+2 -2
View File
@@ -874,7 +874,7 @@ func_ov04_02101188: ; 0x02101188
add r0, r5, #0
add r0, #0x31
strb r1, [r0]
ldr r1, _0210137c ; =data_027e0fac
ldr r1, _0210137c ; =gPlayerAngle
mov r0, #0
ldrsh r0, [r1, r0]
strh r0, [r5, #0x36]
@@ -1084,7 +1084,7 @@ _02101370:
.align 2, 0
_02101374: .word 0x027ffc3c
_02101378: .word data_027e0d38
_0210137c: .word data_027e0fac
_0210137c: .word gPlayerAngle
_02101380: .word gPlayerPos
_02101384: .word data_027e0618
_02101388: .word gMapManager
asm/ov05.inc
+2 -2
View File
@@ -200,8 +200,8 @@
.extern data_027e0f88
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb0
.extern data_027e0fb8
.extern data_027e0fc0
asm/ov05.s
+13 -13
View File
@@ -16277,7 +16277,7 @@ _0210e52c:
mov r1, r7
bl func_ov00_020b5360
ldr r1, _0210e87c ; =data_027e0fcc
ldr r2, _0210e888 ; =data_027e0fa0
ldr r2, _0210e888 ; =gPlayerVel
ldr r3, [r1]
ldr r1, _0210e884 ; =data_027e0fd4
ldr r3, [r3, #8]
@@ -16337,7 +16337,7 @@ _0210e644:
ldr r0, [r2]
str r3, [sp, #0xc]
ldr r3, [r6, #0x24]
ldr r2, _0210e888 ; =data_027e0fa0
ldr r2, _0210e888 ; =gPlayerVel
str r3, [sp, #0x10]
ldr ip, [r6, #0x28]
add r3, sp, #0xc
@@ -16420,7 +16420,7 @@ _0210e7b8:
ldr r0, [r0]
bl func_ov00_020b50f8
ldr ip, _0210e87c ; =data_027e0fcc
ldr r2, _0210e8a0 ; =data_027e0fac
ldr r2, _0210e8a0 ; =gPlayerAngle
ldr r1, [ip]
ldr r3, _0210e884 ; =data_027e0fd4
strb r0, [r1, #0x149]
@@ -16470,13 +16470,13 @@ _0210e878: .word data_027e0fb8
_0210e87c: .word data_027e0fcc
_0210e880: .word data_027e0d38
_0210e884: .word data_027e0fd4
_0210e888: .word data_027e0fa0
_0210e888: .word gPlayerVel
_0210e88c: .word data_027e0fd0
_0210e890: .word gPlayerPos
_0210e894: .word gMapManager
_0210e898: .word gAdventureFlags
_0210e89c: .word 0x66666667
_0210e8a0: .word data_027e0fac
_0210e8a0: .word gPlayerAngle
_0210e8a4: .word data_ov00_020eec9c
arm_func_end func_ov05_0210e4e4
@@ -16524,7 +16524,7 @@ _0210e918:
bl func_ov00_020b1eb8
cmp r0, #0
beq _0210ea1c
ldr r0, _0210ea90 ; =data_027e0fac
ldr r0, _0210ea90 ; =gPlayerAngle
ldrsh r0, [r0]
bl func_0202bbbc
cmp r0, #3
@@ -16597,7 +16597,7 @@ _0210ea1c:
str r0, [r5, #0x1c]
_0210ea38:
ldr r0, _0210ea98 ; =data_027e0fcc
ldr r3, _0210ea90 ; =data_027e0fac
ldr r3, _0210ea90 ; =gPlayerAngle
ldr r2, [r0]
mov r1, r4
ldrb ip, [r2, #0x14e]
@@ -16619,7 +16619,7 @@ _0210ea38:
.align 2, 0
_0210ea88: .word data_027e0d38
_0210ea8c: .word gMapManager
_0210ea90: .word data_027e0fac
_0210ea90: .word gPlayerAngle
_0210ea94: .word gPlayerPos
_0210ea98: .word data_027e0fcc
_0210ea9c: .word data_027e0fd0
@@ -16640,7 +16640,7 @@ func_ov05_0210eaa0: ; 0x0210eaa0
cmp r0, #0
beq _0210eb64
ldr r0, _0210eb90 ; =data_027e0fcc
ldr r1, _0210eb94 ; =data_027e0fac
ldr r1, _0210eb94 ; =gPlayerAngle
ldr r0, [r0]
ldrsh r2, [r1]
ldr r3, [r0]
@@ -16655,7 +16655,7 @@ func_ov05_0210eaa0: ; 0x0210eaa0
cmp r1, #0
beq _0210eb64
ldr r1, _0210eb98 ; =data_027e0fb0
ldr r3, _0210eb94 ; =data_027e0fac
ldr r3, _0210eb94 ; =gPlayerAngle
ldrsh ip, [r1]
ldr r2, _0210eb9c ; =gPlayerPos
mov r1, r4
@@ -16691,7 +16691,7 @@ _0210eb64:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0210eb90: .word data_027e0fcc
_0210eb94: .word data_027e0fac
_0210eb94: .word gPlayerAngle
_0210eb98: .word data_027e0fb0
_0210eb9c: .word gPlayerPos
_0210eba0: .word data_027e0fd0
@@ -19541,7 +19541,7 @@ func_ov05_021112ec: ; 0x021112ec
bl _ZN13LinkStateBase19GetCurrentCharacterEv
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _02111354 ; =data_027e0fac
ldr r0, _02111354 ; =gPlayerAngle
ldrsh r4, [r0]
bl func_ov05_02105d84
strh r4, [r0, #4]
@@ -19554,7 +19554,7 @@ func_ov05_021112ec: ; 0x021112ec
strb r0, [r4, #9]
ldmia sp!, {r4, pc}
.align 2, 0
_02111354: .word data_027e0fac
_02111354: .word gPlayerAngle
arm_func_end func_ov05_021112ec
.global func_ov05_02111358
asm/ov12.inc
+2 -2
View File
@@ -154,8 +154,8 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fc0
.extern data_027e0fc4
.extern gPlayerLink
asm/ov12.s
+14 -14
View File
@@ -8580,7 +8580,7 @@ _02119b7c:
ldr r1, _02119dbc ; =gPlayerPos
mov r0, r6
bl func_ov12_0211986c
ldr r0, _02119dd0 ; =data_027e0fac
ldr r0, _02119dd0 ; =gPlayerAngle
ldrb r1, [r6, #0x11c]
ldrsh r2, [r0]
mov r0, r6
@@ -8733,7 +8733,7 @@ _02119dc0: .word data_027e0d0c
_02119dc4: .word gItemManager
_02119dc8: .word data_027e0fd4
_02119dcc: .word data_ov00_020eec9c
_02119dd0: .word data_027e0fac
_02119dd0: .word gPlayerAngle
_02119dd4: .word data_027e0fcc
_02119dd8: .word gAdventureFlags
_02119ddc: .word data_027e0fc0
@@ -8760,7 +8760,7 @@ _02119e14:
mov r0, r6
bl func_ov12_02119968
ldrb r2, [r6, #0x11c]
ldr r1, _0211a3cc ; =data_027e0fac
ldr r1, _0211a3cc ; =gPlayerAngle
mov r0, r6
mov r2, r2, asr #0x3
mov r2, r2, lsl #0x1b
@@ -9148,7 +9148,7 @@ _0211a378:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0211a3c8: .word gPlayerPos
_0211a3cc: .word data_027e0fac
_0211a3cc: .word gPlayerAngle
_0211a3d0: .word data_ov12_02137c64
_0211a3d4: .word gAdventureFlags
_0211a3d8: .word 0x66666667
@@ -9667,13 +9667,13 @@ func_ov12_0211aa40: ; 0x0211aa40
.global func_ov12_0211aa4c
arm_func_start func_ov12_0211aa4c
func_ov12_0211aa4c: ; 0x0211aa4c
ldr r1, _0211aa60 ; =data_027e0fac
ldr r1, _0211aa60 ; =gPlayerAngle
ldr ip, _0211aa64 ; =func_ov12_0212e324
ldr r0, _0211aa68 ; =gPlayerPos
ldrsh r1, [r1]
bx ip
.align 2, 0
_0211aa60: .word data_027e0fac
_0211aa60: .word gPlayerAngle
_0211aa64: .word func_ov12_0212e324
_0211aa68: .word gPlayerPos
arm_func_end func_ov12_0211aa4c
@@ -30920,9 +30920,9 @@ func_ov12_0212bff0: ; 0x0212bff0
cmp r1, #0
bne _0212c058
ldr r2, _0212c1a8 ; =gPlayerPos
ldr r1, _0212c1ac ; =data_027e0fa0
ldr r1, _0212c1ac ; =gPlayerVel
ldr r3, [r2]
ldr r0, _0212c1b0 ; =data_027e0fac
ldr r0, _0212c1b0 ; =gPlayerAngle
str r3, [r6]
ldr r3, [r2, #4]
str r3, [r6, #4]
@@ -30944,9 +30944,9 @@ _0212c058:
cmp r0, #0
bne _0212c0b4
ldr r2, _0212c1a8 ; =gPlayerPos
ldr r1, _0212c1ac ; =data_027e0fa0
ldr r1, _0212c1ac ; =gPlayerVel
ldr r3, [r2]
ldr r0, _0212c1b0 ; =data_027e0fac
ldr r0, _0212c1b0 ; =gPlayerAngle
str r3, [r6]
ldr r3, [r2, #4]
str r3, [r6, #4]
@@ -31027,8 +31027,8 @@ _0212c10c:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0212c1a8: .word gPlayerPos
_0212c1ac: .word data_027e0fa0
_0212c1b0: .word data_027e0fac
_0212c1ac: .word gPlayerVel
_0212c1b0: .word gPlayerAngle
_0212c1b4: .word gActorManager
_0212c1b8: .word data_027e0c68
_0212c1bc: .word data_02050f54
@@ -34179,7 +34179,7 @@ _0212e7c4: .word 0xfffff777
func_ov12_0212e7c8: ; 0x0212e7c8
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldr r1, _0212e958 ; =data_027e0fd4
ldr r2, _0212e95c ; =data_027e0fac
ldr r2, _0212e95c ; =gPlayerAngle
ldr r3, [r1]
ldrsh r4, [r2]
ldr r1, [r3, #0x44]
@@ -34283,7 +34283,7 @@ _0212e930:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0212e958: .word data_027e0fd4
_0212e95c: .word data_027e0fac
_0212e95c: .word gPlayerAngle
_0212e960: .word data_027e0764
_0212e964: .word 0x0000071e
arm_func_end func_ov12_0212e7c8
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -167,7 +167,7 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fcc
asm/ov14/ov14_0211f640.s
+4 -4
View File
@@ -8636,7 +8636,7 @@ func_ov14_02126600: ; 0x02126600
.global func_ov14_02126604
arm_func_start func_ov14_02126604
func_ov14_02126604: ; 0x02126604
ldr r1, _02126624 ; =data_027e0fac
ldr r1, _02126624 ; =gPlayerAngle
ldr r3, _02126628 ; =gPlayerLink
ldrsh r2, [r1]
mov r1, r0
@@ -8645,7 +8645,7 @@ func_ov14_02126604: ; 0x02126604
add r1, r1, #4
bx ip
.align 2, 0
_02126624: .word data_027e0fac
_02126624: .word gPlayerAngle
_02126628: .word gPlayerLink
_0212662c: .word func_ov00_020bcdec
arm_func_end func_ov14_02126604
@@ -27730,7 +27730,7 @@ _02135ee0: .word 0x00000111
arm_func_start func_ov14_02135ee4
func_ov14_02135ee4: ; 0x02135ee4
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _02135f48 ; =data_027e0fac
ldr r2, _02135f48 ; =gPlayerAngle
mov r6, r0
ldrsh r0, [r2]
mov r5, r1
@@ -27756,7 +27756,7 @@ _02135f20:
str r0, [r6, #0x19c]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02135f48: .word data_027e0fac
_02135f48: .word gPlayerAngle
_02135f4c: .word gPlayerLink
arm_func_end func_ov14_02135ee4
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -168,7 +168,7 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern gPlayerVel
.extern data_027e0fb8
.extern data_027e0fc0
.extern data_027e0fc4
asm/ov14/ov14_0213b778.s
+6 -6
View File
@@ -4365,7 +4365,7 @@ _0213eba0: .word data_ov14_02158f94
func_ov14_0213eba4: ; 0x0213eba4
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x14
ldr r1, _0213ec34 ; =data_027e0fa0
ldr r1, _0213ec34 ; =gPlayerVel
mov r4, r0
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -4401,7 +4401,7 @@ _0213ebe4:
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0213ec34: .word data_027e0fa0
_0213ec34: .word gPlayerVel
_0213ec38: .word data_027e0f64
_0213ec3c: .word data_027e0d0c
arm_func_end func_ov14_0213eba4
@@ -5401,7 +5401,7 @@ _0213f644:
cmp r0, #0
addlt sp, sp, #0xc
ldmltia sp!, {pc}
ldr r0, _0213f710 ; =data_027e0fa0
ldr r0, _0213f710 ; =gPlayerVel
ldr r0, [r0, #4]
cmp r0, #0
addgt sp, sp, #0xc
@@ -5448,7 +5448,7 @@ _0213f6e4:
.align 2, 0
_0213f708: .word data_027e0fd4
_0213f70c: .word 0x000003ae
_0213f710: .word data_027e0fa0
_0213f710: .word gPlayerVel
_0213f714: .word data_027e0fb8
_0213f718: .word data_027e0e58
_0213f71c: .word gPlayerPos
@@ -15736,7 +15736,7 @@ _02147580: .word gAdventureFlags
func_ov14_02147584: ; 0x02147584
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
ldr r2, _02147678 ; =data_027e0fa0
ldr r2, _02147678 ; =gPlayerVel
ldr ip, _0214767c ; =gPlayerPos
ldr r5, [r2, #8]
ldmia ip, {r3, r9}
@@ -15797,7 +15797,7 @@ _02147624:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02147678: .word data_027e0fa0
_02147678: .word gPlayerVel
_0214767c: .word gPlayerPos
_02147680: .word gPlayerLink
_02147684: .word data_027e0fd0
asm/ov15.inc
+2 -2
View File
@@ -219,8 +219,8 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb0
.extern data_027e0fb8
.extern data_027e0fc4
asm/ov15.s
+245 -245
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+1 -1
View File
@@ -99,7 +99,7 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern data_027e0fc4
.extern gPlayerLink
asm/ov17.s
+2 -2
View File
@@ -8901,7 +8901,7 @@ func_ov17_021624e0: ; 0x021624e0
cmp r1, #1
moveq r0, #1
bxeq lr
ldr r1, _0216252c ; =data_027e0fac
ldr r1, _0216252c ; =gPlayerAngle
ldrsh r0, [r0, #0xc]
ldrsh r1, [r1]
sub r1, r1, #0x8000
@@ -8919,7 +8919,7 @@ _02162524:
mov r0, #1
bx lr
.align 2, 0
_0216252c: .word data_027e0fac
_0216252c: .word gPlayerAngle
arm_func_end func_ov17_021624e0
.global func_ov17_02162530
asm/ov19.inc
+1 -1
View File
@@ -120,7 +120,7 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern gPlayerVel
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
asm/ov19.s
+2 -2
View File
@@ -8543,7 +8543,7 @@ _0217467c:
ldr r4, _0217478c ; =gPlayerPos
add r0, r7, #0x48
mov r1, r4
ldr r5, _02174790 ; =data_027e0fa0
ldr r5, _02174790 ; =gPlayerVel
bl func_ov00_020ce2f0
ldr r1, [r7, #0x34c]
cmp r1, #0
@@ -8613,7 +8613,7 @@ _0217475c:
_02174784: .word gActorManager
_02174788: .word 0x424f4d42
_0217478c: .word gPlayerPos
_02174790: .word data_027e0fa0
_02174790: .word gPlayerVel
_02174794: .word 0x0000019a
_02174798: .word gMapManager
arm_func_end func_ov19_021745b8
asm/ov20.inc
+1 -1
View File
@@ -112,7 +112,7 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov20.s
+2 -2
View File
@@ -9452,7 +9452,7 @@ _02175420:
_021754a0:
cmp r0, #0x96
bge _02175528
ldr r0, _021755ec ; =data_027e0fac
ldr r0, _021755ec ; =gPlayerAngle
ldrsh r2, [r0]
add r0, r2, #0xab
add r0, r0, #0x6a00
@@ -9539,7 +9539,7 @@ _021755d8:
_021755e0: .word data_027e0f64
_021755e4: .word data_027e0e58
_021755e8: .word gPlayerLink
_021755ec: .word data_027e0fac
_021755ec: .word gPlayerAngle
_021755f0: .word 0xffff9555
arm_func_end func_ov20_02175324
asm/ov22.inc
+1 -1
View File
@@ -115,7 +115,7 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fd4
asm/ov22.s
+2 -2
View File
@@ -647,7 +647,7 @@ func_ov22_0216ded8: ; 0x0216ded8
mov r5, r0
cmp r1, #0
beq _0216df08
ldr r0, _0216e150 ; =data_027e0fac
ldr r0, _0216e150 ; =gPlayerAngle
ldrsh r0, [r0]
bl func_0202bbbc
str r0, [r5, #0x164]
@@ -814,7 +814,7 @@ _0216e108:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0216e150: .word data_027e0fac
_0216e150: .word gPlayerAngle
_0216e154: .word data_027e0764
_0216e158: .word data_027e0e58
_0216e15c: .word 0x00000245
asm/ov23.inc
+2 -2
View File
@@ -150,8 +150,8 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fcc
asm/ov23.s
+24 -24
View File
@@ -12824,7 +12824,7 @@ _02177f10: ; jump table
b _02177f74 ; case 2
b _02177f9c ; case 3
_02177f20:
ldr r0, _02178048 ; =data_027e0fa0
ldr r0, _02178048 ; =gPlayerVel
rsb r1, r6, #0
str r1, [r0, #8]
ldr r1, [r0]
@@ -12836,7 +12836,7 @@ _02177f20:
str r2, [r0]
b _02177fcc
_02177f4c:
ldr r0, _02178048 ; =data_027e0fa0
ldr r0, _02178048 ; =gPlayerVel
str r6, [r0]
ldr r1, [r0, #8]
smull r3, r2, r1, r5
@@ -12847,7 +12847,7 @@ _02177f4c:
str r2, [r0, #8]
b _02177fcc
_02177f74:
ldr r0, _02178048 ; =data_027e0fa0
ldr r0, _02178048 ; =gPlayerVel
str r6, [r0, #8]
ldr r1, [r0]
smull r3, r2, r1, r5
@@ -12858,7 +12858,7 @@ _02177f74:
str r2, [r0]
b _02177fcc
_02177f9c:
ldr r0, _02178048 ; =data_027e0fa0
ldr r0, _02178048 ; =gPlayerVel
rsb r1, r6, #0
str r1, [r0]
ldr r1, [r0, #8]
@@ -12894,7 +12894,7 @@ _02178010:
strb r0, [r9, #0x80]
_02178018:
ldr r0, _02178054 ; =data_027e0fcc
ldr r1, _02178048 ; =data_027e0fa0
ldr r1, _02178048 ; =gPlayerVel
ldr r0, [r0]
mov r2, r7
bl func_ov23_021707e0
@@ -12907,7 +12907,7 @@ _02178030:
_0217803c: .word data_027e0d38
_02178040: .word gMapManager
_02178044: .word gPlayerPos
_02178048: .word data_027e0fa0
_02178048: .word gPlayerVel
_0217804c: .word data_027e0ffc
_02178050: .word data_027e0fd4
_02178054: .word data_027e0fcc
@@ -13030,7 +13030,7 @@ func_ov23_02178174: ; 0x02178174
str r0, [sp]
mov r0, r4
ldr r1, _02178310 ; =gPlayerPos
ldr r2, _02178314 ; =data_027e0fac
ldr r2, _02178314 ; =gPlayerAngle
add r3, r5, #8
bl func_ov23_02175a64
mov r4, r0
@@ -13092,7 +13092,7 @@ _02178298:
mov r1, #0
strb r1, [r0, #0xb]
ldr r0, _02178328 ; =data_027e0d0c
ldr r2, _0217832c ; =data_027e0fa0
ldr r2, _0217832c ; =gPlayerVel
ldr r3, [r0]
ldr r1, [r0, #4]
str r3, [r2]
@@ -13113,13 +13113,13 @@ _02178298:
_02178308: .word gActorManager
_0217830c: .word 0x504c444d
_02178310: .word gPlayerPos
_02178314: .word data_027e0fac
_02178314: .word gPlayerAngle
_02178318: .word gMapManager
_0217831c: .word data_027e0f64
_02178320: .word data_027e0fcc
_02178324: .word data_027e0fd4
_02178328: .word data_027e0d0c
_0217832c: .word data_027e0fa0
_0217832c: .word gPlayerVel
_02178330: .word data_ov00_020eec9c
arm_func_end func_ov23_02178174
@@ -13163,7 +13163,7 @@ func_ov23_02178354: ; 0x02178354
bl func_ov00_020bc46c
str r0, [sp]
ldr r1, _02178408 ; =gPlayerPos
ldr r2, _0217840c ; =data_027e0fac
ldr r2, _0217840c ; =gPlayerAngle
mov r0, r4
add r3, r5, #8
bl func_ov23_02175a64
@@ -13178,7 +13178,7 @@ func_ov23_02178354: ; 0x02178354
mov r1, #0
strb r1, [r0, #0xb]
ldr r3, _02178418 ; =data_027e0d0c
ldr r2, _0217841c ; =data_027e0fa0
ldr r2, _0217841c ; =gPlayerVel
ldr lr, [r3]
ldr ip, [r3, #4]
str lr, [r2]
@@ -13193,11 +13193,11 @@ func_ov23_02178354: ; 0x02178354
_02178400: .word gActorManager
_02178404: .word 0x504c444d
_02178408: .word gPlayerPos
_0217840c: .word data_027e0fac
_0217840c: .word gPlayerAngle
_02178410: .word data_027e0fcc
_02178414: .word data_027e0fd4
_02178418: .word data_027e0d0c
_0217841c: .word data_027e0fa0
_0217841c: .word gPlayerVel
arm_func_end func_ov23_02178354
.global func_ov23_02178420
@@ -13218,7 +13218,7 @@ func_ov23_02178420: ; 0x02178420
addne sp, sp, #0x2c
ldmneia sp!, {r4, r5, pc}
ldr r2, [r5]
ldr r0, _02178610 ; =data_027e0fa0
ldr r0, _02178610 ; =gPlayerVel
ldr r1, _02178614 ; =data_027e0fd4
str r2, [r0]
ldr r2, [r5, #4]
@@ -13333,7 +13333,7 @@ _021785bc:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0217860c: .word data_027e0fd8
_02178610: .word data_027e0fa0
_02178610: .word gPlayerVel
_02178614: .word data_027e0fd4
_02178618: .word data_ov14_02153e4c
_0217861c: .word func_ov23_02177e60
@@ -13359,11 +13359,11 @@ func_ov23_02178630: ; 0x02178630
ldr r0, [r0, #0x50]
cmp r0, #0
bgt _0217867c
ldr r1, _02178718 ; =data_027e0fa0
ldr r1, _02178718 ; =gPlayerVel
ldr r0, [r1]
ldr r1, [r1, #8]
bl func_01ffa0f4
ldr r1, _0217871c ; =data_027e0fac
ldr r1, _0217871c ; =gPlayerAngle
strh r0, [r1]
_0217867c:
ldr r0, _02178714 ; =data_027e0fd4
@@ -13371,7 +13371,7 @@ _0217867c:
ldrb r0, [r0, #0x56]
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02178718 ; =data_027e0fa0
ldr r0, _02178718 ; =gPlayerVel
ldr r0, [r0, #4]
cmp r0, #0
ldmgtia sp!, {r4, pc}
@@ -13388,7 +13388,7 @@ _0217867c:
cmp r0, #0
beq _021786f8
ldr r1, _02178720 ; =data_027e0d0c
ldr r0, _02178718 ; =data_027e0fa0
ldr r0, _02178718 ; =gPlayerVel
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [r0]
@@ -13398,17 +13398,17 @@ _0217867c:
strb ip, [r4, #0x57]
ldmia sp!, {r4, pc}
_021786f8:
ldr r1, _02178718 ; =data_027e0fa0
ldr r1, _02178718 ; =gPlayerVel
ldr r0, [r1]
ldr r1, [r1, #8]
bl func_01ffa0f4
ldr r1, _0217871c ; =data_027e0fac
ldr r1, _0217871c ; =gPlayerAngle
strh r0, [r1]
ldmia sp!, {r4, pc}
.align 2, 0
_02178714: .word data_027e0fd4
_02178718: .word data_027e0fa0
_0217871c: .word data_027e0fac
_02178718: .word gPlayerVel
_0217871c: .word gPlayerAngle
_02178720: .word data_027e0d0c
arm_func_end func_ov23_02178630
asm/ov25.inc
+1 -1
View File
@@ -115,7 +115,7 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
asm/ov25.s
+4 -4
View File
@@ -439,7 +439,7 @@ _0216db80:
str r3, [sp, #0x1c]
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
str r0, [r4, #0x18]
ldr r0, _0216dcd4 ; =data_027e0fac
ldr r0, _0216dcd4 ; =gPlayerAngle
add r2, r4, #0x14
ldrsh r4, [r0]
add r1, sp, #4
@@ -456,7 +456,7 @@ _0216db80:
_0216dcc8: .word data_027e0fe8
_0216dccc: .word gPlayerPos
_0216dcd0: .word gMapManager
_0216dcd4: .word data_027e0fac
_0216dcd4: .word gPlayerAngle
arm_func_end func_ov25_0216daa4
.global func_ov25_0216dcd8
@@ -3798,7 +3798,7 @@ _021709d4:
bl _ZN5Actor14GetAngleToLinkEv
ldr r1, _02170d54 ; =gPlayerLink
sub r3, r0, #0x8000
ldr r2, _02170d5c ; =data_027e0fac
ldr r2, _02170d5c ; =gPlayerAngle
ldr r0, [r1]
mvn r1, #0
strh r3, [r2]
@@ -3997,7 +3997,7 @@ _02170d38:
.align 2, 0
_02170d54: .word gPlayerLink
_02170d58: .word data_027e0fb8
_02170d5c: .word data_027e0fac
_02170d5c: .word gPlayerAngle
_02170d60: .word data_ov25_0217a880
_02170d64: .word data_027e0ff0
_02170d68: .word gAdventureFlags
asm/ov26.inc
+2 -2
View File
@@ -120,8 +120,8 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
asm/ov26.s
+9 -9
View File
@@ -3698,7 +3698,7 @@ func_ov26_0217027c: ; 0x0217027c
mov r2, #0
str r2, [r4, #0x60]
str r2, [r4, #0x68]
ldr r1, _02170318 ; =data_027e0fac
ldr r1, _02170318 ; =gPlayerAngle
str r2, [r4, #0x64]
ldrsh r5, [r1]
bl _ZN5Actor14GetAngleToLinkEv
@@ -3733,7 +3733,7 @@ func_ov26_0217027c: ; 0x0217027c
strh r0, [r4, #0x9c]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02170318: .word data_027e0fac
_02170318: .word gPlayerAngle
_0217031c: .word data_027e0764
arm_func_end func_ov26_0217027c
@@ -3747,7 +3747,7 @@ func_ov26_02170320: ; 0x02170320
ldrsh r3, [r4, #0x78]
ldrsh r2, [r6, #0xea]
ldr r0, _02170574 ; =0x0000071c
ldr r1, _02170578 ; =data_027e0fac
ldr r1, _02170578 ; =gPlayerAngle
smlabb r0, r2, r0, r3
strh r0, [r4, #0x78]
ldrsh r0, [r6, #0xe8]
@@ -3805,7 +3805,7 @@ func_ov26_02170320: ; 0x02170320
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
ldrsh r8, [r3, r1]
ldr r1, _02170588 ; =data_027e0fa0
ldr r1, _02170588 ; =gPlayerVel
mov r2, r0
mov r5, r8, asr #0x1f
mov r9, r5, lsl #0xa
@@ -3891,11 +3891,11 @@ func_ov26_02170320: ; 0x02170320
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02170574: .word 0x0000071c
_02170578: .word data_027e0fac
_02170578: .word gPlayerAngle
_0217057c: .word data_02050f54
_02170580: .word 0x0000019a
_02170584: .word gPlayerPos
_02170588: .word data_027e0fa0
_02170588: .word gPlayerVel
_0217058c: .word gMapManager
arm_func_end func_ov26_02170320
@@ -14873,7 +14873,7 @@ func_ov26_02178cbc: ; 0x02178cbc
bl func_ov14_021418ec
cmp r0, #0
beq _02178d78
ldr r1, _02178e38 ; =data_027e0fa0
ldr r1, _02178e38 ; =gPlayerVel
add r0, sp, #0x14
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -14920,7 +14920,7 @@ _02178d78:
cmp r0, #0
addeq sp, sp, #0x2c
ldmeqia sp!, {r4, r5, pc}
ldr r1, _02178e38 ; =data_027e0fa0
ldr r1, _02178e38 ; =gPlayerVel
add r0, sp, #8
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -14963,7 +14963,7 @@ _02178e0c:
add sp, sp, #0x2c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02178e38: .word data_027e0fa0
_02178e38: .word gPlayerVel
_02178e3c: .word 0x00000102
_02178e40: .word data_027e1038
_02178e44: .word data_027e0e58
asm/ov27.inc
+2 -2
View File
@@ -99,8 +99,8 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fd4
asm/ov27.s
+7 -7
View File
@@ -3271,7 +3271,7 @@ _0217047c: .word data_027e0764
func_ov27_02170480: ; 0x02170480
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x38
ldr r1, _021708a4 ; =data_027e0fac
ldr r1, _021708a4 ; =gPlayerAngle
ldr r3, _021708a8 ; =data_02050f54
ldrh r2, [r1]
ldr r1, _021708ac ; =0x00001b85
@@ -3378,7 +3378,7 @@ func_ov27_02170480: ; 0x02170480
ldr r0, [r0]
bl func_ov00_020bd4d8
_02170630:
ldr r1, _021708a4 ; =data_027e0fac
ldr r1, _021708a4 ; =gPlayerAngle
mov r0, r4
ldrsh r1, [r1]
strh r1, [sp, #4]
@@ -3538,7 +3538,7 @@ _021707f8:
add sp, sp, #0x38
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_021708a4: .word data_027e0fac
_021708a4: .word gPlayerAngle
_021708a8: .word data_02050f54
_021708ac: .word 0x00001b85
_021708b0: .word gPlayerPos
@@ -7988,7 +7988,7 @@ func_ov27_02174454: ; 0x02174454
ldr r1, _021746e4 ; =gPlayerPos
mov r4, r0
ldr r2, [r1]
ldr r0, _021746e8 ; =data_027e0fac
ldr r0, _021746e8 ; =gPlayerAngle
str r2, [r4, #0x48]
ldr r2, [r1, #4]
ldr r7, _021746ec ; =data_02050f54
@@ -8149,7 +8149,7 @@ func_ov27_02174454: ; 0x02174454
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021746e4: .word gPlayerPos
_021746e8: .word data_027e0fac
_021746e8: .word gPlayerAngle
_021746ec: .word data_02050f54
_021746f0: .word data_027e0c68
_021746f4: .word 0x00060015
@@ -10623,7 +10623,7 @@ func_ov27_02176744: ; 0x02176744
ldr r0, [r0]
ldrsh r0, [r0, #0xc6]
cmp r0, #0
ldrge r0, _021767a4 ; =data_027e0fa0
ldrge r0, _021767a4 ; =gPlayerVel
ldrge r0, [r0, #4]
cmpge r0, #0
ldmltia sp!, {r4, pc}
@@ -10637,7 +10637,7 @@ func_ov27_02176744: ; 0x02176744
ldmia sp!, {r4, pc}
.align 2, 0
_021767a0: .word data_027e0fd4
_021767a4: .word data_027e0fa0
_021767a4: .word gPlayerVel
arm_func_end func_ov27_02176744
.global func_ov27_021767a8
asm/ov29.inc
+1 -1
View File
@@ -96,7 +96,7 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
asm/ov29.s
+4 -4
View File
@@ -5022,7 +5022,7 @@ _021719d8: .word data_ov29_021793d0
func_ov29_021719dc: ; 0x021719dc
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _02171a2c ; =data_027e0fac
ldr r1, _02171a2c ; =gPlayerAngle
mov r3, #0
ldrsh r1, [r1]
mov r2, #0x1000
@@ -5041,7 +5041,7 @@ func_ov29_021719dc: ; 0x021719dc
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02171a2c: .word data_027e0fac
_02171a2c: .word gPlayerAngle
arm_func_end func_ov29_021719dc
.global func_ov29_02171a30
@@ -11596,7 +11596,7 @@ func_ov29_021772f8: ; 0x021772f8
stmdb sp!, {r4, r5, r6, lr}
ldr lr, _02177408 ; =data_ov29_0217bce0
mov r3, #0x78
ldr r2, _0217740c ; =data_027e0fac
ldr r2, _0217740c ; =gPlayerAngle
strh r3, [lr, #0x24]
ldrh r3, [r2]
mov r2, #0
@@ -11665,7 +11665,7 @@ _021773b4:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02177408: .word data_ov29_0217bce0
_0217740c: .word data_027e0fac
_0217740c: .word gPlayerAngle
_02177410: .word gPlayerPos
_02177414: .word data_02050f54
_02177418: .word data_ov29_0217a244
asm/ov32.inc
+2 -2
View File
@@ -96,8 +96,8 @@
.extern data_027e0f84
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov32.s
+6 -6
View File
@@ -3861,7 +3861,7 @@ _0217ee34:
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _0217ef50
ldr r0, _0217efd0 ; =data_027e0fac
ldr r0, _0217efd0 ; =gPlayerAngle
ldrsh r1, [r7, #0x78]
ldrsh r0, [r0]
sub r0, r1, r0
@@ -3922,7 +3922,7 @@ _0217ef94:
_0217efc4: .word 0x00007fff
_0217efc8: .word data_02050f54
_0217efcc: .word gPlayer
_0217efd0: .word data_027e0fac
_0217efd0: .word gPlayerAngle
_0217efd4: .word 0x00005555
arm_func_end func_ov32_0217eddc
@@ -5604,7 +5604,7 @@ func_ov32_021804a4: ; 0x021804a4
ldrsh r1, [r0, #0xfc]
ldrsh r2, [r10, #0x78]
ldr r0, _0218084c ; =0x0000071c
ldr r3, _02180850 ; =data_027e0fac
ldr r3, _02180850 ; =gPlayerAngle
smlabb r1, r1, r0, r2
strh r1, [r10, #0x78]
ldr r0, _02180854 ; =gPlayerPos
@@ -5682,7 +5682,7 @@ func_ov32_021804a4: ; 0x021804a4
str r0, [sp]
mov r0, r8
ldr r8, _0218085c ; =0x00000333
ldr r1, _02180860 ; =data_027e0fa0
ldr r1, _02180860 ; =gPlayerVel
umull ip, r8, r7, r8
str ip, [sp, #0xc]
mov ip, #0
@@ -5841,11 +5841,11 @@ _02180840:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218084c: .word 0x0000071c
_02180850: .word data_027e0fac
_02180850: .word gPlayerAngle
_02180854: .word gPlayerPos
_02180858: .word data_02050f54
_0218085c: .word 0x00000333
_02180860: .word data_027e0fa0
_02180860: .word gPlayerVel
_02180864: .word data_027e0f6c
_02180868: .word 0x0000ffff
_0218086c: .word 0x00000a66
asm/ov33.inc
+2 -2
View File
@@ -73,8 +73,8 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerVel
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov33.s
+4 -4
View File
@@ -3194,7 +3194,7 @@ func_ov33_0217e640: ; 0x0217e640
mov r4, r0
ldmia r1, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr ip, _0217e6f0 ; =data_027e0fa0
ldr ip, _0217e6f0 ; =gPlayerVel
add r3, sp, #4
ldmia ip, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -3233,7 +3233,7 @@ _0217e6c8:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217e6ec: .word gPlayerPos
_0217e6f0: .word data_027e0fa0
_0217e6f0: .word gPlayerVel
_0217e6f4: .word 0x000024cd
_0217e6f8: .word 0x000038a4
arm_func_end func_ov33_0217e640
@@ -3892,7 +3892,7 @@ _0217efbc:
b _0217f1b8
_0217efd8:
bl _ZN5Actor18func_ov00_020c195cEv
ldr r1, _0217f3d4 ; =data_027e0fac
ldr r1, _0217f3d4 ; =gPlayerAngle
ldr r0, _0217f3d8 ; =gPlayerLink
ldrsh r1, [r1]
strh r1, [r4, #0x78]
@@ -4168,7 +4168,7 @@ _0217f3c0:
.align 2, 0
_0217f3cc: .word data_027e0ffc
_0217f3d0: .word 0x00000242
_0217f3d4: .word data_027e0fac
_0217f3d4: .word gPlayerAngle
_0217f3d8: .word gPlayerLink
_0217f3dc: .word data_ov33_0217fb80
_0217f3e0: .word data_02050f54
asm/ov35.inc
+1 -1
View File
@@ -94,7 +94,7 @@
.extern data_027e0f64
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fcc
asm/ov35.s
+2 -2
View File
@@ -8744,7 +8744,7 @@ _02183680:
cmp r0, #0
bne _021836c4
ldr r1, _02183758 ; =gPlayerPos
ldr r0, _0218375c ; =data_027e0fac
ldr r0, _0218375c ; =gPlayerAngle
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp, #0x18]
@@ -8797,7 +8797,7 @@ _0218374c:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02183758: .word gPlayerPos
_0218375c: .word data_027e0fac
_0218375c: .word gPlayerAngle
_02183760: .word 0x00005554
arm_func_end func_ov35_0218361c
asm/ov36.inc
+1 -1
View File
@@ -81,7 +81,7 @@
.extern data_027e0f6c
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern gPlayerVel
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd4
asm/ov36.s
+5 -5
View File
@@ -8391,7 +8391,7 @@ _02183338:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
_02183360:
ldr r1, _021834fc ; =data_027e0fa0
ldr r1, _021834fc ; =gPlayerVel
ldr r0, [r1]
ldr r1, [r1, #8]
bl func_01ffa0f4
@@ -8502,7 +8502,7 @@ _021834e8:
_021834f0: .word gPlayerLink
_021834f4: .word 0x00000333
_021834f8: .word data_027e0ffc
_021834fc: .word data_027e0fa0
_021834fc: .word gPlayerVel
_02183500: .word 0x00002aab
arm_func_end func_ov36_02183204
@@ -10934,7 +10934,7 @@ func_ov36_021856cc: ; 0x021856cc
mov r6, r2
cmp r1, #0
beq _021857a8
ldr r1, _02185854 ; =data_027e0fa0
ldr r1, _02185854 ; =gPlayerVel
ldr r0, _02185858 ; =data_027e0fcc
ldmia r1, {r2, r5}
str r5, [sp, #0x10]
@@ -10988,7 +10988,7 @@ _0218577c:
b _0218581c
_021857a8:
bl _ZN5Actor14GetAngleToLinkEv
ldr r1, _02185854 ; =data_027e0fa0
ldr r1, _02185854 ; =gPlayerVel
mov r4, r0, lsl #0x10
ldr r0, [r1]
ldr r1, [r1, #8]
@@ -11032,7 +11032,7 @@ _0218581c:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02185854: .word data_027e0fa0
_02185854: .word gPlayerVel
_02185858: .word data_027e0fcc
_0218585c: .word gPlayerPos
_02185860: .word gPlayerLink
asm/ov37.inc
+1 -1
View File
@@ -83,7 +83,7 @@
.extern data_027e0f6c
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fa0
.extern gPlayerVel
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov37.s
+6 -6
View File
@@ -36,7 +36,7 @@ func_ov37_0217bdb0: ; 0x0217bdb0
ldrneb r0, [r0, #0x28]
cmpne r0, #0
beq _0217bdf4
ldr r0, _0217be10 ; =data_027e0fa0
ldr r0, _0217be10 ; =gPlayerVel
ldr r0, [r0, #4]
cmp r0, #0
movgt r0, #1
@@ -50,7 +50,7 @@ _0217bdf4:
ldmia sp!, {r3, pc}
.align 2, 0
_0217be0c: .word gPlayerPos
_0217be10: .word data_027e0fa0
_0217be10: .word gPlayerVel
arm_func_end func_ov37_0217bdb0
.global func_ov37_0217be14
@@ -2716,7 +2716,7 @@ _0217e280:
mov r7, r0, asr #0x10
_0217e290:
ldr r0, _0217e354 ; =gPlayerPos
ldr lr, _0217e358 ; =data_027e0fa0
ldr lr, _0217e358 ; =gPlayerVel
add r3, sp, #0xcc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -2767,7 +2767,7 @@ _0217e348: .word data_027e0764
_0217e34c: .word 0x00000222
_0217e350: .word data_027e0ffc
_0217e354: .word gPlayerPos
_0217e358: .word data_027e0fa0
_0217e358: .word gPlayerVel
_0217e35c: .word 0xffff8001
_0217e360: .word 0x00000e39
_0217e364: .word 0xfffff8e4
@@ -12712,7 +12712,7 @@ func_ov37_02186d60: ; 0x02186d60
ldrneb r0, [r0, #0x28]
cmpne r0, #0
beq _02186dd0
ldr r0, _02186e58 ; =data_027e0fa0
ldr r0, _02186e58 ; =gPlayerVel
ldr r0, [r0, #4]
cmp r0, #0
ble _02186dd0
@@ -12767,7 +12767,7 @@ _02186dd0:
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02186e58: .word data_027e0fa0
_02186e58: .word gPlayerVel
_02186e5c: .word 0xffffe4cd
arm_func_end func_ov37_02186d60
asm/ov39.inc
+1 -1
View File
@@ -84,7 +84,7 @@
.extern data_027e0f64
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
asm/ov39.s
+4 -4
View File
@@ -3802,7 +3802,7 @@ func_ov39_0217f10c: ; 0x0217f10c
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x1c
mov r5, r0
ldr r1, _0217f264 ; =data_027e0fac
ldr r1, _0217f264 ; =gPlayerAngle
ldr r4, [r5, #0x138]
ldrsh r3, [r1]
ldr r0, _0217f268 ; =gPlayerPos
@@ -3887,7 +3887,7 @@ _0217f23c:
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217f264: .word data_027e0fac
_0217f264: .word gPlayerAngle
_0217f268: .word gPlayerPos
_0217f26c: .word data_02050f54
_0217f270: .word 0x00002b33
@@ -11536,7 +11536,7 @@ func_ov39_02185c3c: ; 0x02185c3c
add r2, sp, #0x1c
add r0, r5, #0x208
bl Vec3p_Sub
ldr r1, _02185e8c ; =data_027e0fac
ldr r1, _02185e8c ; =gPlayerAngle
ldr r0, [sp, #0x1c]
ldrsh r4, [r1]
ldr r1, [sp, #0x24]
@@ -11662,7 +11662,7 @@ _02185e50:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02185e88: .word 0x00000e66
_02185e8c: .word data_027e0fac
_02185e8c: .word gPlayerAngle
_02185e90: .word 0x000031c7
_02185e94: .word gPlayer
_02185e98: .word data_02050f54
asm/ov41.inc
+1 -1
View File
@@ -85,7 +85,7 @@
.extern data_027e0f78
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
asm/ov41.s
+2 -2
View File
@@ -4719,7 +4719,7 @@ func_ov41_0218d210: ; 0x0218d210
ldmia r1, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldr r0, [r3]
ldr r1, _0218d318 ; =data_027e0fac
ldr r1, _0218d318 ; =gPlayerAngle
ldr r2, [r0]
ldrsh r4, [r1]
ldr r2, [r2, #4]
@@ -4779,7 +4779,7 @@ _0218d2fc:
.align 2, 0
_0218d310: .word gPlayerPos
_0218d314: .word gPlayer
_0218d318: .word data_027e0fac
_0218d318: .word gPlayerAngle
_0218d31c: .word gMapManager
_0218d320: .word 0xffff8001
arm_func_end func_ov41_0218d210
asm/ov43.inc
+1 -1
View File
@@ -67,7 +67,7 @@
.extern data_027e0f6c
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov43.s
+2 -2
View File
@@ -1347,7 +1347,7 @@ func_ov43_0218a674: ; 0x0218a674
bl _ZN10PlayerBase12CollidesWithEP8Cylinder
cmp r0, #0
beq _0218a7ac
ldr r0, _0218a858 ; =data_027e0fac
ldr r0, _0218a858 ; =gPlayerAngle
ldrsh r2, [r4, #0x78]
ldrsh r0, [r0]
ldr r1, _0218a85c ; =0xffff8001
@@ -1418,7 +1418,7 @@ _0218a834:
_0218a84c: .word 0x0000099a
_0218a850: .word data_02050f54
_0218a854: .word gPlayer
_0218a858: .word data_027e0fac
_0218a858: .word gPlayerAngle
_0218a85c: .word 0xffff8001
_0218a860: .word 0x00005555
_0218a864: .word 0x50424c4e
asm/ov48.inc
+1 -1
View File
@@ -136,7 +136,7 @@
.extern gMapManager
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern data_027e0fe0
.extern gActorManager
.extern data_027e0fe8
asm/ov48.s
+2 -2
View File
@@ -2080,7 +2080,7 @@ _021918a4:
bl _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
cmp r0, #0
beq _02191964
ldr r1, _02191c3c ; =data_027e0fac
ldr r1, _02191c3c ; =gPlayerAngle
mov r0, r4
ldrsh r6, [r1]
bl _ZN5Actor14GetAngleToLinkEv
@@ -2298,7 +2298,7 @@ _02191c2c: .word 0x00000333
_02191c30: .word gMapManager
_02191c34: .word gItemManager
_02191c38: .word gPlayer
_02191c3c: .word data_027e0fac
_02191c3c: .word gPlayerAngle
_02191c40: .word 0x00000b33
_02191c44: .word data_027e0e58
_02191c48: .word data_027e0ffc
asm/ov50.inc
+1 -1
View File
@@ -81,7 +81,7 @@
.extern data_027e0f6c
.extern gPlayer
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov50.s
+4 -4
View File
@@ -1140,7 +1140,7 @@ _02196494: .word data_ov00_020e9370
arm_func_start func_ov50_02196498
func_ov50_02196498: ; 0x02196498
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _021964cc ; =data_027e0fac
ldr r2, _021964cc ; =gPlayerAngle
mov r5, r0
ldrsh r0, [r2]
mov r4, r1
@@ -1153,7 +1153,7 @@ func_ov50_02196498: ; 0x02196498
bl func_ov14_02148334
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021964cc: .word data_027e0fac
_021964cc: .word gPlayerAngle
arm_func_end func_ov50_02196498
.global func_ov50_021964d0
@@ -1781,7 +1781,7 @@ _02196d24: .word data_02050f54
arm_func_start func_ov50_02196d28
func_ov50_02196d28: ; 0x02196d28
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _02196d8c ; =data_027e0fac
ldr r2, _02196d8c ; =gPlayerAngle
mov r6, r0
ldrsh r0, [r2]
mov r5, r1
@@ -1807,7 +1807,7 @@ _02196d64:
str r0, [r6, #0x164]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02196d8c: .word data_027e0fac
_02196d8c: .word gPlayerAngle
_02196d90: .word gPlayerLink
arm_func_end func_ov50_02196d28
asm/ov52.inc
+1 -1
View File
@@ -75,7 +75,7 @@
.extern data_027e0e58
.extern data_027e0f68
.extern data_027e0f78
.extern data_027e0fa0
.extern gPlayerVel
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
asm/ov52.s
+2 -2
View File
@@ -1482,7 +1482,7 @@ _02196768:
_021967ec:
mov r0, r5
bl func_ov52_0219699c
ldr r0, _021968a8 ; =data_027e0fa0
ldr r0, _021968a8 ; =gPlayerVel
bl Vec3p_Length
ldr r1, _021968ac ; =0x0000019a
cmp r0, r1
@@ -1533,7 +1533,7 @@ _02196890:
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021968a8: .word data_027e0fa0
_021968a8: .word gPlayerVel
_021968ac: .word 0x0000019a
_021968b0: .word 0x0000099a
_021968b4: .word data_027e0ff8
include/Player/PlayerBase.hpp
+2
View File
@@ -62,3 +62,5 @@ public:
extern PlayerBase *gPlayer;
extern Vec3p gPlayerPos;
extern Vec3p gPlayerVel;
extern s16 gPlayerAngle;