diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /engine/movie/title.asm | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie/title.asm')
| -rw-r--r-- | engine/movie/title.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/movie/title.asm b/engine/movie/title.asm index ec7a2aa3..7a4637ec 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -165,12 +165,12 @@ DisplayTitleScreen: call DelayFrame call JoypadLowSensitivity ldh a, [hJoyHeld] - cp D_UP | SELECT | B_BUTTON + cp PAD_UP | PAD_SELECT | PAD_B jr z, .go_to_main_menu IF DEF(_DEBUG) - and A_BUTTON | SELECT | START + and PAD_A | PAD_SELECT | PAD_START ELSE - and A_BUTTON | START + and PAD_A | PAD_START ENDC jr nz, .go_to_main_menu call DoTitleScreenFunction @@ -194,12 +194,12 @@ ENDC call LoadGBPal ldh a, [hJoyHeld] ld b, a - and D_UP | SELECT | B_BUTTON - cp D_UP | SELECT | B_BUTTON + and PAD_UP | PAD_SELECT | PAD_B + cp PAD_UP | PAD_SELECT | PAD_B jp z, .doClearSaveDialogue IF DEF(_DEBUG) ld a, b - bit BIT_SELECT, a + bit B_PAD_SELECT, a jp z, MainMenu callfar DebugMenu jp hl |