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/FuchsiaMart.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/FuchsiaMart.asm')
-rw-r--r-- | maps/FuchsiaMart.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 48ffdba5f..4ab7932f3 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -3,7 +3,7 @@ const_value set 2 const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F -FuchsiaMart_MapScriptHeader: +FuchsiaMart_MapScripts: .SceneScripts: db 0 @@ -37,7 +37,7 @@ FuchsiaMartCooltrainerFText: cont "town." done -FuchsiaMart_MapEventHeader: +FuchsiaMart_MapEvents: ; filler db 0, 0 |