summaryrefslogtreecommitdiff
path: root/maps/FastShipCabins_SW_SSW_NW.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FastShipCabins_SW_SSW_NW.asm')
-rw-r--r--maps/FastShipCabins_SW_SSW_NW.asm32
1 files changed, 19 insertions, 13 deletions
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index 493ee070e..5118d90d4 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -1,3 +1,9 @@
+const_value set 2
+ const FASTSHIPCABINS_SW_SSW_NW_FISHER
+ const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER
+ const FASTSHIPCABINS_SW_SSW_NW_BUENA
+ const FASTSHIPCABINS_SW_SSW_NW_ROCKER
+
FastShipCabins_SW_SSW_NW_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,60 +15,60 @@ TrainerFirebreatherLyle:
trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript
FirebreatherLyleScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x75b52
+ waitbutton
closetext
- loadmovesprites
end
TrainerBug_catcherKen:
trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript
Bug_catcherKenScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x75bd5
+ waitbutton
closetext
- loadmovesprites
end
TrainerBeautyCassie:
trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript
BeautyCassieScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x75c43
+ waitbutton
closetext
- loadmovesprites
end
TrainerGuitaristClyde:
trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript
GuitaristClydeScript:
- talkaftercancel
+ end_if_just_battled
special Mobile_DummyReturnFalse
iftrue .mobile
loadfont
writetext UnknownText_0x75d65
+ waitbutton
closetext
- loadmovesprites
end
.mobile:
loadfont
writetext UnknownText_0x75cfe
+ waitbutton
closetext
- loadmovesprites
end
FastShipBed:
loadfont
writetext FastShipBedText1
+ waitbutton
closetext
- loadmovesprites
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
special Mobile_HealParty
@@ -73,8 +79,8 @@ FastShipBed:
special Special_FadeInQuickly
loadfont
writetext FastShipBedText2
+ waitbutton
closetext
- loadmovesprites
checkevent EVENT_FAST_SHIP_HAS_ARRIVED
iftrue UnknownScript_0x75ae1
checkevent EVENT_FAST_SHIP_FOUND_GIRL
@@ -91,16 +97,16 @@ UnknownScript_0x75ae2:
iftrue UnknownScript_0x75af7
loadfont
writetext FastShipArrivedVermilionText
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_FAST_SHIP_HAS_ARRIVED
end
UnknownScript_0x75af7:
loadfont
writetext FastShipArrivedOlivineText
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_FAST_SHIP_HAS_ARRIVED
end