aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SafariZoneGate.asm
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xscripts/SafariZoneGate.asm (renamed from scripts/safarizoneentrance.asm)28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/safarizoneentrance.asm b/scripts/SafariZoneGate.asm
index 5c6002a9..f3de556b 100755
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/SafariZoneGate.asm
@@ -1,10 +1,10 @@
-SafariZoneEntranceScript:
+SafariZoneGate_Script:
call EnableAutoTextBoxDrawing
- ld hl, SafariZoneEntranceScriptPointers
- ld a, [wSafariZoneEntranceCurScript]
+ ld hl, SafariZoneGate_ScriptPointers
+ ld a, [wSafariZoneGateCurScript]
jp CallFunctionInTable
-SafariZoneEntranceScriptPointers:
+SafariZoneGate_ScriptPointers:
dw .SafariZoneEntranceScript0
dw .SafariZoneEntranceScript1
dw .SafariZoneEntranceScript2
@@ -30,7 +30,7 @@ SafariZoneEntranceScriptPointers:
cp $1
jr z, .asm_7520f
ld a, $2
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
ret
.asm_7520f
ld a, D_RIGHT
@@ -39,7 +39,7 @@ SafariZoneEntranceScriptPointers:
ld a, $f0
ld [wJoyIgnore], a
ld a, $1
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
ret
.CoordsData_75221:
@@ -68,7 +68,7 @@ SafariZoneEntranceScriptPointers:
xor a
ld [wJoyIgnore], a
ld a, $5
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
ret
.SafariZoneEntranceScript5
@@ -89,7 +89,7 @@ SafariZoneEntranceScriptPointers:
ld c, $3
call SafariZoneEntranceAutoWalk
ld a, $4
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
jr .asm_75286
.asm_7527f
ld a, $5
@@ -104,7 +104,7 @@ SafariZoneEntranceScriptPointers:
xor a
ld [wJoyIgnore], a
ld a, $0
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
ret
.SafariZoneEntranceScript6
@@ -112,7 +112,7 @@ SafariZoneEntranceScriptPointers:
ret nz
call Delay3
ld a, [wcf0d]
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
ret
SafariZoneEntranceAutoWalk:
@@ -130,7 +130,7 @@ SafariZoneEntranceScript_752b4:
and a
ret
-SafariZoneEntranceTextPointers:
+SafariZoneGate_TextPointers:
dw .SafariZoneEntranceText1
dw .SafariZoneEntranceText2
dw .SafariZoneEntranceText1
@@ -192,7 +192,7 @@ SafariZoneEntranceTextPointers:
SetEvent EVENT_IN_SAFARI_ZONE
ResetEventReuseHL EVENT_SAFARI_GAME_OVER
ld a, 3
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
jr .done
.PleaseComeAgain
@@ -203,7 +203,7 @@ SafariZoneEntranceTextPointers:
ld c, 1
call SafariZoneEntranceAutoWalk
ld a, 4
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
.done
jp TextScriptEnd
@@ -251,7 +251,7 @@ SafariZoneEntranceTextPointers:
ld [wcf0d], a
.asm_753b3
ld a, $6
- ld [wSafariZoneEntranceCurScript], a
+ ld [wSafariZoneGateCurScript], a
jp TextScriptEnd
.SafariZoneEntranceText_753bb