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 SPROUTTOWER2F_SAGE1
const SPROUTTOWER2F_SAGE2
const SPROUTTOWER2F_POKE_BALL
SproutTower2F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerSageNico:
trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script
@@ -85,18 +85,18 @@ SproutTower2FStatueText:
SproutTower2F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 6, 4, SPROUT_TOWER_1F, 3
warp_event 2, 6, SPROUT_TOWER_1F, 4
warp_event 17, 3, SPROUT_TOWER_1F, 5
warp_event 10, 14, SPROUT_TOWER_3F, 1
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 12, 15, BGEVENT_READ, SproutTower2FStatue
db 3 ; object events
def_object_events
object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER_2F_X_ACCURACY