diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
| commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
| tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/VictoryRoad.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/VictoryRoad.asm')
| -rw-r--r-- | maps/VictoryRoad.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 834e0d76..5c7fdf23 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const VICTORYROAD_SILVER const VICTORYROAD_POKE_BALL1 const VICTORYROAD_POKE_BALL2 @@ -7,11 +7,11 @@ const VICTORYROAD_POKE_BALL5 VictoryRoad_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 @@ -239,7 +239,7 @@ VictoryRoadRivalVictoryText: VictoryRoad_MapEvents: db 0, 0 ; filler - db 10 ; warp events + def_warp_events warp_event 9, 67, VICTORY_ROAD_GATE, 5 warp_event 1, 49, VICTORY_ROAD, 3 warp_event 1, 35, VICTORY_ROAD, 2 @@ -251,15 +251,15 @@ VictoryRoad_MapEvents: warp_event 0, 27, VICTORY_ROAD, 8 warp_event 13, 5, ROUTE_23, 3 - db 2 ; coord events + def_coord_events coord_event 12, 8, SCENE_DEFAULT, VictoryRoadRivalLeft coord_event 13, 8, SCENE_DEFAULT, VictoryRoadRivalRight - db 2 ; bg events + def_bg_events bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal - db 6 ; object events + def_object_events object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE |