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/Route15Gate1F.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/Route15Gate1F.asm')
| -rw-r--r-- | data/maps/objects/Route15Gate1F.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index e611e98b..24311f87 100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm @@ -1,16 +1,16 @@ Route15Gate1F_Object: db $a ; border block - def_warps - warp 0, 4, 0, LAST_MAP - warp 0, 5, 1, LAST_MAP - warp 7, 4, 2, LAST_MAP - warp 7, 5, 3, LAST_MAP - warp 6, 8, 0, ROUTE_15_GATE_2F + def_warp_events + warp_event 0, 4, LAST_MAP, 0 + warp_event 0, 5, LAST_MAP, 1 + warp_event 7, 4, LAST_MAP, 2 + warp_event 7, 5, LAST_MAP, 3 + warp_event 6, 8, ROUTE_15_GATE_2F, 0 - def_signs + def_bg_events - def_objects - object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person + def_object_events + object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person def_warps_to ROUTE_15_GATE_1F |