diff options
Diffstat (limited to 'engine/menus')
-rw-r--r-- | engine/menus/main_menu.asm | 6 | ||||
-rw-r--r-- | engine/menus/pc.asm | 2 | ||||
-rw-r--r-- | engine/menus/save.asm | 2 | ||||
-rw-r--r-- | engine/menus/start_sub_menus.asm | 4 | ||||
-rw-r--r-- | engine/menus/unused_input.asm | 2 |
5 files changed, 8 insertions, 8 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 diff --git a/engine/menus/pc.asm b/engine/menus/pc.asm index 4c340e7b..6a15eaa5 100644 --- a/engine/menus/pc.asm +++ b/engine/menus/pc.asm @@ -14,7 +14,7 @@ PCMainMenu: ld hl, wFlags_0xcd60 set 5, [hl] call HandleMenuInput - bit 1, a ;if player pressed B + bit BIT_B_BUTTON, a jp nz, LogOff ld a, [wMaxMenuItem] cp 2 diff --git a/engine/menus/save.asm b/engine/menus/save.asm index aab29b20..55ae9e47 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -347,7 +347,7 @@ ChangeBox:: call HandleMenuInput ld hl, hUILayoutFlags res 1, [hl] - bit 1, a ; pressed b + bit BIT_B_BUTTON, a ret nz ld a, $b6 call PlaySoundWaitForCurrent diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index 6055db5c..8a0b7b82 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -65,7 +65,7 @@ StartMenu_Pokemon:: push af call LoadScreenTilesFromBuffer1 ; restore saved screen pop af - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a jp nz, .loop ; if the B button wasn't pressed ld a, [wMaxMenuItem] @@ -377,7 +377,7 @@ StartMenu_Item:: ld [hl], a ; old menu item id call HandleMenuInput call PlaceUnfilledArrowMenuCursor - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a jr z, .useOrTossItem jp ItemMenuLoop .useOrTossItem ; if the player made the choice to use or toss the item diff --git a/engine/menus/unused_input.asm b/engine/menus/unused_input.asm index ad5c36df..6fe44b0b 100644 --- a/engine/menus/unused_input.asm +++ b/engine/menus/unused_input.asm @@ -31,7 +31,7 @@ HandleMenuInputPokemonSelectionDuplicate: ; unreferenced ld [wCheckFor180DegreeTurn], a ldh a, [hJoy5] ld b, a - bit 6, a ; pressed Up key? + bit BIT_D_UP, a jr z, .checkIfDownPressed .upPressed ld a, [wCurrentMenuItem] ; selected menu item |