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 SILVERCAVEROOM1_POKE_BALL1
const SILVERCAVEROOM1_POKE_BALL2
const SILVERCAVEROOM1_POKE_BALL3
const SILVERCAVEROOM1_POKE_BALL4
SilverCaveRoom1_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
SilverCaveRoom1MaxElixer:
itemball MAX_ELIXER
@@ -30,17 +30,17 @@ SilverCaveRoom1HiddenUltraBall:
SilverCaveRoom1_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2
warp_event 15, 1, SILVER_CAVE_ROOM_2, 1
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 16, 23, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit
bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall
db 4 ; object events
def_object_events
object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE