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,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const ICEPATH1F_POKE_BALL1
const ICEPATH1F_POKE_BALL2
const ICEPATH1F_POKE_BALL3
IcePath1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
IcePath1FHMWaterfall:
itemball HM_WATERFALL
@@ -20,17 +20,17 @@ IcePath1FProtein:
IcePath1F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 4, 19, ROUTE_44, 1
warp_event 36, 27, BLACKTHORN_CITY, 7
warp_event 37, 5, ICE_PATH_B1F, 1
warp_event 37, 13, ICE_PATH_B1F, 7
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 3 ; object events
def_object_events
object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN