aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route19.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/Route19.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to '')
-rwxr-xr-xscripts/Route19.asm (renamed from scripts/route19.asm)11
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/route19.asm b/scripts/Route19.asm
index 162c4548..febeb9a4 100755
--- a/scripts/route19.asm
+++ b/scripts/Route19.asm
@@ -1,18 +1,18 @@
-Route19Script:
+Route19_Script:
call EnableAutoTextBoxDrawing
- ld hl, Route19TrainerHeaders
- ld de, Route19ScriptPointers
+ ld hl, Route19TrainerHeader0
+ ld de, Route19_ScriptPointers
ld a, [wRoute19CurScript]
call ExecuteCurMapScriptInTable
ld [wRoute19CurScript], a
ret
-Route19ScriptPointers:
+Route19_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-Route19TextPointers:
+Route19_TextPointers:
dw Route19Text1
dw Route19Text2
dw Route19Text3
@@ -25,7 +25,6 @@ Route19TextPointers:
dw Route19Text10
dw Route19Text11
-Route19TrainerHeaders:
Route19TrainerHeader0:
dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0
db ($4 << 4) ; trainer's view range