summaryrefslogtreecommitdiff
path: root/data/mapObjects/route3.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
committerdannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
commit5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch)
treea1ce27018f39d98f49d89468df426d0291e18560 /data/mapObjects/route3.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/route3.asm')
-rwxr-xr-xdata/mapObjects/route3.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm
index 29a6307b..a2df6925 100755
--- a/data/mapObjects/route3.asm
+++ b/data/mapObjects/route3.asm
@@ -8,11 +8,11 @@ Route3Object: ; 0x54208 (size=77)
db $9 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $39, $b, STAY, NONE, $1 ; person
- object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, BUG_CATCHER + $C8, $4
- object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, YOUNGSTER + $C8, $1
- object SPRITE_LASS, $10, $9, STAY, LEFT, $4, LASS + $C8, $1
- object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, BUG_CATCHER + $C8, $5
- object SPRITE_LASS, $17, $4, STAY, LEFT, $6, LASS + $C8, $2
- object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, YOUNGSTER + $C8, $2
- object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, BUG_CATCHER + $C8, $6
- object SPRITE_LASS, $21, $a, STAY, UP, $9, LASS + $C8, $3
+ object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, OPP_BUG_CATCHER, $4
+ object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, OPP_YOUNGSTER, $1
+ object SPRITE_LASS, $10, $9, STAY, LEFT, $4, OPP_LASS, $1
+ object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, OPP_BUG_CATCHER, $5
+ object SPRITE_LASS, $17, $4, STAY, LEFT, $6, OPP_LASS, $2
+ object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, OPP_YOUNGSTER, $2
+ object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, OPP_BUG_CATCHER, $6
+ object SPRITE_LASS, $21, $a, STAY, UP, $9, OPP_LASS, $3