summaryrefslogtreecommitdiff
path: root/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FastShipCabins_SE_SSE_CaptainsCabin.asm')
-rw-r--r--maps/FastShipCabins_SE_SSE_CaptainsCabin.asm56
1 files changed, 28 insertions, 28 deletions
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 69a499841..049b7cc47 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -14,27 +14,27 @@ CaptainScript_0x75ea7:
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue UnknownScript_0x75eb5
writetext UnknownText_0x76012
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x75eb5:
writetext UnknownText_0x76064
+ waitbutton
closetext
- loadmovesprites
end
TwinScript_0x75ebb:
spriteface $5, RIGHT
loadfont
writetext UnknownText_0x761e0
+ waitbutton
closetext
- loadmovesprites
faceplayer
loadfont
writetext UnknownText_0x7621f
+ waitbutton
closetext
- loadmovesprites
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
disappear $5
@@ -52,15 +52,15 @@ TwinScript_0x75ebb:
iftrue UnknownScript_0x75f03
loadfont
writetext UnknownText_0x76284
+ waitbutton
closetext
- loadmovesprites
jump UnknownScript_0x75f09
UnknownScript_0x75f03:
loadfont
writetext UnknownText_0x762c6
+ waitbutton
closetext
- loadmovesprites
UnknownScript_0x75f09:
spriteface $5, DOWN
applymovement $3, MovementData_0x76010
@@ -79,8 +79,8 @@ GentlemanScript_0x75f1f:
checkevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
iftrue UnknownScript_0x75f58
writetext UnknownText_0x760ae
+ waitbutton
closetext
- loadmovesprites
domaptrigger FAST_SHIP_1F, $0
end
@@ -91,16 +91,16 @@ UnknownScript_0x75f37:
iffalse UnknownScript_0x75f44
setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
UnknownScript_0x75f44:
- loadmovesprites
- waitbutton
+ closetext
+ waitsfx
playsound SFX_ELEVATOR_END
pause 30
loadfont
writetext UnknownText_0x76645
- closetext
+ waitbutton
setevent EVENT_FAST_SHIP_HAS_ARRIVED
setevent EVENT_FAST_SHIP_FOUND_GIRL
- loadmovesprites
+ closetext
end
UnknownScript_0x75f58:
@@ -110,98 +110,98 @@ UnknownScript_0x75f58:
iffalse UnknownScript_0x75f65
setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
UnknownScript_0x75f65:
- loadmovesprites
+ closetext
end
UnknownScript_0x75f67:
writetext UnknownText_0x761be
+ waitbutton
closetext
- loadmovesprites
end
TwinScript_0x75f6d:
faceplayer
loadfont
writetext UnknownText_0x7630d
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokefanmColin:
trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript
PokefanmColinScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x7635b
+ waitbutton
closetext
- loadmovesprites
end
TrainerTwinsMegandpeg1:
trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script
TwinsMegandpeg1Script:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x763c2
+ waitbutton
closetext
- loadmovesprites
end
TrainerTwinsMegandpeg2:
trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script
TwinsMegandpeg2Script:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76428
+ waitbutton
closetext
- loadmovesprites
end
TrainerPsychicRodney:
trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript
PsychicRodneyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76497
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokefanmJeremy:
trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript
PokefanmJeremyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x7651c
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokefanfGeorgia:
trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript
PokefanfGeorgiaScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76596
+ waitbutton
closetext
- loadmovesprites
end
TrainerSupernerdShawn:
trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript
SupernerdShawnScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x7660f
+ waitbutton
closetext
- loadmovesprites
end
FastShipCaptainsCabinTrashcan: