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/Route14.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
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 |