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/Route16.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/Route16.asm (renamed from scripts/route16.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route16.asm b/scripts/Route16.asm index fe38fac4..54f83380 100755 --- a/scripts/route16.asm +++ b/scripts/Route16.asm @@ -1,7 +1,7 @@ -Route16Script: +Route16_Script: call EnableAutoTextBoxDrawing - ld hl, Route16TrainerHeaders - ld de, Route16ScriptPointers + ld hl, Route16TrainerHeader0 + ld de, Route16_ScriptPointers ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable ld [wRoute16CurScript], a @@ -14,7 +14,7 @@ Route16Script_59946: ld [wCurMapScript], a ret -Route16ScriptPointers: +Route16_ScriptPointers: dw Route16Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -61,7 +61,7 @@ Route16Script3: ld [wCurMapScript], a ret -Route16TextPointers: +Route16_TextPointers: dw Route16Text1 dw Route16Text2 dw Route16Text3 @@ -74,7 +74,6 @@ Route16TextPointers: dw Route16Text10 dw Route16Text11 -Route16TrainerHeaders: Route16TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0 db ($3 << 4) ; trainer's view range |