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/Route14.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/Route14.asm')
| -rw-r--r-- | maps/Route14.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route14.asm b/maps/Route14.asm index e8801ab89..6f22784f0 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -6,7 +6,7 @@ Route14_MapScriptHeader: ; 0x1ad47d db 0 ; 0x1ad47f -UnknownScript_0x1ad47f: ; 0x1ad47f +TeacherScript_0x1ad47f: ; 0x1ad47f faceplayer loadfont trade $5 @@ -174,9 +174,9 @@ Route14_MapEventHeader: ; 0x1ad6a1 ; people-events db 4 - person_event $2d, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, $ffff - person_event $27, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, $ffff - person_event $2d, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, $ffff - person_event $29, 9, 11, $5, $1, 255, 255, $a0, 4, UnknownScript_0x1ad47f, $ffff + person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, $ffff + person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, $ffff + person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, $ffff + person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, $ffff ; 0x1ad6db |