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/BikeShop.asm | |
| parent | `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff) | |
| download | pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip | |
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/BikeShop.asm')
| -rw-r--r-- | data/maps/objects/BikeShop.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 6a6fe6d6..873d4fc1 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -1,15 +1,15 @@ BikeShop_Object: db $e ; border block - def_warps - warp 2, 7, 4, LAST_MAP - warp 3, 7, 4, LAST_MAP + def_warp_events + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 - def_signs + def_bg_events - def_objects - object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person - object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, UP_DOWN, 2 ; person - object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person + def_object_events + object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person + object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person + object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person def_warps_to BIKE_SHOP |