diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/BluesHouse.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/BluesHouse.asm')
| -rw-r--r-- | data/maps/objects/BluesHouse.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index f4931a47..8db28bb3 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -1,15 +1,15 @@ BluesHouse_Object: db $a ; border block - def_warps - warp 2, 7, 1, LAST_MAP - warp 3, 7, 1, LAST_MAP + def_warp_events + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 - def_signs + def_bg_events - def_objects - object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1, 0 ; 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 + def_object_events + object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1, 0 ; Daisy, sitting by map + object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table def_warps_to BLUES_HOUSE |