From ec8aae7d5412c33dce169d8b967bbc5afc5a94fb Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 23 May 2024 18:32:24 +0200 Subject: [PATCH] Rename `gPlayerVel` and `gPlayerAngle` --- asm/dtcm.s | 19 +- asm/ov00/Actor/Actor.inc | 2 +- asm/ov00/Actor/Actor.s | 4 +- asm/ov00/Player/LinkStateBase.inc | 4 +- asm/ov00/Player/LinkStateBase.s | 14 +- asm/ov00/Player/PlayerBase.inc | 4 +- asm/ov00/Player/PlayerBase.s | 12 +- asm/ov00/Player/PlayerControl.inc | 2 +- asm/ov00/Player/PlayerControl.s | 12 +- asm/ov00/ov00_0207afa0.inc | 2 +- asm/ov00/ov00_0207afa0.s | 4 +- asm/ov00/ov00_02086cd0.inc | 4 +- asm/ov00/ov00_02086cd0.s | 18 +- asm/ov00/ov00_020980f4.inc | 4 +- asm/ov00/ov00_020980f4.s | 34 +-- asm/ov00/ov00_020b1498.inc | 4 +- asm/ov00/ov00_020b1498.s | 80 ++--- asm/ov00/ov00_020c3e54.inc | 2 +- asm/ov00/ov00_020c3e54.s | 8 +- asm/ov04.inc | 2 +- asm/ov04.s | 4 +- asm/ov05.inc | 4 +- asm/ov05.s | 26 +- asm/ov12.inc | 4 +- asm/ov12.s | 28 +- asm/ov14/ov14_0211f640.inc | 2 +- asm/ov14/ov14_0211f640.s | 8 +- asm/ov14/ov14_0213b778.inc | 2 +- asm/ov14/ov14_0213b778.s | 12 +- asm/ov15.inc | 4 +- asm/ov15.s | 490 +++++++++++++++--------------- asm/ov17.inc | 2 +- asm/ov17.s | 4 +- asm/ov19.inc | 2 +- asm/ov19.s | 4 +- asm/ov20.inc | 2 +- asm/ov20.s | 4 +- asm/ov22.inc | 2 +- asm/ov22.s | 4 +- asm/ov23.inc | 4 +- asm/ov23.s | 48 +-- asm/ov25.inc | 2 +- asm/ov25.s | 8 +- asm/ov26.inc | 4 +- asm/ov26.s | 18 +- asm/ov27.inc | 4 +- asm/ov27.s | 14 +- asm/ov29.inc | 2 +- asm/ov29.s | 8 +- asm/ov32.inc | 4 +- asm/ov32.s | 12 +- asm/ov33.inc | 4 +- asm/ov33.s | 8 +- asm/ov35.inc | 2 +- asm/ov35.s | 4 +- asm/ov36.inc | 2 +- asm/ov36.s | 10 +- asm/ov37.inc | 2 +- asm/ov37.s | 12 +- asm/ov39.inc | 2 +- asm/ov39.s | 8 +- asm/ov41.inc | 2 +- asm/ov41.s | 4 +- asm/ov43.inc | 2 +- asm/ov43.s | 4 +- asm/ov48.inc | 2 +- asm/ov48.s | 4 +- asm/ov50.inc | 2 +- asm/ov50.s | 8 +- asm/ov52.inc | 2 +- asm/ov52.s | 4 +- include/Player/PlayerBase.hpp | 2 + 72 files changed, 529 insertions(+), 532 deletions(-) diff --git a/asm/dtcm.s b/asm/dtcm.s index 9de3a63a..1f98eafd 100644 --- a/asm/dtcm.s +++ b/asm/dtcm.s @@ -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 diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 427baa76..cbac3fe9 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -28,7 +28,7 @@ .extern gMapManager .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gPlayerLink .extern gActorManager diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 0e210e92..ff4caf08 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -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 diff --git a/asm/ov00/Player/LinkStateBase.inc b/asm/ov00/Player/LinkStateBase.inc index 0546f6e4..5364bc3d 100644 --- a/asm/ov00/Player/LinkStateBase.inc +++ b/asm/ov00/Player/LinkStateBase.inc @@ -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 diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index d4bebb0f..a9fcaf71 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -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 diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index c3463165..452c9187 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -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 diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index e9549241..5b771356 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -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 diff --git a/asm/ov00/Player/PlayerControl.inc b/asm/ov00/Player/PlayerControl.inc index 07f29057..f8319fab 100644 --- a/asm/ov00/Player/PlayerControl.inc +++ b/asm/ov00/Player/PlayerControl.inc @@ -30,7 +30,7 @@ .extern data_027e0f64 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern gPlayerLink .extern data_027e0fcc .extern gActorManager diff --git a/asm/ov00/Player/PlayerControl.s b/asm/ov00/Player/PlayerControl.s index 7ed2a28a..5821e3d4 100644 --- a/asm/ov00/Player/PlayerControl.s +++ b/asm/ov00/Player/PlayerControl.s @@ -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 diff --git a/asm/ov00/ov00_0207afa0.inc b/asm/ov00/ov00_0207afa0.inc index 8c52fc8d..efe6aedc 100644 --- a/asm/ov00/ov00_0207afa0.inc +++ b/asm/ov00/ov00_0207afa0.inc @@ -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 diff --git a/asm/ov00/ov00_0207afa0.s b/asm/ov00/ov00_0207afa0.s index cc518e9b..e2bc0ab1 100644 --- a/asm/ov00/ov00_0207afa0.s +++ b/asm/ov00/ov00_0207afa0.s @@ -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 diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index 9c6118f4..4e30e242 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -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 diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index 09de3872..d515afcc 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -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 diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index 979182fa..dbaa88d4 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -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 diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index b0f3ac72..69e04dd3 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -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 diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index c26e3c38..057d9ec9 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -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 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 591927fe..22417dab 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -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 diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index fd49d1a5..ecec4ec0 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -146,7 +146,7 @@ .extern data_027e0f88 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gPlayerLink .extern data_027e0fd4 diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index 5134d03a..c951bc01 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -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 diff --git a/asm/ov04.inc b/asm/ov04.inc index adf48266..80301d19 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -135,7 +135,7 @@ .extern data_027e0f7c .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gHealthManager .extern data_027e0fc0 diff --git a/asm/ov04.s b/asm/ov04.s index 4ac6eb80..5468dab5 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -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 diff --git a/asm/ov05.inc b/asm/ov05.inc index f5cc7a93..dd6d9b21 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -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 diff --git a/asm/ov05.s b/asm/ov05.s index 75fd03a2..c51811c3 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -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 diff --git a/asm/ov12.inc b/asm/ov12.inc index 9e4492b8..06af23c5 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -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 diff --git a/asm/ov12.s b/asm/ov12.s index af89c4f4..5e7bcb37 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -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 diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index e6c9ae7b..cc49c033 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -167,7 +167,7 @@ .extern data_027e0f84 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gPlayerLink .extern data_027e0fcc diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 36fbed9b..4df526f0 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -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 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index a9a8b32d..a7022ccc 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -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 diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 8464ceb7..a1d8e133 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -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 diff --git a/asm/ov15.inc b/asm/ov15.inc index 12afe334..c955cb4e 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -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 diff --git a/asm/ov15.s b/asm/ov15.s index a43e025f..ff1b29ad 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -12571,7 +12571,7 @@ func_ov15_02129b50: ; 0x02129b50 mov ip, #0 str r0, [r4, #0x1a0] ldr r0, [r2, #4] - ldr r1, _02129bf8 ; =data_027e0fac + ldr r1, _02129bf8 ; =gPlayerAngle str r0, [r4, #0x1a4] ldr r2, [r2, #8] add r0, r4, #0x100 @@ -12606,7 +12606,7 @@ func_ov15_02129b50: ; 0x02129b50 ldmia sp!, {r3, r4, pc} .align 2, 0 _02129bf4: .word gPlayerPos -_02129bf8: .word data_027e0fac +_02129bf8: .word gPlayerAngle _02129bfc: .word 0xfffffd9a _02129c00: .word 0x00000614 arm_func_end func_ov15_02129b50 @@ -17122,7 +17122,7 @@ func_ov15_0212d858: ; 0x0212d858 str r0, [r6, #0x250] mov r0, r6 bl _ZN5Actor14GetAngleToLinkEv - ldr r1, _0212dba4 ; =data_027e0fac + ldr r1, _0212dba4 ; =gPlayerAngle mov r0, r0, lsl #0x10 ldrh r5, [r1] rsb r4, r5, r0, lsr #16 @@ -17304,7 +17304,7 @@ _0212db7c: .align 2, 0 _0212db9c: .word data_027e10a4 _0212dba0: .word gPlayerPos -_0212dba4: .word data_027e0fac +_0212dba4: .word gPlayerAngle _0212dba8: .word 0x00001555 _0212dbac: .word data_02050f54 _0212dbb0: .word data_ov15_0218a464 @@ -17492,7 +17492,7 @@ _0212de20: bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p cmp r0, #0 beq _0212de50 - ldr r1, _0212e05c ; =data_027e0fac + ldr r1, _0212e05c ; =gPlayerAngle add r0, r4, #0x78 ldrsh r1, [r1] mov r2, #0x2d8 @@ -17634,7 +17634,7 @@ _0212e03c: .align 2, 0 _0212e054: .word data_027e0f64 _0212e058: .word gPlayerPos -_0212e05c: .word data_027e0fac +_0212e05c: .word gPlayerAngle _0212e060: .word data_02050f54 _0212e064: .word data_027e0c68 _0212e068: .word 0x00050022 @@ -18251,7 +18251,7 @@ func_ov15_0212e8e0: ; 0x0212e8e0 mov r4, r3 sub r0, r0, #2 cmp r0, #1 - ldrls r0, _0212eb7c ; =data_027e0fac + ldrls r0, _0212eb7c ; =gPlayerAngle mov r5, r2 ldrlssh r7, [r0] ldrhish r7, [r6, #0x78] @@ -18421,7 +18421,7 @@ _0212eae4: str r0, [r5, #8] ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 -_0212eb7c: .word data_027e0fac +_0212eb7c: .word gPlayerAngle _0212eb80: .word 0x00007fff _0212eb84: .word data_ov15_0218a464 _0212eb88: .word gPlayerPos @@ -21897,7 +21897,7 @@ _02131c70: ldr r0, _02131f00 ; =gPlayer str r3, [sp, #4] ldr r0, [r0] - ldr r1, _02131f04 ; =data_027e0fac + ldr r1, _02131f04 ; =gPlayerAngle ldr ip, [r0] ldrsh r2, [r1] ldr ip, [ip, #0x34] @@ -22064,7 +22064,7 @@ _02131ef4: .word data_027e0f64 _02131ef8: .word 0x000002e2 _02131efc: .word data_02050f54 _02131f00: .word gPlayer -_02131f04: .word data_027e0fac +_02131f04: .word gPlayerAngle _02131f08: .word gMapManager arm_func_end func_ov15_02131938 @@ -22087,7 +22087,7 @@ func_ov15_02131f0c: ; 0x02131f0c mov r0, #0x3000 str r0, [r9, #0x36c] ldr r1, _021321bc ; =0x00001770 - ldr r0, _021321c0 ; =data_027e0fac + ldr r0, _021321c0 ; =gPlayerAngle str r1, [r9, #0x368] ldrsh r0, [r0] mov r2, #0 @@ -22251,7 +22251,7 @@ _0213215c: .align 2, 0 _021321b8: .word data_027e0f64 _021321bc: .word 0x00001770 -_021321c0: .word data_027e0fac +_021321c0: .word gPlayerAngle arm_func_end func_ov15_02131f0c .global func_ov15_021321c4 @@ -22259,7 +22259,7 @@ _021321c0: .word data_027e0fac func_ov15_021321c4: ; 0x021321c4 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x24 - ldr r2, _02132258 ; =data_027e0fac + ldr r2, _02132258 ; =gPlayerAngle ldr r3, [r1, #0x370] ldrsh r1, [r2] ldr ip, _0213225c ; =0x000008a4 @@ -22295,7 +22295,7 @@ func_ov15_021321c4: ; 0x021321c4 add sp, sp, #0x24 ldmia sp!, {r4, r5, pc} .align 2, 0 -_02132258: .word data_027e0fac +_02132258: .word gPlayerAngle _0213225c: .word 0x000008a4 _02132260: .word 0x0000051f _02132264: .word gPlayerPos @@ -22349,7 +22349,7 @@ _021322e8: ldr r1, _021325e8 ; =gMapManager addlt r0, r0, #1 strltb r0, [r4, #0x490] - ldr r0, _021325ec ; =data_027e0fac + ldr r0, _021325ec ; =gPlayerAngle ldr r3, [sp, #0x88] ldrh r0, [r0] str r3, [sp, #0x44] @@ -22439,7 +22439,7 @@ _02132440: strb r1, [r4, #0x490] str r0, [r4, #0x138] _0213246c: - ldr r1, _021325ec ; =data_027e0fac + ldr r1, _021325ec ; =gPlayerAngle add r0, sp, #0 ldrsh r1, [r1] mov r2, #0xb6 @@ -22538,7 +22538,7 @@ _021325dc: .word data_027e0c68 _021325e0: .word 0x00050082 _021325e4: .word data_02050f54 _021325e8: .word gMapManager -_021325ec: .word data_027e0fac +_021325ec: .word gPlayerAngle _021325f0: .word data_027e10a4 arm_func_end func_ov15_02132268 @@ -23590,7 +23590,7 @@ _021333cc: add r0, sp, #0x94 str r1, [sp, #0x98] bl Vec3p_Length - ldr r1, _02133cb0 ; =data_027e0fac + ldr r1, _02133cb0 ; =gPlayerAngle mov r4, r0 ldrsh r5, [r1] ldr r0, [sp, #0x94] @@ -23886,7 +23886,7 @@ _02133858: mov r0, #0 mov r2, #4 bl func_020078f4 - ldr r2, _02133cb0 ; =data_027e0fac + ldr r2, _02133cb0 ; =gPlayerAngle add r0, r7, #0x300 ldr r1, _02133cc4 ; =data_027e10a4 ldrsh r5, [r0, #0x70] @@ -24176,7 +24176,7 @@ _02133ca0: .word data_ov15_02185e74 _02133ca4: .word data_ov15_02185e70 _02133ca8: .word data_ov15_02185e6c _02133cac: .word gPlayerPos -_02133cb0: .word data_027e0fac +_02133cb0: .word gPlayerAngle _02133cb4: .word 0x0000019a _02133cb8: .word data_ov15_0218a6e0 _02133cbc: .word data_02050f54 @@ -26057,7 +26057,7 @@ _02135590: _021355a4: mov r0, r4 bl func_ov15_021368c8 - ldr r1, _02135644 ; =data_027e0fac + ldr r1, _02135644 ; =gPlayerAngle str r0, [r4, #0x88] ldrsh r0, [r1] strh r0, [r4, #0x9a] @@ -26076,7 +26076,7 @@ _021355a4: add r0, r1, r0 strh r0, [r4, #0x9a] _021355f4: - ldr r0, _02135644 ; =data_027e0fac + ldr r0, _02135644 ; =gPlayerAngle ldrsh r1, [r4, #0x9a] ldrsh r0, [r0] sub r0, r0, r1 @@ -26097,7 +26097,7 @@ _021355f4: bl func_ov15_02136d04 ldmia sp!, {r4, pc} .align 2, 0 -_02135644: .word data_027e0fac +_02135644: .word gPlayerAngle arm_func_end func_ov15_02135558 .global func_ov15_02135648 @@ -26108,7 +26108,7 @@ func_ov15_02135648: ; 0x02135648 ldrb r0, [r4, #0x25f] cmp r0, #0 beq _021356d0 - ldr r0, _021356e0 ; =data_027e0fac + ldr r0, _021356e0 ; =gPlayerAngle ldrsh r3, [r4, #0x9a] ldrsh r0, [r0] ldr r1, _021356e4 ; =0x0000019a @@ -26134,16 +26134,16 @@ func_ov15_02135648: ; 0x02135648 bl func_0202b154 ldrsh r1, [r4, #0x9a] ldrsh r2, [r4, #0x9c] - ldr r0, _021356e0 ; =data_027e0fac + ldr r0, _021356e0 ; =gPlayerAngle bl func_0202b154 ldmia sp!, {r4, pc} _021356d0: ldrsh r1, [r4, #0x9a] - ldr r0, _021356e0 ; =data_027e0fac + ldr r0, _021356e0 ; =gPlayerAngle strh r1, [r0] ldmia sp!, {r4, pc} .align 2, 0 -_021356e0: .word data_027e0fac +_021356e0: .word gPlayerAngle _021356e4: .word 0x0000019a arm_func_end func_ov15_02135648 @@ -26163,7 +26163,7 @@ func_ov15_021356e8: ; 0x021356e8 cmp r0, #0 addlt sp, sp, #0x18 ldmltia sp!, {r4, r5, r6, pc} - ldr r0, _021358cc ; =data_027e0fac + ldr r0, _021358cc ; =gPlayerAngle ldrsh r4, [r0] bl func_ov15_0212f7a0 ldr r1, _021358d0 ; =gPlayerPos @@ -26279,7 +26279,7 @@ _021358b8: add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_021358cc: .word data_027e0fac +_021358cc: .word gPlayerAngle _021358d0: .word gPlayerPos _021358d4: .word 0x60db9391 _021358d8: .word 0x000028be @@ -26349,7 +26349,7 @@ func_ov15_02135948: ; 0x02135948 mov r0, #1 strb r0, [r4, #0x25e] _02135988: - ldr r0, _02135aec ; =data_027e0fac + ldr r0, _02135aec ; =gPlayerAngle mov r1, #0 ldrsh r0, [r0] strh r0, [r4, #0x9a] @@ -26391,7 +26391,7 @@ _021359f0: b _02135ad4 _02135a20: ldr r1, _02135af4 ; =data_027e0f64 - ldr r0, _02135aec ; =data_027e0fac + ldr r0, _02135aec ; =gPlayerAngle ldr r2, [r1] ldrsh r1, [r0] ldr r0, [r2, #4] @@ -26444,7 +26444,7 @@ _02135ad4: add sp, sp, #0x18 ldmia sp!, {r4, pc} .align 2, 0 -_02135aec: .word data_027e0fac +_02135aec: .word gPlayerAngle _02135af0: .word gPlayerPos _02135af4: .word data_027e0f64 arm_func_end func_ov15_02135948 @@ -26482,11 +26482,11 @@ _02135b28: mov r2, r0, asr #0x10 _02135b64: ldrsh r1, [r4, #0x9a] - ldr r0, _02135b74 ; =data_027e0fac + ldr r0, _02135b74 ; =gPlayerAngle bl func_0202b154 ldmia sp!, {r4, pc} .align 2, 0 -_02135b74: .word data_027e0fac +_02135b74: .word gPlayerAngle arm_func_end func_ov15_02135af8 .global func_ov15_02135b78 @@ -26550,7 +26550,7 @@ _02135c28: bicne r0, r0, #2 strne r0, [r4, #0x60] _02135c40: - ldr r0, _02135cd8 ; =data_027e0fac + ldr r0, _02135cd8 ; =gPlayerAngle ldrsh r1, [r4, #0x9a] ldrsh r0, [r0] sub r0, r1, r0 @@ -26591,7 +26591,7 @@ _02135cc0: ldmia sp!, {r4, pc} .align 2, 0 _02135cd4: .word data_ov15_0218a9a4 -_02135cd8: .word data_027e0fac +_02135cd8: .word gPlayerAngle _02135cdc: .word data_ov15_0218a9a8 _02135ce0: .word data_ov15_0218a9ac arm_func_end func_ov15_02135bd0 @@ -26754,7 +26754,7 @@ func_ov15_02135e2c: ; 0x02135e2c add r1, sp, #0x2c mov r2, r0 bl func_01ff8690 - ldr r1, _021360c8 ; =data_027e0fac + ldr r1, _021360c8 ; =gPlayerAngle ldr r3, _021360c0 ; =data_02050f54 ldrh r1, [r1] add r0, sp, #8 @@ -26773,7 +26773,7 @@ func_ov15_02135e2c: ; 0x02135e2c ldr r0, [r4] ldr r1, [r4, #8] bl func_01ffa0f4 - ldr r1, _021360c8 ; =data_027e0fac + ldr r1, _021360c8 ; =gPlayerAngle ldr r3, [r5, #0x20] ldrsh ip, [r1] add r1, sp, #0xb8 @@ -26874,7 +26874,7 @@ _021360b8: .word gPlayerPos _021360bc: .word data_027e10a4 _021360c0: .word data_02050f54 _021360c4: .word data_027e0fb0 -_021360c8: .word data_027e0fac +_021360c8: .word gPlayerAngle _021360cc: .word 0x00000333 _021360d0: .word func_ov15_02135e10 _021360d4: .word data_027e0e58 @@ -26978,7 +26978,7 @@ _0213618c: add r1, sp, #0x2c mov r2, r0 bl func_01ff8690 - ldr r1, _021363f4 ; =data_027e0fac + ldr r1, _021363f4 ; =gPlayerAngle ldr r3, _021363ec ; =data_02050f54 ldrh r1, [r1] add r0, sp, #8 @@ -26994,7 +26994,7 @@ _0213618c: add r1, sp, #8 mov r2, r0 bl func_01ff8690 - ldr r1, _021363f4 ; =data_027e0fac + ldr r1, _021363f4 ; =gPlayerAngle ldr r0, [r7] ldrsh r6, [r1] ldr r1, [r7, #8] @@ -27089,7 +27089,7 @@ _021363e4: .word gPlayerPos _021363e8: .word data_027e10a4 _021363ec: .word data_02050f54 _021363f0: .word data_027e0fb0 -_021363f4: .word data_027e0fac +_021363f4: .word gPlayerAngle _021363f8: .word data_027e0f64 _021363fc: .word data_ov15_0218a9d8 arm_func_end func_ov15_021360e4 @@ -27193,7 +27193,7 @@ func_ov15_021364b0: ; 0x021364b0 addeq sp, sp, #0x20 ldmeqia sp!, {r4, pc} add r0, sp, #0x14 - ldr r1, _02136614 ; =data_027e0fa0 + ldr r1, _02136614 ; =gPlayerVel mov r2, r0 bl Vec3p_Add add r1, sp, #0x14 @@ -27243,7 +27243,7 @@ _021365e8: .align 2, 0 _0213660c: .word data_027e0e2c _02136610: .word data_027e0fb8 -_02136614: .word data_027e0fa0 +_02136614: .word gPlayerVel _02136618: .word gPlayerPos _0213661c: .word data_027e0ffc _02136620: .word 0x0000020d @@ -27405,7 +27405,7 @@ func_ov15_0213677c: ; 0x0213677c str r3, [sp, #8] bl Vec3p_Sub mov r3, #0 - ldr r0, _02136884 ; =data_027e0fac + ldr r0, _02136884 ; =gPlayerAngle mov r2, #0x1000 ldrsh r1, [r0] add r0, sp, #0xc @@ -27420,7 +27420,7 @@ func_ov15_0213677c: ; 0x0213677c mov r2, r0, lsl #0xf mov r0, r2, asr #0xb add r0, r2, r0, lsr #20 - ldr r1, _02136884 ; =data_027e0fac + ldr r1, _02136884 ; =gPlayerAngle mov r0, r0, lsl #0x4 ldrsh r2, [r1] ldrsh r1, [r4, #0x8c] @@ -27451,7 +27451,7 @@ func_ov15_0213677c: ; 0x0213677c ldmia sp!, {r3, r4, pc} .align 2, 0 _02136880: .word gPlayerPos -_02136884: .word data_027e0fac +_02136884: .word gPlayerAngle arm_func_end func_ov15_0213677c .global func_ov15_02136888 @@ -27770,7 +27770,7 @@ func_ov15_02136c34: ; 0x02136c34 ldrneb r0, [r0, #0x43] cmpne r0, #0 bne _02136c94 - ldr r0, _02136c9c ; =data_027e0fac + ldr r0, _02136c9c ; =gPlayerAngle ldrsh r1, [r5, #0x9a] ldrsh r0, [r0] sub r0, r1, r0 @@ -27786,14 +27786,14 @@ _02136c94: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02136c9c: .word data_027e0fac +_02136c9c: .word gPlayerAngle _02136ca0: .word 0x00000222 arm_func_end func_ov15_02136c34 .global func_ov15_02136ca4 arm_func_start func_ov15_02136ca4 func_ov15_02136ca4: ; 0x02136ca4 - ldr r1, _02136d00 ; =data_027e0fac + ldr r1, _02136d00 ; =gPlayerAngle ldrsh r2, [r0, #0x9a] ldrsh r1, [r1] sub r1, r1, r2 @@ -27817,7 +27817,7 @@ func_ov15_02136ca4: ; 0x02136ca4 strmi r1, [r0, #0x78] bx lr .align 2, 0 -_02136d00: .word data_027e0fac +_02136d00: .word gPlayerAngle arm_func_end func_ov15_02136ca4 .global func_ov15_02136d04 @@ -27921,7 +27921,7 @@ _02136d5c: ldr r1, _02137128 ; =0xfffff8cd add r0, sp, #0 str r1, [sp, #8] - ldr r1, _0213712c ; =data_027e0fac + ldr r1, _0213712c ; =gPlayerAngle str r11, [sp] ldrsh r1, [r1] str r3, [sp, #4] @@ -28064,7 +28064,7 @@ _02137070: _02137084: mov r0, r4 bl func_ov15_021368b4 - ldr r1, _02137130 ; =data_027e0fa0 + ldr r1, _02137130 ; =gPlayerVel ldr r2, [r1, #4] sub r2, r2, r0 mov r0, r4 @@ -28106,8 +28106,8 @@ _0213711c: .word gPlayerPos _02137120: .word data_027e0764 _02137124: .word 0x0000019b _02137128: .word 0xfffff8cd -_0213712c: .word data_027e0fac -_02137130: .word data_027e0fa0 +_0213712c: .word gPlayerAngle +_02137130: .word gPlayerVel _02137134: .word data_ov00_020ee800 arm_func_end func_ov15_02136d04 @@ -28116,7 +28116,7 @@ _02137134: .word data_ov00_020ee800 func_ov15_02137138: ; 0x02137138 stmdb sp!, {r4, lr} sub sp, sp, #0x20 - ldr r1, _02137258 ; =data_027e0fa0 + ldr r1, _02137258 ; =gPlayerVel mov r4, r0 ldr r0, [r1, #4] cmp r0, #0 @@ -28143,7 +28143,7 @@ _02137164: cmp r1, #1 addne sp, sp, #0x20 ldmneia sp!, {r4, pc} - ldr r0, _02137258 ; =data_027e0fa0 + ldr r0, _02137258 ; =gPlayerVel ldr r0, [r0, #4] cmp r0, #0 addgt sp, sp, #0x20 @@ -28182,13 +28182,13 @@ _02137164: ldr r0, [r0] ldr r0, [r0, #4] bl func_ov00_02088000 - ldr r0, _02137258 ; =data_027e0fa0 + ldr r0, _02137258 ; =gPlayerVel mov r1, #0 str r1, [r0, #4] add sp, sp, #0x20 ldmia sp!, {r4, pc} .align 2, 0 -_02137258: .word data_027e0fa0 +_02137258: .word gPlayerVel _0213725c: .word gPlayerPos _02137260: .word gMapManager _02137264: .word 0x000004cd @@ -28238,11 +28238,11 @@ _021372e0: cmp r0, #0 addeq sp, sp, #0x10 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _021374cc ; =data_027e0fa0 + ldr r0, _021374cc ; =gPlayerVel bl Vec3p_Length movs r4, r0 beq _021373f0 - ldr r0, _021374cc ; =data_027e0fa0 + ldr r0, _021374cc ; =gPlayerVel mov r1, r0 bl Vec3p_Normalize mov r0, r5 @@ -28262,7 +28262,7 @@ _021372e0: mov r1, r1, asr #0x1f adds lr, r3, #0x800 mla ip, r1, r0, ip - ldr r3, _021374cc ; =data_027e0fa0 + ldr r3, _021374cc ; =gPlayerVel adc r0, ip, #0 mov ip, lr, lsr #0xc orr ip, ip, r0, lsl #20 @@ -28298,7 +28298,7 @@ _021372e0: strlt r0, [r3, #4] b _02137408 _021373f0: - ldr r0, _021374cc ; =data_027e0fa0 + ldr r0, _021374cc ; =gPlayerVel mov r2, #0 str r2, [r0] mov r1, #0x148 @@ -28328,8 +28328,8 @@ _02137408: add r1, r5, #0x180 mov r2, #0x58 bl func_ov00_0207c1f8 - ldr r0, _021374cc ; =data_027e0fa0 - ldr r1, _021374e4 ; =data_027e0fac + ldr r0, _021374cc ; =gPlayerVel + ldr r1, _021374e4 ; =gPlayerAngle ldr r2, [r0, #4] ldr r3, [r5, #0x78] mov r0, r2, asr #0x2 @@ -28356,13 +28356,13 @@ _021374bc: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_021374cc: .word data_027e0fa0 +_021374cc: .word gPlayerVel _021374d0: .word 0x0000028f _021374d4: .word data_027e0ffc _021374d8: .word gPlayerPos _021374dc: .word data_027e0e58 _021374e0: .word data_027e0d0c -_021374e4: .word data_027e0fac +_021374e4: .word gPlayerAngle arm_func_end func_ov15_02137278 .global func_ov15_021374e8 @@ -28473,7 +28473,7 @@ func_ov15_02137574: ; 0x02137574 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] bl func_01ffa0f4 - ldr r2, _021377bc ; =data_027e0fac + ldr r2, _021377bc ; =gPlayerAngle add r1, r6, #0x400 ldrsh r3, [r2] ldrh r2, [r1, #0xdc] @@ -28512,7 +28512,7 @@ _021376b4: ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] bl func_01ffa0f4 - ldr r2, _021377bc ; =data_027e0fac + ldr r2, _021377bc ; =gPlayerAngle add r1, r6, #0x400 ldrsh r2, [r2] ldrh r1, [r1, #0xdc] @@ -28579,7 +28579,7 @@ _02137788: add sp, sp, #0x28 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_021377bc: .word data_027e0fac +_021377bc: .word gPlayerAngle _021377c0: .word 0x00002e39 _021377c4: .word 0x0000438e _021377c8: .word 0x00001c72 @@ -28600,7 +28600,7 @@ func_ov15_021377d4: ; 0x021377d4 mov r0, #6 str r0, [r4, #0x4e8] rsb r3, r1, #0x334 - ldr r0, _0213790c ; =data_027e0fac + ldr r0, _0213790c ; =gPlayerAngle ldr r2, _02137910 ; =0xfffff8cd ldrsh r1, [r0] add r0, sp, #0x18 @@ -28637,7 +28637,7 @@ func_ov15_021377d4: ; 0x021377d4 ldr r1, _0213791c ; =0xfffff23d ldr r0, _02137920 ; =0x00000829 str r1, [sp, #0xc] - ldr r1, _0213790c ; =data_027e0fac + ldr r1, _0213790c ; =gPlayerAngle str r0, [sp, #0x10] mov r0, #0 str r0, [sp, #0x14] @@ -28653,7 +28653,7 @@ func_ov15_021377d4: ; 0x021377d4 ldr r1, _02137924 ; =0x00000dc3 ldr r0, _02137920 ; =0x00000829 str r1, [sp, #0xc] - ldr r1, _0213790c ; =data_027e0fac + ldr r1, _0213790c ; =gPlayerAngle str r0, [sp, #0x10] mov r0, #0 str r0, [sp, #0x14] @@ -28669,7 +28669,7 @@ func_ov15_021377d4: ; 0x021377d4 add sp, sp, #0x24 ldmia sp!, {r3, r4, pc} .align 2, 0 -_0213790c: .word data_027e0fac +_0213790c: .word gPlayerAngle _02137910: .word 0xfffff8cd _02137914: .word gPlayerPos _02137918: .word data_027e0e58 @@ -28805,7 +28805,7 @@ _02137ad4: mov r1, #0 bl Approach_thunk _02137b00: - ldr r0, _02137cb4 ; =data_027e0fac + ldr r0, _02137cb4 ; =gPlayerAngle ldr r3, _02137cb8 ; =0x00000333 ldrsh r1, [r0] ldr r2, _02137cbc ; =0xfffff8cd @@ -28881,7 +28881,7 @@ _02137c0c: cmp r2, r1 bne _02137bb8 _02137c18: - ldr r0, _02137cb4 ; =data_027e0fac + ldr r0, _02137cb4 ; =gPlayerAngle ldr ip, _02137cc0 ; =0xfffff23d ldrsh r1, [r0] ldr r3, _02137cc4 ; =0x00000829 @@ -28897,7 +28897,7 @@ _02137c18: add r1, sp, #0 add r0, r4, #0x178 bl func_ov00_020b7ea4 - ldr r0, _02137cb4 ; =data_027e0fac + ldr r0, _02137cb4 ; =gPlayerAngle ldr ip, _02137cc8 ; =0x00000dc3 ldrsh r1, [r0] ldr r3, _02137cc4 ; =0x00000829 @@ -28921,7 +28921,7 @@ _02137ca4: .word data_027e0ffc _02137ca8: .word gPlayerPos _02137cac: .word data_02050f54 _02137cb0: .word 0x00000171 -_02137cb4: .word data_027e0fac +_02137cb4: .word gPlayerAngle _02137cb8: .word 0x00000333 _02137cbc: .word 0xfffff8cd _02137cc0: .word 0xfffff23d @@ -29028,11 +29028,11 @@ func_ov15_02137df4: ; 0x02137df4 mov r4, r0 mov r2, #0 str r2, [r4, #0x88] - ldr r1, _021382d0 ; =data_027e0fa0 + ldr r1, _021382d0 ; =gPlayerVel str r2, [r4, #0x78] str r2, [r1] bl func_ov15_021368b4 - ldr r1, _021382d0 ; =data_027e0fa0 + ldr r1, _021382d0 ; =gPlayerVel mov r2, #0 ldr r3, [r1, #4] sub r0, r3, r0 @@ -29059,7 +29059,7 @@ _02137e74: ldr r0, [r4, #0x34] cmp r0, #0 bne _02137f18 - ldr r0, _021382dc ; =data_027e0fac + ldr r0, _021382dc ; =gPlayerAngle ldr r3, _021382e0 ; =0x00000333 ldrsh r1, [r0] ldr r2, _021382e4 ; =0xfffff8a4 @@ -29101,7 +29101,7 @@ _02137f18: ldr r0, [r4, #0x34] cmp r0, #4 bne _02137f8c - ldr r0, _021382dc ; =data_027e0fac + ldr r0, _021382dc ; =gPlayerAngle mov ip, #0 ldrsh r1, [r0] mov r3, #0x800 @@ -29131,7 +29131,7 @@ _02137f8c: ldr r0, [r4, #0x34] cmp r0, #8 bne _02138000 - ldr r0, _021382dc ; =data_027e0fac + ldr r0, _021382dc ; =gPlayerAngle ldr r3, _021382e0 ; =0x00000333 ldrsh r1, [r0] ldr r2, _021382f0 ; =0x0000019a @@ -29161,7 +29161,7 @@ _02138000: ldr r0, [r4, #0x34] cmp r0, #0xe bne _02138084 - ldr r0, _021382dc ; =data_027e0fac + ldr r0, _021382dc ; =gPlayerAngle ldr r3, _021382e0 ; =0x00000333 ldrsh r1, [r0] rsb r2, r3, #0x52 @@ -29347,10 +29347,10 @@ _02138288: add sp, sp, #0x64 ldmia sp!, {r4, r5, pc} .align 2, 0 -_021382d0: .word data_027e0fa0 +_021382d0: .word gPlayerVel _021382d4: .word 0x00000183 _021382d8: .word data_ov00_020eec68 -_021382dc: .word data_027e0fac +_021382dc: .word gPlayerAngle _021382e0: .word 0x00000333 _021382e4: .word 0xfffff8a4 _021382e8: .word gPlayerPos @@ -29368,7 +29368,7 @@ _02138308: .word 0x00002aab arm_func_start func_ov15_0213830c func_ov15_0213830c: ; 0x0213830c stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _021383a4 ; =data_027e0fac + ldr r1, _021383a4 ; =gPlayerAngle mvn r3, #0 ldrh r1, [r1] mov r2, #0 @@ -29406,7 +29406,7 @@ func_ov15_0213830c: ; 0x0213830c str r1, [r0, #0x70] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_021383a4: .word data_027e0fac +_021383a4: .word gPlayerAngle _021383a8: .word data_02050f54 _021383ac: .word 0x00000429 _021383b0: .word 0x000005c3 @@ -29480,7 +29480,7 @@ func_ov15_02138478: ; 0x02138478 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x78 ldr r2, _02138ba0 ; =data_027e10a4 - ldr r4, _02138ba4 ; =data_027e0fa0 + ldr r4, _02138ba4 ; =gPlayerVel ldr r3, _02138ba8 ; =data_ov15_0218aa28 ldr r2, [r2] str r4, [r3, #0x28] @@ -29505,7 +29505,7 @@ func_ov15_02138478: ; 0x02138478 mov r1, r1, lsl #0x1 ldrsh r5, [r5, r1] rsb r4, r6, #0 - ldr r1, _02138bb4 ; =data_027e0fac + ldr r1, _02138bb4 ; =gPlayerAngle mov r9, r0 ldrsh r0, [r1] add r1, sp, #0x54 @@ -29522,7 +29522,7 @@ func_ov15_02138478: ; 0x02138478 str r4, [sp, #0x4c] str r3, [sp, #0x50] bl func_0202af4c - ldr r0, _02138bb4 ; =data_027e0fac + ldr r0, _02138bb4 ; =gPlayerAngle add r1, sp, #0x48 ldrsh r0, [r0] bl func_0202af4c @@ -29614,7 +29614,7 @@ func_ov15_02138478: ; 0x02138478 movge r0, #0 cmp r0, #0 beq _021386b0 - ldr r0, _02138ba4 ; =data_027e0fa0 + ldr r0, _02138ba4 ; =gPlayerVel mvn r1, #0x5f ldr r2, [r0, #4] cmp r2, r1 @@ -29709,7 +29709,7 @@ _0213879c: add r1, sp, #0x60 mov r3, r2 bl Vec3p_Axpy - ldr ip, _02138ba4 ; =data_027e0fa0 + ldr ip, _02138ba4 ; =gPlayerVel ldr r0, [sp, #0x10] ldr r1, [ip, #4] mov r3, #0 @@ -29720,7 +29720,7 @@ _0213879c: ldrb r0, [r9, #0x26e] cmp r0, #0 beq _02138894 - ldr r0, _02138bb4 ; =data_027e0fac + ldr r0, _02138bb4 ; =gPlayerAngle ldr r10, _02138bb0 ; =data_02050f54 ldrh r0, [r0] ldr r2, [r9, #0x78] @@ -29915,7 +29915,7 @@ _02138b08: mov r2, #0 mla r3, r1, r2, r3 mov r2, r1, asr #0x1f - ldr r1, _02138ba4 ; =data_027e0fa0 + ldr r1, _02138ba4 ; =gPlayerVel adds r4, r4, #0x800 mla r3, r2, r0, r3 adc r0, r3, #0 @@ -29950,11 +29950,11 @@ _02138b78: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 _02138ba0: .word data_027e10a4 -_02138ba4: .word data_027e0fa0 +_02138ba4: .word gPlayerVel _02138ba8: .word data_ov15_0218aa28 _02138bac: .word data_027e0fb0 _02138bb0: .word data_02050f54 -_02138bb4: .word data_027e0fac +_02138bb4: .word gPlayerAngle _02138bb8: .word gPlayerPos _02138bbc: .word gMapManager _02138bc0: .word 0xffffc71c @@ -29986,7 +29986,7 @@ func_ov15_02138bc8: ; 0x02138bc8 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02138c18: ldr r0, _02138f9c ; =gPlayerPos - ldr r1, _02138fa0 ; =data_027e0fa0 + ldr r1, _02138fa0 ; =gPlayerVel mov r2, r0 bl Vec3p_Add add sp, sp, #0xe8 @@ -30001,7 +30001,7 @@ _02138c30: add r1, sp, #0x6c ldr r2, [r2, #0x14] blx r2 - ldr r0, _02138fa0 ; =data_027e0fa0 + ldr r0, _02138fa0 ; =gPlayerVel add r1, sp, #0x6c add r2, sp, #0x60 bl Vec3p_Add @@ -30071,7 +30071,7 @@ _02138c30: ldr r0, [sp, #0x48] ldr r1, [sp, #0x50] bl func_01ffa0f4 - ldr r2, _02138fb4 ; =data_027e0fac + ldr r2, _02138fb4 ; =gPlayerAngle mov r1, r0, lsl #0x10 ldrsh r3, [r2] ldr r2, _02138fb8 ; =data_02050f54 @@ -30118,7 +30118,7 @@ _02138c30: strgt r0, [r4, #0x78] cmp r2, #0 ldrgt r0, [r4, #0x80] - ldr r1, _02138fa0 ; =data_027e0fa0 + ldr r1, _02138fa0 ; =gPlayerVel subgt r0, r0, r2 strgt r0, [r4, #0x80] add r0, sp, #0x48 @@ -30217,12 +30217,12 @@ _02138ed0: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02138f9c: .word gPlayerPos -_02138fa0: .word data_027e0fa0 +_02138fa0: .word gPlayerVel _02138fa4: .word data_027e0ff8 _02138fa8: .word 0x0000ffff _02138fac: .word data_ov15_0218eec0 _02138fb0: .word gMapManager -_02138fb4: .word data_027e0fac +_02138fb4: .word gPlayerAngle _02138fb8: .word data_02050f54 _02138fbc: .word data_027e0f6c _02138fc0: .word data_027e0fb8 @@ -30450,7 +30450,7 @@ _021392b4: _021392cc: cmp r4, #2 bne _021393f4 - ldr r0, _021394f4 ; =data_027e0fac + ldr r0, _021394f4 ; =gPlayerAngle mov r1, #0x5a str r1, [r7, #0x264] ldr r4, _021394f8 ; =0xfffffccd @@ -30490,7 +30490,7 @@ _021392cc: bl func_ov00_0207c2e8 sub r1, r4, #0xa90 str r1, [sp, #0x30] - ldr r1, _021394f4 ; =data_027e0fac + ldr r1, _021394f4 ; =gPlayerAngle ldr r0, _02139504 ; =0x00000829 ldrsh r1, [r1] str r0, [sp, #0x34] @@ -30506,7 +30506,7 @@ _021392cc: bl func_ov00_020b7ea4 rsb r1, r4, #0xa90 str r1, [sp, #0x30] - ldr r1, _021394f4 ; =data_027e0fac + ldr r1, _021394f4 ; =gPlayerAngle ldr r0, _02139504 ; =0x00000829 ldrsh r1, [r1] str r0, [sp, #0x34] @@ -30591,7 +30591,7 @@ _021394dc: _021394e8: .word data_027e0d38 _021394ec: .word data_027e0f64 _021394f0: .word data_027e0fb8 -_021394f4: .word data_027e0fac +_021394f4: .word gPlayerAngle _021394f8: .word 0xfffffccd _021394fc: .word gPlayerPos _02139500: .word data_027e0e58 @@ -31438,7 +31438,7 @@ _0213a0c4: mov r2, #0 bl func_ov09_021154e8 _0213a124: - ldr r0, _0213a148 ; =data_027e0fac + ldr r0, _0213a148 ; =gPlayerAngle ldrsh r0, [r0] strh r0, [r4, #0x8c] add sp, sp, #4 @@ -31448,7 +31448,7 @@ _0213a138: .word data_027e0e58 _0213a13c: .word data_027e0d0c _0213a140: .word data_027e0d38 _0213a144: .word data_027e1094 -_0213a148: .word data_027e0fac +_0213a148: .word gPlayerAngle arm_func_end func_ov15_02139f84 .global func_ov15_0213a14c @@ -31464,12 +31464,12 @@ _0213a158: str r2, [r1, #0x40c] cmp r3, #5 blt _0213a158 - ldr r1, _0213a180 ; =data_027e0fac + ldr r1, _0213a180 ; =gPlayerAngle ldrsh r1, [r1] strh r1, [r0, #0x8c] bx lr .align 2, 0 -_0213a180: .word data_027e0fac +_0213a180: .word gPlayerAngle arm_func_end func_ov15_0213a14c .global func_ov15_0213a184 @@ -31664,7 +31664,7 @@ _0213a404: strne r0, [r5, #0x244] mov r0, r5 bl func_ov15_021356e8 - ldr r0, _0213a47c ; =data_027e0fac + ldr r0, _0213a47c ; =gPlayerAngle ldrsh r0, [r0] strh r0, [r5, #0x8c] ldmia sp!, {r3, r4, r5, pc} @@ -31679,7 +31679,7 @@ _0213a46c: .word data_027e0fb8 _0213a470: .word gPlayerPos _0213a474: .word data_027e0d78 _0213a478: .word data_ov15_02190458 -_0213a47c: .word data_027e0fac +_0213a47c: .word gPlayerAngle arm_func_end func_ov15_0213a184 .global func_ov15_0213a480 @@ -31711,14 +31711,14 @@ _0213a4b0: addeq sp, sp, #8 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} - ldr r1, _0213a4fc ; =data_027e0fac + ldr r1, _0213a4fc ; =gPlayerAngle mov r0, #1 ldrsh r1, [r1] strh r1, [r4, #0x8c] add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0213a4fc: .word data_027e0fac +_0213a4fc: .word gPlayerAngle arm_func_end func_ov15_0213a480 .global func_ov15_0213a500 @@ -33539,7 +33539,7 @@ func_ov15_0213bcc8: ; 0x0213bcc8 add r3, sp, #4 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0213bef0 ; =data_027e0fac + ldr r0, _0213bef0 ; =gPlayerAngle mov r1, r3 ldrsh r0, [r0] bl func_0202af4c @@ -33557,7 +33557,7 @@ func_ov15_0213bcc8: ; 0x0213bcc8 cmp r0, #0x2000 bge _0213bd64 _0213bd38: - ldr r0, _0213bef4 ; =data_027e0fa0 + ldr r0, _0213bef4 ; =gPlayerVel bl Vec3p_Length cmp r0, #0x52 mov r0, r5 @@ -33672,8 +33672,8 @@ _0213bdd8: .align 2, 0 _0213bee8: .word gPlayerPos _0213beec: .word data_ov15_02185f9c -_0213bef0: .word data_027e0fac -_0213bef4: .word data_027e0fa0 +_0213bef0: .word gPlayerAngle +_0213bef4: .word gPlayerVel _0213bef8: .word 0xffffe71c _0213befc: .word data_02050f54 _0213bf00: .word 0x00000133 @@ -33756,7 +33756,7 @@ func_ov15_0213bfe8: ; 0x0213bfe8 add r3, sp, #4 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0213c260 ; =data_027e0fac + ldr r0, _0213c260 ; =gPlayerAngle mov r1, r3 ldrsh r0, [r0] bl func_0202af4c @@ -33850,7 +33850,7 @@ _0213c0ec: mov r0, r0, lsl #0x1 ldrsh r2, [r1, r2] ldrsh r1, [r1, r0] - ldr r0, _0213c274 ; =data_027e0fa0 + ldr r0, _0213c274 ; =gPlayerVel smulbb r1, r2, r1 add r1, r1, #0x800 mov r4, r1, asr #0xc @@ -33908,12 +33908,12 @@ _0213c1ec: .align 2, 0 _0213c258: .word gPlayerPos _0213c25c: .word data_ov15_02185fa8 -_0213c260: .word data_027e0fac +_0213c260: .word gPlayerAngle _0213c264: .word data_027e0764 _0213c268: .word 0x00001c72 _0213c26c: .word 0xfffff1c7 _0213c270: .word data_02050f54 -_0213c274: .word data_027e0fa0 +_0213c274: .word gPlayerVel _0213c278: .word 0x00000133 arm_func_end func_ov15_0213bfe8 @@ -34282,7 +34282,7 @@ func_ov15_0213c788: ; 0x0213c788 sub sp, sp, #0x10 mov r4, r0 bl _ZN5Actor16XzDistanceToLinkEv - ldr r0, _0213cb00 ; =data_027e0fa0 + ldr r0, _0213cb00 ; =gPlayerVel bl Vec3p_Length cmp r0, #0x52 ble _0213c7b4 @@ -34505,7 +34505,7 @@ _0213c9ec: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 -_0213cb00: .word data_027e0fa0 +_0213cb00: .word gPlayerVel _0213cb04: .word data_027e0764 _0213cb08: .word 0x00002001 _0213cb0c: .word gPlayerPos @@ -37877,7 +37877,7 @@ func_ov15_0213f80c: ; 0x0213f80c ldr r0, [sp, #0x9c] str r2, [sp, #0xa0] str r0, [sp, #0xa8] - ldr r0, _0213fb80 ; =data_027e0fac + ldr r0, _0213fb80 ; =gPlayerAngle ldr r2, [sp, #0xb0] ldrsh r3, [r0] orr r2, r2, #1 @@ -38056,7 +38056,7 @@ _0213facc: .align 2, 0 _0213fb78: .word gPlayerPos _0213fb7c: .word gMapManager -_0213fb80: .word data_027e0fac +_0213fb80: .word gPlayerAngle _0213fb84: .word data_027e10a4 _0213fb88: .word 0x00000d9a _0213fb8c: .word data_027e0e58 @@ -39765,7 +39765,7 @@ _0214128c: .word gActorManager .global func_ov15_02141290 arm_func_start func_ov15_02141290 func_ov15_02141290: ; 0x02141290 - ldr r1, _021412ac ; =data_027e0fa0 + ldr r1, _021412ac ; =gPlayerVel mov r2, #0 str r2, [r1] str r2, [r1, #4] @@ -39773,7 +39773,7 @@ func_ov15_02141290: ; 0x02141290 str r2, [r0, #0x78] bx lr .align 2, 0 -_021412ac: .word data_027e0fa0 +_021412ac: .word gPlayerVel arm_func_end func_ov15_02141290 .global func_ov15_021412b0 @@ -39806,7 +39806,7 @@ func_ov15_021412b0: ; 0x021412b0 func_ov15_02141300: ; 0x02141300 ldr r3, [r1] ldr r2, _0214132c ; =gPlayerPos - ldr r0, _02141330 ; =data_027e0fac + ldr r0, _02141330 ; =gPlayerAngle str r3, [r2] ldr r3, [r1, #4] str r3, [r2, #4] @@ -39817,7 +39817,7 @@ func_ov15_02141300: ; 0x02141300 bx lr .align 2, 0 _0214132c: .word gPlayerPos -_02141330: .word data_027e0fac +_02141330: .word gPlayerAngle arm_func_end func_ov15_02141300 .global func_ov15_02141334 @@ -39870,26 +39870,26 @@ _021413b4: ldr r0, [r1, #0x10] tst r0, #2 ldrnesh r1, [r1, #0xc] - ldrne r0, _021413d0 ; =data_027e0fac + ldrne r0, _021413d0 ; =gPlayerAngle strneh r1, [r0] bx lr .align 2, 0 _021413cc: .word gPlayerPos -_021413d0: .word data_027e0fac +_021413d0: .word gPlayerAngle arm_func_end func_ov15_0214138c .global func_ov15_021413d4 arm_func_start func_ov15_021413d4 func_ov15_021413d4: ; 0x021413d4 cmp r1, #0 - ldrne r1, _021413f0 ; =data_027e0fa0 + ldrne r1, _021413f0 ; =gPlayerVel movne r2, #0 strne r2, [r1, #4] ldr ip, _021413f4 ; =func_ov15_02136b34 ldr r1, [r0, #0x30] bx ip .align 2, 0 -_021413f0: .word data_027e0fa0 +_021413f0: .word gPlayerVel _021413f4: .word func_ov15_02136b34 arm_func_end func_ov15_021413d4 @@ -39973,7 +39973,7 @@ func_ov15_021414f8: ; 0x021414f8 stmdb sp!, {r4, lr} mov r4, r0 bl func_ov15_021368b4 - ldr r1, _02141534 ; =data_027e0fa0 + ldr r1, _02141534 ; =gPlayerVel ldr r2, [r1, #4] sub r0, r2, r0 str r0, [r1, #4] @@ -39986,7 +39986,7 @@ func_ov15_021414f8: ; 0x021414f8 str r0, [r4, #0x78] ldmia sp!, {r4, pc} .align 2, 0 -_02141534: .word data_027e0fa0 +_02141534: .word gPlayerVel arm_func_end func_ov15_021414f8 .global func_ov15_02141538 @@ -41844,7 +41844,7 @@ func_ov15_02142c78: ; 0x02142c78 mov r2, ip str r3, [sp, #8] bl Vec3p_Sub - ldr r0, _02142d5c ; =data_027e0fac + ldr r0, _02142d5c ; =gPlayerAngle mov r1, #0x4000 ldrsh r2, [r0] rsb r1, r1, #0 @@ -41885,7 +41885,7 @@ _02142d10: add sp, sp, #0x18 ldmia sp!, {r4, pc} .align 2, 0 -_02142d5c: .word data_027e0fac +_02142d5c: .word gPlayerAngle arm_func_end func_ov15_02142c78 .global func_ov15_02142d60 @@ -42163,7 +42163,7 @@ _021430f8: mov r1, r1, lsl #0x10 mov r1, r1, asr #0x10 bl func_ov00_020a6110 - ldr r1, _021431bc ; =data_027e0fac + ldr r1, _021431bc ; =gPlayerAngle add r0, sp, #0 ldrsh r1, [r1] bl func_ov00_020a61ac @@ -42198,7 +42198,7 @@ _021431a8: add sp, sp, #0x18 ldmia sp!, {r4, pc} .align 2, 0 -_021431bc: .word data_027e0fac +_021431bc: .word gPlayerAngle arm_func_end func_ov15_02142ec4 .global func_ov15_021431c0 @@ -42275,7 +42275,7 @@ func_ov15_0214325c: ; 0x0214325c mov r0, #0x39 sub r2, r2, #0x4000 smulbb r3, r2, r0 - ldr r0, _0214331c ; =data_027e0fac + ldr r0, _0214331c ; =gPlayerAngle str r1, [sp, #8] str r1, [sp, #0xc] ldr r1, _02143320 ; =0xb40b40b5 @@ -42303,7 +42303,7 @@ func_ov15_0214325c: ; 0x0214325c add sp, sp, #0x64 ldmia sp!, {r3, r4, pc} .align 2, 0 -_0214331c: .word data_027e0fac +_0214331c: .word gPlayerAngle _02143320: .word 0xb40b40b5 arm_func_end func_ov15_0214325c @@ -43643,7 +43643,7 @@ _021445a4: _021445f8: mov r0, r4 bl func_ov15_021368b4 - ldr r1, _02144760 ; =data_027e0fa0 + ldr r1, _02144760 ; =gPlayerVel ldr r2, [r1, #4] sub r2, r2, r0 mov r0, r4 @@ -43737,7 +43737,7 @@ _02144754: ldmia sp!, {r4, pc} .align 2, 0 _0214475c: .word gAdventureFlags -_02144760: .word data_027e0fa0 +_02144760: .word gPlayerVel _02144764: .word data_027e0ffc _02144768: .word 0x000003ea _0214476c: .word gMapManager @@ -44075,7 +44075,7 @@ _02144a40: add r0, sp, #0xe4 add r2, r9, #0x358 bl Vec3p_Add - ldr r0, _021457d8 ; =data_027e0fac + ldr r0, _021457d8 ; =gPlayerAngle add r1, r9, #0x300 ldrsh r0, [r0] ldr r3, _021457dc ; =0xfffffccd @@ -44336,7 +44336,7 @@ _02144fdc: add r0, sp, #0xa8 add r2, r9, #0x358 bl Vec3p_Add - ldr r1, _021457d8 ; =data_027e0fac + ldr r1, _021457d8 ; =gPlayerAngle add r0, r9, #0x300 ldrsh r3, [r1] ldr r1, _02145808 ; =0x000003d7 @@ -44394,7 +44394,7 @@ _02144fdc: mov r1, #0x180 str r0, [r9, #0x468] str r1, [r9, #0x460] - ldr r0, _021457d8 ; =data_027e0fac + ldr r0, _021457d8 ; =gPlayerAngle mov r1, #7 ldrsh r2, [r0] mov r0, #0x14 @@ -44716,7 +44716,7 @@ _02145524: ldr r1, _02145838 ; =0x000023b0 add r0, r9, #0x460 bl func_0202b154 - ldr r0, _021457d8 ; =data_027e0fac + ldr r0, _021457d8 ; =gPlayerAngle ldr r1, [r9, #0x464] ldrsh r4, [r0] ldr r0, _0214583c ; =0xffff86dc @@ -44745,7 +44745,7 @@ _02145524: ldr r1, _021457f0 ; =0x0000028f add r0, r0, #0x400 bl Approach_thunk - ldr r0, _021457d8 ; =data_027e0fac + ldr r0, _021457d8 ; =gPlayerAngle ldr r8, [sp, #0x3c] ldrh r2, [r0] ldr r0, [r9, #0x4b8] @@ -44848,7 +44848,7 @@ _02145798: _021457cc: .word data_027e0f64 _021457d0: .word gAdventureFlags _021457d4: .word gPlayerPos -_021457d8: .word data_027e0fac +_021457d8: .word gPlayerAngle _021457dc: .word 0xfffffccd _021457e0: .word gMapManager _021457e4: .word 0xfffffe66 @@ -45012,7 +45012,7 @@ _02145a00: bl func_ov15_0214325c mov r0, r4 bl func_ov15_021368b4 - ldr r2, _02145b60 ; =data_027e0fa0 + ldr r2, _02145b60 ; =gPlayerVel mvn r3, #0x80000000 ldr ip, [r2, #4] mov r1, #0 @@ -45102,7 +45102,7 @@ _02145ac8: _02145b54: .word data_027e0d38 _02145b58: .word data_027e0d78 _02145b5c: .word gAdventureFlags -_02145b60: .word data_027e0fa0 +_02145b60: .word gPlayerVel _02145b64: .word data_ov15_02186154 _02145b68: .word data_ov00_020eec9c _02145b6c: .word data_ov00_020eec68 @@ -54967,7 +54967,7 @@ _0214dd14: str r2, [sp, #0x20] mov r0, #0 str r0, [sp] - ldr r1, _0214e068 ; =data_027e0fac + ldr r1, _0214e068 ; =gPlayerAngle ldr r0, [r3, #4] ldrsh r3, [r1] add r2, sp, #0x1c @@ -55169,7 +55169,7 @@ _0214e02c: .align 2, 0 _0214e060: .word data_027e0f64 _0214e064: .word gPlayerPos -_0214e068: .word data_027e0fac +_0214e068: .word gPlayerAngle _0214e06c: .word data_027e1060 _0214e070: .word data_027e0fb8 _0214e074: .word data_ov09_0211f5b4 @@ -56564,7 +56564,7 @@ _0214f388: ldr r0, _0214f748 ; =0x00001770 str r1, [r4, #0x294] str r0, [r4, #0x284] - ldr r0, _0214f74c ; =data_027e0fac + ldr r0, _0214f74c ; =gPlayerAngle str r2, [r4, #0x288] ldrsh r0, [r0] add sp, sp, #0x224 @@ -56643,7 +56643,7 @@ _0214f510: ldr r0, _0214f750 ; =gPlayer str r3, [sp, #4] ldr r0, [r0] - ldr r1, _0214f74c ; =data_027e0fac + ldr r1, _0214f74c ; =gPlayerAngle ldr ip, [r0] ldrsh r2, [r1] ldr ip, [ip, #0x34] @@ -56785,7 +56785,7 @@ _0214f73c: .word data_027e10a4 _0214f740: .word 0x00001333 _0214f744: .word 0x0000051f _0214f748: .word 0x00001770 -_0214f74c: .word data_027e0fac +_0214f74c: .word gPlayerAngle _0214f750: .word gPlayer arm_func_end func_ov15_0214f1a4 @@ -57129,7 +57129,7 @@ func_ov15_0214fbec: ; 0x0214fbec mov r0, #0x3000 str r0, [r9, #0x220] ldr r1, _0214fe9c ; =0x00001770 - ldr r0, _0214fea0 ; =data_027e0fac + ldr r0, _0214fea0 ; =gPlayerAngle str r1, [r9, #0x21c] ldrsh r0, [r0] mov r2, #0 @@ -57293,7 +57293,7 @@ _0214fe3c: .align 2, 0 _0214fe98: .word data_027e0f64 _0214fe9c: .word 0x00001770 -_0214fea0: .word data_027e0fac +_0214fea0: .word gPlayerAngle arm_func_end func_ov15_0214fbec .global func_ov15_0214fea4 @@ -57301,7 +57301,7 @@ _0214fea0: .word data_027e0fac func_ov15_0214fea4: ; 0x0214fea4 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x24 - ldr r2, _0214ff38 ; =data_027e0fac + ldr r2, _0214ff38 ; =gPlayerAngle ldr r3, [r1, #0x224] ldrsh r1, [r2] ldr ip, _0214ff3c ; =0x000008a4 @@ -57337,7 +57337,7 @@ func_ov15_0214fea4: ; 0x0214fea4 add sp, sp, #0x24 ldmia sp!, {r4, r5, pc} .align 2, 0 -_0214ff38: .word data_027e0fac +_0214ff38: .word gPlayerAngle _0214ff3c: .word 0x000008a4 _0214ff40: .word 0x0000051f _0214ff44: .word gPlayerPos @@ -60271,7 +60271,7 @@ _021525f4: _0215265c: mov r0, r4 bl func_ov15_021368b4 - ldr r1, _02152690 ; =data_027e0fa0 + ldr r1, _02152690 ; =gPlayerVel ldr r2, [r1, #4] sub r2, r2, r0 mov r0, r4 @@ -60283,7 +60283,7 @@ _0215265c: _02152684: .word gAdventureFlags _02152688: .word gMapManager _0215268c: .word data_027e0d38 -_02152690: .word data_027e0fa0 +_02152690: .word gPlayerVel arm_func_end func_ov15_02152560 .global func_ov15_02152694 @@ -60665,7 +60665,7 @@ _02152b98: ldr r0, [r5, #0x3f0] cmp r0, #0 beq _02152d1c - ldr r1, _02153474 ; =data_027e0fac + ldr r1, _02153474 ; =gPlayerAngle ldr r11, _02153478 ; =data_02050f54 ldrsh r3, [r1] ldr r0, _0215347c ; =0xfffffd9a @@ -60942,7 +60942,7 @@ _02152fa8: ldr r0, [r5, #0x3f0] cmp r0, #0 bne _021530c4 - ldr r0, _02153474 ; =data_027e0fac + ldr r0, _02153474 ; =gPlayerAngle ldr r4, _02153478 ; =data_02050f54 ldrsh r0, [r0] ldr r1, _02153468 ; =gPlayerPos @@ -61241,7 +61241,7 @@ _02153464: .word gActorManager _02153468: .word gPlayerPos _0215346c: .word gAdventureFlags _02153470: .word data_027e0f64 -_02153474: .word data_027e0fac +_02153474: .word gPlayerAngle _02153478: .word data_02050f54 _0215347c: .word 0xfffffd9a _02153480: .word 0x000004aa @@ -61877,7 +61877,7 @@ _02153d0c: _02153d74: add r0, sp, #0x6c bl func_01ff80d4 - ldr r0, _02153f80 ; =data_027e0fac + ldr r0, _02153f80 ; =gPlayerAngle ldr r3, _02153f84 ; =data_02050f54 ldrh r1, [r0] add r0, sp, #0xc @@ -61960,7 +61960,7 @@ _02153d74: add r0, sp, #0x48 add r2, r5, #0x358 bl Vec3p_Add - ldr r1, _02153f80 ; =data_027e0fac + ldr r1, _02153f80 ; =gPlayerAngle add r0, r5, #0x4c ldrsh r1, [r1] add r3, r5, #0x300 @@ -62007,7 +62007,7 @@ _02153f70: .word 0x000004cd _02153f74: .word 0xfffff8e1 _02153f78: .word gMapManager _02153f7c: .word data_027e0d38 -_02153f80: .word data_027e0fac +_02153f80: .word gPlayerAngle _02153f84: .word data_02050f54 _02153f88: .word data_ov15_021863a8 _02153f8c: .word data_ov15_021863bc @@ -62058,7 +62058,7 @@ func_ov15_02153f94: ; 0x02153f94 add r0, sp, #0x30 add r2, r5, #0x358 bl Vec3p_Add - ldr r0, _02154188 ; =data_027e0fac + ldr r0, _02154188 ; =gPlayerAngle add r1, r5, #0x300 ldrsh r2, [r0] add r0, r5, #0x4c @@ -62143,7 +62143,7 @@ _02154178: .word gActorManager _0215417c: .word gPlayerPos _02154180: .word gMapManager _02154184: .word 0x000003d7 -_02154188: .word data_027e0fac +_02154188: .word gPlayerAngle _0215418c: .word data_ov15_021863bc _02154190: .word 0x0000019a _02154194: .word data_ov15_021863a8 @@ -62580,14 +62580,14 @@ _021547ac: strb r0, [r4, #0x291] strb r0, [r4, #0x443] _021547b8: - ldr r0, _021548b8 ; =data_027e0fa0 + ldr r0, _021548b8 ; =gPlayerVel mov r1, #0 str r1, [r0] str r1, [r0, #8] _021547c8: mov r0, r4 bl func_ov15_021368b4 - ldr r2, _021548b8 ; =data_027e0fa0 + ldr r2, _021548b8 ; =gPlayerVel mvn r3, #0x80000000 ldr ip, [r2, #4] mov r1, #0 @@ -62654,7 +62654,7 @@ _02154888: ldmia sp!, {r3, r4, pc} .align 2, 0 _021548b4: .word data_027e0d78 -_021548b8: .word data_027e0fa0 +_021548b8: .word gPlayerVel _021548bc: .word data_ov00_020eec9c _021548c0: .word 0x0000041d arm_func_end func_ov15_02154704 @@ -62693,7 +62693,7 @@ func_ov15_021548c4: ; 0x021548c4 movgt r5, r2 cmp r5, #0x2000 movgt r5, #0x2000 - ldr r1, _02154a68 ; =data_027e0fac + ldr r1, _02154a68 ; =gPlayerAngle add r0, r6, #0x300 ldrsh r2, [r1] add r1, r6, #0x39c @@ -62768,7 +62768,7 @@ func_ov15_021548c4: ; 0x021548c4 add sp, sp, #0x54 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02154a68: .word data_027e0fac +_02154a68: .word gPlayerAngle _02154a6c: .word gPlayerPos arm_func_end func_ov15_021548c4 @@ -62892,7 +62892,7 @@ func_ov15_02154ba4: ; 0x02154ba4 ldrb r0, [r4, #0x448] cmp r0, #0 beq _02154c40 - ldr r0, _02155208 ; =data_027e0fa0 + ldr r0, _02155208 ; =gPlayerVel add r2, sp, #0x1c ldr r3, [r0] ldr r1, [r0, #4] @@ -63294,7 +63294,7 @@ _021551dc: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 _02155204: .word gActorManager -_02155208: .word data_027e0fa0 +_02155208: .word gPlayerVel _0215520c: .word gPlayerPos _02155210: .word data_027e0d78 _02155214: .word data_02050f54 @@ -67418,7 +67418,7 @@ _021589f8: str r1, [r5, #0x48] add r1, r3, r2 str r1, [r5, #0x50] - ldr r0, _02158cc0 ; =data_027e0fac + ldr r0, _02158cc0 ; =gPlayerAngle add r1, r5, #0x48 ldrsh r2, [r0] ldr r0, _02158cc4 ; =data_027e0c68 @@ -67568,7 +67568,7 @@ _02158cb0: .word data_027e0d0c _02158cb4: .word data_027e0764 _02158cb8: .word data_02050f54 _02158cbc: .word gPlayerPos -_02158cc0: .word data_027e0fac +_02158cc0: .word gPlayerAngle _02158cc4: .word data_027e0c68 _02158cc8: .word gMapManager _02158ccc: .word data_ov15_0218c384 @@ -68053,7 +68053,7 @@ _021593a4: .word gPlayerPos arm_func_start func_ov15_021593a8 func_ov15_021593a8: ; 0x021593a8 stmdb sp!, {r4, lr} - ldr r1, _021593f4 ; =data_027e0fac + ldr r1, _021593f4 ; =gPlayerAngle mov r4, r0 ldrsh r1, [r1] add r0, r4, #0x200 @@ -68073,7 +68073,7 @@ _021593e4: bl func_ov15_021588e4 ldmia sp!, {r4, pc} .align 2, 0 -_021593f4: .word data_027e0fac +_021593f4: .word gPlayerAngle arm_func_end func_ov15_021593a8 .global func_ov15_021593f8 @@ -68699,7 +68699,7 @@ _02159c84: sub r1, r2, r1 strh r1, [r0, #0xea] _02159c90: - ldr r1, _02159d74 ; =data_027e0fac + ldr r1, _02159d74 ; =gPlayerAngle mov r0, r6 ldrsh r5, [r1] bl _ZN5Actor14GetAngleToLinkEv @@ -68757,7 +68757,7 @@ _02159c90: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02159d70: .word 0x00000444 -_02159d74: .word data_027e0fac +_02159d74: .word gPlayerAngle _02159d78: .word 0x00001c72 _02159d7c: .word gActorManager arm_func_end func_ov15_02159bec @@ -72165,7 +72165,7 @@ func_ov15_0215cc30: ; 0x0215cc30 str r2, [sp, #0x20] ldr r8, [r4] ldr r6, _0215cee8 ; =0x00001333 - ldr r1, _0215ceec ; =data_027e0fac + ldr r1, _0215ceec ; =gPlayerAngle umull r9, r0, r8, r6 mov r7, #0 ldrh r10, [r1] @@ -72319,7 +72319,7 @@ _0215ced0: .align 2, 0 _0215cee4: .word gPlayerPos _0215cee8: .word 0x00001333 -_0215ceec: .word data_027e0fac +_0215ceec: .word gPlayerAngle _0215cef0: .word data_02050f54 _0215cef4: .word data_027e0764 arm_func_end func_ov15_0215cc30 @@ -79927,7 +79927,7 @@ _0216374c: beq _02163854 b _0216391c _02163774: - ldr r1, _02163c6c ; =data_027e0fac + ldr r1, _02163c6c ; =gPlayerAngle add r0, r4, #0x78 ldrsh r1, [r1] mov r2, #0x16c @@ -80255,7 +80255,7 @@ _02163c5c: .word 0x544f5044 _02163c60: .word 0x0000019a _02163c64: .word func_ov15_0216199c _02163c68: .word data_027e0e58 -_02163c6c: .word data_027e0fac +_02163c6c: .word gPlayerAngle _02163c70: .word data_027e0ff8 _02163c74: .word 0x0000038e _02163c78: .word data_027e0f64 @@ -81337,7 +81337,7 @@ func_ov15_02164c0c: ; 0x02164c0c stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x18 bl _ZN5Actor14GetAngleToLinkEv - ldr r1, _02164cbc ; =data_027e0fac + ldr r1, _02164cbc ; =gPlayerAngle add r0, r0, #0x8000 mov r0, r0, lsl #0x10 ldrsh r1, [r1] @@ -81354,7 +81354,7 @@ func_ov15_02164c0c: ; 0x02164c0c mov r0, #0 mov r2, #4 bl func_020078f4 - ldr r1, _02164cbc ; =data_027e0fac + ldr r1, _02164cbc ; =gPlayerAngle add r0, sp, #0 ldrsh r3, [r1] mov r1, r4 @@ -81380,7 +81380,7 @@ _02164cb0: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02164cbc: .word data_027e0fac +_02164cbc: .word gPlayerAngle _02164cc0: .word data_027e10a4 arm_func_end func_ov15_02164c0c @@ -84926,7 +84926,7 @@ _02167b58: addeq sp, sp, #0x14 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, pc} - ldr r1, _02167d28 ; =data_027e0fac + ldr r1, _02167d28 ; =gPlayerAngle str r0, [r4, #0x1a4] ldrsh r5, [r1] bl _ZN5Actor14GetAngleToLinkEv @@ -84966,7 +84966,7 @@ _02167c1c: ldr r2, [r0, #4] str r2, [r4, #0x4c] ldr r2, [r0, #8] - ldr r0, _02167d28 ; =data_027e0fac + ldr r0, _02167d28 ; =gPlayerAngle str r2, [r4, #0x50] str r1, [r4, #0x2f8] str r1, [r4, #0x2f0] @@ -85028,7 +85028,7 @@ _02167d18: .word gActorManager _02167d1c: .word data_02050f54 _02167d20: .word data_027e0c68 _02167d24: .word 0x49434247 -_02167d28: .word data_027e0fac +_02167d28: .word gPlayerAngle _02167d2c: .word gPlayerPos arm_func_end func_ov15_02167960 @@ -85058,7 +85058,7 @@ _02167d74: bl _ZN5Actor16XzDistanceToLinkEv str r0, [r7, #0x2f4] ldr r1, [r7, #0x4c] - ldr r0, _02167f00 ; =data_027e0fac + ldr r0, _02167f00 ; =gPlayerAngle str r1, [r7, #0x2f0] ldrsh r4, [r0] mov r0, r7 @@ -85067,7 +85067,7 @@ _02167d74: sub r1, r0, r4 add r0, r7, #0x300 strh r1, [r0, #0xa] - ldr r1, _02167f00 ; =data_027e0fac + ldr r1, _02167f00 ; =gPlayerAngle ldrsh r2, [r0, #0xa] ldrsh r1, [r1] add r1, r2, r1 @@ -85161,7 +85161,7 @@ _02167ef0: str r6, [r7, #0x130] ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 -_02167f00: .word data_027e0fac +_02167f00: .word gPlayerAngle _02167f04: .word gPlayerPos _02167f08: .word 0x0000019a _02167f0c: .word data_027e0ffc @@ -85190,7 +85190,7 @@ _02167f4c: ldr r1, [r4, #0x2f4] cmp r1, #0x1000 bge _02167fa4 - ldr r1, _02168340 ; =data_027e0fac + ldr r1, _02168340 ; =gPlayerAngle ldrsh r5, [r1] bl _ZN5Actor14GetAngleToLinkEv add r0, r0, #0x8000 @@ -85453,7 +85453,7 @@ _02168338: add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02168340: .word data_027e0fac +_02168340: .word gPlayerAngle _02168344: .word gPlayerPos _02168348: .word data_02050f54 _0216834c: .word gMapManager @@ -85724,7 +85724,7 @@ func_ov15_02168700: ; 0x02168700 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x18 mov r5, r0 - ldr r1, _02168878 ; =data_027e0fac + ldr r1, _02168878 ; =gPlayerAngle add r0, r5, #0x300 ldrsh r3, [r0, #0xa] ldrsh r0, [r1] @@ -85818,7 +85818,7 @@ _02168770: add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02168878: .word data_027e0fac +_02168878: .word gPlayerAngle _0216887c: .word gActorManager _02168880: .word data_02050f54 _02168884: .word 0x0000019a @@ -93622,7 +93622,7 @@ _0216f134: str r1, [sp, #0x10] str r0, [sp, #0x14] _0216f158: - ldr r1, _0216f31c ; =data_027e0fac + ldr r1, _0216f31c ; =gPlayerAngle add r0, sp, #0xc ldrsh r1, [r1] strh r1, [r4, #0x78] @@ -93740,7 +93740,7 @@ _0216f2b4: ldmia sp!, {r4, pc} .align 2, 0 _0216f318: .word data_027e10a4 -_0216f31c: .word data_027e0fac +_0216f31c: .word gPlayerAngle _0216f320: .word gPlayerPos _0216f324: .word gAdventureFlags _0216f328: .word 0x55555556 @@ -94767,7 +94767,7 @@ _021700a4: mov r2, #0x6000 str r1, [r5, #0x48] ldr r3, [r0, #4] - ldr r1, _02170640 ; =data_027e0fac + ldr r1, _02170640 ; =gPlayerAngle str r3, [r5, #0x4c] ldr r0, [r0, #8] ldr r7, _02170644 ; =data_02050f54 @@ -94881,7 +94881,7 @@ _021700a4: bl func_ov15_0217d59c _0217029c: mov r7, #0 - ldr r0, _02170640 ; =data_027e0fac + ldr r0, _02170640 ; =gPlayerAngle str r7, [r5, #0x534] ldrsh r0, [r0] add r1, r5, #0x500 @@ -95118,7 +95118,7 @@ _02170630: .word gPlayerPos _02170634: .word data_027e0f64 _02170638: .word gAdventureFlags _0217063c: .word data_027e10a4 -_02170640: .word data_027e0fac +_02170640: .word gPlayerAngle _02170644: .word data_02050f54 _02170648: .word 0xffffd738 _0217064c: .word data_027e0d3c @@ -96544,7 +96544,7 @@ func_ov15_02171aa8: ; 0x02171aa8 stmia r3, {r0, r1, r2} ldr r2, [sp, #0x1c] ldr r1, [sp, #0x24] - ldr r3, _02171ec8 ; =data_027e0fac + ldr r3, _02171ec8 ; =gPlayerAngle str r2, [sp, #0x10] str r1, [sp, #0x18] ldr r0, [r4, #0x544] @@ -96808,7 +96808,7 @@ _02171e98: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02171ec4: .word gPlayerPos -_02171ec8: .word data_027e0fac +_02171ec8: .word gPlayerAngle _02171ecc: .word data_02050f54 _02171ed0: .word 0x00001dde arm_func_end func_ov15_02171aa8 @@ -98469,7 +98469,7 @@ func_ov15_021735a8: ; 0x021735a8 ldr r0, _02173708 ; =0x00001770 str r1, [r4, #0x14] str r0, [r4, #0xc] - ldr r0, _0217370c ; =data_027e0fac + ldr r0, _0217370c ; =gPlayerAngle ldr r3, _02173710 ; =0x000008a4 ldrsh r1, [r0] mov r2, #0x214 @@ -98544,7 +98544,7 @@ _021736e4: .align 2, 0 _02173704: .word gPlayerPos _02173708: .word 0x00001770 -_0217370c: .word data_027e0fac +_0217370c: .word gPlayerAngle _02173710: .word 0x000008a4 _02173714: .word 0xfffffae1 _02173718: .word gMapManager @@ -100504,7 +100504,7 @@ _02174fbc: ldmeqia sp!, {r4, r5, r6, pc} add r0, sp, #0x28 bl func_01ffbe34 - ldr r0, _0217527c ; =data_027e0fac + ldr r0, _0217527c ; =gPlayerAngle mov ip, #2 ldrsh r0, [r0] mov r3, #1 @@ -100667,7 +100667,7 @@ _0217511c: _02175270: .word data_027e0d38 _02175274: .word data_027e0d3c _02175278: .word gPlayerPos -_0217527c: .word data_027e0fac +_0217527c: .word gPlayerAngle _02175280: .word data_02050f54 _02175284: .word data_027e1054 _02175288: .word data_02063e4c @@ -100778,7 +100778,7 @@ _021753f0: str r1, [r0, #0x1ac] _021753fc: ldr r0, [r5, #0x20] - ldr r1, _0217543c ; =data_027e0fac + ldr r1, _0217543c ; =gPlayerAngle ldr r4, [r0] ldrsh r3, [r1] ldr r4, [r4, #0xc] @@ -100794,7 +100794,7 @@ _021753fc: .align 2, 0 _02175434: .word 0x66666667 _02175438: .word data_027e0e5c -_0217543c: .word data_027e0fac +_0217543c: .word gPlayerAngle arm_func_end func_ov15_021752a0 .global func_ov15_02175440 @@ -101177,7 +101177,7 @@ _02175994: ldmia r0, {r0, r1, r2} stmia r7, {r0, r1, r2} ldr r1, [r6, #0x84] - ldr r0, _02175b4c ; =data_027e0fac + ldr r0, _02175b4c ; =gPlayerAngle str r1, [sp, #0x30] ldrsh r7, [r6, #0x8e] ldrsh r1, [r0] @@ -101237,8 +101237,8 @@ _02175994: add r1, r2, r1 str r1, [r0, #0x30] _02175ad4: - ldr r0, _02175b54 ; =data_027e0fa0 - ldr r1, _02175b4c ; =data_027e0fac + ldr r0, _02175b54 ; =gPlayerVel + ldr r1, _02175b4c ; =gPlayerAngle ldr r2, [r0, #4] ldr r3, [r6, #0x78] mov r0, r2, asr #0x2 @@ -101268,9 +101268,9 @@ _02175b3c: .word gPlayer _02175b40: .word data_ov15_02186d10 _02175b44: .word data_ov15_02186d1c _02175b48: .word data_ov15_02186d28 -_02175b4c: .word data_027e0fac +_02175b4c: .word gPlayerAngle _02175b50: .word 0x00000e66 -_02175b54: .word data_027e0fa0 +_02175b54: .word gPlayerVel arm_func_end func_ov15_02175440 .global func_ov15_02175b58 @@ -101352,7 +101352,7 @@ func_ov15_02175ba8: ; 0x02175ba8 add r1, sp, #0x24 mov r2, r4 bl func_01ff8690 - ldr r1, _02175cc0 ; =data_027e0fac + ldr r1, _02175cc0 ; =gPlayerAngle ldr r3, _02175cb8 ; =data_02050f54 ldrh r1, [r1] add r0, sp, #0 @@ -101373,7 +101373,7 @@ func_ov15_02175ba8: ; 0x02175ba8 .align 2, 0 _02175cb8: .word data_02050f54 _02175cbc: .word data_027e0fb0 -_02175cc0: .word data_027e0fac +_02175cc0: .word gPlayerAngle arm_func_end func_ov15_02175ba8 .global func_ov15_02175cc4 @@ -105506,7 +105506,7 @@ _021796b0: .word data_ov15_0218ddc4 func_ov15_021796b4: ; 0x021796b4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0xc - ldr r1, _021797c0 ; =data_027e0fac + ldr r1, _021797c0 ; =gPlayerAngle mov r4, r0 ldrsh r3, [r1] add r1, r4, #0x400 @@ -105572,7 +105572,7 @@ func_ov15_021796b4: ; 0x021796b4 add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_021797c0: .word data_027e0fac +_021797c0: .word gPlayerAngle _021797c4: .word data_027e0764 _021797c8: .word 0x00004001 _021797cc: .word gPlayerPos @@ -105789,7 +105789,7 @@ _02179ac4: .word data_ov15_0218ddfc func_ov15_02179ac8: ; 0x02179ac8 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x14 - ldr r3, _02179d54 ; =data_027e0fac + ldr r3, _02179d54 ; =gPlayerAngle mov r6, r0 add r2, r6, #0x400 ldrsh r4, [r3] @@ -105944,7 +105944,7 @@ _02179bc4: add r0, r3, r1 bl func_01ff9958 str r0, [r6, #0x44c] - ldr r1, _02179d54 ; =data_027e0fac + ldr r1, _02179d54 ; =gPlayerAngle add r0, r6, #0x78 ldrsh r1, [r1] mov r2, #0xb6 @@ -105952,7 +105952,7 @@ _02179bc4: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02179d54: .word data_027e0fac +_02179d54: .word gPlayerAngle _02179d58: .word 0x0000019a _02179d5c: .word data_02050f54 _02179d60: .word gPlayerPos @@ -108907,7 +108907,7 @@ _0217c530: blt _0217c530 b _0217c63c _0217c554: - ldr r0, _0217c670 ; =data_027e0fac + ldr r0, _0217c670 ; =gPlayerAngle add r1, r8, #0x200 ldrsh r2, [r0] mov r0, r8 @@ -108982,7 +108982,7 @@ _0217c660: .word data_027e0d0c _0217c664: .word data_ov15_02187038 _0217c668: .word data_02050f54 _0217c66c: .word data_ov15_02187050 -_0217c670: .word data_027e0fac +_0217c670: .word gPlayerAngle _0217c674: .word 0x00000666 _0217c678: .word gPlayerPos arm_func_end func_ov15_0217c228 @@ -109262,7 +109262,7 @@ func_ov15_0217ca04: ; 0x0217ca04 str r3, [r4, #0x4c] bl Approach_thunk add r2, r4, #0x200 - ldr r0, _0217cea4 ; =data_027e0fac + ldr r0, _0217cea4 ; =gPlayerAngle ldrh r3, [r2, #0xe6] ldrsh r5, [r0] ldrsh r6, [r2, #0xe4] @@ -109518,7 +109518,7 @@ _0217ce00: add r1, r4, #0x2d0 str r3, [r4, #0x64] bl Vec3p_Add - ldr r0, _0217cea4 ; =data_027e0fac + ldr r0, _0217cea4 ; =gPlayerAngle add r2, r4, #0x200 ldrsh r3, [r0] add r1, sp, #0x20 @@ -109553,7 +109553,7 @@ _0217ce00: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 _0217cea0: .word 0x0000019a -_0217cea4: .word data_027e0fac +_0217cea4: .word gPlayerAngle _0217cea8: .word gPlayerPos _0217ceac: .word data_02050f54 _0217ceb0: .word 0x000004cd @@ -109662,7 +109662,7 @@ _0217d01c: .word data_ov15_02187048 func_ov15_0217d020: ; 0x0217d020 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x20 - ldr r2, _0217d204 ; =data_027e0fac + ldr r2, _0217d204 ; =gPlayerAngle mov r5, r0 add ip, r5, #0x200 ldrsh r3, [r2] @@ -109783,7 +109783,7 @@ _0217d16c: add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0217d204: .word data_027e0fac +_0217d204: .word gPlayerAngle _0217d208: .word gPlayerPos _0217d20c: .word data_02050f54 _0217d210: .word data_027e0e58 @@ -113996,7 +113996,7 @@ _02180a1c: bl func_02036ce4 b _02180ab8 _02180a3c: - ldr r1, _02180aec ; =data_027e0fac + ldr r1, _02180aec ; =gPlayerAngle str r0, [r5, #0x388] ldrsh r2, [r1] add r1, r5, #0x300 @@ -114042,7 +114042,7 @@ _02180adc: .word gAdventureFlags _02180ae0: .word data_027e0764 _02180ae4: .word data_027e0c68 _02180ae8: .word 0x00050048 -_02180aec: .word data_027e0fac +_02180aec: .word gPlayerAngle arm_func_end func_ov15_021803ac .global func_ov15_02180af0 @@ -114328,7 +114328,7 @@ _02180e68: str r1, [sp, #0x50] bl Vec3p_Length mov r5, r0 - ldr r2, _02181364 ; =data_027e0fac + ldr r2, _02181364 ; =gPlayerAngle ldr r0, [sp, #0x4c] ldr r1, [sp, #0x54] ldrsh r6, [r2] @@ -114582,7 +114582,7 @@ _021811d8: str r1, [sp, #0x18] str r0, [r4, #0x330] ldr r0, [sp, #0x18] - ldr r1, _02181364 ; =data_027e0fac + ldr r1, _02181364 ; =gPlayerAngle str r0, [r4, #0x334] ldr r2, [sp, #0x1c] add r0, r4, #0x300 @@ -114644,7 +114644,7 @@ _02181338: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 _02181360: .word gPlayerPos -_02181364: .word data_027e0fac +_02181364: .word gPlayerAngle _02181368: .word 0x0000019a _0218136c: .word data_ov15_0218e8c8 _02181370: .word data_02050f54 @@ -115330,7 +115330,7 @@ func_ov15_02181cb8: ; 0x02181cb8 add r3, sp, #0x38 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r3, _02181ea4 ; =data_027e0fac + ldr r3, _02181ea4 ; =gPlayerAngle add r5, sp, #0x24 add r1, sp, #0x34 mov r0, #0 @@ -115446,7 +115446,7 @@ _02181e8c: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 _02181ea0: .word gPlayerPos -_02181ea4: .word data_027e0fac +_02181ea4: .word gPlayerAngle _02181ea8: .word gActorManager _02181eac: .word 0x00000aab _02181eb0: .word 0x0000025d @@ -115483,7 +115483,7 @@ func_ov15_02181ecc: ; 0x02181ecc add r3, sp, #0x40 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r3, _021820f4 ; =data_027e0fac + ldr r3, _021820f4 ; =gPlayerAngle add r5, sp, #0x2c add r1, sp, #0x3c mov r0, #0 @@ -115608,7 +115608,7 @@ _02181f9c: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 _021820f0: .word gPlayerPos -_021820f4: .word data_027e0fac +_021820f4: .word gPlayerAngle _021820f8: .word gActorManager _021820fc: .word 0x00000aab _02182100: .word 0x0000025d @@ -116016,7 +116016,7 @@ func_ov15_021826ac: ; 0x021826ac ldr r0, _021827f8 ; =0x00001770 str r1, [r4, #0x14] str r0, [r4, #0xc] - ldr r0, _021827fc ; =data_027e0fac + ldr r0, _021827fc ; =gPlayerAngle ldr r3, _02182800 ; =0x000008a4 ldrsh r1, [r0] mov r2, #0x214 @@ -116086,7 +116086,7 @@ _021827a8: .align 2, 0 _021827f4: .word gPlayerPos _021827f8: .word 0x00001770 -_021827fc: .word data_027e0fac +_021827fc: .word gPlayerAngle _02182800: .word 0x000008a4 _02182804: .word 0xfffffae1 _02182808: .word gMapManager diff --git a/asm/ov17.inc b/asm/ov17.inc index b72d0c1a..3fea6450 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -99,7 +99,7 @@ .extern data_027e0f84 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern data_027e0fc4 .extern gPlayerLink diff --git a/asm/ov17.s b/asm/ov17.s index a84dbc42..3a938a25 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -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 diff --git a/asm/ov19.inc b/asm/ov19.inc index 3998823c..8a0523f0 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -120,7 +120,7 @@ .extern data_027e0f84 .extern gPlayer .extern gPlayerPos -.extern data_027e0fa0 +.extern gPlayerVel .extern data_027e0fb8 .extern gPlayerLink .extern data_027e0fe0 diff --git a/asm/ov19.s b/asm/ov19.s index 84534dbb..7b5110c2 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -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 diff --git a/asm/ov20.inc b/asm/ov20.inc index 5f55413b..8f6bc943 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -112,7 +112,7 @@ .extern data_027e0f84 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov20.s b/asm/ov20.s index f7887939..73a96da2 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -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 diff --git a/asm/ov22.inc b/asm/ov22.inc index ea627850..12f03bd5 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -115,7 +115,7 @@ .extern data_027e0f84 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gPlayerLink .extern data_027e0fd4 diff --git a/asm/ov22.s b/asm/ov22.s index 90d7bcdb..896f6cb1 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -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 diff --git a/asm/ov23.inc b/asm/ov23.inc index 54aacb98..083dcfda 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -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 diff --git a/asm/ov23.s b/asm/ov23.s index 8c1392eb..8fec3194 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -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 diff --git a/asm/ov25.inc b/asm/ov25.inc index 76229273..359505bb 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -115,7 +115,7 @@ .extern data_027e0f84 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gPlayerLink .extern data_027e0fe0 diff --git a/asm/ov25.s b/asm/ov25.s index 23151e23..6208a813 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -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 diff --git a/asm/ov26.inc b/asm/ov26.inc index ea17f32d..0053a816 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -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 diff --git a/asm/ov26.s b/asm/ov26.s index dbcbed3a..59e8d623 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -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 diff --git a/asm/ov27.inc b/asm/ov27.inc index e9f2833a..427c103d 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -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 diff --git a/asm/ov27.s b/asm/ov27.s index 01f087f5..494fabbb 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -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 diff --git a/asm/ov29.inc b/asm/ov29.inc index b4cd52c4..cde3bcb6 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -96,7 +96,7 @@ .extern data_027e0f84 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gPlayerLink .extern data_027e0fe0 diff --git a/asm/ov29.s b/asm/ov29.s index 046f26ce..918e9e26 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -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 diff --git a/asm/ov32.inc b/asm/ov32.inc index 97cfad9d..eaac9c70 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -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 diff --git a/asm/ov32.s b/asm/ov32.s index 58bacd82..e6840118 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -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 diff --git a/asm/ov33.inc b/asm/ov33.inc index 0210fd71..96dd8881 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -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 diff --git a/asm/ov33.s b/asm/ov33.s index 9e5e5033..3de4821f 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -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 diff --git a/asm/ov35.inc b/asm/ov35.inc index f027552c..5e303a2c 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -94,7 +94,7 @@ .extern data_027e0f64 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gPlayerLink .extern data_027e0fcc diff --git a/asm/ov35.s b/asm/ov35.s index b0dafc46..bd427b05 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -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 diff --git a/asm/ov36.inc b/asm/ov36.inc index c0365cf3..9576d4fc 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -81,7 +81,7 @@ .extern data_027e0f6c .extern gPlayer .extern gPlayerPos -.extern data_027e0fa0 +.extern gPlayerVel .extern gPlayerLink .extern data_027e0fcc .extern data_027e0fd4 diff --git a/asm/ov36.s b/asm/ov36.s index 7b2caa5d..b46fb7d5 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -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 diff --git a/asm/ov37.inc b/asm/ov37.inc index 144bf70a..9305436c 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -83,7 +83,7 @@ .extern data_027e0f6c .extern gPlayer .extern gPlayerPos -.extern data_027e0fa0 +.extern gPlayerVel .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov37.s b/asm/ov37.s index c9b2bc87..50f77bc0 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -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 diff --git a/asm/ov39.inc b/asm/ov39.inc index f6caa703..deced3af 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -84,7 +84,7 @@ .extern data_027e0f64 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fb8 .extern gPlayerLink .extern data_027e0fe0 diff --git a/asm/ov39.s b/asm/ov39.s index 5a08843b..8e4edfc6 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -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 diff --git a/asm/ov41.inc b/asm/ov41.inc index cf85084e..675e3839 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -85,7 +85,7 @@ .extern data_027e0f78 .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern gPlayerLink .extern data_027e0fd0 .extern data_027e0fe0 diff --git a/asm/ov41.s b/asm/ov41.s index bc532d27..6519040e 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -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 diff --git a/asm/ov43.inc b/asm/ov43.inc index 54c5f95b..0e79cbaa 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -67,7 +67,7 @@ .extern data_027e0f6c .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov43.s b/asm/ov43.s index f58d0bf7..00871499 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -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 diff --git a/asm/ov48.inc b/asm/ov48.inc index 4e215910..17a83e09 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -136,7 +136,7 @@ .extern gMapManager .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern data_027e0fe0 .extern gActorManager .extern data_027e0fe8 diff --git a/asm/ov48.s b/asm/ov48.s index 1b7914bd..5b9c6dbb 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -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 diff --git a/asm/ov50.inc b/asm/ov50.inc index 2898298a..d3b0c055 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -81,7 +81,7 @@ .extern data_027e0f6c .extern gPlayer .extern gPlayerPos -.extern data_027e0fac +.extern gPlayerAngle .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov50.s b/asm/ov50.s index 5724e332..c22d8be6 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -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 diff --git a/asm/ov52.inc b/asm/ov52.inc index 1e1284da..6d69e647 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -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 diff --git a/asm/ov52.s b/asm/ov52.s index 23aef35d..9ec3a52b 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -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 diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index 3272af25..f618f740 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -62,3 +62,5 @@ public: extern PlayerBase *gPlayer; extern Vec3p gPlayerPos; +extern Vec3p gPlayerVel; +extern s16 gPlayerAngle;