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/Route17.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/Route17.asm (renamed from scripts/route17.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route17.asm b/scripts/Route17.asm index ddf92c2d..dd92ac44 100755 --- a/scripts/route17.asm +++ b/scripts/Route17.asm @@ -1,18 +1,18 @@ -Route17Script: +Route17_Script: call EnableAutoTextBoxDrawing - ld hl, Route17TrainerHeaders - ld de, Route17ScriptPointers + ld hl, Route17TrainerHeader0 + ld de, Route17_ScriptPointers ld a, [wRoute17CurScript] call ExecuteCurMapScriptInTable ld [wRoute17CurScript], a ret -Route17ScriptPointers: +Route17_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route17TextPointers: +Route17_TextPointers: dw Route17Text1 dw Route17Text2 dw Route17Text3 @@ -30,7 +30,6 @@ Route17TextPointers: dw Route17Text15 dw Route17Text16 -Route17TrainerHeaders: Route17TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0 db ($3 << 4) ; trainer's view range |