summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorYamaArashi <YamaArashi@users.noreply.github.com>2016-09-08 22:26:24 -0700
committerGitHub <noreply@github.com>2016-09-08 22:26:24 -0700
commit65a978e4f71f347894458ee1d1282af2668585cf (patch)
treee6467e8f7cec95b8ca5e10f0ae2c0d0bea7ae67d /asm
parent06bed8be90c865057378482f2b179749b082619c (diff)
parent5080b9083c70d12528015678940af9b3c61a7faa (diff)
Merge pull request #42 from yenatch/more-map-splits
Split out groups of includes related to maps.
Diffstat (limited to 'asm')
-rw-r--r--asm/rom4.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/rom4.s b/asm/rom4.s
index 549c2b446..608df2e11 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -677,7 +677,7 @@ _08053266:
pop {r1}
bx r1
.align 2, 0
-_0805326C: .4byte gUnknown_08304F18
+_0805326C: .4byte gMapAttributes
thumb_func_end get_mapdata_header
thumb_func_start warp_shift
@@ -779,7 +779,7 @@ get_mapheader_by_bank_and_number: @ 8053310
ldr r0, [r1]
bx lr
.align 2, 0
-_08053324: .4byte gUnknown_08308588
+_08053324: .4byte gMapGroups
thumb_func_end get_mapheader_by_bank_and_number
thumb_func_start warp1_get_mapheader