aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-11-07 21:28:20 -0600
committerGitHub <noreply@github.com>2020-11-07 21:28:20 -0600
commitedf375aff14e54bd54e7a25780fe8b714691ccc7 (patch)
tree015c63e79e4a245c28f72b18954f2a845d30271c /engine/movie
parentIgnore tools/pcm (diff)
parentFix typo (diff)
downloadpokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.tar.gz
pokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.tar.xz
pokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.zip
Merge pull request #63 from dannye/debug
Debug Yellow
Diffstat (limited to 'engine/movie')
-rwxr-xr-xengine/movie/title.asm12
1 files changed, 12 insertions, 0 deletions
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 11852ae4..cf1eecdb 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -164,7 +164,11 @@ DisplayTitleScreen:
ldh a, [hJoyHeld]
cp D_UP | SELECT | B_BUTTON
jr z, .go_to_main_menu
+IF DEF(_DEBUG)
+ and A_BUTTON | SELECT | START
+ELSE
and A_BUTTON | START
+ENDC
jr nz, .go_to_main_menu
call DoTitleScreenFunction
jr .titleScreenLoop
@@ -190,7 +194,15 @@ DisplayTitleScreen:
and D_UP | SELECT | B_BUTTON
cp D_UP | SELECT | B_BUTTON
jp z, .doClearSaveDialogue
+IF DEF(_DEBUG)
+ ld a, b
+ bit BIT_SELECT, a
+ jp z, MainMenu
+ callfar DebugMenu
+ jp hl
+ELSE
jp MainMenu
+ENDC
.asm_42f0
; unreferenced