diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-05 20:23:46 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-05 20:23:46 -0500 |
| commit | f50bc217ae5daeb2c2788f502f604e3684249256 (patch) | |
| tree | db4ce7e07f8a5c1b7728c06da945174c04fff7ce /asm | |
| parent | 1e699465bdef048f0c2d9574db6ca9a0dd77b051 (diff) | |
| parent | 103789770b635610ee1c04ed923fdcc7298f878e (diff) | |
Merge branch 'master' into trainer_tower
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/overworld.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 2b3ca139d..5f1e198ac 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -825,7 +825,7 @@ _08055232: get_mapheader_by_bank_and_number: @ 8055238 lsls r0, 16 lsls r1, 16 - ldr r2, _0805524C @ =gUnknown_83526A8 + ldr r2, _0805524C @ =gMapGroups lsrs r0, 14 adds r0, r2 ldr r0, [r0] @@ -834,7 +834,7 @@ get_mapheader_by_bank_and_number: @ 8055238 ldr r0, [r1] bx lr .align 2, 0 -_0805524C: .4byte gUnknown_83526A8 +_0805524C: .4byte gMapGroups thumb_func_end get_mapheader_by_bank_and_number thumb_func_start warp1_get_mapheader |