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/Route12.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/Route12.asm (renamed from scripts/route12.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route12.asm b/scripts/Route12.asm index e61f41c0..510e7727 100755 --- a/scripts/route12.asm +++ b/scripts/Route12.asm @@ -1,7 +1,7 @@ -Route12Script: +Route12_Script: call EnableAutoTextBoxDrawing - ld hl, Route12TrainerHeaders - ld de, Route12ScriptPointers + ld hl, Route12TrainerHeader0 + ld de, Route12_ScriptPointers ld a, [wRoute12CurScript] call ExecuteCurMapScriptInTable ld [wRoute12CurScript], a @@ -14,7 +14,7 @@ Route12Script_59606: ld [wCurMapScript], a ret -Route12ScriptPointers: +Route12_ScriptPointers: dw Route12Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -60,7 +60,7 @@ Route12Script3: ld [wCurMapScript], a ret -Route12TextPointers: +Route12_TextPointers: dw Route12Text1 dw Route12Text2 dw Route12Text3 @@ -76,7 +76,6 @@ Route12TextPointers: dw Route12Text13 dw Route12Text14 -Route12TrainerHeaders: Route12TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0 db ($4 << 4) ; trainer's view range |