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 ROUTE16GATE_OFFICER
Route16Gate_MapScripts:
db 1 ; scene scripts
def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT
db 0 ; callbacks
def_callbacks
.DummyScene:
end
@@ -61,17 +61,17 @@ Route16GateCannotPassText:
Route16Gate_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 0, 4, ROUTE_16, 4
warp_event 0, 5, ROUTE_16, 5
warp_event 9, 4, ROUTE_16, 2
warp_event 9, 5, ROUTE_16, 3
db 2 ; coord events
def_coord_events
coord_event 5, 4, SCENE_DEFAULT, Route16GateBicycleCheck
coord_event 5, 5, SCENE_DEFAULT, Route16GateBicycleCheck
db 0 ; bg events
def_bg_events
db 1 ; object events
def_object_events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1