diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
commit | 1cb19a03a3c57c85d27495f95483b30ae37f0976 (patch) | |
tree | 0f798841fdf32e9ee4fdee93fb0b43d8cb73fa5b /maps/IcePathB2FBlackthornSide.asm | |
parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/IcePathB2FBlackthornSide.asm')
-rw-r--r-- | maps/IcePathB2FBlackthornSide.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 016aae602..8571aace5 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -34,6 +34,6 @@ IcePathB2FBlackthornSide_MapEventHeader: ; 0x7e64b ; people-events db 1 - person_event $54, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d + person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d ; 0x7e66d |