diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-05 14:06:03 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-05 14:06:03 -0500 |
| commit | adf2fe712d372bad8c68590ae77b1dde85290d8f (patch) | |
| tree | 3f41aa52ea49ad17f355870097ecbe9cc46be917 /engine/map_setup.asm | |
| parent | 893b3a217eefd354d8b0023aa91d9b6a7d03604a (diff) | |
Various labels
Diffstat (limited to 'engine/map_setup.asm')
| -rw-r--r-- | engine/map_setup.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 957747406..8ae9838f0 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -252,7 +252,7 @@ MapSetupCommands: ; 15440 dba FadeOutMapAndMusic ; 06 dba EnterMapMusic ; 07 dba ForceMapMusic ; 08 - dba CrankUpTheVolume ; 09 + dba FadeInMusic ; 09 dba LoadBlockData ; 0a dba LoadNeighboringBlockData ; 0b dba SaveScreen ; 0c @@ -300,13 +300,13 @@ DontScrollText: ; 154ca ActivateMapAnims: ; 154cf ld a, $1 - ld [$ffde], a + ld [hMapAnims], a ret ; 154d3 SuspendMapAnims: ; 154d3 xor a - ld [$ffde], a + ld [hMapAnims], a ret ; 154d7 |