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/Route13.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route13.asm')
| -rw-r--r-- | maps/Route13.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route13.asm b/maps/Route13.asm index ae32dda0c..44a7c0d3a 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -294,10 +294,10 @@ Route13_MapEventHeader: ; 0x1a27aa ; people-events db 5 - person_event $27, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, $ffff - person_event $27, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, $ffff - person_event $2d, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, $ffff - person_event $2d, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, $ffff - person_event $2d, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, $ffff + person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, $ffff + person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, $ffff + person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, $ffff + person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, $ffff + person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, $ffff ; 0x1a2805 |