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/Route18.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/Route18.asm (renamed from scripts/route18.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route18.asm b/scripts/Route18.asm index b89e2613..022d41be 100755 --- a/scripts/route18.asm +++ b/scripts/Route18.asm @@ -1,25 +1,24 @@ -Route18Script: +Route18_Script: call EnableAutoTextBoxDrawing - ld hl, Route18TrainerHeaders - ld de, Route18ScriptPointers + ld hl, Route18TrainerHeader0 + ld de, Route18_ScriptPointers ld a, [wRoute18CurScript] call ExecuteCurMapScriptInTable ld [wRoute18CurScript], a ret -Route18ScriptPointers: +Route18_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route18TextPointers: +Route18_TextPointers: dw Route18Text1 dw Route18Text2 dw Route18Text3 dw Route18Text4 dw Route18Text5 -Route18TrainerHeaders: Route18TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 db ($3 << 4) ; trainer's view range |