diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/Route14.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/Route14.asm (renamed from scripts/route14.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route14.asm b/scripts/Route14.asm index 70f747c5..fdc84d74 100755 --- a/scripts/route14.asm +++ b/scripts/Route14.asm @@ -1,18 +1,18 @@ -Route14Script: +Route14_Script: call EnableAutoTextBoxDrawing - ld hl, Route14TrainerHeaders - ld de, Route14ScriptPointers + ld hl, Route14TrainerHeader0 + ld de, Route14_ScriptPointers ld a, [wRoute14CurScript] call ExecuteCurMapScriptInTable ld [wRoute14CurScript], a ret -Route14ScriptPointers: +Route14_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route14TextPointers: +Route14_TextPointers: dw Route14Text1 dw Route14Text2 dw Route14Text3 @@ -25,7 +25,6 @@ Route14TextPointers: dw Route14Text10 dw Route14Text11 -Route14TrainerHeaders: Route14TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0 db ($2 << 4) ; trainer's view range |