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/Route38.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route38.asm')
| -rw-r--r-- | maps/Route38.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route38.asm b/maps/Route38.asm index 88cb9ff01..b22c26417 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -451,7 +451,7 @@ MapRoute38Signpost1Script: ; 0x1a1f30 jumptext UnknownText_0x1a2324 ; 0x1a1f33 -UnknownScript_0x1a1f33: ; 0x1a1f33 +FruitTreeScript_0x1a1f33: ; 0x1a1f33 fruittree $3 ; 0x1a1f35 @@ -610,12 +610,12 @@ Route38_MapEventHeader: ; 0x1a23bb ; people-events db 7 - person_event $66, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, $ffff - person_event $28, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, $ffff - person_event $66, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, $ffff - person_event $2a, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, $ffff - person_event $49, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, $ffff - person_event $5d, 14, 16, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a1f33, $ffff - person_event $2a, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, $ffff + person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, $ffff + person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, $ffff + person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, $ffff + person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, $ffff + person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, $ffff ; 0x1a2430 |