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/pewtergym.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/pewtergym.asm')
| -rwxr-xr-x | data/mapObjects/pewtergym.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index b4098813..65fcf723 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -1,17 +1,17 @@ PewterGymObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $d, $2, $ff - warp $5, $d, $2, $ff + db 2 ; warps + warp 4, 13, 2, -1 + warp 5, 13, 2, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1 - object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR_TRAINER_M, $1 - object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 + object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 + object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person ; warp-to - warp_to $4, $d, PEWTER_GYM_WIDTH - warp_to $5, $d, PEWTER_GYM_WIDTH + warp_to 4, 13, PEWTER_GYM_WIDTH + warp_to 5, 13, PEWTER_GYM_WIDTH |