summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/bike.s92
-rw-r--r--asm/field_camera.s2
-rw-r--r--asm/field_control_avatar.s4
-rw-r--r--asm/field_effect.s106
-rw-r--r--asm/field_effect_helpers.s2
-rw-r--r--asm/field_map_obj.s33
-rw-r--r--asm/field_player_avatar.s164
-rw-r--r--asm/fldeff_80F9BCC.s22
-rw-r--r--asm/fldeff_emotion.s2
-rw-r--r--asm/link.s4
-rw-r--r--asm/map_obj_8097404.s6
-rw-r--r--asm/map_obj_lock.s2
-rw-r--r--asm/porthole.s2
-rw-r--r--asm/rom4.s2
-rw-r--r--asm/rom6.s8
-rw-r--r--asm/rom_80C6FA0.s2
-rw-r--r--asm/rom_81BE66C.s24
-rw-r--r--asm/secret_base.s2
-rw-r--r--asm/trainer_see.s6
-rw-r--r--include/field_map_obj.h6
-rw-r--r--src/field_map_obj.c25
-rw-r--r--sym_ewram.txt2
22 files changed, 255 insertions, 263 deletions
diff --git a/asm/bike.s b/asm/bike.s
index 22d52c0fa..7ea4a4598 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -15,7 +15,7 @@ MovePlayerOnBike: @ 8119164
lsrs r4, r1, 16
lsls r2, 16
lsrs r2, 16
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -72,7 +72,7 @@ CheckMovementInputMachBike: @ 81191CC
cmp r1, 0
bne _081191F4
strb r0, [r4]
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r0, [r2, 0xB]
cmp r0, 0
bne _08119208
@@ -81,7 +81,7 @@ CheckMovementInputMachBike: @ 81191CC
b _0811921C
.pool
_081191F4:
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
cmp r1, r3
beq _08119218
ldrb r0, [r2, 0x2]
@@ -126,7 +126,7 @@ sub_8119238: @ 8119238
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -161,7 +161,7 @@ sub_8119280: @ 8119280
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -255,7 +255,7 @@ sub_8119344: @ 8119344
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0xB]
cmp r0, 0
beq _0811935A
@@ -352,7 +352,7 @@ CheckMovementInputAcroBike: @ 8119400
lsls r2, 16
lsrs r2, 16
ldr r4, =gUnknown_0859749C
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r3, [r3, 0x8]
lsls r3, 2
adds r3, r4
@@ -377,7 +377,7 @@ CheckMovementInputAcroBikeNormal: @ 811942C
bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r3, r0, 24
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
movs r0, 0
strb r0, [r2, 0xA]
ldrb r1, [r4]
@@ -417,11 +417,11 @@ _0811946C:
b _081194C0
_0811948A:
ldrb r0, [r4]
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
cmp r0, r3
beq _081194BC
_08119492:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x2]
adds r2, r0, 0
cmp r1, 0x2
@@ -453,7 +453,7 @@ _081194C0:
CheckMovementInputAcroBikeChangingDirection: @ 81194C8
push {r4-r6,lr}
adds r5, r0, 0
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldrb r0, [r4, 0x9]
strb r0, [r5]
ldrb r0, [r4, 0xA]
@@ -520,7 +520,7 @@ CheckMovementInputAcroBikeStandingWheelie: @ 8119540
bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r6, r0, 24
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -553,7 +553,7 @@ _08119594:
adds r0, 0x1
strb r0, [r5, 0xA]
_0811959A:
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r0, [r1, 0xA]
cmp r0, 0x27
bls _081195B4
@@ -608,7 +608,7 @@ CheckMovementInputAcroBikeBunnyHop: @ 81195E0
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -661,7 +661,7 @@ _08119668:
movs r0, 0x6
b _08119676
_0811966E:
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0x7
@@ -693,7 +693,7 @@ CheckMovementInputAcroBikeMovingWheelie: @ 8119688
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -732,7 +732,7 @@ _081196F6:
movs r0, 0x4
b _08119750
_081196FC:
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0xC
@@ -770,7 +770,7 @@ _08119736:
movs r0, 0x5
b _08119750
_08119748:
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0xA
@@ -797,7 +797,7 @@ CheckMovementInputAcroBikeUnknownMode5: @ 8119764
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -836,7 +836,7 @@ CheckMovementInputAcroBikeUnknownMode6: @ 81197C0
lsrs r1, 16
lsls r2, 16
lsrs r2, 16
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
movs r3, 0
strb r3, [r4, 0x8]
bl CheckMovementInputAcroBike
@@ -863,7 +863,7 @@ sub_81197F4: @ 81197F4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -893,7 +893,7 @@ sub_8119830: @ 8119830
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -961,7 +961,7 @@ sub_81198C0: @ 81198C0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -990,7 +990,7 @@ sub_81198FC: @ 81198FC
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1019,7 +1019,7 @@ sub_8119938: @ 8119938
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1048,7 +1048,7 @@ sub_8119974: @ 8119974
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1077,7 +1077,7 @@ sub_81199B0: @ 81199B0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1156,7 +1156,7 @@ _08119A50:
bl sub_81197F4
b _08119A84
_08119A58:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -1198,7 +1198,7 @@ sub_8119AA4: @ 8119AA4
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
- ldr r7, =gUnknown_02037590
+ ldr r7, =gPlayerAvatar
ldrb r1, [r7, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1267,7 +1267,7 @@ sub_8119B34: @ 8119B34
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
- ldr r7, =gUnknown_02037590
+ ldr r7, =gPlayerAvatar
ldrb r1, [r7, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1336,7 +1336,7 @@ sub_8119BC4: @ 8119BC4
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1396,7 +1396,7 @@ sub_8119C3C: @ 8119C3C
lsrs r3, r0, 16
lsls r1, 16
lsrs r2, r1, 16
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
@@ -1421,7 +1421,7 @@ sub_8119C64: @ 8119C64
bl sub_8119DF8
lsls r0, 24
lsrs r2, r0, 24
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldr r0, [r4, 0xC]
movs r1, 0xF
ands r0, r1
@@ -1443,7 +1443,7 @@ _08119C9A:
movs r0, 0xF
adds r2, r5, 0
ands r2, r0
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldr r0, [r4, 0x10]
movs r1, 0xF
ands r0, r1
@@ -1532,7 +1532,7 @@ sub_8119D30: @ 8119D30
_08119D36:
ldr r0, =gUnknown_085974C0
adds r4, r5, r0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldr r1, [r0, 0xC]
ldr r2, [r0, 0x10]
ldr r0, [r4, 0x8]
@@ -1570,7 +1570,7 @@ _08119D7A:
sub_8119D80: @ 8119D80
push {r4,lr}
lsls r0, 24
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldr r2, [r3, 0xC]
lsls r2, 4
movs r1, 0xF0
@@ -1604,7 +1604,7 @@ _08119D9C:
sub_8119DBC: @ 8119DBC
push {r4,lr}
lsls r0, 24
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldr r2, [r3, 0x10]
lsls r2, 4
movs r1, 0xF0
@@ -1681,7 +1681,7 @@ sub_8119E38: @ 8119E38
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -1922,7 +1922,7 @@ _08119FF2:
sub_8119FF8: @ 8119FF8
push {r4,lr}
sub sp, 0x4
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x18
ands r0, r1
@@ -1966,7 +1966,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 811A044
cmp r0, 0
beq _0811A078
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1996,7 +1996,7 @@ GetOnOffBike: @ 811A080
ldr r1, =gUnknown_02037348
movs r0, 0
strb r0, [r1]
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -2026,7 +2026,7 @@ _0811A0C4:
thumb_func_start sub_811A0D0
sub_811A0D0: @ 811A0D0
push {lr}
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
movs r3, 0
strb r3, [r2, 0x8]
strb r3, [r2, 0x9]
@@ -2064,7 +2064,7 @@ _0811A0FA:
sub_811A114: @ 811A114
lsls r0, 24
lsrs r0, 24
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
strb r0, [r2, 0xA]
lsrs r1, r0, 1
adds r0, r1
@@ -2075,7 +2075,7 @@ sub_811A114: @ 811A114
thumb_func_start sub_811A128
sub_811A128: @ 811A128
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0xA]
strb r0, [r1, 0xB]
@@ -2091,7 +2091,7 @@ sub_811A138: @ 811A138
mov r0, sp
movs r2, 0x6
bl memcpy
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0x2
ands r0, r1
@@ -2130,7 +2130,7 @@ _0811A182:
sub_811A188: @ 811A188
push {r4,r5,lr}
sub sp, 0x4
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r1, [r5]
movs r0, 0x4
ands r0, r1
diff --git a/asm/field_camera.s b/asm/field_camera.s
index cead2954c..35359f444 100644
--- a/asm/field_camera.s
+++ b/asm/field_camera.s
@@ -1082,7 +1082,7 @@ CameraPanningCB_PanAhead: @ 808A360
b _0808A3FC
.pool
_0808A374:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x1
bne _0808A394
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 85009cc5b..3b1052473 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -44,7 +44,7 @@ process_overworld_input: @ 809BF08
lsls r2, 16
lsrs r2, 16
mov r8, r2
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r6, [r0, 0x3]
ldrb r0, [r0, 0x2]
mov r9, r0
@@ -1368,7 +1368,7 @@ _0809CA04:
bl sub_80B215C
bl happiness_algorithm_step
bl sub_81D4998
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
diff --git a/asm/field_effect.s b/asm/field_effect.s
index b073103f3..03789eada 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -2033,7 +2033,7 @@ mapldr_08084390: @ 80B6AA4
movs r1, 0
bl CreateTask
ldr r4, =gMapObjects
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2163,7 +2163,7 @@ sub_80B6BCC: @ 80B6BCC
mov r5, r8
push {r5,r6}
mov r9, r0
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r5, r0, 3
adds r5, r0
@@ -2256,7 +2256,7 @@ _080B6C88:
sub_80B6C90: @ 80B6C90
push {r4-r6,lr}
adds r5, r0, 0
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x4]
lsls r2, r0, 4
adds r2, r0
@@ -2309,7 +2309,7 @@ sub_80B6C90: @ 80B6C90
sub_80B6D04: @ 80B6D04
push {r4-r6,lr}
adds r4, r0, 0
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2454,7 +2454,7 @@ _080B6E0E:
thumb_func_start sub_80B6E18
sub_80B6E18: @ 80B6E18
push {lr}
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl script_env_2_disable
@@ -2551,7 +2551,7 @@ sub_80B6EC0: @ 80B6EC0
sub_80B6EE0: @ 80B6EE0
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2664,7 +2664,7 @@ sub_80B6FA8: @ 80B6FA8
sub_80B6FB8: @ 80B6FB8
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -2702,7 +2702,7 @@ _080B6FF6:
sub_80B7004: @ 80B7004
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -2828,7 +2828,7 @@ sub_80B7114: @ 80B7114
sub sp, 0x4
adds r5, r0, 0
bl CameraObjectReset2
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -2883,7 +2883,7 @@ _080B717E:
sub_80B7190: @ 80B7190
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -2914,7 +2914,7 @@ sub_80B7190: @ 80B7190
sub_80B71D0: @ 80B71D0
push {r4,r5,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -2962,7 +2962,7 @@ _080B721E:
sub_80B7230: @ 80B7230
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -2993,7 +2993,7 @@ sub_80B7230: @ 80B7230
sub_80B7270: @ 80B7270
push {r4,r5,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3063,7 +3063,7 @@ _080B72EE:
thumb_func_start sub_80B72F4
sub_80B72F4: @ 80B72F4
push {r4,lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -3138,7 +3138,7 @@ _080B7396:
ldrsh r2, [r4, r0]
lsls r2, 2
adds r2, r5
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -3162,7 +3162,7 @@ sub_80B73D0: @ 80B73D0
push {r4,lr}
adds r4, r0, 0
bl script_env_2_enable
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrh r0, [r4, 0x8]
@@ -3268,7 +3268,7 @@ _080B748E:
cmp r4, 0
bne _080B74C4
bl script_env_2_disable
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
strb r4, [r0, 0x6]
ldr r0, =sub_80B7384
bl FindTaskIdByFunc
@@ -3347,7 +3347,7 @@ _080B751E:
thumb_func_start dive_1_lock
dive_1_lock: @ 80B7544
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
movs r1, 0x1
strb r1, [r2, 0x6]
ldrh r1, [r0, 0x8]
@@ -3393,7 +3393,7 @@ dive_3_unknown: @ 80B7580
cmp r0, 0
bne _080B75C4
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -3437,7 +3437,7 @@ sub_80B75F0: @ 80B75F0
lsrs r0, 24
ldr r6, =gUnknown_0855C438
ldr r2, =gTasks
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3480,7 +3480,7 @@ sub_80B764C: @ 80B764C
bl CameraObjectReset2
movs r0, 0
bl SetCameraPanningCallback
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
movs r2, 0x1
strb r2, [r0, 0x6]
ldrb r0, [r5, 0x3]
@@ -3767,7 +3767,7 @@ sub_80B7890: @ 80B7890
lsrs r0, 24
ldr r6, =gUnknown_0855C450
ldr r2, =gTasks
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3808,7 +3808,7 @@ sub_80B78EC: @ 80B78EC
adds r4, r1, 0
bl CameraObjectReset2
bl player_bitmagic
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r0, [r4, 0x1]
@@ -3915,7 +3915,7 @@ sub_80B79BC: @ 80B79BC
lsls r0, 24
cmp r0, 0
beq _080B79E6
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl script_env_2_disable
@@ -4016,7 +4016,7 @@ sub_80B7A8C: @ 80B7A8C
lsrs r0, 24
ldr r6, =gUnknown_0855C460
ldr r2, =gTasks
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -4057,7 +4057,7 @@ sub_80B7AE8: @ 80B7AE8
adds r4, r1, 0
bl player_bitmagic
bl CameraObjectReset2
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r0, [r4, 0x3]
@@ -4359,7 +4359,7 @@ sub_80B7D34: @ 80B7D34
bl music_something
bl sub_80AF0B4
_080B7D60:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4466,7 +4466,7 @@ mapldr_080859D4: @ 80B7E48
movs r0, 0
str r0, [r1]
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4537,7 +4537,7 @@ sub_80B7EE8: @ 80B7EE8
mov r0, sp
movs r2, 0x5
bl memcpy
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4695,7 +4695,7 @@ sub_80B8034: @ 80B8034
mov r0, sp
movs r2, 0x5
bl memcpy
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4765,7 +4765,7 @@ sub_80B80C4: @ 80B80C4
mov r0, sp
movs r2, 0x5
bl memcpy
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4911,7 +4911,7 @@ mapldr_08085D88: @ 80B8200
movs r0, 0
str r0, [r1]
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4961,7 +4961,7 @@ sub_80B8280: @ 80B8280
lsls r0, 24
cmp r0, 0
beq _080B82F6
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
adds r2, r0
@@ -5027,7 +5027,7 @@ sub_80B830C: @ 80B830C
mov r0, sp
movs r2, 0x5
bl memcpy
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5156,7 +5156,7 @@ sub_80B8410: @ 80B8410
mov r0, sp
movs r2, 0x5
bl memcpy
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -6335,7 +6335,7 @@ sub_80B8DB4: @ 80B8DB4
adds r4, r0, 0
bl script_env_2_enable
bl player_bitmagic
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
movs r0, 0x8
@@ -6374,7 +6374,7 @@ sub_80B8DB4: @ 80B8DB4
sub_80B8E14: @ 80B8E14
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -6410,7 +6410,7 @@ _080B8E50:
sub_80B8E60: @ 80B8E60
push {r4,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -6449,7 +6449,7 @@ sub_80B8EA8: @ 80B8EA8
lsls r0, 24
cmp r0, 0
bne _080B8F12
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -6498,7 +6498,7 @@ _080B8F12:
thumb_func_start sub_80B8F24
sub_80B8F24: @ 80B8F24
push {r4,r5,lr}
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -6829,7 +6829,7 @@ sub_80B91D4: @ 80B91D4
sub_80B9204: @ 80B9204
push {r4-r6,lr}
adds r5, r0, 0
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -6870,7 +6870,7 @@ _080B924C:
sub_80B925C: @ 80B925C
push {r4,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -6906,7 +6906,7 @@ sub_80B92A0: @ 80B92A0
lsls r0, 24
cmp r0, 0
bne _080B92E8
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -6955,7 +6955,7 @@ sub_80B92F8: @ 80B92F8
strh r0, [r4, 0xC]
movs r0, 0x1
bl SetPlayerAvatarTransitionFlags
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -6975,7 +6975,7 @@ _080B932C:
sub_80B933C: @ 80B933C
push {r4,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7023,7 +7023,7 @@ sub_80B9390: @ 80B9390
asrs r0, 16
cmp r0, 0x7
ble _080B9406
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7087,7 +7087,7 @@ sub_80B9418: @ 80B9418
asrs r0, 16
cmp r0, 0x9
ble _080B9464
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -7582,7 +7582,7 @@ sub_80B97D4: @ 80B97D4
sub_80B9804: @ 80B9804
push {r4-r6,lr}
adds r5, r0, 0
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7673,7 +7673,7 @@ sub_80B98B8: @ 80B98B8
cmp r0, 0
bne _080B9910
_080B98D0:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7720,7 +7720,7 @@ sub_80B9924: @ 80B9924
mov r0, sp
movs r2, 0x24
bl memcpy
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r1, r0, 4
adds r1, r0
@@ -7760,7 +7760,7 @@ sub_80B9978: @ 80B9978
lsls r0, 24
cmp r0, 0
beq _080B99DC
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r5, r0, 3
adds r5, r0
@@ -7810,7 +7810,7 @@ _080B99DC:
sub_80B99F0: @ 80B99F0
push {r4,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7872,7 +7872,7 @@ sub_80B9A60: @ 80B9A60
lsls r0, 16
cmp r0, 0
bne _080B9ACA
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 69c67672c..cef6287ff 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -2766,7 +2766,7 @@ sub_81554AC: @ 81554AC
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 436350899..ff3aff842 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,33 +5,6 @@
.text
- thumb_func_start sub_808D958
-sub_808D958: @ 808D958
- push {r4,lr}
- movs r4, 0
-_0808D95C:
- ldr r0, =gUnknown_02037590
- ldrb r0, [r0, 0x5]
- cmp r4, r0
- beq _0808D972
- lsls r0, r4, 3
- adds r0, r4
- lsls r0, 2
- ldr r1, =gMapObjects
- adds r0, r1
- bl RemoveFieldObject
-_0808D972:
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0xF
- bls _0808D95C
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_808D958
-
thumb_func_start SpawnFieldObjectInternal
@ u8 SpawnFieldObjectInternal(struct FieldObjectTemplate *romFieldObject, struct objtemplate *template, int mapId, int mapGroupId, u16 movingCameraOffsetX, u16 movingCameraOffsetY)
SpawnFieldObjectInternal: @ 808D98C
@@ -1351,7 +1324,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 808E3C4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
strb r0, [r5, 0x5]
strb r1, [r5, 0x4]
ldr r1, =gMapObjects
@@ -9413,7 +9386,7 @@ sub_8091EC0: @ 8091EC0
adds r6, r0, 0
adds r7, r1, 0
ldr r2, =gMapObjects
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -10168,7 +10141,7 @@ mss_08062EA4: @ 80924D8
adds r6, r0, 0
adds r7, r1, 0
ldr r2, =gMapObjects
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index 9a5cc323c..e9fee369a 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -43,7 +43,7 @@ player_step: @ 808A9C0
lsrs r7, r1, 16
lsls r2, 16
lsrs r6, r2, 16
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -153,7 +153,7 @@ npc_clear_strange_bits: @ 808AA9C
adds r2, 0x2
ands r1, r2
strb r1, [r0, 0x1]
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0x7F
ands r0, r1
@@ -172,7 +172,7 @@ MovePlayerAvatarUsingKeypadInput: @ 808AAC0
lsrs r4, r1, 16
lsls r2, 16
lsrs r2, 16
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -197,7 +197,7 @@ _0808AAF0:
@ void PlayerAllowForcedMovementIfMovingSameDirection()
PlayerAllowForcedMovementIfMovingSameDirection: @ 808AAF8
push {lr}
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r0, [r2, 0x2]
cmp r0, 0x2
bne _0808AB0A
@@ -234,7 +234,7 @@ TryDoMetatileBehaviorForcedMovment: @ 808AB14
@ u8 GetForcedMovementByMetatileBehavior()
GetForcedMovementByMetatileBehavior: @ 808AB38
push {r4-r6,lr}
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r1, [r3]
movs r0, 0x20
ands r0, r1
@@ -280,7 +280,7 @@ _0808AB8C:
thumb_func_start ForcedMovement_None
ForcedMovement_None: @ 808AB94
push {r4,lr}
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldrb r1, [r4]
movs r0, 0x40
ands r0, r1
@@ -325,7 +325,7 @@ DoForcedMovement: @ 808ABE0
mov r9, r1
lsls r0, 24
lsrs r5, r0, 24
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
adds r0, r5, 0
bl CheckForPlayerAvatarCollision
lsls r0, 24
@@ -381,7 +381,7 @@ _0808AC48:
DoForcedMovementInCurrentDirection: @ 808AC58
push {lr}
adds r1, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r2, [r0, 0x5]
lsls r0, r2, 3
adds r0, r2
@@ -523,7 +523,7 @@ ForcedMovement_Slide: @ 808AD60
push {r4,lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r3, [r2, 0x5]
lsls r2, r3, 3
adds r2, r3
@@ -618,7 +618,7 @@ ForcedMovement_0xBC: @ 808AE04
thumb_func_start ForcedMovement_MuddySlope
ForcedMovement_MuddySlope: @ 808AE10
push {r4,lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -691,7 +691,7 @@ CheckMovementInputNotOnBike: @ 808AE98
lsrs r4, r0, 24
cmp r4, 0
bne _0808AEB0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
strb r4, [r0, 0x2]
movs r0, 0
b _0808AED2
@@ -702,7 +702,7 @@ _0808AEB0:
lsrs r0, 24
cmp r4, r0
beq _0808AECC
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r0, [r1, 0x2]
cmp r0, 0x2
beq _0808AECC
@@ -710,7 +710,7 @@ _0808AEB0:
b _0808AED0
.pool
_0808AECC:
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x2
_0808AED0:
strb r0, [r1, 0x2]
@@ -784,7 +784,7 @@ _0808AF3C:
bl PlayerNotOnBikeCollide
b _0808AFB6
_0808AF4E:
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldrb r1, [r4]
movs r0, 0x8
ands r0, r1
@@ -843,7 +843,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -894,7 +894,7 @@ sub_808B028: @ 808B028
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -1102,7 +1102,7 @@ sub_808B1BC: @ 808B1BC
lsrs r4, r1, 16
lsls r2, 24
lsrs r6, r2, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1285,7 +1285,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
adds r1, r2
@@ -1369,7 +1369,7 @@ SetPlayerAvatarTransitionFlags: @ 808B3CC
push {lr}
lsls r0, 16
lsrs r0, 16
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x1]
orrs r0, r1
strb r0, [r2, 0x1]
@@ -1383,7 +1383,7 @@ SetPlayerAvatarTransitionFlags: @ 808B3CC
@ void DoPlayerAvatarTransition()
DoPlayerAvatarTransition: @ 808B3E8
push {r4,r5,lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r4, [r0, 0x1]
cmp r4, 0
beq _0808B428
@@ -1396,7 +1396,7 @@ _0808B3F4:
ldr r0, =gUnknown_084974B8
lsls r2, r5, 2
adds r2, r0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1412,7 +1412,7 @@ _0808B416:
lsrs r4, 1
cmp r5, 0x7
bls _0808B3F4
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x1]
_0808B428:
@@ -1529,7 +1529,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
movs r2, 0x12
ldrsh r0, [r4, r2]
str r0, [r1, 0x4]
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
str r0, [r1, 0x8]
movs r0, 0x8
@@ -1574,7 +1574,7 @@ PlayerAvatarTransition_Underwater: @ 808B534
thumb_func_start PlayerAvatarTransition_ReturnToField
@ void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject)
PlayerAvatarTransition_ReturnToField: @ 808B568
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0x20
orrs r0, r1
@@ -1586,7 +1586,7 @@ PlayerAvatarTransition_ReturnToField: @ 808B568
thumb_func_start sub_808B578
sub_808B578: @ 808B578
push {r4,lr}
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
movs r0, 0
strb r0, [r4, 0x3]
bl PlayerIsAnimActive
@@ -1622,7 +1622,7 @@ _0808B5B6:
player_is_anim_in_certain_ranges: @ 808B5BC
push {lr}
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1673,7 +1673,7 @@ sub_808B618: @ 808B618
lsls r0, 24
cmp r0, 0
beq _0808B634
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x2]
cmp r0, 0x1
beq _0808B634
@@ -1691,7 +1691,7 @@ _0808B636:
@ bool8 PlayerIsAnimActive()
PlayerIsAnimActive: @ 808B63C
push {lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1710,7 +1710,7 @@ PlayerIsAnimActive: @ 808B63C
@ bool8 PlayerCheckIfAnimFinishedOrInactive()
PlayerCheckIfAnimFinishedOrInactive: @ 808B660
push {lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1728,7 +1728,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
thumb_func_start player_set_x22
player_set_x22: @ 808B684
ldr r3, =gMapObjects
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
adds r1, r2
@@ -1743,7 +1743,7 @@ player_set_x22: @ 808B684
thumb_func_start player_get_x22
player_get_x22: @ 808B6A0
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1761,7 +1761,7 @@ sub_808B6BC: @ 808B6BC
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r2, [r0, 0x5]
lsls r0, r2, 3
adds r0, r2
@@ -1788,7 +1788,7 @@ player_npc_set_state_and_x22_etc: @ 808B6E4
bne _0808B712
adds r0, r4, 0
bl player_set_x22
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2002,7 +2002,7 @@ PlayerJumpLedge: @ 808B840
thumb_func_start sub_808B864
sub_808B864: @ 808B864
push {r4,lr}
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldrb r0, [r4, 0x3]
cmp r0, 0x2
beq _0808B872
@@ -2220,7 +2220,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2276,7 +2276,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
adds r4, r0, 0
adds r5, r1, 0
ldr r3, =gMapObjects
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2308,7 +2308,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
PlayerGetDestCoords: @ 808BAAC
push {r4,r5,lr}
ldr r5, =gMapObjects
- ldr r4, =gUnknown_02037590
+ ldr r4, =gPlayerAvatar
ldrb r3, [r4, 0x5]
lsls r2, r3, 3
adds r2, r3
@@ -2334,7 +2334,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2466,7 +2466,7 @@ _0808BC30:
@ u8 player_get_direction_lower_nybble()
player_get_direction_lower_nybble: @ 808BC38
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2483,7 +2483,7 @@ player_get_direction_lower_nybble: @ 808BC38
@ u8 player_get_direction_upper_nybble()
player_get_direction_upper_nybble: @ 808BC58
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2499,7 +2499,7 @@ player_get_direction_upper_nybble: @ 808BC58
@ u8 PlayerGetZCoord()
PlayerGetZCoord: @ 808BC74
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2516,7 +2516,7 @@ sub_808BC90: @ 808BC90
push {lr}
adds r3, r0, 0
adds r2, r1, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2537,7 +2537,7 @@ sub_808BC90: @ 808BC90
thumb_func_start TestPlayerAvatarFlags
@ u32 TestPlayerAvatarFlags(u32 mask)
TestPlayerAvatarFlags: @ 808BCC0
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1]
ands r1, r0
adds r0, r1, 0
@@ -2547,7 +2547,7 @@ TestPlayerAvatarFlags: @ 808BCC0
thumb_func_start sub_808BCD0
sub_808BCD0: @ 808BCD0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0]
bx lr
.pool
@@ -2556,7 +2556,7 @@ sub_808BCD0: @ 808BCD0
thumb_func_start GetPlayerAvatarObjectId
@ u8 GetPlayerAvatarObjectId()
GetPlayerAvatarObjectId: @ 808BCDC
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
bx lr
.pool
@@ -2573,7 +2573,7 @@ sub_808BCE8: @ 808BCE8
thumb_func_start sub_808BCF4
sub_808BCF4: @ 808BCF4
push {r4,lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -2659,7 +2659,7 @@ GetPlayerAvatarGraphicsIdByStateId: @ 808BD8C
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x7]
bl GetPlayerAvatarGraphicsIdByStateIdAndGender
lsls r0, 24
@@ -2804,7 +2804,7 @@ _0808BE70:
IsPlayerFacingSurfableFishableWater: @ 808BE74
push {r4,r5,lr}
sub sp, 0x4
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -2871,7 +2871,7 @@ _0808BEF6:
@ void ClearPlayerAvatarInfo()
ClearPlayerAvatarInfo: @ 808BF00
push {lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
movs r1, 0
movs r2, 0x24
bl memset
@@ -2885,7 +2885,7 @@ ClearPlayerAvatarInfo: @ 808BF00
SetPlayerAvatarStateMask: @ 808BF14
lsls r0, 24
lsrs r0, 24
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r2, [r3]
movs r1, 0xE0
ands r1, r2
@@ -2937,7 +2937,7 @@ _0808BF64:
@ u8 GetPlayerAvatarGraphicsIdByCurrentState()
GetPlayerAvatarGraphicsIdByCurrentState: @ 808BF6C
push {r4-r6,lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r5, [r0]
movs r2, 0
ldr r3, =gUnknown_0849750C
@@ -2980,7 +2980,7 @@ SetPlayerAvatarExtraStateTransition: @ 808BFB0
lsrs r0, 24
lsls r4, 24
lsrs r4, 24
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r1, [r5, 0x7]
bl GetPlayerAvatarStateTransitionByGraphicsId
lsls r0, 24
@@ -3072,7 +3072,7 @@ InitPlayerAvatar: @ 808BFE0
mov r1, r9
bl FieldObjectTurn
bl ClearPlayerAvatarInfo
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
strb r6, [r0, 0x2]
strb r6, [r0, 0x3]
strb r5, [r0, 0x5]
@@ -3098,7 +3098,7 @@ sub_808C0A8: @ 808C0A8
lsls r0, 24
lsrs r4, r0, 24
ldr r6, =gMapObjects
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -3147,7 +3147,7 @@ _0808C100:
thumb_func_start sub_808C114
sub_808C114: @ 808C114
push {r4,r5,lr}
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -3181,7 +3181,7 @@ sub_808C15C: @ 808C15C
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -3222,7 +3222,7 @@ sub_808C1B4: @ 808C1B4
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -3271,7 +3271,7 @@ sub_808C228: @ 808C228
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r0, [r6, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -3424,7 +3424,7 @@ _0808C360:
ldrsh r3, [r4, r0]
lsls r3, 2
adds r3, r6
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -3453,7 +3453,7 @@ sub_808C3A4: @ 808C3A4
push {r4,lr}
adds r4, r0, 0
bl script_env_2_enable
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrh r0, [r4, 0x8]
@@ -3571,7 +3571,7 @@ sub_808C484: @ 808C484
bl FieldObjectClearAnimIfSpecialAnimFinished
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl script_env_2_disable
@@ -3620,7 +3620,7 @@ _0808C50A:
ldrsh r2, [r4, r0]
lsls r2, 2
adds r2, r5
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -3644,7 +3644,7 @@ sub_808C544: @ 808C544
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r1, 0
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
adds r0, r4, 0
@@ -3721,7 +3721,7 @@ _0808C5E2:
ldrsh r2, [r4, r0]
lsls r2, 2
adds r2, r5
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -3749,7 +3749,7 @@ sub_808C61C: @ 808C61C
ldrb r1, [r1, 0x18]
lsrs r1, 4
strh r1, [r0, 0xA]
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
bl script_env_2_enable
@@ -3873,7 +3873,7 @@ sub_808C6FC: @ 808C6FC
adds r0, r5, 0
bl FieldObjectSetSpecialAnim
bl script_env_2_disable
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
ldr r0, =sub_808C5D0
@@ -3898,7 +3898,7 @@ sub_808C750: @ 808C750
bl script_env_2_enable
bl sav1_reset_battle_music_maybe
bl sub_8085898
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0xF7
ands r0, r1
@@ -3931,7 +3931,7 @@ taskFF_0805D1D4: @ 808C7A8
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -3978,7 +3978,7 @@ sub_808C814: @ 808C814
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
- ldr r6, =gUnknown_02037590
+ ldr r6, =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4083,7 +4083,7 @@ fish0: @ 808C8F8
push {r4,lr}
adds r4, r0, 0
bl script_env_2_enable
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrh r0, [r4, 0x8]
@@ -4128,7 +4128,7 @@ fish1: @ 808C918
adds r1, r0
strh r1, [r5, 0x22]
ldr r3, =gMapObjects
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4366,7 +4366,7 @@ _0808CB30:
_0808CB32:
cmp r6, 0x1
bne _0808CB5C
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -4574,7 +4574,7 @@ _0808CCBC:
lsrs r6, r0, 16
cmp r6, 0
bne _0808CD50
- ldr r7, =gUnknown_02037590
+ ldr r7, =gPlayerAvatar
ldrb r0, [r7, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -4633,7 +4633,7 @@ _0808CD50:
cmp r0, 0
beq _0808CD80
_0808CD58:
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
bl script_env_2_disable
@@ -4664,7 +4664,7 @@ fishB: @ 808CD94
sub sp, 0x10
adds r5, r0, 0
bl sub_808CF78
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -4712,7 +4712,7 @@ fishC: @ 808CE04
sub sp, 0x10
adds r5, r0, 0
bl sub_808CF78
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -4777,7 +4777,7 @@ fishE: @ 808CE8C
adds r6, r0, 0
bl sub_808CF78
ldr r7, =gSprites
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x4]
lsls r1, r0, 4
adds r1, r0
@@ -4855,7 +4855,7 @@ fishF: @ 808CF2C
lsrs r1, r0, 16
cmp r1, 0
bne _0808CF68
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
strb r1, [r0, 0x6]
bl script_env_2_disable
bl sub_809757C
@@ -4879,7 +4879,7 @@ _0808CF68:
thumb_func_start sub_808CF78
sub_808CF78: @ 808CF78
push {r4-r7,lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -4978,7 +4978,7 @@ _0808D02A:
movs r0, 0x8
strh r0, [r4, 0x26]
_0808D03A:
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r1, [r3]
movs r0, 0x8
ands r0, r1
@@ -5032,7 +5032,7 @@ sub_808D094: @ 808D094
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5212,7 +5212,7 @@ sub_808D1FC: @ 808D1FC
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s
index d5e620c77..960c8e244 100644
--- a/asm/fldeff_80F9BCC.s
+++ b/asm/fldeff_80F9BCC.s
@@ -480,7 +480,7 @@ sub_80F9F5C: @ 80F9F5C
thumb_func_start sub_80F9F78
sub_80F9F78: @ 80F9F78
push {lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -692,7 +692,7 @@ sub_80FA13C: @ 80FA13C
bl sub_80F9F78
ldr r0, =gUnknown_0858E600
ldr r3, =gSprites
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -849,7 +849,7 @@ _080FA274:
bl sub_80F9F78
ldr r0, =gUnknown_0858E618
ldr r3, =gSprites
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1000,7 +1000,7 @@ sub_80FA3AC: @ 80FA3AC
bl sub_80F9F78
ldr r0, =gUnknown_0858E630
ldr r3, =gSprites
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1723,7 +1723,7 @@ sub_80FA9D0: @ 80FA9D0
push {r4,lr}
sub sp, 0x4
ldr r3, =gMapObjects
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1835,7 +1835,7 @@ _080FAABC:
_080FAAC6:
ldr r0, =gUnknown_0858E68C
ldr r3, =gSprites
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1857,7 +1857,7 @@ _080FAAC6:
_080FAAFC:
ldr r0, =gUnknown_0858E68C
ldr r3, =gSprites
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1876,7 +1876,7 @@ _080FAAFC:
_080FAB2C:
ldr r0, =gUnknown_0858E68C
ldr r3, =gSprites
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1898,7 +1898,7 @@ _080FAB4C:
_080FAB64:
ldr r0, =gUnknown_0858E68C
ldr r3, =gSprites
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -2307,7 +2307,7 @@ sub_80FAEF0: @ 80FAEF0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2357,7 +2357,7 @@ sub_80FAF64: @ 80FAF64
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/fldeff_emotion.s b/asm/fldeff_emotion.s
index f8b66da0d..dce540074 100644
--- a/asm/fldeff_emotion.s
+++ b/asm/fldeff_emotion.s
@@ -296,7 +296,7 @@ sub_80B4808: @ 80B4808
b _080B489E
.pool
_080B4870:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/link.s b/asm/link.s
index 022922164..91d0e513b 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -27235,7 +27235,7 @@ sub_8017940: @ 8017940
ldrsh r0, [r4, r1]
cmp r0, 0x8
bne _08017978
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x2
beq _0801796E
@@ -31141,7 +31141,7 @@ bgid_upload_textbox_1: @ 8019938
thumb_func_start is_walking_or_running
is_walking_or_running: @ 8019958
push {lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x2
beq _08019966
diff --git a/asm/map_obj_8097404.s b/asm/map_obj_8097404.s
index 50284a013..6bc74d0e5 100644
--- a/asm/map_obj_8097404.s
+++ b/asm/map_obj_8097404.s
@@ -97,7 +97,7 @@ _0809749A:
lsls r0, 31
cmp r0, 0
beq _080974B8
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080974B8
@@ -133,7 +133,7 @@ _080974DA:
lsls r0, 31
cmp r0, 0
beq _080974FC
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080974FC
@@ -1771,7 +1771,7 @@ _08098082:
lsls r0, 31
cmp r0, 0
beq _080980A8
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080980A8
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s
index 6cb8c508e..f02f8526b 100644
--- a/asm/map_obj_lock.s
+++ b/asm/map_obj_lock.s
@@ -8,7 +8,7 @@
thumb_func_start walkrun_is_standing_still
walkrun_is_standing_still: @ 8098388
push {lr}
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x1
beq _0809839C
diff --git a/asm/porthole.s b/asm/porthole.s
index a1bcff977..42ecc303a 100644
--- a/asm/porthole.s
+++ b/asm/porthole.s
@@ -232,7 +232,7 @@ sub_80FB768: @ 80FB768
push {lr}
bl sub_80FB6EC
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/rom4.s b/asm/rom4.s
index b6a5c0fa0..bf16055e7 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -4396,7 +4396,7 @@ sub_8086A68: @ 8086A68
sub_8086A80: @ 8086A80
push {lr}
ldr r2, =gMapObjects
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/rom6.s b/asm/rom6.s
index ef2d27110..4ccc2e05f 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -68,7 +68,7 @@ task08_080C9820: @ 813549C
lsrs r5, r0, 24
adds r6, r5, 0
bl script_env_2_enable
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r1, [r1, 0x5]
@@ -127,7 +127,7 @@ sub_813552C: @ 813552C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -191,7 +191,7 @@ _081355B0:
movs r0, 0x3
str r0, [r6, 0x8]
_081355B8:
- ldr r5, =gUnknown_02037590
+ ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -244,7 +244,7 @@ sub_813561C: @ 813561C
ldrh r0, [r0, 0x1A]
orrs r1, r0
bl _call_via_r1
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
adds r0, r4, 0
diff --git a/asm/rom_80C6FA0.s b/asm/rom_80C6FA0.s
index 04d4c29f4..35215e80c 100644
--- a/asm/rom_80C6FA0.s
+++ b/asm/rom_80C6FA0.s
@@ -24601,7 +24601,7 @@ _080D3B64:
movs r6, 0
ldr r5, =gSprites
_080D3BA0:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
diff --git a/asm/rom_81BE66C.s b/asm/rom_81BE66C.s
index ad83d6402..7b3b695e3 100644
--- a/asm/rom_81BE66C.s
+++ b/asm/rom_81BE66C.s
@@ -236,7 +236,7 @@ sub_81BE808: @ 81BE808
ldrh r1, [r0, 0x26]
adds r1, 0x4
strh r1, [r0, 0x26]
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -42695,7 +42695,7 @@ sub_81D427C: @ 81D427C
ldr r2, =gMapObjects
adds r5, r1, r2
ldr r4, =gUnknown_030012F8
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -42731,7 +42731,7 @@ _081D42CA:
cmp r0, 0x3
bls _081D42CA
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -42789,7 +42789,7 @@ _081D4360:
ldr r6, =gMapObjects
mov r10, r6
_081D4368:
- ldr r3, =gUnknown_02037590
+ ldr r3, =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -42896,7 +42896,7 @@ _081D4410:
beq _081D4446
b _081D45AA
_081D4446:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -42938,7 +42938,7 @@ _081D4488:
cmp r0, 0
bne _081D4538
_081D449E:
- ldr r2, =gUnknown_02037590
+ ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -43042,7 +43042,7 @@ _081D4540:
beq _081D4576
b _081D447C
_081D4576:
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -43211,7 +43211,7 @@ _081D46D0:
cmp r0, 0
bne _081D476E
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -43236,7 +43236,7 @@ _081D46D0:
b _081D447C
_081D470C:
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -43290,7 +43290,7 @@ _081D476E:
cmp r0, 0
bne _081D480C
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -43315,7 +43315,7 @@ _081D476E:
b _081D45AA
_081D47AA:
ldr r2, =gMapObjects
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -43386,7 +43386,7 @@ sub_81D4834: @ 81D4834
lsls r1, 16
lsrs r4, r1, 16
ldr r3, =gMapObjects
- ldr r1, =gUnknown_02037590
+ ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
adds r1, r2
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 99e15fe0f..e67212350 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -751,7 +751,7 @@ sub_80E90C8: @ 80E90C8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/asm/trainer_see.s b/asm/trainer_see.s
index 03c8d3320..1b3e33e98 100644
--- a/asm/trainer_see.s
+++ b/asm/trainer_see.s
@@ -882,7 +882,7 @@ _080B427A:
bl sub_808F23C
adds r0, r5, 0
bl sub_808F208
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -901,7 +901,7 @@ _080B427A:
beq _080B4308
_080B42D2:
bl sub_808BCE8
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -936,7 +936,7 @@ sub_80B4318: @ 80B4318
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, =gUnknown_02037590
+ ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 3381d847b..6ca6b4103 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -5,6 +5,8 @@
// Exported RAM declarations
+
+
// Exported ROM declarations
void sub_808D438(void);
@@ -12,6 +14,10 @@ u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
u8 GetFieldObjectIdByXY(s16, s16);
void FieldObjectSetDirection(struct MapObject *, u8);
+u8 GetFieldObjectIdByXY(s16, s16);
+u8 sub_808D4F4(void);
+void RemoveFieldObject(struct MapObject *);
+void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
// Exported data declarations
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 52f798f9b..6e15d3e86 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -15,12 +15,12 @@
// Static ROM declarations
-/*static*/ void sub_808D450(void);
+void sub_808D450(void);
static u8 GetFieldObjectIdByLocalId(u8);
static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8);
static bool8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *);
/*static*/ void FieldObjectHandleDynamicGraphicsId(struct MapObject *);
-/*static*/ void RemoveFieldObjectInternal (struct MapObject *);
+static void RemoveFieldObjectInternal (struct MapObject *);
/*static*/ u16 GetFieldObjectFlagIdByFieldObjectId(u8);
/*static*/ struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
@@ -136,7 +136,7 @@ static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGr
return ARRAY_COUNT(gMapObjects);
}
-u8 GetFieldObjectIdByLocalId(u8 localId)
+static u8 GetFieldObjectIdByLocalId(u8 localId)
{
u8 i;
@@ -152,7 +152,7 @@ u8 GetFieldObjectIdByLocalId(u8 localId)
// This function has the same nonmatching quirk as in Ruby/Sapphire.
#ifdef NONMATCHING
-u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId)
+/*static*/ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId)
{
u8 slot;
struct MapObject *mapObject;
@@ -203,7 +203,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId
return slot;
}
#else
-__attribute__((naked)) u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId)
+/*static*/ __attribute__((naked)) u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmov r7, r9\n"
@@ -435,10 +435,23 @@ void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
}
}
-void RemoveFieldObjectInternal(struct MapObject *mapObject)
+static void RemoveFieldObjectInternal(struct MapObject *mapObject)
{
struct SpriteFrameImage image;
image.size = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->size;
gSprites[mapObject->spriteId].images = ℑ
DestroySprite(&gSprites[mapObject->spriteId]);
}
+
+void unref_sub_808D958(void)
+{
+ u8 i;
+
+ for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
+ {
+ if (i != gPlayerAvatar.mapObjectId)
+ {
+ RemoveFieldObject(&gMapObjects[i]);
+ }
+ }
+}
diff --git a/sym_ewram.txt b/sym_ewram.txt
index df8f32f6a..bfe8faeb9 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -764,7 +764,7 @@ gUnknown_0203734C: @ 203734C
gMapObjects: @ 2037350
.space 0x240
-gUnknown_02037590: @ 2037590
+gPlayerAvatar: @ 2037590
.space 0x14
gUnknown_020375A4: @ 20375A4
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 23:40:13 +0000