diff options
Diffstat (limited to 'maps/MountMoonSquare.asm')
| -rw-r--r-- | maps/MountMoonSquare.asm | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 1d9848f3b..b12e7b391 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -4,12 +4,10 @@ const_value set 2 const MOUNTMOONSQUARE_ROCK MountMoonSquare_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .DisappearMoonStone callback MAPCALLBACK_OBJECTS, .DisappearRock @@ -75,7 +73,7 @@ ClefairyDance: end MountMoonSquareHiddenMoonStone: - hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE + hiddenitem MOON_STONE, EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE DontLitterSign: jumptext DontLitterSignText @@ -133,26 +131,21 @@ DontLitterSignText: done MountMoonSquare_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 20, 5, 5, MOUNT_MOON - warp_def 22, 11, 6, MOUNT_MOON - warp_def 13, 7, 1, MOUNT_MOON_GIFT_SHOP + db 3 ; warp events + warp_event 20, 5, 5, MOUNT_MOON + warp_event 22, 11, 6, MOUNT_MOON + warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP -.CoordEvents: - db 1 + db 1 ; coord events coord_event 7, 11, 0, ClefairyDance -.BGEvents: - db 2 + db 2 ; bg events bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone bg_event 17, 7, BGEVENT_READ, DontLitterSign -.ObjectEvents: - db 3 + db 3 ; object events object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK |