aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SafariZoneGate2.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/SafariZoneGate2.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to '')
-rwxr-xr-xscripts/SafariZoneGate2.asm (renamed from scripts/safarizoneentrance2.asm)8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/safarizoneentrance2.asm b/scripts/SafariZoneGate2.asm
index 4a6c23e6..a99bad6a 100755
--- a/scripts/safarizoneentrance2.asm
+++ b/scripts/SafariZoneGate2.asm
@@ -66,7 +66,7 @@ Func_f1f77:
SetEvent EVENT_IN_SAFARI_ZONE
ResetEventReuseHL EVENT_SAFARI_GAME_OVER
ld a, $3
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
jr .asm_f2024
.declined:
ld hl, .PleaseComeAgainText
@@ -76,7 +76,7 @@ Func_f1f77:
ld c, 1
call SafariZoneEntranceStartSimulatingJoypadStates
ld a, $4
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
.asm_f2024
ret
@@ -86,7 +86,7 @@ Func_f1f77:
.MakePaymentText
TX_FAR SafariZoneEntranceText_9e747
- TX_SFX_ITEM
+ TX_SFX_ITEM_1
TX_FAR _SafariZoneEntranceText_75360
db "@"
@@ -208,7 +208,7 @@ SafariZoneEntranceGetLowCostAdmissionText:
SafariZoneEntranceText_f20f6:
TX_FAR _SafariZoneLowCostText3
- TX_SFX_ITEM
+ TX_SFX_ITEM_1
TX_FAR _SafariZoneLowCostText4
db "@"