diff options
Diffstat (limited to 'maps/MountMoon.asm')
| -rw-r--r-- | maps/MountMoon.asm | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 38e5d436d..5b978bc0e 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -2,13 +2,11 @@ const_value set 2 const MOUNTMOON_SILVER MountMoon_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .RivalEncounter scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .RivalEncounter: priorityjump .RivalBattle @@ -20,7 +18,7 @@ MountMoon_MapScripts: .RivalBattle: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore playmusic MUSIC_RIVAL_ENCOUNTER @@ -161,26 +159,21 @@ MountMoonSilverTextLoss: done MountMoon_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 3, 3, 1, ROUTE_3 - warp_def 15, 15, 1, ROUTE_4 - warp_def 13, 3, 7, MOUNT_MOON - warp_def 15, 11, 8, MOUNT_MOON - warp_def 25, 5, 1, MOUNT_MOON_SQUARE - warp_def 25, 15, 2, MOUNT_MOON_SQUARE - warp_def 25, 3, 3, MOUNT_MOON - warp_def 25, 13, 4, MOUNT_MOON - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 + db 0, 0 ; filler + + db 8 ; warp events + warp_event 3, 3, 1, ROUTE_3 + warp_event 15, 15, 1, ROUTE_4 + warp_event 13, 3, 7, MOUNT_MOON + warp_event 15, 11, 8, MOUNT_MOON + warp_event 25, 5, 1, MOUNT_MOON_SQUARE + warp_event 25, 15, 2, MOUNT_MOON_SQUARE + warp_event 25, 3, 3, MOUNT_MOON + warp_event 25, 13, 4, MOUNT_MOON + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL |