diff options
| author | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
| commit | a2242e1b9d95dcaf21ecdb5ae27a497c6ee6c27a (patch) | |
| tree | a30798efa48b616dc655387ba8f3c1cdd8afd466 /maps/Route46.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/Route46.asm')
| -rw-r--r-- | maps/Route46.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route46.asm b/maps/Route46.asm index 5e558be40..d192a2275 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -228,11 +228,11 @@ ItemFragment_0x1a978d: ; 0x1a978d db X_SPEED, 1 ; 0x1a978f -UnknownScript_0x1a978f: ; 0x1a978f +FruitTreeScript_0x1a978f: ; 0x1a978f fruittree $4 ; 0x1a9791 -UnknownScript_0x1a9791: ; 0x1a9791 +FruitTreeScript_0x1a9791: ; 0x1a9791 fruittree $a ; 0x1a9793 @@ -327,11 +327,11 @@ Route46_MapEventHeader: ; 0x1a99db ; people-events db 6 - person_event $2d, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, $ffff - person_event $27, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, $ffff - person_event $28, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, $ffff - person_event $5d, 9, 11, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a978f, $ffff - person_event $5d, 10, 12, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a9791, $ffff - person_event $54, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc + person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, $ffff + person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, $ffff + person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, $ffff + person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, $ffff + person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, $ffff + person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc ; 0x1a9a43 |