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/Route21.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route21.asm')
| -rw-r--r-- | maps/Route21.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/Route21.asm b/maps/Route21.asm index 2a5fc1e68..247e87fbb 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -154,8 +154,8 @@ Route21_MapEventHeader: ; 0x1ac97a ; people-events db 3 - person_event $32, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, $ffff - person_event $31, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff - person_event $3a, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff + person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, $ffff + person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff + person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff ; 0x1ac9a7 |