diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-03-27 14:11:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 14:11:59 -0500 |
| commit | e2e8bf6a8477af254ea7057028f72ac918b62005 (patch) | |
| tree | ffed0137cf81880afa4b0ec2fa30300565996f4b /data/mapObjects/beach_house.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| parent | Removed EVENT_DISP (diff) | |
| download | pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.gz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.xz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.zip | |
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/beach_house.asm')
| -rw-r--r-- | data/mapObjects/beach_house.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm index 71b4b7df..cbca9f28 100644 --- a/data/mapObjects/beach_house.asm +++ b/data/mapObjects/beach_house.asm @@ -2,19 +2,19 @@ BeachHouseObjects: db $a ; border block db 2 ; warps - db 7,2,0,$ff - db 7,3,0,$ff + warp 2,7,0,-1 + warp 3,7,0,-1 db 4 ; signs - db 0,3,3 - db 0,7,4 - db 0,$b,5 - db 1,$d,6 + sign 3,0,3 + sign 7,0,4 + sign 11,0,5 + sign 13,1,6 db 2 ; objects object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude object $3d, 5, 3, WALK, $01, 2 ; pikachu ; warp-to - EVENT_DISP BEACH_HOUSE_WIDTH,7,2 - EVENT_DISP BEACH_HOUSE_WIDTH,7,3 + warp_to 2,7, BEACH_HOUSE_WIDTH + warp_to 3,7, BEACH_HOUSE_WIDTH |