diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 11:12:59 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 11:12:59 -0500 |
| commit | dd4f0a0064921f74fd68750848fca87ae21c4545 (patch) | |
| tree | 9b5aea440c39119121720a850a467bb5837c84da /data/mapObjects/ssanne3.asm | |
| parent | Add warp, sign, and warp_to macros for data/mapObjects definitions (diff) | |
| download | pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.gz pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.xz pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.zip | |
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/ssanne3.asm')
| -rwxr-xr-x | data/mapObjects/ssanne3.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index f431fe46..8de4c53d 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -1,15 +1,15 @@ SSAnne3Object: - db $c ; border block + db 12 ; border block - db $2 ; warps - warp $0, $3, $0, SS_ANNE_5 - warp $13, $3, $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 - warp_to $0, $3, SS_ANNE_3_WIDTH ; SS_ANNE_5 - warp_to $13, $3, SS_ANNE_3_WIDTH ; SS_ANNE_2 + warp_to 0, 3, SS_ANNE_3_WIDTH ; SS_ANNE_5 + warp_to 19, 3, SS_ANNE_3_WIDTH ; SS_ANNE_2 |