diff options
Diffstat (limited to 'asm/fieldmap.s')
| -rw-r--r-- | asm/fieldmap.s | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/asm/fieldmap.s b/asm/fieldmap.s index 312ac290a..730289ed5 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -876,7 +876,7 @@ save_serialize_map: @ 80883C4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] adds r4, r1, 0 adds r4, 0x34 @@ -936,7 +936,7 @@ sub_8088438: @ 8088438 push {r4,lr} movs r2, 0 movs r1, 0 - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r0, [r0] adds r3, r0, 0 adds r3, 0x34 @@ -971,7 +971,7 @@ sav2_mapdata_clear: @ 8088474 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] adds r1, 0x34 ldr r2, =0x01000100 @@ -991,7 +991,7 @@ mapdata_from_sav2: @ 808849C mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r4, =gUnknown_03005D8C + ldr r4, =gSaveBlock1Ptr ldr r0, [r4] adds r7, r0, 0 adds r7, 0x34 @@ -1147,7 +1147,7 @@ sub_80885C4: @ 80885C4 lsls r0, 24 lsrs r3, r0, 24 adds r2, r3, 0 - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] adds r0, r1, 0 adds r0, 0x34 @@ -1373,7 +1373,7 @@ _08088782: GetPostCameraMoveMapBorderId: @ 8088788 push {r4,lr} adds r3, r1, 0 - ldr r1, =gUnknown_03005D8C + ldr r1, =gSaveBlock1Ptr ldr r1, [r1] movs r4, 0 ldrsh r2, [r1, r4] @@ -1395,7 +1395,7 @@ GetPostCameraMoveMapBorderId: @ 8088788 @ bool32 CanCameraMoveInDirection(u8 direction) CanCameraMoveInDirection: @ 80887B0 push {r4,r5,lr} - ldr r1, =gUnknown_03005D8C + ldr r1, =gSaveBlock1Ptr ldr r4, [r1] movs r1, 0 ldrsh r3, [r4, r1] @@ -1450,7 +1450,7 @@ _08088816: beq _08088834 cmp r4, 0x4 bne _08088872 - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] negs r0, r6 strh r0, [r1] @@ -1460,7 +1460,7 @@ _08088816: b _08088870 .pool _08088834: - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] ldr r0, [r3] ldr r0, [r0] @@ -1471,7 +1471,7 @@ _08088834: b _08088870 .pool _0808884C: - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] ldr r2, [r5, 0x4] ldrh r0, [r1] @@ -1481,7 +1481,7 @@ _0808884C: b _08088870 .pool _08088860: - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] ldr r2, [r5, 0x4] ldrh r0, [r1] @@ -1522,7 +1522,7 @@ CameraMove: @ 808887C adds r0, r7, 0x1 cmp r0, 0x1 bhi _080888C4 - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] ldrh r0, [r1] add r0, r10 @@ -1535,7 +1535,7 @@ CameraMove: @ 808887C _080888C4: bl save_serialize_map bl sub_81BE72C - ldr r1, =gUnknown_03005D8C + ldr r1, =gSaveBlock1Ptr ldr r0, [r1] movs r2, 0 ldrsh r5, [r0, r2] @@ -1562,7 +1562,7 @@ _080888C4: orrs r0, r1 ldr r2, =gUnknown_02037334 strb r0, [r2] - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r1, [r0] movs r2, 0 ldrsh r0, [r1, r2] @@ -1884,7 +1884,7 @@ sub_8088B3C: @ 8088B3C lsrs r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r2, =gUnknown_03005D8C + ldr r2, =gSaveBlock1Ptr ldr r2, [r2] subs r0, 0x7 strh r0, [r2] @@ -1896,7 +1896,7 @@ sub_8088B3C: @ 8088B3C thumb_func_start sav1_camera_get_focus_coords sav1_camera_get_focus_coords: @ 8088B58 - ldr r2, =gUnknown_03005D8C + ldr r2, =gSaveBlock1Ptr ldr r3, [r2] ldrh r2, [r3] adds r2, 0x7 @@ -1911,7 +1911,7 @@ sav1_camera_get_focus_coords: @ 8088B58 thumb_func_start SetCameraCoords @ void SetCameraCoords(u16 x, u16 y) SetCameraCoords: @ 8088B70 - ldr r2, =gUnknown_03005D8C + ldr r2, =gSaveBlock1Ptr ldr r2, [r2] strh r0, [r2] strh r1, [r2, 0x2] @@ -1922,7 +1922,7 @@ SetCameraCoords: @ 8088B70 thumb_func_start GetCameraCoords @ void GetCameraCoords(u16 *x, u16 *y) GetCameraCoords: @ 8088B80 - ldr r2, =gUnknown_03005D8C + ldr r2, =gSaveBlock1Ptr ldr r3, [r2] ldrh r2, [r3] strh r2, [r0] |