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/ssanne4.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/ssanne4.asm')
| -rwxr-xr-x | data/mapObjects/ssanne4.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index d1e72162..83852a5b 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -1,22 +1,22 @@ SSAnne4Object: - db $c ; border block + db 12 ; border block - db $6 ; warps - warp $17, $3, $8, SS_ANNE_10 - warp $13, $3, $6, SS_ANNE_10 - warp $f, $3, $4, SS_ANNE_10 - warp $b, $3, $2, SS_ANNE_10 - warp $7, $3, $0, SS_ANNE_10 - warp $1b, $5, $9, SS_ANNE_1 + db 6 ; warps + warp 23, 3, 8, SS_ANNE_10 + warp 19, 3, 6, SS_ANNE_10 + warp 15, 3, 4, SS_ANNE_10 + warp 11, 3, 2, SS_ANNE_10 + warp 7, 3, 0, SS_ANNE_10 + warp 27, 5, 9, SS_ANNE_1 - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $17, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $13, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $f, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $b, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $7, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $1b, $5, SS_ANNE_4_WIDTH ; SS_ANNE_1 + warp_to 23, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 19, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 15, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 11, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 7, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 27, 5, SS_ANNE_4_WIDTH ; SS_ANNE_1 |