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,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const SLOWPOKEWELLB1F_ROCKET1
const SLOWPOKEWELLB1F_ROCKET2
const SLOWPOKEWELLB1F_ROCKET3
@@ -10,9 +10,9 @@
const SLOWPOKEWELLB1F_POKE_BALL
SlowpokeWellB1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
SlowpokeWellB1FKurtScript:
jumptextfaceplayer SlowpokeWellB1FKurtText
@@ -321,15 +321,15 @@ SlowpokeWellB1FTaillessSlowpokeText:
SlowpokeWellB1F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 17, 15, AZALEA_TOWN, 6
warp_event 7, 11, SLOWPOKE_WELL_B2F, 1
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 9 ; object events
def_object_events
object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS