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/CeladonMartRoof.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/CeladonMartRoof.asm')
| -rwxr-xr-x | data/maps/objects/CeladonMartRoof.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index b358183e..543dc9b5 100755 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -1,18 +1,17 @@ CeladonMartRoof_Object: db $42 ; border block - db 1 ; warps + def_warps warp 15, 2, 0, CELADON_MART_5F - db 4 ; signs + def_signs sign 10, 1, 3 ; CeladonMartRoofText3 sign 11, 1, 4 ; CeladonMartRoofText4 sign 12, 2, 5 ; CeladonMartRoofText5 sign 13, 2, 6 ; CeladonMartRoofText6 - db 2 ; objects + def_objects object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person object SPRITE_LITTLE_GIRL, 5, 5, WALK, ANY_DIR, 2 ; person - ; warp-to - warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F + def_warps_to CELADON_MART_ROOF |