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/pokemontower6.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/pokemontower6.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower6.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index 62513fb4..13cde398 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -1,19 +1,19 @@ PokemonTower6Object: - db $1 ; border block + db 1 ; border block - db $2 ; warps - warp $12, $9, $1, POKEMONTOWER_5 - warp $9, $10, $0, POKEMONTOWER_7 + db 2 ; warps + warp 18, 9, 1, POKEMONTOWER_5 + warp 9, 16, 0, POKEMONTOWER_7 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, OPP_CHANNELER, $13 - object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, OPP_CHANNELER, $14 - object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, OPP_CHANNELER, $15 - object SPRITE_BALL, $6, $8, STAY, NONE, $4, RARE_CANDY - object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY + db 5 ; objects + object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 + object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 + object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 + object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY + object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY ; warp-to - warp_to $12, $9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 - warp_to $9, $10, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 + warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 + warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 |