aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CeruleanCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/CeruleanCity.asm')
-rw-r--r--scripts/CeruleanCity.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index c08d0280..4412b49c 100644
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -24,7 +24,7 @@ CeruleanCityRocketDefeatedScript:
ld a, [wIsInBattle]
cp $ff
jp z, CeruleanCityClearScripts
- ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
+ ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
ld a, TEXT_CERULEANCITY_ROCKET
@@ -78,7 +78,7 @@ ENDC
call PlayMusic
xor a
ldh [hJoyHeld], a
- ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
+ ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, [wXCoord]
cp 20 ; is the player standing on the right side of the bridge?
@@ -170,7 +170,7 @@ CeruleanCityRivalDefeatedScript:
cp $ff
jp z, CeruleanCityClearScripts
call CeruleanCityFaceRivalScript
- ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
+ ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_CERULEAN_RIVAL
ld a, TEXT_CERULEANCITY_RIVAL