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/SaffronPokecenter.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/SaffronPokecenter.asm')
| -rw-r--r-- | data/maps/objects/SaffronPokecenter.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index ab52a72c..52a21b80 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -1,17 +1,17 @@ SaffronPokecenter_Object: db $0 ; border block - def_warps - warp 3, 7, 6, LAST_MAP - warp 4, 7, 6, LAST_MAP + def_warp_events + warp_event 3, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 6 - def_signs + def_bg_events - def_objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BEAUTY, 5, 5, STAY, NONE, 2 ; person - object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person - object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person + def_object_events + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person + object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, 2 ; person + object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to SAFFRON_POKECENTER |