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 ROUTE31VIOLETGATE_OFFICER
const ROUTE31VIOLETGATE_COOLTRAINER_F
Route31VioletGate_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
Route31VioletGateOfficerScript:
jumptextfaceplayer Route31VioletGateOfficerText
@@ -28,16 +28,16 @@ Route31VioletGateCooltrainerFText:
Route31VioletGate_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 0, 4, VIOLET_CITY, 8
warp_event 0, 5, VIOLET_CITY, 9
warp_event 9, 4, ROUTE_31, 1
warp_event 9, 5, ROUTE_31, 2
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 2 ; object events
def_object_events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1