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/ssanne3.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/ssanne3.asm')
| -rwxr-xr-x | data/mapObjects/ssanne3.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 567f0363..fea7c143 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -1,15 +1,15 @@ SSAnne3Object: db $c ; border block - db $2 ; warps - db $3, $0, $0, SS_ANNE_5 - db $3, $13, $7, SS_ANNE_2 + db 2 ; warps + warp 0, 3, 0, SS_ANNE_5 + warp 19, 3, 7, SS_ANNE_2 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_SAILOR, $9, $3, WALK, $2, $1 ; person + db 1 ; objects + object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person ; warp-to - EVENT_DISP SS_ANNE_3_WIDTH, $3, $0 ; SS_ANNE_5 - EVENT_DISP SS_ANNE_3_WIDTH, $3, $13 ; SS_ANNE_2 + warp_to 0, 3, SS_ANNE_3_WIDTH ; SS_ANNE_BOW + warp_to 19, 3, SS_ANNE_3_WIDTH ; SS_ANNE_2F |