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/GameCorner.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/GameCorner.asm')
| -rw-r--r-- | data/maps/objects/GameCorner.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 4e425e86..f0d27ba7 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -1,25 +1,25 @@ GameCorner_Object: db $f ; border block - def_warps - warp 15, 17, 7, LAST_MAP - warp 16, 17, 7, LAST_MAP - warp 17, 4, 1, ROCKET_HIDEOUT_B1F + def_warp_events + warp_event 15, 17, LAST_MAP, 7 + warp_event 16, 17, LAST_MAP, 7 + warp_event 17, 4, ROCKET_HIDEOUT_B1F, 1 - def_signs - sign 9, 4, 12 ; CeladonGameCornerText12 + def_bg_events + bg_event 9, 4, 12 ; CeladonGameCornerText12 - def_objects - object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person - object SPRITE_CLERK, 5, 6, STAY, DOWN, 2 ; person - object SPRITE_MIDDLE_AGED_MAN, 2, 10, STAY, LEFT, 3 ; person - object SPRITE_BEAUTY, 2, 13, STAY, LEFT, 4 ; person - object SPRITE_FISHING_GURU, 5, 11, STAY, RIGHT, 5 ; person - object SPRITE_MIDDLE_AGED_WOMAN, 8, 11, STAY, LEFT, 6 ; person - object SPRITE_GYM_GUIDE, 8, 14, STAY, LEFT, 7 ; person - object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person - object SPRITE_MIDDLE_AGED_MAN, 14, 11, STAY, LEFT, 9 ; person - object SPRITE_FISHING_GURU, 17, 13, STAY, RIGHT, 10 ; person - object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 + def_object_events + object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person + object_event 5, 6, SPRITE_CLERK, STAY, DOWN, 2 ; person + object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 3 ; person + object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, 4 ; person + object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, 5 ; person + object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, 6 ; person + object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, 7 ; person + object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, 8 ; person + object_event 14, 11, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 9 ; person + object_event 17, 13, SPRITE_FISHING_GURU, STAY, RIGHT, 10 ; person + object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7 def_warps_to GAME_CORNER |