aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SafariZoneGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/SafariZoneGate.asm')
-rw-r--r--scripts/SafariZoneGate.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm
index 87b6ec6d..3052cac9 100644
--- a/scripts/SafariZoneGate.asm
+++ b/scripts/SafariZoneGate.asm
@@ -22,7 +22,7 @@ SafariZoneGateDefaultScript:
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_1
ldh [hTextID], a
call DisplayTextID
- 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
xor a
ldh [hJoyHeld], a
@@ -38,7 +38,7 @@ SafariZoneGateDefaultScript:
ld a, PAD_RIGHT
ld c, 1
call SafariZoneEntranceAutoWalk
- ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
+ ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_RIGHT
ld [wSafariZoneGateCurScript], a
@@ -60,7 +60,7 @@ SafariZoneGateWouldYouLikeToJoinScript:
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_WOULD_YOU_LIKE_TO_JOIN
ldh [hTextID], a
call DisplayTextID
- 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
ret
@@ -80,7 +80,7 @@ SafariZoneGateLeavingSafariScript:
jr z, .leaving_early
ResetEventReuseHL EVENT_IN_SAFARI_ZONE
call UpdateSprites
- ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
+ ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_GOOD_HAUL_COME_AGAIN
ldh [hTextID], a