diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /engine/menus | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/link_menu.asm | 16 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/menus/link_menu.asm b/engine/menus/link_menu.asm index e0f39eda..9b151388 100644 --- a/engine/menus/link_menu.asm +++ b/engine/menus/link_menu.asm @@ -656,20 +656,20 @@ LinkMenu: ld hl, wTopMenuItemY ld a, 5 ld [hli], a - assert wTopMenuItemY + 1 == wTopMenuItemX + ASSERT wTopMenuItemY + 1 == wTopMenuItemX ld a, 6 ld [hli], a - assert wTopMenuItemX + 1 == wCurrentMenuItem + ASSERT wTopMenuItemX + 1 == wCurrentMenuItem xor a ld [hli], a inc hl - assert wCurrentMenuItem + 2 == wMaxMenuItem + ASSERT wCurrentMenuItem + 2 == wMaxMenuItem ld a, 3 ld [hli], a - assert wMaxMenuItem + 1 == wMenuWatchedKeys - assert 2 == B_BUTTON + ASSERT wMaxMenuItem + 1 == wMenuWatchedKeys + ASSERT 2 == B_BUTTON ld [hli], a - assert wMenuWatchedKeys + 1 == wLastMenuItem + ASSERT wMenuWatchedKeys + 1 == wLastMenuItem xor a ld [hl], a .waitForInputLoop @@ -741,7 +741,7 @@ LinkMenu: ld d, " " ld e, "▷" ld a, [wLinkMenuSelectionSendBuffer] - and (B_BUTTON << 2) ; was B button pressed? + and B_BUTTON << 2 ; was B button pressed? jr nz, .updateCursorPosition ; A button was pressed ld a, [wCurrentMenuItem] @@ -762,7 +762,7 @@ LinkMenu: call Func_f59ec call LoadScreenTilesFromBuffer1 ld a, [wLinkMenuSelectionSendBuffer] - and (B_BUTTON << 2) ; was B button pressed? + and B_BUTTON << 2 ; was B button pressed? jr nz, .choseCancel ; cancel if B pressed ld a, [wCurrentMenuItem] cp $2 diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 817205a9..a8e37ff2 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -278,7 +278,7 @@ CheckForPlayerNameInSRAM: ld [MBC1SRamEnable], a ld a, SRAM_BANKING_MODE ld [MBC1SRamBankingMode], a - assert SRAM_BANKING_MODE == BANK("Save Data") + ASSERT SRAM_BANKING_MODE == BANK("Save Data") ld [MBC1SRamBank], a ld b, NAME_LENGTH ld hl, sPlayerName |