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/Route8.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/Route8.asm (renamed from scripts/route8.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route8.asm b/scripts/Route8.asm index 34e6aba4..f3388505 100755 --- a/scripts/route8.asm +++ b/scripts/Route8.asm @@ -1,18 +1,18 @@ -Route8Script: +Route8_Script: call EnableAutoTextBoxDrawing - ld hl, Route8TrainerHeaders - ld de, Route8ScriptPointers + ld hl, Route8TrainerHeader0 + ld de, Route8_ScriptPointers ld a, [wRoute8CurScript] call ExecuteCurMapScriptInTable ld [wRoute8CurScript], a ret -Route8ScriptPointers: +Route8_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route8TextPointers: +Route8_TextPointers: dw Route8Text1 dw Route8Text2 dw Route8Text3 @@ -24,7 +24,6 @@ Route8TextPointers: dw Route8Text9 dw Route8Text10 -Route8TrainerHeaders: Route8TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0 db ($4 << 4) ; trainer's view range |