diff options
Diffstat (limited to 'asm/field_player_avatar.s')
-rw-r--r-- | asm/field_player_avatar.s | 362 |
1 files changed, 181 insertions, 181 deletions
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 24494ab59..65d56af88 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -43,7 +43,7 @@ sub_805B3E0: @ 805B3E0 mov r8, r1 lsls r2, 16 lsrs r7, r2, 16 - ldr r4, _0805B454 @ =gUnknown_2037078 + ldr r4, _0805B454 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -84,7 +84,7 @@ _0805B448: pop {r0} bx r0 .align 2, 0 -_0805B454: .4byte gUnknown_2037078 +_0805B454: .4byte gPlayerAvatar _0805B458: .4byte gMapObjects thumb_func_end sub_805B3E0 @@ -144,14 +144,14 @@ npc_clear_strange_bits: @ 805B4B0 adds r2, 0x2 ands r1, r2 strb r1, [r0, 0x1] - ldr r2, _0805B4D0 @ =gUnknown_2037078 + ldr r2, _0805B4D0 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x7F ands r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0805B4D0: .4byte gUnknown_2037078 +_0805B4D0: .4byte gPlayerAvatar thumb_func_end npc_clear_strange_bits thumb_func_start MovePlayerAvatarUsingKeypadInput @@ -163,7 +163,7 @@ MovePlayerAvatarUsingKeypadInput: @ 805B4D4 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _0805B4F8 @ =gUnknown_2037078 + ldr r0, _0805B4F8 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -174,7 +174,7 @@ MovePlayerAvatarUsingKeypadInput: @ 805B4D4 bl sub_80BD09C b _0805B504 .align 2, 0 -_0805B4F8: .4byte gUnknown_2037078 +_0805B4F8: .4byte gPlayerAvatar _0805B4FC: adds r0, r3, 0 adds r1, r2, 0 @@ -188,7 +188,7 @@ _0805B504: thumb_func_start PlayerAllowForcedMovementIfMovingSameDirection PlayerAllowForcedMovementIfMovingSameDirection: @ 805B50C push {lr} - ldr r2, _0805B524 @ =gUnknown_2037078 + ldr r2, _0805B524 @ =gPlayerAvatar ldrb r0, [r2, 0x2] cmp r0, 0x2 bne _0805B51E @@ -200,13 +200,13 @@ _0805B51E: pop {r0} bx r0 .align 2, 0 -_0805B524: .4byte gUnknown_2037078 +_0805B524: .4byte gPlayerAvatar thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection thumb_func_start sub_805B528 sub_805B528: @ 805B528 push {r4,r5,lr} - ldr r5, _0805B58C @ =gUnknown_2037078 + ldr r5, _0805B58C @ =gPlayerAvatar ldrb r1, [r5] movs r0, 0x40 ands r0, r1 @@ -252,7 +252,7 @@ _0805B586: movs r0, 0x1 b _0805B59A .align 2, 0 -_0805B58C: .4byte gUnknown_2037078 +_0805B58C: .4byte gPlayerAvatar _0805B590: .4byte gUnknown_2036E30 _0805B594: .4byte gMapObjects _0805B598: @@ -267,7 +267,7 @@ _0805B59A: sub_805B5A0: @ 805B5A0 push {r4-r7,lr} sub sp, 0x4 - ldr r3, _0805B5F4 @ =gUnknown_2037078 + ldr r3, _0805B5F4 @ =gPlayerAvatar ldrb r1, [r3] movs r0, 0x20 ands r0, r1 @@ -307,17 +307,17 @@ _0805B5CC: bne _0805B5CC b _0805B628 .align 2, 0 -_0805B5F4: .4byte gUnknown_2037078 +_0805B5F4: .4byte gPlayerAvatar _0805B5F8: .4byte gMapObjects _0805B5FC: .4byte gUnknown_835B764 _0805B600: - ldr r0, _0805B60C @ =gUnknown_2037078 + ldr r0, _0805B60C @ =gPlayerAvatar strh r7, [r0, 0x1C] adds r0, r2, 0x4 adds r0, r5, r0 b _0805B62E .align 2, 0 -_0805B60C: .4byte gUnknown_2037078 +_0805B60C: .4byte gPlayerAvatar _0805B610: movs r6, 0 ldr r0, _0805B640 @ =gUnknown_835B764 @@ -352,7 +352,7 @@ _0805B640: .4byte gUnknown_835B764 thumb_func_start ForcedMovement_None ForcedMovement_None: @ 805B644 push {r4,lr} - ldr r4, _0805B688 @ =gUnknown_2037078 + ldr r4, _0805B688 @ =gPlayerAvatar ldrb r1, [r4] movs r0, 0x40 ands r0, r1 @@ -385,7 +385,7 @@ _0805B67E: pop {r1} bx r1 .align 2, 0 -_0805B688: .4byte gUnknown_2037078 +_0805B688: .4byte gPlayerAvatar _0805B68C: .4byte gMapObjects thumb_func_end ForcedMovement_None @@ -399,7 +399,7 @@ DoForcedMovement: @ 805B690 mov r9, r1 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0805B6D0 @ =gUnknown_2037078 + ldr r6, _0805B6D0 @ =gPlayerAvatar adds r0, r5, 0 bl sub_805BB1C lsls r0, 24 @@ -421,7 +421,7 @@ DoForcedMovement: @ 805B690 movs r0, 0 b _0805B6F8 .align 2, 0 -_0805B6D0: .4byte gUnknown_2037078 +_0805B6D0: .4byte gPlayerAvatar _0805B6D4: cmp r7, 0x6 bne _0805B6DE @@ -456,7 +456,7 @@ _0805B6F8: DoForcedMovementInCurrentDirection: @ 805B708 push {lr} adds r1, r0, 0 - ldr r0, _0805B734 @ =gUnknown_2037078 + ldr r0, _0805B734 @ =gPlayerAvatar ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 @@ -475,7 +475,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 pop {r1} bx r1 .align 2, 0 -_0805B734: .4byte gUnknown_2037078 +_0805B734: .4byte gPlayerAvatar _0805B738: .4byte gMapObjects thumb_func_end DoForcedMovementInCurrentDirection @@ -678,7 +678,7 @@ ForcedMovement_Slide: @ 805B88C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0805B8BC @ =gUnknown_2037078 + ldr r2, _0805B8BC @ =gPlayerAvatar ldrb r3, [r2, 0x5] lsls r2, r3, 3 adds r2, r3 @@ -698,7 +698,7 @@ ForcedMovement_Slide: @ 805B88C pop {r1} bx r1 .align 2, 0 -_0805B8BC: .4byte gUnknown_2037078 +_0805B8BC: .4byte gPlayerAvatar _0805B8C0: .4byte gMapObjects thumb_func_end ForcedMovement_Slide @@ -809,28 +809,28 @@ CheckMovementInputNotOnBike: @ 805B96C lsrs r4, r0, 24 cmp r4, 0 bne _0805B984 - ldr r0, _0805B980 @ =gUnknown_2037078 + ldr r0, _0805B980 @ =gPlayerAvatar strb r4, [r0, 0x2] movs r0, 0 b _0805B9A6 .align 2, 0 -_0805B980: .4byte gUnknown_2037078 +_0805B980: .4byte gPlayerAvatar _0805B984: bl player_get_direction_upper_nybble lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _0805B9A0 - ldr r1, _0805B99C @ =gUnknown_2037078 + ldr r1, _0805B99C @ =gPlayerAvatar ldrb r0, [r1, 0x2] cmp r0, 0x2 beq _0805B9A0 movs r0, 0x1 b _0805B9A4 .align 2, 0 -_0805B99C: .4byte gUnknown_2037078 +_0805B99C: .4byte gPlayerAvatar _0805B9A0: - ldr r1, _0805B9AC @ =gUnknown_2037078 + ldr r1, _0805B9AC @ =gPlayerAvatar movs r0, 0x2 _0805B9A4: strb r0, [r1, 0x2] @@ -839,7 +839,7 @@ _0805B9A6: pop {r1} bx r1 .align 2, 0 -_0805B9AC: .4byte gUnknown_2037078 +_0805B9AC: .4byte gPlayerAvatar thumb_func_end CheckMovementInputNotOnBike thumb_func_start PlayerNotOnBikeNotMoving @@ -898,7 +898,7 @@ _0805BA06: bl PlayerNotOnBikeCollide b _0805BAA4 _0805BA18: - ldr r6, _0805BA2C @ =gUnknown_2037078 + ldr r6, _0805BA2C @ =gPlayerAvatar ldrb r1, [r6] movs r0, 0x8 ands r0, r1 @@ -908,7 +908,7 @@ _0805BA18: bl sub_805C11C b _0805BAA4 .align 2, 0 -_0805BA2C: .4byte gUnknown_2037078 +_0805BA2C: .4byte gPlayerAvatar _0805BA30: movs r0, 0x2 ands r5, r0 @@ -943,14 +943,14 @@ _0805BA74: adds r0, r4, 0 bl sub_805C17C _0805BA7A: - ldr r2, _0805BA88 @ =gUnknown_2037078 + ldr r2, _0805BA88 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x80 orrs r0, r1 strb r0, [r2] b _0805BAA4 .align 2, 0 -_0805BA88: .4byte gUnknown_2037078 +_0805BA88: .4byte gPlayerAvatar _0805BA8C: adds r0, r4, 0 bl sub_805BAAC @@ -974,7 +974,7 @@ sub_805BAAC: @ 805BAAC sub sp, 0x4 lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0805BAE4 @ =gUnknown_2037078 + ldr r0, _0805BAE4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -999,7 +999,7 @@ sub_805BAAC: @ 805BAAC asrs r1, 16 b _0805BB00 .align 2, 0 -_0805BAE4: .4byte gUnknown_2037078 +_0805BAE4: .4byte gPlayerAvatar _0805BAE8: .4byte gMapObjects _0805BAEC: movs r0, 0x1 @@ -1012,7 +1012,7 @@ _0805BAEC: movs r2, 0 ldrsh r1, [r4, r2] _0805BB00: - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsRockStairs @@ -1034,7 +1034,7 @@ sub_805BB1C: @ 805BB1C sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0805BB94 @ =gUnknown_2037078 + ldr r0, _0805BB94 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1052,7 +1052,7 @@ sub_805BB1C: @ 805BB1C ldrsh r0, [r0, r2] lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 @@ -1069,7 +1069,7 @@ sub_805BB1C: @ 805BB1C ldrsh r0, [r0, r3] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 add r1, sp, 0x4 @@ -1085,7 +1085,7 @@ sub_805BB1C: @ 805BB1C lsrs r0, 24 b _0805BB9E .align 2, 0 -_0805BB94: .4byte gUnknown_2037078 +_0805BB94: .4byte gPlayerAvatar _0805BB98: .4byte gMapObjects _0805BB9C: movs r0, 0x8 @@ -1200,7 +1200,7 @@ sub_805BC60: @ 805BC60 lsrs r4, r1, 16 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _0805BCB8 @ =gUnknown_2037078 + ldr r0, _0805BCB8 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x8 ands r0, r1 @@ -1233,7 +1233,7 @@ sub_805BC60: @ 805BC60 movs r0, 0x1 b _0805BCC2 .align 2, 0 -_0805BCB8: .4byte gUnknown_2037078 +_0805BCB8: .4byte gPlayerAvatar _0805BCBC: .4byte gUnknown_835B820 _0805BCC0: movs r0, 0 @@ -1313,7 +1313,7 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x66 beq _0805BD8A mov r0, sp @@ -1332,7 +1332,7 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsCaveDoor @@ -1399,7 +1399,7 @@ SetPlayerAvatarTransitionFlags: @ 805BDEC push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _0805BE04 @ =gUnknown_2037078 + ldr r2, _0805BE04 @ =gPlayerAvatar ldrb r1, [r2, 0x1] orrs r0, r1 strb r0, [r2, 0x1] @@ -1407,13 +1407,13 @@ SetPlayerAvatarTransitionFlags: @ 805BDEC pop {r0} bx r0 .align 2, 0 -_0805BE04: .4byte gUnknown_2037078 +_0805BE04: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarTransitionFlags thumb_func_start DoPlayerAvatarTransition DoPlayerAvatarTransition: @ 805BE08 push {r4,r5,lr} - ldr r0, _0805BE50 @ =gUnknown_2037078 + ldr r0, _0805BE50 @ =gPlayerAvatar ldrb r4, [r0, 0x1] cmp r4, 0 beq _0805BE48 @@ -1426,7 +1426,7 @@ _0805BE14: ldr r0, _0805BE54 @ =gUnknown_835B844 lsls r2, r5, 2 adds r2, r0 - ldr r0, _0805BE50 @ =gUnknown_2037078 + ldr r0, _0805BE50 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1442,7 +1442,7 @@ _0805BE36: lsrs r4, 1 cmp r5, 0x7 bls _0805BE14 - ldr r1, _0805BE50 @ =gUnknown_2037078 + ldr r1, _0805BE50 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x1] _0805BE48: @@ -1450,7 +1450,7 @@ _0805BE48: pop {r0} bx r0 .align 2, 0 -_0805BE50: .4byte gUnknown_2037078 +_0805BE50: .4byte gPlayerAvatar _0805BE54: .4byte gUnknown_835B844 _0805BE58: .4byte gMapObjects thumb_func_end DoPlayerAvatarTransition @@ -1503,20 +1503,20 @@ nullsub_23: @ 805BEA4 thumb_func_start PlayerAvatarTransition_ReturnToField PlayerAvatarTransition_ReturnToField: @ 805BEA8 - ldr r2, _0805BEB4 @ =gUnknown_2037078 + ldr r2, _0805BEB4 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x20 orrs r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0805BEB4: .4byte gUnknown_2037078 +_0805BEB4: .4byte gPlayerAvatar thumb_func_end PlayerAvatarTransition_ReturnToField thumb_func_start sub_805BEB8 sub_805BEB8: @ 805BEB8 push {r4,lr} - ldr r4, _0805BEE4 @ =gUnknown_2037078 + ldr r4, _0805BEE4 @ =gPlayerAvatar movs r0, 0 strb r0, [r4, 0x3] bl PlayerIsAnimActive @@ -1534,7 +1534,7 @@ sub_805BEB8: @ 805BEB8 movs r0, 0x1 b _0805BEF4 .align 2, 0 -_0805BEE4: .4byte gUnknown_2037078 +_0805BEE4: .4byte gPlayerAvatar _0805BEE8: bl sub_805BF58 lsls r0, 24 @@ -1553,7 +1553,7 @@ _0805BEF6: player_is_anim_in_certain_ranges: @ 805BEFC push {lr} ldr r2, _0805BF48 @ =gMapObjects - ldr r0, _0805BF4C @ =gUnknown_2037078 + ldr r0, _0805BF4C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1591,7 +1591,7 @@ _0805BF42: b _0805BF52 .align 2, 0 _0805BF48: .4byte gMapObjects -_0805BF4C: .4byte gUnknown_2037078 +_0805BF4C: .4byte gPlayerAvatar _0805BF50: movs r0, 0 _0805BF52: @@ -1606,14 +1606,14 @@ sub_805BF58: @ 805BF58 lsls r0, 24 cmp r0, 0 beq _0805BF74 - ldr r0, _0805BF70 @ =gUnknown_2037078 + ldr r0, _0805BF70 @ =gPlayerAvatar ldrb r0, [r0, 0x2] cmp r0, 0x1 beq _0805BF74 movs r0, 0x1 b _0805BF76 .align 2, 0 -_0805BF70: .4byte gUnknown_2037078 +_0805BF70: .4byte gPlayerAvatar _0805BF74: movs r0, 0 _0805BF76: @@ -1624,7 +1624,7 @@ _0805BF76: thumb_func_start PlayerIsAnimActive PlayerIsAnimActive: @ 805BF7C push {lr} - ldr r0, _0805BF98 @ =gUnknown_2037078 + ldr r0, _0805BF98 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1637,14 +1637,14 @@ PlayerIsAnimActive: @ 805BF7C pop {r1} bx r1 .align 2, 0 -_0805BF98: .4byte gUnknown_2037078 +_0805BF98: .4byte gPlayerAvatar _0805BF9C: .4byte gMapObjects thumb_func_end PlayerIsAnimActive thumb_func_start PlayerCheckIfAnimFinishedOrInactive PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 push {lr} - ldr r0, _0805BFBC @ =gUnknown_2037078 + ldr r0, _0805BFBC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1657,14 +1657,14 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 pop {r1} bx r1 .align 2, 0 -_0805BFBC: .4byte gUnknown_2037078 +_0805BFBC: .4byte gPlayerAvatar _0805BFC0: .4byte gMapObjects thumb_func_end PlayerCheckIfAnimFinishedOrInactive thumb_func_start player_set_x22 player_set_x22: @ 805BFC4 ldr r3, _0805BFD8 @ =gMapObjects - ldr r1, _0805BFDC @ =gUnknown_2037078 + ldr r1, _0805BFDC @ =gPlayerAvatar ldrb r2, [r1, 0x5] lsls r1, r2, 3 adds r1, r2 @@ -1675,13 +1675,13 @@ player_set_x22: @ 805BFC4 bx lr .align 2, 0 _0805BFD8: .4byte gMapObjects -_0805BFDC: .4byte gUnknown_2037078 +_0805BFDC: .4byte gPlayerAvatar thumb_func_end player_set_x22 thumb_func_start player_get_x22 player_get_x22: @ 805BFE0 ldr r2, _0805BFF4 @ =gMapObjects - ldr r0, _0805BFF8 @ =gUnknown_2037078 + ldr r0, _0805BFF8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1692,7 +1692,7 @@ player_get_x22: @ 805BFE0 bx lr .align 2, 0 _0805BFF4: .4byte gMapObjects -_0805BFF8: .4byte gUnknown_2037078 +_0805BFF8: .4byte gPlayerAvatar thumb_func_end player_get_x22 thumb_func_start sub_805BFFC @@ -1701,7 +1701,7 @@ sub_805BFFC: @ 805BFFC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0805C01C @ =gUnknown_2037078 + ldr r0, _0805C01C @ =gPlayerAvatar ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 @@ -1712,7 +1712,7 @@ sub_805BFFC: @ 805BFFC pop {r0} bx r0 .align 2, 0 -_0805C01C: .4byte gUnknown_2037078 +_0805C01C: .4byte gPlayerAvatar _0805C020: .4byte gMapObjects thumb_func_end sub_805BFFC @@ -1729,7 +1729,7 @@ sub_805C024: @ 805C024 bne _0805C05E adds r0, r4, 0 bl player_set_x22 - ldr r0, _0805C064 @ =gUnknown_2037078 + ldr r0, _0805C064 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1748,7 +1748,7 @@ _0805C05E: pop {r0} bx r0 .align 2, 0 -_0805C064: .4byte gUnknown_2037078 +_0805C064: .4byte gPlayerAvatar _0805C068: .4byte gMapObjects thumb_func_end sub_805C024 @@ -1757,7 +1757,7 @@ sub_805C06C: @ 805C06C push {r4,lr} lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0805C09C @ =gUnknown_2037078 + ldr r0, _0805C09C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1777,7 +1777,7 @@ _0805C094: pop {r0} bx r0 .align 2, 0 -_0805C09C: .4byte gUnknown_2037078 +_0805C09C: .4byte gPlayerAvatar _0805C0A0: .4byte gMapObjects thumb_func_end sub_805C06C @@ -2045,7 +2045,7 @@ sub_805C260: @ 805C260 thumb_func_start sub_805C270 sub_805C270: @ 805C270 push {r4,lr} - ldr r4, _0805C2AC @ =gUnknown_2037078 + ldr r4, _0805C2AC @ =gPlayerAvatar ldrb r0, [r4, 0x3] cmp r0, 0x2 beq _0805C27E @@ -2074,7 +2074,7 @@ _0805C2A6: pop {r0} bx r0 .align 2, 0 -_0805C2AC: .4byte gUnknown_2037078 +_0805C2AC: .4byte gPlayerAvatar _0805C2B0: .4byte gMapObjects thumb_func_end sub_805C270 @@ -2302,7 +2302,7 @@ sub_805C438: @ 805C438 lsrs r5, r0, 24 adds r6, r5, 0 ldr r2, _0805C4E8 @ =gMapObjects - ldr r0, _0805C4EC @ =gUnknown_2037078 + ldr r0, _0805C4EC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2361,7 +2361,7 @@ _0805C4A0: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -2379,7 +2379,7 @@ _0805C4DE: bx r0 .align 2, 0 _0805C4E8: .4byte gMapObjects -_0805C4EC: .4byte gUnknown_2037078 +_0805C4EC: .4byte gPlayerAvatar _0805C4F0: .4byte gUnknown_835B864 thumb_func_end sub_805C438 @@ -2389,7 +2389,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 adds r4, r0, 0 adds r5, r1, 0 ldr r3, _0805C530 @ =gMapObjects - ldr r2, _0805C534 @ =gUnknown_2037078 + ldr r2, _0805C534 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2415,14 +2415,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 bx r0 .align 2, 0 _0805C530: .4byte gMapObjects -_0805C534: .4byte gUnknown_2037078 +_0805C534: .4byte gPlayerAvatar thumb_func_end GetXYCoordsOneStepInFrontOfPlayer thumb_func_start PlayerGetDestCoords PlayerGetDestCoords: @ 805C538 push {r4,r5,lr} ldr r5, _0805C560 @ =gMapObjects - ldr r4, _0805C564 @ =gUnknown_2037078 + ldr r4, _0805C564 @ =gPlayerAvatar ldrb r3, [r4, 0x5] lsls r2, r3, 3 adds r2, r3 @@ -2442,7 +2442,7 @@ PlayerGetDestCoords: @ 805C538 bx r0 .align 2, 0 _0805C560: .4byte gMapObjects -_0805C564: .4byte gUnknown_2037078 +_0805C564: .4byte gPlayerAvatar thumb_func_end PlayerGetDestCoords thumb_func_start plaer_get_pos_including_state_based_drift @@ -2450,7 +2450,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _0805C5BC @ =gUnknown_2037078 + ldr r0, _0805C5BC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2492,7 +2492,7 @@ _0805C5B0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0805C5BC: .4byte gUnknown_2037078 +_0805C5BC: .4byte gPlayerAvatar _0805C5C0: .4byte gMapObjects _0805C5C4: .4byte gSprites _0805C5C8: .4byte _0805C5CC @@ -2585,7 +2585,7 @@ _0805C6BC: thumb_func_start player_get_direction_lower_nybble player_get_direction_lower_nybble: @ 805C6C4 ldr r2, _0805C6DC @ =gMapObjects - ldr r0, _0805C6E0 @ =gUnknown_2037078 + ldr r0, _0805C6E0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2597,13 +2597,13 @@ player_get_direction_lower_nybble: @ 805C6C4 bx lr .align 2, 0 _0805C6DC: .4byte gMapObjects -_0805C6E0: .4byte gUnknown_2037078 +_0805C6E0: .4byte gPlayerAvatar thumb_func_end player_get_direction_lower_nybble thumb_func_start player_get_direction_upper_nybble player_get_direction_upper_nybble: @ 805C6E4 ldr r2, _0805C6F8 @ =gMapObjects - ldr r0, _0805C6FC @ =gUnknown_2037078 + ldr r0, _0805C6FC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2614,13 +2614,13 @@ player_get_direction_upper_nybble: @ 805C6E4 bx lr .align 2, 0 _0805C6F8: .4byte gMapObjects -_0805C6FC: .4byte gUnknown_2037078 +_0805C6FC: .4byte gPlayerAvatar thumb_func_end player_get_direction_upper_nybble thumb_func_start PlayerGetZCoord PlayerGetZCoord: @ 805C700 ldr r2, _0805C714 @ =gMapObjects - ldr r0, _0805C718 @ =gUnknown_2037078 + ldr r0, _0805C718 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2631,7 +2631,7 @@ PlayerGetZCoord: @ 805C700 bx lr .align 2, 0 _0805C714: .4byte gMapObjects -_0805C718: .4byte gUnknown_2037078 +_0805C718: .4byte gPlayerAvatar thumb_func_end PlayerGetZCoord thumb_func_start sub_805C71C @@ -2639,7 +2639,7 @@ sub_805C71C: @ 805C71C push {lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _0805C744 @ =gUnknown_2037078 + ldr r0, _0805C744 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2655,37 +2655,37 @@ sub_805C71C: @ 805C71C pop {r0} bx r0 .align 2, 0 -_0805C744: .4byte gUnknown_2037078 +_0805C744: .4byte gPlayerAvatar _0805C748: .4byte gMapObjects thumb_func_end sub_805C71C thumb_func_start TestPlayerAvatarFlags TestPlayerAvatarFlags: @ 805C74C - ldr r1, _0805C758 @ =gUnknown_2037078 + ldr r1, _0805C758 @ =gPlayerAvatar ldrb r1, [r1] ands r1, r0 adds r0, r1, 0 bx lr .align 2, 0 -_0805C758: .4byte gUnknown_2037078 +_0805C758: .4byte gPlayerAvatar thumb_func_end TestPlayerAvatarFlags thumb_func_start sub_805C75C sub_805C75C: @ 805C75C - ldr r0, _0805C764 @ =gUnknown_2037078 + ldr r0, _0805C764 @ =gPlayerAvatar ldrb r0, [r0] bx lr .align 2, 0 -_0805C764: .4byte gUnknown_2037078 +_0805C764: .4byte gPlayerAvatar thumb_func_end sub_805C75C thumb_func_start GetPlayerAvatarObjectId GetPlayerAvatarObjectId: @ 805C768 - ldr r0, _0805C770 @ =gUnknown_2037078 + ldr r0, _0805C770 @ =gPlayerAvatar ldrb r0, [r0, 0x4] bx lr .align 2, 0 -_0805C770: .4byte gUnknown_2037078 +_0805C770: .4byte gPlayerAvatar thumb_func_end GetPlayerAvatarObjectId thumb_func_start sub_805C774 @@ -2699,7 +2699,7 @@ sub_805C774: @ 805C774 thumb_func_start sub_805C780 sub_805C780: @ 805C780 push {r4,lr} - ldr r0, _0805C7C0 @ =gUnknown_2037078 + ldr r0, _0805C7C0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2726,7 +2726,7 @@ _0805C7B8: pop {r0} bx r0 .align 2, 0 -_0805C7C0: .4byte gUnknown_2037078 +_0805C7C0: .4byte gPlayerAvatar _0805C7C4: .4byte gMapObjects thumb_func_end sub_805C780 @@ -2776,7 +2776,7 @@ sub_805C808: @ 805C808 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805C820 @ =gUnknown_2037078 + ldr r1, _0805C820 @ =gPlayerAvatar ldrb r1, [r1, 0x7] bl GetPlayerAvatarGraphicsIdByStateIdAndGender lsls r0, 24 @@ -2784,7 +2784,7 @@ sub_805C808: @ 805C808 pop {r1} bx r1 .align 2, 0 -_0805C820: .4byte gUnknown_2037078 +_0805C820: .4byte gPlayerAvatar thumb_func_end sub_805C808 thumb_func_start sub_805C824 @@ -2877,7 +2877,7 @@ _0805C8AC: IsPlayerFacingSurfableFishableWater: @ 805C8B0 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _0805C924 @ =gUnknown_2037078 + ldr r0, _0805C924 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2929,7 +2929,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 movs r0, 0x1 b _0805C92E .align 2, 0 -_0805C924: .4byte gUnknown_2037078 +_0805C924: .4byte gPlayerAvatar _0805C928: .4byte gMapObjects _0805C92C: movs r0, 0 @@ -2962,21 +2962,21 @@ sub_805C938: @ 805C938 thumb_func_start ClearPlayerAvatarInfo ClearPlayerAvatarInfo: @ 805C95C push {lr} - ldr r0, _0805C96C @ =gUnknown_2037078 + ldr r0, _0805C96C @ =gPlayerAvatar movs r1, 0 movs r2, 0x20 bl memset pop {r0} bx r0 .align 2, 0 -_0805C96C: .4byte gUnknown_2037078 +_0805C96C: .4byte gPlayerAvatar thumb_func_end ClearPlayerAvatarInfo thumb_func_start SetPlayerAvatarStateMask SetPlayerAvatarStateMask: @ 805C970 lsls r0, 24 lsrs r0, 24 - ldr r3, _0805C984 @ =gUnknown_2037078 + ldr r3, _0805C984 @ =gPlayerAvatar ldrb r2, [r3] movs r1, 0xE0 ands r1, r2 @@ -2984,7 +2984,7 @@ SetPlayerAvatarStateMask: @ 805C970 strb r0, [r3] bx lr .align 2, 0 -_0805C984: .4byte gUnknown_2037078 +_0805C984: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarStateMask thumb_func_start GetPlayerAvatarStateTransitionByGraphicsId @@ -3028,7 +3028,7 @@ _0805C9C0: thumb_func_start GetPlayerAvatarGraphicsIdByCurrentState GetPlayerAvatarGraphicsIdByCurrentState: @ 805C9C8 push {r4-r6,lr} - ldr r0, _0805C9F0 @ =gUnknown_2037078 + ldr r0, _0805C9F0 @ =gPlayerAvatar ldrb r5, [r0] movs r2, 0 ldr r3, _0805C9F4 @ =gUnknown_835B882 @@ -3049,7 +3049,7 @@ _0805C9DC: ldrb r0, [r0] b _0805CA04 .align 2, 0 -_0805C9F0: .4byte gUnknown_2037078 +_0805C9F0: .4byte gPlayerAvatar _0805C9F4: .4byte gUnknown_835B882 _0805C9F8: adds r0, r2, 0x1 @@ -3072,7 +3072,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C lsrs r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r5, _0805CA38 @ =gUnknown_2037078 + ldr r5, _0805CA38 @ =gPlayerAvatar ldrb r1, [r5, 0x7] bl GetPlayerAvatarStateTransitionByGraphicsId lsls r0, 24 @@ -3086,7 +3086,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C pop {r0} bx r0 .align 2, 0 -_0805CA38: .4byte gUnknown_2037078 +_0805CA38: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarExtraStateTransition thumb_func_start InitPlayerAvatar @@ -3164,7 +3164,7 @@ InitPlayerAvatar: @ 805CA3C mov r1, r9 bl FieldObjectTurn bl ClearPlayerAvatarInfo - ldr r0, _0805CB00 @ =gUnknown_2037078 + ldr r0, _0805CB00 @ =gPlayerAvatar strb r6, [r0, 0x2] strb r6, [r0, 0x3] strb r5, [r0, 0x5] @@ -3183,7 +3183,7 @@ InitPlayerAvatar: @ 805CA3C bx r0 .align 2, 0 _0805CAFC: .4byte gMapObjects -_0805CB00: .4byte gUnknown_2037078 +_0805CB00: .4byte gPlayerAvatar thumb_func_end InitPlayerAvatar thumb_func_start sub_805CB04 @@ -3192,7 +3192,7 @@ sub_805CB04: @ 805CB04 lsls r0, 24 lsrs r4, r0, 24 ldr r6, _0805CB64 @ =gMapObjects - ldr r5, _0805CB68 @ =gUnknown_2037078 + ldr r5, _0805CB68 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3237,14 +3237,14 @@ _0805CB5C: bx r0 .align 2, 0 _0805CB64: .4byte gMapObjects -_0805CB68: .4byte gUnknown_2037078 +_0805CB68: .4byte gPlayerAvatar _0805CB6C: .4byte gSprites thumb_func_end sub_805CB04 thumb_func_start sub_805CB70 sub_805CB70: @ 805CB70 push {r4,r5,lr} - ldr r5, _0805CBAC @ =gUnknown_2037078 + ldr r5, _0805CBAC @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -3270,7 +3270,7 @@ sub_805CB70: @ 805CB70 pop {r0} bx r0 .align 2, 0 -_0805CBAC: .4byte gUnknown_2037078 +_0805CBAC: .4byte gPlayerAvatar _0805CBB0: .4byte gMapObjects _0805CBB4: .4byte gSprites thumb_func_end sub_805CB70 @@ -3278,7 +3278,7 @@ _0805CBB4: .4byte gSprites thumb_func_start sub_805CBB8 sub_805CBB8: @ 805CBB8 push {lr} - ldr r2, _0805CBD4 @ =gUnknown_2037078 + ldr r2, _0805CBD4 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x6 ands r0, r1 @@ -3290,7 +3290,7 @@ sub_805CBB8: @ 805CBB8 lsrs r0, 24 b _0805CBE0 .align 2, 0 -_0805CBD4: .4byte gUnknown_2037078 +_0805CBD4: .4byte gPlayerAvatar _0805CBD8: ldr r0, _0805CBE4 @ =gUnknown_835B88E ldrb r1, [r2, 0x7] @@ -3306,7 +3306,7 @@ _0805CBE4: .4byte gUnknown_835B88E thumb_func_start sub_805CBE8 sub_805CBE8: @ 805CBE8 push {r4,r5,lr} - ldr r5, _0805CC20 @ =gUnknown_2037078 + ldr r5, _0805CC20 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -3331,7 +3331,7 @@ sub_805CBE8: @ 805CBE8 pop {r0} bx r0 .align 2, 0 -_0805CC20: .4byte gUnknown_2037078 +_0805CC20: .4byte gPlayerAvatar _0805CC24: .4byte gMapObjects _0805CC28: .4byte gSprites thumb_func_end sub_805CBE8 @@ -3478,7 +3478,7 @@ _0805CD20: ldrsh r3, [r4, r0] lsls r3, 2 adds r3, r6 - ldr r0, _0805CD60 @ =gUnknown_2037078 + ldr r0, _0805CD60 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3503,7 +3503,7 @@ _0805CD20: _0805CD54: .4byte gUnknown_835B8A0 _0805CD58: .4byte gTasks _0805CD5C: .4byte gMapObjects -_0805CD60: .4byte gUnknown_2037078 +_0805CD60: .4byte gPlayerAvatar thumb_func_end taskFF_bump_boulder thumb_func_start sub_805CD64 @@ -3511,7 +3511,7 @@ sub_805CD64: @ 805CD64 push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _0805CD80 @ =gUnknown_2037078 + ldr r1, _0805CD80 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -3522,7 +3522,7 @@ sub_805CD64: @ 805CD64 pop {r1} bx r1 .align 2, 0 -_0805CD80: .4byte gUnknown_2037078 +_0805CD80: .4byte gPlayerAvatar thumb_func_end sub_805CD64 thumb_func_start sub_805CD84 @@ -3620,7 +3620,7 @@ sub_805CE20: @ 805CE20 ldrh r0, [r4, 0x10] ldrh r1, [r4, 0x12] bl sub_806DE70 - ldr r1, _0805CE78 @ =gUnknown_2037078 + ldr r1, _0805CE78 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -3635,7 +3635,7 @@ _0805CE70: pop {r1} bx r1 .align 2, 0 -_0805CE78: .4byte gUnknown_2037078 +_0805CE78: .4byte gPlayerAvatar _0805CE7C: .4byte taskFF_bump_boulder thumb_func_end sub_805CE20 @@ -3672,7 +3672,7 @@ _0805CEB2: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0805CEE4 @ =gUnknown_2037078 + ldr r0, _0805CEE4 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3691,7 +3691,7 @@ _0805CEB2: .align 2, 0 _0805CEDC: .4byte gUnknown_835B8AC _0805CEE0: .4byte gTasks -_0805CEE4: .4byte gUnknown_2037078 +_0805CEE4: .4byte gPlayerAvatar _0805CEE8: .4byte gMapObjects thumb_func_end sub_805CEA0 @@ -3700,7 +3700,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC push {r4-r6,lr} adds r6, r0, 0 adds r4, r1, 0 - ldr r5, _0805CF50 @ =gUnknown_2037078 + ldr r5, _0805CF50 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r5, 0x6] adds r0, r4, 0 @@ -3743,7 +3743,7 @@ _0805CF48: pop {r1} bx r1 .align 2, 0 -_0805CF50: .4byte gUnknown_2037078 +_0805CF50: .4byte gPlayerAvatar _0805CF54: .4byte sub_805CEA0 thumb_func_end PlayerAvatar_DoSecretBaseMatJump @@ -3780,7 +3780,7 @@ _0805CF8A: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0805CFBC @ =gUnknown_2037078 + ldr r0, _0805CFBC @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3799,7 +3799,7 @@ _0805CF8A: .align 2, 0 _0805CFB4: .4byte gUnknown_835B8B0 _0805CFB8: .4byte gTasks -_0805CFBC: .4byte gUnknown_2037078 +_0805CFBC: .4byte gPlayerAvatar _0805CFC0: .4byte gMapObjects thumb_func_end sub_805CF78 @@ -3812,7 +3812,7 @@ sub_805CFC4: @ 805CFC4 ldrb r1, [r1, 0x18] lsrs r1, 4 strh r1, [r0, 0xA] - ldr r1, _0805CFE8 @ =gUnknown_2037078 + ldr r1, _0805CFE8 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] bl ScriptContext2_Enable @@ -3822,7 +3822,7 @@ sub_805CFC4: @ 805CFC4 pop {r1} bx r1 .align 2, 0 -_0805CFE8: .4byte gUnknown_2037078 +_0805CFE8: .4byte gPlayerAvatar thumb_func_end sub_805CFC4 thumb_func_start sub_805CFEC @@ -3939,7 +3939,7 @@ sub_805D0A4: @ 805D0A4 adds r0, r5, 0 bl sub_805C06C bl ScriptContext2_Disable - ldr r1, _0805D0F0 @ =gUnknown_2037078 + ldr r1, _0805D0F0 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] ldr r0, _0805D0F4 @ =sub_805CF78 @@ -3953,7 +3953,7 @@ _0805D0E8: pop {r1} bx r1 .align 2, 0 -_0805D0F0: .4byte gUnknown_2037078 +_0805D0F0: .4byte gPlayerAvatar _0805D0F4: .4byte sub_805CF78 thumb_func_end sub_805D0A4 @@ -3967,7 +3967,7 @@ sub_805D0F8: @ 805D0F8 bl player_bitmagic bl sav1_reset_battle_music_maybe bl Overworld_ChangeMusicToDefault - ldr r2, _0805D148 @ =gUnknown_2037078 + ldr r2, _0805D148 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -3993,7 +3993,7 @@ sub_805D0F8: @ 805D0F8 pop {r0} bx r0 .align 2, 0 -_0805D148: .4byte gUnknown_2037078 +_0805D148: .4byte gPlayerAvatar _0805D14C: .4byte taskFF_0805D1D4 _0805D150: .4byte gTasks thumb_func_end sub_805D0F8 @@ -4006,7 +4006,7 @@ sub_805D154: @ 805D154 lsrs r4, 24 bl ScriptContext2_Enable bl player_bitmagic - ldr r2, _0805D19C @ =gUnknown_2037078 + ldr r2, _0805D19C @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -4032,7 +4032,7 @@ sub_805D154: @ 805D154 pop {r0} bx r0 .align 2, 0 -_0805D19C: .4byte gUnknown_2037078 +_0805D19C: .4byte gPlayerAvatar _0805D1A0: .4byte taskFF_0805D1D4 _0805D1A4: .4byte gTasks thumb_func_end sub_805D154 @@ -4065,7 +4065,7 @@ taskFF_0805D1D4: @ 805D1D4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0805D230 @ =gUnknown_2037078 + ldr r0, _0805D230 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4105,7 +4105,7 @@ _0805D228: pop {r0} bx r0 .align 2, 0 -_0805D230: .4byte gUnknown_2037078 +_0805D230: .4byte gPlayerAvatar _0805D234: .4byte gMapObjects _0805D238: .4byte gTasks _0805D23C: .4byte sub_805D240 @@ -4116,7 +4116,7 @@ sub_805D240: @ 805D240 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0805D2B4 @ =gUnknown_2037078 + ldr r6, _0805D2B4 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4163,7 +4163,7 @@ _0805D2AE: pop {r0} bx r0 .align 2, 0 -_0805D2B4: .4byte gUnknown_2037078 +_0805D2B4: .4byte gPlayerAvatar _0805D2B8: .4byte gMapObjects _0805D2BC: .4byte gSprites thumb_func_end sub_805D240 @@ -4236,7 +4236,7 @@ sub_805D33C: @ 805D33C push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _0805D358 @ =gUnknown_2037078 + ldr r1, _0805D358 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -4247,7 +4247,7 @@ sub_805D33C: @ 805D33C pop {r1} bx r1 .align 2, 0 -_0805D358: .4byte gUnknown_2037078 +_0805D358: .4byte gPlayerAvatar thumb_func_end sub_805D33C thumb_func_start fish1 @@ -4282,7 +4282,7 @@ fish1: @ 805D35C adds r1, r0 strh r1, [r5, 0x22] ldr r3, _0805D3EC @ =gMapObjects - ldr r2, _0805D3F0 @ =gUnknown_2037078 + ldr r2, _0805D3F0 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4317,14 +4317,14 @@ fish1: @ 805D35C _0805D3E4: .4byte gUnknown_835B90C _0805D3E8: .4byte gUnknown_835B912 _0805D3EC: .4byte gMapObjects -_0805D3F0: .4byte gUnknown_2037078 +_0805D3F0: .4byte gPlayerAvatar thumb_func_end fish1 thumb_func_start fish2 fish2: @ 805D3F4 push {r4,lr} adds r4, r0, 0 - ldr r0, _0805D428 @ =gUnknown_2037078 + ldr r0, _0805D428 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4348,7 +4348,7 @@ _0805D41E: pop {r1} bx r1 .align 2, 0 -_0805D428: .4byte gUnknown_2037078 +_0805D428: .4byte gPlayerAvatar _0805D42C: .4byte gSprites thumb_func_end fish2 @@ -4398,7 +4398,7 @@ sub_805D47C: @ 805D47C push {r4,r5,lr} sub sp, 0xC adds r4, r0, 0 - ldr r0, _0805D4CC @ =gUnknown_2037078 + ldr r0, _0805D4CC @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4436,7 +4436,7 @@ _0805D4C6: strh r0, [r4, 0x20] b _0805D4F8 .align 2, 0 -_0805D4CC: .4byte gUnknown_2037078 +_0805D4CC: .4byte gPlayerAvatar _0805D4D0: .4byte gSprites _0805D4D4: ldr r2, _0805D504 @ =gUnknown_835B918 @@ -4470,7 +4470,7 @@ _0805D504: .4byte gUnknown_835B918 sub_805D508: @ 805D508 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _0805D540 @ =gUnknown_2037078 + ldr r6, _0805D540 @ =gPlayerAvatar ldrb r1, [r6, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4495,7 +4495,7 @@ _0805D53A: strh r0, [r4, 0x8] b _0805D56A .align 2, 0 -_0805D540: .4byte gUnknown_2037078 +_0805D540: .4byte gPlayerAvatar _0805D544: .4byte gSprites _0805D548: ldrb r0, [r6, 0x4] @@ -4537,7 +4537,7 @@ sub_805D580: @ 805D580 mov r0, sp movs r2, 0x6 bl memcpy - ldr r0, _0805D5C4 @ =gUnknown_2037078 + ldr r0, _0805D5C4 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4562,7 +4562,7 @@ sub_805D580: @ 805D580 b _0805D5DC .align 2, 0 _0805D5C0: .4byte gUnknown_835B91A -_0805D5C4: .4byte gUnknown_2037078 +_0805D5C4: .4byte gPlayerAvatar _0805D5C8: .4byte gSprites _0805D5CC: ldr r0, _0805D5E8 @ =gMain @@ -4594,7 +4594,7 @@ sub_805D5EC: @ 805D5EC mov r0, sp movs r2, 0xC bl memcpy - ldr r0, _0805D664 @ =gUnknown_2037078 + ldr r0, _0805D664 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4644,7 +4644,7 @@ _0805D654: bx r1 .align 2, 0 _0805D660: .4byte gUnknown_835B920 -_0805D664: .4byte gUnknown_2037078 +_0805D664: .4byte gPlayerAvatar _0805D668: .4byte gSprites thumb_func_end sub_805D5EC @@ -4653,7 +4653,7 @@ sub_805D66C: @ 805D66C push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r0, _0805D6BC @ =gUnknown_2037078 + ldr r0, _0805D6BC @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4687,7 +4687,7 @@ sub_805D66C: @ 805D66C pop {r1} bx r1 .align 2, 0 -_0805D6BC: .4byte gUnknown_2037078 +_0805D6BC: .4byte gPlayerAvatar _0805D6C0: .4byte gSprites _0805D6C4: .4byte gUnknown_841D14E thumb_func_end sub_805D66C @@ -4702,7 +4702,7 @@ sub_805D6C8: @ 805D6C8 ldrsh r0, [r5, r1] cmp r0, 0 bne _0805D6EA - ldr r0, _0805D774 @ =gUnknown_2037078 + ldr r0, _0805D774 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4722,7 +4722,7 @@ _0805D6EA: lsrs r6, r0, 16 cmp r6, 0 bne _0805D780 - ldr r7, _0805D774 @ =gUnknown_2037078 + ldr r7, _0805D774 @ =gPlayerAvatar ldrb r0, [r7, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -4775,7 +4775,7 @@ _0805D748: strh r0, [r5, 0xA] b _0805D7AA .align 2, 0 -_0805D774: .4byte gUnknown_2037078 +_0805D774: .4byte gPlayerAvatar _0805D778: .4byte gSprites _0805D77C: .4byte gMapObjects _0805D780: @@ -4784,7 +4784,7 @@ _0805D780: cmp r0, 0 beq _0805D7AA _0805D788: - ldr r1, _0805D7B8 @ =gUnknown_2037078 + ldr r1, _0805D7B8 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -4805,7 +4805,7 @@ _0805D7AA: pop {r1} bx r1 .align 2, 0 -_0805D7B8: .4byte gUnknown_2037078 +_0805D7B8: .4byte gPlayerAvatar _0805D7BC: .4byte sub_805D304 thumb_func_end sub_805D6C8 @@ -4814,7 +4814,7 @@ sub_805D7C0: @ 805D7C0 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r4, _0805D82C @ =gUnknown_2037078 + ldr r4, _0805D82C @ =gPlayerAvatar ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4860,7 +4860,7 @@ sub_805D7C0: @ 805D7C0 pop {r1} bx r1 .align 2, 0 -_0805D82C: .4byte gUnknown_2037078 +_0805D82C: .4byte gPlayerAvatar _0805D830: .4byte gSprites _0805D834: .4byte gUnknown_841D169 thumb_func_end sub_805D7C0 @@ -4870,7 +4870,7 @@ sub_805D838: @ 805D838 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r4, _0805D8A0 @ =gUnknown_2037078 + ldr r4, _0805D8A0 @ =gPlayerAvatar ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4914,7 +4914,7 @@ sub_805D838: @ 805D838 pop {r1} bx r1 .align 2, 0 -_0805D8A0: .4byte gUnknown_2037078 +_0805D8A0: .4byte gPlayerAvatar _0805D8A4: .4byte gSprites _0805D8A8: .4byte gUnknown_841D17E thumb_func_end sub_805D838 @@ -4923,7 +4923,7 @@ _0805D8A8: .4byte gUnknown_841D17E sub_805D8AC: @ 805D8AC push {r4,lr} adds r4, r0, 0 - ldr r0, _0805D8D0 @ =gUnknown_2037078 + ldr r0, _0805D8D0 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4939,7 +4939,7 @@ sub_805D8AC: @ 805D8AC pop {r1} bx r1 .align 2, 0 -_0805D8D0: .4byte gUnknown_2037078 +_0805D8D0: .4byte gPlayerAvatar _0805D8D4: .4byte gSprites thumb_func_end sub_805D8AC @@ -4949,7 +4949,7 @@ sub_805D8D8: @ 805D8D8 mov r7, r8 push {r7} adds r6, r0, 0 - ldr r5, _0805D974 @ =gUnknown_2037078 + ldr r5, _0805D974 @ =gPlayerAvatar ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -5022,7 +5022,7 @@ _0805D968: pop {r1} bx r1 .align 2, 0 -_0805D974: .4byte gUnknown_2037078 +_0805D974: .4byte gPlayerAvatar _0805D978: .4byte gSprites _0805D97C: .4byte gMapObjects thumb_func_end sub_805D8D8 @@ -5037,7 +5037,7 @@ sub_805D980: @ 805D980 lsrs r1, r0, 16 cmp r1, 0 bne _0805D9B6 - ldr r0, _0805D9BC @ =gUnknown_2037078 + ldr r0, _0805D9BC @ =gPlayerAvatar strb r1, [r0, 0x6] bl ScriptContext2_Disable bl UnfreezeMapObjects @@ -5054,7 +5054,7 @@ _0805D9B6: pop {r1} bx r1 .align 2, 0 -_0805D9BC: .4byte gUnknown_2037078 +_0805D9BC: .4byte gPlayerAvatar _0805D9C0: .4byte sub_805D304 thumb_func_end sub_805D980 @@ -5153,7 +5153,7 @@ _0805DA68: movs r0, 0x8 strh r0, [r4, 0x26] _0805DA78: - ldr r3, _0805DAA8 @ =gUnknown_2037078 + ldr r3, _0805DAA8 @ =gPlayerAvatar ldrb r1, [r3] movs r0, 0x8 ands r0, r1 @@ -5176,7 +5176,7 @@ _0805DA9C: bx r0 .align 2, 0 _0805DAA4: .4byte 0x0000fff8 -_0805DAA8: .4byte gUnknown_2037078 +_0805DAA8: .4byte gPlayerAvatar _0805DAAC: .4byte gMapObjects thumb_func_end sub_805D9C4 @@ -5242,7 +5242,7 @@ sub_805DB04: @ 805DB04 lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r0, _0805DB48 @ =gUnknown_2037078 + ldr r0, _0805DB48 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5270,7 +5270,7 @@ sub_805DB04: @ 805DB04 beq _0805DB5E b _0805DBFA .align 2, 0 -_0805DB48: .4byte gUnknown_2037078 +_0805DB48: .4byte gPlayerAvatar _0805DB4C: .4byte gMapObjects _0805DB50: .4byte gSprites _0805DB54: .4byte gTasks+0x8 @@ -5401,7 +5401,7 @@ sub_805DC38: @ 805DC38 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0805DC80 @ =gUnknown_2037078 + ldr r0, _0805DC80 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5430,7 +5430,7 @@ sub_805DC38: @ 805DC38 beq _0805DC9A b _0805DDBA .align 2, 0 -_0805DC80: .4byte gUnknown_2037078 +_0805DC80: .4byte gPlayerAvatar _0805DC84: .4byte gMapObjects _0805DC88: .4byte gSprites _0805DC8C: .4byte gTasks+0x8 |