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/Route2TradeHouse.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/Route2TradeHouse.asm')
| -rw-r--r-- | data/maps/objects/Route2TradeHouse.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index d14df485..3a7f1d72 100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -1,14 +1,14 @@ Route2TradeHouse_Object: db $a ; border block - def_warps - warp 2, 7, 2, LAST_MAP - warp 3, 7, 2, LAST_MAP + def_warp_events + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 - def_signs + def_bg_events - def_objects - object SPRITE_SCIENTIST, 2, 4, STAY, RIGHT, 1 ; person - object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person + def_object_events + object_event 2, 4, SPRITE_SCIENTIST, STAY, RIGHT, 1 ; person + object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person def_warps_to ROUTE_2_TRADE_HOUSE |