Name gPlayer singleton

asm/dtcm.s

@@ -3968,8 +3968,8 @@ data_027e0f88:
 	.global data_027e0f8c
 data_027e0f8c:
 	.space 0x4
-	.global data_027e0f90
-data_027e0f90:
+	.global gPlayer
+gPlayer:
 	.space 0x4
 	.global data_027e0f94
 data_027e0f94:

asm/ov00/Actor/Actor.inc

@@ -26,7 +26,7 @@
 .extern data_027e0d0c
 .extern data_027e0d3c
 .extern gMapManager
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov00/Actor/Actor.s

@@ -497,7 +497,7 @@ _ZN5Actor18func_ov00_020c198cEv: ; 0x020c198c
 	bl func_ov05_02103f4c
 	cmp r0, #0
 	bne _020c19ec
-	ldr r0, _020c1a28 ; =data_027e0f90
+	ldr r0, _020c1a28 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -521,7 +521,7 @@ _020c1a14:
 _020c1a1c: .word data_027e077c
 _020c1a20: .word data_02056be4
 _020c1a24: .word data_027e103c
-_020c1a28: .word data_027e0f90
+_020c1a28: .word gPlayer
 _020c1a2c: .word gPlayerLink
 	arm_func_end _ZN5Actor18func_ov00_020c198cEv
 
@@ -809,7 +809,7 @@ _ZN5Actor18func_ov00_020c1d58Ev: ; 0x020c1d58
 	cmp r0, #0
 	movne r0, #0
 	ldmneia sp!, {r3, pc}
-	ldr r0, _020c1d9c ; =data_027e0f90
+	ldr r0, _020c1d9c ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #4]
@@ -820,7 +820,7 @@ _ZN5Actor18func_ov00_020c1d58Ev: ; 0x020c1d58
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _020c1d98: .word gAdventureFlags
-_020c1d9c: .word data_027e0f90
+_020c1d9c: .word gPlayer
 	arm_func_end _ZN5Actor18func_ov00_020c1d58Ev
 
 	.global _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
@@ -851,7 +851,7 @@ _020c1dec:
 	add r1, r6, #0x54
 	bl func_01ff9bf8
 _020c1dfc:
-	ldr r0, _020c1e28 ; =data_027e0f90
+	ldr r0, _020c1e28 ; =gPlayer
 	ldrb r1, [r6, #0x124]
 	ldr r0, [r0]
 	add r2, sp, #0
@@ -863,7 +863,7 @@ _020c1dfc:
 	ldmia sp!, {r3, r4, r5, r6, pc}
 	.align 2, 0
 _020c1e24: .word data_027e0f94
-_020c1e28: .word data_027e0f90
+_020c1e28: .word gPlayer
 	arm_func_end _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
 
 	.global _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
@@ -902,7 +902,7 @@ _020c1e9c:
 	add r1, sp, #0
 	mov r0, r5
 	bl _ZN5Actor9GetHitboxEP8Cylinder
-	ldr r0, _020c1ef4 ; =data_027e0f90
+	ldr r0, _020c1ef4 ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -910,7 +910,7 @@ _020c1e9c:
 	addeq sp, sp, #0x1c
 	moveq r0, #0
 	ldmeqia sp!, {r3, r4, r5, r6, pc}
-	ldr r0, _020c1ef4 ; =data_027e0f90
+	ldr r0, _020c1ef4 ; =gPlayer
 	ldrb r1, [r5, #0x124]
 	ldr r0, [r0]
 	add r2, sp, #0x10
@@ -922,7 +922,7 @@ _020c1e9c:
 	ldmia sp!, {r3, r4, r5, r6, pc}
 	.align 2, 0
 _020c1ef0: .word data_027e0f94
-_020c1ef4: .word data_027e0f90
+_020c1ef4: .word gPlayer
 	arm_func_end _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
 
 	.global _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
@@ -936,14 +936,14 @@ _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii: ; 0x020c1ef8
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
-	ldr r0, _020c1f58 ; =data_027e0f90
+	ldr r0, _020c1f58 ; =gPlayer
 	mov r1, r6
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
-	ldr r0, _020c1f58 ; =data_027e0f90
+	ldr r0, _020c1f58 ; =gPlayer
 	ldr r3, [sp, #0x10]
 	ldr r0, [r0]
 	mov r1, r4
@@ -953,7 +953,7 @@ _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii: ; 0x020c1ef8
 	blx ip
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
-_020c1f58: .word data_027e0f90
+_020c1f58: .word gPlayer
 	arm_func_end _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
 
 	.global _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
@@ -967,7 +967,7 @@ _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii: ; 0x020c1f5c
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
-	ldr r0, _020c1fc4 ; =data_027e0f90
+	ldr r0, _020c1fc4 ; =gPlayer
 	mov r1, r6
 	ldr r0, [r0]
 	mov r2, r5
@@ -976,7 +976,7 @@ _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii: ; 0x020c1f5c
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
-	ldr r0, _020c1fc4 ; =data_027e0f90
+	ldr r0, _020c1fc4 ; =gPlayer
 	ldrb r1, [sp, #0x14]
 	ldr r0, [r0]
 	ldr r2, [sp, #0x10]
@@ -986,7 +986,7 @@ _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii: ; 0x020c1f5c
 	blx ip
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
-_020c1fc4: .word data_027e0f90
+_020c1fc4: .word gPlayer
 	arm_func_end _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
 
 	.global _ZN5Actor18func_ov00_020c1fc8Ej
@@ -1016,7 +1016,7 @@ _ZN5Actor18func_ov00_020c1fc8Ej: ; 0x020c1fc8
 	bl _ZN5Actor18CollidesWithPlayerEj
 	cmp r0, #0
 	beq _020c208c
-	ldr r0, _020c222c ; =data_027e0f90
+	ldr r0, _020c222c ; =gPlayer
 	mov r2, r5
 	ldr r0, [r0]
 	mov r1, #0xb
@@ -1081,7 +1081,7 @@ _020c2110:
 	bl _ZN5Actor18CollidesWithPlayerEj
 	cmp r0, #0
 	beq _020c218c
-	ldr r0, _020c222c ; =data_027e0f90
+	ldr r0, _020c222c ; =gPlayer
 	mov r2, r5
 	ldr r0, [r0]
 	mov r1, #0xb
@@ -1150,7 +1150,7 @@ _020c2218:
 	.align 2, 0
 _020c2224: .word gAdventureFlags
 _020c2228: .word data_027e0f94
-_020c222c: .word data_027e0f90
+_020c222c: .word gPlayer
 _020c2230: .word gItemManager
 _020c2234: .word gPlayerLink
 	arm_func_end _ZN5Actor18func_ov00_020c1fc8Ej
@@ -1175,7 +1175,7 @@ _ZN5Actor18CollidesWithShieldEP8Cylinder: ; 0x020c2238
 	rsbmi r0, r0, #0
 	cmp r0, #0x4000
 	bgt _020c22a0
-	ldr r0, _020c22b4 ; =data_027e0f90
+	ldr r0, _020c22b4 ; =gPlayer
 	mov r1, r5
 	ldr r0, [r0]
 	mov r2, #1
@@ -1191,7 +1191,7 @@ _020c22a0:
 	.align 2, 0
 _020c22ac: .word data_027e0f94
 _020c22b0: .word data_027e0fac
-_020c22b4: .word data_027e0f90
+_020c22b4: .word gPlayer
 	arm_func_end _ZN5Actor18CollidesWithShieldEP8Cylinder
 
 	.global _ZN5Actor18CollidesWithPlayerEj
@@ -1209,7 +1209,7 @@ _ZN5Actor18CollidesWithPlayerEj: ; 0x020c22b8
 	bl _ZN5Actor9GetHitboxEP8Cylinder
 	tst r4, #1
 	beq _020c2308
-	ldr r0, _020c23bc ; =data_027e0f90
+	ldr r0, _020c23bc ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -1220,7 +1220,7 @@ _ZN5Actor18CollidesWithPlayerEj: ; 0x020c22b8
 _020c2308:
 	tst r4, #2
 	beq _020c2334
-	ldr r0, _020c23bc ; =data_027e0f90
+	ldr r0, _020c23bc ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	mov r2, #0
@@ -1254,7 +1254,7 @@ _020c2358:
 _020c2384:
 	tst r4, #0x10
 	beq _020c23b0
-	ldr r0, _020c23bc ; =data_027e0f90
+	ldr r0, _020c23bc ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	mov r2, #8
@@ -1268,7 +1268,7 @@ _020c23b0:
 	add sp, sp, #0x10
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_020c23bc: .word data_027e0f90
+_020c23bc: .word gPlayer
 _020c23c0: .word gPlayerLink
 	arm_func_end _ZN5Actor18CollidesWithPlayerEj
 

asm/ov00/Map/MapManager.inc

@@ -51,7 +51,7 @@
 .extern data_027e0f70
 .extern data_027e0f78
 .extern data_027e0f7c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fe4
 .extern data_027e0fe8

asm/ov00/Map/MapManager.s

@@ -1012,7 +1012,7 @@ _02082c90:
 	ldr r0, [r0]
 	bl _ZN14AdventureFlags18func_ov00_020976c8Ev
 	ldrb r1, [r5, #0x13]
-	ldr r0, _02082d00 ; =data_027e0f90
+	ldr r0, _02082d00 ; =gPlayer
 	mov r2, #0
 	strb r1, [r6, #0xc]
 	ldr r0, [r0]
@@ -1038,7 +1038,7 @@ _02082cf0: .word data_027e0f68
 _02082cf4: .word data_027e0f6c
 _02082cf8: .word data_027e0f78
 _02082cfc: .word data_027e103c
-_02082d00: .word data_027e0f90
+_02082d00: .word gPlayer
 _02082d04: .word data_027e0c68
 	arm_func_end _ZN10MapManager18func_ov00_02082b3cEi
 

asm/ov00/Player/PlayerControl.inc

@@ -28,7 +28,7 @@
 .extern data_027e0e2c
 .extern gMapManager
 .extern data_027e0f64
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern gPlayerLink

asm/ov00/Player/PlayerControl.s

@@ -815,7 +815,7 @@ _020af810:
 	movne r4, #1
 	cmpne r0, #0
 	beq _020af8b0
-	ldr r0, _020afac0 ; =data_027e0f90
+	ldr r0, _020afac0 ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #8]
@@ -969,7 +969,7 @@ _020afaa8:
 	ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
 	.align 2, 0
 _020afabc: .word gAdventureFlags
-_020afac0: .word data_027e0f90
+_020afac0: .word gPlayer
 _020afac4: .word gItemManager
 _020afac8: .word gPlayerLink
 _020afacc: .word data_027e0fe4
@@ -992,7 +992,7 @@ _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p: ; 0x020afad8
 	ldrb r0, [r0, #0x79]
 	cmp r0, #0
 	beq _020afb54
-	ldr r0, _020afb64 ; =data_027e0f90
+	ldr r0, _020afb64 ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #8]
@@ -1018,7 +1018,7 @@ _020afb54:
 	ldmia sp!, {pc}
 	.align 2, 0
 _020afb60: .word data_027e0f94
-_020afb64: .word data_027e0f90
+_020afb64: .word gPlayer
 _020afb68: .word gMapManager
 	arm_func_end _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
 

asm/ov00/ov00_02086cd0.inc

@@ -124,7 +124,7 @@
 .extern data_027e0f7c
 .extern data_027e0f80
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov00/ov00_02086cd0.s

@@ -6620,7 +6620,7 @@ func_ov00_0208c3a4: ; 0x0208c3a4
 	cmp r0, #0
 	movne r0, #0
 	ldmneia sp!, {r3, pc}
-	ldr r0, _0208c460 ; =data_027e0f90
+	ldr r0, _0208c460 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -6642,7 +6642,7 @@ _0208c450: .word gAdventureFlags
 _0208c454: .word data_027e0c68
 _0208c458: .word data_027e077c
 _0208c45c: .word data_027e103c
-_0208c460: .word data_027e0f90
+_0208c460: .word gPlayer
 _0208c464: .word gPlayerLink
 	arm_func_end func_ov00_0208c3a4
 
@@ -6665,7 +6665,7 @@ func_ov00_0208c468: ; 0x0208c468
 	cmp r0, #0
 	movne r0, #0
 	ldmneia sp!, {r3, pc}
-	ldr r0, _0208c4f0 ; =data_027e0f90
+	ldr r0, _0208c4f0 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -6685,7 +6685,7 @@ _0208c4e0:
 	.align 2, 0
 _0208c4e8: .word data_027e077c
 _0208c4ec: .word data_027e103c
-_0208c4f0: .word data_027e0f90
+_0208c4f0: .word gPlayer
 _0208c4f4: .word gPlayerLink
 	arm_func_end func_ov00_0208c468
 
@@ -14283,7 +14283,7 @@ _0209242c:
 func_ov00_020924b8: ; 0x020924b8
 	stmdb sp!, {r4, r5, r6, r7, lr}
 	sub sp, sp, #0x174
-	ldr r1, _020931d8 ; =data_027e0f90
+	ldr r1, _020931d8 ; =gPlayer
 	mov r4, r0
 	ldr r0, [r1]
 	ldr r1, [r0]
@@ -15175,7 +15175,7 @@ _020931bc:
 	add sp, sp, #0x174
 	ldmia sp!, {r4, r5, r6, r7, pc}
 	.align 2, 0
-_020931d8: .word data_027e0f90
+_020931d8: .word gPlayer
 _020931dc: .word data_027e0fa0
 _020931e0: .word data_027e0fac
 _020931e4: .word 0x0000028f

asm/ov00/ov00_020980f4.inc

@@ -103,7 +103,7 @@
 .extern data_027e0f84
 .extern data_027e0f88
 .extern data_027e0f8c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov00/ov00_020980f4.s

@@ -141,7 +141,7 @@ _0209828c:
 	ldrb r0, [r4, #0x12]
 	cmp r0, #0
 	beq _020982a8
-	ldr r0, _020985ac ; =data_027e0f90
+	ldr r0, _020985ac ; =gPlayer
 	mov r1, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase12SetUpdatePosEb
@@ -350,7 +350,7 @@ _02098574:
 	ldmia sp!, {r3, r4, r5, r6, pc}
 	.align 2, 0
 _020985a8: .word data_027e0f64
-_020985ac: .word data_027e0f90
+_020985ac: .word gPlayer
 _020985b0: .word data_027e0c54
 _020985b4: .word data_027e0db0
 _020985b8: .word gMapManager
@@ -742,7 +742,7 @@ _02098a34:
 	cmp r2, #0
 	beq _02098a8c
 	mov r1, #0
-	ldr r0, _02098b28 ; =data_027e0f90
+	ldr r0, _02098b28 ; =gPlayer
 	strb r1, [r4, #0x21]
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -769,7 +769,7 @@ _02098abc:
 	ldrb r0, [r4, #0x21]
 	cmp r0, #0
 	beq _02098af0
-	ldr r0, _02098b28 ; =data_027e0f90
+	ldr r0, _02098b28 ; =gPlayer
 	strb r1, [r4, #0x21]
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -789,7 +789,7 @@ _02098af0:
 	.align 2, 0
 _02098b20: .word data_027e071c
 _02098b24: .word gPlayerLink
-_02098b28: .word data_027e0f90
+_02098b28: .word gPlayer
 _02098b2c: .word data_027e0fe4
 _02098b30: .word data_027e0f68
 	arm_func_end func_ov00_020989a8
@@ -1357,7 +1357,7 @@ _02099240:
 _02099244:
 	cmp r1, #0
 	beq _0209925c
-	ldr r0, _020994b4 ; =data_027e0f90
+	ldr r0, _020994b4 ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -1378,7 +1378,7 @@ _02099288:
 _0209928c:
 	cmp r1, #0
 	beq _020992a4
-	ldr r0, _020994b4 ; =data_027e0f90
+	ldr r0, _020994b4 ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase12SetUpdatePosEb
@@ -1528,7 +1528,7 @@ _020994a4:
 	add sp, sp, #0x20
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
-_020994b4: .word data_027e0f90
+_020994b4: .word gPlayer
 _020994b8: .word data_027e0fe4
 _020994bc: .word data_027e0f68
 _020994c0: .word data_027e0f64

asm/ov00/ov00_020b1498.inc

@@ -188,7 +188,7 @@
 .extern data_027e0f64
 .extern data_027e0f6c
 .extern data_027e0f78
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov00/ov00_020b1498.s

@@ -7752,7 +7752,7 @@ func_ov00_020b7924: ; 0x020b7924
 	ldr r2, [r4, #0x10]
 	mov r3, r1, lsl #0x10
 	mov r2, r2, lsl #0x10
-	ldr r1, _020b7d40 ; =data_027e0f90
+	ldr r1, _020b7d40 ; =gPlayer
 	mov r5, r0
 	ldr r0, [r1]
 	add r1, sp, #0x2c
@@ -8020,7 +8020,7 @@ _020b7d24:
 	.align 2, 0
 _020b7d38: .word data_027e0d84
 _020b7d3c: .word data_027e0f64
-_020b7d40: .word data_027e0f90
+_020b7d40: .word gPlayer
 _020b7d44: .word data_027e0f94
 _020b7d48: .word data_027e077c
 	arm_func_end func_ov00_020b7924
@@ -9237,7 +9237,7 @@ func_ov00_020b88c4: ; 0x020b88c4
 	movne r0, #1
 	ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
 _020b8908:
-	ldr r0, _020b8b7c ; =data_027e0f90
+	ldr r0, _020b8b7c ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -9412,7 +9412,7 @@ _020b8b70:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
 	.align 2, 0
 _020b8b78: .word data_027e0618
-_020b8b7c: .word data_027e0f90
+_020b8b7c: .word gPlayer
 _020b8b80: .word data_027e0f64
 _020b8b84: .word gAdventureFlags
 _020b8b88: .word gItemManager
@@ -11208,7 +11208,7 @@ _020ba410: .word gItemManager
 func_ov00_020ba414: ; 0x020ba414
 	stmdb sp!, {r3, r4, r5, lr}
 	sub sp, sp, #0x10
-	ldr r2, _020ba454 ; =data_027e0f90
+	ldr r2, _020ba454 ; =gPlayer
 	mov r5, r0
 	ldr r0, [r2]
 	mov r4, r1
@@ -11223,7 +11223,7 @@ func_ov00_020ba414: ; 0x020ba414
 	add sp, sp, #0x10
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_020ba454: .word data_027e0f90
+_020ba454: .word gPlayer
 	arm_func_end func_ov00_020ba414
 
 	.global func_ov00_020ba458
@@ -17012,7 +17012,7 @@ _020be998: .word data_027e0f94
 func_ov00_020be99c: ; 0x020be99c
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #0x10
-	ldr r0, _020be9e0 ; =data_027e0f90
+	ldr r0, _020be9e0 ; =gPlayer
 	mov r4, r1
 	ldr r0, [r0]
 	add r1, sp, #0
@@ -17028,7 +17028,7 @@ func_ov00_020be99c: ; 0x020be99c
 	add sp, sp, #0x10
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_020be9e0: .word data_027e0f90
+_020be9e0: .word gPlayer
 	arm_func_end func_ov00_020be99c
 
 	.global func_ov00_020be9e4

asm/ov00/ov00_020c3e54.inc

@@ -144,7 +144,7 @@
 .extern data_027e0f70
 .extern data_027e0f78
 .extern data_027e0f88
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov00/ov00_020c3e54.s

@@ -1972,7 +1972,7 @@ func_ov00_020c566c: ; 0x020c566c
 func_ov00_020c56d8: ; 0x020c56d8
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	sub sp, sp, #0x10
-	ldr ip, _020c576c ; =data_027e0f90
+	ldr ip, _020c576c ; =gPlayer
 	mov r4, r0
 	ldr r0, [ip]
 	mov r7, r1
@@ -2008,7 +2008,7 @@ func_ov00_020c56d8: ; 0x020c56d8
 	add sp, sp, #0x10
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_020c576c: .word data_027e0f90
+_020c576c: .word gPlayer
 _020c5770: .word data_027e0f94
 	arm_func_end func_ov00_020c56d8
 
@@ -2017,7 +2017,7 @@ _020c5770: .word data_027e0f94
 func_ov00_020c5774: ; 0x020c5774
 	stmdb sp!, {r4, r5, lr}
 	sub sp, sp, #0xc
-	ldr r2, _020c57f4 ; =data_027e0f90
+	ldr r2, _020c57f4 ; =gPlayer
 	mov r5, r0
 	ldr r0, [r2]
 	mov r4, r1
@@ -2048,7 +2048,7 @@ func_ov00_020c5774: ; 0x020c5774
 	add sp, sp, #0xc
 	ldmia sp!, {r4, r5, pc}
 	.align 2, 0
-_020c57f4: .word data_027e0f90
+_020c57f4: .word gPlayer
 _020c57f8: .word data_027e0f94
 	arm_func_end func_ov00_020c5774
 
@@ -20234,7 +20234,7 @@ _020d3a4c:
 	cmp r0, #0
 	beq _020d3afc
 _020d3a6c:
-	ldr r0, _020d3b0c ; =data_027e0f90
+	ldr r0, _020d3b0c ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -20277,7 +20277,7 @@ _020d3afc:
 	.align 2, 0
 _020d3b04: .word gMapManager
 _020d3b08: .word gAdventureFlags
-_020d3b0c: .word data_027e0f90
+_020d3b0c: .word gPlayer
 _020d3b10: .word data_027e077c
 _020d3b14: .word data_027e0d38
 _020d3b18: .word data_027e10a4

asm/ov03.inc

@@ -98,7 +98,7 @@
 .extern data_027e0f7c
 .extern data_027e0f84
 .extern data_027e0f88
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fb8
 .extern gPlayerLink

asm/ov03.s

@@ -5688,7 +5688,7 @@ func_ov03_020f2294: ; 0x020f2294
 	bl _ZN14AdventureFlags18func_ov00_02097738Ev
 	cmp r0, #0
 	beq _020f22d0
-	ldr r0, _020f2318 ; =data_027e0f90
+	ldr r0, _020f2318 ; =gPlayer
 	ldr r0, [r0]
 	ldrb r0, [r0, #0x11]
 	cmp r0, #0
@@ -5713,7 +5713,7 @@ _020f22d0:
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _020f2314: .word gAdventureFlags
-_020f2318: .word data_027e0f90
+_020f2318: .word gPlayer
 _020f231c: .word data_027e103c
 _020f2320: .word 0x0000019f
 	arm_func_end func_ov03_020f2294
@@ -5731,7 +5731,7 @@ func_ov03_020f2324: ; 0x020f2324
 	bl _ZN14AdventureFlags18func_ov00_02097738Ev
 	cmp r0, #0
 	beq _020f2360
-	ldr r0, _020f23a8 ; =data_027e0f90
+	ldr r0, _020f23a8 ; =gPlayer
 	ldr r0, [r0]
 	ldrb r0, [r0, #0x11]
 	cmp r0, #0
@@ -5756,7 +5756,7 @@ _020f2360:
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _020f23a4: .word gAdventureFlags
-_020f23a8: .word data_027e0f90
+_020f23a8: .word gPlayer
 _020f23ac: .word data_027e103c
 _020f23b0: .word 0x0000019f
 	arm_func_end func_ov03_020f2324
@@ -9739,7 +9739,7 @@ func_ov03_020f4718: ; 0x020f4718
 	add r4, r1, #0
 	cmp r0, #0
 	bne _020f474c
-	ldr r0, _020f4758 ; =data_027e0f90
+	ldr r0, _020f4758 ; =gPlayer
 	mov r1, #5
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -9764,7 +9764,7 @@ _020f474c:
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_020f4758: .word data_027e0f90
+_020f4758: .word gPlayer
 _020f475c: .word data_ov00_020eec9c
 	thumb_func_end func_ov03_020f4718
 
@@ -11816,7 +11816,7 @@ _020f5990: .word data_027e0d38
 	.global func_ov03_020f5994
 	arm_func_start func_ov03_020f5994
 func_ov03_020f5994: ; 0x020f5994
-	ldr r1, _020f59cc ; =data_027e0f90
+	ldr r1, _020f59cc ; =gPlayer
 	ldr ip, _020f59d0 ; =func_ov03_020f59d4
 	ldr r2, [r1]
 	ldrb r1, [r2, #0x12]
@@ -11831,7 +11831,7 @@ func_ov03_020f5994: ; 0x020f5994
 	str r1, [r0, #8]
 	bx ip
 	.align 2, 0
-_020f59cc: .word data_027e0f90
+_020f59cc: .word gPlayer
 _020f59d0: .word func_ov03_020f59d4 - 1
 	arm_func_end func_ov03_020f5994
 
@@ -12678,7 +12678,7 @@ _020f63b0:
 	thumb_func_start func_ov03_020f63d4
 func_ov03_020f63d4: ; 0x020f63d4
 	push {r4, lr}
-	ldr r1, _020f6410 ; =data_027e0f90
+	ldr r1, _020f6410 ; =gPlayer
 	add r4, r0, #0
 	ldr r2, [r1]
 	mov r1, #0xa
@@ -12705,7 +12705,7 @@ func_ov03_020f63d4: ; 0x020f63d4
 	strb r2, [r4, r1]
 	pop {r4, pc}
 	.align 2, 0
-_020f6410: .word data_027e0f90
+_020f6410: .word gPlayer
 _020f6414: .word gItemManager
 	thumb_func_end func_ov03_020f63d4
 
@@ -12922,7 +12922,7 @@ func_ov03_020f6714: ; 0x020f6714
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	bl func_ov03_020f7020
-	ldr r0, _020f676c ; =data_027e0f90
+	ldr r0, _020f676c ; =gPlayer
 	ldr r1, [r0]
 	ldrb r0, [r1, #0x12]
 	cmp r0, #0
@@ -12944,7 +12944,7 @@ _020f6750:
 	bl func_ov03_020f6a88
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_020f676c: .word data_027e0f90
+_020f676c: .word gPlayer
 	arm_func_end func_ov03_020f6714
 
 	.global func_ov03_020f6770
@@ -13367,14 +13367,14 @@ _020f6d30: .word gAdventureFlags
 	.global func_ov03_020f6d34
 	arm_func_start func_ov03_020f6d34
 func_ov03_020f6d34: ; 0x020f6d34
-	ldr r1, _020f6d4c ; =data_027e0f90
+	ldr r1, _020f6d4c ; =gPlayer
 	ldr ip, _020f6d50 ; =func_ov03_020f57b8
 	ldr r1, [r1]
 	add r0, r0, #0x2c
 	ldrsh r1, [r1, #0xa]
 	bx ip
 	.align 2, 0
-_020f6d4c: .word data_027e0f90
+_020f6d4c: .word gPlayer
 _020f6d50: .word func_ov03_020f57b8
 	arm_func_end func_ov03_020f6d34
 
@@ -13467,7 +13467,7 @@ func_ov03_020f6e10: ; 0x020f6e10
 	ldr r0, _020f6ef0 ; =data_027e0c38
 	ldr r0, [r0, #0x10]
 	cmp r0, #0
-	ldr r0, _020f6ef4 ; =data_027e0f90
+	ldr r0, _020f6ef4 ; =gPlayer
 	moveq r5, #0
 	ldr r0, [r0]
 	movne r5, #0xab
@@ -13496,7 +13496,7 @@ _020f6ee4: .word data_027e0db0
 _020f6ee8: .word data_027e0d38
 _020f6eec: .word data_027e0cbc
 _020f6ef0: .word data_027e0c38
-_020f6ef4: .word data_027e0f90
+_020f6ef4: .word gPlayer
 	arm_func_end func_ov03_020f6e10
 
 	.global func_ov03_020f6ef8
@@ -13520,7 +13520,7 @@ func_ov03_020f6ef8: ; 0x020f6ef8
 	bl _ZN14AdventureFlags18func_ov00_02097738Ev
 	cmp r0, #0
 	beq _020f6f58
-	ldr r0, _020f7000 ; =data_027e0f90
+	ldr r0, _020f7000 ; =gPlayer
 	ldr r0, [r0]
 	ldrb r0, [r0, #0x11]
 	cmp r0, #0
@@ -13538,7 +13538,7 @@ _020f6f58:
 	ldr r0, [r0, #0x10]
 	ldr r5, [r1]
 	cmp r0, #0
-	ldr r0, _020f7000 ; =data_027e0f90
+	ldr r0, _020f7000 ; =gPlayer
 	moveq r6, #0
 	ldr r0, [r0]
 	movne r6, #0xab
@@ -13570,7 +13570,7 @@ _020f6f58:
 _020f6ff4: .word data_027e077c
 _020f6ff8: .word data_027e0db0
 _020f6ffc: .word gAdventureFlags
-_020f7000: .word data_027e0f90
+_020f7000: .word gPlayer
 _020f7004: .word data_027e0cbc
 _020f7008: .word data_027e0c38
 _020f700c: .word gItemManager

asm/ov04.inc

@@ -133,7 +133,7 @@
 .extern data_027e0f70
 .extern data_027e0f78
 .extern data_027e0f7c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov04.s

@@ -3391,7 +3391,7 @@ func_ov04_021024c4: ; 0x021024c4
 	add r0, r5, #0
 	add r1, sp, #0x10
 	blx _ZN10MapManager14GetEntrancePosEP5Vec3pi
-	ldr r0, _021025bc ; =data_027e0f90
+	ldr r0, _021025bc ; =gPlayer
 	ldrb r1, [r4, #0x13]
 	ldr r0, [r0]
 	mov r2, #0
@@ -3467,7 +3467,7 @@ _021025ae:
 	nop
 _021025b4: .word data_027e0ff0
 _021025b8: .word data_027e0f6c
-_021025bc: .word data_027e0f90
+_021025bc: .word gPlayer
 _021025c0: .word data_027e0fe4
 _021025c4: .word data_027e0d38
 _021025c8: .word data_027e0f70
@@ -7877,7 +7877,7 @@ _02104920:
 	ldr r0, _02104a04 ; =data_027e0f68
 	ldr r0, [r0]
 	bl func_ov04_02102aa0
-	ldr r0, _02104a08 ; =data_027e0f90
+	ldr r0, _02104a08 ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #0x1c]
@@ -7939,7 +7939,7 @@ _021049f8: .word data_027e1048
 _021049fc: .word data_027e0f78
 _02104a00: .word gMapManager
 _02104a04: .word data_027e0f68
-_02104a08: .word data_027e0f90
+_02104a08: .word gPlayer
 _02104a0c: .word data_027e0fc0
 _02104a10: .word data_ov00_020ee734
 	thumb_func_end func_ov04_021046dc
@@ -21510,7 +21510,7 @@ _0210b1ee:
 	thumb_func_start func_ov04_0210b1f0
 func_ov04_0210b1f0: ; 0x0210b1f0
 	push {r3, lr}
-	ldr r0, _0210b20c ; =data_027e0f90
+	ldr r0, _0210b20c ; =gPlayer
 	ldr r0, [r0]
 	cmp r0, #0
 	beq _0210b208
@@ -21519,13 +21519,13 @@ func_ov04_0210b1f0: ; 0x0210b1f0
 	ldr r1, [r1, #0x54]
 	blx r1
 _0210b202:
-	ldr r0, _0210b20c ; =data_027e0f90
+	ldr r0, _0210b20c ; =gPlayer
 	mov r1, #0
 	str r1, [r0]
 _0210b208:
 	pop {r3, pc}
 	nop
-_0210b20c: .word data_027e0f90
+_0210b20c: .word gPlayer
 	thumb_func_end func_ov04_0210b1f0
 
 	.global func_ov04_0210b210
@@ -23955,7 +23955,7 @@ func_ov04_0210c3fc: ; 0x0210c3fc
 	ldr r0, [r0]
 	add r2, sp, #0x18
 	bl func_ov04_02104ffc
-	ldr r0, _0210c514 ; =data_027e0f90
+	ldr r0, _0210c514 ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #0x20]
@@ -23996,7 +23996,7 @@ _0210c504: .word data_027e0fec
 _0210c508: .word data_027e0c68
 _0210c50c: .word data_027e0cbc
 _0210c510: .word data_027e103c
-_0210c514: .word data_027e0f90
+_0210c514: .word gPlayer
 _0210c518: .word data_027e0618
 _0210c51c: .word data_ov09_0211f5b4
 _0210c520: .word data_ov09_0211f530

asm/ov05.inc

@@ -198,7 +198,7 @@
 .extern data_027e0f78
 .extern data_027e0f7c
 .extern data_027e0f88
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov05.s

@@ -1992,7 +1992,7 @@ _02102544:
 _02102598:
 	mov r2, #0
 _0210259c:
-	ldr r0, _021026d4 ; =data_027e0f90
+	ldr r0, _021026d4 ; =gPlayer
 	mov r1, r8
 	ldr r0, [r0]
 	ldr r3, [r0]
@@ -2077,7 +2077,7 @@ _021026c4: .word data_027e0ff8
 _021026c8: .word data_027e071c
 _021026cc: .word data_027e0e2c
 _021026d0: .word data_027e0d04
-_021026d4: .word data_027e0f90
+_021026d4: .word gPlayer
 _021026d8: .word data_027e0f64
 _021026dc: .word data_027e0f78
 _021026e0: .word gMapManager
@@ -2148,7 +2148,7 @@ _02102798:
 	ldrneb r0, [r5, #1]
 	cmpne r0, #0
 	bne _021027d8
-	ldr r0, _0210281c ; =data_027e0f90
+	ldr r0, _0210281c ; =gPlayer
 	mov r1, r4
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -2173,7 +2173,7 @@ _021027d8:
 	.align 2, 0
 _02102814: .word data_027e103c
 _02102818: .word data_027e0c54
-_0210281c: .word data_027e0f90
+_0210281c: .word gPlayer
 _02102820: .word data_027e0fe4
 _02102824: .word gMapManager
 	arm_func_end func_ov05_0210274c
@@ -2271,7 +2271,7 @@ _0210294c:
 	ldr r0, [r0]
 	bl func_ov05_021011fc
 _02102978:
-	ldr r0, _02102a60 ; =data_027e0f90
+	ldr r0, _02102a60 ; =gPlayer
 	mov r1, r8
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -2333,7 +2333,7 @@ _02102a50: .word data_027e0de8
 _02102a54: .word data_027e0f88
 _02102a58: .word data_027e0f64
 _02102a5c: .word gMapManager
-_02102a60: .word data_027e0f90
+_02102a60: .word gPlayer
 _02102a64: .word data_027e0fe4
 _02102a68: .word data_027e0618
 _02102a6c: .word data_027e1048

asm/ov09.inc

@@ -51,7 +51,7 @@
 .extern data_027e0e58
 .extern gMapManager
 .extern data_027e0f64
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0fe4
 .extern data_027e0ffc
 .extern data_027e103c

asm/ov09.s

@@ -14694,7 +14694,7 @@ _0211b164:
 	bl _ZN14AdventureFlags18func_ov00_02097738Ev
 	cmp r0, #0
 	bne _0211b34c
-	ldr r0, _0211b378 ; =data_027e0f90
+	ldr r0, _0211b378 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -14837,7 +14837,7 @@ _0211b368: .word gAdventureFlags
 _0211b36c: .word data_027e0db0
 _0211b370: .word data_027e0d38
 _0211b374: .word data_ov00_020eec9c
-_0211b378: .word data_027e0f90
+_0211b378: .word gPlayer
 _0211b37c: .word data_027e077c
 _0211b380: .word 0x00000c71
 _0211b384: .word data_027e103c
@@ -15706,7 +15706,7 @@ func_ov09_0211bd14: ; 0x0211bd14
 	bl _ZN14AdventureFlags18func_ov00_02097738Ev
 	cmp r0, #0
 	bne _0211bd40
-	ldr r0, _0211bd54 ; =data_027e0f90
+	ldr r0, _0211bd54 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -15719,7 +15719,7 @@ _0211bd48:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0211bd50: .word gAdventureFlags
-_0211bd54: .word data_027e0f90
+_0211bd54: .word gPlayer
 	arm_func_end func_ov09_0211bd14
 
 	.global func_ov09_0211bd58

asm/ov12.inc

@@ -152,7 +152,7 @@
 .extern data_027e0f64
 .extern data_027e0f68
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov12.s

@@ -2245,7 +2245,7 @@ _02114924:
 	beq _02114a78
 	cmp r7, #1
 	bne _02114964
-	ldr r0, _02114a9c ; =data_027e0f90
+	ldr r0, _02114a9c ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #4]
@@ -2338,7 +2338,7 @@ _02114a78:
 _02114a90: .word 0x00005555
 _02114a94: .word data_027e0f94
 _02114a98: .word data_ov12_02137c64
-_02114a9c: .word data_027e0f90
+_02114a9c: .word gPlayer
 _02114aa0: .word 0x0000019a
 	arm_func_end func_ov12_021148a8
 
@@ -7895,7 +7895,7 @@ _021192dc:
 	arm_func_start func_ov12_021192f4
 func_ov12_021192f4: ; 0x021192f4
 	stmdb sp!, {r3, lr}
-	ldr r0, _02119334 ; =data_027e0f90
+	ldr r0, _02119334 ; =gPlayer
 	ldr r0, [r0]
 	cmp r0, #0
 	ldmneia sp!, {r3, pc}
@@ -7908,11 +7908,11 @@ func_ov12_021192f4: ; 0x021192f4
 	beq _02119328
 	bl func_ov12_021193b0
 _02119328:
-	ldr r1, _02119334 ; =data_027e0f90
+	ldr r1, _02119334 ; =gPlayer
 	str r0, [r1]
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_02119334: .word data_027e0f90
+_02119334: .word gPlayer
 _02119338: .word data_027e0ce0
 	arm_func_end func_ov12_021192f4
 
@@ -34665,7 +34665,7 @@ func_ov12_0212ee64: ; 0x0212ee64
 	ldr r0, [ip, #0x130]
 	cmp r0, #0
 	ldmeqia sp!, {r3, pc}
-	ldr r0, _0212eeb4 ; =data_027e0f90
+	ldr r0, _0212eeb4 ; =gPlayer
 	ldr r0, [r0]
 	ldrb r0, [r0, #0x10]
 	cmp r0, #0
@@ -34681,7 +34681,7 @@ func_ov12_0212ee64: ; 0x0212ee64
 	blx ip
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_0212eeb4: .word data_027e0f90
+_0212eeb4: .word gPlayer
 _0212eeb8: .word data_027e0fcc
 	arm_func_end func_ov12_0212ee64
 
@@ -38115,7 +38115,7 @@ _02131c18:
 	bl func_ov12_02120108
 	cmp r0, #0
 	beq _02131c88
-	ldr r0, _02131d74 ; =data_027e0f90
+	ldr r0, _02131d74 ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -38188,7 +38188,7 @@ _02131d64:
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _02131d70: .word data_ov12_02137c64
-_02131d74: .word data_027e0f90
+_02131d74: .word gPlayer
 _02131d78: .word gMapManager
 	arm_func_end func_ov12_02131bdc
 

asm/ov14/ov14_0211f640.inc

@@ -165,7 +165,7 @@
 .extern data_027e0f70
 .extern data_027e0f78
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov14/ov14_0211f640.s

@@ -4644,7 +4644,7 @@ _02123394:
 	mov r2, r0
 	str r3, [sp, #0x18]
 	bl func_01ff9bf8
-	ldr r0, _02123558 ; =data_027e0f90
+	ldr r0, _02123558 ; =gPlayer
 	add r1, sp, #0x28
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -4737,7 +4737,7 @@ _02123548: .word data_027e0ffc
 _0212354c: .word 0x0000019e
 _02123550: .word gItemManager
 _02123554: .word gPlayerLink
-_02123558: .word data_027e0f90
+_02123558: .word gPlayer
 _0212355c: .word data_027e0fb8
 _02123560: .word data_027e0f64
 _02123564: .word data_027e0e58
@@ -11278,7 +11278,7 @@ _021288d0:
 	add sp, sp, #0x18
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 _02128938:
-	ldr r0, _021289a0 ; =data_027e0f90
+	ldr r0, _021289a0 ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -11307,7 +11307,7 @@ _02128990: .word 0x000001b2
 _02128994: .word gAdventureFlags
 _02128998: .word 0x0b60b60b
 _0212899c: .word data_02050f54
-_021289a0: .word data_027e0f90
+_021289a0: .word gPlayer
 	arm_func_end func_ov14_02128328
 
 	.global func_ov14_021289a4
@@ -11344,7 +11344,7 @@ _021289c4: ; jump table
 	b _02128cdc ; case 19
 	b _02128cdc ; case 20
 _02128a18:
-	ldr r0, _02128d70 ; =data_027e0f90
+	ldr r0, _02128d70 ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -11573,7 +11573,7 @@ _02128d64:
 	add sp, sp, #0x118
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
 	.align 2, 0
-_02128d70: .word data_027e0f90
+_02128d70: .word gPlayer
 _02128d74: .word gAdventureFlags
 _02128d78: .word data_027e0ffc
 _02128d7c: .word data_027e0f64
@@ -18772,7 +18772,7 @@ _0212e97c:
 	ldr r0, [r0, #4]
 	add r3, sp, #0x18
 	bl func_ov00_020888e8
-	ldr r0, _0212eb3c ; =data_027e0f90
+	ldr r0, _0212eb3c ; =gPlayer
 	mov r1, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -18821,7 +18821,7 @@ _0212eacc:
 	ldr r0, _0212eb24 ; =data_027e077c
 	mov r1, #1
 	bl func_0202e740
-	ldr r0, _0212eb3c ; =data_027e0f90
+	ldr r0, _0212eb3c ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -18845,7 +18845,7 @@ _0212eb2c: .word data_027e0f64
 _0212eb30: .word 0x00001555
 _0212eb34: .word 0x000004cd
 _0212eb38: .word gAdventureFlags
-_0212eb3c: .word data_027e0f90
+_0212eb3c: .word gPlayer
 _0212eb40: .word data_027e0fe4
 _0212eb44: .word data_027e0c68
 	arm_func_end func_ov14_0212e8dc
@@ -20869,7 +20869,7 @@ func_ov14_021305c4: ; 0x021305c4
 	add sp, sp, #0x1c
 	ldmia sp!, {r3, r4, pc}
 _02130610:
-	ldr r0, _02130648 ; =data_027e0f90
+	ldr r0, _02130648 ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -20884,7 +20884,7 @@ _02130610:
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
 _02130644: .word data_027e0f94
-_02130648: .word data_027e0f90
+_02130648: .word gPlayer
 	arm_func_end func_ov14_021305c4
 
 	.global func_ov14_0213064c
@@ -31257,7 +31257,7 @@ _02138d68: .word data_027e0fe8
 	.global func_ov14_02138d6c
 	arm_func_start func_ov14_02138d6c
 func_ov14_02138d6c: ; 0x02138d6c
-	ldr r1, _02138db8 ; =data_027e0f90
+	ldr r1, _02138db8 ; =gPlayer
 	ldr r1, [r1]
 	ldrb r1, [r1, #0x11]
 	cmp r1, #0
@@ -31278,7 +31278,7 @@ _02138dac:
 	strb r1, [r0, #0x11a]
 	bx lr
 	.align 2, 0
-_02138db8: .word data_027e0f90
+_02138db8: .word gPlayer
 _02138dbc: .word data_027e0fcc
 	arm_func_end func_ov14_02138d6c
 
@@ -33158,7 +33158,7 @@ func_ov14_0213a4c8: ; 0x0213a4c8
 	ldreq r1, [r5, #0x130]
 	cmpeq r1, #1
 	bne _0213a588
-	ldr r0, _0213a80c ; =data_027e0f90
+	ldr r0, _0213a80c ; =gPlayer
 	add r1, sp, #4
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -33359,7 +33359,7 @@ _0213a7fc:
 	add sp, sp, #0x44
 	ldmia sp!, {r3, r4, r5, r6, pc}
 	.align 2, 0
-_0213a80c: .word data_027e0f90
+_0213a80c: .word gPlayer
 _0213a810: .word gPlayerLink
 _0213a814: .word data_ov00_020eec9c
 _0213a818: .word data_02050f54

asm/ov14/ov14_0213b778.inc

@@ -166,7 +166,7 @@
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fb8

asm/ov14/ov14_0213b778.s

@@ -4667,7 +4667,7 @@ _0213eeb0: .word 0x00000333
 	thumb_func_start func_ov14_0213eeb4
 func_ov14_0213eeb4: ; 0x0213eeb4
 	push {r3, lr}
-	ldr r0, _0213eed8 ; =data_027e0f90
+	ldr r0, _0213eed8 ; =gPlayer
 	ldr r0, [r0]
 	cmp r0, #0
 	bne _0213eed6
@@ -4680,12 +4680,12 @@ func_ov14_0213eeb4: ; 0x0213eeb4
 	beq _0213eed2
 	bl func_ov14_0213ef2c
 _0213eed2:
-	ldr r1, _0213eed8 ; =data_027e0f90
+	ldr r1, _0213eed8 ; =gPlayer
 	str r0, [r1]
 _0213eed6:
 	pop {r3, pc}
 	.align 2, 0
-_0213eed8: .word data_027e0f90
+_0213eed8: .word gPlayer
 _0213eedc: .word data_027e0ce0
 	thumb_func_end func_ov14_0213eeb4
 
@@ -10641,7 +10641,7 @@ func_ov14_0214392c: ; 0x0214392c
 	cmp r0, #0
 	movne r0, #0
 	ldmneia sp!, {r3, pc}
-	ldr r0, _021439d0 ; =data_027e0f90
+	ldr r0, _021439d0 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -10662,7 +10662,7 @@ _021439bc:
 _021439c4: .word gAdventureFlags
 _021439c8: .word data_027e077c
 _021439cc: .word data_027e103c
-_021439d0: .word data_027e0f90
+_021439d0: .word gPlayer
 _021439d4: .word gPlayerLink
 	arm_func_end func_ov14_0214392c
 
@@ -11595,7 +11595,7 @@ func_ov14_0214418c: ; 0x0214418c
 	bl _ZN14AdventureFlags18func_ov00_02097738Ev
 	cmp r0, #0
 	bne _0214429c
-	ldr r0, _021442a8 ; =data_027e0f90
+	ldr r0, _021442a8 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -11657,7 +11657,7 @@ _0214429c:
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _021442a4: .word gAdventureFlags
-_021442a8: .word data_027e0f90
+_021442a8: .word gPlayer
 _021442ac: .word data_027e077c
 _021442b0: .word data_027e05f8
 _021442b4: .word data_027e103c
@@ -15125,7 +15125,7 @@ func_ov14_02146d48: ; 0x02146d48
 	ldrh r0, [r4, #0x2a]
 	cmp r0, #1
 	bne _02146dd8
-	ldr r0, _02146e18 ; =data_027e0f90
+	ldr r0, _02146e18 ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -15167,7 +15167,7 @@ _02146df8:
 	add sp, sp, #0x10
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_02146e18: .word data_027e0f90
+_02146e18: .word gPlayer
 _02146e1c: .word 0x00000333
 _02146e20: .word gMapManager
 	arm_func_end func_ov14_02146d48
@@ -15188,7 +15188,7 @@ func_ov14_02146e24: ; 0x02146e24
 	cmp r0, #0
 	addeq sp, sp, #0x10
 	ldmeqia sp!, {r4, pc}
-	ldr r0, _02146eb0 ; =data_027e0f90
+	ldr r0, _02146eb0 ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -15211,7 +15211,7 @@ func_ov14_02146e24: ; 0x02146e24
 	add sp, sp, #0x10
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_02146eb0: .word data_027e0f90
+_02146eb0: .word gPlayer
 	arm_func_end func_ov14_02146e24
 
 	.global func_ov14_02146eb4
@@ -20108,7 +20108,7 @@ _0214ae44:
 	cmp r0, #0
 	beq _0214ae7c
 _0214ae64:
-	ldr r0, _0214ae8c ; =data_027e0f90
+	ldr r0, _0214ae8c ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -20120,7 +20120,7 @@ _0214ae7c:
 	.align 2, 0
 _0214ae84: .word gMapManager
 _0214ae88: .word gAdventureFlags
-_0214ae8c: .word data_027e0f90
+_0214ae8c: .word gPlayer
 	arm_func_end func_ov14_0214adfc
 
 	.global func_ov14_0214ae90
@@ -21478,7 +21478,7 @@ func_ov14_0214c018: ; 0x0214c018
 	cmp r0, #0
 	movne r0, #0
 	ldmneia sp!, {r4, pc}
-	ldr r0, _0214c0a4 ; =data_027e0f90
+	ldr r0, _0214c0a4 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -21510,7 +21510,7 @@ _0214c09c:
 	mov r0, #0
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_0214c0a4: .word data_027e0f90
+_0214c0a4: .word gPlayer
 _0214c0a8: .word gMapManager
 _0214c0ac: .word data_ov00_020eed2c
 _0214c0b0: .word 0x00000bb8

asm/ov15.inc

@@ -217,7 +217,7 @@
 .extern data_027e0f78
 .extern data_027e0f7c
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov15.s

@@ -3328,7 +3328,7 @@ _021222b8: .word data_027e0764
 func_ov15_021222bc: ; 0x021222bc
 	stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
 	sub sp, sp, #0x60
-	ldr r2, _02122638 ; =data_027e0f90
+	ldr r2, _02122638 ; =gPlayer
 	mov r4, r1
 	ldr r2, [r2]
 	mov r5, r0
@@ -3557,7 +3557,7 @@ _021225f0:
 	add sp, sp, #0x60
 	ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
 	.align 2, 0
-_02122638: .word data_027e0f90
+_02122638: .word gPlayer
 _0212263c: .word 0x42554949
 _02122640: .word data_027e0f94
 _02122644: .word 0x53504b4e
@@ -17382,7 +17382,7 @@ _0212dbf4:
 	bl _ZN5Actor14DistanceToLinkEv
 	cmp r0, #0x2000
 	blt _0212dcdc
-	ldr r0, _0212dd1c ; =data_027e0f90
+	ldr r0, _0212dd1c ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -17407,7 +17407,7 @@ _0212dcf8:
 _0212dd10: .word data_027e10a4
 _0212dd14: .word 0x00000171
 _0212dd18: .word data_02050f54
-_0212dd1c: .word data_027e0f90
+_0212dd1c: .word gPlayer
 	arm_func_end func_ov15_0212dbbc
 
 	.global func_ov15_0212dd20
@@ -21894,7 +21894,7 @@ _02131c70:
 	bne _02131cd0
 	mov r3, #0
 	str r3, [sp]
-	ldr r0, _02131f00 ; =data_027e0f90
+	ldr r0, _02131f00 ; =gPlayer
 	str r3, [sp, #4]
 	ldr r0, [r0]
 	ldr r1, _02131f04 ; =data_027e0fac
@@ -22063,7 +22063,7 @@ _02131ef0: .word 0x00050049
 _02131ef4: .word data_027e0f64
 _02131ef8: .word 0x000002e2
 _02131efc: .word data_02050f54
-_02131f00: .word data_027e0f90
+_02131f00: .word gPlayer
 _02131f04: .word data_027e0fac
 _02131f08: .word gMapManager
 	arm_func_end func_ov15_02131938
@@ -30604,7 +30604,7 @@ _0213950c: .word 0x000001a3
 	arm_func_start func_ov15_02139510
 func_ov15_02139510: ; 0x02139510
 	stmdb sp!, {r3, lr}
-	ldr r0, _02139550 ; =data_027e0f90
+	ldr r0, _02139550 ; =gPlayer
 	ldr r0, [r0]
 	cmp r0, #0
 	ldmneia sp!, {r3, pc}
@@ -30617,11 +30617,11 @@ func_ov15_02139510: ; 0x02139510
 	beq _02139544
 	bl func_ov15_0213955c
 _02139544:
-	ldr r1, _02139550 ; =data_027e0f90
+	ldr r1, _02139550 ; =gPlayer
 	str r0, [r1]
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_02139550: .word data_027e0f90
+_02139550: .word gPlayer
 _02139554: .word data_027e0ce0
 _02139558: .word 0x00000a44
 	arm_func_end func_ov15_02139510
@@ -54412,7 +54412,7 @@ func_ov15_0214d604: ; 0x0214d604
 	ldr r0, [r4, #0x138]
 	cmp r0, #0xf
 	ldmltia sp!, {r4, pc}
-	ldr r0, _0214d670 ; =data_027e0f90
+	ldr r0, _0214d670 ; =gPlayer
 	mov r1, #4
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -54426,7 +54426,7 @@ func_ov15_0214d604: ; 0x0214d604
 	bl _ZN5Actor4KillEv
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_0214d670: .word data_027e0f90
+_0214d670: .word gPlayer
 _0214d674: .word data_ov00_020eec9c
 _0214d678: .word data_027e0f94
 	arm_func_end func_ov15_0214d604
@@ -56640,7 +56640,7 @@ _0214f510:
 	stmia lr, {r0, r1, r2}
 	mov r3, #0
 	str r3, [sp]
-	ldr r0, _0214f750 ; =data_027e0f90
+	ldr r0, _0214f750 ; =gPlayer
 	str r3, [sp, #4]
 	ldr r0, [r0]
 	ldr r1, _0214f74c ; =data_027e0fac
@@ -56786,7 +56786,7 @@ _0214f740: .word 0x00001333
 _0214f744: .word 0x0000051f
 _0214f748: .word 0x00001770
 _0214f74c: .word data_027e0fac
-_0214f750: .word data_027e0f90
+_0214f750: .word gPlayer
 	arm_func_end func_ov15_0214f1a4
 
 	.global func_ov15_0214f754
@@ -59396,7 +59396,7 @@ _02151b3c: .word data_027e0764
 func_ov15_02151b40: ; 0x02151b40
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	sub sp, sp, #0x48
-	ldr r1, _02151cc0 ; =data_027e0f90
+	ldr r1, _02151cc0 ; =gPlayer
 	mov r4, r0
 	ldr r0, [r1]
 	ldrsh r0, [r0, #0xa]
@@ -59491,7 +59491,7 @@ func_ov15_02151b40: ; 0x02151b40
 	add sp, sp, #0x48
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02151cc0: .word data_027e0f90
+_02151cc0: .word gPlayer
 _02151cc4: .word data_027e0f94
 _02151cc8: .word data_027e0764
 _02151ccc: .word 0x00001001
@@ -72587,7 +72587,7 @@ _0215d25c: .word data_027e0d3c
 	.global func_ov15_0215d260
 	arm_func_start func_ov15_0215d260
 func_ov15_0215d260: ; 0x0215d260
-	ldr r0, _0215d2bc ; =data_027e0f90
+	ldr r0, _0215d2bc ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -72612,7 +72612,7 @@ _0215d2b4:
 	mov r0, #0
 	bx lr
 	.align 2, 0
-_0215d2bc: .word data_027e0f90
+_0215d2bc: .word gPlayer
 _0215d2c0: .word data_027e077c
 _0215d2c4: .word data_027e10a4
 	arm_func_end func_ov15_0215d260
@@ -87656,7 +87656,7 @@ _0216a0fc: .word gAdventureFlags
 func_ov15_0216a100: ; 0x0216a100
 	stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
 	sub sp, sp, #0x3c
-	ldr r1, _0216a384 ; =data_027e0f90
+	ldr r1, _0216a384 ; =gPlayer
 	mov r4, r0
 	ldr r0, [r1]
 	ldrsh r0, [r0, #0xa]
@@ -87820,7 +87820,7 @@ _0216a2f8:
 	add sp, sp, #0x3c
 	ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
 	.align 2, 0
-_0216a384: .word data_027e0f90
+_0216a384: .word gPlayer
 _0216a388: .word data_027e0764
 _0216a38c: .word 0x00005555
 _0216a390: .word data_027e0fe8
@@ -97262,14 +97262,14 @@ func_ov15_021724d0: ; 0x021724d0
 	add r1, sp, #0x1c
 	mov r0, r4
 	bl _ZN5Actor9GetHitboxEP8Cylinder
-	ldr r0, _021725c4 ; =data_027e0f90
+	ldr r0, _021725c4 ; =gPlayer
 	add r1, sp, #0x1c
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
 	cmp r0, #0
 	addeq sp, sp, #0x2c
 	ldmeqia sp!, {r3, r4, pc}
-	ldr r0, _021725c4 ; =data_027e0f90
+	ldr r0, _021725c4 ; =gPlayer
 	add r1, sp, #0xc
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -97289,7 +97289,7 @@ func_ov15_021724d0: ; 0x021724d0
 	add r2, sp, #0
 	add r1, r4, #0x54
 	bl func_01ff9bf8
-	ldr r0, _021725c4 ; =data_027e0f90
+	ldr r0, _021725c4 ; =gPlayer
 	add r2, sp, #0
 	ldr r0, [r0]
 	mov r1, #4
@@ -97307,7 +97307,7 @@ _021725b4:
 	add sp, sp, #0x2c
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
-_021725c4: .word data_027e0f90
+_021725c4: .word gPlayer
 _021725c8: .word data_027e0f94
 	arm_func_end func_ov15_021724d0
 
@@ -100886,7 +100886,7 @@ _02175574:
 	ldr r0, [r6, #0xb0]
 	cmp r0, #0
 	strneh r8, [r0, #0x74]
-	ldr r0, _02175b3c ; =data_027e0f90
+	ldr r0, _02175b3c ; =gPlayer
 	ldr r2, [r6, #0xb0]
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
@@ -100966,7 +100966,7 @@ _021756a8:
 	ldr r0, [r6, #0xb4]
 	cmp r0, #0
 	strneh r8, [r0, #0x74]
-	ldr r0, _02175b3c ; =data_027e0f90
+	ldr r0, _02175b3c ; =gPlayer
 	ldr r2, [r6, #0xb4]
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
@@ -101044,7 +101044,7 @@ _021757d4:
 	ldr r0, [r6, #0xb8]
 	cmp r0, #0
 	strneh r8, [r0, #0x74]
-	ldr r0, _02175b3c ; =data_027e0f90
+	ldr r0, _02175b3c ; =gPlayer
 	ldr r2, [r6, #0xb8]
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
@@ -101104,7 +101104,7 @@ _0217585c:
 	add r1, r2, r1
 	str r1, [r0, #0x30]
 _021758d0:
-	ldr r0, _02175b3c ; =data_027e0f90
+	ldr r0, _02175b3c ; =gPlayer
 	ldr r2, [r6, #0xbc]
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
@@ -101264,7 +101264,7 @@ _02175ad4:
 _02175b30: .word data_027e0d38
 _02175b34: .word data_027e0c54
 _02175b38: .word data_ov15_02186d04
-_02175b3c: .word data_027e0f90
+_02175b3c: .word gPlayer
 _02175b40: .word data_ov15_02186d10
 _02175b44: .word data_ov15_02186d1c
 _02175b48: .word data_ov15_02186d28
@@ -114589,7 +114589,7 @@ _021811d8:
 	str r2, [r4, #0x338]
 	ldrsh r2, [r1]
 	mov r3, #0
-	ldr r5, _02181394 ; =data_027e0f90
+	ldr r5, _02181394 ; =gPlayer
 	strh r2, [r0, #0x98]
 	ldr r2, _02181380 ; =0x00000aab
 	str r3, [r4, #0x388]
@@ -114656,7 +114656,7 @@ _02181384: .word 0x00000133
 _02181388: .word data_027e10a4
 _0218138c: .word data_027e0764
 _02181390: .word data_027e0ff0
-_02181394: .word data_027e0f90
+_02181394: .word gPlayer
 	arm_func_end func_ov15_02180e44
 
 	.global func_ov15_02181398

asm/ov17.inc

@@ -97,7 +97,7 @@
 .extern data_027e0f70
 .extern data_027e0f78
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov17.s

@@ -7459,7 +7459,7 @@ func_ov17_021611cc: ; 0x021611cc
 	ldr r0, [r4, #0xb4]
 	cmp r0, #0
 	ldmneia sp!, {r3, r4, r5, pc}
-	ldr r0, _021612a4 ; =data_027e0f90
+	ldr r0, _021612a4 ; =gPlayer
 	mov r1, #0x3e8
 	ldr r0, [r0]
 	rsb r1, r1, #0
@@ -7489,7 +7489,7 @@ _0216127c:
 	bl func_ov00_020bcfb8
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_021612a4: .word data_027e0f90
+_021612a4: .word gPlayer
 _021612a8: .word gAdventureFlags
 _021612ac: .word gPlayerLink
 	arm_func_end func_ov17_021611cc

asm/ov19.inc

@@ -118,7 +118,7 @@
 .extern data_027e0f6c
 .extern data_027e0f78
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fb8

asm/ov19.s

@@ -3451,7 +3451,7 @@ _021703a4:
 	mov r3, r2
 	mov r1, #1
 	blx func_ov00_0207b2f0
-	ldr r0, _02170560 ; =data_027e0f90
+	ldr r0, _02170560 ; =gPlayer
 	mov r1, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -3555,7 +3555,7 @@ _02170540:
 _02170554: .word data_027e0c54
 _02170558: .word func_ov05_02102a80
 _0217055c: .word data_027e0db0
-_02170560: .word data_027e0f90
+_02170560: .word gPlayer
 _02170564: .word gMapManager
 _02170568: .word data_027e0f64
 _0217056c: .word 0x00001555
@@ -9176,7 +9176,7 @@ _02174f38:
 	add r1, sp, #0x38
 	mov r0, r4
 	bl _ZN5Actor9GetHitboxEP8Cylinder
-	ldr r0, _0217558c ; =data_027e0f90
+	ldr r0, _0217558c ; =gPlayer
 	add r1, sp, #0x38
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -9603,7 +9603,7 @@ _02175574:
 _02175580: .word data_027e0ffc
 _02175584: .word 0x0000024a
 _02175588: .word gMapManager
-_0217558c: .word data_027e0f90
+_0217558c: .word gPlayer
 _02175590: .word 0x00000333
 _02175594: .word gPlayerLink
 _02175598: .word data_ov19_02175e4c

asm/ov20.inc

@@ -110,7 +110,7 @@
 .extern data_027e0f64
 .extern data_027e0f68
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern gPlayerLink

asm/ov20.s

@@ -933,7 +933,7 @@ _0216e3b4:
 	add sp, sp, #0x124
 	ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
 _0216e3dc:
-	ldr r0, _0216e554 ; =data_027e0f90
+	ldr r0, _0216e554 ; =gPlayer
 	mov r1, r4
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -1030,7 +1030,7 @@ _0216e544: .word data_027e0f94
 _0216e548: .word data_027e0764
 _0216e54c: .word 0x00008001
 _0216e550: .word gMapManager
-_0216e554: .word data_027e0f90
+_0216e554: .word gPlayer
 _0216e558: .word data_027e0f64
 _0216e55c: .word 0x00001555
 _0216e560: .word 0x00001006

asm/ov22.inc

@@ -113,7 +113,7 @@
 .extern data_027e0f6c
 .extern data_027e0f78
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov22.s

@@ -5038,7 +5038,7 @@ func_ov22_02171944: ; 0x02171944
 	stmdb sp!, {r3, r4, lr}
 	sub sp, sp, #0xc
 	ldr r1, _02171998 ; =data_027e0f94
-	ldr r3, _0217199c ; =data_027e0f90
+	ldr r3, _0217199c ; =gPlayer
 	mov r4, r0
 	add ip, sp, #0
 	ldmia r1, {r0, r1, r2}
@@ -5058,7 +5058,7 @@ func_ov22_02171944: ; 0x02171944
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
 _02171998: .word data_027e0f94
-_0217199c: .word data_027e0f90
+_0217199c: .word gPlayer
 	arm_func_end func_ov22_02171944
 
 	.global func_ov22_021719a0

asm/ov23.inc

@@ -148,7 +148,7 @@
 .extern data_027e0f6c
 .extern data_027e0f70
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov23.s

@@ -6375,7 +6375,7 @@ func_ov23_02172928: ; 0x02172928
 	add r3, sp, #0
 	ldmia r0, {r0, r1, r2}
 	stmia r3, {r0, r1, r2}
-	ldr r0, _02172990 ; =data_027e0f90
+	ldr r0, _02172990 ; =gPlayer
 	ldr r2, _02172994 ; =0x0000099a
 	ldr r0, [r0]
 	mov r1, r3
@@ -6394,7 +6394,7 @@ _02172984:
 	add sp, sp, #0x10
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_02172990: .word data_027e0f90
+_02172990: .word gPlayer
 _02172994: .word 0x0000099a
 	arm_func_end func_ov23_02172928
 
@@ -6510,7 +6510,7 @@ func_ov23_02172b18: ; 0x02172b18
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	bl func_ov23_02173014
-	ldr r0, _02172b5c ; =data_027e0f90
+	ldr r0, _02172b5c ; =gPlayer
 	add r1, r4, #0x184
 	ldr r0, [r0]
 	add r1, r1, #0x400
@@ -6526,7 +6526,7 @@ _02172b54:
 	mov r0, #0
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_02172b5c: .word data_027e0f90
+_02172b5c: .word gPlayer
 	arm_func_end func_ov23_02172b18
 
 	.global func_ov23_02172b60
@@ -9863,7 +9863,7 @@ func_ov23_021758f8: ; 0x021758f8
 	arm_func_start func_ov23_0217590c
 func_ov23_0217590c: ; 0x0217590c
 	stmdb sp!, {r3, r4, r5, lr}
-	ldr r2, _02175970 ; =data_027e0f90
+	ldr r2, _02175970 ; =gPlayer
 	mov r5, r0
 	ldr r0, [r2]
 	mov r4, r1
@@ -9888,7 +9888,7 @@ func_ov23_0217590c: ; 0x0217590c
 	blx ip
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_02175970: .word data_027e0f90
+_02175970: .word gPlayer
 _02175974: .word gPlayerLink
 	arm_func_end func_ov23_0217590c
 

asm/ov24.inc

@@ -108,7 +108,7 @@
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern gPlayerLink
 .extern data_027e0fe0

asm/ov24.s

@@ -9720,7 +9720,7 @@ _021754f4:
 	mov r1, r1, lsr #0xc
 	orr r1, r1, r0, lsl #20
 	ldr r2, [r3, #0x408]
-	ldr r0, _02175ecc ; =data_027e0f90
+	ldr r0, _02175ecc ; =gPlayer
 	add r1, r2, r1
 	str r1, [r3, #0x408]
 	ldr r0, [r0]
@@ -10331,7 +10331,7 @@ _02175ebc: .word data_027e0fe4
 _02175ec0: .word data_ov24_021792e4
 _02175ec4: .word 0x00000b33
 _02175ec8: .word data_02050f54
-_02175ecc: .word data_027e0f90
+_02175ecc: .word gPlayer
 _02175ed0: .word gItemManager
 _02175ed4: .word data_027e0ffc
 _02175ed8: .word 0x0000ffff

asm/ov25.inc

@@ -113,7 +113,7 @@
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov25.s

@@ -13683,7 +13683,7 @@ func_ov25_02178d0c: ; 0x02178d0c
 	add r2, sp, #0
 	add r1, r4, #0x34c
 	bl func_01ff9bf8
-	ldr r0, _02178d88 ; =data_027e0f90
+	ldr r0, _02178d88 ; =gPlayer
 	add r1, r4, #0x34c
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -13691,7 +13691,7 @@ func_ov25_02178d0c: ; 0x02178d0c
 	addeq sp, sp, #0xc
 	moveq r0, #0
 	ldmeqia sp!, {r3, r4, pc}
-	ldr r0, _02178d88 ; =data_027e0f90
+	ldr r0, _02178d88 ; =gPlayer
 	ldrb r1, [r4, #0x124]
 	ldr r0, [r0]
 	add r2, sp, #0
@@ -13703,7 +13703,7 @@ func_ov25_02178d0c: ; 0x02178d0c
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
 _02178d84: .word data_027e0f94
-_02178d88: .word data_027e0f90
+_02178d88: .word gPlayer
 	arm_func_end func_ov25_02178d0c
 
 	.global func_ov25_02178d8c

asm/ov26.inc

@@ -118,7 +118,7 @@
 .extern data_027e0f6c
 .extern data_027e0f7c
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov26.s

@@ -7095,7 +7095,7 @@ _02173010:
 	ldr r0, [r0, #4]
 	add r3, sp, #0xbc
 	bl func_ov00_020888e8
-	ldr r0, _021732b0 ; =data_027e0f90
+	ldr r0, _021732b0 ; =gPlayer
 	mov r1, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -7146,7 +7146,7 @@ _02173160:
 	ldr r0, _02173294 ; =data_027e077c
 	mov r1, #1
 	bl func_0202e740
-	ldr r0, _021732b0 ; =data_027e0f90
+	ldr r0, _021732b0 ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -7230,7 +7230,7 @@ _021732a0: .word 0x00001555
 _021732a4: .word 0x00001733
 _021732a8: .word 0xfffff99a
 _021732ac: .word gAdventureFlags
-_021732b0: .word data_027e0f90
+_021732b0: .word gPlayer
 _021732b4: .word data_027e0fe4
 _021732b8: .word data_027e0c68
 _021732bc: .word gItemManager
@@ -9777,7 +9777,7 @@ _02174d14:
 	ldr r0, [r0, #4]
 	add r3, sp, #0xbc
 	bl func_ov00_020888e8
-	ldr r0, _02174ff0 ; =data_027e0f90
+	ldr r0, _02174ff0 ; =gPlayer
 	mov r1, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -9840,7 +9840,7 @@ _02174ea4:
 	ldr r0, [r0]
 	ldr r0, [r0, #4]
 	bl func_ov00_020875f8
-	ldr r0, _02174ff0 ; =data_027e0f90
+	ldr r0, _02174ff0 ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -9922,7 +9922,7 @@ _02174fe0: .word data_027e0f64
 _02174fe4: .word 0x0000071c
 _02174fe8: .word 0x0000199a
 _02174fec: .word gAdventureFlags
-_02174ff0: .word data_027e0f90
+_02174ff0: .word gPlayer
 _02174ff4: .word data_027e0c68
 _02174ff8: .word data_027e1048
 _02174ffc: .word data_027e104c

asm/ov27.inc

@@ -97,7 +97,7 @@
 .extern data_027e0f64
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov27.s

@@ -3514,7 +3514,7 @@ _021707f8:
 	str r1, [sp, #0xc]
 	str r2, [sp, #0x10]
 	bl func_ov00_020bc280
-	ldr r0, _021708d0 ; =data_027e0f90
+	ldr r0, _021708d0 ; =gPlayer
 	mov r1, #2
 	ldr r0, [r0]
 	add r2, sp, #8
@@ -3549,7 +3549,7 @@ _021708c0: .word 0x00000239
 _021708c4: .word data_027e0e58
 _021708c8: .word data_027e0fb8
 _021708cc: .word data_027e0f64
-_021708d0: .word data_027e0f90
+_021708d0: .word gPlayer
 	arm_func_end func_ov27_02170480
 
 	.global func_ov27_021708d4
@@ -6831,7 +6831,7 @@ func_ov27_02173590: ; 0x02173590
 	cmp r0, #0
 	addne sp, sp, #8
 	ldmneia sp!, {r4, pc}
-	ldr r0, _021736f8 ; =data_027e0f90
+	ldr r0, _021736f8 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -6903,7 +6903,7 @@ _021736dc:
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _021736f4: .word data_027e103c
-_021736f8: .word data_027e0f90
+_021736f8: .word gPlayer
 _021736fc: .word data_027e077c
 _02173700: .word gItemManager
 _02173704: .word data_027e0fe4
@@ -10041,7 +10041,7 @@ _02175f10:
 	ldrb r0, [r4, #0x4e3]
 	cmp r0, #4
 	bne _02175fd8
-	ldr r0, _02176060 ; =data_027e0f90
+	ldr r0, _02176060 ; =gPlayer
 	ldr r1, [r0]
 	ldrsh r0, [r1, #0xc]
 	sub r0, r0, #4
@@ -10117,7 +10117,7 @@ _02176044:
 	.align 2, 0
 _02176058: .word data_027e0ffc
 _0217605c: .word 0x0000040b
-_02176060: .word data_027e0f90
+_02176060: .word gPlayer
 _02176064: .word data_ov00_020eec9c
 _02176068: .word 0x0000040d
 _0217606c: .word 0x0000040e
@@ -11491,7 +11491,7 @@ _02177358: ; jump table
 	b _0217749c ; case 5
 _02177370:
 	mov r1, #1
-	ldr r0, _02177670 ; =data_027e0f90
+	ldr r0, _02177670 ; =gPlayer
 	strb r1, [r4, #0x4e5]
 	ldr r2, [r0]
 	mov r3, #0xc
@@ -11525,7 +11525,7 @@ _02177370:
 	b _02177664
 _021773f4:
 	mov r1, #1
-	ldr r0, _02177670 ; =data_027e0f90
+	ldr r0, _02177670 ; =gPlayer
 	strb r1, [r4, #0x4e8]
 	mov r1, #0
 	ldr r2, [r0]
@@ -11687,7 +11687,7 @@ _02177664:
 	add sp, sp, #0x118
 	ldmia sp!, {r4, r5, r6, r7, r8, pc}
 	.align 2, 0
-_02177670: .word data_027e0f90
+_02177670: .word gPlayer
 _02177674: .word data_027e103c
 _02177678: .word data_027e0fb8
 _0217767c: .word data_027e0cbc
@@ -11919,7 +11919,7 @@ func_ov27_02177940: ; 0x02177940
 	tst r0, #2
 	addeq sp, sp, #0x28
 	ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
-	ldr r0, _02177bb4 ; =data_027e0f90
+	ldr r0, _02177bb4 ; =gPlayer
 	ldr r0, [r0]
 	ldrb r0, [r0, #0x12]
 	cmp r0, #0
@@ -12064,7 +12064,7 @@ _02177a9c:
 	.align 2, 0
 _02177bac: .word data_027e0cbc
 _02177bb0: .word data_027e0618
-_02177bb4: .word data_027e0f90
+_02177bb4: .word gPlayer
 _02177bb8: .word data_027e0c38
 _02177bbc: .word 0x51eb851f
 _02177bc0: .word 0x66666667

asm/ov29.inc

@@ -94,7 +94,7 @@
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov29.s

@@ -566,7 +566,7 @@ func_ov29_0216dcf4: ; 0x0216dcf4
 	ldreq r0, [r4, #0x38]
 	cmpeq r0, #4
 	ldmneia sp!, {r3, r4, r5, pc}
-	ldr r0, _0216dd5c ; =data_027e0f90
+	ldr r0, _0216dd5c ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #0
@@ -582,7 +582,7 @@ func_ov29_0216dcf4: ; 0x0216dcf4
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _0216dd58: .word data_027e0618
-_0216dd5c: .word data_027e0f90
+_0216dd5c: .word gPlayer
 	arm_func_end func_ov29_0216dcf4
 
 	.global func_ov29_0216dd60

asm/ov30.inc

@@ -87,7 +87,7 @@
 .extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f6c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern gPlayerLink
 .extern data_027e0fe0

asm/ov30.s

@@ -1545,7 +1545,7 @@ _0217d098: .word 0x43525053
 func_ov30_0217d09c: ; 0x0217d09c
 	stmdb sp!, {r4, r5, r6, r7, r8, lr}
 	sub sp, sp, #0x58
-	ldr r3, _0217d388 ; =data_027e0f90
+	ldr r3, _0217d388 ; =gPlayer
 	mov r7, r0
 	ldr r0, [r3]
 	mov r6, r1
@@ -1742,7 +1742,7 @@ _0217d37c:
 	add sp, sp, #0x58
 	ldmia sp!, {r4, r5, r6, r7, r8, pc}
 	.align 2, 0
-_0217d388: .word data_027e0f90
+_0217d388: .word gPlayer
 _0217d38c: .word data_027e0f94
 _0217d390: .word gMapManager
 _0217d394: .word 0xffff8001
@@ -1766,7 +1766,7 @@ func_ov30_0217d3a4: ; 0x0217d3a4
 func_ov30_0217d3b8: ; 0x0217d3b8
 	stmdb sp!, {r3, r4, r5, lr}
 	sub sp, sp, #0x20
-	ldr r1, _0217d4d8 ; =data_027e0f90
+	ldr r1, _0217d4d8 ; =gPlayer
 	mov r5, r0
 	ldr r0, [r1]
 	ldr r4, _0217d4dc ; =data_027e0f94
@@ -1837,7 +1837,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8
 	add sp, sp, #0x20
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_0217d4d8: .word data_027e0f90
+_0217d4d8: .word gPlayer
 _0217d4dc: .word data_027e0f94
 _0217d4e0: .word gMapManager
 _0217d4e4: .word 0x0000019a
@@ -8197,7 +8197,7 @@ func_ov30_02182454: ; 0x02182454
 	arm_func_start func_ov30_02182474
 func_ov30_02182474: ; 0x02182474
 	stmdb sp!, {r3, r4, r5, lr}
-	ldr r1, _021824bc ; =data_027e0f90
+	ldr r1, _021824bc ; =gPlayer
 	mov r5, r0
 	ldr r0, [r1]
 	ldr r4, _021824c0 ; =data_027e0f94
@@ -8215,7 +8215,7 @@ func_ov30_02182474: ; 0x02182474
 	bl func_ov00_020c54a0
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_021824bc: .word data_027e0f90
+_021824bc: .word gPlayer
 _021824c0: .word data_027e0f94
 _021824c4: .word 0x00001b33
 _021824c8: .word 0x00001555
@@ -8641,7 +8641,7 @@ func_ov30_02182ae4: ; 0x02182ae4
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
-	ldr r0, _02182b44 ; =data_027e0f90
+	ldr r0, _02182b44 ; =gPlayer
 	mov r1, r6
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -8658,7 +8658,7 @@ func_ov30_02182ae4: ; 0x02182ae4
 	blx ip
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
-_02182b44: .word data_027e0f90
+_02182b44: .word gPlayer
 _02182b48: .word gPlayerLink
 	arm_func_end func_ov30_02182ae4
 

asm/ov32.inc

@@ -94,7 +94,7 @@
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern data_027e0fac

asm/ov32.s

@@ -1514,7 +1514,7 @@ _0217cfc0:
 _0217cfc4:
 	mov r0, r5
 	bl func_ov32_0217d188
-	ldr r0, _0217d170 ; =data_027e0f90
+	ldr r0, _0217d170 ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #4]
@@ -1623,7 +1623,7 @@ _0217d0f8:
 	blx r1
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
-_0217d170: .word data_027e0f90
+_0217d170: .word gPlayer
 _0217d174: .word gMapManager
 _0217d178: .word 0x0000071c
 _0217d17c: .word data_027e0764
@@ -3054,7 +3054,7 @@ func_ov32_0217e3c4: ; 0x0217e3c4
 _0217e3e0:
 	mov r4, #0x46
 _0217e3e4:
-	ldr r0, _0217e58c ; =data_027e0f90
+	ldr r0, _0217e58c ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #4]
@@ -3164,7 +3164,7 @@ _0217e514:
 	blx r1
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
-_0217e58c: .word data_027e0f90
+_0217e58c: .word gPlayer
 _0217e590: .word gMapManager
 _0217e594: .word 0x0000071c
 _0217e598: .word data_027e0764
@@ -3840,7 +3840,7 @@ _0217ee34:
 	mov r0, r2, asr #0x1f
 	orr r3, r3, r11, lsl #20
 	str r0, [sp, #8]
-	ldr r0, _0217efcc ; =data_027e0f90
+	ldr r0, _0217efcc ; =gPlayer
 	add r1, sp, #0x1c
 	add r10, r10, r3
 	mov r3, r1
@@ -3921,7 +3921,7 @@ _0217ef94:
 	.align 2, 0
 _0217efc4: .word 0x00007fff
 _0217efc8: .word data_02050f54
-_0217efcc: .word data_027e0f90
+_0217efcc: .word gPlayer
 _0217efd0: .word data_027e0fac
 _0217efd4: .word 0x00005555
 	arm_func_end func_ov32_0217eddc
@@ -5180,7 +5180,7 @@ func_ov32_0217feac: ; 0x0217feac
 	mov r0, r6
 	bl func_ov32_02180af0
 	mov r1, #2
-	ldr r0, _02180044 ; =data_027e0f90
+	ldr r0, _02180044 ; =gPlayer
 	str r1, [r6, #0x12c]
 	ldr r0, [r0]
 	mov r4, #0
@@ -5271,7 +5271,7 @@ _0217ffd0:
 	add sp, sp, #0x20
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02180044: .word data_027e0f90
+_02180044: .word gPlayer
 _02180048: .word data_027e0f94
 _0218004c: .word gMapManager
 _02180050: .word data_027e0764
@@ -7621,7 +7621,7 @@ _02182080:
 	ldr r0, [r0, #4]
 	add r3, sp, #0xc
 	bl func_ov00_020888e8
-	ldr r0, _021822a4 ; =data_027e0f90
+	ldr r0, _021822a4 ; =gPlayer
 	mov r1, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -7705,7 +7705,7 @@ _0218223c:
 	ldr r0, _02182294 ; =data_027e077c
 	mov r1, #1
 	bl func_0202e740
-	ldr r0, _021822a4 ; =data_027e0f90
+	ldr r0, _021822a4 ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -7730,7 +7730,7 @@ _02182294: .word data_027e077c
 _02182298: .word data_027e103c
 _0218229c: .word data_027e0f64
 _021822a0: .word 0x00003c72
-_021822a4: .word data_027e0f90
+_021822a4: .word gPlayer
 _021822a8: .word data_027e0c68
 _021822ac: .word 0x0000039a
 	arm_func_end func_ov32_02181d00

asm/ov35.inc

@@ -92,7 +92,7 @@
 .extern data_027e0e58
 .extern gMapManager
 .extern data_027e0f64
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov35.s

@@ -6490,7 +6490,7 @@ _02181788:
 	ldr r1, [r4, #0x548]
 	cmp r1, #1
 	bne _021817c4
-	ldr r0, _02181804 ; =data_027e0f90
+	ldr r0, _02181804 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #1
@@ -6518,7 +6518,7 @@ _021817c4:
 	.align 2, 0
 _021817fc: .word data_027e0fb8
 _02181800: .word gPlayerLink
-_02181804: .word data_027e0f90
+_02181804: .word gPlayer
 _02181808: .word data_ov00_020eec9c
 _0218180c: .word data_027e0f94
 	arm_func_end func_ov35_0218174c
@@ -7493,7 +7493,7 @@ _02182598:
 	ldr r1, [r4, #0x548]
 	cmp r1, #1
 	bne _021825d4
-	ldr r0, _02182614 ; =data_027e0f90
+	ldr r0, _02182614 ; =gPlayer
 	ldr r0, [r0]
 	ldrsh r0, [r0, #0xa]
 	cmp r0, #1
@@ -7521,7 +7521,7 @@ _021825d4:
 	.align 2, 0
 _0218260c: .word data_027e0fb8
 _02182610: .word gPlayerLink
-_02182614: .word data_027e0f90
+_02182614: .word gPlayer
 _02182618: .word data_ov00_020eec9c
 _0218261c: .word data_027e0f94
 	arm_func_end func_ov35_02182560
@@ -7622,7 +7622,7 @@ _0218271c: .word 0x0000071c
 func_ov35_02182720: ; 0x02182720
 	stmdb sp!, {r3, r4, lr}
 	sub sp, sp, #4
-	ldr r1, _02182820 ; =data_027e0f90
+	ldr r1, _02182820 ; =gPlayer
 	mov r4, r0
 	ldr r0, [r1]
 	mov r1, #0
@@ -7689,7 +7689,7 @@ _02182814:
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
-_02182820: .word data_027e0f90
+_02182820: .word gPlayer
 _02182824: .word data_027e0ffc
 _02182828: .word 0x00000229
 _0218282c: .word 0x0000019a

asm/ov36.inc

@@ -79,7 +79,7 @@
 .extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f6c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern gPlayerLink

asm/ov36.s

@@ -6736,7 +6736,7 @@ _021818fc:
 	ldr r3, [r3, #0x7c]
 	blx r3
 _02181b40:
-	ldr r0, _02181ba0 ; =data_027e0f90
+	ldr r0, _02181ba0 ; =gPlayer
 	mov r1, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -6761,7 +6761,7 @@ _02181b90: .word data_027e0f64
 _02181b94: .word 0x0000038e
 _02181b98: .word 0x00000dac
 _02181b9c: .word gPlayerLink
-_02181ba0: .word data_027e0f90
+_02181ba0: .word gPlayer
 _02181ba4: .word data_027e0e58
 	arm_func_end func_ov36_021818b4
 
@@ -6947,7 +6947,7 @@ _02181e34:
 	cmpeq r0, #0
 	addne sp, sp, #0x14
 	ldmneia sp!, {r3, r4, pc}
-	ldr r0, _02181f38 ; =data_027e0f90
+	ldr r0, _02181f38 ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -7004,7 +7004,7 @@ _02181f28: .word 0x000002c7
 _02181f2c: .word data_027e071c
 _02181f30: .word gMapManager
 _02181f34: .word 0x0000011e
-_02181f38: .word data_027e0f90
+_02181f38: .word gPlayer
 	arm_func_end func_ov36_02181ba8
 
 	.global func_ov36_02181f3c
@@ -7231,7 +7231,7 @@ _02182270:
 	cmp r0, #0
 	addeq sp, sp, #0x228
 	ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
-	ldr r0, _0218294c ; =data_027e0f90
+	ldr r0, _0218294c ; =gPlayer
 	mov r1, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -7640,7 +7640,7 @@ _0218287c:
 	bl _ZN14AdventureFlags18func_ov00_02097bccEv
 	mvn r1, #0
 	str r1, [r4, #0x66c]
-	ldr r0, _0218294c ; =data_027e0f90
+	ldr r0, _0218294c ; =gPlayer
 	mov r1, #1
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -7684,7 +7684,7 @@ _02182940:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
 	.align 2, 0
 _02182948: .word gAdventureFlags
-_0218294c: .word data_027e0f90
+_0218294c: .word gPlayer
 _02182950: .word 0x00000bb8
 _02182954: .word data_027e0f64
 _02182958: .word data_ov36_02186ce8
@@ -7907,7 +7907,7 @@ _02182c84: .word 0x00000dac
 func_ov36_02182c88: ; 0x02182c88
 	stmdb sp!, {r3, r4, lr}
 	sub sp, sp, #0x14
-	ldr r1, _02182df4 ; =data_027e0f90
+	ldr r1, _02182df4 ; =gPlayer
 	mov r4, r0
 	ldr r0, [r1]
 	mov r1, #0
@@ -8001,7 +8001,7 @@ _02182de4:
 	add sp, sp, #0x14
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
-_02182df4: .word data_027e0f90
+_02182df4: .word gPlayer
 _02182df8: .word data_027e0e58
 _02182dfc: .word data_027e0f64
 _02182e00: .word data_027e0ffc

asm/ov37.inc

@@ -81,7 +81,7 @@
 .extern data_027e0e58
 .extern data_027e0f64
 .extern data_027e0f6c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fa0
 .extern gPlayerLink

asm/ov37.s

@@ -814,7 +814,7 @@ _0217c808:
 	add sp, sp, #0x18
 	ldmia sp!, {r3, r4, r5, pc}
 _0217c814:
-	ldr r0, _0217c918 ; =data_027e0f90
+	ldr r0, _0217c918 ; =gPlayer
 	mov r1, r2
 	ldr r0, [r0]
 	bl _ZN10PlayerBase10SetVisibleEb
@@ -882,7 +882,7 @@ _0217c908: .word gPlayerLink
 _0217c90c: .word data_ov37_02189160
 _0217c910: .word data_027e0c54
 _0217c914: .word func_ov37_0217be34
-_0217c918: .word data_027e0f90
+_0217c918: .word gPlayer
 _0217c91c: .word 0x0000101e
 _0217c920: .word data_027e0e58
 	arm_func_end func_ov37_0217c464
@@ -13788,7 +13788,7 @@ func_ov37_02187c5c: ; 0x02187c5c
 	add r2, sp, #0x1c
 	add r1, r4, #0x54
 	bl func_01ff9bf8
-	ldr r0, _02187ce8 ; =data_027e0f90
+	ldr r0, _02187ce8 ; =gPlayer
 	ldr r1, [r4, #0x4c]
 	ldr lr, [r4, #0x50]
 	ldr ip, [r4, #0x48]
@@ -13805,7 +13805,7 @@ func_ov37_02187c5c: ; 0x02187c5c
 	addeq sp, sp, #0x28
 	moveq r0, #0
 	ldmeqia sp!, {r4, pc}
-	ldr r0, _02187ce8 ; =data_027e0f90
+	ldr r0, _02187ce8 ; =gPlayer
 	mov r1, #2
 	ldr r0, [r0]
 	add r2, sp, #0x1c
@@ -13817,7 +13817,7 @@ func_ov37_02187c5c: ; 0x02187c5c
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _02187ce4: .word data_027e0f94
-_02187ce8: .word data_027e0f90
+_02187ce8: .word gPlayer
 	arm_func_end func_ov37_02187c5c
 
 	.global func_ov37_02187cec
@@ -13830,7 +13830,7 @@ func_ov37_02187cec: ; 0x02187cec
 	add r2, sp, #0x1c
 	add r1, r4, #0x54
 	bl func_01ff9bf8
-	ldr r0, _02187d88 ; =data_027e0f90
+	ldr r0, _02187d88 ; =gPlayer
 	ldr lr, [r4, #0x4c]
 	ldr ip, [r4, #0x50]
 	ldr r3, [r4, #0x48]
@@ -13848,7 +13848,7 @@ func_ov37_02187cec: ; 0x02187cec
 	bl func_ov00_020cca50
 	cmp r0, #0
 	beq _02187d78
-	ldr r0, _02187d88 ; =data_027e0f90
+	ldr r0, _02187d88 ; =gPlayer
 	mov r1, #2
 	ldr r0, [r0]
 	add r2, sp, #0x1c
@@ -13864,7 +13864,7 @@ _02187d78:
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _02187d84: .word data_027e0f94
-_02187d88: .word data_027e0f90
+_02187d88: .word gPlayer
 _02187d8c: .word 0x000024cd
 	arm_func_end func_ov37_02187cec
 

asm/ov39.inc

@@ -82,7 +82,7 @@
 .extern data_027e0e58
 .extern gMapManager
 .extern data_027e0f64
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fb8

asm/ov39.s

@@ -3020,7 +3020,7 @@ _0217e69c:
 	mov r0, r0, lsl #0x1
 	ldrsh r1, [r2, r1]
 	ldrsh r0, [r2, r0]
-	ldr r11, _0217e824 ; =data_027e0f90
+	ldr r11, _0217e824 ; =gPlayer
 	str r9, [sp, #0x1c]
 	str r1, [sp, #0x18]
 	str r0, [sp, #0x20]
@@ -3077,7 +3077,7 @@ _0217e6dc:
 	movne r10, #1
 	cmp r10, #0
 	beq _0217e7ec
-	ldr r0, _0217e824 ; =data_027e0f90
+	ldr r0, _0217e824 ; =gPlayer
 	add r2, sp, #0x18
 	ldr r0, [r0]
 	mov r1, #4
@@ -3111,7 +3111,7 @@ _0217e814: .word data_ov39_02186620
 _0217e818: .word data_ov39_02186590
 _0217e81c: .word 0x0000059a
 _0217e820: .word data_02050f54
-_0217e824: .word data_027e0f90
+_0217e824: .word gPlayer
 _0217e828: .word data_ov29_0217bd28
 	arm_func_end func_ov39_0217e5b0
 
@@ -3507,7 +3507,7 @@ _0217ecdc:
 	add r1, sp, #0
 	add r0, r0, #0x400
 	bl func_ov39_0217c894
-	ldr r0, _0217ede8 ; =data_027e0f90
+	ldr r0, _0217ede8 ; =gPlayer
 	ldr r3, _0217edec ; =0x00000b33
 	ldr r0, [r0]
 	add r1, sp, #0
@@ -3564,7 +3564,7 @@ _0217edd8:
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _0217ede4: .word 0x0000471c
-_0217ede8: .word data_027e0f90
+_0217ede8: .word gPlayer
 _0217edec: .word 0x00000b33
 _0217edf0: .word data_027e0ffc
 	arm_func_end func_ov39_0217ec98
@@ -5031,7 +5031,7 @@ _02180004:
 	ldr r4, [r5, #0x1c]
 	ldr r2, [r5, #0x18]
 	ldr r1, [r5, #0x14]
-	ldr r0, _02180f38 ; =data_027e0f90
+	ldr r0, _02180f38 ; =gPlayer
 	str r1, [r5, #0x48]
 	str r2, [r5, #0x4c]
 	str r4, [r5, #0x50]
@@ -5918,7 +5918,7 @@ _02180f28: .word gAdventureFlags
 _02180f2c: .word 0x00001b33
 _02180f30: .word 0x00000b33
 _02180f34: .word 0x00000666
-_02180f38: .word data_027e0f90
+_02180f38: .word gPlayer
 _02180f3c: .word gItemManager
 _02180f40: .word data_02050f54
 _02180f44: .word data_027e0c68
@@ -7376,7 +7376,7 @@ _0218233c:
 	str r1, [sp, #4]
 	str r2, [sp, #8]
 	bl func_ov00_020bc280
-	ldr r0, _02182404 ; =data_027e0f90
+	ldr r0, _02182404 ; =gPlayer
 	mov r1, #2
 	ldr r0, [r0]
 	add r2, sp, #0
@@ -7407,7 +7407,7 @@ _021823f4: .word data_027e0ffc
 _021823f8: .word 0x000001bd
 _021823fc: .word data_ov29_0217a4ac
 _02182400: .word data_02050f54
-_02182404: .word data_027e0f90
+_02182404: .word gPlayer
 _02182408: .word data_ov29_0217bd28
 	arm_func_end func_ov39_02182284
 
@@ -8417,7 +8417,7 @@ func_ov39_021831d8: ; 0x021831d8
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r4, r0
 	ldr r1, [r4, #0x174]
-	ldr r0, _021832bc ; =data_027e0f90
+	ldr r0, _021832bc ; =gPlayer
 	add r1, r1, #1
 	str r1, [r4, #0x174]
 	ldr r0, [r0]
@@ -8473,7 +8473,7 @@ _0218321c:
 	str r2, [r4, #0x68]
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_021832bc: .word data_027e0f90
+_021832bc: .word gPlayer
 _021832c0: .word data_ov29_0217a4ac
 _021832c4: .word data_02050f54
 _021832c8: .word 0x00000666
@@ -11547,7 +11547,7 @@ func_ov39_02185c3c: ; 0x02185c3c
 	rsbmi r1, r1, #0
 	cmp r1, r0
 	bgt _02185d1c
-	ldr r0, _02185e94 ; =data_027e0f90
+	ldr r0, _02185e94 ; =gPlayer
 	add r1, sp, #0x28
 	ldr r0, [r0]
 	mov r2, #1
@@ -11664,7 +11664,7 @@ _02185e50:
 _02185e88: .word 0x00000e66
 _02185e8c: .word data_027e0fac
 _02185e90: .word 0x000031c7
-_02185e94: .word data_027e0f90
+_02185e94: .word gPlayer
 _02185e98: .word data_02050f54
 _02185e9c: .word data_027e0ffc
 _02185ea0: .word 0x00000313

asm/ov40.inc

@@ -94,7 +94,7 @@
 .extern data_027e0f6c
 .extern data_027e0f78
 .extern data_027e0f80
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0fc4
 .extern data_027e0fcc
 .extern data_027e0fe0

asm/ov40.s

@@ -5799,7 +5799,7 @@ func_ov40_02180680: ; 0x02180680
 	str ip, [sp, #0x6c]
 	str lr, [sp, #0x70]
 	bl func_ov40_02180a18
-	ldr r0, _02180748 ; =data_027e0f90
+	ldr r0, _02180748 ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -5813,7 +5813,7 @@ func_ov40_02180680: ; 0x02180680
 	add sp, sp, #0x74
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
-_02180748: .word data_027e0f90
+_02180748: .word gPlayer
 	arm_func_end func_ov40_02180680
 
 	.global func_ov40_0218074c
@@ -5925,7 +5925,7 @@ func_ov40_0218081c: ; 0x0218081c
 	str ip, [sp, #0x6c]
 	str lr, [sp, #0x70]
 	bl func_ov40_02180a18
-	ldr r0, _021808e4 ; =data_027e0f90
+	ldr r0, _021808e4 ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -5939,21 +5939,21 @@ func_ov40_0218081c: ; 0x0218081c
 	add sp, sp, #0x74
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
-_021808e4: .word data_027e0f90
+_021808e4: .word gPlayer
 	arm_func_end func_ov40_0218081c
 
 	.global func_ov40_021808e8
 	arm_func_start func_ov40_021808e8
 func_ov40_021808e8: ; 0x021808e8
 	stmdb sp!, {r3, lr}
-	ldr r0, _02180904 ; =data_027e0f90
+	ldr r0, _02180904 ; =gPlayer
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r1, [r1, #0x4c]
 	blx r1
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_02180904: .word data_027e0f90
+_02180904: .word gPlayer
 	arm_func_end func_ov40_021808e8
 
 	.global func_ov40_02180908

asm/ov41.inc

@@ -83,7 +83,7 @@
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f78
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern gPlayerLink

asm/ov41.s

@@ -4713,7 +4713,7 @@ func_ov41_0218d210: ; 0x0218d210
 	stmdb sp!, {r4, r5, r6, lr}
 	sub sp, sp, #0x18
 	ldr r1, _0218d310 ; =data_027e0f94
-	ldr r3, _0218d314 ; =data_027e0f90
+	ldr r3, _0218d314 ; =gPlayer
 	mov r6, r0
 	add r4, sp, #0xc
 	ldmia r1, {r0, r1, r2}
@@ -4778,7 +4778,7 @@ _0218d2fc:
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
 _0218d310: .word data_027e0f94
-_0218d314: .word data_027e0f90
+_0218d314: .word gPlayer
 _0218d318: .word data_027e0fac
 _0218d31c: .word gMapManager
 _0218d320: .word 0xffff8001
@@ -4797,7 +4797,7 @@ func_ov41_0218d324: ; 0x0218d324
 	ldmia r0, {r0, r1, r2}
 	stmia r3, {r0, r1, r2}
 	ldr r0, [r4, #0x510]
-	ldr r1, _0218d394 ; =data_027e0f90
+	ldr r1, _0218d394 ; =gPlayer
 	add r0, r0, r0, lsr #31
 	mov r2, r0, asr #0x1
 	ldr r0, [r1]
@@ -4817,7 +4817,7 @@ _0218d388:
 	add sp, sp, #0x10
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_0218d394: .word data_027e0f90
+_0218d394: .word gPlayer
 	arm_func_end func_ov41_0218d324
 
 	.global func_ov41_0218d398

asm/ov43.inc

@@ -65,7 +65,7 @@
 .extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f6c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern gPlayerLink

asm/ov43.s

@@ -1317,7 +1317,7 @@ func_ov43_0218a674: ; 0x0218a674
 	adds r0, r0, #0x800
 	str r1, [sp, #0x18]
 	ldr r9, [r4, #0x50]
-	ldr r2, _0218a854 ; =data_027e0f90
+	ldr r2, _0218a854 ; =gPlayer
 	mov r8, r0, lsr #0xc
 	ldr r0, [r2]
 	add r2, r1, #0x800
@@ -1417,7 +1417,7 @@ _0218a834:
 	.align 2, 0
 _0218a84c: .word 0x0000099a
 _0218a850: .word data_02050f54
-_0218a854: .word data_027e0f90
+_0218a854: .word gPlayer
 _0218a858: .word data_027e0fac
 _0218a85c: .word 0xffff8001
 _0218a860: .word 0x00005555

asm/ov47.inc

@@ -67,7 +67,7 @@
 .extern data_027e0e58
 .extern gMapManager
 .extern data_027e0f6c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fe0
 .extern data_027e0fe8

asm/ov47.s

@@ -4813,13 +4813,13 @@ func_ov47_02193f78: ; 0x02193f78
 	add sp, sp, #0x10
 	ldmia sp!, {r3, r4, r5, pc}
 _02194028:
-	ldr r0, _0219410c ; =data_027e0f90
+	ldr r0, _0219410c ; =gPlayer
 	add r1, sp, #0
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
 	cmp r0, #0
 	beq _0219407c
-	ldr r0, _0219410c ; =data_027e0f90
+	ldr r0, _0219410c ; =gPlayer
 	ldrb r1, [r5, #0x124]
 	ldr r0, [r0]
 	add r2, r5, #0x60
@@ -4874,7 +4874,7 @@ _021940ec:
 	.align 2, 0
 _02194104: .word data_027e0f94
 _02194108: .word gItemManager
-_0219410c: .word data_027e0f90
+_0219410c: .word gPlayer
 	arm_func_end func_ov47_02193f78
 
 	.global func_ov47_02194110

asm/ov48.inc

@@ -134,7 +134,7 @@
 .extern data_027e0e58
 .extern data_027e0e5c
 .extern gMapManager
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern data_027e0fe0

asm/ov48.s

@@ -777,7 +777,7 @@ func_ov48_021908ac: ; 0x021908ac
 	add r1, sp, #0
 	mov r0, r5
 	bl _ZN5Actor9GetHitboxEP8Cylinder
-	ldr r0, _02190940 ; =data_027e0f90
+	ldr r0, _02190940 ; =gPlayer
 	ldr r2, _02190944 ; =0x000004cd
 	ldr r0, [r0]
 	add r1, sp, #0
@@ -787,7 +787,7 @@ func_ov48_021908ac: ; 0x021908ac
 	addeq sp, sp, #0x1c
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, pc}
-	ldr r0, _02190940 ; =data_027e0f90
+	ldr r0, _02190940 ; =gPlayer
 	ldrb r1, [r5, #0x124]
 	ldr r0, [r0]
 	add r2, sp, #0x10
@@ -799,7 +799,7 @@ func_ov48_021908ac: ; 0x021908ac
 	ldmia sp!, {r4, r5, pc}
 	.align 2, 0
 _0219093c: .word data_027e0f94
-_02190940: .word data_027e0f90
+_02190940: .word gPlayer
 _02190944: .word 0x000004cd
 	arm_func_end func_ov48_021908ac
 
@@ -2072,7 +2072,7 @@ _021918a4:
 	add r3, sp, #0x38
 	add r2, r4, #0x48
 	bl func_01ff9e64
-	ldr r0, _02191c38 ; =data_027e0f90
+	ldr r0, _02191c38 ; =gPlayer
 	ldr r3, _02191c2c ; =0x00000333
 	ldr r0, [r0]
 	add r1, sp, #0x44
@@ -2093,7 +2093,7 @@ _021918a4:
 	mov r1, #0xf9
 	mov r3, #0
 	bl func_ov00_020c070c
-	ldr r0, _02191c38 ; =data_027e0f90
+	ldr r0, _02191c38 ; =gPlayer
 	add r1, r4, #0x48
 	ldr r0, [r0]
 	bl _ZN10PlayerBase6LookAtEP5Vec3p
@@ -2297,7 +2297,7 @@ _02191c28: .word 0x0000ffff
 _02191c2c: .word 0x00000333
 _02191c30: .word gMapManager
 _02191c34: .word gItemManager
-_02191c38: .word data_027e0f90
+_02191c38: .word gPlayer
 _02191c3c: .word data_027e0fac
 _02191c40: .word 0x00000b33
 _02191c44: .word data_027e0e58
@@ -3323,7 +3323,7 @@ _021927dc:
 	str r7, [r3, r5, lsl #2]
 	cmp r8, #3
 	blt _021927a4
-	ldr r10, _02193170 ; =data_027e0f90
+	ldr r10, _02193170 ; =gPlayer
 	mov r6, #0
 	add r4, sp, #0x44
 	add r5, sp, #0x60
@@ -3575,7 +3575,7 @@ _02192b5c:
 	add r2, sp, #0x38
 	add r1, r8, #0x48
 	bl func_01ff9bf8
-	ldr r0, _02193170 ; =data_027e0f90
+	ldr r0, _02193170 ; =gPlayer
 	ldrb r1, [r9, #0x124]
 	ldr r0, [r0]
 	add r2, sp, #0x38
@@ -3985,7 +3985,7 @@ _02193160: .word gItemManager
 _02193164: .word data_027e0ffc
 _02193168: .word 0x00000247
 _0219316c: .word data_027e0f94
-_02193170: .word data_027e0f90
+_02193170: .word gPlayer
 _02193174: .word 0x00000191
 _02193178: .word 0x5342454d
 _0219317c: .word 0x424d524e

asm/ov49.inc

@@ -78,7 +78,7 @@
 .extern data_027e0e58
 .extern gMapManager
 .extern data_027e0f64
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern gPlayerLink
 .extern data_027e0fe0

asm/ov49.s

@@ -1363,7 +1363,7 @@ func_ov49_02196710: ; 0x02196710
 	add r1, sp, #0x98
 	mov r0, r5
 	bl _ZN5Actor9GetHitboxEP8Cylinder
-	ldr r0, _02196ff0 ; =data_027e0f90
+	ldr r0, _02196ff0 ; =gPlayer
 	ldr r2, _02196ff4 ; =0x00000ccd
 	ldr r0, [r0]
 	add r1, sp, #0x98
@@ -1676,7 +1676,7 @@ _02196ac0:
 	cmp r4, #0
 	beq _02196e34
 _02196bec:
-	ldr r0, _02196ff0 ; =data_027e0f90
+	ldr r0, _02196ff0 ; =gPlayer
 	add r1, sp, #0x70
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -1949,7 +1949,7 @@ _02196fe0:
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _02196fec: .word gPlayerLink
-_02196ff0: .word data_027e0f90
+_02196ff0: .word gPlayer
 _02196ff4: .word 0x00000ccd
 _02196ff8: .word 0x00004333
 _02196ffc: .word 0x0000071c

asm/ov50.inc

@@ -79,7 +79,7 @@
 .extern data_027e0e58
 .extern data_027e0f64
 .extern data_027e0f6c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fac
 .extern gPlayerLink

asm/ov50.s

@@ -1916,7 +1916,7 @@ func_ov50_02196ee4: ; 0x02196ee4
 	add r1, sp, #0x18
 	mov r4, r0
 	bl _ZN5Actor9GetHitboxEP8Cylinder
-	ldr r0, _02196f70 ; =data_027e0f90
+	ldr r0, _02196f70 ; =gPlayer
 	add r1, sp, #0x18
 	ldr r0, [r0]
 	bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -1947,7 +1947,7 @@ func_ov50_02196ee4: ; 0x02196ee4
 	add sp, sp, #0x28
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_02196f70: .word data_027e0f90
+_02196f70: .word gPlayer
 _02196f74: .word data_ov50_021989f0
 _02196f78: .word data_027e0fe4
 	arm_func_end func_ov50_02196ee4

asm/ov51.inc

@@ -63,7 +63,7 @@
 .extern data_027e0e58
 .extern gMapManager
 .extern data_027e0f6c
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0f94
 .extern data_027e0fe0
 .extern data_027e0fe4

asm/ov51.s

@@ -1181,7 +1181,7 @@ _02196324:
 	blt _02196324
 	add r0, r10, #0x6c
 	ldr r11, _021964f8 ; =0x000004cd
-	ldr r4, _021964fc ; =data_027e0f90
+	ldr r4, _021964fc ; =gPlayer
 	mov r8, r10
 	add r9, r0, #0x400
 	mov r7, #0
@@ -1270,7 +1270,7 @@ _021964e0:
 	.align 2, 0
 _021964f4: .word data_027e0e58
 _021964f8: .word 0x000004cd
-_021964fc: .word data_027e0f90
+_021964fc: .word gPlayer
 _02196500: .word data_027e0f94
 _02196504: .word data_027e0ffc
 _02196508: .word 0x00000262
@@ -3446,7 +3446,7 @@ func_ov51_02198184: ; 0x02198184
 	add r1, sp, #0x1c
 	ldr r2, [r2, #0x20]
 	blx r2
-	ldr r0, _02198264 ; =data_027e0f90
+	ldr r0, _02198264 ; =gPlayer
 	add r1, sp, #0xc
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -3497,7 +3497,7 @@ _0219824c:
 	add sp, sp, #0x34
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
-_02198264: .word data_027e0f90
+_02198264: .word gPlayer
 	arm_func_end func_ov51_02198184
 
 	.rodata

asm/ov55.inc

@@ -27,7 +27,7 @@
 .extern data_027e0c54
 .extern gMapManager
 .extern data_027e0f64
-.extern data_027e0f90
+.extern gPlayer
 .extern data_027e0fb8
 .extern data_027e0fcc
 .extern data_027e0fe4

asm/ov55.s

@@ -405,7 +405,7 @@ func_ov55_021991b0: ; 0x021991b0
 	beq _0219922c
 	b _02199244
 _021991f4:
-	ldr r0, _02199270 ; =data_027e0f90
+	ldr r0, _02199270 ; =gPlayer
 	mov r1, #0x18
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -413,7 +413,7 @@ _021991f4:
 	blx r2
 	b _02199244
 _02199210:
-	ldr r0, _02199270 ; =data_027e0f90
+	ldr r0, _02199270 ; =gPlayer
 	mov r1, #0x20
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -421,7 +421,7 @@ _02199210:
 	blx r2
 	b _02199244
 _0219922c:
-	ldr r0, _02199270 ; =data_027e0f90
+	ldr r0, _02199270 ; =gPlayer
 	mov r1, #0x3e8
 	ldr r0, [r0]
 	ldr r2, [r0]
@@ -440,7 +440,7 @@ _02199244:
 	.align 2, 0
 _02199268: .word data_027e103c
 _0219926c: .word gItemManager
-_02199270: .word data_027e0f90
+_02199270: .word gPlayer
 	arm_func_end func_ov55_021991b0
 
 	.global func_ov55_02199274

include/Player/PlayerBase.hpp

@@ -59,3 +59,5 @@ public:
     void EquipItem_vfunc_2c();
     void SetHealth(s16 health);
 };
+
+extern PlayerBase *gPlayer;