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/route22.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/route22.asm')
| -rwxr-xr-x | data/mapObjects/route22.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index 258c29a1..377cf6c9 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -1,15 +1,15 @@ Route22Object: - db $2c ; border block + db 44 ; border block - db $1 ; warps - warp $8, $5, $0, ROUTE_22_GATE + db 1 ; warps + warp 8, 5, 0, ROUTE_22_GATE - db $1 ; signs - sign $7, $b, $3 ; Route22FrontGateText + db 1 ; signs + sign 7, 11, 3 ; Route22FrontGateText - db $2 ; objects - object SPRITE_BLUE, $19, $5, STAY, NONE, $1 ; person - object SPRITE_BLUE, $19, $5, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person + object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person ; warp-to - warp_to $8, $5, ROUTE_22_WIDTH ; ROUTE_22_GATE + warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE |