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 ROUTE37_WEIRD_TREE1
const ROUTE37_WEIRD_TREE2
const ROUTE37_YOUNGSTER
@@ -8,9 +8,9 @@
const ROUTE37_FRUIT_TREE3
Route37_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_OBJECTS, .Sunny
.Sunny:
@@ -238,15 +238,15 @@ Route37SignText:
Route37_MapEvents:
db 0, 0 ; filler
db 0 ; warp events
def_warp_events
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 5, 3, BGEVENT_READ, Route37Sign
bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther
db 7 ; object events
def_object_events
object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1