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/Route16Gate1F.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/Route16Gate1F.asm')
| -rw-r--r-- | data/maps/objects/Route16Gate1F.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index 4f876e7f..229ee0a0 100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm @@ -1,21 +1,21 @@ Route16Gate1F_Object: db $a ; border block - def_warps - warp 0, 8, 0, LAST_MAP - warp 0, 9, 1, LAST_MAP - warp 7, 8, 2, LAST_MAP - warp 7, 9, 2, LAST_MAP - warp 0, 2, 4, LAST_MAP - warp 0, 3, 5, LAST_MAP - warp 7, 2, 6, LAST_MAP - warp 7, 3, 7, LAST_MAP - warp 6, 12, 0, ROUTE_16_GATE_2F + def_warp_events + warp_event 0, 8, LAST_MAP, 0 + warp_event 0, 9, LAST_MAP, 1 + warp_event 7, 8, LAST_MAP, 2 + warp_event 7, 9, LAST_MAP, 2 + warp_event 0, 2, LAST_MAP, 4 + warp_event 0, 3, LAST_MAP, 5 + warp_event 7, 2, LAST_MAP, 6 + warp_event 7, 3, LAST_MAP, 7 + warp_event 6, 12, ROUTE_16_GATE_2F, 0 - def_signs + def_bg_events - def_objects - object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person - object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person + def_object_events + object_event 4, 5, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 4, 3, SPRITE_GAMBLER, STAY, NONE, 2 ; person def_warps_to ROUTE_16_GATE_1F |