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,11 +1,11 @@
object_const_def ; object_event constants
object_const_def
const SILPHCO1F_RECEPTIONIST
const SILPHCO1F_OFFICER
SilphCo1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
SilphCoReceptionistScript:
jumptextfaceplayer SilphCoReceptionistText
@@ -56,14 +56,14 @@ SilphCoOfficerText_GotUpGrade:
SilphCo1F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 7, SAFFRON_CITY, 7
warp_event 3, 7, SAFFRON_CITY, 7
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 2 ; object events
def_object_events
object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionistScript, -1
object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoOfficerScript, -1