diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/Route23.asm | |
| parent | f1285f8584ce7ff50ceb5e3134c0efc867209096 (diff) | |
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289
* Rename warp to warp_event
* Replace object to object_event
* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
Diffstat (limited to 'data/maps/objects/Route23.asm')
| -rw-r--r-- | data/maps/objects/Route23.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index bd74afb4..fe5aadab 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -1,22 +1,22 @@ Route23_Object: db $f ; border block - def_warps - warp 7, 139, 2, ROUTE_22_GATE - warp 8, 139, 3, ROUTE_22_GATE - warp 4, 31, 0, VICTORY_ROAD_1F - warp 14, 31, 1, VICTORY_ROAD_2F + def_warp_events + warp_event 7, 139, ROUTE_22_GATE, 2 + warp_event 8, 139, ROUTE_22_GATE, 3 + warp_event 4, 31, VICTORY_ROAD_1F, 0 + warp_event 14, 31, VICTORY_ROAD_2F, 1 - def_signs - sign 3, 33, 8 ; Route23Text8 + def_bg_events + bg_event 3, 33, 8 ; Route23Text8 - def_objects - object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person - object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person - object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person - object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person - object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person - object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person - object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person + def_object_events + object_event 4, 35, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 10, 56, SPRITE_GUARD, STAY, DOWN, 2 ; person + object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, 3 ; person + object_event 11, 96, SPRITE_SWIMMER, STAY, DOWN, 4 ; person + object_event 12, 105, SPRITE_GUARD, STAY, DOWN, 5 ; person + object_event 8, 119, SPRITE_GUARD, STAY, DOWN, 6 ; person + object_event 8, 136, SPRITE_GUARD, STAY, DOWN, 7 ; person def_warps_to ROUTE_23 |