diff options
Diffstat (limited to 'maps/Route42.asm')
| -rw-r--r-- | maps/Route42.asm | 99 |
1 files changed, 46 insertions, 53 deletions
diff --git a/maps/Route42.asm b/maps/Route42.asm index 47d45c140..b38bb0344 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE42_FISHER const ROUTE42_POKEFAN_M const ROUTE42_SUPER_NERD @@ -10,13 +10,11 @@ const_value set 2 const ROUTE42_SUICUNE Route42_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_ROUTE42_NOTHING + scene_script .DummyScene1 ; SCENE_ROUTE42_SUICUNE -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -31,17 +29,17 @@ Route42SuicuneScript: applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 disappear ROUTE42_SUICUNE pause 10 - setscene 0 + setscene SCENE_ROUTE42_NOTHING clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - setmapscene ROUTE_36, 1 + setmapscene ROUTE_36, SCENE_ROUTE36_SUICUNE end TrainerFisherTully: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTullySeenText, FisherTullyBeatenText, 0, .Script + trainer FISHER, TULLY1, EVENT_BEAT_FISHER_TULLY, FisherTullySeenText, FisherTullyBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_TULLY iftrue .WantsBattle @@ -61,8 +59,8 @@ TrainerFisherTully: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_FISHER_TULLY - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext FISHER, TULLY1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -71,10 +69,10 @@ TrainerFisherTully: scall .Rematch winlosstext FisherTullyBeatenText, 0 copybytetovar wTullyFightCount - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 @@ -163,10 +161,10 @@ TrainerFisherTully: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script + trainer POKEMANIAC, SHANE, EVENT_BEAT_POKEMANIAC_SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacShaneAfterBattleText waitbutton @@ -174,10 +172,10 @@ TrainerPokemaniacShane: end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script + trainer HIKER, BENJAMIN, EVENT_BEAT_HIKER_BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerBenjaminAfterBattleText waitbutton @@ -212,7 +210,7 @@ FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 Route42HiddenMaxPotion: - hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION MovementData_0x1a9356: set_sliding @@ -319,37 +317,32 @@ Route42Sign2Text: done Route42_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 0, 8, 3, ROUTE_42_ECRUTEAK_GATE - warp_def 0, 9, 4, ROUTE_42_ECRUTEAK_GATE - warp_def 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE - warp_def 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE - warp_def 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE - -.CoordEvents: - db 1 - coord_event 24, 14, 1, Route42SuicuneScript - -.BGEvents: - db 5 - bg_event 4, 10, BGEVENT_READ, Route42Sign1 - bg_event 7, 5, BGEVENT_READ, MtMortarSign1 - bg_event 45, 9, BGEVENT_READ, MtMortarSign2 - bg_event 54, 8, BGEVENT_READ, Route42Sign2 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3 + warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4 + warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1 + warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2 + warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3 + + db 1 ; coord events + coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript + + db 5 ; bg events + bg_event 4, 10, BGEVENT_READ, Route42Sign1 + bg_event 7, 5, BGEVENT_READ, MtMortarSign1 + bg_event 45, 9, BGEVENT_READ, MtMortarSign2 + bg_event 54, 8, BGEVENT_READ, Route42Sign2 bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion -.ObjectEvents: - db 9 + db 9 ; object events object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1 - object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 - object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 - object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 - object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 - object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 - object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL - object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION - object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 + object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 + object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 + object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 + object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 + object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL + object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION + object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 |