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/celadonmansion2.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/celadonmansion2.asm')
| -rwxr-xr-x | data/mapObjects/celadonmansion2.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 675afdc7..fd7e58b9 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -1,19 +1,19 @@ CeladonMansion2Object: - db $f ; border block + db 15 ; border block - db $4 ; warps - warp $6, $1, $0, CELADON_MANSION_3 - warp $7, $1, $3, CELADON_MANSION_1 - warp $2, $1, $4, CELADON_MANSION_1 - warp $4, $1, $3, CELADON_MANSION_3 + db 4 ; warps + warp 6, 1, 0, CELADON_MANSION_3 + warp 7, 1, 3, CELADON_MANSION_1 + warp 2, 1, 4, CELADON_MANSION_1 + warp 4, 1, 3, CELADON_MANSION_3 - db $1 ; signs - sign $4, $9, $1 ; CeladonMansion2Text1 + db 1 ; signs + sign 4, 9, 1 ; CeladonMansion2Text1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $6, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 - warp_to $7, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 - warp_to $2, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 - warp_to $4, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 + warp_to 6, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 + warp_to 7, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to 2, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to 4, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 |