diff options
Diffstat (limited to 'maps/Route32.asm')
| -rw-r--r-- | maps/Route32.asm | 81 |
1 files changed, 38 insertions, 43 deletions
diff --git a/maps/Route32.asm b/maps/Route32.asm index da9eb5c70..660f972f3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -15,28 +15,23 @@ const_value set 2 const ROUTE32_POKE_BALL2 Route32_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Frieda -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end .Frieda: @@ -51,7 +46,7 @@ Route32_MapScriptHeader: Route32CooltrainerMScript: faceplayer -Route32CooltrainerMTrigger: +Route32CooltrainerMContinueScene: opentext checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 iftrue .GotMiracleSeed @@ -91,7 +86,7 @@ Route32CooltrainerMTrigger: closetext end -Route32CooltrainerMStopsYou: +Route32CooltrainerMStopsYouScene: spriteface ROUTE32_COOLTRAINER_M, LEFT spriteface PLAYER, RIGHT opentext @@ -102,7 +97,7 @@ Route32CooltrainerMStopsYou: applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet stopfollow spriteface PLAYER, DOWN - scall Route32CooltrainerMTrigger + scall Route32CooltrainerMContinueScene applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1 applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2 end @@ -132,7 +127,7 @@ Route32WannaBuyASlowpokeTailScript: SlowpokeTailSalesmanScript: faceplayer _OfferToSellSlowpokeTail: - dotrigger $2 + setscene $2 opentext writetext Text_MillionDollarSlowpokeTail yesorno @@ -507,7 +502,7 @@ Route32RuinsSign: Route32UnionCaveSign: jumptext Route32UnionCaveSignText -Route32PokeCenterSign: +Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: @@ -946,33 +941,33 @@ Route32_MapEventHeader: warp_def $3, $4, 4, ROUTE_32_RUINS_OF_ALPH_GATE warp_def $4f, $6, 4, UNION_CAVE_1F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $12, $0, Route32CooltrainerMStopsYou, $0, $0 - xy_trigger 1, $47, $7, $0, Route32WannaBuyASlowpokeTailScript, $0, $0 + coord_event 0, $8, $12, Route32CooltrainerMStopsYouScene + coord_event 1, $47, $7, Route32WannaBuyASlowpokeTailScript -.Signposts: +.BGEvents: db 6 - signpost 5, 13, SIGNPOST_READ, Route32Sign - signpost 1, 9, SIGNPOST_READ, Route32RuinsSign - signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign - signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign - signpost 67, 12, SIGNPOST_ITEM, Route32HiddenGreatBall - signpost 40, 11, SIGNPOST_ITEM, Route32HiddenSuperPotion - -.PersonEvents: + bg_event 5, 13, BGEVENT_READ, Route32Sign + bg_event 1, 9, BGEVENT_READ, Route32RuinsSign + bg_event 84, 10, BGEVENT_READ, Route32UnionCaveSign + bg_event 73, 12, BGEVENT_READ, Route32PokecenterSign + bg_event 67, 12, BGEVENT_ITEM, Route32HiddenGreatBall + bg_event 40, 11, BGEVENT_ITEM, Route32HiddenSuperPotion + +.ObjectEvents: db 14 - person_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherJustin, -1 - person_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherRalph1, -1 - person_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherHenry, -1 - person_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 - person_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 - person_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperRoland, -1 - person_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 - person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 - person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 - person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL - person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 - person_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY - person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL + object_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 + object_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1 + object_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 + object_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 + object_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 + object_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 + object_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 + object_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 + object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 + object_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL + object_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 + object_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY + object_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL |