diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
| commit | 7574e186e7505e237efc3ab0969fed60bec6eb9d (patch) | |
| tree | 527ec48412989e98cca7827c5e31d89cdf742b05 /engine/menus/main_menu.asm | |
| parent | 70baa4f3e80bceedd00cafbbab219665eb189225 (diff) | |
| parent | 09e92c554c7563b52a9484b26d96d903c7635b0d (diff) | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'engine/menus/main_menu.asm')
| -rw-r--r-- | engine/menus/main_menu.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 7d81d2f6..6ccbb597 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -64,7 +64,7 @@ MainMenu: ld a, [wSaveFileStatus] ld [wMaxMenuItem], a call HandleMenuInput - bit 1, a ; pressed B? + bit BIT_B_BUTTON, a jp nz, DisplayTitleScreen ; if so, go back to the title screen ld c, 20 call DelayFrames @@ -97,9 +97,9 @@ MainMenu: ldh [hJoyHeld], a call Joypad ldh a, [hJoyHeld] - bit 0, a + bit BIT_A_BUTTON, a jr nz, .pressedA - bit 1, a + bit BIT_B_BUTTON, a jp nz, .mainMenuLoop ; pressed B jr .inputLoop .pressedA |