summaryrefslogtreecommitdiff
path: root/data/mapObjects/route16.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route16.asm')
-rwxr-xr-xdata/mapObjects/route16.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm
index 3023124e..a342d106 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -1,4 +1,4 @@
-Route16Object: ; 0x58afc (size=136)
+Route16Object:
db $f ; border block
db $9 ; warps
@@ -16,14 +16,14 @@ Route16Object: ; 0x58afc (size=136)
db $b, $1b, $8 ; Route16Text8
db $11, $5, $9 ; Route16Text9
- db $7 ; people
- db SPRITE_BIKER, $c + 4, $11 + 4, $ff, $d2, TRAINER | $1, BIKER + $C8, $5
- db SPRITE_BIKER, $d + 4, $e + 4, $ff, $d3, TRAINER | $2, CUE_BALL + $C8, $1
- db SPRITE_BIKER, $c + 4, $b + 4, $ff, $d1, TRAINER | $3, CUE_BALL + $C8, $2
- db SPRITE_BIKER, $b + 4, $9 + 4, $ff, $d2, TRAINER | $4, BIKER + $C8, $6
- db SPRITE_BIKER, $a + 4, $6 + 4, $ff, $d3, TRAINER | $5, CUE_BALL + $C8, $3
- db SPRITE_BIKER, $c + 4, $3 + 4, $ff, $d3, TRAINER | $6, BIKER + $C8, $7
- db SPRITE_SNORLAX, $a + 4, $1a + 4, $ff, $d0, $7 ; person
+ db $7 ; objects
+ object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5
+ object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, OPP_CUE_BALL, $1
+ object SPRITE_BIKER, $b, $c, STAY, UP, $3, OPP_CUE_BALL, $2
+ object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, OPP_BIKER, $6
+ object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, OPP_CUE_BALL, $3
+ object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, OPP_BIKER, $7
+ object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person
; warp-to
EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F