diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /maps/Route13.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (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/Route13.asm')
| -rw-r--r-- | maps/Route13.asm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/maps/Route13.asm b/maps/Route13.asm index 59107f67f..88753afbb 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE13_POKEFAN_M2 const ROUTE13_POKEFAN_M3 -Route13_MapScriptHeader: +Route13_MapScripts: .SceneScripts: db 0 @@ -77,8 +77,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM - + hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM PokefanmAlexSeenText: text "Bow down before my" @@ -192,7 +191,7 @@ Route13DirectionsSignText: line "CITY" done -Route13_MapEventHeader: +Route13_MapEvents: ; filler db 0, 0 |