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/BattleTowerOutside.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/BattleTowerOutside.asm')
| -rw-r--r-- | maps/BattleTowerOutside.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index f4d7e24a9..e38ab7c61 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER const BATTLETOWEROUTSIDE_BEAUTY const BATTLETOWEROUTSIDE_SAILOR const BATTLETOWEROUTSIDE_LASS BattleTowerOutside_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .Callback1 callback MAPCALLBACK_OBJECTS, .Callback2 @@ -134,18 +134,18 @@ BattleTowerOutsideText_DoorsOpen: BattleTowerOutside_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3 warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4 warp_event 8, 9, BATTLE_TOWER_1F, 1 warp_event 9, 9, BATTLE_TOWER_1F, 2 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 10, 10, BGEVENT_READ, BattleTowerOutsideSign - db 4 ; object events + def_object_events object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1 object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR |