diff options
| author | dannye <33dannye@gmail.com> | 2022-09-11 23:34:59 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2022-09-12 00:53:37 -0500 |
| commit | ecab35295aefb44227ba38f257dc40c8c10474e3 (patch) | |
| tree | d04160bc19180ee50a941d121f90cc7071e7a672 /engine/menus | |
| parent | Replace Hard-Coded Number With Constant (diff) | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/link_menu.asm | 6 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 4 | ||||
| -rw-r--r-- | engine/menus/pokedex.asm | 2 | ||||
| -rw-r--r-- | engine/menus/text_box.asm | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/engine/menus/link_menu.asm b/engine/menus/link_menu.asm index 409316c9..ada3941e 100644 --- a/engine/menus/link_menu.asm +++ b/engine/menus/link_menu.asm @@ -690,13 +690,13 @@ LinkMenu: ld b, a and $f0 cp $d0 - jr z, .asm_f5c7d + jr z, .checkEnemyMenuSelection ld a, [wLinkMenuSelectionReceiveBuffer + 1] ld b, a and $f0 cp $d0 jr nz, .exchangeMenuSelectionLoop -.asm_f5c7d +.checkEnemyMenuSelection ld a, b and $c ; did the enemy press A or B? jr nz, .enemyPressedAOrB @@ -720,7 +720,7 @@ LinkMenu: ld a, b ld [wLinkMenuSelectionSendBuffer], a and $3 - ld [wCurrentMenuItem], a ; wCurrentMenuItem + ld [wCurrentMenuItem], a .doneChoosingMenuSelection ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 6ccbb597..cfcfcb74 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -123,9 +123,9 @@ MainMenu: jp SpecialEnterMap InitOptions: - ld a, 1 ; no delay + ld a, TEXT_DELAY_FAST ld [wLetterPrintingDelayFlags], a - ld a, 3 ; medium speed + ld a, TEXT_DELAY_MEDIUM ld [wOptions], a ld a, 64 ; audio? ld [wPrinterSettings], a diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 1ab1ff9b..36b2bb04 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -100,7 +100,7 @@ HandlePokedexSideMenu: ldh [hJoy7], a .handleMenuInput call HandleMenuInput - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a ld b, 2 jr nz, .buttonBPressed ld a, [wCurrentMenuItem] diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm index 7a315af2..697fe507 100644 --- a/engine/menus/text_box.asm +++ b/engine/menus/text_box.asm @@ -173,9 +173,9 @@ DoBuySellQuitMenu: ld [wd730], a call HandleMenuInput call PlaceUnfilledArrowMenuCursor - bit 0, a ; was A pressed? + bit BIT_A_BUTTON, a jr nz, .pressedA - bit 1, a ; was B pressed? (always true since only A/B are watched) + bit BIT_B_BUTTON, a ; always true since only A/B are watched jr z, .pressedA ld a, CANCELLED_MENU ld [wMenuExitMethod], a @@ -282,7 +282,7 @@ DisplayTwoOptionMenu: res 6, [hl] ; turn on the printing delay call HandleMenuInput pop hl - bit 1, a ; A button pressed? + bit BIT_B_BUTTON, a jr nz, .choseSecondMenuItem ; automatically choose the second option if B is pressed .pressedAButton ld a, [wCurrentMenuItem] |