summaryrefslogtreecommitdiff
path: root/maps/MountMoonSquare.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MountMoonSquare.asm')
-rw-r--r--maps/MountMoonSquare.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index d92ede729..0bfff1457 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -4,16 +4,16 @@ const_value set 2
const MOUNTMOONSQUARE_ROCK
MountMoonSquare_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 1
- maptrigger .DummyTrigger
+ scene_script .DummyScene
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone
dbw MAPCALLBACK_OBJECTS, .DisappearRock
-.DummyTrigger:
+.DummyScene:
end
.DisappearMoonStone:
@@ -143,17 +143,17 @@ MountMoonSquare_MapEventHeader:
warp_def $b, $16, 6, MOUNT_MOON
warp_def $7, $d, 1, MOUNT_MOON_GIFT_SHOP
-.XYTriggers:
+.CoordEvents:
db 1
- xy_trigger 0, $b, $7, ClefairyDance
+ coord_event 0, $b, $7, ClefairyDance
-.Signposts:
+.BGEvents:
db 2
- signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone
- signpost 7, 17, SIGNPOST_READ, DontLitterSign
+ bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
+ bg_event 7, 17, BGEVENT_READ, DontLitterSign
-.PersonEvents:
+.ObjectEvents:
db 3
- person_event SPRITE_FAIRY, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
- person_event SPRITE_FAIRY, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
- person_event SPRITE_ROCK, 7, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
+ object_event SPRITE_FAIRY, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
+ object_event SPRITE_FAIRY, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
+ object_event SPRITE_ROCK, 7, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK