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/fuchsiahouse2.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/fuchsiahouse2.asm')
| -rwxr-xr-x | data/mapObjects/fuchsiahouse2.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index 3e549857..a1c3aefe 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -1,19 +1,19 @@ FuchsiaHouse2Object: - db $17 ; border block + db 23 ; border block - db $2 ; warps - warp $4, $7, $3, $ff - warp $5, $7, $3, $ff + db 2 ; warps + warp 4, 7, 3, -1 + warp 5, 7, 3, -1 - db $2 ; signs - sign $4, $3, $4 ; FuchsiaHouse2Text4 - sign $5, $3, $5 ; FuchsiaHouse2Text5 + db 2 ; signs + sign 4, 3, 4 ; FuchsiaHouse2Text4 + sign 5, 3, 5 ; FuchsiaHouse2Text5 - db $3 ; objects - object SPRITE_WARDEN, $2, $3, STAY, NONE, $1 ; person - object SPRITE_BALL, $8, $3, STAY, NONE, $2, RARE_CANDY - object SPRITE_BOULDER, $8, $4, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person + db 3 ; objects + object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person + object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY + object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person ; warp-to - warp_to $4, $7, FUCHSIA_HOUSE_2_WIDTH - warp_to $5, $7, FUCHSIA_HOUSE_2_WIDTH + warp_to 4, 7, FUCHSIA_HOUSE_2_WIDTH + warp_to 5, 7, FUCHSIA_HOUSE_2_WIDTH |