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/MtMoon1F.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/MtMoon1F.asm')
| -rw-r--r-- | data/maps/objects/MtMoon1F.asm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index 8b40ac4f..4f72fcda 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -1,29 +1,29 @@ MtMoon1F_Object: db $3 ; border block - def_warps - warp 14, 35, 1, LAST_MAP - warp 15, 35, 1, LAST_MAP - warp 5, 5, 0, MT_MOON_B1F - warp 17, 11, 2, MT_MOON_B1F - warp 25, 15, 3, MT_MOON_B1F + def_warp_events + warp_event 14, 35, LAST_MAP, 1 + warp_event 15, 35, LAST_MAP, 1 + warp_event 5, 5, MT_MOON_B1F, 0 + warp_event 17, 11, MT_MOON_B1F, 2 + warp_event 25, 15, MT_MOON_B1F, 3 - def_signs - sign 15, 23, 14 ; MtMoon1Text14 + def_bg_events + bg_event 15, 23, 14 ; MtMoon1Text14 - def_objects - object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 - object SPRITE_YOUNGSTER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 - object SPRITE_COOLTRAINER_F, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 - object SPRITE_SUPER_NERD, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 - object SPRITE_COOLTRAINER_F, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 - object SPRITE_YOUNGSTER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 - object SPRITE_YOUNGSTER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 - object SPRITE_POKE_BALL, 2, 20, STAY, NONE, 8, POTION - object SPRITE_POKE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE - object SPRITE_POKE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY - object SPRITE_POKE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE - object SPRITE_POKE_BALL, 20, 33, STAY, NONE, 12, POTION - object SPRITE_POKE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN + def_object_events + object_event 5, 6, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 1 + object_event 12, 16, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 + object_event 30, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_LASS, 5 + object_event 24, 31, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 1 + object_event 16, 23, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_LASS, 6 + object_event 7, 22, SPRITE_YOUNGSTER, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 + object_event 30, 27, SPRITE_YOUNGSTER, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 + object_event 2, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POTION + object_event 2, 2, SPRITE_POKE_BALL, STAY, NONE, 9, MOON_STONE + object_event 35, 31, SPRITE_POKE_BALL, STAY, NONE, 10, RARE_CANDY + object_event 36, 23, SPRITE_POKE_BALL, STAY, NONE, 11, ESCAPE_ROPE + object_event 20, 33, SPRITE_POKE_BALL, STAY, NONE, 12, POTION + object_event 5, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_WATER_GUN def_warps_to MT_MOON_1F |