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/Route8.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/Route8.asm')
| -rw-r--r-- | data/maps/objects/Route8.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index aaa69ea2..ff24aa24 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -1,25 +1,25 @@ Route8_Object: db $2c ; border block - def_warps - warp 1, 9, 0, ROUTE_8_GATE - warp 1, 10, 0, ROUTE_8_GATE - warp 8, 9, 2, ROUTE_8_GATE - warp 8, 10, 2, ROUTE_8_GATE - warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 + def_warp_events + warp_event 1, 9, ROUTE_8_GATE, 0 + warp_event 1, 10, ROUTE_8_GATE, 0 + warp_event 8, 9, ROUTE_8_GATE, 2 + warp_event 8, 10, ROUTE_8_GATE, 2 + warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 0 - def_signs - sign 17, 3, 10 ; Route8Text10 + def_bg_events + bg_event 17, 3, 10 ; Route8Text10 - def_objects - object SPRITE_SUPER_NERD, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 - object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 - object SPRITE_SUPER_NERD, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 - object SPRITE_COOLTRAINER_F, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 - object SPRITE_SUPER_NERD, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 - object SPRITE_COOLTRAINER_F, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 - object SPRITE_COOLTRAINER_F, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 - object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 - object SPRITE_COOLTRAINER_F, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 + def_object_events + object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 + object_event 13, 9, SPRITE_GAMBLER, STAY, UP, 2, OPP_GAMBLER, 5 + object_event 42, 6, SPRITE_SUPER_NERD, STAY, UP, 3, OPP_SUPER_NERD, 4 + object_event 26, 3, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 13 + object_event 26, 4, SPRITE_SUPER_NERD, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 + object_event 26, 5, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 14 + object_event 26, 6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_LASS, 15 + object_event 46, 13, SPRITE_GAMBLER, STAY, DOWN, 8, OPP_GAMBLER, 7 + object_event 51, 12, SPRITE_COOLTRAINER_F, STAY, LEFT, 9, OPP_LASS, 16 def_warps_to ROUTE_8 |