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 RADIOTOWER1F_RECEPTIONIST
const RADIOTOWER1F_LASS
const RADIOTOWER1F_YOUNGSTER
@@ -7,9 +7,9 @@
const RADIOTOWER1F_CARD_WOMAN
RadioTower1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
RadioTower1FReceptionistScript:
faceplayer
@@ -473,18 +473,18 @@ RadioTower1FLuckyChannelSignText:
RadioTower1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 2, 7, GOLDENROD_CITY, 11
warp_event 3, 7, GOLDENROD_CITY, 11
warp_event 15, 0, RADIO_TOWER_2F, 2
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 3, 0, BGEVENT_READ, RadioTower1FDirectory
bg_event 13, 0, BGEVENT_READ, RadioTower1FLuckyChannelSign
db 6 ; object events
def_object_events
object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FReceptionistScript, -1
object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS