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,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const ROCKTUNNELB1F_POKE_BALL1
const ROCKTUNNELB1F_POKE_BALL2
const ROCKTUNNELB1F_POKE_BALL3
RockTunnelB1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
RockTunnelB1FIron:
itemball IRON
@@ -23,18 +23,18 @@ RockTunnelB1FHiddenMaxPotion:
RockTunnelB1F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 3, 3, ROCK_TUNNEL_1F, 6
warp_event 17, 9, ROCK_TUNNEL_1F, 4
warp_event 23, 3, ROCK_TUNNEL_1F, 3
warp_event 25, 23, ROCK_TUNNEL_1F, 5
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
db 3 ; object events
def_object_events
object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE