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/seafoamislands1.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/seafoamislands1.asm')
| -rwxr-xr-x | data/mapObjects/seafoamislands1.asm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 027c4abe..e4cf6bfe 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -1,30 +1,30 @@ SeafoamIslands1Object: - db $7d ; border block + db 125 ; border block - db $7 ; warps - warp $4, $11, $0, $ff - warp $5, $11, $0, $ff - warp $1a, $11, $1, $ff - warp $1b, $11, $1, $ff - warp $7, $5, $1, SEAFOAM_ISLANDS_2 - warp $19, $3, $6, SEAFOAM_ISLANDS_2 - warp $17, $f, $4, SEAFOAM_ISLANDS_2 + db 7 ; warps + warp 4, 17, 0, -1 + warp 5, 17, 0, -1 + warp 26, 17, 1, -1 + warp 27, 17, 1, -1 + warp 7, 5, 1, SEAFOAM_ISLANDS_2 + warp 25, 3, 6, SEAFOAM_ISLANDS_2 + warp 23, 15, 4, SEAFOAM_ISLANDS_2 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BOULDER, $12, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $1a, $7, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db 2 ; objects + object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person ; warp-to - warp_to $4, $11, SEAFOAM_ISLANDS_1_WIDTH - warp_to $5, $11, SEAFOAM_ISLANDS_1_WIDTH - warp_to $1a, $11, SEAFOAM_ISLANDS_1_WIDTH - warp_to $1b, $11, SEAFOAM_ISLANDS_1_WIDTH - warp_to $7, $5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to $19, $3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to $17, $f, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 4, 17, SEAFOAM_ISLANDS_1_WIDTH + warp_to 5, 17, SEAFOAM_ISLANDS_1_WIDTH + warp_to 26, 17, SEAFOAM_ISLANDS_1_WIDTH + warp_to 27, 17, SEAFOAM_ISLANDS_1_WIDTH + warp_to 7, 5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 25, 3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 23, 15, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 ; holes - warp_to $11, $6, SEAFOAM_ISLANDS_1_WIDTH - warp_to $18, $6, SEAFOAM_ISLANDS_1_WIDTH + warp_to 17, 6, SEAFOAM_ISLANDS_1_WIDTH + warp_to 24, 6, SEAFOAM_ISLANDS_1_WIDTH |