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/Route41.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route41.asm')
| -rw-r--r-- | maps/Route41.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/Route41.asm b/maps/Route41.asm index 0160c4628..c6116dbfe 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -517,15 +517,15 @@ Route41_MapEventHeader: ; 0x1a6f12 ; people-events db 10 - person_event $f5, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, $ffff - person_event $f5, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, $ffff - person_event $f5, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, $ffff - person_event $f5, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, $ffff - person_event $f5, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, $ffff - person_event $32, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, $ffff - person_event $32, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, $ffff - person_event $32, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, $ffff - person_event $32, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, $ffff - person_event $32, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, $ffff + person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, $ffff + person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, $ffff + person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, $ffff + person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, $ffff + person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, $ffff + person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, $ffff + person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, $ffff + person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, $ffff + person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, $ffff + person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, $ffff ; 0x1a6fb3 |