diff options
author | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
commit | a2242e1b9d95dcaf21ecdb5ae27a497c6ee6c27a (patch) | |
tree | a30798efa48b616dc655387ba8f3c1cdd8afd466 /maps/Route13.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
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 |