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/redshouse1f.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/redshouse1f.asm')
| -rwxr-xr-x | data/mapObjects/redshouse1f.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 4d32ea3d..c70ee1f6 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -1,18 +1,18 @@ RedsHouse1FObject: db $0A ; border block - db $3 ; warps - db $7, $2, $0, $FF ; exit1 - db $7, $3, $0, $FF ; exit2 - db $1, $7, $0, REDS_HOUSE_2F ; staircase + db 3 ; warps + warp 2, 7, 0, -1 ; exit1 + warp 3, 7, 0, -1 ; exit2 + warp 7, 1, 0, REDS_HOUSE_2F ; staircase - db $1 ; signs - db $1, $3, $2 ; TV + db 1 ; signs + sign 3, 1, 2 ; TV - db $1 ; objects - object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom + db 1 ; objects + object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom ; warp-to - EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2 - EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $3 - EVENT_DISP REDS_HOUSE_1F_WIDTH, $1, $7 + warp_to 2, 7, REDS_HOUSE_1F_WIDTH + warp_to 3, 7, REDS_HOUSE_1F_WIDTH + warp_to 7, 1, REDS_HOUSE_1F_WIDTH |