diff --git a/asm/dtcm.s b/asm/dtcm.s index 1f98eafd..688be4ea 100644 --- a/asm/dtcm.s +++ b/asm/dtcm.s @@ -3987,8 +3987,8 @@ data_027e0fb0: .global gItemManager gItemManager: .space 0x4 - .global data_027e0fb8 -data_027e0fb8: + .global gPlayerControl +gPlayerControl: .space 0x4 .global gHealthManager gHealthManager: diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index ce5c2de4..93f479d8 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -29,7 +29,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern gActorManager .extern data_027e103c diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 43d61e13..ece7c3a0 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -1610,7 +1610,7 @@ _ZN5Actor16CollidesWithLinkEv: ; 0x020c27e4 .global _ZN5Actor16IsFollowedByLinkEv arm_func_start _ZN5Actor16IsFollowedByLinkEv _ZN5Actor16IsFollowedByLinkEv: ; 0x020c281c - ldr r1, _020c283c ; =data_027e0fb8 + ldr r1, _020c283c ; =gPlayerControl ldr r2, [r0, #8] ldr r0, [r1] ldr r0, [r0, #0x84] @@ -1619,7 +1619,7 @@ _ZN5Actor16IsFollowedByLinkEv: ; 0x020c281c movne r0, #0 bx lr .align 2, 0 -_020c283c: .word data_027e0fb8 +_020c283c: .word gPlayerControl arm_func_end _ZN5Actor16IsFollowedByLinkEv .global _ZN5Actor14StopLinkFollowEv @@ -1629,12 +1629,12 @@ _ZN5Actor14StopLinkFollowEv: ; 0x020c2840 bl _ZN5Actor16IsFollowedByLinkEv cmp r0, #0 ldmeqia sp!, {r3, pc} - ldr r0, _020c2860 ; =data_027e0fb8 + ldr r0, _020c2860 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv ldmia sp!, {r3, pc} .align 2, 0 -_020c2860: .word data_027e0fb8 +_020c2860: .word gPlayerControl arm_func_end _ZN5Actor14StopLinkFollowEv .global _ZN5Actor9IsGrabbedEv diff --git a/asm/ov00/Player/LinkStateBase.inc b/asm/ov00/Player/LinkStateBase.inc index d8ffb5cc..2156d303 100644 --- a/asm/ov00/Player/LinkStateBase.inc +++ b/asm/ov00/Player/LinkStateBase.inc @@ -18,7 +18,7 @@ .extern gPlayerVel .extern gPlayerAngle .extern data_027e0fb0 -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e0fcc .extern data_027e0fd4 .extern gActorManager diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index 567aad4d..cb825784 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -111,7 +111,7 @@ _020a8084: _020a80c8: cmp r4, #0 beq _020a80e8 - ldr r0, _020a8104 ; =data_027e0fb8 + ldr r0, _020a8104 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020af4a4Ev cmp r0, #0 @@ -127,7 +127,7 @@ _020a80f0: _020a80f8: .word gAdventureFlags _020a80fc: .word data_027e0c68 _020a8100: .word data_027e0f64 -_020a8104: .word data_027e0fb8 +_020a8104: .word gPlayerControl arm_func_end _ZN13LinkStateBase8vfunc_24Ei .global _ZN13LinkStateBase8vfunc_28Ev @@ -805,7 +805,7 @@ _020a8840: .word gSinCosTable _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb: ; 0x020a8844 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x18 - ldr r4, _020a8948 ; =data_027e0fb8 + ldr r4, _020a8948 ; =gPlayerControl mov r6, r0 ldr r0, [r4] mov r5, r2 @@ -870,7 +870,7 @@ _020a8904: add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_020a8948: .word data_027e0fb8 +_020a8948: .word gPlayerControl _020a894c: .word data_027e0618 _020a8950: .word data_027e0f64 arm_func_end _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb diff --git a/asm/ov00/Player/LinkStateFollow.inc b/asm/ov00/Player/LinkStateFollow.inc index c2599fcb..c20ad0f6 100644 --- a/asm/ov00/Player/LinkStateFollow.inc +++ b/asm/ov00/Player/LinkStateFollow.inc @@ -11,7 +11,7 @@ .extern _ZN13PlayerControl13StopFollowingEv .extern _ZN13PlayerControl18func_ov00_020af01cEPc .extern gMapManager -.extern data_027e0fb8 +.extern gPlayerControl .extern Vec3p_Sub .extern Vec3p_Length .extern func_01fffcd8 diff --git a/asm/ov00/Player/LinkStateFollow.s b/asm/ov00/Player/LinkStateFollow.s index a4ff49e4..d0955a14 100644 --- a/asm/ov00/Player/LinkStateFollow.s +++ b/asm/ov00/Player/LinkStateFollow.s @@ -71,7 +71,7 @@ _ZN15LinkStateFollow12OnStateLeaveEi: ; 0x020a9028 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 bl _ZN13LinkStateBase12OnStateLeaveEi - ldr r0, _020a90a8 ; =data_027e0fb8 + ldr r0, _020a90a8 ; =gPlayerControl ldr r0, [r0] ldrb r1, [r0, #0x80] cmp r1, #0 @@ -102,7 +102,7 @@ _020a904c: bl func_ov14_0214bd08 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_020a90a8: .word data_027e0fb8 +_020a90a8: .word gPlayerControl _020a90ac: .word gMapManager arm_func_end _ZN15LinkStateFollow12OnStateLeaveEi @@ -189,7 +189,7 @@ _ZN15LinkStateFollow8vfunc_34EP5Vec3p: ; 0x020a915c arm_func_start _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p: ; 0x020a9180 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _020a9208 ; =data_027e0fb8 + ldr r2, _020a9208 ; =gPlayerControl mov r4, r1 ldr r3, [r2] ldr r5, [r3, #0xa0] @@ -224,7 +224,7 @@ _020a91f0: moveq r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_020a9208: .word data_027e0fb8 +_020a9208: .word gPlayerControl _020a920c: .word gMapManager arm_func_end _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p diff --git a/asm/ov00/Player/LinkStateInteract.inc b/asm/ov00/Player/LinkStateInteract.inc index 610e9fdc..19587ecc 100644 --- a/asm/ov00/Player/LinkStateInteract.inc +++ b/asm/ov00/Player/LinkStateInteract.inc @@ -44,7 +44,7 @@ .extern gSinCosTable .extern data_027e0d0c .extern gMapManager -.extern data_027e0fb8 +.extern gPlayerControl .extern gActorManager .extern data_ov00_020eec9c .extern Vec3p_Add diff --git a/asm/ov00/Player/LinkStateInteract.s b/asm/ov00/Player/LinkStateInteract.s index 86d3f293..95c8f0ed 100644 --- a/asm/ov00/Player/LinkStateInteract.s +++ b/asm/ov00/Player/LinkStateInteract.s @@ -280,7 +280,7 @@ _020aa590: bl _ZN13LinkStateBase15ChangeLinkStateEi b _020aa778 _020aa5a0: - ldr r0, _020aa78c ; =data_027e0fb8 + ldr r0, _020aa78c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev ldr r1, _020aa790 ; =data_ov00_020e592c @@ -343,7 +343,7 @@ _020aa674: bl _ZN13LinkStateBase15ChangeLinkStateEi b _020aa778 _020aa684: - ldr r0, _020aa78c ; =data_027e0fb8 + ldr r0, _020aa78c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev ldr r0, _020aa7a8 ; =gActorManager @@ -404,7 +404,7 @@ _020aa74c: str r0, [r4, #0xc] b _020aa778 _020aa75c: - ldr r0, _020aa78c ; =data_027e0fb8 + ldr r0, _020aa78c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev b _020aa778 @@ -419,7 +419,7 @@ _020aa778: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_020aa78c: .word data_027e0fb8 +_020aa78c: .word gPlayerControl _020aa790: .word data_ov00_020e592c _020aa794: .word data_ov00_020e593c _020aa798: .word data_ov00_020eec9c @@ -436,7 +436,7 @@ _ZN17LinkStateInteract12OnStateLeaveEi: ; 0x020aa7b0 stmdb sp!, {r4, lr} mov r4, r0 bl _ZN13LinkStateBase12OnStateLeaveEi - ldr r0, _020aa814 ; =data_027e0fb8 + ldr r0, _020aa814 ; =gPlayerControl ldr r0, [r0] ldrb r1, [r0, #0x80] cmp r1, #0 @@ -460,7 +460,7 @@ _020aa7d4: str r1, [r0, #4] ldmia sp!, {r4, pc} .align 2, 0 -_020aa814: .word data_027e0fb8 +_020aa814: .word gPlayerControl arm_func_end _ZN17LinkStateInteract12OnStateLeaveEi .global _ZN17LinkStateInteract18func_ov00_020aa818Ev @@ -807,14 +807,14 @@ _020aacf4: bne _020aad64 cmp r6, #0 bne _020aad3c - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl add r1, r4, #0x18 ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p cmp r0, #0 beq _020aad64 _020aad3c: - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl mov r1, #0 ldr r2, [r0] mov r0, #5 @@ -827,7 +827,7 @@ _020aad3c: _020aad64: cmp r6, #0 bne _020aad88 - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl mov r2, r5 ldr r0, [r0] add r1, r4, #0x18 @@ -835,7 +835,7 @@ _020aad64: cmp r0, #0 beq _020aadb0 _020aad88: - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl mov r1, #0 ldr r2, [r0] mov r0, #3 @@ -850,7 +850,7 @@ _020aadb0: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} _020aadbc: - ldr r1, _020ab3cc ; =data_027e0fb8 + ldr r1, _020ab3cc ; =gPlayerControl ldr r0, _020ab3d0 ; =gActorManager ldr r3, [r1] ldr r0, [r0] @@ -864,7 +864,7 @@ _020aadbc: bne _020aae38 mov r0, r4 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev - ldr r2, _020ab3cc ; =data_027e0fb8 + ldr r2, _020ab3cc ; =gPlayerControl ldr r1, [r0, #0xe0] ldr r0, [r2] bl _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor @@ -883,7 +883,7 @@ _020aae2c: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} _020aae38: - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x80] cmp r0, #0 @@ -891,7 +891,7 @@ _020aae38: movne r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, pc} _020aae54: - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl cmp r5, #0 movne r2, #1 ldr r1, [r6, #0x12c] @@ -900,7 +900,7 @@ _020aae54: bl _ZN13PlayerControl18func_ov00_020afe88Eib cmp r0, #0 bne _020aae90 - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv add sp, sp, #0xc8 @@ -997,7 +997,7 @@ _020aafd8: bl Vec3p_Length cmp r0, #0x800 bge _020aaff4 - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev _020aaff4: @@ -1114,7 +1114,7 @@ _020ab170: add r0, r6, #0x48 add r2, r4, #0x18 bl Vec3p_Sub - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl mov r1, #0 ldr r2, [r0] strb r1, [r2, #0x79] @@ -1251,7 +1251,7 @@ _020ab38c: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} _020ab398: - ldr r0, _020ab3cc ; =data_027e0fb8 + ldr r0, _020ab3cc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv add sp, sp, #0xc8 @@ -1266,7 +1266,7 @@ _020ab3bc: .word gItemManager _020ab3c0: .word data_027e0d0c _020ab3c4: .word gSinCosTable _020ab3c8: .word 0x000004cd -_020ab3cc: .word data_027e0fb8 +_020ab3cc: .word gPlayerControl _020ab3d0: .word gActorManager _020ab3d4: .word 0x0000ffff _020ab3d8: .word gMapManager @@ -1557,7 +1557,7 @@ _020ab76c: .word 0x54535542 arm_func_start _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p: ; 0x020ab770 stmdb sp!, {r4, r5, r6, lr} - ldr r2, _020ab7b8 ; =data_027e0fb8 + ldr r2, _020ab7b8 ; =gPlayerControl mov r6, r0 ldr r0, [r2] mov r5, r1 @@ -1577,7 +1577,7 @@ _020ab7b0: ldr r0, [r4, #0x12c] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_020ab7b8: .word data_027e0fb8 +_020ab7b8: .word gPlayerControl arm_func_end _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p .global _ZN17LinkStateInteract18func_ov00_020ab7bcEP5Vec3pP5Actor @@ -1976,7 +1976,7 @@ _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef: ; 0x020abc78 beq _020abce0 cmp r0, #1 bne _020abcd8 - ldr r0, _020abd6c ; =data_027e0fb8 + ldr r0, _020abd6c ; =gPlayerControl mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x79] @@ -2022,7 +2022,7 @@ _020abce0: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_020abd6c: .word data_027e0fb8 +_020abd6c: .word gPlayerControl _020abd70: .word gActorManager _020abd74: .word data_ov00_020eec9c arm_func_end _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef diff --git a/asm/ov00/Player/LinkStateItem.inc b/asm/ov00/Player/LinkStateItem.inc index 9b667992..12f9bd1d 100644 --- a/asm/ov00/Player/LinkStateItem.inc +++ b/asm/ov00/Player/LinkStateItem.inc @@ -5,7 +5,7 @@ .extern _ZN13LinkStateBase8vfunc_34EP5Vec3p .extern _ZN13PlayerControl13StopFollowingEv .extern gAdventureFlags -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e103c .extern data_027e1098 .extern func_01fffcd8 diff --git a/asm/ov00/Player/LinkStateItem.s b/asm/ov00/Player/LinkStateItem.s index c0ee3e4f..ef9f3174 100644 --- a/asm/ov00/Player/LinkStateItem.s +++ b/asm/ov00/Player/LinkStateItem.s @@ -145,7 +145,7 @@ _020abf0c: cmp r6, r4 bne _020abf0c _020abf20: - ldr r0, _020abf4c ; =data_027e0fb8 + ldr r0, _020abf4c ; =gPlayerControl ldr r0, [r0] ldrb r1, [r0, #0x80] cmp r1, #0 @@ -158,7 +158,7 @@ _020abf38: .align 2, 0 _020abf44: .word data_027e103c _020abf48: .word data_027e1098 -_020abf4c: .word data_027e0fb8 +_020abf4c: .word gPlayerControl arm_func_end _ZN13LinkStateItem12OnStateLeaveEi .global _ZN13LinkStateItem15GetEquipBombchuEv diff --git a/asm/ov00/Player/LinkStateRoll.inc b/asm/ov00/Player/LinkStateRoll.inc index 8c6d7ed2..a43c441d 100644 --- a/asm/ov00/Player/LinkStateRoll.inc +++ b/asm/ov00/Player/LinkStateRoll.inc @@ -27,7 +27,7 @@ .extern gSinCosTable .extern data_027e0618 .extern data_027e0e58 -.extern data_027e0fb8 +.extern gPlayerControl .extern data_ov00_020eec9c .extern func_ov00_0207c39c .extern func_ov00_0207c444 diff --git a/asm/ov00/Player/LinkStateRoll.s b/asm/ov00/Player/LinkStateRoll.s index 16df293c..81c2e805 100644 --- a/asm/ov00/Player/LinkStateRoll.s +++ b/asm/ov00/Player/LinkStateRoll.s @@ -115,7 +115,7 @@ _020ae7e8: ldr r1, _020aeb14 ; =0x0000019a str r1, [r0, #4] _020ae8f0: - ldr r0, _020aeb18 ; =data_027e0fb8 + ldr r0, _020aeb18 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv ldr r1, _020aeb1c ; =data_ov00_020e6078 @@ -264,7 +264,7 @@ _020aeb08: .align 2, 0 _020aeb10: .word gSinCosTable _020aeb14: .word 0x0000019a -_020aeb18: .word data_027e0fb8 +_020aeb18: .word gPlayerControl _020aeb1c: .word data_ov00_020e6078 _020aeb20: .word data_ov00_020eec9c _020aeb24: .word data_ov00_020e6088 @@ -360,7 +360,7 @@ _ZN13LinkStateRoll8vfunc_20Ei: ; 0x020aec10 bl _ZN13LinkStateBase18func_ov00_020a8b80Ev cmp r0, #0 beq _020aecc8 - ldr r1, _020aed84 ; =data_027e0fb8 + ldr r1, _020aed84 ; =gPlayerControl mov r0, r5 ldr r6, [r1] bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -419,12 +419,12 @@ _020aed08: ldr r0, _020aed8c ; =0x0000099a cmp r1, r0 blt _020aed70 - ldr r0, _020aed84 ; =data_027e0fb8 + ldr r0, _020aed84 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv cmp r0, #0 ble _020aed70 - ldr r0, _020aed84 ; =data_027e0fb8 + ldr r0, _020aed84 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv mov r2, #0 @@ -444,7 +444,7 @@ _020aed7c: mov r0, #0 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_020aed84: .word data_027e0fb8 +_020aed84: .word gPlayerControl _020aed88: .word data_027e0618 _020aed8c: .word 0x0000099a arm_func_end _ZN13LinkStateRoll8vfunc_20Ei diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index e2e88d08..6a24e67c 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -13,7 +13,7 @@ .extern gPlayerVel .extern gPlayerAngle .extern data_027e0fb0 -.extern data_027e0fb8 +.extern gPlayerControl .extern gActorManager .extern Vec3p_Sub .extern Atan2 diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index 68bf7819..83c69492 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -355,7 +355,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70 str ip, [r3, #4] strh r4, [r2] str r5, [r1, #4] - ldr r0, _020a7f78 ; =data_027e0fb8 + ldr r0, _020a7f78 ; =gPlayerControl str r5, [r1, #8] ldr r0, [r0] blx _ZN13PlayerControl9UpdateAimEv @@ -389,7 +389,7 @@ _020a7f68: .word gMapManager _020a7f6c: .word gPlayerAngle _020a7f70: .word gPlayerVel _020a7f74: .word data_027e0fb0 -_020a7f78: .word data_027e0fb8 +_020a7f78: .word gPlayerControl _020a7f7c: .word gActorManager _020a7f80: .word gAdventureFlags _020a7f84: .word data_027e0f64 diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index a7e886ea..89a7e78e 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -192,7 +192,7 @@ .extern gPlayerPos .extern gPlayerVel .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gHealthManager .extern data_027e0fc4 .extern gPlayerLink diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 6188115c..c7ae3ac2 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -3167,7 +3167,7 @@ _020b3dbc: mov r0, #0 bx lr _020b3dc4: - ldr r0, _020b3de0 ; =data_027e0fb8 + ldr r0, _020b3de0 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x7d] cmp r0, #0 @@ -3175,7 +3175,7 @@ _020b3dc4: movne r0, #0 bx lr .align 2, 0 -_020b3de0: .word data_027e0fb8 +_020b3de0: .word gPlayerControl arm_func_end func_ov00_020b3d6c .global func_ov00_020b3de4 @@ -5250,7 +5250,7 @@ func_ov00_020b5514: ; 0x020b5514 cmp r0, #0 beq _020b5630 _020b5540: - ldr r0, _020b5c80 ; =data_027e0fb8 + ldr r0, _020b5c80 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv cmp r0, #0 @@ -5265,7 +5265,7 @@ _020b5540: str r2, [sp, #0x6c] str r1, [sp, #0x68] bl Vec3p_Length - ldr r1, _020b5c80 ; =data_027e0fb8 + ldr r1, _020b5c80 ; =gPlayerControl mov r7, r0 ldr r0, [r1] bl _ZN13PlayerControl13GetTouchAngleEv @@ -5735,7 +5735,7 @@ _020b5c68: add sp, sp, #0x70 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_020b5c80: .word data_027e0fb8 +_020b5c80: .word gPlayerControl _020b5c84: .word 0x0000071c _020b5c88: .word gSinCosTable _020b5c8c: .word gAdventureFlags @@ -13601,7 +13601,7 @@ _020bc028: add r1, sp, #0 bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p _020bc060: - ldr r0, _020bc084 ; =data_027e0fb8 + ldr r0, _020bc084 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv mov r0, #1 @@ -13611,7 +13611,7 @@ _020bc060: _020bc078: .word data_027e0fcc _020bc07c: .word gPlayerPos _020bc080: .word gPlayerVel -_020bc084: .word data_027e0fb8 +_020bc084: .word gPlayerControl arm_func_end func_ov00_020bbed4 .global func_ov00_020bc088 @@ -13700,7 +13700,7 @@ _020bc114: bl func_020385b8 add r1, sp, #0xc bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p - ldr r0, _020bc1c4 ; =data_027e0fb8 + ldr r0, _020bc1c4 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv mov r0, #1 @@ -13710,7 +13710,7 @@ _020bc114: _020bc1b8: .word gAdventureFlags _020bc1bc: .word gPlayerVel _020bc1c0: .word data_ov00_020dc858 -_020bc1c4: .word data_027e0fb8 +_020bc1c4: .word gPlayerControl arm_func_end func_ov00_020bc0a8 .global func_ov00_020bc1c8 @@ -15061,7 +15061,7 @@ _020bd1ec: strb r4, [r0, #0x28] cmp r4, #0 bne _020bd234 - ldr r0, _020bd260 ; =data_027e0fb8 + ldr r0, _020bd260 ; =gPlayerControl mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x79] @@ -15079,7 +15079,7 @@ _020bd250: .word gPlayerPos _020bd254: .word 0x0000099a _020bd258: .word data_027e0fcc _020bd25c: .word gPlayerVel -_020bd260: .word data_027e0fb8 +_020bd260: .word gPlayerControl _020bd264: .word data_027e0fd4 arm_func_end func_ov00_020bd0bc @@ -19230,7 +19230,7 @@ func_ov00_020c06d8: ; 0x020c06d8 arm_func_start func_ov00_020c06e0 func_ov00_020c06e0: ; 0x020c06e0 stmdb sp!, {r3, lr} - ldr r1, _020c0708 ; =data_027e0fb8 + ldr r1, _020c0708 ; =gPlayerControl ldr r1, [r1] ldrb r1, [r1, #0x79] cmp r1, #0 @@ -19240,7 +19240,7 @@ func_ov00_020c06e0: ; 0x020c06e0 bl func_ov00_020be8e4 ldmia sp!, {r3, pc} .align 2, 0 -_020c0708: .word data_027e0fb8 +_020c0708: .word gPlayerControl arm_func_end func_ov00_020c06e0 .global func_ov00_020c070c diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index f6e11ef1..bb0bad1c 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -147,7 +147,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fd4 .extern data_027e0fe0 diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index 0505a536..7965aee7 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -14526,7 +14526,7 @@ func_ov00_020cf42c: ; 0x020cf42c arm_func_start func_ov00_020cf444 func_ov00_020cf444: ; 0x020cf444 stmdb sp!, {r3, lr} - ldr r0, _020cf480 ; =data_027e0fb8 + ldr r0, _020cf480 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -14542,7 +14542,7 @@ _020cf478: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_020cf480: .word data_027e0fb8 +_020cf480: .word gPlayerControl _020cf484: .word gItemManager arm_func_end func_ov00_020cf444 diff --git a/asm/ov03.inc b/asm/ov03.inc index 14bfec7e..1680ada0 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -100,7 +100,7 @@ .extern data_027e0f88 .extern gPlayer .extern gPlayerPos -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fe0 .extern data_027e103c diff --git a/asm/ov03.s b/asm/ov03.s index 15c0fe03..8865f58e 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -6078,7 +6078,7 @@ func_ov03_020f2774: ; 0x020f2774 bl func_ov00_02078b40 cmp r0, #2 beq _020f27d0 - ldr r0, _020f27e4 ; =data_027e0fb8 + ldr r0, _020f27e4 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -6091,7 +6091,7 @@ _020f27d0: .align 2, 0 _020f27dc: .word data_027e103c _020f27e0: .word data_027e0d38 -_020f27e4: .word data_027e0fb8 +_020f27e4: .word gPlayerControl arm_func_end func_ov03_020f2774 .global func_ov03_020f27e8 @@ -13615,7 +13615,7 @@ _020f7068: bl _ZN11ItemManager18func_ov00_020ad790Ei cmp r0, #0 beq _020f70ac - ldr r0, _020f70c0 ; =data_027e0fb8 + ldr r0, _020f70c0 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -13633,7 +13633,7 @@ _020f70ac: .align 2, 0 _020f70b8: .word data_027e103c _020f70bc: .word gItemManager -_020f70c0: .word data_027e0fb8 +_020f70c0: .word gPlayerControl _020f70c4: .word data_027e05f8 arm_func_end func_ov03_020f7020 diff --git a/asm/ov04.inc b/asm/ov04.inc index a3f297a7..346ce059 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -136,7 +136,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gHealthManager .extern data_027e0fc0 .extern data_027e0fc4 diff --git a/asm/ov04.s b/asm/ov04.s index 0f9a2c25..2e61221d 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -14960,7 +14960,7 @@ func_ov04_02107e9c: ; 0x02107e9c ldr r0, [r0] bl _ZN11ItemManager4LoadEPK15SaveItemManager _02107ef6: - ldr r0, _02107f34 ; =data_027e0fb8 + ldr r0, _02107f34 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020aef30Ev ldr r0, _02107f2c ; =gItemManager @@ -14981,7 +14981,7 @@ _02107f24: .word data_ov00_020e9e98 _02107f28: .word data_ov00_020e9e94 _02107f2c: .word gItemManager _02107f30: .word data_ov00_020e9e18 -_02107f34: .word data_027e0fb8 +_02107f34: .word gPlayerControl thumb_func_end func_ov04_02107e9c .global func_ov04_02107f38 @@ -15071,7 +15071,7 @@ _02107fda: ldr r0, _02108000 ; =gItemManager ldr r0, [r0] bl func_ov04_02107314 - ldr r0, _02108004 ; =data_027e0fb8 + ldr r0, _02108004 ; =gPlayerControl ldr r0, [r0] bl func_ov04_0210b184 pop {r3, r4, r5, pc} @@ -15082,7 +15082,7 @@ _02107ff4: .word data_ov09_0211f530 _02107ff8: .word data_027e0d38 _02107ffc: .word data_027e0f7c _02108000: .word gItemManager -_02108004: .word data_027e0fb8 +_02108004: .word gPlayerControl thumb_func_end func_ov04_02107f48 .global func_ov04_02108008 @@ -15090,7 +15090,7 @@ _02108004: .word data_027e0fb8 func_ov04_02108008: ; 0x02108008 push {r3, lr} bl func_ov04_0210b1f0 - ldr r0, _0210804c ; =data_027e0fb8 + ldr r0, _0210804c ; =gPlayerControl ldr r0, [r0] bl func_ov04_0210b1d0 ldr r0, _02108050 ; =gItemManager @@ -15115,7 +15115,7 @@ _02108034: _02108048: pop {r3, pc} nop -_0210804c: .word data_027e0fb8 +_0210804c: .word gPlayerControl _02108050: .word gItemManager _02108054: .word data_027e0618 _02108058: .word data_ov09_0211f530 @@ -21415,19 +21415,19 @@ func_ov04_0210b13c: ; 0x0210b13c beq _0210b152 bl func_ov04_0210afdc _0210b152: - ldr r1, _0210b15c ; =data_027e0fb8 + ldr r1, _0210b15c ; =gPlayerControl str r0, [r1] pop {r3, pc} .align 2, 0 _0210b158: .word data_027e0ce0 -_0210b15c: .word data_027e0fb8 +_0210b15c: .word gPlayerControl thumb_func_end func_ov04_0210b13c .global func_ov04_0210b160 thumb_func_start func_ov04_0210b160 func_ov04_0210b160: ; 0x0210b160 push {r4, lr} - ldr r0, _0210b180 ; =data_027e0fb8 + ldr r0, _0210b180 ; =gPlayerControl ldr r4, [r0] cmp r4, #0 beq _0210b176 @@ -21436,12 +21436,12 @@ func_ov04_0210b160: ; 0x0210b160 add r0, r4, #0 blx _ZN9SysObjectdlEPv _0210b176: - ldr r0, _0210b180 ; =data_027e0fb8 + ldr r0, _0210b180 ; =gPlayerControl mov r1, #0 str r1, [r0] pop {r4, pc} nop -_0210b180: .word data_027e0fb8 +_0210b180: .word gPlayerControl thumb_func_end func_ov04_0210b160 .global func_ov04_0210b184 @@ -21452,7 +21452,7 @@ func_ov04_0210b184: ; 0x0210b184 mov r1, #0 add r0, #0x79 strb r1, [r0] - ldr r0, _0210b1c0 ; =data_027e0fb8 + ldr r0, _0210b1c0 ; =gPlayerControl mov r1, #1 ldr r0, [r0] add r0, #0x78 @@ -21477,7 +21477,7 @@ _0210b1b6: _0210b1bc: pop {r4, pc} nop -_0210b1c0: .word data_027e0fb8 +_0210b1c0: .word gPlayerControl _0210b1c4: .word gOverlayManager _0210b1c8: .word 0x0000001d _0210b1cc: .word data_027e0ce0 diff --git a/asm/ov05.inc b/asm/ov05.inc index dc8959c2..c888a438 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -203,7 +203,7 @@ .extern gPlayerVel .extern gPlayerAngle .extern data_027e0fb0 -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e0fc0 .extern gPlayerLink .extern data_027e0fcc diff --git a/asm/ov05.s b/asm/ov05.s index 08590453..1d03ad77 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -5771,7 +5771,7 @@ func_ov05_021055e0: ; 0x021055e0 ldrneb r1, [r0, #0x24] cmpne r1, #0 beq _0210563c - ldr r1, _02105668 ; =data_027e0fb8 + ldr r1, _02105668 ; =gPlayerControl ldr r1, [r1] ldrb r1, [r1, #0x79] cmp r1, #0 @@ -5799,7 +5799,7 @@ _0210565c: blx r1 ldmia sp!, {r3, pc} .align 2, 0 -_02105668: .word data_027e0fb8 +_02105668: .word gPlayerControl _0210566c: .word data_027e077c arm_func_end func_ov05_021055e0 @@ -5875,7 +5875,7 @@ _02105764: mov r0, #0 ldmia sp!, {r3, r4, pc} _02105770: - ldr r1, _021057b0 ; =data_027e0fb8 + ldr r1, _021057b0 ; =gPlayerControl ldr r1, [r1] ldrb r1, [r1, #0x79] cmp r1, #0 @@ -5893,7 +5893,7 @@ _0210579c: .align 2, 0 _021057a8: .word data_027e0618 _021057ac: .word data_027e0f64 -_021057b0: .word data_027e0fb8 +_021057b0: .word gPlayerControl arm_func_end func_ov05_02105670 .global func_ov05_021057b4 @@ -5962,7 +5962,7 @@ func_ov05_02105850: ; 0x02105850 mov r0, r6 bl _ZN13LinkStateBase22UpdateSwordShieldInUseEv mov r1, #0 - ldr r0, _02105bf0 ; =data_027e0fb8 + ldr r0, _02105bf0 ; =gPlayerControl strb r1, [r6, #0x25] ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev @@ -6039,12 +6039,12 @@ _02105968: ldr r0, [r6, #0x58] cmp r0, #3 beq _02105b6c - ldr r0, _02105bf0 ; =data_027e0fb8 + ldr r0, _02105bf0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14GetFollowActorEv cmp r0, #0 beq _021059e0 - ldr r0, _02105bf0 ; =data_027e0fb8 + ldr r0, _02105bf0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14GetFollowActorEv mov r5, r0 @@ -6202,7 +6202,7 @@ _02105be0: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 -_02105bf0: .word data_027e0fb8 +_02105bf0: .word gPlayerControl _02105bf4: .word data_ov00_020eec9c _02105bf8: .word 0x00000111 _02105bfc: .word 0x00000112 @@ -6478,7 +6478,7 @@ _02105f4c: cmp r0, #0 addne sp, sp, #8 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _021065f0 ; =data_027e0fb8 + ldr r0, _021065f0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv ldr r1, _021065f4 ; =0x00000ccd @@ -6838,7 +6838,7 @@ _021064e0: str r1, [r0] b _021065a8 _021064f4: - ldr r0, _021065f0 ; =data_027e0fb8 + ldr r0, _021065f0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv mov r7, r0 @@ -6851,7 +6851,7 @@ _021064f4: rsb r0, r2, #0x800 cmp r7, r0 ble _0210653c - ldr r0, _021065f0 ; =data_027e0fb8 + ldr r0, _021065f0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13GetTouchAngleEv mov r1, r0 @@ -6906,7 +6906,7 @@ _021065a8: .align 2, 0 _021065e8: .word gItemManager _021065ec: .word data_ov05_0211252c -_021065f0: .word data_027e0fb8 +_021065f0: .word gPlayerControl _021065f4: .word 0x00000ccd _021065f8: .word data_ov05_0211257c _021065fc: .word data_ov05_0211258c @@ -7032,7 +7032,7 @@ func_ov05_02106740: ; 0x02106740 cmp r0, #0 addne sp, sp, #0xc ldmneia sp!, {r4, r5, r6, r7, pc} - ldr r1, _0210688c ; =data_027e0fb8 + ldr r1, _0210688c ; =gPlayerControl mov r0, r6 ldr r7, [r1] bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -7100,7 +7100,7 @@ _02106874: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_0210688c: .word data_027e0fb8 +_0210688c: .word gPlayerControl _02106890: .word gItemManager arm_func_end func_ov05_02106740 @@ -7243,7 +7243,7 @@ func_ov05_02106a50: ; 0x02106a50 cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02106bb8 ; =data_027e0fb8 + ldr r0, _02106bb8 ; =gPlayerControl ldr r0, [r0] ldrb r1, [r0, #0x80] cmp r1, #0 @@ -7333,14 +7333,14 @@ _02106bb0: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02106bb8: .word data_027e0fb8 +_02106bb8: .word gPlayerControl arm_func_end func_ov05_02106a50 .global func_ov05_02106bbc arm_func_start func_ov05_02106bbc func_ov05_02106bbc: ; 0x02106bbc stmdb sp!, {r3, r4, r5, lr} - ldr r2, _02106c6c ; =data_027e0fb8 + ldr r2, _02106c6c ; =gPlayerControl mov r5, r0 ldr r2, [r2] mov r4, r1 @@ -7357,7 +7357,7 @@ func_ov05_02106bbc: ; 0x02106bbc blx r1 cmp r0, #0 beq _02106c64 - ldr r0, _02106c6c ; =data_027e0fb8 + ldr r0, _02106c6c ; =gPlayerControl add r1, sp, #0 ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020af01cEPc @@ -7385,7 +7385,7 @@ _02106c64: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02106c6c: .word data_027e0fb8 +_02106c6c: .word gPlayerControl _02106c70: .word gMapManager arm_func_end func_ov05_02106bbc @@ -7545,7 +7545,7 @@ _02106e0c: ldr r1, [r1, #4] cmp r0, r1 blt _02106ee0 - ldr r0, _021071dc ; =data_027e0fb8 + ldr r0, _021071dc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv ldr r1, _021071e0 ; =0x00000ccd @@ -7748,7 +7748,7 @@ _02107148: mov r3, #1 bl func_ov00_0207c1b0 _02107188: - ldr r1, _021071dc ; =data_027e0fb8 + ldr r1, _021071dc ; =gPlayerControl mov r0, r7 ldr r4, [r1] bl _ZN13LinkStateBase12GetPlayerPosEv @@ -7771,7 +7771,7 @@ _021071cc: .word data_027e0618 _021071d0: .word data_ov00_020dc6e4 _021071d4: .word 0x00000b33 _021071d8: .word data_ov05_021126ac -_021071dc: .word data_027e0fb8 +_021071dc: .word gPlayerControl _021071e0: .word 0x00000ccd _021071e4: .word data_027e0e58 _021071e8: .word gMapManager @@ -7803,7 +7803,7 @@ func_ov05_02107208: ; 0x02107208 func_ov05_02107214: ; 0x02107214 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x1c - ldr r1, _021073ac ; =data_027e0fb8 + ldr r1, _021073ac ; =gPlayerControl mov r4, r0 ldr r0, [r1] mov r1, #1 @@ -7910,7 +7910,7 @@ _02107398: add sp, sp, #0x1c ldmia sp!, {r4, r5, pc} .align 2, 0 -_021073ac: .word data_027e0fb8 +_021073ac: .word gPlayerControl _021073b0: .word data_ov00_020e6088 _021073b4: .word data_ov00_020eec9c arm_func_end func_ov05_02107214 @@ -7919,7 +7919,7 @@ _021073b4: .word data_ov00_020eec9c arm_func_start func_ov05_021073b8 func_ov05_021073b8: ; 0x021073b8 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _0210759c ; =data_027e0fb8 + ldr r1, _0210759c ; =gPlayerControl mov r5, r0 ldr r0, [r1] bl _ZN13PlayerControl18func_ov00_020b034cEv @@ -7928,7 +7928,7 @@ func_ov05_021073b8: ; 0x021073b8 ble _02107430 mov r0, r5 bl _ZN13LinkStateBase28Get_PlayerControlData_Unk004Ev - ldr r1, _0210759c ; =data_027e0fb8 + ldr r1, _0210759c ; =gPlayerControl ldr r6, [r0] ldr r0, [r1] bl _ZN13PlayerControl13GetTouchAngleEv @@ -7997,7 +7997,7 @@ _021074c8: mov r1, r6 mov r2, r6 bl _ZN13LinkStateBase6TurnToEsii - ldr r0, _0210759c ; =data_027e0fb8 + ldr r0, _0210759c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13GetTouchAngleEv sub r0, r0, r6 @@ -8044,7 +8044,7 @@ _0210758c: bl func_ov00_020d7cd4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0210759c: .word data_027e0fb8 +_0210759c: .word gPlayerControl _021075a0: .word 0x0000030a _021075a4: .word 0x00000614 _021075a8: .word data_ov00_020eec9c @@ -8251,7 +8251,7 @@ _0210787c: .word func_01fffcd8 arm_func_start func_ov05_02107880 func_ov05_02107880: ; 0x02107880 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _0210794c ; =data_027e0fb8 + ldr r1, _0210794c ; =gPlayerControl mov r5, r0 ldr r0, [r1] mov r1, #1 @@ -8305,7 +8305,7 @@ _02107934: bl _ZN13LinkStateBase15ChangeLinkStateEi ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0210794c: .word data_027e0fb8 +_0210794c: .word gPlayerControl _02107950: .word data_ov00_020eec9c arm_func_end func_ov05_02107880 @@ -8348,7 +8348,7 @@ _021079d0: ldrsh r0, [r4, #0x10] cmp r0, #0 ble _02107a08 - ldr r0, _02107b64 ; =data_027e0fb8 + ldr r0, _02107b64 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14IsTouchingFastEv cmp r0, #0 @@ -8450,7 +8450,7 @@ _02107b1c: .align 2, 0 _02107b5c: .word data_ov05_021126ac _02107b60: .word data_ov05_021126b4 -_02107b64: .word data_027e0fb8 +_02107b64: .word gPlayerControl _02107b68: .word gMapManager _02107b6c: .word data_ov05_021122e0 _02107b70: .word data_027e0d0c @@ -8854,7 +8854,7 @@ func_ov05_02108094: ; 0x02108094 bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et cmp r0, #0 beq _021080ec - ldr r0, _02108184 ; =data_027e0fb8 + ldr r0, _02108184 ; =gPlayerControl mov r1, #1 ldr r0, [r0] bl _ZN13PlayerControl14CheckTouchFastEj @@ -8909,7 +8909,7 @@ _0210817c: mov r0, #0 ldmia sp!, {r4, pc} .align 2, 0 -_02108184: .word data_027e0fb8 +_02108184: .word gPlayerControl arm_func_end func_ov05_02108094 .global func_ov05_02108188 @@ -9570,7 +9570,7 @@ func_ov05_021089f4: ; 0x021089f4 bl _ZN17LinkStateInteract18func_ov00_020ab6c8Ev mov r0, r4 bl _ZN13LinkStateBase18func_ov00_020a82acEv - ldr r0, _02108ce0 ; =data_027e0fb8 + ldr r0, _02108ce0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev ldr r0, [r4, #0x74] @@ -9766,7 +9766,7 @@ _02108c88: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02108ce0: .word data_027e0fb8 +_02108ce0: .word gPlayerControl _02108ce4: .word data_027e103c _02108ce8: .word 0x00002a30 _02108cec: .word 0x00008ca0 @@ -9960,7 +9960,7 @@ func_ov05_02108f38: ; 0x02108f38 ldr r0, _02108f90 ; =0x0000010b cmp r1, r0 ldmgeia sp!, {r4, pc} - ldr r0, _02108f94 ; =data_027e0fb8 + ldr r0, _02108f94 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl17IsNotUntouchedNowEv cmp r0, #0 @@ -9970,7 +9970,7 @@ _02108f88: ldmia sp!, {r4, pc} .align 2, 0 _02108f90: .word 0x0000010b -_02108f94: .word data_027e0fb8 +_02108f94: .word gPlayerControl arm_func_end func_ov05_02108f38 .global func_ov05_02108f98 @@ -12424,7 +12424,7 @@ _0210ae98: mov r2, r4 strb r3, [r5, #0xb1] bl func_ov05_0210b4f4 - ldr r1, _0210b294 ; =data_027e0fb8 + ldr r1, _0210b294 ; =gPlayerControl mov r0, r5 ldr r6, [r1] bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -12514,7 +12514,7 @@ _0210b284: .word gAdventureFlags _0210b288: .word gSinCosTable _0210b28c: .word 0x0000ffff _0210b290: .word gMapManager -_0210b294: .word data_027e0fb8 +_0210b294: .word gPlayerControl _0210b298: .word data_ov05_021128a4 _0210b29c: .word data_ov05_021128b4 _0210b2a0: .word data_ov05_02112894 @@ -12546,7 +12546,7 @@ func_ov05_0210b2a4: ; 0x0210b2a4 bl _ZN13LinkStateBase15ChangeLinkStateEi ldmia sp!, {r3, r4, r5, pc} _0210b2fc: - ldr r0, _0210b3b4 ; =data_027e0fb8 + ldr r0, _0210b3b4 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl16CheckNotTouchingEv cmp r0, #0 @@ -12598,7 +12598,7 @@ _0210b3a0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0210b3b0: .word gActorManager -_0210b3b4: .word data_027e0fb8 +_0210b3b4: .word gPlayerControl _0210b3b8: .word gAdventureFlags arm_func_end func_ov05_0210b2a4 @@ -12782,7 +12782,7 @@ _0210b5f4: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, pc} _0210b608: - ldr r0, _0210b95c ; =data_027e0fb8 + ldr r0, _0210b95c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev mov r0, r5 @@ -12804,7 +12804,7 @@ _0210b634: bl _ZN13LinkStateBase14GetPlayerAngleEv mov r2, #0x8000 rsb r2, r2, #0 - ldr r1, _0210b95c ; =data_027e0fb8 + ldr r1, _0210b95c ; =gPlayerControl strh r2, [r0] ldr r0, [r1] bl _ZN13PlayerControl9SetUnk_80Ev @@ -12815,7 +12815,7 @@ _0210b634: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, pc} _0210b684: - ldr r0, _0210b95c ; =data_027e0fb8 + ldr r0, _0210b95c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev ldr r1, _0210b968 ; =gMapManager @@ -12896,7 +12896,7 @@ _0210b79c: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, pc} _0210b7b0: - ldr r0, _0210b95c ; =data_027e0fb8 + ldr r0, _0210b95c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev bl func_020385b8 @@ -13008,7 +13008,7 @@ _0210b954: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0210b95c: .word data_027e0fb8 +_0210b95c: .word gPlayerControl _0210b960: .word data_ov05_02112984 _0210b964: .word data_ov05_021129f4 _0210b968: .word gMapManager @@ -13154,7 +13154,7 @@ _0210bb10: cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, pc} - ldr r0, _0210bb4c ; =data_027e0fb8 + ldr r0, _0210bb4c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev mov r0, r4 @@ -13164,7 +13164,7 @@ _0210bb10: ldmia sp!, {r3, r4, pc} .align 2, 0 _0210bb48: .word gMapManager -_0210bb4c: .word data_027e0fb8 +_0210bb4c: .word gPlayerControl arm_func_end func_ov05_0210babc .global func_ov05_0210bb50 @@ -13231,7 +13231,7 @@ _0210bc18: mov r0, r5 mov r2, r4 bl func_ov05_0210ca80 - ldr r1, _0210bd60 ; =data_027e0fb8 + ldr r1, _0210bd60 ; =gPlayerControl mov r0, r5 ldr r6, [r1] bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -13315,7 +13315,7 @@ _0210bd48: .align 2, 0 _0210bd58: .word gMapManager _0210bd5c: .word gAdventureFlags -_0210bd60: .word data_027e0fb8 +_0210bd60: .word gPlayerControl _0210bd64: .word data_ov05_021129d4 _0210bd68: .word data_ov05_021129c4 _0210bd6c: .word 0x00000155 @@ -13357,7 +13357,7 @@ _0210bdd8: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} _0210bdec: - ldr r0, _0210bf44 ; =data_027e0fb8 + ldr r0, _0210bf44 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl16CheckNotTouchingEv cmp r0, #0 @@ -13451,7 +13451,7 @@ _0210beb8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0210bf40: .word gMapManager -_0210bf44: .word data_027e0fb8 +_0210bf44: .word gPlayerControl _0210bf48: .word gAdventureFlags _0210bf4c: .word 0x00000155 arm_func_end func_ov05_0210bd70 @@ -13521,13 +13521,13 @@ _0210c004: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} _0210c040: - ldr r0, _0210c200 ; =data_027e0fb8 + ldr r0, _0210c200 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv cmp r0, #0xcd addle sp, sp, #0x14 ldmleia sp!, {r4, r5, r6, r7, r8, r9, pc} - ldr r1, _0210c200 ; =data_027e0fb8 + ldr r1, _0210c200 ; =gPlayerControl mov r0, r4 ldr r6, [r1] bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -13544,7 +13544,7 @@ _0210c040: ldrneb r0, [r4, #0x15] cmpne r0, #0 beq _0210c19c - ldr r0, _0210c200 ; =data_027e0fb8 + ldr r0, _0210c200 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13GetTouchAngleEv ldrsh r1, [r4, #0x16] @@ -13609,7 +13609,7 @@ _0210c040: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} _0210c19c: - ldr r0, _0210c200 ; =data_027e0fb8 + ldr r0, _0210c200 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b13c4Ev cmp r0, #0 @@ -13635,7 +13635,7 @@ _0210c19c: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 -_0210c200: .word data_027e0fb8 +_0210c200: .word gPlayerControl _0210c204: .word gSinCosTable _0210c208: .word 0x0000019a arm_func_end func_ov05_0210bf50 @@ -13653,7 +13653,7 @@ func_ov05_0210c20c: ; 0x0210c20c bl _ZN13LinkStateBase19GetCurrentCharacterEv cmp r0, #1 bne _0210c2b4 - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl mov r2, #0 ldr r0, [r0] add r1, sp, #8 @@ -13747,7 +13747,7 @@ _0210c38c: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0210c398: - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl ldr r0, [r0] ldr r5, [r0, #0xa0] cmp r5, #0 @@ -13782,7 +13782,7 @@ _0210c3f8: mov r0, r7 bl _ZN13LinkStateBase12GetGrabActorEv cmp r0, #0 - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl movne r2, #1 ldr r0, [r0] moveq r2, #0 @@ -13790,7 +13790,7 @@ _0210c3f8: bl _ZN13PlayerControl18func_ov00_020afeecEib cmp r0, #0 bne _0210c454 - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv add sp, sp, #0x78 @@ -13827,7 +13827,7 @@ _0210c4b4: mov r0, r7 add r1, r7, #0x24 bl _ZN13LinkStateBase6LookAtEP5Vec3p - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv add sp, sp, #0x78 @@ -13837,7 +13837,7 @@ _0210c4d8: mov r0, r7 add r1, r7, #0x24 bl _ZN13LinkStateBase6LookAtEP5Vec3p - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv ldr r1, [r7, #0x24] @@ -13992,7 +13992,7 @@ _0210c680: mov r0, r7 add r1, r7, #0x24 bl _ZN13LinkStateBase6LookAtEP5Vec3p - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev add sp, sp, #0x78 @@ -14009,7 +14009,7 @@ _0210c738: mov r0, r7 add r1, r7, #0x24 bl _ZN13LinkStateBase6LookAtEP5Vec3p - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev mov r0, r7 @@ -14030,7 +14030,7 @@ _0210c788: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0210c7a8: - ldr r0, _0210c94c ; =data_027e0fb8 + ldr r0, _0210c94c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev bl func_020385b8 @@ -14125,7 +14125,7 @@ _0210c88c: sub r1, r2, r1 str r1, [sp, #0x48] bl _ZN13LinkStateBase12GetPlayerPosEv - ldr r1, _0210c94c ; =data_027e0fb8 + ldr r1, _0210c94c ; =gPlayerControl ldr r2, [r0, #8] ldr r3, [r7, #0x2c] ldr r0, [r1] @@ -14141,7 +14141,7 @@ _0210c93c: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0210c948: .word data_027e0618 -_0210c94c: .word data_027e0fb8 +_0210c94c: .word gPlayerControl _0210c950: .word gMapManager _0210c954: .word data_ov00_020eec9c _0210c958: .word data_ov05_02112324 @@ -16234,11 +16234,11 @@ func_ov05_0210e4e4: ; 0x0210e4e4 movs r5, r1 mov r6, r0 bne _0210e52c - ldr r0, _0210e878 ; =data_027e0fb8 + ldr r0, _0210e878 ; =gPlayerControl mov r1, r2 ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020af538Ev - ldr r1, _0210e878 ; =data_027e0fb8 + ldr r1, _0210e878 ; =gPlayerControl mov r0, r6 ldr r4, [r1] bl func_ov00_020bc46c @@ -16309,7 +16309,7 @@ _0210e52c: ldr r1, [r0] ldr r1, [r1, #0x68] blx r1 - ldr r0, _0210e878 ; =data_027e0fb8 + ldr r0, _0210e878 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x7d] cmp r0, #0 @@ -16399,7 +16399,7 @@ _0210e760: bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0210e7b8 - ldr r0, _0210e878 ; =data_027e0fb8 + ldr r0, _0210e878 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x7d] cmp r0, #0 @@ -16466,7 +16466,7 @@ _0210e838: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0210e878: .word data_027e0fb8 +_0210e878: .word gPlayerControl _0210e87c: .word data_027e0fcc _0210e880: .word data_027e0d38 _0210e884: .word data_027e0fd4 @@ -16797,7 +16797,7 @@ _0210ecd0: cmp r0, #0x24000 addlt sp, sp, #0x20 ldmltia sp!, {r4, r5, r6, pc} - ldr r0, _0210f688 ; =data_027e0fb8 + ldr r0, _0210f688 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv ldr r1, _0210f68c ; =0x00000ccd @@ -16942,7 +16942,7 @@ _0210eedc: mov r2, r4 str r2, [r0, #0x1c] str r2, [r0, #0x20] - ldr r1, _0210f688 ; =data_027e0fb8 + ldr r1, _0210f688 ; =gPlayerControl str r2, [r0, #0x24] ldr r0, [r1] bl _ZN13PlayerControl14IsTouchingFastEv @@ -16970,7 +16970,7 @@ _0210ef34: bl _ZN13LinkStateBase15ChangeLinkStateEi b _0210f030 _0210ef74: - ldr r0, _0210f688 ; =data_027e0fb8 + ldr r0, _0210f688 ; =gPlayerControl ldr r1, [r0] ldrsh r0, [r1, #0x72] ldrsh r1, [r1, #0x74] @@ -17421,7 +17421,7 @@ _0210f5d8: mov r0, r6 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev mov r2, #1 - ldr r1, _0210f688 ; =data_027e0fb8 + ldr r1, _0210f688 ; =gPlayerControl strb r2, [r0, #0xbe] ldr r0, [r1] bl _ZN13PlayerControl20UpdateUsingEquipItemEv @@ -17457,7 +17457,7 @@ _0210f680: add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0210f688: .word data_027e0fb8 +_0210f688: .word gPlayerControl _0210f68c: .word 0x00000ccd _0210f690: .word data_ov00_020dc558 _0210f694: .word 0x000002aa @@ -17534,7 +17534,7 @@ func_ov05_0210f714: ; 0x0210f714 .global func_ov05_0210f71c arm_func_start func_ov05_0210f71c func_ov05_0210f71c: ; 0x0210f71c - ldr r0, _0210f750 ; =data_027e0fb8 + ldr r0, _0210f750 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x7d] cmp r0, #0 @@ -17548,7 +17548,7 @@ func_ov05_0210f71c: ; 0x0210f71c moveq r0, #0 bx lr .align 2, 0 -_0210f750: .word data_027e0fb8 +_0210f750: .word gPlayerControl _0210f754: .word data_027e077c arm_func_end func_ov05_0210f71c @@ -17645,7 +17645,7 @@ func_ov05_0210f808: ; 0x0210f808 _0210f884: cmp r9, #0 ble _0210f89c - ldr r0, _021101d8 ; =data_027e0fb8 + ldr r0, _021101d8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13GetTouchAngleEv mov r5, r0 @@ -17767,7 +17767,7 @@ _0210fa38: bne _0210fc44 cmp r6, #0 beq _0210fa80 - ldr r0, _021101d8 ; =data_027e0fb8 + ldr r0, _021101d8 ; =gPlayerControl mov r1, r6 ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p @@ -17886,7 +17886,7 @@ _0210fc04: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} _0210fc30: - ldr r0, _021101d8 ; =data_027e0fb8 + ldr r0, _021101d8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv mov r9, #0 @@ -17896,7 +17896,7 @@ _0210fc44: bl _ZN13LinkStateBase18func_ov00_020a8b80Ev cmp r0, #0 beq _0210fc74 - ldr r0, _021101d8 ; =data_027e0fb8 + ldr r0, _021101d8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b129cEv mov r3, r0 @@ -18252,7 +18252,7 @@ _0211016c: bl _ZN13LinkStateBase19GetCurrentCharacterEv cmp r0, #0 bne _021101a8 - ldr r1, _021101d8 ; =data_027e0fb8 + ldr r1, _021101d8 ; =gPlayerControl mov r0, r10 ldr r5, [r1] bl _ZN13LinkStateBase12GetPlayerPosEv @@ -18275,7 +18275,7 @@ _021101cc: add sp, sp, #0x84 ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 -_021101d8: .word data_027e0fb8 +_021101d8: .word gPlayerControl _021101dc: .word gSinCosTable _021101e0: .word data_ov05_02112acc _021101e4: .word 0x00000ccd @@ -19743,7 +19743,7 @@ _02111594: ldr r0, [r0] cmp r0, #6 beq _021116a4 - ldr r0, _02111a68 ; =data_027e0fb8 + ldr r0, _02111a68 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b0418Ev mov r7, r0 @@ -19847,12 +19847,12 @@ _021116a4: mov r4, r0 b _02111960 _02111734: - ldr r0, _02111a68 ; =data_027e0fb8 + ldr r0, _02111a68 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv b _02111960 _02111744: - ldr r0, _02111a68 ; =data_027e0fb8 + ldr r0, _02111a68 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv cmp r6, #0 @@ -20065,7 +20065,7 @@ _02111a3c: _02111a5c: .word gAdventureFlags _02111a60: .word data_027e0d38 _02111a64: .word data_027e0618 -_02111a68: .word data_027e0fb8 +_02111a68: .word gPlayerControl _02111a6c: .word data_ov05_02112be4 _02111a70: .word data_ov00_020e56f0 _02111a74: .word 0x00000333 @@ -20083,13 +20083,13 @@ _02111a94: .word data_ov05_021123ac arm_func_start func_ov05_02111a98 func_ov05_02111a98: ; 0x02111a98 stmdb sp!, {r4, lr} - ldr r1, _02111af4 ; =data_027e0fb8 + ldr r1, _02111af4 ; =gPlayerControl mov r4, r0 ldr r0, [r1] bl _ZN13PlayerControl14GetFollowActorEv cmp r0, #0 bne _02111aec - ldr r0, _02111af4 ; =data_027e0fb8 + ldr r0, _02111af4 ; =gPlayerControl ldr r0, [r0] ldr r0, [r0, #0xa0] cmp r0, #0 @@ -20107,7 +20107,7 @@ _02111aec: mov r0, #0 ldmia sp!, {r4, pc} .align 2, 0 -_02111af4: .word data_027e0fb8 +_02111af4: .word gPlayerControl arm_func_end func_ov05_02111a98 .global func_ov05_02111af8 diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index b2c2eb44..f8f6e84a 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -168,7 +168,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fcc .extern data_027e0fd4 diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 92000453..5bdf4bfb 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -180,7 +180,7 @@ _0211f7bc: blx func_0202ece0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0211f7cc: - ldr r0, _0211f8cc ; =data_027e0fb8 + ldr r0, _0211f8cc ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -251,7 +251,7 @@ _0211f8b0: _0211f8c0: .word data_027e0d3c _0211f8c4: .word data_027e103c _0211f8c8: .word data_027e080c -_0211f8cc: .word data_027e0fb8 +_0211f8cc: .word gPlayerControl arm_func_end func_ov14_0211f734 .global func_ov14_0211f8d0 @@ -414,7 +414,7 @@ _0211fae8: cmp r0, #0xc cmpne r0, #0xd bne _0211fb14 - ldr r0, _0211fc84 ; =data_027e0fb8 + ldr r0, _0211fc84 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -520,7 +520,7 @@ _0211fc48: _0211fc78: .word gOverlayManager _0211fc7c: .word 0x0000003a _0211fc80: .word data_027e077c -_0211fc84: .word data_027e0fb8 +_0211fc84: .word gPlayerControl _0211fc88: .word data_027e0d3c arm_func_end func_ov14_0211fab0 @@ -1087,7 +1087,7 @@ func_ov14_02120300: ; 0x02120300 mov r1, #4 bl func_ov14_02120dec _02120360: - ldr r0, _02120750 ; =data_027e0fb8 + ldr r0, _02120750 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13IsNotTouchingEv cmp r0, #0 @@ -1360,7 +1360,7 @@ _02120728: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02120750: .word data_027e0fb8 +_02120750: .word gPlayerControl _02120754: .word data_ov14_0215abc0 _02120758: .word data_ov14_0215abec _0212075c: .word data_027e0ffc @@ -2597,7 +2597,7 @@ _02121838: ldrb r0, [r5, #0x158] cmp r0, #0 beq _02121868 - ldr r0, _021219d0 ; =data_027e0fb8 + ldr r0, _021219d0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13IsNotTouchingEv cmp r0, #0 @@ -2700,7 +2700,7 @@ _021219b8: add sp, sp, #0xa4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_021219d0: .word data_027e0fb8 +_021219d0: .word gPlayerControl _021219d4: .word data_027e0f64 _021219d8: .word 0x0000ffff _021219dc: .word data_ov14_02155aa4 @@ -2736,7 +2736,7 @@ func_ov14_021219f8: ; 0x021219f8 ldrb r0, [r5, #0x158] cmp r0, #0 beq _02121a50 - ldr r0, _02121a84 ; =data_027e0fb8 + ldr r0, _02121a84 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13IsNotTouchingEv cmp r0, #0 @@ -2759,7 +2759,7 @@ _02121a70: bl func_ov00_0207a1c8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02121a84: .word data_027e0fb8 +_02121a84: .word gPlayerControl arm_func_end func_ov14_021219f8 .global func_ov14_02121a88 @@ -4672,7 +4672,7 @@ _02123460: ldrb r0, [r5, #0x168] cmp r0, #0 beq _02123484 - ldr r0, _0212355c ; =data_027e0fb8 + ldr r0, _0212355c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13IsNotTouchingEv cmp r0, #0 @@ -4738,7 +4738,7 @@ _0212354c: .word 0x0000019e _02123550: .word gItemManager _02123554: .word gPlayerLink _02123558: .word gPlayer -_0212355c: .word data_027e0fb8 +_0212355c: .word gPlayerControl _02123560: .word data_027e0f64 _02123564: .word data_027e0e58 arm_func_end func_ov14_02123254 @@ -5179,7 +5179,7 @@ _02123ab0: ldrb r0, [r6, #0x16a] cmp r0, #0 beq _02123ad4 - ldr r0, _02123ba0 ; =data_027e0fb8 + ldr r0, _02123ba0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13IsNotTouchingEv cmp r0, #0 @@ -5240,7 +5240,7 @@ _02123b44: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02123b9c: .word 0x00000b33 -_02123ba0: .word data_027e0fb8 +_02123ba0: .word gPlayerControl _02123ba4: .word data_027e0f64 arm_func_end func_ov14_02123994 @@ -13047,7 +13047,7 @@ _0212a0f0: ldmia sp!, {r4, pc} _0212a0fc: ldr r2, [r4, #0x1c] - ldr r1, _0212a1e8 ; =data_027e0fb8 + ldr r1, _0212a1e8 ; =gPlayerControl add ip, r2, #0x800 ldr lr, [r4, #0x20] ldr r3, [r4, #0x18] @@ -13109,7 +13109,7 @@ _0212a1dc: add sp, sp, #0x20 ldmia sp!, {r4, pc} .align 2, 0 -_0212a1e8: .word data_027e0fb8 +_0212a1e8: .word gPlayerControl _0212a1ec: .word data_027e0e58 _0212a1f0: .word 0x0000025d _0212a1f4: .word 0x0000025e diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index ae68534f..82664f2a 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -169,7 +169,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerVel -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e0fc0 .extern data_027e0fc4 .extern gPlayerLink diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index b2309c16..44870c57 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -1308,7 +1308,7 @@ _0213c634: cmpeq r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} - ldr r0, _0213c8d4 ; =data_027e0fb8 + ldr r0, _0213c8d4 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -1456,7 +1456,7 @@ _0213c8c4: .word data_027e103c _0213c8c8: .word 0x000002ff _0213c8cc: .word data_027e077c _0213c8d0: .word data_027e0c68 -_0213c8d4: .word data_027e0fb8 +_0213c8d4: .word gPlayerControl _0213c8d8: .word 0x00020010 _0213c8dc: .word data_ov00_020eec9c _0213c8e0: .word gItemManager @@ -1954,7 +1954,7 @@ func_ov14_0213cf2c: ; 0x0213cf2c cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0213cf84 ; =data_027e0fb8 + ldr r0, _0213cf84 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -1965,7 +1965,7 @@ func_ov14_0213cf2c: ; 0x0213cf2c ldmia sp!, {r4, pc} .align 2, 0 _0213cf80: .word data_027e103c -_0213cf84: .word data_027e0fb8 +_0213cf84: .word gPlayerControl arm_func_end func_ov14_0213cf2c .global func_ov14_0213cf88 @@ -4914,7 +4914,7 @@ _0213f0b4: .word data_027e0fd8 arm_func_start func_ov14_0213f0b8 func_ov14_0213f0b8: ; 0x0213f0b8 stmdb sp!, {r4, lr} - ldr r1, _0213f0fc ; =data_027e0fb8 + ldr r1, _0213f0fc ; =gPlayerControl mov r2, #0 ldr r1, [r1] mov r4, r0 @@ -4931,7 +4931,7 @@ func_ov14_0213f0b8: ; 0x0213f0b8 blx func_ov00_020bd5fc ldmia sp!, {r4, pc} .align 2, 0 -_0213f0fc: .word data_027e0fb8 +_0213f0fc: .word gPlayerControl _0213f100: .word data_ov00_020e5684 arm_func_end func_ov14_0213f0b8 @@ -5409,7 +5409,7 @@ _0213f644: bl func_ov14_0213f724 mov r2, #0 strb r2, [r0, #0x27] - ldr r1, _0213f714 ; =data_027e0fb8 + ldr r1, _0213f714 ; =gPlayerControl strb r2, [r0, #0x28] ldr r0, [r1] bl _ZN13PlayerControl20UpdateUsingEquipItemEv @@ -5449,7 +5449,7 @@ _0213f6e4: _0213f708: .word data_027e0fd4 _0213f70c: .word 0x000003ae _0213f710: .word gPlayerVel -_0213f714: .word data_027e0fb8 +_0213f714: .word gPlayerControl _0213f718: .word data_027e0e58 _0213f71c: .word gPlayerPos _0213f720: .word 0x000001a7 diff --git a/asm/ov15.inc b/asm/ov15.inc index 12a21aa4..e73c546d 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -222,7 +222,7 @@ .extern gPlayerVel .extern gPlayerAngle .extern data_027e0fb0 -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e0fc4 .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov15.s b/asm/ov15.s index e61032b1..ac97568a 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -27098,7 +27098,7 @@ _021363fc: .word data_ov15_0218a9d8 arm_func_start func_ov15_02136400 func_ov15_02136400: ; 0x02136400 stmdb sp!, {r4, lr} - ldr r1, _021364a8 ; =data_027e0fb8 + ldr r1, _021364a8 ; =gPlayerControl mov r4, r0 ldr r0, [r1] ldrb r0, [r0, #0x79] @@ -27144,7 +27144,7 @@ _02136494: bl func_ov09_0211555c ldmia sp!, {r4, pc} .align 2, 0 -_021364a8: .word data_027e0fb8 +_021364a8: .word gPlayerControl _021364ac: .word data_ov00_020eec9c arm_func_end func_ov15_02136400 @@ -27170,7 +27170,7 @@ func_ov15_021364b0: ; 0x021364b0 cmp r1, r0 addne sp, sp, #0x20 ldmneia sp!, {r4, pc} - ldr r0, _02136610 ; =data_027e0fb8 + ldr r0, _02136610 ; =gPlayerControl ldr r0, [r0] ldrb r1, [r0, #0x79] cmp r1, #0 @@ -27242,7 +27242,7 @@ _021365e8: ldmia sp!, {r4, pc} .align 2, 0 _0213660c: .word data_027e0e2c -_02136610: .word data_027e0fb8 +_02136610: .word gPlayerControl _02136614: .word gPlayerVel _02136618: .word gPlayerPos _0213661c: .word data_027e0ffc @@ -29305,7 +29305,7 @@ _02138224: str r0, [r4, #0x34] cmp r0, #0x5a blt _02138268 - ldr r0, _021382f8 ; =data_027e0fb8 + ldr r0, _021382f8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl17IsNotUntouchedNowEv cmp r0, #0 @@ -29357,7 +29357,7 @@ _021382e8: .word gPlayerPos _021382ec: .word data_027e0e58 _021382f0: .word 0x0000019a _021382f4: .word gMapManager -_021382f8: .word data_027e0fb8 +_021382f8: .word gPlayerControl _021382fc: .word data_ov00_020eec9c _02138300: .word 0xfffffa66 _02138304: .word 0x5e6ea9af @@ -30144,7 +30144,7 @@ _02138c30: _02138e84: cmp r2, #0 beq _02138e9c - ldr r0, _02138fc0 ; =data_027e0fb8 + ldr r0, _02138fc0 ; =gPlayerControl ldr r0, [r0] blx _ZN13PlayerControl9UpdateAimEv b _02138eb8 @@ -30225,7 +30225,7 @@ _02138fb0: .word gMapManager _02138fb4: .word gPlayerAngle _02138fb8: .word gSinCosTable _02138fbc: .word data_027e0f6c -_02138fc0: .word data_027e0fb8 +_02138fc0: .word gPlayerControl _02138fc4: .word data_ov15_0218eeb4 _02138fc8: .word data_027e0d0c arm_func_end func_ov15_02138bc8 @@ -30416,7 +30416,7 @@ _0213922c: add r1, sp, #0x14 mov r0, r7 bl func_ov15_02135d78 - ldr r0, _021394f0 ; =data_027e0fb8 + ldr r0, _021394f0 ; =gPlayerControl ldr r0, [r0] blx _ZN13PlayerControl9UpdateAimEv b _021393f4 @@ -30523,7 +30523,7 @@ _021392cc: mov r0, #0x28 str r0, [r7, #0x268] _021393f4: - ldr r0, _021394f0 ; =data_027e0fb8 + ldr r0, _021394f0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv ldr r1, [r5] @@ -30590,7 +30590,7 @@ _021394dc: .align 2, 0 _021394e8: .word data_027e0d38 _021394ec: .word data_027e0f64 -_021394f0: .word data_027e0fb8 +_021394f0: .word gPlayerControl _021394f4: .word gPlayerAngle _021394f8: .word 0xfffffccd _021394fc: .word gPlayerPos @@ -31545,7 +31545,7 @@ _0213a260: moveq r0, #0 streqb r0, [r5, #0x26d] streqb r0, [r5, #0x26c] - ldr r0, _0213a46c ; =data_027e0fb8 + ldr r0, _0213a46c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020af2d4Ejb cmp r0, #0 @@ -31675,7 +31675,7 @@ _0213a45c: .word data_027e103c _0213a460: .word gAdventureFlags _0213a464: .word data_027e0e2c _0213a468: .word data_027e0d38 -_0213a46c: .word data_027e0fb8 +_0213a46c: .word gPlayerControl _0213a470: .word gPlayerPos _0213a474: .word data_027e0d78 _0213a478: .word data_ov15_02190458 @@ -34879,7 +34879,7 @@ _0213cfb0: .word data_ov15_0218ef1c arm_func_start func_ov15_0213cfb4 func_ov15_0213cfb4: ; 0x0213cfb4 stmdb sp!, {r4, lr} - ldr r2, _0213cfe4 ; =data_027e0fb8 + ldr r2, _0213cfe4 ; =gPlayerControl mov r4, r0 ldr r0, [r2] mov r2, r1 @@ -34891,7 +34891,7 @@ func_ov15_0213cfb4: ; 0x0213cfb4 bl func_ov15_0213dcc0 ldmia sp!, {r4, pc} .align 2, 0 -_0213cfe4: .word data_027e0fb8 +_0213cfe4: .word gPlayerControl arm_func_end func_ov15_0213cfb4 .global func_ov15_0213cfe8 @@ -54740,7 +54740,7 @@ _0214da40: ldrb r0, [r5, #0x158] cmp r0, #0 beq _0214da70 - ldr r0, _0214dbe8 ; =data_027e0fb8 + ldr r0, _0214dbe8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13IsNotTouchingEv cmp r0, #0 @@ -54847,7 +54847,7 @@ _0214dbd0: add sp, sp, #0x94 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_0214dbe8: .word data_027e0fb8 +_0214dbe8: .word gPlayerControl _0214dbec: .word data_027e0f64 _0214dbf0: .word data_ov15_0218f62c _0214dbf4: .word data_ov15_0218f65c @@ -54886,7 +54886,7 @@ func_ov15_0214dc1c: ; 0x0214dc1c ldrb r0, [r5, #0x158] cmp r0, #0 beq _0214dc74 - ldr r0, _0214dca8 ; =data_027e0fb8 + ldr r0, _0214dca8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13IsNotTouchingEv cmp r0, #0 @@ -54909,7 +54909,7 @@ _0214dc94: bl func_ov00_0207a1c8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0214dca8: .word data_027e0fb8 +_0214dca8: .word gPlayerControl arm_func_end func_ov15_0214dc1c .global func_ov15_0214dcac @@ -55021,14 +55021,14 @@ _0214de08: add sp, sp, #0x34 ldmia sp!, {r3, r4, pc} _0214de3c: - ldr r0, _0214e070 ; =data_027e0fb8 + ldr r0, _0214e070 ; =gPlayerControl mov r1, #1 ldr r0, [r0] mov r2, r1 bl _ZN13PlayerControl18func_ov00_020af2d4Ejb cmp r0, #0 beq _0214dec4 - ldr r0, _0214e070 ; =data_027e0fb8 + ldr r0, _0214e070 ; =gPlayerControl ldr r3, [r0] ldrh r0, [r3, #0x34] tst r0, #1 @@ -55134,7 +55134,7 @@ _0214df94: add sp, sp, #0x34 ldmia sp!, {r3, r4, pc} _0214dfe4: - ldr r0, _0214e070 ; =data_027e0fb8 + ldr r0, _0214e070 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -55171,7 +55171,7 @@ _0214e060: .word data_027e0f64 _0214e064: .word gPlayerPos _0214e068: .word gPlayerAngle _0214e06c: .word data_027e1060 -_0214e070: .word data_027e0fb8 +_0214e070: .word gPlayerControl _0214e074: .word data_ov09_0211f5b4 arm_func_end func_ov15_0214dcac @@ -91760,7 +91760,7 @@ func_ov15_0216d7b4: ; 0x0216d7b4 add r3, sp, #0x10 bl func_ov00_020c4048 mov r3, #0 - ldr r0, _0216d86c ; =data_027e0fb8 + ldr r0, _0216d86c ; =gPlayerControl strb r3, [r4, #0x18] ldr r2, [r0] mov r1, #1 @@ -91776,7 +91776,7 @@ _0216d85c: .word data_ov09_0211f5ca _0216d860: .word data_ov15_02186ae0 _0216d864: .word data_027e0fe8 _0216d868: .word 0x4d544354 -_0216d86c: .word data_027e0fb8 +_0216d86c: .word gPlayerControl arm_func_end func_ov15_0216d7b4 .global func_ov15_0216d870 @@ -91798,14 +91798,14 @@ func_ov15_0216d870: ; 0x0216d870 mov r1, #1 strb r1, [r0] _0216d8ac: - ldr r0, _0216d8c4 ; =data_027e0fb8 + ldr r0, _0216d8c4 ; =gPlayerControl mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x7a] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0216d8c0: .word data_ov09_0211f5ca -_0216d8c4: .word data_027e0fb8 +_0216d8c4: .word gPlayerControl arm_func_end func_ov15_0216d870 .global func_ov15_0216d8c8 @@ -93829,25 +93829,25 @@ _0216f434: .word 0x00000666 .global func_ov15_0216f438 arm_func_start func_ov15_0216f438 func_ov15_0216f438: ; 0x0216f438 - ldr r1, _0216f44c ; =data_027e0fb8 + ldr r1, _0216f44c ; =gPlayerControl mov r2, #0 ldr r1, [r1] strb r2, [r1, #0x7a] bx lr .align 2, 0 -_0216f44c: .word data_027e0fb8 +_0216f44c: .word gPlayerControl arm_func_end func_ov15_0216f438 .global func_ov15_0216f450 arm_func_start func_ov15_0216f450 func_ov15_0216f450: ; 0x0216f450 - ldr r1, _0216f464 ; =data_027e0fb8 + ldr r1, _0216f464 ; =gPlayerControl mov r2, #1 ldr r1, [r1] strb r2, [r1, #0x7a] bx lr .align 2, 0 -_0216f464: .word data_027e0fb8 +_0216f464: .word gPlayerControl arm_func_end func_ov15_0216f450 .global func_ov15_0216f468 diff --git a/asm/ov17.inc b/asm/ov17.inc index c5036765..ce726941 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -100,7 +100,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e0fc4 .extern gPlayerLink .extern data_027e0fe0 diff --git a/asm/ov17.s b/asm/ov17.s index 1e2d7949..254a40a8 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -15761,7 +15761,7 @@ _02167b9c: add sp, sp, #0x24 ldmia sp!, {r4, r5, pc} _02167bd4: - ldr r0, _02167ccc ; =data_027e0fb8 + ldr r0, _02167ccc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13IsNotTouchingEv cmp r0, #0 @@ -15827,7 +15827,7 @@ _02167cbc: .align 2, 0 _02167cc4: .word gAdventureFlags _02167cc8: .word gActorManager -_02167ccc: .word data_027e0fb8 +_02167ccc: .word gPlayerControl _02167cd0: .word data_027e0f64 arm_func_end func_ov17_02167aac diff --git a/asm/ov19.inc b/asm/ov19.inc index 26162438..6ee13fe3 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -121,7 +121,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerVel -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov19.s b/asm/ov19.s index 2f3ae90b..247d0bcf 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -10017,7 +10017,7 @@ func_ov19_02175a2c: ; 0x02175a2c ldrsh r0, [r4, #0x10] cmp r0, #0 ble _02175ae8 - ldr r0, _02175c28 ; =data_027e0fb8 + ldr r0, _02175c28 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14IsTouchingFastEv cmp r0, #0 @@ -10135,7 +10135,7 @@ _02175be8: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02175c28: .word data_027e0fb8 +_02175c28: .word gPlayerControl _02175c2c: .word 0xb60b60b7 _02175c30: .word data_ov00_020eec9c _02175c34: .word gMapManager diff --git a/asm/ov22.inc b/asm/ov22.inc index fb1afe8a..78e9bb73 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -116,7 +116,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fd4 .extern data_027e0fe0 diff --git a/asm/ov22.s b/asm/ov22.s index c3ca5ea9..abfb895c 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -10938,7 +10938,7 @@ _02176560: ldmia sp!, {r4, pc} _0217656c: ldr r2, [r4, #0x1c] - ldr r1, _02176638 ; =data_027e0fb8 + ldr r1, _02176638 ; =gPlayerControl add ip, r2, #0x800 ldr lr, [r4, #0x20] ldr r3, [r4, #0x18] @@ -10991,7 +10991,7 @@ _0217662c: add sp, sp, #0x20 ldmia sp!, {r4, pc} .align 2, 0 -_02176638: .word data_027e0fb8 +_02176638: .word gPlayerControl _0217663c: .word data_027e0e58 _02176640: .word 0x0000025d _02176644: .word 0x0000025e diff --git a/asm/ov23.inc b/asm/ov23.inc index 9c0ed4a3..0b112b09 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -152,7 +152,7 @@ .extern gPlayerPos .extern gPlayerVel .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fcc .extern data_027e0fd0 diff --git a/asm/ov23.s b/asm/ov23.s index 9935ded1..aea8bb02 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -4711,7 +4711,7 @@ func_ov23_021712fc: ; 0x021712fc mov r4, r0 cmp r1, #0 bne _02171324 - ldr r0, _02171394 ; =data_027e0fb8 + ldr r0, _02171394 ; =gPlayerControl ldr r0, [r0] bl func_ov23_02177e24 cmp r0, #0 @@ -4723,7 +4723,7 @@ _02171324: mov r0, #1 ldmia sp!, {r4, pc} _02171338: - ldr r1, _02171394 ; =data_027e0fb8 + ldr r1, _02171394 ; =gPlayerControl ldr r0, _02171398 ; =gActorManager ldr r3, [r1] ldr r0, [r0] @@ -4748,7 +4748,7 @@ _02171388: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_02171394: .word data_027e0fb8 +_02171394: .word gPlayerControl _02171398: .word gActorManager arm_func_end func_ov23_021712fc @@ -4810,7 +4810,7 @@ func_ov23_02171410: ; 0x02171410 cmp r0, #0 addeq sp, sp, #0x28 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _02171698 ; =data_027e0fb8 + ldr r0, _02171698 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x80] cmp r0, #0 @@ -4874,7 +4874,7 @@ _02171510: mov r0, r7 bl _ZN13LinkStateBase14GetPlayerAngleEv strh r4, [r0] - ldr r0, _02171698 ; =data_027e0fb8 + ldr r0, _02171698 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev mov r0, r7 @@ -4941,7 +4941,7 @@ _02171614: mov r0, r7 bl _ZN13LinkStateBase14GetPlayerAngleEv strh r4, [r0] - ldr r0, _02171698 ; =data_027e0fb8 + ldr r0, _02171698 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev mov r0, r7 @@ -4956,7 +4956,7 @@ _02171614: add sp, sp, #0x28 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02171698: .word data_027e0fb8 +_02171698: .word gPlayerControl _0217169c: .word 0x50574253 _021716a0: .word 0x0000059a _021716a4: .word data_027e0ffc @@ -4983,7 +4983,7 @@ func_ov23_021716b0: ; 0x021716b0 cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, r5, r6, pc} - ldr r0, _0217180c ; =data_027e0fb8 + ldr r0, _0217180c ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x80] cmp r0, #0 @@ -5041,7 +5041,7 @@ _02171788: mov r0, r5 bl _ZN13LinkStateBase14GetPlayerAngleEv strh r4, [r0] - ldr r0, _0217180c ; =data_027e0fb8 + ldr r0, _0217180c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev mov r0, r5 @@ -5056,7 +5056,7 @@ _02171788: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0217180c: .word data_027e0fb8 +_0217180c: .word gPlayerControl _02171810: .word 0x00000171 _02171814: .word 0x000004cd _02171818: .word data_027e0ffc @@ -5199,10 +5199,10 @@ _021719b0: mov r6, r0, asr #0x10 b _02171a38 _02171a18: - ldr r0, _02172088 ; =data_027e0fb8 + ldr r0, _02172088 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv - ldr r1, _02172088 ; =data_027e0fb8 + ldr r1, _02172088 ; =gPlayerControl mov r5, r0 ldr r0, [r1] bl _ZN13PlayerControl13GetTouchAngleEv @@ -5429,7 +5429,7 @@ _02171d34: cmp r0, #0 addeq sp, sp, #0x4c ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc} - ldr r0, _02172088 ; =data_027e0fb8 + ldr r0, _02172088 ; =gPlayerControl ldr r0, [r0] ldrb r1, [r0, #0x80] cmp r1, #0 @@ -5450,7 +5450,7 @@ _02171d34: ldr r1, [r1, #8] str r1, [r0, #8] _02171dd4: - ldr r0, _02172088 ; =data_027e0fb8 + ldr r0, _02172088 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv _02171de0: @@ -5458,7 +5458,7 @@ _02171de0: strb r0, [r4, #0x2b] b _02171e18 _02171dec: - ldr r0, _02172088 ; =data_027e0fb8 + ldr r0, _02172088 ; =gPlayerControl ldr r0, [r0] ldr r1, [r0, #0xa0] cmp r1, #0 @@ -5466,7 +5466,7 @@ _02171dec: bl _ZN13PlayerControl14GetFollowActorEv cmp r0, #0 bne _02171e18 - ldr r0, _02172088 ; =data_027e0fb8 + ldr r0, _02172088 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv _02171e18: @@ -5633,7 +5633,7 @@ _02172078: .word 0x5b672f7d _0217207c: .word data_027e0ffc _02172080: .word 0x0000038b _02172084: .word data_ov23_0217a2c4 -_02172088: .word data_027e0fb8 +_02172088: .word gPlayerControl _0217208c: .word 0x0000059a _02172090: .word gAdventureFlags _02172094: .word 0x00000666 diff --git a/asm/ov25.inc b/asm/ov25.inc index a478b8b6..08df3cea 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -116,7 +116,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov25.s b/asm/ov25.s index 9598a5b5..586b75a2 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -3790,7 +3790,7 @@ _021709d4: mov r0, r4 str r2, [r1, #0x10] bl func_ov25_0216ef9c - ldr r1, _02170d58 ; =data_027e0fb8 + ldr r1, _02170d58 ; =gPlayerControl mov r0, r4 ldr r1, [r1] mov r2, #1 @@ -3996,7 +3996,7 @@ _02170d38: ldmia sp!, {r4, pc} .align 2, 0 _02170d54: .word gPlayerLink -_02170d58: .word data_027e0fb8 +_02170d58: .word gPlayerControl _02170d5c: .word gPlayerAngle _02170d60: .word data_ov25_0217a880 _02170d64: .word data_027e0ff0 diff --git a/asm/ov27.inc b/asm/ov27.inc index 6fa6ea93..278966d5 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -101,7 +101,7 @@ .extern gPlayerPos .extern gPlayerVel .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fd4 .extern data_027e0fe0 diff --git a/asm/ov27.s b/asm/ov27.s index f7652c28..e1cc6665 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -3454,7 +3454,7 @@ _02170630: add r1, r1, #0x400 add r2, sp, #0x14 bl func_ov00_0207c474 - ldr r0, _021708c8 ; =data_027e0fb8 + ldr r0, _021708c8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14IsTouchingFastEv cmp r0, #0 @@ -3547,7 +3547,7 @@ _021708b8: .word gPlayerLink _021708bc: .word data_027e0ffc _021708c0: .word 0x00000239 _021708c4: .word data_027e0e58 -_021708c8: .word data_027e0fb8 +_021708c8: .word gPlayerControl _021708cc: .word data_027e0f64 _021708d0: .word gPlayer arm_func_end func_ov27_02170480 @@ -11514,7 +11514,7 @@ _02177370: mov r1, #1 ldr r0, [r0] bl func_ov05_02103fc8 - ldr r1, _02177678 ; =data_027e0fb8 + ldr r1, _02177678 ; =gPlayerControl ldr r0, _0217767c ; =data_027e0cbc ldr r1, [r1] mov r2, #0 @@ -11546,7 +11546,7 @@ _021773f4: mov r1, #0 ldr r0, [r0] bl func_ov05_02103fc8 - ldr r0, _02177678 ; =data_027e0fb8 + ldr r0, _02177678 ; =gPlayerControl mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x7a] @@ -11689,7 +11689,7 @@ _02177664: .align 2, 0 _02177670: .word gPlayer _02177674: .word data_027e103c -_02177678: .word data_027e0fb8 +_02177678: .word gPlayerControl _0217767c: .word data_027e0cbc _02177680: .word gAdventureFlags _02177684: .word data_027e0f64 diff --git a/asm/ov29.inc b/asm/ov29.inc index 87607c16..a07f4b51 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -97,7 +97,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov29.s b/asm/ov29.s index ceebe87d..f429c2c5 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -237,7 +237,7 @@ _0216d92c: .word data_ov29_0217a4ac func_ov29_0216d930: ; 0x0216d930 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - ldr r0, _0216d984 ; =data_027e0fb8 + ldr r0, _0216d984 ; =gPlayerControl movs r4, r1 moveq r2, #1 movne r2, #0 @@ -258,7 +258,7 @@ _0216d968: strb r4, [r5, #0x54] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0216d984: .word data_027e0fb8 +_0216d984: .word gPlayerControl _0216d988: .word data_027e103c arm_func_end func_ov29_0216d930 diff --git a/asm/ov35.inc b/asm/ov35.inc index 537204ab..2a3b0bb2 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -95,7 +95,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fcc .extern data_027e0fe0 diff --git a/asm/ov35.s b/asm/ov35.s index ad3daabf..423b28af 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -6472,7 +6472,7 @@ func_ov35_0218174c: ; 0x0218174c mov r1, #1 mov r4, r0 bl func_ov35_02182fa8 - ldr r0, _021817fc ; =data_027e0fb8 + ldr r0, _021817fc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14IsTouchingFastEv cmp r0, #0 @@ -6516,7 +6516,7 @@ _021817c4: str r0, [r4, #0x548] ldmia sp!, {r4, pc} .align 2, 0 -_021817fc: .word data_027e0fb8 +_021817fc: .word gPlayerControl _02181800: .word gPlayerLink _02181804: .word gPlayer _02181808: .word data_ov00_020eec9c @@ -7473,7 +7473,7 @@ _0218255c: .word 0xffffe333 arm_func_start func_ov35_02182560 func_ov35_02182560: ; 0x02182560 stmdb sp!, {r4, lr} - ldr r1, _0218260c ; =data_027e0fb8 + ldr r1, _0218260c ; =gPlayerControl mov r4, r0 ldr r0, [r1] mov r1, #1 @@ -7519,7 +7519,7 @@ _021825d4: str r0, [r4, #0x548] ldmia sp!, {r4, pc} .align 2, 0 -_0218260c: .word data_027e0fb8 +_0218260c: .word gPlayerControl _02182610: .word gPlayerLink _02182614: .word gPlayer _02182618: .word data_ov00_020eec9c diff --git a/asm/ov39.inc b/asm/ov39.inc index 1b6b8665..aa2121de 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -85,7 +85,7 @@ .extern gPlayer .extern gPlayerPos .extern gPlayerAngle -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov39.s b/asm/ov39.s index a6960a5c..f9f6e7c5 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -7314,7 +7314,7 @@ func_ov39_02182284: ; 0x02182284 bl func_ov39_0217f10c mov r0, r4 bl func_ov39_0217f278 - ldr r0, _021823e8 ; =data_027e0fb8 + ldr r0, _021823e8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14IsTouchingFastEv cmp r0, #0 @@ -7400,7 +7400,7 @@ _0218233c: add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 -_021823e8: .word data_027e0fb8 +_021823e8: .word gPlayerControl _021823ec: .word gPlayerLink _021823f0: .word gPlayerPos _021823f4: .word data_027e0ffc diff --git a/asm/ov42.inc b/asm/ov42.inc index 6cc4857a..4d9dec93 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -66,7 +66,7 @@ .extern data_027e0f64 .extern data_027e0f78 .extern gPlayerPos -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov42.s b/asm/ov42.s index db37b11f..da4dcca3 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -425,7 +425,7 @@ _02189a74: moveq r0, #5 movne r0, #0x78 str r0, [r7, #0x60] - ldr r0, _02189b14 ; =data_027e0fb8 + ldr r0, _02189b14 ; =gPlayerControl ldr r1, [r0] ldr r0, _02189b18 ; =data_ov00_020eec68 strb r2, [r1, #0x7a] @@ -454,7 +454,7 @@ _02189b04: .word data_ov42_0218c6f4 _02189b08: .word 0x4d544748 _02189b0c: .word data_027e0fe8 _02189b10: .word 0x4d544752 -_02189b14: .word data_027e0fb8 +_02189b14: .word gPlayerControl _02189b18: .word data_ov00_020eec68 _02189b1c: .word data_027e0ffc arm_func_end func_ov42_02189834 @@ -465,7 +465,7 @@ func_ov42_02189b20: ; 0x02189b20 stmdb sp!, {r4, lr} mov r4, r0 mov r1, #0 - ldr r0, _02189b7c ; =data_027e0fb8 + ldr r0, _02189b7c ; =gPlayerControl strb r1, [r4, #0x65] ldr r0, [r0] strb r1, [r0, #0x79] @@ -486,7 +486,7 @@ func_ov42_02189b20: ; 0x02189b20 strb r2, [r0, #0x24] ldmia sp!, {r4, pc} .align 2, 0 -_02189b7c: .word data_027e0fb8 +_02189b7c: .word gPlayerControl _02189b80: .word data_027e0ffc arm_func_end func_ov42_02189b20 @@ -536,7 +536,7 @@ _02189be4: blx _ZN11ItemManager20ClearForcedEquipItemEv bl func_ov42_02189ce8 mov r1, #0 - ldr r2, _02189cd4 ; =data_027e0fb8 + ldr r2, _02189cd4 ; =gPlayerControl strb r1, [r0, #0xb] ldr r2, [r2] mov r3, #1 @@ -581,7 +581,7 @@ _02189c88: .align 2, 0 _02189ccc: .word gActorManager _02189cd0: .word gItemManager -_02189cd4: .word data_027e0fb8 +_02189cd4: .word gPlayerControl _02189cd8: .word data_027e0f64 _02189cdc: .word data_ov09_0211f5b4 _02189ce0: .word data_ov00_020eec68 @@ -617,7 +617,7 @@ func_ov42_02189cf8: ; 0x02189cf8 bl func_ov42_0218aa8c mov r3, #1 mov r2, #0x8000 - ldr r0, _02189e50 ; =data_027e0fb8 + ldr r0, _02189e50 ; =gPlayerControl strb r3, [r4, #0x64] ldr r1, [r0] ldr r0, _02189e4c ; =gPlayerLink @@ -695,7 +695,7 @@ _02189e44: ldmia sp!, {r4, pc} .align 2, 0 _02189e4c: .word gPlayerLink -_02189e50: .word data_027e0fb8 +_02189e50: .word gPlayerControl _02189e54: .word gPlayerPos _02189e58: .word data_ov00_020eec9c _02189e5c: .word 0x88888889 @@ -705,7 +705,7 @@ _02189e5c: .word 0x88888889 arm_func_start func_ov42_02189e60 func_ov42_02189e60: ; 0x02189e60 stmdb sp!, {r3, lr} - ldr r0, _02189e84 ; =data_027e0fb8 + ldr r0, _02189e84 ; =gPlayerControl mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x79] @@ -714,7 +714,7 @@ func_ov42_02189e60: ; 0x02189e60 bl func_ov42_0218afa8 ldmia sp!, {r3, pc} .align 2, 0 -_02189e84: .word data_027e0fb8 +_02189e84: .word gPlayerControl arm_func_end func_ov42_02189e60 .global func_ov42_02189e88 diff --git a/asm/ov45.inc b/asm/ov45.inc index dc3b6846..81d19265 100644 --- a/asm/ov45.inc +++ b/asm/ov45.inc @@ -61,7 +61,7 @@ .extern data_027e0e58 .extern data_027e0f64 .extern gPlayerPos -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fe0 .extern data_027e0ff8 diff --git a/asm/ov45.s b/asm/ov45.s index 0d6f80ae..f6dd8ff9 100644 --- a/asm/ov45.s +++ b/asm/ov45.s @@ -228,7 +228,7 @@ func_ov45_02189764: ; 0x02189764 mov r0, r4 mov r1, #1 bl _ZN5Actor10SetUnk_11cEc - ldr r0, _02189894 ; =data_027e0fb8 + ldr r0, _02189894 ; =gPlayerControl mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x78] @@ -247,7 +247,7 @@ _02189884: .word data_ov45_0218e4c0 _02189888: .word data_ov45_0218e4c4 _0218988c: .word gAdventureFlags _02189890: .word 0x0000010a -_02189894: .word data_027e0fb8 +_02189894: .word gPlayerControl arm_func_end func_ov45_02189764 .global func_ov45_02189898 @@ -520,7 +520,7 @@ _02189c18: blx r1 cmp r0, #0 beq _02189c54 - ldr r0, _02189d1c ; =data_027e0fb8 + ldr r0, _02189d1c ; =gPlayerControl mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x78] @@ -584,7 +584,7 @@ _02189d0c: .word 0x00000101 _02189d10: .word 0x00000102 _02189d14: .word 0x00000103 _02189d18: .word 0x0000011f -_02189d1c: .word data_027e0fb8 +_02189d1c: .word gPlayerControl arm_func_end func_ov45_02189ab4 .global func_ov45_02189d20 diff --git a/asm/ov52.inc b/asm/ov52.inc index 4a7b7b94..b99f6860 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -76,7 +76,7 @@ .extern data_027e0f68 .extern data_027e0f78 .extern gPlayerVel -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fe0 .extern gActorManager diff --git a/asm/ov52.s b/asm/ov52.s index a76a2e13..e9537aa5 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -432,7 +432,7 @@ func_ov52_02195908: ; 0x02195908 ldr r2, _02195a14 ; =0x00000005 mov r1, #2 blx _ZN14OverlayManager15LoadIfNotLoadedEjj - ldr r1, _02195a18 ; =data_027e0fb8 + ldr r1, _02195a18 ; =gPlayerControl mov r2, #0 ldr r3, [r1] ldr r0, _02195a1c ; =data_027e103c @@ -453,7 +453,7 @@ _02195a08: .word gMapManager _02195a0c: .word gOverlayManager _02195a10: .word 0x00000004 _02195a14: .word 0x00000005 -_02195a18: .word data_027e0fb8 +_02195a18: .word gPlayerControl _02195a1c: .word data_027e103c arm_func_end func_ov52_02195908 @@ -508,7 +508,7 @@ _02195a60: ldr r2, _02195b44 ; =0x00000005 mov r1, #2 blx _ZN14OverlayManager15LoadIfNotLoadedEjj - ldr r0, _02195b48 ; =data_027e0fb8 + ldr r0, _02195b48 ; =gPlayerControl mov r1, r4 ldr r3, [r0] ldr r0, _02195b4c ; =data_ov52_02197c6c @@ -536,7 +536,7 @@ _02195b38: .word gMapManager _02195b3c: .word gOverlayManager _02195b40: .word 0x00000004 _02195b44: .word 0x00000005 -_02195b48: .word data_027e0fb8 +_02195b48: .word gPlayerControl _02195b4c: .word data_ov52_02197c6c _02195b50: .word data_ov52_02197c68 _02195b54: .word data_ov52_02197c70 diff --git a/asm/ov53.inc b/asm/ov53.inc index 6eeed521..7c9bc895 100644 --- a/asm/ov53.inc +++ b/asm/ov53.inc @@ -23,7 +23,7 @@ .extern gMapManager .extern data_027e0f64 .extern gPlayerPos -.extern data_027e0fb8 +.extern gPlayerControl .extern gActorManager .extern data_027e0fe8 .extern data_027e0ffc diff --git a/asm/ov53.s b/asm/ov53.s index 9191dce5..4af9f62c 100644 --- a/asm/ov53.s +++ b/asm/ov53.s @@ -544,7 +544,7 @@ func_ov53_02199318: ; 0x02199318 _02199368: cmp r5, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _021993d8 ; =data_027e0fb8 + ldr r0, _021993d8 ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x7d] cmp r0, #0 @@ -571,7 +571,7 @@ _02199368: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _021993d4: .word data_ov53_0219a180 -_021993d8: .word data_027e0fb8 +_021993d8: .word gPlayerControl _021993dc: .word data_027e0de4 _021993e0: .word func_ov53_02199014 _021993e4: .word func_ov53_02199020 @@ -825,7 +825,7 @@ func_ov53_02199730: ; 0x02199730 mov r4, r0 bl _ZN13LinkStateBase18func_ov00_020a89bcEii ldr r1, _02199774 ; =data_027e0d0c - ldr r0, _02199778 ; =data_027e0fb8 + ldr r0, _02199778 ; =gPlayerControl ldr r2, [r1] str r2, [r4, #0x44] ldr r2, [r1, #4] @@ -838,7 +838,7 @@ func_ov53_02199730: ; 0x02199730 .align 2, 0 _02199770: .word data_ov53_0219a0f4 _02199774: .word data_027e0d0c -_02199778: .word data_027e0fb8 +_02199778: .word gPlayerControl arm_func_end func_ov53_02199730 .global func_ov53_0219977c @@ -855,7 +855,7 @@ func_ov53_0219977c: ; 0x0219977c ldr r1, [r1, #8] cmp r1, r0 bne _021998b0 - ldr r0, _021999fc ; =data_027e0fb8 + ldr r0, _021999fc ; =gPlayerControl add r1, sp, #0x38 ldr r0, [r0] add r3, r5, #0x44 @@ -882,7 +882,7 @@ _021997ec: bl _ZN13LinkStateBase18func_ov00_020a81fcEv b _02199850 _0219980c: - ldr r0, _021999fc ; =data_027e0fb8 + ldr r0, _021999fc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14IsUntouchedNowEv cmp r0, #0 @@ -953,7 +953,7 @@ _0219990c: bl _ZN13LinkStateBase18func_ov00_020a8b3cEi cmp r0, #0 beq _02199938 - ldr r0, _021999fc ; =data_027e0fb8 + ldr r0, _021999fc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl20UpdateUsingEquipItemEv mov r0, r5 @@ -1011,7 +1011,7 @@ _02199938: ldmia sp!, {r4, r5, pc} .align 2, 0 _021999f8: .word data_ov53_0219a0ec -_021999fc: .word data_027e0fb8 +_021999fc: .word gPlayerControl _02199a00: .word data_ov53_0219a104 _02199a04: .word data_027e0f64 _02199a08: .word gPlayerPos diff --git a/asm/ov54.inc b/asm/ov54.inc index b0f9cf40..45e972ca 100644 --- a/asm/ov54.inc +++ b/asm/ov54.inc @@ -32,7 +32,7 @@ .extern data_027e0d38 .extern data_027e0e58 .extern gMapManager -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e0fcc .extern data_027e0fd4 .extern gActorManager diff --git a/asm/ov54.s b/asm/ov54.s index f0ba2ea7..c997494c 100644 --- a/asm/ov54.s +++ b/asm/ov54.s @@ -68,10 +68,10 @@ func_ov54_02198d68: ; 0x02198d68 cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02198e00 ; =data_027e0fb8 + ldr r0, _02198e00 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14GetFollowActorEv - ldr r1, _02198e00 ; =data_027e0fb8 + ldr r1, _02198e00 ; =gPlayerControl cmp r5, #0 ldr r1, [r1] ldr r1, [r1, #0xa0] @@ -100,7 +100,7 @@ _02198dec: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02198dfc: .word data_027e0fd4 -_02198e00: .word data_027e0fb8 +_02198e00: .word gPlayerControl arm_func_end func_ov54_02198d68 .global func_ov54_02198e04 @@ -381,7 +381,7 @@ _0219919c: mov r0, r7 bl _ZN13LinkStateBase18func_ov00_020a89bcEii _021991a8: - ldr r0, _021992c0 ; =data_027e0fb8 + ldr r0, _021992c0 ; =gPlayerControl mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x7a] @@ -412,19 +412,19 @@ _0219920c: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02199218: - ldr r0, _021992c0 ; =data_027e0fb8 + ldr r0, _021992c0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl14GetFollowActorEv cmp r0, #0 beq _02199244 - ldr r0, _021992c0 ; =data_027e0fb8 + ldr r0, _021992c0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl20UpdateUsingEquipItemEv add sp, sp, #0x30 mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02199244: - ldr r0, _021992c0 ; =data_027e0fb8 + ldr r0, _021992c0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv cmp r0, r4 @@ -432,7 +432,7 @@ _02199244: ldr r0, [r7, #0x58] cmp r0, #0 bne _02199284 - ldr r0, _021992c0 ; =data_027e0fb8 + ldr r0, _021992c0 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv mov r2, #0 @@ -457,7 +457,7 @@ _021992b0: .word data_ov54_021999e8 _021992b4: .word 0x00000216 _021992b8: .word data_ov00_020eec9c _021992bc: .word data_ov54_021999d8 -_021992c0: .word data_027e0fb8 +_021992c0: .word gPlayerControl _021992c4: .word gItemManager arm_func_end func_ov54_02198efc @@ -491,7 +491,7 @@ _02199310: ldr r1, _021997b0 ; =0x00000ccd mov r0, r4 bl func_ov54_02198efc - ldr r0, _021997b4 ; =data_027e0fb8 + ldr r0, _021997b4 ; =gPlayerControl mov r1, #1 ldr r3, [r0] ldrb r2, [r3, #0x7b] @@ -591,7 +591,7 @@ _02199490: ldr r1, _021997b0 ; =0x00000ccd mov r0, r4 bl func_ov54_02198efc - ldr r0, _021997b4 ; =data_027e0fb8 + ldr r0, _021997b4 ; =gPlayerControl mov r1, #1 ldr r3, [r0] ldrb r2, [r3, #0x7b] @@ -702,7 +702,7 @@ _02199640: ldr r1, _021997b0 ; =0x00000ccd mov r0, r4 bl func_ov54_02198efc - ldr r0, _021997b4 ; =data_027e0fb8 + ldr r0, _021997b4 ; =gPlayerControl mov r1, #1 ldr r3, [r0] ldrb r2, [r3, #0x7b] @@ -784,7 +784,7 @@ _0219975c: _02199788: bl func_ov54_02198efc _0219978c: - ldr r1, _021997b4 ; =data_027e0fb8 + ldr r1, _021997b4 ; =gPlayerControl mov r0, r4 ldr r1, [r1] ldrb r4, [r1, #0x7a] @@ -795,7 +795,7 @@ _0219978c: .align 2, 0 _021997ac: .word data_ov54_02199980 _021997b0: .word 0x00000ccd -_021997b4: .word data_027e0fb8 +_021997b4: .word gPlayerControl _021997b8: .word data_ov00_020eec9c _021997bc: .word data_027e0d38 _021997c0: .word gActorManager @@ -823,7 +823,7 @@ _021997ec: .word func_01fffcec func_ov54_021997f0: ; 0x021997f0 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x1c - ldr r0, _021998cc ; =data_027e0fb8 + ldr r0, _021998cc ; =gPlayerControl add r1, sp, #0 ldr r0, [r0] mov r2, #0 @@ -861,11 +861,11 @@ func_ov54_021997f0: ; 0x021997f0 _02199884: cmp r4, #0 beq _02199898 - ldr r0, _021998cc ; =data_027e0fb8 + ldr r0, _021998cc ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv _02199898: - ldr r0, _021998cc ; =data_027e0fb8 + ldr r0, _021998cc ; =gPlayerControl ldr r3, [r0] ldrb r1, [r3, #0x7a] cmp r1, #0 @@ -879,7 +879,7 @@ _02199898: add sp, sp, #0x1c ldmia sp!, {r3, r4, pc} .align 2, 0 -_021998cc: .word data_027e0fb8 +_021998cc: .word gPlayerControl _021998d0: .word gMapManager arm_func_end func_ov54_021997f0 diff --git a/asm/ov55.inc b/asm/ov55.inc index fbdcd401..17b8ec43 100644 --- a/asm/ov55.inc +++ b/asm/ov55.inc @@ -28,7 +28,7 @@ .extern gMapManager .extern data_027e0f64 .extern gPlayer -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e0fcc .extern gActorManager .extern data_027e0fe8 diff --git a/asm/ov55.s b/asm/ov55.s index 0bec5e08..df12f2df 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -228,7 +228,7 @@ func_ov55_02198f90: ; 0x02198f90 bl _ZN13LinkStateBase12GetGrabActorEv cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _0219900c ; =data_027e0fb8 + ldr r0, _0219900c ; =gPlayerControl ldr r0, [r0] ldrb r0, [r0, #0x79] cmp r0, #0 @@ -246,12 +246,12 @@ func_ov55_02198f90: ; 0x02198f90 ldr r1, [r0] ldr r1, [r1, #0x58] blx r1 - ldr r0, _0219900c ; =data_027e0fb8 + ldr r0, _0219900c ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl20UpdateUsingEquipItemEv ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0219900c: .word data_027e0fb8 +_0219900c: .word gPlayerControl arm_func_end func_ov55_02198f90 .global func_ov55_02199010 @@ -296,7 +296,7 @@ _0219907c: bl _ZN13LinkStateBase18func_ov00_020a8b80Ev cmp r0, #0 beq _02199128 - ldr r0, _021991a4 ; =data_027e0fb8 + ldr r0, _021991a4 ; =gPlayerControl add r1, sp, #8 ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p @@ -316,7 +316,7 @@ _0219907c: bl _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p b _02199128 _021990dc: - ldr r0, _021991a4 ; =data_027e0fb8 + ldr r0, _021991a4 ; =gPlayerControl add r1, sp, #8 ldr r0, [r0] mov r2, r5 @@ -348,7 +348,7 @@ _02199128: ldr r1, [r0] ldr r1, [r1, #0x58] blx r1 - ldr r0, _021991a4 ; =data_027e0fb8 + ldr r0, _021991a4 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl20UpdateUsingEquipItemEv mov r0, r4 @@ -357,7 +357,7 @@ _02199128: add sp, sp, #0x14 ldmia sp!, {r4, r5, pc} _02199178: - ldr r0, _021991a4 ; =data_027e0fb8 + ldr r0, _021991a4 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b034cEv mov r1, r0 @@ -369,7 +369,7 @@ _02199178: ldmia sp!, {r4, r5, pc} .align 2, 0 _021991a0: .word data_ov55_02199840 -_021991a4: .word data_027e0fb8 +_021991a4: .word gPlayerControl arm_func_end func_ov55_02199020 .global func_ov55_021991a8 diff --git a/asm/ov56.inc b/asm/ov56.inc index d590e55c..bc1b4331 100644 --- a/asm/ov56.inc +++ b/asm/ov56.inc @@ -14,7 +14,7 @@ .extern data_027e0d0c .extern data_027e0f64 .extern gPlayerPos -.extern data_027e0fb8 +.extern gPlayerControl .extern data_027e0fe8 .extern data_027e0ffc .extern Vec3p_Add diff --git a/asm/ov56.s b/asm/ov56.s index d0a14acb..6ed865b9 100644 --- a/asm/ov56.s +++ b/asm/ov56.s @@ -309,7 +309,7 @@ func_ov56_021990c0: ; 0x021990c0 ldr r1, _02199114 ; =data_027e0d0c strh r0, [r4, #0x2c] ldr r2, [r1] - ldr r0, _02199118 ; =data_027e0fb8 + ldr r0, _02199118 ; =gPlayerControl str r2, [r4, #0x44] ldr r2, [r1, #4] str r2, [r4, #0x48] @@ -323,7 +323,7 @@ func_ov56_021990c0: ; 0x021990c0 .align 2, 0 _02199110: .word data_ov56_021993e0 _02199114: .word data_027e0d0c -_02199118: .word data_027e0fb8 +_02199118: .word gPlayerControl arm_func_end func_ov56_021990c0 .global func_ov56_0219911c @@ -342,7 +342,7 @@ func_ov56_0219911c: ; 0x0219911c mov r5, r0 cmp r1, #5 ble _021991b0 - ldr r0, _021992d0 ; =data_027e0fb8 + ldr r0, _021992d0 ; =gPlayerControl mov r1, #1 ldr r0, [r0] bl _ZN13PlayerControl13CheckTouchingEj @@ -367,7 +367,7 @@ func_ov56_0219911c: ; 0x0219911c strh r0, [r4, #0x2c] ldmia sp!, {r3, r4, r5, pc} _021991b0: - ldr r0, _021992d0 ; =data_027e0fb8 + ldr r0, _021992d0 ; =gPlayerControl add r1, sp, #0x14 ldr r0, [r0] add r2, r4, #0x44 @@ -443,7 +443,7 @@ _0219925c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _021992cc: .word data_ov56_021993c0 -_021992d0: .word data_027e0fb8 +_021992d0: .word gPlayerControl _021992d4: .word data_ov56_021993f0 _021992d8: .word data_ov56_021993e0 _021992dc: .word data_027e0f64 diff --git a/asm/ov57.inc b/asm/ov57.inc index df7795a1..e5fff255 100644 --- a/asm/ov57.inc +++ b/asm/ov57.inc @@ -34,7 +34,7 @@ .extern data_027e0f64 .extern data_027e0f6c .extern gPlayerPos -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern gActorManager .extern data_027e0fe8 diff --git a/asm/ov57.s b/asm/ov57.s index db51c963..10b1e34d 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -1355,7 +1355,7 @@ func_ov57_02199e64: ; 0x02199e64 bl func_ov57_02199ecc mov r1, #1 bl func_ov57_021992b4 - ldr r0, _02199ec4 ; =data_027e0fb8 + ldr r0, _02199ec4 ; =gPlayerControl ldr r1, _02199ec8 ; =data_ov57_0219ab14 mov r2, #0 ldr r0, [r0] @@ -1365,7 +1365,7 @@ func_ov57_02199e64: ; 0x02199e64 .align 2, 0 _02199ebc: .word data_ov57_0219aa60 _02199ec0: .word data_027e0d0c -_02199ec4: .word data_027e0fb8 +_02199ec4: .word gPlayerControl _02199ec8: .word data_ov57_0219ab14 arm_func_end func_ov57_02199e64 @@ -1401,7 +1401,7 @@ func_ov57_02199edc: ; 0x02199edc mov r0, r5 mov r2, #1 bl _ZN13LinkStateBase18func_ov00_020a8a4cEii - ldr r0, _0219a1e8 ; =data_027e0fb8 + ldr r0, _0219a1e8 ; =gPlayerControl mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x7a] @@ -1428,7 +1428,7 @@ _02199f58: ldrb r0, [r4, #0x69] cmp r0, #0 beq _02199fb8 - ldr r0, _0219a1e8 ; =data_027e0fb8 + ldr r0, _0219a1e8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl20UpdateUsingEquipItemEv ldrb r0, [r4, #0x6a] @@ -1456,7 +1456,7 @@ _02199fe4: bl _ZN13LinkStateBase18func_ov00_020a8b80Ev cmp r0, #0 bne _0219a180 - ldr r0, _0219a1e8 ; =data_027e0fb8 + ldr r0, _0219a1e8 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl20UpdateUsingEquipItemEv mov r0, r6 @@ -1493,7 +1493,7 @@ _0219a054: bl _ZN13LinkStateBase18func_ov00_020a89bcEii b _0219a180 _0219a07c: - ldr r0, _0219a1e8 ; =data_027e0fb8 + ldr r0, _0219a1e8 ; =gPlayerControl mov r1, #1 ldr r0, [r0] bl _ZN13PlayerControl17CheckUntouchedNowEj @@ -1522,7 +1522,7 @@ _0219a0d4: cmp r0, #0 addne r1, r4, #0x18 str r1, [sp] - ldr r0, _0219a1e8 ; =data_027e0fb8 + ldr r0, _0219a1e8 ; =gPlayerControl add r1, sp, #0x2c ldr r0, [r0] bl _ZN13PlayerControl18func_ov00_020b1058EP5Vec3piS1_S1_ @@ -1590,7 +1590,7 @@ _0219a180: .align 2, 0 _0219a1e0: .word data_ov57_0219ab14 _0219a1e4: .word data_ov57_0219aa40 -_0219a1e8: .word data_027e0fb8 +_0219a1e8: .word gPlayerControl _0219a1ec: .word data_ov57_0219aa40 _0219a1f0: .word data_ov57_0219aa60 _0219a1f4: .word data_ov57_0219aa70 @@ -1621,7 +1621,7 @@ func_ov57_0219a208: ; 0x0219a208 mov r0, r4 bl _ZN13LinkStateBase12GetPlayerVelEv mov r2, #0 - ldr r1, _0219a320 ; =data_027e0fb8 + ldr r1, _0219a320 ; =gPlayerControl str r2, [r0, #8] ldr r0, [r1] bl _ZN13PlayerControl20UpdateUsingEquipItemEv @@ -1668,7 +1668,7 @@ _0219a2b4: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} _0219a300: - ldr r0, _0219a320 ; =data_027e0fb8 + ldr r0, _0219a320 ; =gPlayerControl ldr r0, [r0] bl _ZN13PlayerControl20UpdateUsingEquipItemEv mov r0, r4 @@ -1677,7 +1677,7 @@ _0219a300: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_0219a320: .word data_027e0fb8 +_0219a320: .word gPlayerControl _0219a324: .word data_ov57_0219ab14 _0219a328: .word data_ov00_020eec9c arm_func_end func_ov57_0219a208 @@ -1694,13 +1694,13 @@ func_ov57_0219a32c: ; 0x0219a32c mov r0, r4 bl func_ov14_0213db60 _0219a34c: - ldr r0, _0219a360 ; =data_027e0fb8 + ldr r0, _0219a360 ; =gPlayerControl mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x7a] ldmia sp!, {r4, pc} .align 2, 0 -_0219a360: .word data_027e0fb8 +_0219a360: .word gPlayerControl arm_func_end func_ov57_0219a32c .global func_ov57_0219a364 diff --git a/asm/ov58.inc b/asm/ov58.inc index 5d16c2a6..2d10ef2e 100644 --- a/asm/ov58.inc +++ b/asm/ov58.inc @@ -24,7 +24,7 @@ .extern gMapManager .extern data_027e0f6c .extern gPlayerPos -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fd4 .extern gActorManager diff --git a/asm/ov58.s b/asm/ov58.s index 3949a996..54435830 100644 --- a/asm/ov58.s +++ b/asm/ov58.s @@ -304,7 +304,7 @@ func_ov58_0219906c: ; 0x0219906c add r0, r5, #0 add r0, #0x44 strh r1, [r0] - ldr r0, _02199158 ; =data_027e0fb8 + ldr r0, _02199158 ; =gPlayerControl ldr r0, [r0] blx _ZN13PlayerControl14IsUntouchedNowEv cmp r0, #0 @@ -411,7 +411,7 @@ _02199154: add sp, #0xc pop {r4, r5, pc} .align 2, 0 -_02199158: .word data_027e0fb8 +_02199158: .word gPlayerControl _0219915c: .word data_027e103c _02199160: .word data_ov58_0219b0a0 _02199164: .word data_027e077c @@ -2545,7 +2545,7 @@ func_ov58_0219a47c: ; 0x0219a47c mov r0, r5 add r1, sp, #4 bl _ZN13LinkStateBase6LookAtEP5Vec3p - ldr r0, _0219a5b4 ; =data_027e0fb8 + ldr r0, _0219a5b4 ; =gPlayerControl mov r1, #0 ldr r2, [r0] mov r0, r5 @@ -2569,7 +2569,7 @@ _0219a59c: _0219a5a8: .word data_027e077c _0219a5ac: .word data_027e103c _0219a5b0: .word gMapManager -_0219a5b4: .word data_027e0fb8 +_0219a5b4: .word gPlayerControl arm_func_end func_ov58_0219a47c .global func_ov58_0219a5b8 @@ -2730,7 +2730,7 @@ _0219a790: ldr r0, _0219a814 ; =data_ov00_020eec9c mov r1, #0x11 bl func_ov00_020d77e4 - ldr r0, _0219a818 ; =data_027e0fb8 + ldr r0, _0219a818 ; =gPlayerControl mov r1, #0 ldr r2, [r0] mov r0, #1 @@ -2765,7 +2765,7 @@ _0219a80c: ldmia sp!, {r4, pc} .align 2, 0 _0219a814: .word data_ov00_020eec9c -_0219a818: .word data_027e0fb8 +_0219a818: .word gPlayerControl _0219a81c: .word data_027e1098 arm_func_end func_ov58_0219a76c diff --git a/asm/ov59.inc b/asm/ov59.inc index 88197372..3cfd4c8f 100644 --- a/asm/ov59.inc +++ b/asm/ov59.inc @@ -20,7 +20,7 @@ .extern data_027e0e58 .extern gMapManager .extern gPlayerPos -.extern data_027e0fb8 +.extern gPlayerControl .extern gPlayerLink .extern data_027e0fd0 .extern data_027e0fd4 diff --git a/asm/ov59.s b/asm/ov59.s index 7c78cac5..45c77cbe 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -347,7 +347,7 @@ _021990c4: ldr r1, [r1, #0x20] cmp r1, r0 bne _02199180 - ldr r0, _021992f8 ; =data_027e0fb8 + ldr r0, _021992f8 ; =gPlayerControl ldr r2, [r0] ldr r1, [r2, #0xbc] str r1, [r6, #0x38] @@ -394,7 +394,7 @@ _02199180: bl _ZN13LinkStateBase18func_ov00_020a8b3cEi cmp r0, #0 bne _021991c4 - ldr r0, _021992f8 ; =data_027e0fb8 + ldr r0, _021992f8 ; =gPlayerControl add r1, r6, #0x38 ldr r0, [r0] bl _ZN13PlayerControl14UpdateAimWorldEP5Vec3p @@ -419,7 +419,7 @@ _021991d8: cmp r1, r0 bne _021992c0 _02199204: - ldr r0, _021992f8 ; =data_027e0fb8 + ldr r0, _021992f8 ; =gPlayerControl add r1, r6, #0x38 ldr r0, [r0] bl _ZN13PlayerControl14UpdateAimWorldEP5Vec3p @@ -434,7 +434,7 @@ _02199204: add r1, r6, #0x38 bl _ZN13LinkStateBase6LookAtEP5Vec3p _0219923c: - ldr r0, _021992f8 ; =data_027e0fb8 + ldr r0, _021992f8 ; =gPlayerControl mov r1, #1 ldr r0, [r0] bl _ZN13PlayerControl13CheckTouchingEj @@ -485,7 +485,7 @@ _021992d0: .align 2, 0 _021992f0: .word gItemManager _021992f4: .word data_ov59_0219b160 -_021992f8: .word data_027e0fb8 +_021992f8: .word gPlayerControl _021992fc: .word data_ov59_0219b190 _02199300: .word data_ov59_0219b180 _02199304: .word data_ov59_0219b1b0 @@ -551,7 +551,7 @@ _02199360: ldr r2, [r2, #0xdc] blx r2 _021993b4: - ldr r0, _0219a064 ; =data_027e0fb8 + ldr r0, _0219a064 ; =gPlayerControl add r1, sp, #0xb0 ldr r0, [r0] bl _ZN13PlayerControl14UpdateAimWorldEP5Vec3p @@ -582,7 +582,7 @@ _02199408: ldr r0, [r1, #8] cmp r0, r5 beq _021998b8 - ldr r0, _0219a064 ; =data_027e0fb8 + ldr r0, _0219a064 ; =gPlayerControl add r1, sp, #0x98 ldr r0, [r0] bl _ZN13PlayerControl14UpdateAimWorldEP5Vec3p @@ -885,7 +885,7 @@ _021998b8: mov r1, #0 str r1, [r4, #0x60] str r1, [r4, #0x68] - ldr r0, _0219a064 ; =data_027e0fb8 + ldr r0, _0219a064 ; =gPlayerControl ldr r1, _0219a070 ; =gPlayerPos ldr r5, [r0] add r0, sp, #0x74 @@ -1014,7 +1014,7 @@ _02199968: bl _ZN12ActorManager8GetActorEP8ActorRef cmp r0, #0 beq _02199b00 - ldr r1, _0219a064 ; =data_027e0fb8 + ldr r1, _0219a064 ; =gPlayerControl ldr r1, [r1] add r1, r1, #0xc8 bl func_ov37_0217fd9c @@ -1398,7 +1398,7 @@ _0219a058: add sp, sp, #0x11c ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_0219a064: .word data_027e0fb8 +_0219a064: .word gPlayerControl _0219a068: .word gItemManager _0219a06c: .word data_ov59_0219b110 _0219a070: .word gPlayerPos @@ -2260,7 +2260,7 @@ _0219ad18: ldmia r0, {r0, r1, r2} stmia r6, {r0, r1, r2} ldr r1, [r3, #4] - ldr r0, _0219af04 ; =data_027e0fb8 + ldr r0, _0219af04 ; =gPlayerControl add r2, r1, #0x800 ldr r0, [r0] add r1, sp, #0x44 @@ -2375,7 +2375,7 @@ _0219aef4: .word data_027e0fd4 _0219aef8: .word gPlayerPos _0219aefc: .word 0x0000ffff _0219af00: .word gMapManager -_0219af04: .word data_027e0fb8 +_0219af04: .word gPlayerControl _0219af08: .word gItemManager _0219af0c: .word data_ov00_020dc7d0 _0219af10: .word data_ov00_020dc7e4 @@ -2510,7 +2510,7 @@ _0219b0a4: ldr r0, [r4, #0x50] str r0, [r4, #0x160] _0219b0bc: - ldr r0, _0219b10c ; =data_027e0fb8 + ldr r0, _0219b10c ; =gPlayerControl ldr r1, [r4, #0x158] ldr r2, [r0] str r1, [r2, #0xbc] @@ -2531,7 +2531,7 @@ _0219b0bc: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0219b108: .word gItemManager -_0219b10c: .word data_027e0fb8 +_0219b10c: .word gPlayerControl arm_func_end func_ov59_0219b020 .rodata diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index 47c94d7a..5b424979 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -126,3 +126,5 @@ public: bool IsTappedNow(); bool func_ov00_020b13c4(); }; + +extern PlayerControl *gPlayerControl;