aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menu/main_menu.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-08-29 17:15:05 -0700
committerYamaArashi <shadow962@live.com>2015-08-29 17:15:05 -0700
commitb6a7e5e9cf20e7924f6cf427c66e9aeb42fa77f3 (patch)
treeaf1bac71243d59c9479898fa0c86ba37d742aacf /engine/menu/main_menu.asm
parentMerge pull request #114 from YamaArashi/master (diff)
downloadpokeyellow-b6a7e5e9cf20e7924f6cf427c66e9aeb42fa77f3.tar.gz
pokeyellow-b6a7e5e9cf20e7924f6cf427c66e9aeb42fa77f3.tar.xz
pokeyellow-b6a7e5e9cf20e7924f6cf427c66e9aeb42fa77f3.zip
documented flags and misc. fixes
Diffstat (limited to 'engine/menu/main_menu.asm')
-rwxr-xr-xengine/menu/main_menu.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 6c109cec..78830093 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -20,7 +20,7 @@ MainMenu: ; 5af2 (1:5af2)
ld [hli],a
ld [hli],a
ld [hl],a
- ld [W_ANIMATIONID],a
+ ld [wDefaultMap],a
ld hl,wd72e
res 6,[hl]
call ClearScreen
@@ -269,7 +269,7 @@ LinkMenu: ; 5c0a (1:5c0a)
call DelayFrames
ld hl, wd732
res 1, [hl]
- ld a, [W_ANIMATIONID]
+ ld a, [wDefaultMap]
ld [wDestinationMap], a
call SpecialWarpIn
ld c, 20