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/bruno.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/bruno.asm')
| -rwxr-xr-x | data/mapObjects/bruno.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index b0df7215..85d789cc 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -1,19 +1,19 @@ BrunoObject: - db $3 ; border block + db 3 ; border block - db $4 ; warps - warp $4, $b, $2, LORELEIS_ROOM - warp $5, $b, $3, LORELEIS_ROOM - warp $4, $0, $0, AGATHAS_ROOM - warp $5, $0, $1, AGATHAS_ROOM + db 4 ; warps + warp 4, 11, 2, LORELEIS_ROOM + warp 5, 11, 3, LORELEIS_ROOM + warp 4, 0, 0, AGATHAS_ROOM + warp 5, 0, 1, AGATHAS_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 + db 1 ; objects + object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 ; warp-to - warp_to $4, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to $5, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to $4, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM - warp_to $5, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM |