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/safarizonesecrethouse.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/safarizonesecrethouse.asm')
| -rwxr-xr-x | data/mapObjects/safarizonesecrethouse.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index a96115b8..4faa90c6 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -1,15 +1,15 @@ SafariZoneSecretHouseObject: db $17 ; border block - db $2 ; warps - db $7, $2, $6, SAFARI_ZONE_WEST - db $7, $3, $6, SAFARI_ZONE_WEST + db 2 ; warps + warp 2, 7, 6, SAFARI_ZONE_WEST + warp 3, 7, 6, SAFARI_ZONE_WEST - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FISHER, $3, $3, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $3 ; SAFARI_ZONE_WEST + warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST |