summaryrefslogtreecommitdiff
path: root/maps/FastShipB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FastShipB1F.asm')
-rw-r--r--maps/FastShipB1F.asm105
1 files changed, 49 insertions, 56 deletions
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index c179b490a..3984274cc 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+ const_def 2 ; object constants
const FASTSHIPB1F_SAILOR1
const FASTSHIPB1F_SAILOR2
const FASTSHIPB1F_SAILOR3
@@ -13,13 +13,11 @@ const_value set 2
const FASTSHIPB1F_YOUNGSTER2
FastShipB1F_MapScripts:
-.SceneScripts:
- db 2
- scene_script .DummyScene0
- scene_script .DummyScene1
+ db 2 ; scene scripts
+ scene_script .DummyScene0 ; SCENE_DEFAULT
+ scene_script .DummyScene1 ; SCENE_FINISHED
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -94,10 +92,10 @@ UnknownScript_0x767a0:
end
TrainerSailorJeff:
- trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script
+ trainer SAILOR, JEFF, EVENT_BEAT_SAILOR_JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorJeffAfterBattleText
waitbutton
@@ -105,10 +103,10 @@ TrainerSailorJeff:
end
TrainerPicnickerDebra:
- trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script
+ trainer PICNICKER, DEBRA, EVENT_BEAT_PICNICKER_DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerDebraAfterBattleText
waitbutton
@@ -116,10 +114,10 @@ TrainerPicnickerDebra:
end
TrainerJugglerFritz:
- trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script
+ trainer JUGGLER, FRITZ, EVENT_BEAT_JUGGLER_FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext JugglerFritzAfterBattleText
waitbutton
@@ -127,10 +125,10 @@ TrainerJugglerFritz:
end
TrainerSailorGarrett:
- trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script
+ trainer SAILOR, GARRETT, EVENT_BEAT_SAILOR_GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorGarrettAfterBattleText
waitbutton
@@ -138,10 +136,10 @@ TrainerSailorGarrett:
end
TrainerFisherJonah:
- trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script
+ trainer FISHER, JONAH, EVENT_BEAT_FISHER_JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherJonahAfterBattleText
waitbutton
@@ -149,10 +147,10 @@ TrainerFisherJonah:
end
TrainerBlackbeltWai:
- trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script
+ trainer BLACKBELT_T, WAI, EVENT_BEAT_BLACKBELT_WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BlackbeltWaiAfterBattleText
waitbutton
@@ -160,10 +158,10 @@ TrainerBlackbeltWai:
end
TrainerSailorKenneth:
- trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script
+ trainer SAILOR, KENNETH, EVENT_BEAT_SAILOR_KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorKennethAfterBattleText
waitbutton
@@ -171,10 +169,10 @@ TrainerSailorKenneth:
end
TrainerTeacherShirley:
- trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script
+ trainer TEACHER, SHIRLEY, EVENT_BEAT_TEACHER_SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TeacherShirleyAfterBattleText
waitbutton
@@ -182,10 +180,10 @@ TrainerTeacherShirley:
end
TrainerSchoolboyNate:
- trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script
+ trainer SCHOOLBOY, NATE, EVENT_BEAT_SCHOOLBOY_NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyNateAfterBattleText
waitbutton
@@ -193,10 +191,10 @@ TrainerSchoolboyNate:
end
TrainerSchoolboyRicky:
- trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script
+ trainer SCHOOLBOY, RICKY, EVENT_BEAT_SCHOOLBOY_RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyRickyAfterBattleText
waitbutton
@@ -449,34 +447,29 @@ SchoolboyRickyAfterBattleText:
done
FastShipB1F_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 5, 11, 11, FAST_SHIP_1F
- warp_def 31, 13, 12, FAST_SHIP_1F
-
-.CoordEvents:
- db 2
- coord_event 30, 7, 0, UnknownScript_0x7673c
- coord_event 31, 7, 0, UnknownScript_0x76751
-
-.BGEvents:
- db 1
- bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
-
-.ObjectEvents:
- db 12
- object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
- object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
- object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
- object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
- object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
- object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
- object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+ db 0, 0 ; filler
+
+ db 2 ; warp events
+ warp_event 5, 11, FAST_SHIP_1F, 11
+ warp_event 31, 13, FAST_SHIP_1F, 12
+
+ db 2 ; coord events
+ coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c
+ coord_event 31, 7, SCENE_DEFAULT, UnknownScript_0x76751
+
+ db 1 ; bg events
+ bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
+
+ db 12 ; object events
+ object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
+ object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
+ object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+ object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+ object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+ object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+ object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
object_event 15, 11, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
- object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
- object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
- object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+ object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+ object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+ object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND