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/ceruleanhouse1.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/ceruleanhouse1.asm')
| -rwxr-xr-x | data/mapObjects/ceruleanhouse1.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index 97e5b52d..efbbebd6 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -1,18 +1,18 @@ CeruleanHouse1Object: db $a ; border block - db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_GIRL, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_BULBASAUR, $4, $1, STAY, DOWN, $2 ; person - object SPRITE_ODDISH, $1, $4, STAY, NONE, $3 ; person - object SPRITE_SANDSHREW, $5, $3, STAY, LEFT, $4 ; person + db 4 ; objects + object SPRITE_GIRL, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BULBASAUR, 4, 1, STAY, DOWN, 2 ; person + object SPRITE_ODDISH, 1, 4, STAY, NONE, 3 ; person + object SPRITE_SANDSHREW, 5, 3, STAY, LEFT, 4 ; person ; warp-to - EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $3 + warp_to 2, 7, CERULEAN_HOUSE_1_WIDTH + warp_to 3, 7, CERULEAN_HOUSE_1_WIDTH |