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/events/hidden_objects/school_blackboard.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/events/hidden_objects/school_blackboard.asm')
| -rw-r--r-- | engine/events/hidden_objects/school_blackboard.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/hidden_objects/school_blackboard.asm b/engine/events/hidden_objects/school_blackboard.asm index c40530a6..75811035 100644 --- a/engine/events/hidden_objects/school_blackboard.asm +++ b/engine/events/hidden_objects/school_blackboard.asm @@ -15,7 +15,7 @@ LinkCableHelp:: ld [wMenuItemOffset], a ; not used ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld a, A_BUTTON | B_BUTTON + ld a, PAD_A | PAD_B ld [wMenuWatchedKeys], a ld a, 3 ld [wMaxMenuItem], a @@ -35,7 +35,7 @@ LinkCableHelp:: ld hl, LinkCableHelpText2 call PrintText call HandleMenuInput - bit BIT_B_BUTTON, a + bit B_PAD_B, a jr nz, .exit ld a, [wCurrentMenuItem] cp 3 ; pressed a on "STOP READING" @@ -98,7 +98,7 @@ ViridianSchoolBlackboard:: ld [wMenuItemOffset], a ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld a, D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON + ld a, PAD_LEFT | PAD_RIGHT | PAD_A | PAD_B ld [wMenuWatchedKeys], a ld a, 2 ld [wMaxMenuItem], a @@ -121,9 +121,9 @@ ViridianSchoolBlackboard:: ld hl, ViridianSchoolBlackboardText2 call PrintText call HandleMenuInput ; pressing up and down is handled in here - bit BIT_B_BUTTON, a ; pressed b + bit B_PAD_B, a ; pressed b jr nz, .exitBlackboard - bit BIT_D_RIGHT, a + bit B_PAD_RIGHT, a jr z, .didNotPressRight ; move cursor to right column ld a, 2 @@ -136,7 +136,7 @@ ViridianSchoolBlackboard:: ld [wMenuItemOffset], a jr .blackboardLoop .didNotPressRight - bit BIT_D_LEFT, a + bit B_PAD_LEFT, a jr z, .didNotPressLeftOrRight ; move cursor to left column ld a, 2 |