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,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const CELADONMANSION1F_GRANNY
const CELADONMANSION1F_GROWLITHE1
const CELADONMANSION1F_CLEFAIRY
const CELADONMANSION1F_GROWLITHE2
CeladonMansion1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
CeladonMansionManager:
jumptextfaceplayer CeladonMansionManagerText
@@ -75,21 +75,21 @@ CeladonMansionManagersSuiteSignText:
CeladonMansion1F_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
def_warp_events
warp_event 6, 9, CELADON_CITY, 2
warp_event 7, 9, CELADON_CITY, 2
warp_event 3, 0, CELADON_CITY, 3
warp_event 0, 0, CELADON_MANSION_2F, 1
warp_event 7, 0, CELADON_MANSION_2F, 4
db 0 ; coord events
def_coord_events
db 3 ; bg events
def_bg_events
bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign
bg_event 0, 3, BGEVENT_READ, CeladonMansion1FBookshelf
bg_event 2, 3, BGEVENT_READ, CeladonMansion1FBookshelf
db 4 ; object events
def_object_events
object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1