diff options
author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/titlescreen.asm | |
parent | b35294752c55b5df88ccfc785279c36f30a43fd6 (diff) | |
parent | 7b7c563c93155e121e05149779cfb78b0bf9d259 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/titlescreen.asm')
-rwxr-xr-x | engine/titlescreen.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 5e8a15d5..ed23fbc4 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -237,14 +237,14 @@ ENDC call LoadGBPal ld a, [hJoyHeld] ld b, a - and $46 - cp $46 - jp z, Func_448e + and D_UP | SELECT | B_BUTTON + cp D_UP | SELECT | B_BUTTON + jp z, .doClearSaveDialogue jp MainMenu -Func_448e: ; 448e (1:448e) - ld b, BANK(Func_1c98a) - ld hl, Func_1c98a +.doClearSaveDialogue + ld b, BANK(DoClearSaveDialogue) + ld hl, DoClearSaveDialogue jp Bankswitch Func_4496: ; 4496 (1:4496) |