aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menu/start_menu.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-11 17:51:03 -0700
committerGitHub <noreply@github.com>2016-06-11 17:51:03 -0700
commit54143d33fc1211fb0c949ba62633d1c8d94f2717 (patch)
tree9176ffc5b6384a48eb32ea8f33ac97d1d67f6865 /engine/menu/start_menu.asm
parentMerge pull request #14 from PikalaxALT/master (diff)
parentremove address comments (diff)
downloadpokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.gz
pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.xz
pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.zip
Merge pull request #13 from YamaArashi/master
remove address comments
Diffstat (limited to 'engine/menu/start_menu.asm')
-rwxr-xr-xengine/menu/start_menu.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm
index 3eeb1c07..16a9973d 100755
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -1,13 +1,13 @@
-DisplayStartMenu:: ; 29d1 (0:29d1)
+DisplayStartMenu::
switchbank StartMenu_Pokedex ; also bank for other functions
ld a, [wWalkBikeSurfState] ; walking/biking/surfing
ld [wWalkBikeSurfStateCopy], a
ld a, $8f ; (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound
call PlaySound
-RedisplayStartMenu:: ; 29e1 (0:29e1)
+RedisplayStartMenu::
callba DrawStartMenu
-RedisplayStartMenu_DoNotDrawStartMenu: ; 29e9 (0:29e9)
+RedisplayStartMenu_DoNotDrawStartMenu:
callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone
call UpdateSprites
.loop
@@ -75,7 +75,7 @@ RedisplayStartMenu_DoNotDrawStartMenu: ; 29e9 (0:29e9)
jp z, StartMenu_Option
; EXIT falls through to here
-CloseStartMenu:: ; 2a72 (0:2a72)
+CloseStartMenu::
call Joypad
ld a, [hJoyPressed]
bit 0, a ; was A button newly pressed?