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 CERULEANPOLICESTATION_FISHING_GURU
const CERULEANPOLICESTATION_POKEFAN_F
const CERULEANPOLICESTATION_DIGLETT
CeruleanPoliceStation_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
CeruleanPoliceStationFishingGuruScript:
jumptextfaceplayer CeruleanPoliceStationFishingGuruText
@@ -44,15 +44,15 @@ CeruleanDiglettText:
CeruleanPoliceStation_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 7, CERULEAN_CITY, 2
warp_event 3, 7, CERULEAN_CITY, 2
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 3 ; object events
def_object_events
object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1