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/MtMoonB2F.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/MtMoonB2F.asm')
| -rw-r--r-- | data/maps/objects/MtMoonB2F.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index b2c1ff1d..3c3d8f7a 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -1,24 +1,24 @@ MtMoonB2F_Object: db $3 ; border block - def_warps - warp 25, 9, 1, MT_MOON_B1F - warp 21, 17, 4, MT_MOON_B1F - warp 15, 27, 5, MT_MOON_B1F - warp 5, 7, 6, MT_MOON_B1F + def_warp_events + warp_event 25, 9, MT_MOON_B1F, 1 + warp_event 21, 17, MT_MOON_B1F, 4 + warp_event 15, 27, MT_MOON_B1F, 5 + warp_event 5, 7, MT_MOON_B1F, 6 - def_signs + def_bg_events - def_objects - object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 - object SPRITE_JESSIE, 9, 3, STAY, LEFT, 2 - object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 - object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 - object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 1 - object SPRITE_JAMES, 9, 4, STAY, LEFT, 6 - object SPRITE_FOSSIL, 12, 6, STAY, NONE, 7 ; person - object SPRITE_FOSSIL, 13, 6, STAY, NONE, 8 ; person - object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 9, HP_UP - object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 10, TM_MEGA_PUNCH + def_object_events + object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 + object_event 9, 3, SPRITE_JESSIE, STAY, LEFT, 2 + object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2 + object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3 + object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 1 + object_event 9, 4, SPRITE_JAMES, STAY, LEFT, 6 + object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person + object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 8 ; person + object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP + object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 10, TM_MEGA_PUNCH def_warps_to MT_MOON_B2F |