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/Route6.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/Route6.asm')
| -rw-r--r-- | maps/Route6.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm index d19033031..9a66c5844 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE6_POKEFAN_M2 const ROUTE6_POKEFAN_M3 -Route6_MapScriptHeader: +Route6_MapScripts: .SceneScripts: db 0 @@ -91,7 +91,7 @@ PokefanmAllanAfterBattleText: cont "your heart melt?" done -Route6_MapEventHeader: +Route6_MapEvents: ; filler db 0, 0 |