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/Route7.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/Route7.asm')
| -rw-r--r-- | data/maps/objects/Route7.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index d2346f2c..6dd9d92c 100644 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm @@ -1,16 +1,16 @@ Route7_Object: db $f ; border block - def_warps - warp 18, 9, 2, ROUTE_7_GATE - warp 18, 10, 3, ROUTE_7_GATE - warp 11, 9, 0, ROUTE_7_GATE - warp 11, 10, 1, ROUTE_7_GATE - warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 + def_warp_events + warp_event 18, 9, ROUTE_7_GATE, 2 + warp_event 18, 10, ROUTE_7_GATE, 3 + warp_event 11, 9, ROUTE_7_GATE, 0 + warp_event 11, 10, ROUTE_7_GATE, 1 + warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 0 - def_signs - sign 3, 13, 1 ; Route7Text1 + def_bg_events + bg_event 3, 13, 1 ; Route7Text1 - def_objects + def_object_events def_warps_to ROUTE_7 |