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/Route7.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/Route7.asm')
| -rw-r--r-- | data/maps/objects/Route7.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index 64b0387f..a48eea62 100644 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm @@ -1,16 +1,16 @@ Route7_Object: db $f ; border block - def_warps - warp 18, 9, 2, ROUTE_7_GATE - warp 18, 10, 2, ROUTE_7_GATE - warp 11, 9, 0, ROUTE_7_GATE - warp 11, 10, 0, ROUTE_7_GATE - warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 + def_warp_events + warp_event 18, 9, ROUTE_7_GATE, 2 + warp_event 18, 10, ROUTE_7_GATE, 2 + warp_event 11, 9, ROUTE_7_GATE, 0 + warp_event 11, 10, ROUTE_7_GATE, 0 + warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 0 - def_signs - sign 3, 13, 1 ; Route7Text1 + def_bg_events + bg_event 3, 13, 1 ; Route7Text1 - def_objects + def_object_events def_warps_to ROUTE_7 |