diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:49:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:57:16 -0400 |
| commit | dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch) | |
| tree | 4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/BattleTowerHallway.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/BattleTowerHallway.asm')
| -rw-r--r-- | maps/BattleTowerHallway.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 92f050580..c00a21b33 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -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 |