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 PEWTERGYM_BROCK
const PEWTERGYM_YOUNGSTER
const PEWTERGYM_GYM_GUIDE
PewterGym_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
PewterGymBrockScript:
faceplayer
@@ -209,17 +209,17 @@ PewterGymGuideWinText:
PewterGym_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 4, 13, PEWTER_CITY, 2
warp_event 5, 13, PEWTER_CITY, 2
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 2, 11, BGEVENT_READ, PewterGymStatue
bg_event 7, 11, BGEVENT_READ, PewterGymStatue
db 3 ; object events
def_object_events
object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PewterGymBrockScript, -1
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
object_event 6, 11, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuideScript, -1