summaryrefslogtreecommitdiff
path: root/maps/FastShipB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FastShipB1F.asm')
-rw-r--r--maps/FastShipB1F.asm80
1 files changed, 47 insertions, 33 deletions
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 7634bd7f2..d6bf88556 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -1,3 +1,17 @@
+const_value set 2
+ const FASTSHIPB1F_SAILOR1
+ const FASTSHIPB1F_SAILOR2
+ const FASTSHIPB1F_SAILOR3
+ const FASTSHIPB1F_LASS
+ const FASTSHIPB1F_SUPER_NERD
+ const FASTSHIPB1F_SAILOR4
+ const FASTSHIPB1F_FISHER
+ const FASTSHIPB1F_BLACK_BELT
+ const FASTSHIPB1F_SAILOR5
+ const FASTSHIPB1F_TEACHER
+ const FASTSHIPB1F_YOUNGSTER1
+ const FASTSHIPB1F_YOUNGSTER2
+
FastShipB1F_MapScriptHeader:
.MapTriggers:
db 2
@@ -18,21 +32,21 @@ UnknownScript_0x7673b:
UnknownScript_0x7673c:
checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
iftrue UnknownScript_0x76766
- applymovement $3, MovementData_0x76876
- moveperson $2, $1e, $6
- appear $2
+ applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876
+ moveperson FASTSHIPB1F_SAILOR1, $1e, $6
+ appear FASTSHIPB1F_SAILOR1
pause 5
- disappear $3
+ disappear FASTSHIPB1F_SAILOR2
end
UnknownScript_0x76751:
checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT
iftrue UnknownScript_0x76766
- applymovement $2, MovementData_0x76871
- moveperson $3, $1f, $6
- appear $3
+ applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871
+ moveperson FASTSHIPB1F_SAILOR2, $1f, $6
+ appear FASTSHIPB1F_SAILOR2
pause 5
- disappear $2
+ disappear FASTSHIPB1F_SAILOR1
end
UnknownScript_0x76766:
@@ -48,147 +62,147 @@ SailorScript_0x76767:
checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
iftrue UnknownScript_0x76787
writetext UnknownText_0x7687b
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
end
UnknownScript_0x76787:
writetext UnknownText_0x76907
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x7678d:
writetext UnknownText_0x7692e
checkevent EVENT_FAST_SHIP_FOUND_GIRL
iffalse UnknownScript_0x76799
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x76799:
keeptextopen
writetext UnknownText_0x7696d
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x767a0:
writetext UnknownText_0x7699d
+ waitbutton
closetext
- loadmovesprites
end
TrainerSailorJeff:
trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript
SailorJeffScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76a38
+ waitbutton
closetext
- loadmovesprites
end
TrainerPicnickerDebra:
trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript
PicnickerDebraScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76a99
+ waitbutton
closetext
- loadmovesprites
end
TrainerJugglerFritz:
trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript
JugglerFritzScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76b02
+ waitbutton
closetext
- loadmovesprites
end
TrainerSailorGarrett:
trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript
SailorGarrettScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76b7a
+ waitbutton
closetext
- loadmovesprites
end
TrainerFisherJonah:
trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript
FisherJonahScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76c22
+ waitbutton
closetext
- loadmovesprites
end
TrainerBlackbeltWai:
trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript
BlackbeltWaiScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76c9e
+ waitbutton
closetext
- loadmovesprites
end
TrainerSailorKenneth:
trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript
SailorKennethScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76d5f
+ waitbutton
closetext
- loadmovesprites
end
TrainerTeacherShirley:
trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript
TeacherShirleyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76de1
+ waitbutton
closetext
- loadmovesprites
end
TrainerSchoolboyNate:
trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript
SchoolboyNateScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76e3d
+ waitbutton
closetext
- loadmovesprites
end
TrainerSchoolboyRicky:
trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript
SchoolboyRickyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x76eb6
+ waitbutton
closetext
- loadmovesprites
end
FashShipB1FTrashcan: