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/Route15.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/Route15.asm (renamed from scripts/route15.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route15.asm b/scripts/Route15.asm index e3329ab4..d973eb9c 100755 --- a/scripts/route15.asm +++ b/scripts/Route15.asm @@ -1,18 +1,18 @@ -Route15Script: +Route15_Script: call EnableAutoTextBoxDrawing - ld hl, Route15TrainerHeaders - ld de, Route15ScriptPointers + ld hl, Route15TrainerHeader0 + ld de, Route15_ScriptPointers ld a, [wRoute15CurScript] call ExecuteCurMapScriptInTable ld [wRoute15CurScript], a ret -Route15ScriptPointers: +Route15_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route15TextPointers: +Route15_TextPointers: dw Route15Text1 dw Route15Text2 dw Route15Text3 @@ -26,7 +26,6 @@ Route15TextPointers: dw PickUpItemText dw Route15Text12 -Route15TrainerHeaders: Route15TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0 db ($2 << 4) ; trainer's view range |