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/Route44.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route44.asm')
| -rw-r--r-- | maps/Route44.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/Route44.asm b/maps/Route44.asm index e4bd73319..b4af61ca6 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -446,7 +446,7 @@ MapRoute44Signpost1Script: ; 0x19da3d jumptext UnknownText_0x19dfcc ; 0x19da40 -UnknownScript_0x19da40: ; 0x19da40 +FruitTreeScript_0x19da40: ; 0x19da40 fruittree $10 ; 0x19da42 @@ -654,16 +654,16 @@ Route44_MapEventHeader: ; 0x19dff6 ; people-events db 11 - person_event $3a, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, $ffff - person_event $3a, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, $ffff - person_event $27, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, $ffff - person_event $2b, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, $ffff - person_event $27, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, $ffff - person_event $23, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, $ffff - person_event $24, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, $ffff - person_event $5d, 9, 13, $1, $0, 255, 255, $0, 0, UnknownScript_0x19da40, $ffff - person_event $54, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, $06b6 - person_event $54, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, $06b7 - person_event $54, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, $07bd + person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, $ffff + person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, $ffff + person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, $ffff + person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, $ffff + person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, $ffff + person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, $ffff + person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, $ffff + person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, $ffff + person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, $06b6 + person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, $06b7 + person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, $07bd ; 0x19e09f |