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/Route10.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/Route10.asm (renamed from scripts/route10.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route10.asm b/scripts/Route10.asm index ca0ab190..3fffa2c0 100755 --- a/scripts/route10.asm +++ b/scripts/Route10.asm @@ -1,18 +1,18 @@ -Route10Script: +Route10_Script: call EnableAutoTextBoxDrawing - ld hl, Route10TrainerHeaders - ld de, Route10ScriptPointers + ld hl, Route10TrainerHeader0 + ld de, Route10_ScriptPointers ld a, [wRoute10CurScript] call ExecuteCurMapScriptInTable ld [wRoute10CurScript], a ret -Route10ScriptPointers: +Route10_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route10TextPointers: +Route10_TextPointers: dw Route10Text1 dw Route10Text2 dw Route10Text3 @@ -24,7 +24,6 @@ Route10TextPointers: dw Route10Text9 dw Route10Text10 -Route10TrainerHeaders: Route10TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0 db ($4 << 4) ; trainer's view range |