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/VictoryRoad.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
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 |