diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-02 14:16:03 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-02 14:16:03 -0400 |
| commit | 5391289fc1164eab859856617f8dede7db3fe435 (patch) | |
| tree | 8cb4f701f3b49cf182715e28b0d818c778ff9e5c /asm/egg_hatch.s | |
| parent | 46e006b94cf7a2e59652a083cdd01f0d5dc9a26f (diff) | |
| parent | c0a9d620919bd6403772c4e5a236d47cd40ae861 (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/egg_hatch.s')
| -rw-r--r-- | asm/egg_hatch.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 24fb7c61b..078dadb29 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -575,7 +575,7 @@ _08047090: ldr r0, _08047150 @ =sub_8046FC0 bl SetVBlankCallback bl GetCurrentMapMusic - ldr r1, _08047154 @ =gUnknown_20370C2 + ldr r1, _08047154 @ =gSpecialVar_0x8005 strh r0, [r1] bl reset_temp_tile_data_buffers movs r0, 0 @@ -628,7 +628,7 @@ _08047090: _08047148: .4byte gUnknown_3000E74 _0804714C: .4byte gUnknown_20370C0 _08047150: .4byte sub_8046FC0 -_08047154: .4byte gUnknown_20370C2 +_08047154: .4byte gSpecialVar_0x8005 _08047158: .4byte gUnknown_826019C _0804715C: ldr r0, _0804716C @ =gUnknown_82601A4 |