summaryrefslogtreecommitdiff
path: root/maps/Route20.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/Route20.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/Route20.asm')
-rw-r--r--maps/Route20.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 7137999fe..e7a776b2b 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -3,13 +3,13 @@ const_value set 2
const ROUTE20_SWIMMER_GIRL2
const ROUTE20_SWIMMER_GUY
-Route20_MapScriptHeader:
+Route20_MapScripts:
.SceneScripts:
db 0
.MapCallbacks:
db 1
- dbw MAPCALLBACK_NEWMAP, .ClearRocks
+ callback MAPCALLBACK_NEWMAP, .ClearRocks
.ClearRocks:
setevent EVENT_CINNABAR_ROCKS_CLEARED
@@ -112,7 +112,7 @@ CinnabarGymSignText:
line "LEADER: BLAINE"
done
-Route20_MapEventHeader:
+Route20_MapEvents:
; filler
db 0, 0