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 RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1
const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2
const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3
const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4
RuinsOfAlphOmanyteItemRoom_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
RuinsOfAlphOmanyteItemRoomMysteryberry:
itemball MYSTERYBERRY
@@ -33,19 +33,19 @@ RuinsOfAlphOmanyteItemRoomAncientReplicaText:
RuinsOfAlphOmanyteItemRoom_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1
warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 2, 1, BGEVENT_READ, RuinsOfAlphOmanyteItemRoomAncientReplica
bg_event 5, 1, BGEVENT_READ, RuinsOfAlphOmanyteItemRoomAncientReplica
db 4 ; object events
def_object_events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM