diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-08-23 16:03:18 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-08-23 16:03:18 -0500 |
| commit | e9c3dfcd537a2acaa772011645340d7e26886423 (patch) | |
| tree | 4789a4a08e3324b2684214dbc3e7dcb326bc5fc4 /asm/code_080A5574.s | |
| parent | 6550bf3f044678db5f1e5fca2ff0dad37069016f (diff) | |
Dump and label room headers
Diffstat (limited to 'asm/code_080A5574.s')
| -rw-r--r-- | asm/code_080A5574.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index f609214a..ba695e1a 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -2632,7 +2632,7 @@ _080A6A26: bne _080A6A30 movs r2, #9 _080A6A30: - ldr r1, _080A6A40 @ =gAreas + ldr r1, _080A6A40 @ =gAreaRoomHeaders lsls r0, r2, #2 adds r0, r0, r1 ldr r0, [r0] @@ -2640,7 +2640,7 @@ _080A6A30: subs r6, r6, r0 b _080A6A48 .align 2, 0 -_080A6A40: .4byte gAreas +_080A6A40: .4byte gAreaRoomHeaders _080A6A44: ldr r0, _080A6A78 @ =0xFFFFFEF8 adds r7, r7, r0 @@ -3233,7 +3233,7 @@ sub_080A6EE0: @ 0x080A6EE0 adds r1, r1, r0 ldrh r3, [r1, #6] ldrh r4, [r1, #8] - ldr r0, _080A6F38 @ =gAreas + ldr r0, _080A6F38 @ =gAreaRoomHeaders ldrb r2, [r1, #0xb] lsls r2, r2, #2 adds r2, r2, r0 @@ -3267,7 +3267,7 @@ sub_080A6EE0: @ 0x080A6EE0 pop {r4, r5, r6, pc} .align 2, 0 _080A6F34: .4byte gUnk_08128024 -_080A6F38: .4byte gAreas +_080A6F38: .4byte gAreaRoomHeaders _080A6F3C: .4byte gUnk_03001010 thumb_func_start sub_080A6F40 |