aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route6.asm
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xscripts/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