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,14 +1,14 @@
object_const_def ; object_event constants
object_const_def
const RUINSOFALPHINNERCHAMBER_FISHER
const RUINSOFALPHINNERCHAMBER_TEACHER
const RUINSOFALPHINNERCHAMBER_GRAMPS
RuinsOfAlphInnerChamber_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_NOTHING
scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
db 0 ; callbacks
def_callbacks
.DummyScene0:
end
@@ -77,7 +77,7 @@ RuinsOfAlphInnerChamberStatueText:
RuinsOfAlphInnerChamber_MapEvents:
db 0, 0 ; filler
db 9 ; warp events
def_warp_events
warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5
warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3
warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4
@@ -88,9 +88,9 @@ RuinsOfAlphInnerChamber_MapEvents:
warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3
warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4
db 0 ; coord events
def_coord_events
db 26 ; bg events
def_bg_events
bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
@@ -118,7 +118,7 @@ RuinsOfAlphInnerChamber_MapEvents:
bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
db 3 ; object events
def_object_events
object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS