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/VictoryRoad.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/VictoryRoad.asm')
-rw-r--r-- | maps/VictoryRoad.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 1ce3daa44..0109fcc92 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -267,11 +267,11 @@ VictoryRoad_MapEventHeader: ; 0x74802 ; people-events db 6 - person_event $4, 17, 22, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c2 - person_event $54, 32, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x74529, $06a3 - person_event $54, 52, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452b, $06a4 - person_event $54, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, $06a5 - person_event $54, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, $06a6 - person_event $54, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, $06a7 + person_event SPRITE_SILVER, 17, 22, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c2 + person_event SPRITE_POKE_BALL, 32, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x74529, $06a3 + person_event SPRITE_POKE_BALL, 52, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452b, $06a4 + person_event SPRITE_POKE_BALL, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, $06a5 + person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, $06a6 + person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, $06a7 ; 0x748a2 |