Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use def_* macros for automatic map event counts

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
maps/BattleTowerHallway.asm
View File

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const BATTLETOWERHALLWAY_RECEPTIONIST
BattleTowerHallway_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 .ChooseBattleRoom
@@ -77,7 +77,7 @@ BattleTowerHallway_MapScripts:
BattleTowerHallway_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
def_warp_events
warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1
warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1
warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1
@@ -85,9 +85,9 @@ BattleTowerHallway_MapEvents:
warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1
warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 1 ; object events
def_object_events
object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1