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/Route3.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route3.asm')
| -rw-r--r-- | maps/Route3.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route3.asm b/maps/Route3.asm index 94b330dc2..f03c56f46 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -213,9 +213,9 @@ Route3_MapEventHeader: ; 0x1ae18a ; people-events db 4 - person_event $3a, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, $ffff - person_event $27, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, $ffff - person_event $27, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff - person_event $3a, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff + person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, $ffff + person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, $ffff + person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff + person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff ; 0x1ae1ce |