summaryrefslogtreecommitdiff
path: root/maps/Route15.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-01-22 01:06:48 -0500
committerGitHub <noreply@github.com>2018-01-22 01:06:48 -0500
commitc60f1331fef22b886adf3472d2b4f348832cfaf7 (patch)
tree5a471fad61e406f5b3ca1aba67ced0186de01c52 /maps/Route15.asm
parentf27f79488a460f0a89670f3611e1e9e175baf5d6 (diff)
parent7fba864883732ccecb1221ae7ff97492d112362a (diff)
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'maps/Route15.asm')
-rw-r--r--maps/Route15.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 59232fd8f..58fe79c9b 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -7,7 +7,7 @@ const_value set 2
const ROUTE15_TEACHER2
const ROUTE15_POKE_BALL
-Route15_MapScriptHeader:
+Route15_MapScripts:
.SceneScripts:
db 0
@@ -201,7 +201,7 @@ Route15SignText:
line "LAVENDER TOWN"
done
-Route15_MapEventHeader:
+Route15_MapEvents:
; filler
db 0, 0