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 MOUNTMORTARB1F_POKE_BALL1
const MOUNTMORTARB1F_POKE_BALL2
const MOUNTMORTARB1F_BOULDER
@@ -8,9 +8,9 @@
const MOUNTMORTARB1F_POKE_BALL5
MountMortarB1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
MountMortarB1FKiyoScript:
faceplayer
@@ -135,16 +135,16 @@ MountMortarB1FKiyoFullPartyText:
MountMortarB1F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5
warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
db 7 ; object events
def_object_events
object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1