Use def_* macros for automatic map event counts

Resolves #742
This commit is contained in:
Rangi
2020-07-24 09:49:26 -04:00
parent 89c47f2170
commit dcb24bc724
392 changed files with 2750 additions and 2695 deletions

View File

@@ -1,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const MOUNTMOONSQUARE_FAIRY1
const MOUNTMOONSQUARE_FAIRY2
const MOUNTMOONSQUARE_ROCK
MountMoonSquare_MapScripts:
db 1 ; scene scripts
def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT
db 2 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
callback MAPCALLBACK_OBJECTS, .DisappearRock
@@ -133,19 +133,19 @@ DontLitterSignText:
MountMoonSquare_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 20, 5, MOUNT_MOON, 5
warp_event 22, 11, MOUNT_MOON, 6
warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1
db 1 ; coord events
def_coord_events
coord_event 7, 11, SCENE_DEFAULT, ClefairyDance
db 2 ; bg events
def_bg_events
bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
bg_event 17, 7, BGEVENT_READ, DontLitterSign
db 3 ; object events
def_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