aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route22.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-20 20:17:30 -0500
committerGitHub <noreply@github.com>2020-05-20 20:17:30 -0500
commit500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/Route22.asm
parentMerge pull request #39 from TiKevin83/master (diff)
parentMerge remote-tracking branch 'pokered/master' (diff)
downloadpokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
-rwxr-xr-xscripts/Route22.asm (renamed from scripts/route22.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/route22.asm b/scripts/Route22.asm
index 41f77680..ff57f902 100755
--- a/scripts/route22.asm
+++ b/scripts/Route22.asm
@@ -1,10 +1,10 @@
-Route22Script:
+Route22_Script:
call EnableAutoTextBoxDrawing
- ld hl, Route22ScriptPointers
+ ld hl, Route22_ScriptPointers
ld a, [wRoute22CurScript]
- jp JumpTable
+ jp CallFunctionInTable
-Route22ScriptPointers:
+Route22_ScriptPointers:
dw Route22Script0
dw Route22Script1
dw Route22Script2
@@ -373,7 +373,7 @@ Route22Script6:
ld [wRoute22CurScript], a
ret
-Route22TextPointers:
+Route22_TextPointers:
dw Route22Text1
dw Route22Text2
dw Route22FrontGateText