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/celadonmansion4.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/celadonmansion4.asm')
| -rwxr-xr-x | data/mapObjects/celadonmansion4.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 4f0fa214..5bd2db06 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -1,17 +1,17 @@ CeladonMansion4Object: - db $9 ; border block + db 9 ; border block - db $3 ; warps - warp $6, $1, $1, CELADON_MANSION_3 - warp $2, $1, $2, CELADON_MANSION_3 - warp $2, $7, $0, CELADON_MANSION_5 + db 3 ; warps + warp 6, 1, 1, CELADON_MANSION_3 + warp 2, 1, 2, CELADON_MANSION_3 + warp 2, 7, 0, CELADON_MANSION_5 - db $1 ; signs - sign $3, $7, $1 ; CeladonMansion4Text1 + db 1 ; signs + sign 3, 7, 1 ; CeladonMansion4Text1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $6, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 - warp_to $2, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 - warp_to $2, $7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5 + warp_to 6, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 + warp_to 2, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 + warp_to 2, 7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5 |