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/Route21.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/Route21.asm (renamed from scripts/route21.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route21.asm b/scripts/Route21.asm index 89874e58..15dacd5d 100755 --- a/scripts/route21.asm +++ b/scripts/Route21.asm @@ -1,18 +1,18 @@ -Route21Script: +Route21_Script: call EnableAutoTextBoxDrawing - ld hl, Route21TrainerHeaders - ld de, Route21ScriptPointers + ld hl, Route21TrainerHeader0 + ld de, Route21_ScriptPointers ld a, [wRoute21CurScript] call ExecuteCurMapScriptInTable ld [wRoute21CurScript], a ret -Route21ScriptPointers: +Route21_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route21TextPointers: +Route21_TextPointers: dw Route21Text1 dw Route21Text2 dw Route21Text3 @@ -23,7 +23,6 @@ Route21TextPointers: dw Route21Text8 dw Route21Text9 -Route21TrainerHeaders: Route21TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0 db ($0 << 4) ; trainer's view range |