diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-20 19:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:07:42 -0400 |
| commit | 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch) | |
| tree | ddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/BikeShop.asm | |
| parent | Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff) | |
| parent | Comments explain the def_warps_to macros (diff) | |
| download | pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.gz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.xz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.zip | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/BikeShop.asm')
| -rwxr-xr-x | data/maps/objects/BikeShop.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 7f699ed6..5af0d996 100755 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -1,17 +1,15 @@ BikeShop_Object: db $e ; border block - db 2 ; warps + def_warps warp 2, 7, 4, LAST_MAP warp 3, 7, 4, LAST_MAP - db 0 ; signs + def_signs - db 3 ; objects + 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 - ; warp-to - warp_to 2, 7, BIKE_SHOP_WIDTH - warp_to 3, 7, BIKE_SHOP_WIDTH + def_warps_to BIKE_SHOP |