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 CIANWOODLUGIASPEECHHOUSE_TEACHER
const CIANWOODLUGIASPEECHHOUSE_LASS
const CIANWOODLUGIASPEECHHOUSE_TWIN
CianwoodLugiaSpeechHouse_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
CianwoodLugiaSpeechHouseTeacherScript:
jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText
@@ -62,17 +62,17 @@ CianwoodLugiaSpeechHouseTwinText:
CianwoodLugiaSpeechHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 7, CIANWOOD_CITY, 6
warp_event 3, 7, CIANWOOD_CITY, 6
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
db 3 ; object events
def_object_events
object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1