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/lance.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/lance.asm')
| -rwxr-xr-x | data/mapObjects/lance.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index 73ed8e63..572ae77c 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -1,17 +1,17 @@ LanceObject: - db $3 ; border block + db 3 ; border block - db $3 ; warps - warp $18, $10, $2, AGATHAS_ROOM - warp $5, $0, $0, CHAMPIONS_ROOM - warp $6, $0, $0, CHAMPIONS_ROOM + db 3 ; warps + warp 24, 16, 2, AGATHAS_ROOM + warp 5, 0, 0, CHAMPIONS_ROOM + warp 6, 0, 0, CHAMPIONS_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 + db 1 ; objects + object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 ; warp-to - warp_to $18, $10, LANCES_ROOM_WIDTH ; AGATHAS_ROOM - warp_to $5, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM - warp_to $6, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM |