diff options
Diffstat (limited to 'asm/field_player_avatar.s')
-rw-r--r-- | asm/field_player_avatar.s | 184 |
1 files changed, 92 insertions, 92 deletions
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 93a13f293..f0621961a 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -14,14 +14,14 @@ sub_805B3B8: @ 805B3B8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805B3D4 @ =gUnknown_2036E38 + ldr r2, _0805B3D4 @ =gMapObjects adds r0, r2 ldr r2, _0805B3D8 @ =sub_805B3DC bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0805B3D4: .4byte gUnknown_2036E38 +_0805B3D4: .4byte gMapObjects _0805B3D8: .4byte sub_805B3DC thumb_func_end sub_805B3B8 @@ -48,7 +48,7 @@ sub_805B3E0: @ 805B3E0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B458 @ =gUnknown_2036E38 + ldr r1, _0805B458 @ =gMapObjects adds r5, r0, r1 adds r0, r5, 0 bl sub_805CC40 @@ -85,7 +85,7 @@ _0805B448: bx r0 .align 2, 0 _0805B454: .4byte gUnknown_2037078 -_0805B458: .4byte gUnknown_2036E38 +_0805B458: .4byte gMapObjects thumb_func_end sub_805B3E0 thumb_func_start sub_805B45C @@ -222,7 +222,7 @@ sub_805B528: @ 805B528 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B594 @ =gUnknown_2036E38 + ldr r1, _0805B594 @ =gMapObjects adds r1, r0, r1 str r1, [r4] ldrb r0, [r1] @@ -254,7 +254,7 @@ _0805B586: .align 2, 0 _0805B58C: .4byte gUnknown_2037078 _0805B590: .4byte gUnknown_2036E30 -_0805B594: .4byte gUnknown_2036E38 +_0805B594: .4byte gMapObjects _0805B598: movs r0, 0 _0805B59A: @@ -273,7 +273,7 @@ sub_805B5A0: @ 805B5A0 ands r0, r1 cmp r0, 0 bne _0805B610 - ldr r2, _0805B5F8 @ =gUnknown_2036E38 + ldr r2, _0805B5F8 @ =gMapObjects ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -308,7 +308,7 @@ _0805B5CC: b _0805B628 .align 2, 0 _0805B5F4: .4byte gUnknown_2037078 -_0805B5F8: .4byte gUnknown_2036E38 +_0805B5F8: .4byte gMapObjects _0805B5FC: .4byte gUnknown_835B764 _0805B600: ldr r0, _0805B60C @ =gUnknown_2037078 @@ -362,7 +362,7 @@ ForcedMovement_None: @ 805B644 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B68C @ =gUnknown_2036E38 + ldr r1, _0805B68C @ =gMapObjects adds r0, r1 ldrb r2, [r0, 0x1] movs r1, 0x3 @@ -386,7 +386,7 @@ _0805B67E: bx r1 .align 2, 0 _0805B688: .4byte gUnknown_2037078 -_0805B68C: .4byte gUnknown_2036E38 +_0805B68C: .4byte gMapObjects thumb_func_end ForcedMovement_None thumb_func_start DoForcedMovement @@ -461,7 +461,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805B738 @ =gUnknown_2036E38 + ldr r2, _0805B738 @ =gMapObjects adds r0, r2 ldrb r2, [r0, 0x1] movs r3, 0x4 @@ -476,7 +476,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 bx r1 .align 2, 0 _0805B734: .4byte gUnknown_2037078 -_0805B738: .4byte gUnknown_2036E38 +_0805B738: .4byte gMapObjects thumb_func_end DoForcedMovementInCurrentDirection thumb_func_start ForcedMovement_Slip @@ -683,7 +683,7 @@ ForcedMovement_Slide: @ 805B88C lsls r2, r3, 3 adds r2, r3 lsls r2, 2 - ldr r3, _0805B8C0 @ =gUnknown_2036E38 + ldr r3, _0805B8C0 @ =gMapObjects adds r2, r3 ldrb r3, [r2, 0x1] movs r4, 0x4 @@ -699,7 +699,7 @@ ForcedMovement_Slide: @ 805B88C bx r1 .align 2, 0 _0805B8BC: .4byte gUnknown_2037078 -_0805B8C0: .4byte gUnknown_2036E38 +_0805B8C0: .4byte gMapObjects thumb_func_end ForcedMovement_Slide thumb_func_start ForcedMovement_SlideSouth @@ -919,7 +919,7 @@ _0805BA30: lsls r0, 24 cmp r0, 0 beq _0805BA8C - ldr r2, _0805BA70 @ =gUnknown_2036E38 + ldr r2, _0805BA70 @ =gMapObjects ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -938,7 +938,7 @@ _0805BA30: b _0805BA7A .align 2, 0 _0805BA6C: .4byte 0x0000082f -_0805BA70: .4byte gUnknown_2036E38 +_0805BA70: .4byte gMapObjects _0805BA74: adds r0, r4, 0 bl sub_805C17C @@ -979,7 +979,7 @@ sub_805BAAC: @ 805BAAC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BAE8 @ =gUnknown_2036E38 + ldr r1, _0805BAE8 @ =gMapObjects adds r0, r1 ldrh r2, [r0, 0x10] mov r1, sp @@ -1000,7 +1000,7 @@ sub_805BAAC: @ 805BAAC b _0805BB00 .align 2, 0 _0805BAE4: .4byte gUnknown_2037078 -_0805BAE8: .4byte gUnknown_2036E38 +_0805BAE8: .4byte gMapObjects _0805BAEC: movs r0, 0x1 mov r1, sp @@ -1039,7 +1039,7 @@ sub_805BB1C: @ 805BB1C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BB98 @ =gUnknown_2036E38 + ldr r1, _0805BB98 @ =gMapObjects adds r5, r0, r1 ldrh r1, [r5, 0x10] add r0, sp, 0x4 @@ -1086,7 +1086,7 @@ sub_805BB1C: @ 805BB1C b _0805BB9E .align 2, 0 _0805BB94: .4byte gUnknown_2037078 -_0805BB98: .4byte gUnknown_2036E38 +_0805BB98: .4byte gMapObjects _0805BB9C: movs r0, 0x8 _0805BB9E: @@ -1291,7 +1291,7 @@ sub_805BCEC: @ 805BCEC lsrs r6, r0, 24 cmp r6, 0x10 beq _0805BDA0 - ldr r0, _0805BD9C @ =gUnknown_2036E38 + ldr r0, _0805BD9C @ =gMapObjects lsls r1, r6, 3 adds r1, r6 lsls r1, 2 @@ -1347,7 +1347,7 @@ _0805BD8A: b _0805BDA2 .align 2, 0 _0805BD98: .4byte 0x00000805 -_0805BD9C: .4byte gUnknown_2036E38 +_0805BD9C: .4byte gMapObjects _0805BDA0: movs r0, 0 _0805BDA2: @@ -1431,7 +1431,7 @@ _0805BE14: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BE58 @ =gUnknown_2036E38 + ldr r1, _0805BE58 @ =gMapObjects adds r0, r1 ldr r1, [r2] bl _call_via_r1 @@ -1452,7 +1452,7 @@ _0805BE48: .align 2, 0 _0805BE50: .4byte gUnknown_2037078 _0805BE54: .4byte gUnknown_835B844 -_0805BE58: .4byte gUnknown_2036E38 +_0805BE58: .4byte gMapObjects thumb_func_end DoPlayerAvatarTransition thumb_func_start nullsub_22 @@ -1552,7 +1552,7 @@ _0805BEF6: thumb_func_start player_is_anim_in_certain_ranges player_is_anim_in_certain_ranges: @ 805BEFC push {lr} - ldr r2, _0805BF48 @ =gUnknown_2036E38 + ldr r2, _0805BF48 @ =gMapObjects ldr r0, _0805BF4C @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -1590,7 +1590,7 @@ _0805BF42: movs r0, 0x1 b _0805BF52 .align 2, 0 -_0805BF48: .4byte gUnknown_2036E38 +_0805BF48: .4byte gMapObjects _0805BF4C: .4byte gUnknown_2037078 _0805BF50: movs r0, 0 @@ -1629,7 +1629,7 @@ PlayerIsAnimActive: @ 805BF7C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BF9C @ =gUnknown_2036E38 + ldr r1, _0805BF9C @ =gMapObjects adds r0, r1 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 @@ -1638,7 +1638,7 @@ PlayerIsAnimActive: @ 805BF7C bx r1 .align 2, 0 _0805BF98: .4byte gUnknown_2037078 -_0805BF9C: .4byte gUnknown_2036E38 +_0805BF9C: .4byte gMapObjects thumb_func_end PlayerIsAnimActive thumb_func_start PlayerCheckIfAnimFinishedOrInactive @@ -1649,7 +1649,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BFC0 @ =gUnknown_2036E38 + ldr r1, _0805BFC0 @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -1658,12 +1658,12 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 bx r1 .align 2, 0 _0805BFBC: .4byte gUnknown_2037078 -_0805BFC0: .4byte gUnknown_2036E38 +_0805BFC0: .4byte gMapObjects thumb_func_end PlayerCheckIfAnimFinishedOrInactive thumb_func_start player_set_x22 player_set_x22: @ 805BFC4 - ldr r3, _0805BFD8 @ =gUnknown_2036E38 + ldr r3, _0805BFD8 @ =gMapObjects ldr r1, _0805BFDC @ =gUnknown_2037078 ldrb r2, [r1, 0x5] lsls r1, r2, 3 @@ -1674,13 +1674,13 @@ player_set_x22: @ 805BFC4 strb r0, [r1] bx lr .align 2, 0 -_0805BFD8: .4byte gUnknown_2036E38 +_0805BFD8: .4byte gMapObjects _0805BFDC: .4byte gUnknown_2037078 thumb_func_end player_set_x22 thumb_func_start player_get_x22 player_get_x22: @ 805BFE0 - ldr r2, _0805BFF4 @ =gUnknown_2036E38 + ldr r2, _0805BFF4 @ =gMapObjects ldr r0, _0805BFF8 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -1691,7 +1691,7 @@ player_get_x22: @ 805BFE0 ldrb r0, [r0] bx lr .align 2, 0 -_0805BFF4: .4byte gUnknown_2036E38 +_0805BFF4: .4byte gMapObjects _0805BFF8: .4byte gUnknown_2037078 thumb_func_end player_get_x22 @@ -1706,14 +1706,14 @@ sub_805BFFC: @ 805BFFC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805C020 @ =gUnknown_2036E38 + ldr r2, _0805C020 @ =gMapObjects adds r0, r2 bl FieldObjectForceSetSpecialAnim pop {r0} bx r0 .align 2, 0 _0805C01C: .4byte gUnknown_2037078 -_0805C020: .4byte gUnknown_2036E38 +_0805C020: .4byte gMapObjects thumb_func_end sub_805BFFC thumb_func_start sub_805C024 @@ -1734,7 +1734,7 @@ sub_805C024: @ 805C024 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C068 @ =gUnknown_2036E38 + ldr r1, _0805C068 @ =gMapObjects adds r0, r1 adds r1, r5, 0 bl sub_8063CA4 @@ -1749,7 +1749,7 @@ _0805C05E: bx r0 .align 2, 0 _0805C064: .4byte gUnknown_2037078 -_0805C068: .4byte gUnknown_2036E38 +_0805C068: .4byte gMapObjects thumb_func_end sub_805C024 thumb_func_start sub_805C06C @@ -1762,7 +1762,7 @@ sub_805C06C: @ 805C06C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C0A0 @ =gUnknown_2036E38 + ldr r1, _0805C0A0 @ =gMapObjects adds r0, r1 adds r1, r4, 0 bl sub_8063CA4 @@ -1778,7 +1778,7 @@ _0805C094: bx r0 .align 2, 0 _0805C09C: .4byte gUnknown_2037078 -_0805C0A0: .4byte gUnknown_2036E38 +_0805C0A0: .4byte gMapObjects thumb_func_end sub_805C06C thumb_func_start sub_805C0A4 @@ -2056,7 +2056,7 @@ _0805C27E: lsls r0, 24 cmp r0, 0 beq _0805C2A6 - ldr r2, _0805C2B0 @ =gUnknown_2036E38 + ldr r2, _0805C2B0 @ =gMapObjects ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2075,7 +2075,7 @@ _0805C2A6: bx r0 .align 2, 0 _0805C2AC: .4byte gUnknown_2037078 -_0805C2B0: .4byte gUnknown_2036E38 +_0805C2B0: .4byte gMapObjects thumb_func_end sub_805C270 thumb_func_start sub_805C2B4 @@ -2301,7 +2301,7 @@ sub_805C438: @ 805C438 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r2, _0805C4E8 @ =gUnknown_2036E38 + ldr r2, _0805C4E8 @ =gMapObjects ldr r0, _0805C4EC @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2378,7 +2378,7 @@ _0805C4DE: pop {r0} bx r0 .align 2, 0 -_0805C4E8: .4byte gUnknown_2036E38 +_0805C4E8: .4byte gMapObjects _0805C4EC: .4byte gUnknown_2037078 _0805C4F0: .4byte gUnknown_835B864 thumb_func_end sub_805C438 @@ -2388,7 +2388,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r3, _0805C530 @ =gUnknown_2036E38 + ldr r3, _0805C530 @ =gMapObjects ldr r2, _0805C534 @ =gUnknown_2037078 ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -2414,14 +2414,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 pop {r0} bx r0 .align 2, 0 -_0805C530: .4byte gUnknown_2036E38 +_0805C530: .4byte gMapObjects _0805C534: .4byte gUnknown_2037078 thumb_func_end GetXYCoordsOneStepInFrontOfPlayer thumb_func_start PlayerGetDestCoords PlayerGetDestCoords: @ 805C538 push {r4,r5,lr} - ldr r5, _0805C560 @ =gUnknown_2036E38 + ldr r5, _0805C560 @ =gMapObjects ldr r4, _0805C564 @ =gUnknown_2037078 ldrb r3, [r4, 0x5] lsls r2, r3, 3 @@ -2441,7 +2441,7 @@ PlayerGetDestCoords: @ 805C538 pop {r0} bx r0 .align 2, 0 -_0805C560: .4byte gUnknown_2036E38 +_0805C560: .4byte gMapObjects _0805C564: .4byte gUnknown_2037078 thumb_func_end PlayerGetDestCoords @@ -2455,7 +2455,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C5C0 @ =gUnknown_2036E38 + ldr r1, _0805C5C0 @ =gMapObjects adds r3, r0, r1 ldrb r1, [r3] movs r0, 0xC0 @@ -2493,7 +2493,7 @@ _0805C5B0: mov pc, r0 .align 2, 0 _0805C5BC: .4byte gUnknown_2037078 -_0805C5C0: .4byte gUnknown_2036E38 +_0805C5C0: .4byte gMapObjects _0805C5C4: .4byte gSprites _0805C5C8: .4byte _0805C5CC .align 2, 0 @@ -2584,7 +2584,7 @@ _0805C6BC: thumb_func_start player_get_direction_lower_nybble player_get_direction_lower_nybble: @ 805C6C4 - ldr r2, _0805C6DC @ =gUnknown_2036E38 + ldr r2, _0805C6DC @ =gMapObjects ldr r0, _0805C6E0 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2596,13 +2596,13 @@ player_get_direction_lower_nybble: @ 805C6C4 lsrs r0, 28 bx lr .align 2, 0 -_0805C6DC: .4byte gUnknown_2036E38 +_0805C6DC: .4byte gMapObjects _0805C6E0: .4byte gUnknown_2037078 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 @ =gUnknown_2036E38 + ldr r2, _0805C6F8 @ =gMapObjects ldr r0, _0805C6FC @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2613,13 +2613,13 @@ player_get_direction_upper_nybble: @ 805C6E4 lsrs r0, 4 bx lr .align 2, 0 -_0805C6F8: .4byte gUnknown_2036E38 +_0805C6F8: .4byte gMapObjects _0805C6FC: .4byte gUnknown_2037078 thumb_func_end player_get_direction_upper_nybble thumb_func_start PlayerGetZCoord PlayerGetZCoord: @ 805C700 - ldr r2, _0805C714 @ =gUnknown_2036E38 + ldr r2, _0805C714 @ =gMapObjects ldr r0, _0805C718 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2630,7 +2630,7 @@ PlayerGetZCoord: @ 805C700 lsrs r0, 4 bx lr .align 2, 0 -_0805C714: .4byte gUnknown_2036E38 +_0805C714: .4byte gMapObjects _0805C718: .4byte gUnknown_2037078 thumb_func_end PlayerGetZCoord @@ -2644,7 +2644,7 @@ sub_805C71C: @ 805C71C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C748 @ =gUnknown_2036E38 + ldr r1, _0805C748 @ =gMapObjects adds r0, r1 lsls r3, 16 asrs r3, 16 @@ -2656,7 +2656,7 @@ sub_805C71C: @ 805C71C bx r0 .align 2, 0 _0805C744: .4byte gUnknown_2037078 -_0805C748: .4byte gUnknown_2036E38 +_0805C748: .4byte gMapObjects thumb_func_end sub_805C71C thumb_func_start TestPlayerAvatarFlags @@ -2704,7 +2704,7 @@ sub_805C780: @ 805C780 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805C7C4 @ =gUnknown_2036E38 + ldr r0, _0805C7C4 @ =gMapObjects adds r4, r0 adds r0, r4, 0 bl npc_clear_strange_bits @@ -2727,7 +2727,7 @@ _0805C7B8: bx r0 .align 2, 0 _0805C7C0: .4byte gUnknown_2037078 -_0805C7C4: .4byte gUnknown_2036E38 +_0805C7C4: .4byte gMapObjects thumb_func_end sub_805C780 thumb_func_start sub_805C7C8 @@ -2882,7 +2882,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805C928 @ =gUnknown_2036E38 + ldr r0, _0805C928 @ =gMapObjects adds r4, r0 ldrh r1, [r4, 0x10] mov r0, sp @@ -2930,7 +2930,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 b _0805C92E .align 2, 0 _0805C924: .4byte gUnknown_2037078 -_0805C928: .4byte gUnknown_2036E38 +_0805C928: .4byte gMapObjects _0805C92C: movs r0, 0 _0805C92E: @@ -3152,7 +3152,7 @@ InitPlayerAvatar: @ 805CA3C lsls r4, r5, 3 adds r4, r5 lsls r4, 2 - ldr r0, _0805CAFC @ =gUnknown_2036E38 + ldr r0, _0805CAFC @ =gMapObjects adds r4, r0 ldrb r0, [r4, 0x2] movs r1, 0x1 @@ -3182,7 +3182,7 @@ InitPlayerAvatar: @ 805CA3C pop {r0} bx r0 .align 2, 0 -_0805CAFC: .4byte gUnknown_2036E38 +_0805CAFC: .4byte gMapObjects _0805CB00: .4byte gUnknown_2037078 thumb_func_end InitPlayerAvatar @@ -3191,7 +3191,7 @@ sub_805CB04: @ 805CB04 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _0805CB64 @ =gUnknown_2036E38 + ldr r6, _0805CB64 @ =gMapObjects ldr r5, _0805CB68 @ =gUnknown_2037078 ldrb r0, [r5, 0x5] lsls r1, r0, 3 @@ -3236,7 +3236,7 @@ _0805CB5C: pop {r0} bx r0 .align 2, 0 -_0805CB64: .4byte gUnknown_2036E38 +_0805CB64: .4byte gMapObjects _0805CB68: .4byte gUnknown_2037078 _0805CB6C: .4byte gSprites thumb_func_end sub_805CB04 @@ -3249,7 +3249,7 @@ sub_805CB70: @ 805CB70 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805CBB0 @ =gUnknown_2036E38 + ldr r0, _0805CBB0 @ =gMapObjects adds r4, r0 movs r0, 0x3 bl sub_805C808 @@ -3271,7 +3271,7 @@ sub_805CB70: @ 805CB70 bx r0 .align 2, 0 _0805CBAC: .4byte gUnknown_2037078 -_0805CBB0: .4byte gUnknown_2036E38 +_0805CBB0: .4byte gMapObjects _0805CBB4: .4byte gSprites thumb_func_end sub_805CB70 @@ -3311,7 +3311,7 @@ sub_805CBE8: @ 805CBE8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805CC24 @ =gUnknown_2036E38 + ldr r0, _0805CC24 @ =gMapObjects adds r4, r0 bl sub_805CBB8 adds r1, r0, 0 @@ -3332,7 +3332,7 @@ sub_805CBE8: @ 805CBE8 bx r0 .align 2, 0 _0805CC20: .4byte gUnknown_2037078 -_0805CC24: .4byte gUnknown_2036E38 +_0805CC24: .4byte gMapObjects _0805CC28: .4byte gSprites thumb_func_end sub_805CBE8 @@ -3468,7 +3468,7 @@ taskFF_bump_boulder: @ 805CD0C lsrs r0, 24 ldr r6, _0805CD54 @ =gUnknown_835B8A0 ldr r2, _0805CD58 @ =gTasks - ldr r5, _0805CD5C @ =gUnknown_2036E38 + ldr r5, _0805CD5C @ =gMapObjects lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3502,7 +3502,7 @@ _0805CD20: .align 2, 0 _0805CD54: .4byte gUnknown_835B8A0 _0805CD58: .4byte gTasks -_0805CD5C: .4byte gUnknown_2036E38 +_0805CD5C: .4byte gMapObjects _0805CD60: .4byte gUnknown_2037078 thumb_func_end taskFF_bump_boulder @@ -3677,7 +3677,7 @@ _0805CEB2: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805CEE8 @ =gUnknown_2036E38 + ldr r0, _0805CEE8 @ =gMapObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3692,7 +3692,7 @@ _0805CEB2: _0805CEDC: .4byte gUnknown_835B8AC _0805CEE0: .4byte gTasks _0805CEE4: .4byte gUnknown_2037078 -_0805CEE8: .4byte gUnknown_2036E38 +_0805CEE8: .4byte gMapObjects thumb_func_end sub_805CEA0 thumb_func_start PlayerAvatar_DoSecretBaseMatJump @@ -3785,7 +3785,7 @@ _0805CF8A: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805CFC0 @ =gUnknown_2036E38 + ldr r0, _0805CFC0 @ =gMapObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3800,7 +3800,7 @@ _0805CF8A: _0805CFB4: .4byte gUnknown_835B8B0 _0805CFB8: .4byte gTasks _0805CFBC: .4byte gUnknown_2037078 -_0805CFC0: .4byte gUnknown_2036E38 +_0805CFC0: .4byte gMapObjects thumb_func_end sub_805CF78 thumb_func_start sub_805CFC4 @@ -4070,7 +4070,7 @@ taskFF_0805D1D4: @ 805D1D4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805D234 @ =gUnknown_2036E38 + ldr r1, _0805D234 @ =gMapObjects adds r5, r0, r1 adds r0, r5, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -4106,7 +4106,7 @@ _0805D228: bx r0 .align 2, 0 _0805D230: .4byte gUnknown_2037078 -_0805D234: .4byte gUnknown_2036E38 +_0805D234: .4byte gMapObjects _0805D238: .4byte gTasks _0805D23C: .4byte sub_805D240 thumb_func_end taskFF_0805D1D4 @@ -4121,7 +4121,7 @@ sub_805D240: @ 805D240 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805D2B8 @ =gUnknown_2036E38 + ldr r1, _0805D2B8 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -4164,7 +4164,7 @@ _0805D2AE: bx r0 .align 2, 0 _0805D2B4: .4byte gUnknown_2037078 -_0805D2B8: .4byte gUnknown_2036E38 +_0805D2B8: .4byte gMapObjects _0805D2BC: .4byte gSprites thumb_func_end sub_805D240 @@ -4281,7 +4281,7 @@ fish1: @ 805D35C ldrh r1, [r6] adds r1, r0 strh r1, [r5, 0x22] - ldr r3, _0805D3EC @ =gUnknown_2036E38 + ldr r3, _0805D3EC @ =gMapObjects ldr r2, _0805D3F0 @ =gUnknown_2037078 ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -4316,7 +4316,7 @@ fish1: @ 805D35C .align 2, 0 _0805D3E4: .4byte gUnknown_835B90C _0805D3E8: .4byte gUnknown_835B912 -_0805D3EC: .4byte gUnknown_2036E38 +_0805D3EC: .4byte gMapObjects _0805D3F0: .4byte gUnknown_2037078 thumb_func_end fish1 @@ -4727,7 +4727,7 @@ _0805D6EA: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805D77C @ =gUnknown_2036E38 + ldr r0, _0805D77C @ =gMapObjects mov r8, r0 add r4, r8 ldrh r1, [r5, 0x24] @@ -4777,7 +4777,7 @@ _0805D748: .align 2, 0 _0805D774: .4byte gUnknown_2037078 _0805D778: .4byte gSprites -_0805D77C: .4byte gUnknown_2036E38 +_0805D77C: .4byte gMapObjects _0805D780: movs r1, 0xA ldrsh r0, [r5, r1] @@ -4971,7 +4971,7 @@ sub_805D8D8: @ 805D8D8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805D97C @ =gUnknown_2036E38 + ldr r0, _0805D97C @ =gMapObjects mov r8, r0 add r4, r8 ldrh r1, [r6, 0x24] @@ -5024,7 +5024,7 @@ _0805D968: .align 2, 0 _0805D974: .4byte gUnknown_2037078 _0805D978: .4byte gSprites -_0805D97C: .4byte gUnknown_2036E38 +_0805D97C: .4byte gMapObjects thumb_func_end sub_805D8D8 thumb_func_start sub_805D980 @@ -5159,7 +5159,7 @@ _0805DA78: ands r0, r1 cmp r0, 0 beq _0805DA9C - ldr r2, _0805DAAC @ =gUnknown_2036E38 + ldr r2, _0805DAAC @ =gMapObjects ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5177,7 +5177,7 @@ _0805DA9C: .align 2, 0 _0805DAA4: .4byte 0x0000fff8 _0805DAA8: .4byte gUnknown_2037078 -_0805DAAC: .4byte gUnknown_2036E38 +_0805DAAC: .4byte gMapObjects thumb_func_end sub_805D9C4 thumb_func_start sub_805DAB0 @@ -5247,7 +5247,7 @@ sub_805DB04: @ 805DB04 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805DB4C @ =gUnknown_2036E38 + ldr r1, _0805DB4C @ =gMapObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5271,7 +5271,7 @@ sub_805DB04: @ 805DB04 b _0805DBFA .align 2, 0 _0805DB48: .4byte gUnknown_2037078 -_0805DB4C: .4byte gUnknown_2036E38 +_0805DB4C: .4byte gMapObjects _0805DB50: .4byte gSprites _0805DB54: .4byte gTasks+0x8 _0805DB58: @@ -5406,7 +5406,7 @@ sub_805DC38: @ 805DC38 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805DC84 @ =gUnknown_2036E38 + ldr r1, _0805DC84 @ =gMapObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5431,7 +5431,7 @@ sub_805DC38: @ 805DC38 b _0805DDBA .align 2, 0 _0805DC80: .4byte gUnknown_2037078 -_0805DC84: .4byte gUnknown_2036E38 +_0805DC84: .4byte gMapObjects _0805DC88: .4byte gSprites _0805DC8C: .4byte gTasks+0x8 _0805DC90: |