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/Route15.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route15.asm')
| -rw-r--r-- | maps/Route15.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route15.asm b/maps/Route15.asm index 5f7af097c..5eba0baf5 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -315,12 +315,12 @@ Route15_MapEventHeader: ; 0x1aa90a ; people-events db 7 - person_event $27, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, $ffff - person_event $27, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, $ffff - person_event $27, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, $ffff - person_event $27, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, $ffff - person_event $29, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, $ffff - person_event $29, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff - person_event $54, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a + person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, $ffff + person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, $ffff + person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, $ffff + person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, $ffff + person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, $ffff + person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff + person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a ; 0x1aa97a |