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/Route1.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route1.asm')
| -rw-r--r-- | maps/Route1.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route1.asm b/maps/Route1.asm index 706f7d0f4..7344fec3c 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -68,7 +68,7 @@ MapRoute1Signpost0Script: ; 0x1ac57e jumptext UnknownText_0x1ac675 ; 0x1ac581 -UnknownScript_0x1ac581: ; 0x1ac581 +FruitTreeScript_0x1ac581: ; 0x1ac581 fruittree $1a ; 0x1ac583 @@ -127,8 +127,8 @@ Route1_MapEventHeader: ; 0x1ac69a ; people-events db 3 - person_event $27, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, $ffff - person_event $24, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, $ffff - person_event $5d, 11, 7, $1, $0, 255, 255, $0, 0, UnknownScript_0x1ac581, $ffff + person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, $ffff + person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, $ffff + person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, $ffff ; 0x1ac6cc |