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/Route46.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
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 |