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/viridianforestentrance.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/viridianforestentrance.asm')
| -rwxr-xr-x | data/mapObjects/viridianforestentrance.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 40b1b42e..a42c7ec0 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -1,20 +1,20 @@ ViridianForestEntranceObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $4, $0, $3, VIRIDIAN_FOREST - warp $5, $0, $4, VIRIDIAN_FOREST - warp $4, $7, $5, $ff - warp $5, $7, $5, $ff + db 4 ; warps + warp 4, 0, 3, VIRIDIAN_FOREST + warp 5, 0, 4, VIRIDIAN_FOREST + warp 4, 7, 5, -1 + warp 5, 7, 5, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_GIRL, $8, $4, STAY, LEFT, $1 ; person - object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person + db 2 ; objects + object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person ; warp-to - warp_to $4, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST - warp_to $5, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST - warp_to $4, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH - warp_to $5, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH + warp_to 4, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to 5, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to 4, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH + warp_to 5, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH |