aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/safarizoneentrance2.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-08 00:35:33 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-08 00:35:33 -0400
commit5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch)
tree97319f45578efa0901fb1986678c16bbdeda6bcc /scripts/safarizoneentrance2.asm
parentIs this an OAM printer? (diff)
parentClean up main.asm (diff)
downloadpokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.gz
pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.xz
pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.zip
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/safarizoneentrance2.asm')
-rwxr-xr-xscripts/safarizoneentrance2.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/safarizoneentrance2.asm b/scripts/safarizoneentrance2.asm
index 0eb50790..4a6c23e6 100755
--- a/scripts/safarizoneentrance2.asm
+++ b/scripts/safarizoneentrance2.asm
@@ -62,7 +62,7 @@ Func_f1f77:
ld [wSafariSteps + 1], a
ld a, D_UP
ld c, 3
- call SafariZoneEntranceStartSimulatiingJoypadStates
+ call SafariZoneEntranceStartSimulatingJoypadStates
SetEvent EVENT_IN_SAFARI_ZONE
ResetEventReuseHL EVENT_SAFARI_GAME_OVER
ld a, $3
@@ -74,7 +74,7 @@ Func_f1f77:
.deny_entry
ld a, D_DOWN
ld c, 1
- call SafariZoneEntranceStartSimulatiingJoypadStates
+ call SafariZoneEntranceStartSimulatingJoypadStates
ld a, $4
ld [wSafariZoneEntranceCurScript], a
.asm_f2024
@@ -123,7 +123,7 @@ Func_f203e:
TX_FAR _SafariZoneEntranceText_753f0
db "@"
-SafariZoneEntranceStartSimulatiingJoypadStates:
+SafariZoneEntranceStartSimulatingJoypadStates:
push af
ld b, $0
ld a, c