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,11 +1,11 @@
object_const_def ; object_event constants
object_const_def
const FIGHTINGDOJO_BLACK_BELT
const FIGHTINGDOJO_POKE_BALL
FightingDojo_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
FightingDojoBlackBelt:
jumptextfaceplayer FightingDojoBlackBeltText
@@ -43,16 +43,16 @@ FightingDojoSign2Text:
FightingDojo_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 4, 11, SAFFRON_CITY, 1
warp_event 5, 11, SAFFRON_CITY, 1
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 4, 0, BGEVENT_READ, FightingDojoSign1
bg_event 5, 0, BGEVENT_READ, FightingDojoSign2
db 2 ; object events
def_object_events
object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND