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/MountMoon.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/MountMoon.asm')
| -rw-r--r-- | maps/MountMoon.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 73306f424..38e5d436d 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,7 +1,7 @@ const_value set 2 const MOUNTMOON_SILVER -MountMoon_MapScriptHeader: +MountMoon_MapScripts: .SceneScripts: db 2 scene_script .RivalEncounter @@ -66,7 +66,7 @@ MountMoon_MapScriptHeader: closetext applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter disappear MOUNTMOON_SILVER - setscene $1 + setscene 1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end @@ -88,7 +88,7 @@ MountMoonSilverMovementAfter: step_end MountMoonSilverTextBefore: - text "<......> <......> <......>" + text "<……> <……> <……>" para "It's been a while," line "<PLAYER>." @@ -108,7 +108,7 @@ MountMoonSilverTextBefore: done MountMoonSilverTextWin: - text "<......> <......> <......>" + text "<……> <……> <……>" para "I thought I raised" line "my #MON to be" @@ -121,7 +121,7 @@ MountMoonSilverTextWin: done MountMoonSilverTextAfter: - text "<......> <......> <......>" + text "<……> <……> <……>" para "…You won, fair" line "and square." @@ -147,7 +147,7 @@ MountMoonSilverTextAfter: done MountMoonSilverTextLoss: - text "<......> <......> <......>" + text "<……> <……> <……>" para "I've repaid my" line "debt to you." @@ -160,7 +160,7 @@ MountMoonSilverTextLoss: cont "greatest trainer." done -MountMoon_MapEventHeader: +MountMoon_MapEvents: ; filler db 0, 0 |