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,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const POKEMONFANCLUB_CHAIRMAN
const POKEMONFANCLUB_RECEPTIONIST
const POKEMONFANCLUB_CLEFAIRY_GUY
@@ -7,9 +7,9 @@
const POKEMONFANCLUB_ODDISH
PokemonFanClub_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
PokemonFanClubChairmanScript:
faceplayer
@@ -297,17 +297,17 @@ PokemonFanClubBraggingSignText:
PokemonFanClub_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 7, VERMILION_CITY, 3
warp_event 3, 7, VERMILION_CITY, 3
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 7, 0, BGEVENT_READ, PokemonFanClubListenSign
bg_event 9, 0, BGEVENT_READ, PokemonFanClubBraggingSign
db 6 ; object events
def_object_events
object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubChairmanScript, -1
object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1