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/Route27.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route27.asm')
| -rw-r--r-- | maps/Route27.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/Route27.asm b/maps/Route27.asm index 9857cbd3f..a90d87176 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -41,7 +41,7 @@ UnknownScript_0x1a088c: ; 0x1a088c end ; 0x1a089c -UnknownScript_0x1a089c: ; 0x1a089c +FisherScript_0x1a089c: ; 0x1a089c jumptextfaceplayer UnknownText_0x1a0a71 ; 0x1a089f @@ -609,14 +609,14 @@ Route27_MapEventHeader: ; 0x1a0ead ; people-events db 9 - person_event $23, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, $ffff - person_event $23, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, $ffff - person_event $24, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena1, $ffff - person_event $24, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, $ffff - person_event $27, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, $ffff - person_event $27, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, $ffff - person_event $54, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, $06ab - person_event $54, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, $06ac - person_event $3a, 14, 25, $3, $0, 255, 255, $0, 3, UnknownScript_0x1a089c, $ffff + person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, $ffff + person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena1, $ffff + person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, $ffff + person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, $ffff + person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, $ffff + person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, $06ab + person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, $06ac + person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, $ffff ; 0x1a0f4c |