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/RedsHouse1F.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/RedsHouse1F.asm')
| -rw-r--r-- | data/maps/objects/RedsHouse1F.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index f7cd0819..6099eb5d 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -1,15 +1,15 @@ RedsHouse1F_Object: db $a ; border block - def_warps - warp 2, 7, 0, LAST_MAP ; exit1 - warp 3, 7, 0, LAST_MAP ; exit2 - warp 7, 1, 0, REDS_HOUSE_2F ; staircase + def_warp_events + warp_event 2, 7, LAST_MAP, 0 ; exit1 + warp_event 3, 7, LAST_MAP, 0 ; exit2 + warp_event 7, 1, REDS_HOUSE_2F, 0 ; staircase - def_signs - sign 3, 1, 2 ; TV + def_bg_events + bg_event 3, 1, 2 ; TV - def_objects - object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom + def_object_events + object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom def_warps_to REDS_HOUSE_1F |