summaryrefslogtreecommitdiff
path: root/data/mapObjects/lance.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/lance.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/lance.asm')
-rwxr-xr-xdata/mapObjects/lance.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm
index 42a3e83b..cdfbc7a6 100755
--- a/data/mapObjects/lance.asm
+++ b/data/mapObjects/lance.asm
@@ -9,7 +9,7 @@ LanceObject: ; 0x5a3c5 (size=36)
db $0 ; signs
db $1 ; objects
- object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, LANCE + $C8, $1
+ object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1
; warp-to
EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM