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/Route11.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route11.asm')
| -rw-r--r-- | maps/Route11.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route11.asm b/maps/Route11.asm index 0731e5030..1c09bc081 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -126,7 +126,7 @@ MapRoute11Signpost0Script: ; 0x68052 jumptext UnknownText_0x68238 ; 0x68055 -UnknownScript_0x68055: ; 0x68055 +FruitTreeScript_0x68055: ; 0x68055 fruittree $18 ; 0x68057 @@ -227,10 +227,10 @@ Route11_MapEventHeader: ; 0x68242 ; people-events db 5 - person_event $27, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, $ffff - person_event $27, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, $ffff - person_event $27, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, $ffff - person_event $27, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff - person_event $5d, 6, 36, $1, $0, 255, 255, $0, 0, UnknownScript_0x68055, $ffff + person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, $ffff + person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, $ffff + person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, $ffff + person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff + person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, $ffff ; 0x68293 |