diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/Route22Gate.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/Route22Gate.asm (renamed from scripts/route22gate.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/route22gate.asm b/scripts/Route22Gate.asm index 2b622a43..946366b5 100755 --- a/scripts/route22gate.asm +++ b/scripts/Route22Gate.asm @@ -1,8 +1,8 @@ -Route22GateScript: +Route22Gate_Script: call EnableAutoTextBoxDrawing - ld hl, Route22GateScriptPointers + ld hl, Route22Gate_ScriptPointers ld a, [wRoute22GateCurScript] - call JumpTable + call CallFunctionInTable ld a, [wYCoord] cp $4 ld a, ROUTE_23 @@ -12,7 +12,7 @@ Route22GateScript: ld [wLastMap], a ret -Route22GateScriptPointers: +Route22Gate_ScriptPointers: dw Route22GateScript0 dw Route22GateScript1 dw Route22GateScript2 @@ -56,7 +56,7 @@ Route22GateScript1: Route22GateScript2: ret -Route22GateTextPointers: +Route22Gate_TextPointers: dw Route22GateText1 Route22GateText1: @@ -92,5 +92,5 @@ Route22GateText_1e715: Route22GateText_1e71a: TX_FAR _Route22GateText_1e71a - TX_SFX_ITEM + TX_SFX_ITEM_1 db "@" |