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/Route6.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/Route6.asm')
| -rw-r--r-- | maps/Route6.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm index f1cdf3973..dc3f78a49 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -64,7 +64,7 @@ PokefanmAllanScript: ; 0x1ad949 end ; 0x1ad951 -UnknownScript_0x1ad951: ; 0x1ad951 +PokefanMScript_0x1ad951: ; 0x1ad951 jumptextfaceplayer UnknownText_0x1ad957 ; 0x1ad954 @@ -139,8 +139,8 @@ Route6_MapEventHeader: ; 0x1adadb ; people-events db 3 - person_event $2d, 8, 21, $6, $0, 255, 255, $b0, 2, UnknownScript_0x1ad951, $0771 - person_event $2d, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff - person_event $2d, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff + person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, $0771 + person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff + person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff ; 0x1adb17 |