diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-17 21:10:51 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-17 21:10:51 +0200 |
| commit | e396bcdb7229645f4a4893b8e3c1d364a0e7930c (patch) | |
| tree | 14959dcb316454411ec791a39ec45a34f49e1ed0 /asm/quest_log.s | |
| parent | 771cc93d932058d4ba079a33c04c0380f339c6a7 (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/quest_log.s')
| -rw-r--r-- | asm/quest_log.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/quest_log.s b/asm/quest_log.s index 57e9611a2..485e6377b 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -3591,7 +3591,7 @@ sub_811246C: @ 811246C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081124B0 @ =gUnknown_2036E38 + ldr r1, _081124B0 @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4, 0x8] cmp r0, 0xFF @@ -3618,7 +3618,7 @@ _081124A6: bl sub_8063E28 b _081124E0 .align 2, 0 -_081124B0: .4byte gUnknown_2036E38 +_081124B0: .4byte gMapObjects _081124B4: .4byte gUnknown_203AF9A _081124B8: ldr r5, _081124E8 @ =gUnknown_203AF9A |