diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:49:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:57:16 -0400 |
| commit | dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch) | |
| tree | 4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/MountMoon.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
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 c0c5df796..25a3080fa 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 @@ -161,7 +161,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 @@ -171,9 +171,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 |