aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route6.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2019-01-13 22:38:16 -0600
committerGitHub <noreply@github.com>2019-01-13 22:38:16 -0600
commit725b86ebbec23bd1f53fd60bf0201c904fee951d (patch)
treea37f4d33c5b77635c7ff72b91a73fcd90c4af915 /scripts/Route6.asm
parentMerge pull request #195 from Rangi42/master (diff)
parentRename map files, labels, and constants to be consistent and work with Polish... (diff)
downloadpokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz
pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz
pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
-rwxr-xr-xscripts/Route6.asm (renamed from scripts/route6.asm)8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/route6.asm b/scripts/Route6.asm
index ba727adc..9f43b800 100755
--- a/scripts/route6.asm
+++ b/scripts/Route6.asm
@@ -1,18 +1,18 @@
-Route6Script:
+Route6_Script:
call EnableAutoTextBoxDrawing
ld hl, Route6TrainerHeader0
- ld de, Route6ScriptPointers
+ 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