summaryrefslogtreecommitdiff
path: root/maps/Route4.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/Route4.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/Route4.asm')
-rw-r--r--maps/Route4.asm7
1 files changed, 3 insertions, 4 deletions
diff --git a/maps/Route4.asm b/maps/Route4.asm
index bd6ea62e5..a0bf7c4bc 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -4,7 +4,7 @@ const_value set 2
const ROUTE4_LASS2
const ROUTE4_POKE_BALL
-Route4_MapScriptHeader:
+Route4_MapScripts:
.SceneScripts:
db 0
@@ -51,8 +51,7 @@ Route4HPUp:
itemball HP_UP
Route4HiddenUltraBall:
- dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
-
+ hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
BirdKeeperHankSeenText:
text "I'm raising my"
@@ -121,7 +120,7 @@ MtMoonSquareSignText:
line "stairs."
done
-Route4_MapEventHeader:
+Route4_MapEvents:
; filler
db 0, 0