diff options
Diffstat (limited to 'maps/Route25.asm')
| -rw-r--r-- | maps/Route25.asm | 108 |
1 files changed, 53 insertions, 55 deletions
diff --git a/maps/Route25.asm b/maps/Route25.asm index f49c4c3d4..ca6576771 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -12,20 +12,18 @@ const_value set 2 const ROUTE25_POKE_BALL Route25_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x19ee9e, 0 - dw UnknownScript_0x19ee9f, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x19ee9e: +.DummyScene0: end -UnknownScript_0x19ee9f: +.DummyScene1: end UnknownScript_0x19eea0: @@ -50,7 +48,7 @@ UnknownScript_0x19eea0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - dotrigger $0 + setscene $0 special RestartMapMusic end @@ -76,83 +74,83 @@ UnknownScript_0x19eee0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - dotrigger $0 + setscene $0 special RestartMapMusic end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, SchoolboyDudleyScript + trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script -SchoolboyDudleyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f1b5 + writetext SchoolboyDudleyAfterBattleText waitbutton closetext end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, LassEllenScript + trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script -LassEllenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f208 + writetext LassEllenAfterBattleText waitbutton closetext end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, SchoolboyJoeScript + trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script -SchoolboyJoeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f25c + writetext SchoolboyJoeAfterBattleText waitbutton closetext end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, LassLauraScript + trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script -LassLauraScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f2a6 + writetext LassLauraAfterBattleText waitbutton closetext end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, CamperLloydScript + trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script -CamperLloydScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f2f8 + writetext CamperLloydAfterBattleText waitbutton closetext end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, LassShannonScript + trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script -LassShannonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f35b + writetext LassShannonAfterBattleText waitbutton closetext end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, SupernerdPatScript + trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script -SupernerdPatScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f41a + writetext SupernerdPatAfterBattleText waitbutton closetext end @@ -287,7 +285,7 @@ SchoolboyDudleyBeatenText: text "Whoo! Good stuff." done -UnknownText_0x19f1b5: +SchoolboyDudleyAfterBattleText: text "I did my best." line "I have no regrets." done @@ -301,7 +299,7 @@ LassEllenBeatenText: text "How could I lose?" done -UnknownText_0x19f208: +LassEllenAfterBattleText: text "I did my best." line "I have no regrets." done @@ -315,7 +313,7 @@ SchoolboyJoeBeatenText: text "Ow! Stomped flat!" done -UnknownText_0x19f25c: +SchoolboyJoeAfterBattleText: text "I did my best." line "I have no regrets." done @@ -329,7 +327,7 @@ LassLauraBeatenText: text "I lost too…" done -UnknownText_0x19f2a6: +LassLauraAfterBattleText: text "I did my best." line "I have no regrets." done @@ -343,7 +341,7 @@ CamperLloydBeatenText: text "Whoa! Too much." done -UnknownText_0x19f2f8: +CamperLloydAfterBattleText: text "I did my best." line "I have no regrets." done @@ -358,7 +356,7 @@ LassShannonBeatenText: text "You're kidding." done -UnknownText_0x19f35b: +LassShannonAfterBattleText: text "I did my best." line "I have no regrets." done @@ -382,7 +380,7 @@ SupernerdPatBeatenText: line "at all?" done -UnknownText_0x19f41a: +SupernerdPatAfterBattleText: text "I'm sorry… I won't" line "cheat anymore…" done @@ -440,26 +438,26 @@ Route25_MapEventHeader: db 1 warp_def $5, $2f, 1, BILLS_HOUSE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $6, $2a, $0, UnknownScript_0x19eea0, $0, $0 - xy_trigger 1, $7, $2a, $0, UnknownScript_0x19eee0, $0, $0 + coord_event 1, $6, $2a, UnknownScript_0x19eea0 + coord_event 1, $7, $2a, UnknownScript_0x19eee0 -.Signposts: +.BGEvents: db 2 - signpost 5, 45, SIGNPOST_READ, BillsHouseSign - signpost 5, 4, SIGNPOST_ITEM, Route25HiddenPotion + bg_event 5, 45, BGEVENT_READ, BillsHouseSign + bg_event 5, 4, BGEVENT_ITEM, Route25HiddenPotion -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - person_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 - person_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassEllen, -1 - person_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 - person_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassLaura, -1 - person_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperLloyd, -1 - person_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassShannon, -1 - person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerSupernerdPat, -1 - person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 - person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN + object_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + object_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + object_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 + object_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1 + object_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 + object_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1 + object_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 + object_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1 + object_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 + object_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 + object_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN |