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/Route5.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/Route5.asm')
| -rw-r--r-- | maps/Route5.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route5.asm b/maps/Route5.asm index 7976fbe79..9bdf8a023 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE5_POKEFAN_M -Route5_MapScriptHeader: +Route5_MapScripts: .SceneScripts: db 0 @@ -39,15 +39,15 @@ HouseForSaleSignText: line "Nobody lives here." done -Route5_MapEventHeader: +Route5_MapEvents: ; filler db 0, 0 .Warps: db 4 warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_def 8, 17, 1, ROUTE_5_SAFFRON_CITY_GATE - warp_def 9, 17, 2, ROUTE_5_SAFFRON_CITY_GATE + warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE + warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE .CoordEvents: |