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/Route6.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/Route6.asm (renamed from scripts/route6.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route6.asm b/scripts/Route6.asm index 7f3a5dda..6ee3f317 100755 --- a/scripts/route6.asm +++ b/scripts/Route6.asm @@ -1,18 +1,18 @@ -Route6Script: +Route6_Script: call EnableAutoTextBoxDrawing - ld hl, Route6TrainerHeaders - ld de, Route6ScriptPointers + ld hl, Route6TrainerHeader0 + ld de, Route6_ScriptPointers ld a, [wRoute6CurScript] call ExecuteCurMapScriptInTable ld [wRoute6CurScript], a ret -Route6ScriptPointers: +Route6_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route6TextPointers: +Route6_TextPointers: dw Route6Text1 dw Route6Text2 dw Route6Text3 @@ -21,7 +21,6 @@ Route6TextPointers: dw Route6Text6 dw Route6Text7 -Route6TrainerHeaders: Route6TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0 db ($0 << 4) ; trainer's view range |