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/BluesHouse.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/BluesHouse.asm')
| -rwxr-xr-x | data/maps/objects/BluesHouse.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 76c80d60..6a5ff757 100755 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -1,17 +1,15 @@ BluesHouse_Object: db $a ; border block - db 2 ; warps + def_warps warp 2, 7, 1, LAST_MAP warp 3, 7, 1, LAST_MAP - db 0 ; signs + def_signs - db 3 ; objects + def_objects object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map object SPRITE_DAISY, 6, 4, WALK, UP_DOWN, 2, 0 ; Daisy, walking around object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table - ; warp-to - warp_to 2, 7, BLUES_HOUSE_WIDTH - warp_to 3, 7, BLUES_HOUSE_WIDTH + def_warps_to BLUES_HOUSE |