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/cinnabarpokecenter.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/cinnabarpokecenter.asm')
| -rwxr-xr-x | data/mapObjects/cinnabarpokecenter.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index 6df12279..19baee75 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -1,18 +1,18 @@ CinnabarPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $3, $ff - warp $4, $7, $3, $ff + db 2 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person - object SPRITE_GENTLEMAN, $2, $6, STAY, NONE, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person + object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, CINNABAR_POKECENTER_WIDTH - warp_to $4, $7, CINNABAR_POKECENTER_WIDTH + warp_to 3, 7, CINNABAR_POKECENTER_WIDTH + warp_to 4, 7, CINNABAR_POKECENTER_WIDTH |