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/VermilionGym.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/VermilionGym.asm')
| -rw-r--r-- | data/maps/objects/VermilionGym.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index ce0fd9f0..234b78c7 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -1,17 +1,17 @@ VermilionGym_Object: db $3 ; border block - def_warps - warp 4, 17, 3, LAST_MAP - warp 5, 17, 3, LAST_MAP + def_warp_events + warp_event 4, 17, LAST_MAP, 3 + warp_event 5, 17, LAST_MAP, 3 - def_signs + def_bg_events - def_objects - object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 - object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 - object SPRITE_SUPER_NERD, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 - object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 - object SPRITE_GYM_GUIDE, 4, 14, STAY, DOWN, 5 ; person + def_object_events + object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1 + object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3 + object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1 + object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8 + object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person def_warps_to VERMILION_GYM |