diff options
Diffstat (limited to 'maps/Route42.asm')
| -rw-r--r-- | maps/Route42.asm | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/maps/Route42.asm b/maps/Route42.asm index b9007bb08..40feaa927 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -10,20 +10,18 @@ const_value set 2 const ROUTE42_SUICUNE Route42_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x1a9216, 0 - dw UnknownScript_0x1a9217, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x1a9216: +.DummyScene0: end -UnknownScript_0x1a9217: +.DummyScene1: end Route42SuicuneScript: @@ -33,15 +31,15 @@ Route42SuicuneScript: applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 disappear ROUTE42_SUICUNE pause 10 - dotrigger $0 + setscene $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - domaptrigger ROUTE_36, $1 + setmapscene ROUTE_36, $1 end TrainerFisherTully1: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, FisherTully1Script + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script -FisherTully1Script: +.Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY end_if_just_battled opentext @@ -165,23 +163,23 @@ UnknownScript_0x1a9311: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript + trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script -PokemaniacShaneScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a94d6 + writetext PokemaniacShaneAfterBattleText waitbutton closetext end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript + trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script -HikerBenjaminScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a943f + writetext HikerBenjaminAfterBattleText waitbutton closetext end @@ -260,7 +258,7 @@ HikerBenjaminBeatenText: text "Gahahah!" done -UnknownText_0x1a943f: +HikerBenjaminAfterBattleText: text "Losing feels in-" line "significant if you" @@ -281,7 +279,7 @@ PokemaniacShaneBeatenText: line "my MOON STONE…" done -UnknownText_0x1a94d6: +PokemaniacShaneAfterBattleText: text "You're working on" line "a #DEX?" @@ -333,26 +331,26 @@ Route42_MapEventHeader: warp_def $9, $1c, 2, MOUNT_MORTAR_1F_OUTSIDE warp_def $7, $2e, 3, MOUNT_MORTAR_1F_OUTSIDE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $e, $18, $0, Route42SuicuneScript, $0, $0 + coord_event 1, $e, $18, Route42SuicuneScript -.Signposts: +.BGEvents: db 5 - signpost 10, 4, SIGNPOST_READ, Route42Sign1 - signpost 5, 7, SIGNPOST_READ, MtMortarSign1 - signpost 9, 45, SIGNPOST_READ, MtMortarSign2 - signpost 8, 54, SIGNPOST_READ, Route42Sign2 - signpost 11, 16, SIGNPOST_ITEM, Route42HiddenMaxPotion + bg_event 10, 4, BGEVENT_READ, Route42Sign1 + bg_event 5, 7, BGEVENT_READ, MtMortarSign1 + bg_event 9, 45, BGEVENT_READ, MtMortarSign2 + bg_event 8, 54, BGEVENT_READ, Route42Sign2 + bg_event 11, 16, BGEVENT_ITEM, Route42HiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherTully1, -1 - person_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 - person_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 - person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 - person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 - person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 - person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL - person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION - person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + object_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1 + object_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 + object_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 + object_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 + object_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 + object_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 + object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL + object_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION + object_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 |