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/Route2.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route2.asm')
| -rw-r--r-- | maps/Route2.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm index 9b081c47f..60ec7a805 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -117,7 +117,7 @@ ItemFragment_0x1ac304: ; 0x1ac304 db ELIXER, 1 ; 0x1ac306 -UnknownScript_0x1ac306: ; 0x1ac306 +FruitTreeScript_0x1ac306: ; 0x1ac306 fruittree $19 ; 0x1ac308 @@ -232,13 +232,13 @@ Route2_MapEventHeader: ; 0x1ac4af ; people-events db 8 - person_event $25, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, $ffff - person_event $25, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, $ffff - person_event $25, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, $ffff - person_event $54, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, $0783 - person_event $54, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, $0784 - person_event $54, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, $0785 - person_event $54, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786 - person_event $5d, 18, 14, $1, $0, 255, 255, $0, 0, UnknownScript_0x1ac306, $ffff + person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, $ffff + person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, $ffff + person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, $ffff + person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, $0783 + person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, $0784 + person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, $0785 + person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786 + person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, $ffff ; 0x1ac554 |