diff options
| author | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
|---|---|---|
| committer | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
| commit | 3d8e949d373a828fee370b08d005f131abb67333 (patch) | |
| tree | e200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/route8.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| download | pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip | |
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/route8.asm')
| -rwxr-xr-x | data/mapObjects/route8.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 8f336e03..5d2b73cb 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -1,30 +1,30 @@ Route8Object: db $2c ; border block - db $5 ; warps - db $9, $1, $0, ROUTE_8_GATE - db $a, $1, $0, ROUTE_8_GATE - db $9, $8, $2, ROUTE_8_GATE - db $a, $8, $2, ROUTE_8_GATE - db $3, $d, $0, PATH_ENTRANCE_ROUTE_8 + db 5 ; warps + warp 1, 9, 0, ROUTE_8_GATE + warp 1, 10, 0, ROUTE_8_GATE + warp 8, 9, 2, ROUTE_8_GATE + warp 8, 10, 2, ROUTE_8_GATE + warp 13, 3, 0, PATH_ENTRANCE_ROUTE_8 - db $1 ; signs - db $3, $11, $a ; Route8Text10 + db 1 ; signs + sign 17, 3, 10 ; Route8Text10 - db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, OPP_SUPER_NERD, $3 - object SPRITE_GAMBLER, $d, $9, STAY, UP, $2, OPP_GAMBLER, $5 - object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, STAY, UP, $3, OPP_SUPER_NERD, $4 - object SPRITE_LASS, $1a, $3, STAY, LEFT, $4, OPP_LASS, $d - object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, STAY, RIGHT, $5, OPP_SUPER_NERD, $5 - object SPRITE_LASS, $1a, $5, STAY, LEFT, $6, OPP_LASS, $e - object SPRITE_LASS, $1a, $6, STAY, RIGHT, $7, OPP_LASS, $f - object SPRITE_GAMBLER, $2e, $d, STAY, DOWN, $8, OPP_GAMBLER, $7 - object SPRITE_LASS, $33, $c, STAY, LEFT, $9, OPP_LASS, $10 + db 9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 + object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 + object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 + object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 + object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 + object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 + object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 + object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 + object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 ; warp-to - EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $a, $1 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $9, $8 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $a, $8 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $3, $d ; PATH_ENTRANCE_ROUTE_8 + warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 13, 3, ROUTE_8_WIDTH ; UNDERGROUND_PATH_ROUTE_8 |