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/Route12.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/Route12.asm')
| -rw-r--r-- | maps/Route12.asm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/maps/Route12.asm b/maps/Route12.asm index 240ff0bb5..3aaf37991 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE12_POKE_BALL1 const ROUTE12_POKE_BALL2 -Route12_MapScriptHeader: +Route12_MapScripts: .SceneScripts: db 0 @@ -70,8 +70,7 @@ Route12Nugget: itemball NUGGET Route12HiddenElixer: - dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER - + hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER FisherMartinSeenText: text "Patience is the" @@ -167,7 +166,7 @@ FishingSpotSignText: text "FISHING SPOT" done -Route12_MapEventHeader: +Route12_MapEvents: ; filler db 0, 0 |