aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/VermilionCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/VermilionCity.asm')
-rw-r--r--scripts/VermilionCity.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm
index 647446fa..1d9d790d 100644
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -74,7 +74,7 @@ VermilionCityDefaultScript:
and a
ret nz
.ship_departed
- ld a, D_UP
+ ld a, PAD_UP
ld [wSimulatedJoypadStatesEnd], a
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
@@ -99,9 +99,9 @@ VermilionCityPlayerAllowedToPassScript:
ret
VermilionCityPlayerExitShipScript:
- ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+ ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
- ld a, D_UP
+ ld a, PAD_UP
ld [wSimulatedJoypadStatesEnd], a
ld [wSimulatedJoypadStatesEnd + 1], a
ld a, 2