diff options
Diffstat (limited to 'asm/rom4.s')
| -rw-r--r-- | asm/rom4.s | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 2b38b65ff..0accffe2f 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -278,7 +278,7 @@ CopyFieldObjectTemplatesToSav1: @ 8084894 ldr r2, =0x05000180 mov r0, sp bl CpuSet - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r2, [r0, 0x4] ldr r0, [r2, 0x4] ldr r1, [r5] @@ -302,7 +302,7 @@ CopyFieldObjectTemplatesToSav1: @ 8084894 @ void CopyFieldObjectTemplateCoordsToSav1() CopyFieldObjectTemplateCoordsToSav1: @ 80848E0 push {lr} - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r1, [r0, 0x4] ldr r0, =gSaveBlock1Ptr ldr r0, [r0] @@ -393,7 +393,7 @@ _08084978: mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980 push {r4,lr} bl move_tilemap_camera_to_upper_left_corner - ldr r4, =gUnknown_02037318 + ldr r4, =gMapHeader ldr r0, [r4] bl copy_map_tileset1_tileset2_to_vram ldr r0, [r4] @@ -571,7 +571,7 @@ warp1_get_mapheader: @ 8084AA8 set_current_map_header_from_sav1_save_old_name: @ 8084ACC push {r4-r6,lr} ldr r1, =gUnknown_020322FC - ldr r4, =gUnknown_02037318 + ldr r4, =gMapHeader ldrb r0, [r4, 0x14] strh r0, [r1] ldr r5, =gSaveBlock1Ptr @@ -607,7 +607,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8084ACC thumb_func_start set_current_map_header_from_sav1 set_current_map_header_from_sav1: @ 8084B1C push {r4,r5,lr} - ldr r4, =gUnknown_02037318 + ldr r4, =gMapHeader ldr r0, =gSaveBlock1Ptr ldr r1, [r0] movs r0, 0x4 @@ -646,7 +646,7 @@ update_camera_pos_from_warpid: @ 8084B5C adds r4, r0, 0 cmp r1, 0 blt _08084B94 - ldr r3, =gUnknown_02037318 + ldr r3, =gMapHeader ldr r0, [r3, 0x4] ldrb r5, [r0, 0x1] cmp r1, r5 @@ -680,7 +680,7 @@ _08084B94: b _08084BCC _08084BB0: ldr r3, [r4] - ldr r2, =gUnknown_02037318 + ldr r2, =gMapHeader ldr r0, [r2] ldr r0, [r0] lsrs r1, r0, 31 @@ -1232,7 +1232,7 @@ sub_8084FC0: @ 8084FC0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0, 0xC] ldr r3, [r0] ldr r1, [r0, 0x4] @@ -1366,7 +1366,7 @@ mliX_load_map: @ 8085098 str r3, [sp] adds r2, r3, 0 bl warp1_set - ldr r4, =gUnknown_02037318 + ldr r4, =gMapHeader ldrb r0, [r4, 0x14] cmp r0, 0x3A beq _080850C8 @@ -1407,7 +1407,7 @@ _08085116: bl sub_80AEE20 bl wild_encounter_reset_coro_args bl mapheader_run_script_with_tag_x5 - ldr r2, =gUnknown_02037318 + ldr r2, =gMapHeader ldrb r0, [r2, 0x14] cmp r0, 0x3A bne _0808514C @@ -1436,7 +1436,7 @@ mli0_load_map: @ 8085160 ands r0, r1 cmp r0, 0 bne _080851A2 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 @@ -1453,7 +1453,7 @@ _08085190: _0808519E: bl CopyFieldObjectTemplatesToSav1 _080851A2: - ldr r4, =gUnknown_02037318 + ldr r4, =gMapHeader ldrb r0, [r4, 0x17] bl is_light_level_1_2_3_5_or_6 lsls r0, 24 @@ -1802,7 +1802,7 @@ cur_mapdata_block_role_at_screen_center_acc_to_sav1: @ 8085450 thumb_func_start sav1_map_is_biking_allowed sav1_map_is_biking_allowed: @ 8085474 push {lr} - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldrb r1, [r0, 0x1A] movs r0, 0x1 ands r0, r1 @@ -1821,7 +1821,7 @@ _0808548E: thumb_func_start update_sav1_flash_used_on_map update_sav1_flash_used_on_map: @ 8085494 push {lr} - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldrb r1, [r0, 0x15] cmp r1, 0 bne _080854B0 @@ -1897,7 +1897,7 @@ sub_8085524: @ 8085524 ldr r1, [r1] strh r0, [r1, 0x32] bl get_mapdata_header - ldr r1, =gUnknown_02037318 + ldr r1, =gMapHeader str r0, [r1] pop {r0} bx r0 @@ -3471,7 +3471,7 @@ sub_80861E8: @ 80861E8 thumb_func_start sub_8086204 sub_8086204: @ 8086204 push {lr} - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldrb r1, [r0, 0x1A] movs r0, 0xF8 ands r0, r1 @@ -3507,7 +3507,7 @@ _0808624A: bl GetCurrentTrainerHillMapId lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 @@ -3528,7 +3528,7 @@ _0808628A: bl sub_809757C bl sub_809E7B0 bl sub_8084788 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 @@ -3739,13 +3739,13 @@ _08086492: bl move_tilemap_camera_to_upper_left_corner b _08086506 _08086498: - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl copy_map_tileset1_to_vram b _08086506 .pool _080864A8: - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl copy_map_tileset2_to_vram b _08086506 @@ -3756,7 +3756,7 @@ _080864B8: lsrs r0, 24 cmp r0, 0x1 beq _08086512 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl apply_map_tileset1_tileset2_palette b _08086506 @@ -3858,13 +3858,13 @@ _080865A6: bl move_tilemap_camera_to_upper_left_corner b _08086622 _080865AC: - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl copy_map_tileset1_to_vram b _08086622 .pool _080865BC: - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl copy_map_tileset2_to_vram b _08086622 @@ -3875,7 +3875,7 @@ _080865CC: lsrs r0, 24 cmp r0, 0x1 beq _0808662E - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl apply_map_tileset1_tileset2_palette b _08086622 @@ -3887,7 +3887,7 @@ _080865EE: bl cur_mapheader_run_tileset_funcs_after_some_cpuset b _08086622 _080865F4: - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldrb r1, [r0, 0x1A] movs r0, 0xF8 ands r0, r1 @@ -4027,13 +4027,13 @@ _0808671E: bl move_tilemap_camera_to_upper_left_corner b _08086792 _08086724: - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl copy_map_tileset1_to_vram b _08086792 .pool _08086734: - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl copy_map_tileset2_to_vram b _08086792 @@ -4044,7 +4044,7 @@ _08086744: lsrs r0, 24 cmp r0, 0x1 beq _080867A8 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] bl apply_map_tileset1_tileset2_palette b _08086792 |