summaryrefslogtreecommitdiff
path: root/maps/MountMoon.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MountMoon.asm')
-rw-r--r--maps/MountMoon.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 1b0ef248..0addd2b0 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -1,12 +1,12 @@
- object_const_def ; object_event constants
+ object_const_def
const MOUNTMOON_SILVER
MountMoon_MapScripts:
- db 2 ; scene scripts
+ def_scene_scripts
scene_script .RivalEncounter ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
- db 0 ; callbacks
+ def_callbacks
.RivalEncounter:
prioritysjump .RivalBattle
@@ -163,7 +163,7 @@ MountMoonSilverTextLoss:
MountMoon_MapEvents:
db 0, 0 ; filler
- db 8 ; warp events
+ def_warp_events
warp_event 3, 3, ROUTE_3, 1
warp_event 15, 15, ROUTE_4, 1
warp_event 13, 3, MOUNT_MOON, 7
@@ -173,9 +173,9 @@ MountMoon_MapEvents:
warp_event 25, 3, MOUNT_MOON, 3
warp_event 25, 13, MOUNT_MOON, 4
- db 0 ; coord events
+ def_coord_events
- db 0 ; bg events
+ def_bg_events
- db 1 ; object events
+ def_object_events
object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL