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 BATTLETOWERELEVATOR_RECEPTIONIST
BattleTowerElevator_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_FINISHED
db 0 ; callbacks
def_callbacks
.Scene0:
prioritysjump .RideElevator
@@ -44,13 +44,13 @@ MovementData_BattleTowerElevatorPlayerWalksIn:
BattleTowerElevator_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1
warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 1 ; object events
def_object_events
object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1