diff options
| author | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2025-06-30 13:30:57 -0400 |
|---|---|---|
| committer | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 13:45:24 -0400 |
| commit | 78e44a8fb10307c55d53a69179b9ff7cd6f49fc0 (patch) | |
| tree | ccc6113a679d842077d67e5453709438c418114f /engine/battle/core.asm | |
| parent | Replace hardware_constants.asm with hardware.inc (#511) (diff) | |
| download | pokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.tar.gz pokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.tar.xz pokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.zip | |
Use combined hardware constants
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f9b45a88..28c164e5 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -18,7 +18,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: call LoadFontTilePatterns call LoadHudAndHpBarAndStatusTilePatterns ld hl, vBGMap0 - ld bc, TILEMAP_WIDTH * TILEMAP_HEIGHT + ld bc, TILEMAP_AREA .clearBackgroundLoop ld a, " " ld [hli], a @@ -2561,9 +2561,9 @@ MoveSelectionMenu: ; Disable left, right, and START buttons in regular battles. ld a, [wStatusFlags7] bit BIT_TEST_BATTLE, a - ld b, PAD_UP | PAD_DOWN | PAD_A | PAD_B | PAD_SELECT + ld b, ~(PAD_LEFT | PAD_RIGHT | PAD_START) jr z, .matchedkeyspicked - ld b, PAD_UP | PAD_DOWN | PAD_LEFT | PAD_RIGHT | PAD_A | PAD_B | PAD_SELECT | PAD_START + ld b, PAD_CTRL_PAD | PAD_BUTTONS .matchedkeyspicked ld a, b ld [hli], a ; wMenuWatchedKeys |