aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route22.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2025-06-30 12:47:22 -0400
committerGitHub <noreply@github.com>2025-06-30 12:47:22 -0400
commit56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch)
tree47d25c237e9af824f7a57295a2d2e298b194a8e6 /scripts/Route22.asm
parentDistinguish single trainer pics section from Pokemon pics (diff)
downloadpokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz
pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz
pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip
Replace hardware_constants.asm with hardware.inc (#511)
Diffstat (limited to 'scripts/Route22.asm')
-rw-r--r--scripts/Route22.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Route22.asm b/scripts/Route22.asm
index 1a2602fd..cab9ec33 100644
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@@ -65,7 +65,7 @@ Route22DefaultScript:
ld [wSavedCoordIndex], a
xor a
ldh [hJoyHeld], a
- ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+ ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld [wJoyIgnore], a
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
@@ -162,7 +162,7 @@ Route22Rival1AfterBattleScript:
ld a, ROUTE22_RIVAL1
ldh [hSpriteIndex], a
call SetSpriteFacingDirectionAndDelay
- ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+ ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
ld a, TEXT_ROUTE22_RIVAL1
@@ -321,7 +321,7 @@ Route22Rival2AfterBattleScript:
.set_rival_facing_direction
ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
- ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+ ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
ld a, TEXT_ROUTE22_RIVAL2