aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route18Gate1F.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/Route18Gate1F.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/Route18Gate1F.asm (renamed from scripts/route18gate.asm)20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/route18gate.asm b/scripts/Route18Gate1F.asm
index 186ea61b..812cb3e0 100755
--- a/scripts/route18gate.asm
+++ b/scripts/Route18Gate1F.asm
@@ -1,12 +1,12 @@
-Route18GateScript:
+Route18Gate1F_Script:
ld hl, wd732
res 5, [hl]
call EnableAutoTextBoxDrawing
- ld a, [wRoute18GateCurScript]
- ld hl, Route18GateScriptPointers
- jp JumpTable
+ ld a, [wRoute18Gate1FCurScript]
+ ld hl, Route18Gate1F_ScriptPointers
+ jp CallFunctionInTable
-Route18GateScriptPointers:
+Route18Gate1F_ScriptPointers:
dw Route18GateScript0
dw Route18GateScript1
dw Route18GateScript2
@@ -36,11 +36,11 @@ Route18GateScript0:
call FillMemory
call StartSimulatingJoypadStates
ld a, $1
- ld [wRoute18GateCurScript], a
+ ld [wRoute18Gate1FCurScript], a
ret
.asm_498c6
ld a, $2
- ld [wRoute18GateCurScript], a
+ ld [wRoute18Gate1FCurScript], a
ret
CoordsData_498cc:
@@ -67,7 +67,7 @@ Route18GateScript2:
ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
ld a, $3
- ld [wRoute18GateCurScript], a
+ ld [wRoute18Gate1FCurScript], a
ret
Route18GateScript3:
@@ -79,10 +79,10 @@ Route18GateScript3:
ld hl, wd730
res 7, [hl]
ld a, $0
- ld [wRoute18GateCurScript], a
+ ld [wRoute18Gate1FCurScript], a
ret
-Route18GateTextPointers:
+Route18Gate1F_TextPointers:
dw Route18GateText1
dw Route18GateText2