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 GOLDENRODDEPTSTOREB1F_POKE_BALL1
const GOLDENRODDEPTSTOREB1F_POKE_BALL2
const GOLDENRODDEPTSTOREB1F_POKE_BALL3
@@ -9,9 +9,9 @@
const GOLDENRODDEPTSTOREB1F_MACHOP
GoldenrodDeptStoreB1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 2 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .ClearBoxes
callback MAPCALLBACK_NEWMAP, .Unblock
@@ -110,16 +110,16 @@ GoldenrodDeptStoreB1FMachokeText:
GoldenrodDeptStoreB1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3
warp_event 9, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 1
warp_event 10, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 2
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 8 ; object events
def_object_events
object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL