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/Route2.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/Route2.asm')
| -rw-r--r-- | maps/Route2.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm index 47abdc9f5..09b885df3 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE2_POKE_BALL4 const ROUTE2_FRUIT_TREE -Route2_MapScriptHeader: +Route2_MapScripts: .SceneScripts: db 0 @@ -70,16 +70,16 @@ FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: - dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER Route2HiddenFullHeal: - dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL Route2HiddenFullRestore: - dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE Route2HiddenRevive: - dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE BugCatcherRobSeenText: text "My bug #MON are" @@ -146,7 +146,7 @@ UnknownText_0x1ac49f: text "DIGLETT'S CAVE" done -Route2_MapEventHeader: +Route2_MapEvents: ; filler db 0, 0 |