diff options
| author | garak <garakmon@gmail.com> | 2019-04-14 22:45:38 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-05-05 16:33:50 -0400 |
| commit | f07d747e6184e8bf72ded4ae2788a1878fe5bbb6 (patch) | |
| tree | ee2ee7e2cf773c7e4273525c95b8994fa3b4e36c /asm | |
| parent | 5f49353de4df86401ec0c7844f08ec1db9587484 (diff) | |
split unused layout incbins, dump layouts table
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/overworld.s | 4 | ||||
| -rw-r--r-- | asm/teachy_tv.s | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 04386a645..e7121d398 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -722,7 +722,7 @@ get_mapdata_header: @ 8055170 .align 2, 0 _08055180: .4byte gSaveBlock1Ptr _08055184: - ldr r0, _08055194 @ =gUnknown_834EB8C + ldr r0, _08055194 @ =gMapLayouts subs r1, 0x1 lsls r1, 2 adds r1, r0 @@ -731,7 +731,7 @@ _0805518E: pop {r1} bx r1 .align 2, 0 -_08055194: .4byte gUnknown_834EB8C +_08055194: .4byte gMapLayouts thumb_func_end get_mapdata_header thumb_func_start warp_shift diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index b7875e7a9..56a3a78e8 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -2273,7 +2273,7 @@ sub_815BD80: @ 815BD80 str r0, [sp, 0x4] movs r0, 0 str r0, [sp, 0x10] - ldr r1, _0815BE1C @ =gUnknown_82E55CC + ldr r1, _0815BE1C @ =gMapData_82E55CC mov r8, r1 movs r0, 0x80 lsls r0, 4 @@ -2339,7 +2339,7 @@ _0815BDF0: ldrh r0, [r6] b _0815BE34 .align 2, 0 -_0815BE1C: .4byte gUnknown_82E55CC +_0815BE1C: .4byte gMapData_82E55CC _0815BE20: .4byte 0x000003ff _0815BE24: adds r0, r3, 0x1 |