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/PewterPokecenter.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/PewterPokecenter.asm')
| -rw-r--r-- | data/maps/objects/PewterPokecenter.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index e9a40d20..c9618df6 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -1,18 +1,18 @@ PewterPokecenter_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_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person - object SPRITE_JIGGLYPUFF, 1, 3, STAY, DOWN, 3 ; person - object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_COOLTRAINER_F, 4, 3, STAY, UP, 5 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 6 ; person + def_object_events + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person + object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person + object_event 1, 3, SPRITE_JIGGLYPUFF, STAY, DOWN, 3 ; person + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 4, 3, SPRITE_COOLTRAINER_F, STAY, UP, 5 ; person + object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; person def_warps_to PEWTER_POKECENTER |