diff options
| author | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
| commit | a2242e1b9d95dcaf21ecdb5ae27a497c6ee6c27a (patch) | |
| tree | a30798efa48b616dc655387ba8f3c1cdd8afd466 /maps/IcePathB3F.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/IcePathB3F.asm')
| -rw-r--r-- | maps/IcePathB3F.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index b9d71310f..c77898e15 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -10,7 +10,7 @@ ItemFragment_0x7e66f: ; 0x7e66f db NEVERMELTICE, 1 ; 0x7e671 -UnknownScript_0x7e671: ; 0x7e671 +RockScript_0x7e671: ; 0x7e671 jumpstd $000f ; 0x7e674 @@ -31,7 +31,7 @@ IcePathB3F_MapEventHeader: ; 0x7e674 ; people-events db 2 - person_event $54, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, $068e - person_event $59, 10, 10, $18, $0, 255, 255, $0, 0, UnknownScript_0x7e671, $ffff + person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, $068e + person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, RockScript_0x7e671, $ffff ; 0x7e69e |