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 ROUTE32RUINSOFALPHGATE_OFFICER
const ROUTE32RUINSOFALPHGATE_POKEFAN_M
const ROUTE32RUINSOFALPHGATE_YOUNGSTER
Route32RuinsOfAlphGate_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
Route32RuinsOfAlphGateOfficerScript:
jumptextfaceplayer Route32RuinsOfAlphGateOfficerText
@@ -47,17 +47,17 @@ Route32RuinsOfAlphGateYoungsterText:
Route32RuinsOfAlphGate_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10
warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11
warp_event 9, 4, ROUTE_32, 2
warp_event 9, 5, ROUTE_32, 3
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 3 ; object events
def_object_events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1