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/Route8.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route8.asm')
| -rw-r--r-- | maps/Route8.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route8.asm b/maps/Route8.asm index 6f2ecef11..2643df004 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -159,7 +159,7 @@ MapRoute8Signpost0Script: ; 0x6c069 jumptext UnknownText_0x6c2b7 ; 0x6c06c -UnknownScript_0x6c06c: ; 0x6c06c +FruitTreeScript_0x6c06c: ; 0x6c06c fruittree $1b ; 0x6c06e @@ -274,11 +274,11 @@ Route8_MapEventHeader: ; 0x6c2e1 ; people-events db 6 - person_event $4a, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, $ffff - person_event $4a, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, $ffff - person_event $4a, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, $ffff - person_event $2b, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, $ffff - person_event $2b, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, $ffff - person_event $5d, 9, 37, $1, $0, 255, 255, $0, 0, UnknownScript_0x6c06c, $ffff + person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, $ffff + person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, $ffff + person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, $ffff + person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, $ffff + person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, $ffff + person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, $ffff ; 0x6c349 |