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 VICTORYROADGATE_OFFICER
const VICTORYROADGATE_BLACK_BELT1
const VICTORYROADGATE_BLACK_BELT2
VictoryRoadGate_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_FINISHED
db 0 ; callbacks
def_callbacks
.DummyScene0:
end
@@ -98,7 +98,7 @@ VictoryRoadGateRightBlackBeltText:
VictoryRoadGate_MapEvents:
db 0, 0 ; filler
db 8 ; warp events
def_warp_events
warp_event 17, 7, ROUTE_22, 1
warp_event 18, 7, ROUTE_22, 1
warp_event 9, 17, ROUTE_26, 1
@@ -108,12 +108,12 @@ VictoryRoadGate_MapEvents:
warp_event 1, 7, ROUTE_28, 2
warp_event 2, 7, ROUTE_28, 2
db 1 ; coord events
def_coord_events
coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene
db 0 ; bg events
def_bg_events
db 3 ; object events
def_object_events
object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX