diff options
Diffstat (limited to 'maps/Route15.asm')
| -rw-r--r-- | maps/Route15.asm | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/maps/Route15.asm b/maps/Route15.asm index 0f52d8daa..bd8ea4839 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE15_YOUNGSTER1 + const ROUTE15_YOUNGSTER2 + const ROUTE15_YOUNGSTER3 + const ROUTE15_YOUNGSTER4 + const ROUTE15_TEACHER1 + const ROUTE15_TEACHER2 + const ROUTE15_POKE_BALL + Route15_MapScriptHeader: .MapTriggers: db 0 @@ -9,73 +18,73 @@ TrainerTeacherColette: trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, TeacherColetteScript TeacherColetteScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa60d + waitbutton closetext - loadmovesprites end TrainerTeacherHillary: trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, TeacherHillaryScript TeacherHillaryScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa6ca + waitbutton closetext - loadmovesprites end TrainerSchoolboyKipp: trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, SchoolboyKippScript SchoolboyKippScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa740 + waitbutton closetext - loadmovesprites end TrainerSchoolboyTommy: trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, SchoolboyTommyScript SchoolboyTommyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa7bc + waitbutton closetext - loadmovesprites end TrainerSchoolboyJohnny: trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, SchoolboyJohnnyScript SchoolboyJohnnyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa84a + waitbutton closetext - loadmovesprites end TrainerSchoolboyBilly: trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, SchoolboyBillyScript SchoolboyBillyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa8b0 + waitbutton closetext - loadmovesprites end MapRoute15Signpost0Script: jumptext UnknownText_0x1aa8e3 -ItemFragment_0x1aa5e4: - db PP_UP, 1 +Route15PPUp: + itemball PP_UP TeacherColetteSeenText: text "Have you forgotten" @@ -216,4 +225,4 @@ Route15_MapEventHeader: person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerTeacherColette, -1 person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherHillary, -1 - person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP + person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP |