From 78e44a8fb10307c55d53a69179b9ff7cd6f49fc0 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 30 Jun 2025 13:30:57 -0400 Subject: Use combined hardware constants --- home/overworld.asm | 6 +++--- home/tilemap.asm | 8 ++++---- home/trainers.asm | 2 +- home/vcopy.asm | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'home') diff --git a/home/overworld.asm b/home/overworld.asm index daa806d6..8c79d6e7 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -5,7 +5,7 @@ HandleMidJump:: EnterMap:: ; Load a new map. - ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a call LoadMapData farcall ClearVariablesOnEnterMap @@ -432,7 +432,7 @@ CheckWarpsNoCollisionLoop:: pop bc pop de ldh a, [hJoyHeld] - and PAD_DOWN | PAD_UP | PAD_LEFT | PAD_RIGHT + and PAD_CTRL_PAD jr z, CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp jr WarpFound1 @@ -1828,7 +1828,7 @@ JoypadOverworld:: cp ROUTE_17 ; Cycling Road jr nz, .notForcedDownwards ldh a, [hJoyHeld] - and PAD_DOWN | PAD_UP | PAD_LEFT | PAD_RIGHT | PAD_B | PAD_A + and PAD_CTRL_PAD | PAD_B | PAD_A jr nz, .notForcedDownwards ld a, PAD_DOWN ldh [hJoyHeld], a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press diff --git a/home/tilemap.asm b/home/tilemap.asm index afee7097..094c7c65 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -23,7 +23,7 @@ UncompressSpriteFromDE:: SaveScreenTilesToBuffer2:: hlcoord 0, 0 ld de, wTileMapBackup2 - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA call CopyData ret @@ -39,14 +39,14 @@ LoadScreenTilesFromBuffer2DisableBGTransfer:: ldh [hAutoBGTransferEnabled], a ld hl, wTileMapBackup2 decoord 0, 0 - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA call CopyData ret SaveScreenTilesToBuffer1:: hlcoord 0, 0 ld de, wTileMapBackup - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA jp CopyData LoadScreenTilesFromBuffer1:: @@ -54,7 +54,7 @@ LoadScreenTilesFromBuffer1:: ldh [hAutoBGTransferEnabled], a ld hl, wTileMapBackup decoord 0, 0 - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA call CopyData ld a, 1 ldh [hAutoBGTransferEnabled], a diff --git a/home/trainers.asm b/home/trainers.asm index 835121e1..ab8d5fff 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -149,7 +149,7 @@ ENDC xor a ; EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble - ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_CTRL_PAD ld [wJoyIgnore], a xor a ldh [hJoyHeld], a diff --git a/home/vcopy.asm b/home/vcopy.asm index 6a9d9b7f..92c78a88 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -23,7 +23,7 @@ ClearBgMap:: jr .next ld a, l .next - ld de, TILEMAP_WIDTH * TILEMAP_HEIGHT + ld de, TILEMAP_AREA ld l, e .loop ld [hli], a -- cgit v1.3.1-sl0p