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/PewterGym.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/PewterGym.asm')
| -rw-r--r-- | data/maps/objects/PewterGym.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index 9c21701a..2e3fb6ed 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -1,15 +1,15 @@ PewterGym_Object: db $3 ; border block - def_warps - warp 4, 13, 2, LAST_MAP - warp 5, 13, 2, LAST_MAP + def_warp_events + warp_event 4, 13, LAST_MAP, 2 + warp_event 5, 13, LAST_MAP, 2 - def_signs + def_bg_events - def_objects - object SPRITE_SUPER_NERD, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 - object SPRITE_COOLTRAINER_M, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 3 ; person + def_object_events + object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1 + object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 + object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person def_warps_to PEWTER_GYM |