summaryrefslogtreecommitdiff
path: root/data/mapObjects/viridianforest.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/viridianforest.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/viridianforest.asm')
-rwxr-xr-xdata/mapObjects/viridianforest.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm
index 1ae1d1e2..a1d52cfe 100755
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/viridianforest.asm
@@ -19,9 +19,9 @@ ViridianForestObject: ; 0x611da (size=127)
db $8 ; objects
object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person
- object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, BUG_CATCHER + $C8, $1
- object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, BUG_CATCHER + $C8, $2
- object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, BUG_CATCHER + $C8, $3
+ object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1
+ object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2
+ object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3
object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE
object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION
object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL