dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document SS Tidal scripts

Browse Source
This commit is contained in:
GriffinR
2019-11-08 03:37:46 -05:00
committed by huderlem
parent ba65719090
commit 0f53aeb19b
15 changed files with 285 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/LilycoveCity_Harbor/scripts.inc
+2 -2
View File
@@ -89,7 +89,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149
msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
setvar VAR_PORTHOLE_STATE, 5 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
call LilycoveCity_Harbor_EventScript_BoardFerry call LilycoveCity_Harbor_EventScript_BoardFerry
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate waitstate
@@ -392,7 +392,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575
msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
setvar VAR_PORTHOLE_STATE, 5 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
call LilycoveCity_Harbor_EventScript_BoardFerry call LilycoveCity_Harbor_EventScript_BoardFerry
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate waitstate
data/maps/SSTidalCorridor/map.json
+16 -16
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SSTidalCorridor_EventScript_23C119", "script": "SSTidalCorridor_EventScript_ExitSailor",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 2, "movement_range_y": 2,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SSTidalCorridor_EventScript_23C1A3", "script": "SSTidalCorridor_EventScript_Sailor",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SSTidalCorridor_EventScript_23C0D9", "script": "SSTidalCorridor_EventScript_Briney",
"flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SSTidalCorridor_EventScript_23C0E2", "script": "SSTidalCorridor_EventScript_Peeko",
"flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
}, },
{ {
@@ -153,7 +153,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalCorridor_EventScript_23C17D" "script": "SSTidalCorridor_EventScript_Porthole"
}, },
{ {
"type": "sign", "type": "sign",
@@ -161,7 +161,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalCorridor_EventScript_23C17D" "script": "SSTidalCorridor_EventScript_Porthole"
}, },
{ {
"type": "sign", "type": "sign",
@@ -169,7 +169,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalCorridor_EventScript_23C17D" "script": "SSTidalCorridor_EventScript_Porthole"
}, },
{ {
"type": "sign", "type": "sign",
@@ -177,7 +177,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalCorridor_EventScript_23C17D" "script": "SSTidalCorridor_EventScript_Porthole"
}, },
{ {
"type": "sign", "type": "sign",
@@ -185,7 +185,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalCorridor_EventScript_23C17D" "script": "SSTidalCorridor_EventScript_Porthole"
}, },
{ {
"type": "sign", "type": "sign",
@@ -193,7 +193,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalCorridor_EventScript_23C17D" "script": "SSTidalCorridor_EventScript_Porthole"
}, },
{ {
"type": "sign", "type": "sign",
@@ -201,7 +201,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalCorridor_EventScript_23C17D" "script": "SSTidalCorridor_EventScript_Porthole"
}, },
{ {
"type": "sign", "type": "sign",
@@ -209,7 +209,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalCorridor_EventScript_23C17D" "script": "SSTidalCorridor_EventScript_Porthole"
}, },
{ {
"type": "sign", "type": "sign",
@@ -217,7 +217,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "SSTidalCorridor_EventScript_23C0F5" "script": "SSTidalCorridor_EventScript_Cabin1Sign"
}, },
{ {
"type": "sign", "type": "sign",
@@ -225,7 +225,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "SSTidalCorridor_EventScript_23C0FE" "script": "SSTidalCorridor_EventScript_Cabin2Sign"
}, },
{ {
"type": "sign", "type": "sign",
@@ -233,7 +233,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "SSTidalCorridor_EventScript_23C107" "script": "SSTidalCorridor_EventScript_Cabin3Sign"
}, },
{ {
"type": "sign", "type": "sign",
@@ -241,7 +241,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "SSTidalCorridor_EventScript_23C110" "script": "SSTidalCorridor_EventScript_Cabin4Sign"
} }
] ]
} }
data/maps/SSTidalCorridor/scripts.inc
+117 -119
View File
@@ -1,218 +1,218 @@
SSTidalCorridor_MapScripts:: @ 823BFCF SSTidalCorridor_MapScripts:: @ 823BFCF
map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5 map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame
.byte 0 .byte 0
SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 SSTidalCorridor_OnFrame: @ 823BFD5
map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219 map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_ScottScene
map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT, SSTidalCorridor_EventScript_DepartSlateportForLilycove
map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015 map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE, SSTidalCorridor_EventScript_DepartLilycoveForSlateport
map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067 map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_RIGHT, SSTidalCorridor_EventScript_HalfwayToLilycove
map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_LEFT, SSTidalCorridor_EventScript_ArrivedInSlateport
.2byte 0 .2byte 0
SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
special SetSSTidalFlag special SetSSTidalFlag
setvar VAR_PORTHOLE_STATE, 2 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
lockall lockall
playse SE_PINPON playse SE_PINPON
msgbox SSTidalCorridor_Text_23C462, MSGBOX_DEFAULT msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
releaseall releaseall
end end
SSTidalCorridor_EventScript_23C015:: @ 823C015 SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
setvar VAR_PORTHOLE_STATE, 6 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE
lockall lockall
playse SE_PINPON playse SE_PINPON
msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
releaseall releaseall
end end
SSTidalRooms_EventScript_23C028:: @ 823C028 SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028
special SetSSTidalFlag special SetSSTidalFlag
setvar VAR_PORTHOLE_STATE, 7 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
playse SE_PINPON playse SE_PINPON
msgbox SSTidalRooms_Text_23C462, MSGBOX_DEFAULT msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
return return
SSTidalRooms_EventScript_23C03C:: @ 823C03C SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C
special ResetSSTidalFlag special ResetSSTidalFlag
setvar VAR_PORTHOLE_STATE, 4 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
playse SE_PINPON playse SE_PINPON
msgbox SSTidalRooms_Text_23C553, MSGBOX_DEFAULT msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT
return return
SSTidalCorridor_EventScript_23C050:: @ 823C050 SSTidalCorridor_EventScript_ReachedStepCount:: @ 823C050
compare VAR_PORTHOLE_STATE, 2 compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
goto_if_eq SSTidalCorridor_EventScript_23C067 goto_if_eq SSTidalCorridor_EventScript_HalfwayToLilycove
compare VAR_PORTHOLE_STATE, 7 compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
goto_if_eq SSTidalCorridor_EventScript_23C07D goto_if_eq SSTidalCorridor_EventScript_ArrivedInSlateport
end end
SSTidalCorridor_EventScript_23C067:: @ 823C067 SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
special ResetSSTidalFlag special ResetSSTidalFlag
setvar VAR_PORTHOLE_STATE, 3 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE
lockall lockall
playse SE_PINPON playse SE_PINPON
msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
releaseall releaseall
end end
SSTidalCorridor_EventScript_23C07D:: @ 823C07D SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
special ResetSSTidalFlag special ResetSSTidalFlag
setvar VAR_PORTHOLE_STATE, 8 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
lockall lockall
playse SE_PINPON playse SE_PINPON
msgbox SSTidalCorridor_Text_23C50F, MSGBOX_DEFAULT msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
releaseall releaseall
end end
SSTidalRooms_EventScript_23C093:: @ 823C093 SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093
special ResetSSTidalFlag special ResetSSTidalFlag
setvar VAR_PORTHOLE_STATE, 8 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
playse SE_PINPON playse SE_PINPON
msgbox SSTidalRooms_Text_23C50F, MSGBOX_DEFAULT msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
return return
SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7
switch VAR_PORTHOLE_STATE switch VAR_SS_TIDAL_STATE
case 2, SSTidalRooms_EventScript_23C03C case SS_TIDAL_DEPART_SLATEPORT, SSTidalRooms_EventScript_ArrivedInLilycove
case 3, SSTidalRooms_EventScript_23C03C case SS_TIDAL_HALFWAY_LILYCOVE, SSTidalRooms_EventScript_ArrivedInLilycove
case 6, SSTidalRooms_EventScript_23C028 case SS_TIDAL_DEPART_LILYCOVE, SSTidalRooms_EventScript_HalfwayToSlateport
case 7, SSTidalRooms_EventScript_23C093 case SS_TIDAL_HALFWAY_SLATEPORT, SSTidalRooms_EventScript_ArrivedInSlateport
return return
SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9 SSTidalCorridor_EventScript_Briney:: @ 823C0D9
msgbox SSTidalCorridor_Text_23C6EC, MSGBOX_NPC msgbox SSTidalCorridor_Text_BrineyWelcomeAboard, MSGBOX_NPC
end end
SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 SSTidalCorridor_EventScript_Peeko:: @ 823C0E2
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_WINGULL, 0 playmoncry SPECIES_WINGULL, 0
msgbox SSTidalCorridor_Text_23C7E1, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_Peeko, MSGBOX_DEFAULT
waitmoncry waitmoncry
release release
end end
SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5 SSTidalCorridor_EventScript_Cabin1Sign:: @ 823C0F5
msgbox SSTidalCorridor_Text_23C7F8, MSGBOX_SIGN msgbox SSTidalCorridor_Text_Cabin1, MSGBOX_SIGN
end end
SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE SSTidalCorridor_EventScript_Cabin2Sign:: @ 823C0FE
msgbox SSTidalCorridor_Text_23C800, MSGBOX_SIGN msgbox SSTidalCorridor_Text_Cabin2, MSGBOX_SIGN
end end
SSTidalCorridor_EventScript_23C107:: @ 823C107 SSTidalCorridor_EventScript_Cabin3Sign:: @ 823C107
msgbox SSTidalCorridor_Text_23C808, MSGBOX_SIGN msgbox SSTidalCorridor_Text_Cabin3, MSGBOX_SIGN
end end
SSTidalCorridor_EventScript_23C110:: @ 823C110 SSTidalCorridor_EventScript_Cabin4Sign:: @ 823C110
msgbox SSTidalCorridor_Text_23C810, MSGBOX_SIGN msgbox SSTidalCorridor_Text_Cabin4, MSGBOX_SIGN
end end
SSTidalCorridor_EventScript_23C119:: @ 823C119 SSTidalCorridor_EventScript_ExitSailor:: @ 823C119
lock lock
faceplayer faceplayer
compare VAR_PORTHOLE_STATE, 4 compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
goto_if_eq SSTidalCorridor_EventScript_23C13B goto_if_eq SSTidalCorridor_EventScript_ExitLilycove
compare VAR_PORTHOLE_STATE, 8 compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
goto_if_eq SSTidalCorridor_EventScript_23C15A goto_if_eq SSTidalCorridor_EventScript_ExitSlateport
msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_CanRestInCabin2, MSGBOX_DEFAULT
release release
end end
SSTidalCorridor_EventScript_23C13B:: @ 823C13B SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B
setrespawn HEAL_LOCATION_LILYCOVE_CITY setrespawn HEAL_LOCATION_LILYCOVE_CITY
msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179 call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
waitstate waitstate
release release
end end
SSTidalCorridor_EventScript_23C15A:: @ 823C15A SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A
setrespawn HEAL_LOCATION_SLATEPORT_CITY setrespawn HEAL_LOCATION_SLATEPORT_CITY
msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179 call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
waitstate waitstate
release release
end end
SSTidalCorridor_EventScript_23C179:: @ 823C179 SSTidalCorridor_EventScript_HideSnatchGiver:: @ 823C179
setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
return return
SSTidalCorridor_EventScript_23C17D:: @ 823C17D SSTidalCorridor_EventScript_Porthole:: @ 823C17D
lockall lockall
compare VAR_PORTHOLE_STATE, 2 compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
goto_if_eq SSTidalCorridor_EventScript_23C19E goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
compare VAR_PORTHOLE_STATE, 7 compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
goto_if_eq SSTidalCorridor_EventScript_23C19E goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole, MSGBOX_DEFAULT
releaseall releaseall
end end
SSTidalCorridor_EventScript_23C19E:: @ 823C19E SSTidalCorridor_EventScript_LookThroughPorthole:: @ 823C19E
special sub_80FB7A4 special LookThroughPorthole
waitstate waitstate
end end
SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 SSTidalCorridor_EventScript_Sailor:: @ 823C1A3
lock lock
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_23C1BD goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_EnjoyYourCruise
call SSTidalCorridor_EventScript_23C1C7 call SSTidalCorridor_EventScript_CheckIfTrainersDefeated
msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_VisitOtherCabins, MSGBOX_DEFAULT
release release
end end
SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD
msgbox SSTidalCorridor_Text_23C6B0, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_EnjoyYourCruise, MSGBOX_DEFAULT
release release
end end
SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7 SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
checktrainerflag TRAINER_PHILLIP checktrainerflag TRAINER_PHILLIP
goto_if_lt SSTidalCorridor_EventScript_23C218 goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_LEONARD checktrainerflag TRAINER_LEONARD
goto_if_lt SSTidalCorridor_EventScript_23C218 goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_COLTON checktrainerflag TRAINER_COLTON
goto_if_lt SSTidalCorridor_EventScript_23C218 goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_MICAH checktrainerflag TRAINER_MICAH
goto_if_lt SSTidalCorridor_EventScript_23C218 goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_THOMAS checktrainerflag TRAINER_THOMAS
goto_if_lt SSTidalCorridor_EventScript_23C218 goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_LEA_AND_JED checktrainerflag TRAINER_LEA_AND_JED
goto_if_lt SSTidalCorridor_EventScript_23C218 goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_GARRET checktrainerflag TRAINER_GARRET
goto_if_lt SSTidalCorridor_EventScript_23C218 goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_NAOMI checktrainerflag TRAINER_NAOMI
goto_if_lt SSTidalCorridor_EventScript_23C218 goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
goto SSTidalCorridor_EventScript_23C1BD goto SSTidalCorridor_EventScript_EnjoyYourCruise
return return
SSTidalCorridor_EventScript_23C218:: @ 823C218 SSTidalCorridor_EventScript_TrainerNotDefeated:: @ 823C218
return return
SSTidalCorridor_EventScript_23C219:: @ 823C219 SSTidalCorridor_EventScript_ScottScene:: @ 823C219
lockall lockall
applymovement 5, SSTidalCorridor_Movement_23C26D applymovement 5, SSTidalCorridor_Movement_ScottApproachPlayer
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT
closemessage closemessage
applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_23C27D applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit
applymovement 1, SSTidalCorridor_Movement_23C284 applymovement 1, SSTidalCorridor_Movement_SailorMoveForScott
applymovement 5, SSTidalCorridor_Movement_23C275 applymovement 5, SSTidalCorridor_Movement_ScottExit
waitmovement 0 waitmovement 0
playse SE_KAIDAN playse SE_KAIDAN
waitse waitse
removeobject 5 removeobject 5
applymovement 1, SSTidalCorridor_Movement_23C28B applymovement 1, SSTidalCorridor_Movement_SailorReturn
waitmovement 0 waitmovement 0
delay 30 delay 30
setflag FLAG_MET_SCOTT_ON_SS_TIDAL setflag FLAG_MET_SCOTT_ON_SS_TIDAL
@@ -220,7 +220,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
releaseall releaseall
end end
SSTidalCorridor_Movement_23C26D: @ 823C26D SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D
walk_left walk_left
walk_left walk_left
walk_left walk_left
@@ -230,7 +230,7 @@ SSTidalCorridor_Movement_23C26D: @ 823C26D
walk_left walk_left
step_end step_end
SSTidalCorridor_Movement_23C275: @ 823C275 SSTidalCorridor_Movement_ScottExit: @ 823C275
walk_in_place_fastest_down walk_in_place_fastest_down
delay_16 delay_16
delay_16 delay_16
@@ -240,7 +240,7 @@ SSTidalCorridor_Movement_23C275: @ 823C275
walk_left walk_left
step_end step_end
SSTidalCorridor_Movement_23C27D: @ 823C27D SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
@@ -249,7 +249,7 @@ SSTidalCorridor_Movement_23C27D: @ 823C27D
walk_in_place_fastest_down walk_in_place_fastest_down
step_end step_end
SSTidalCorridor_Movement_23C284: @ 823C284 SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284
delay_16 delay_16
walk_right walk_right
walk_right walk_right
@@ -258,13 +258,13 @@ SSTidalCorridor_Movement_23C284: @ 823C284
walk_in_place_fastest_left walk_in_place_fastest_left
step_end step_end
SSTidalCorridor_Movement_23C28B: @ 823C28B SSTidalCorridor_Movement_SailorReturn: @ 823C28B
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_fastest_up
step_end step_end
SSTidalCorridor_Text_23C28F: @ 823C28F SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F
.string "SCOTT: Well, hi, hi!\n" .string "SCOTT: Well, hi, hi!\n"
.string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p" .string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p"
.string "Something's come up, so I have to\n" .string "Something's come up, so I have to\n"
@@ -284,27 +284,25 @@ SSTidalCorridor_Text_23C28F: @ 823C28F
.string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n" .string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n"
.string "at the BATTLE FRONTIER!$" .string "at the BATTLE FRONTIER!$"
SSTidalCorridor_Text_23C462: @ 823C462 SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage: @ 823C462
SSTidalRooms_Text_23C462: @ 823C462
.string "This ferry is built to plow through\n" .string "This ferry is built to plow through\n"
.string "fast-running currents.\p" .string "fast-running currents.\p"
.string "We hope you enjoy your voyage with us.\n" .string "We hope you enjoy your voyage with us.\n"
.string "Feel free to explore the ship.$" .string "Feel free to explore the ship.$"
SSTidalCorridor_Text_23C4E3: @ 823C4E3 SSTidal_Text_HopeYouEnjoyVoyage: @ 823C4E3
.string "We hope you enjoy your voyage on\n" .string "We hope you enjoy your voyage on\n"
.string "our ferry.$" .string "our ferry.$"
SSTidalCorridor_Text_23C50F: @ 823C50F SSTidal_Text_MadeLandInSlateport: @ 823C50F
SSTidalRooms_Text_23C50F: @ 823C50F
.string "We have made land in SLATEPORT CITY.\n" .string "We have made land in SLATEPORT CITY.\n"
.string "Thank you for sailing with us.$" .string "Thank you for sailing with us.$"
SSTidalRooms_Text_23C553: @ 823C553 SSTidal_Text_MadeLandInLilycove: @ 823C553
.string "We have made land in LILYCOVE CITY.\n" .string "We have made land in LILYCOVE CITY.\n"
.string "Thank you for sailing with us.$" .string "Thank you for sailing with us.$"
SSTidalCorridor_Text_23C596: @ 823C596 SSTidalCorridor_Text_CanRestInCabin2: @ 823C596
.string "It'll be some time before we make land,\n" .string "It'll be some time before we make land,\n"
.string "I reckon.\p" .string "I reckon.\p"
.string "You can rest up in your cabin if you'd\n" .string "You can rest up in your cabin if you'd\n"
@@ -312,22 +310,22 @@ SSTidalCorridor_Text_23C596: @ 823C596
.string "The bed in there is soft and plushy.\n" .string "The bed in there is soft and plushy.\n"
.string "I can attest to how comfy it is!$" .string "I can attest to how comfy it is!$"
SSTidalCorridor_Text_23C64F: @ 823C64F SSTidalCorridor_Text_WeveArrived: @ 823C64F
.string "We've arrived!$" .string "We've arrived!$"
SSTidalCorridor_Text_23C65E: @ 823C65E SSTidalCorridor_Text_VisitOtherCabins: @ 823C65E
.string "Go visit other cabins.\n" .string "Go visit other cabins.\n"
.string "TRAINERS bored of the boat trip will\l" .string "TRAINERS bored of the boat trip will\l"
.string "be itching to battle.$" .string "be itching to battle.$"
SSTidalCorridor_Text_23C6B0: @ 823C6B0 SSTidalCorridor_Text_EnjoyYourCruise: @ 823C6B0
.string "Enjoy your cruise!$" .string "Enjoy your cruise!$"
SSTidalCorridor_Text_23C6C3: @ 823C6C3 SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole: @ 823C6C3
.string "The horizon spreads beyond\n" .string "The horizon spreads beyond\n"
.string "the porthole.$" .string "the porthole.$"
SSTidalCorridor_Text_23C6EC: @ 823C6EC SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC
.string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p" .string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p"
.string "They made me honorary captain of\n" .string "They made me honorary captain of\n"
.string "the S.S. TIDAL!\p" .string "the S.S. TIDAL!\p"
@@ -337,17 +335,17 @@ SSTidalCorridor_Text_23C6EC: @ 823C6EC
.string "Let me just say, it stirred my sleeping\n" .string "Let me just say, it stirred my sleeping\n"
.string "soul as a sailor!$" .string "soul as a sailor!$"
SSTidalCorridor_Text_23C7E1: @ 823C7E1 SSTidalCorridor_Text_Peeko: @ 823C7E1
.string "PEEKO: Pihyo pihyohyo…$" .string "PEEKO: Pihyo pihyohyo…$"
SSTidalCorridor_Text_23C7F8: @ 823C7F8 SSTidalCorridor_Text_Cabin1: @ 823C7F8
.string "Cabin 1$" .string "Cabin 1$"
SSTidalCorridor_Text_23C800: @ 823C800 SSTidalCorridor_Text_Cabin2: @ 823C800
.string "Cabin 2$" .string "Cabin 2$"
SSTidalCorridor_Text_23C808: @ 823C808 SSTidalCorridor_Text_Cabin3: @ 823C808
.string "Cabin 3$" .string "Cabin 3$"
SSTidalCorridor_Text_23C810: @ 823C810 SSTidalCorridor_Text_Cabin4: @ 823C810
.string "Cabin 4$" .string "Cabin 4$"
data/maps/SSTidalLowerDeck/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"movement_range_y": 4, "movement_range_y": 4,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "SSTidalLowerDeck_EventScript_23C819", "script": "SSTidalLowerDeck_EventScript_Phillip",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 4, "movement_range_y": 4,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "SSTidalLowerDeck_EventScript_23C830", "script": "SSTidalLowerDeck_EventScript_Leonard",
"flag": "0" "flag": "0"
} }
], ],
data/maps/SSTidalLowerDeck/scripts.inc
+12 -12
View File
@@ -1,38 +1,38 @@
SSTidalLowerDeck_MapScripts:: @ 823C818 SSTidalLowerDeck_MapScripts:: @ 823C818
.byte 0 .byte 0
SSTidalLowerDeck_EventScript_23C819:: @ 823C819 SSTidalLowerDeck_EventScript_Phillip:: @ 823C819
trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_PhillipIntro, SSTidalLowerDeck_Text_PhillipDefeat
msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE msgbox SSTidalLowerDeck_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalLowerDeck_EventScript_23C830:: @ 823C830 SSTidalLowerDeck_EventScript_Leonard:: @ 823C830
trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_LeonardIntro, SSTidalLowerDeck_Text_LeonardDefeat
msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE msgbox SSTidalLowerDeck_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalLowerDeck_Text_23C847: @ 823C847 SSTidalLowerDeck_Text_PhillipIntro: @ 823C847
.string "Arrrgh! I'm fed up and dog-tired of\n" .string "Arrrgh! I'm fed up and dog-tired of\n"
.string "cleaning this huge place!\p" .string "cleaning this huge place!\p"
.string "Let's have a quick battle!$" .string "Let's have a quick battle!$"
SSTidalLowerDeck_Text_23C8A0: @ 823C8A0 SSTidalLowerDeck_Text_PhillipDefeat: @ 823C8A0
.string "Little bro, I lost!$" .string "Little bro, I lost!$"
SSTidalLowerDeck_Text_23C8B4: @ 823C8B4 SSTidalLowerDeck_Text_PhillipPostBattle: @ 823C8B4
.string "We're the CLEANUP BROTHERS!\p" .string "We're the CLEANUP BROTHERS!\p"
.string "The old one dumps the detergent,\n" .string "The old one dumps the detergent,\n"
.string "and the young one does the scrubbing!$" .string "and the young one does the scrubbing!$"
SSTidalLowerDeck_Text_23C917: @ 823C917 SSTidalLowerDeck_Text_LeonardIntro: @ 823C917
.string "This is the bottom of the ship's hull.\n" .string "This is the bottom of the ship's hull.\n"
.string "There's plenty of room.\l" .string "There's plenty of room.\l"
.string "It'll be alright for a POKéMON battle.$" .string "It'll be alright for a POKéMON battle.$"
SSTidalLowerDeck_Text_23C97D: @ 823C97D SSTidalLowerDeck_Text_LeonardDefeat: @ 823C97D
.string "Big bro, I lost!$" .string "Big bro, I lost!$"
SSTidalLowerDeck_Text_23C98E: @ 823C98E SSTidalLowerDeck_Text_LeonardPostBattle: @ 823C98E
.string "We're the CLEANUP BROTHERS!\p" .string "We're the CLEANUP BROTHERS!\p"
.string "The old one dumps the detergent,\n" .string "The old one dumps the detergent,\n"
.string "and the young one does the scrubbing!$" .string "and the young one does the scrubbing!$"
data/maps/SSTidalRooms/map.json
+10 -10
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SSTidalRooms_EventScript_23CA49", "script": "SSTidalRooms_EventScript_Colton",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "SSTidalRooms_EventScript_23CA60", "script": "SSTidalRooms_EventScript_Micah",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SSTidalRooms_EventScript_23CA77", "script": "SSTidalRooms_EventScript_Thomas",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "SSTidalRooms_EventScript_23CA8E", "script": "SSTidalRooms_EventScript_Jed",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "SSTidalRooms_EventScript_23CAA9", "script": "SSTidalRooms_EventScript_Lea",
"flag": "0" "flag": "0"
}, },
{ {
@@ -89,7 +89,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "SSTidalRooms_EventScript_23CAC4", "script": "SSTidalRooms_EventScript_Garret",
"flag": "0" "flag": "0"
}, },
{ {
@@ -102,7 +102,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SSTidalRooms_EventScript_23CADB", "script": "SSTidalRooms_EventScript_Naomi",
"flag": "0" "flag": "0"
}, },
{ {
@@ -115,7 +115,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SSTidalRooms_EventScript_23C9F2", "script": "SSTidalRooms_EventScript_SnatchGiver",
"flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER" "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER"
} }
], ],
@@ -213,7 +213,7 @@
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalRooms_EventScript_23CA33" "script": "SSTidalRooms_EventScript_Bed"
}, },
{ {
"type": "sign", "type": "sign",
@@ -221,7 +221,7 @@
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SSTidalRooms_EventScript_23CA33" "script": "SSTidalRooms_EventScript_Bed"
} }
] ]
} }
data/maps/SSTidalRooms/scripts.inc
+57 -57
View File
@@ -1,175 +1,175 @@
SSTidalRooms_MapScripts:: @ 823C9F1 SSTidalRooms_MapScripts:: @ 823C9F1
.byte 0 .byte 0
SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 SSTidalRooms_EventScript_SnatchGiver:: @ 823C9F2
lock lock
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_23CA29 goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_ExplainSnatch
msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT msgbox SSTidalRooms_Text_NotSuspiciousTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_TM49 giveitem_std ITEM_TM49
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM49 setflag FLAG_RECEIVED_TM49
msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
release release
end end
SSTidalRooms_EventScript_23CA29:: @ 823CA29 SSTidalRooms_EventScript_ExplainSnatch:: @ 823CA29
msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
release release
end end
SSTidalRooms_EventScript_23CA33:: @ 823CA33 SSTidalRooms_EventScript_Bed:: @ 823CA33
lockall lockall
msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT msgbox SSTidalRooms_Text_TakeRestOnBed, MSGBOX_DEFAULT
closemessage closemessage
call Common_EventScript_OutOfCenterPartyHeal call Common_EventScript_OutOfCenterPartyHeal
call SSTidalRooms_EventScript_23C0A7 call SSTidalRooms_EventScript_ProgessCruiseAfterBed
releaseall releaseall
end end
SSTidalRooms_EventScript_23CA49:: @ 823CA49 SSTidalRooms_EventScript_Colton:: @ 823CA49
trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_ColtonIntro, SSTidalRooms_Text_ColtonDefeat
msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE msgbox SSTidalRooms_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalRooms_EventScript_23CA60:: @ 823CA60 SSTidalRooms_EventScript_Micah:: @ 823CA60
trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_MicahIntro, SSTidalRooms_Text_MicahDefeat
msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE msgbox SSTidalRooms_Text_MicahPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalRooms_EventScript_23CA77:: @ 823CA77 SSTidalRooms_EventScript_Thomas:: @ 823CA77
trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_ThomasIntro, SSTidalRooms_Text_ThomasDefeat
msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE msgbox SSTidalRooms_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalRooms_EventScript_23CA8E:: @ 823CA8E SSTidalRooms_EventScript_Jed:: @ 823CA8E
trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_JedIntro, SSTidalRooms_Text_JedDefeat, SSTidalRooms_Text_JedNotEnoughMons
msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE msgbox SSTidalRooms_Text_JedPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 SSTidalRooms_EventScript_Lea:: @ 823CAA9
trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_LeaIntro, SSTidalRooms_Text_LeaDefeat, SSTidalRooms_Text_LeaNotEnoughMons
msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE msgbox SSTidalRooms_Text_LeaPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 SSTidalRooms_EventScript_Garret:: @ 823CAC4
trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_GarretIntro, SSTidalRooms_Text_GarretDefeat
msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE msgbox SSTidalRooms_Text_GarretPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalRooms_EventScript_23CADB:: @ 823CADB SSTidalRooms_EventScript_Naomi:: @ 823CADB
trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_NaomiIntro, SSTidalRooms_Text_NaomiDefeat
msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE msgbox SSTidalRooms_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
end end
SSTidalRooms_Text_23CAF2: @ 823CAF2 SSTidalRooms_Text_TakeRestOnBed: @ 823CAF2
.string "There's a bed…\n" .string "There's a bed…\n"
.string "Let's take a rest.$" .string "Let's take a rest.$"
SSTidalRooms_Text_23CB14: @ 823CB14 SSTidalRooms_Text_ColtonIntro: @ 823CB14
.string "I often sail to LILYCOVE CITY.\p" .string "I often sail to LILYCOVE CITY.\p"
.string "I enjoy attending CONTESTS,\n" .string "I enjoy attending CONTESTS,\n"
.string "you see.$" .string "you see.$"
SSTidalRooms_Text_23CB58: @ 823CB58 SSTidalRooms_Text_ColtonDefeat: @ 823CB58
.string "That was an enjoyable match!$" .string "That was an enjoyable match!$"
SSTidalRooms_Text_23CB75: @ 823CB75 SSTidalRooms_Text_ColtonPostBattle: @ 823CB75
.string "I get so excited imagining what kinds\n" .string "I get so excited imagining what kinds\n"
.string "of POKéMON I'll get to see in the next\l" .string "of POKéMON I'll get to see in the next\l"
.string "CONTEST. The anticipation of it thrills!$" .string "CONTEST. The anticipation of it thrills!$"
SSTidalRooms_Text_23CBEB: @ 823CBEB SSTidalRooms_Text_MicahIntro: @ 823CBEB
.string "Are your friends strong?$" .string "Are your friends strong?$"
SSTidalRooms_Text_23CC04: @ 823CC04 SSTidalRooms_Text_MicahDefeat: @ 823CC04
.string "Your friends are, indeed, strong.$" .string "Your friends are, indeed, strong.$"
SSTidalRooms_Text_23CC26: @ 823CC26 SSTidalRooms_Text_MicahPostBattle: @ 823CC26
.string "Friends need not be human.\n" .string "Friends need not be human.\n"
.string "For me, POKéMON are treasured friends!$" .string "For me, POKéMON are treasured friends!$"
SSTidalRooms_Text_23CC68: @ 823CC68 SSTidalRooms_Text_ThomasIntro: @ 823CC68
.string "Child…\n" .string "Child…\n"
.string "Did you knock on the door?$" .string "Did you knock on the door?$"
SSTidalRooms_Text_23CC8A: @ 823CC8A SSTidalRooms_Text_ThomasDefeat: @ 823CC8A
.string "A loss is to be accepted without haste\n" .string "A loss is to be accepted without haste\n"
.string "or panic.$" .string "or panic.$"
SSTidalRooms_Text_23CCBB: @ 823CCBB SSTidalRooms_Text_ThomasPostBattle: @ 823CCBB
.string "To be never ruffled in any situation is\n" .string "To be never ruffled in any situation is\n"
.string "the GENTLEMAN's code of conduct.$" .string "the GENTLEMAN's code of conduct.$"
SSTidalRooms_Text_23CD04: @ 823CD04 SSTidalRooms_Text_JedIntro: @ 823CD04
.string "JED: I feel a little shy about this, but…\n" .string "JED: I feel a little shy about this, but…\n"
.string "We'll show you our lovey-dovey power!$" .string "We'll show you our lovey-dovey power!$"
SSTidalRooms_Text_23CD54: @ 823CD54 SSTidalRooms_Text_JedDefeat: @ 823CD54
.string "JED: Sigh…$" .string "JED: Sigh…$"
SSTidalRooms_Text_23CD5F: @ 823CD5F SSTidalRooms_Text_JedPostBattle: @ 823CD5F
.string "JED: It's the first time that our lovey-\n" .string "JED: It's the first time that our lovey-\n"
.string "dovey power couldn't prevail!\l" .string "dovey power couldn't prevail!\l"
.string "You must be an awesome TRAINER!$" .string "You must be an awesome TRAINER!$"
SSTidalRooms_Text_23CDC6: @ 823CDC6 SSTidalRooms_Text_JedNotEnoughMons: @ 823CDC6
.string "JED: You only have one POKéMON?\n" .string "JED: You only have one POKéMON?\n"
.string "Isn't that just too lonesome?$" .string "Isn't that just too lonesome?$"
SSTidalRooms_Text_23CE04: @ 823CE04 SSTidalRooms_Text_LeaIntro: @ 823CE04
.string "LEA: I feel a little silly, but…\n" .string "LEA: I feel a little silly, but…\n"
.string "We'll show you our lovey-dovey power!$" .string "We'll show you our lovey-dovey power!$"
SSTidalRooms_Text_23CE4B: @ 823CE4B SSTidalRooms_Text_LeaDefeat: @ 823CE4B
.string "LEA: Oh, boo!$" .string "LEA: Oh, boo!$"
SSTidalRooms_Text_23CE59: @ 823CE59 SSTidalRooms_Text_LeaPostBattle: @ 823CE59
.string "LEA: I can't believe it!\n" .string "LEA: I can't believe it!\n"
.string "Our lovey-dovey power failed…\l" .string "Our lovey-dovey power failed…\l"
.string "You must be an awesome TRAINER!$" .string "You must be an awesome TRAINER!$"
SSTidalRooms_Text_23CEB0: @ 823CEB0 SSTidalRooms_Text_LeaNotEnoughMons: @ 823CEB0
.string "LEA: I wanted to battle…\n" .string "LEA: I wanted to battle…\n"
.string "But you don't even have two POKéMON…$" .string "But you don't even have two POKéMON…$"
SSTidalRooms_Text_23CEEE: @ 823CEEE SSTidalRooms_Text_GarretIntro: @ 823CEEE
.string "Ah, you've come just in time.\p" .string "Ah, you've come just in time.\p"
.string "I'm bored, you see.\n" .string "I'm bored, you see.\n"
.string "You may entertain me.$" .string "You may entertain me.$"
SSTidalRooms_Text_23CF36: @ 823CF36 SSTidalRooms_Text_GarretDefeat: @ 823CF36
.string "…That will do.$" .string "…That will do.$"
SSTidalRooms_Text_23CF45: @ 823CF45 SSTidalRooms_Text_GarretPostBattle: @ 823CF45
.string "Perhaps I shall get Father to acquire\n" .string "Perhaps I shall get Father to acquire\n"
.string "a yacht for me.\l" .string "a yacht for me.\l"
.string "A yacht for me and POKéMON!$" .string "A yacht for me and POKéMON!$"
SSTidalRooms_Text_23CF97: @ 823CF97 SSTidalRooms_Text_NaomiIntro: @ 823CF97
.string "Oh, you're such an adorable TRAINER.\n" .string "Oh, you're such an adorable TRAINER.\n"
.string "Would you like to have tea?\l" .string "Would you like to have tea?\l"
.string "Or would you rather battle?$" .string "Or would you rather battle?$"
SSTidalRooms_Text_23CFF4: @ 823CFF4 SSTidalRooms_Text_NaomiDefeat: @ 823CFF4
.string "I see.\n" .string "I see.\n"
.string "You're the active sort.$" .string "You're the active sort.$"
SSTidalRooms_Text_23D013: @ 823D013 SSTidalRooms_Text_NaomiPostBattle: @ 823D013
.string "A world cruise on a luxury liner has its\n" .string "A world cruise on a luxury liner has its\n"
.string "charms, I must say…\p" .string "charms, I must say…\p"
.string "But, I will admit there is an appealing\n" .string "But, I will admit there is an appealing\n"
.string "side to touring HOENN by ferry.$" .string "side to touring HOENN by ferry.$"
SSTidalRooms_Text_23D098: @ 823D098 SSTidalRooms_Text_NotSuspiciousTakeThis: @ 823D098
.string "Uh… Hi! I… I'm not acting suspicious!\n" .string "Uh… Hi! I… I'm not acting suspicious!\n"
.string "Uh… You can have this! For free!\p" .string "Uh… You can have this! For free!\p"
.string "It… Honestly, I didn't SNATCH it from\n" .string "It… Honestly, I didn't SNATCH it from\n"
.string "someone! I'd never do such a thing!\l" .string "someone! I'd never do such a thing!\l"
.string "It's clean! You can use it!$" .string "It's clean! You can use it!$"
SSTidalRooms_Text_23D145: @ 823D145 SSTidalRooms_Text_ExplainSnatch: @ 823D145
.string "SNATCH steals the beneficial effects\n" .string "SNATCH steals the beneficial effects\n"
.string "of certain moves before they can be\l" .string "of certain moves before they can be\l"
.string "used by a foe or ally.$" .string "used by a foe or ally.$"
data/maps/SlateportCity_Harbor/scripts.inc
+1 -1
View File
@@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92
msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
setvar VAR_PORTHOLE_STATE, 1 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT
call SlateportCity_Harbor_EventScript_BoardFerry call SlateportCity_Harbor_EventScript_BoardFerry
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate waitstate
data/specials.inc
+1 -1
View File
@@ -281,7 +281,7 @@ gSpecials:: @ 81DBA64
def_special CheckLeadMonCute def_special CheckLeadMonCute
def_special CheckLeadMonSmart def_special CheckLeadMonSmart
def_special CheckLeadMonTough def_special CheckLeadMonTough
def_special sub_80FB7A4 def_special LookThroughPorthole
def_special DoSoftReset def_special DoSoftReset
def_special GameClear def_special GameClear
def_special MoveElevator def_special MoveElevator
include/constants/field_specials.h
+13
View File
@@ -13,6 +13,19 @@
#define SS_TIDAL_LOCATION_ROUTE124 3 #define SS_TIDAL_LOCATION_ROUTE124 3
#define SS_TIDAL_LOCATION_ROUTE131 4 #define SS_TIDAL_LOCATION_ROUTE131 4
#define SS_TIDAL_BOARD_SLATEPORT 1
#define SS_TIDAL_DEPART_SLATEPORT 2
#define SS_TIDAL_HALFWAY_LILYCOVE 3
#define SS_TIDAL_LAND_LILYCOVE 4
#define SS_TIDAL_BOARD_LILYCOVE 5
#define SS_TIDAL_DEPART_LILYCOVE 6
#define SS_TIDAL_HALFWAY_SLATEPORT 7
#define SS_TIDAL_LAND_SLATEPORT 8
#define SS_TIDAL_EXIT_CURRENTS_RIGHT 9
#define SS_TIDAL_EXIT_CURRENTS_LEFT 10
#define SS_TIDAL_MAX_STEPS 205
// Scrollable Multichoice Menus // Scrollable Multichoice Menus
#define SCROLL_MULTI_NONE 0 #define SCROLL_MULTI_NONE 0
#define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR 1 #define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR 1
include/constants/vars.h
+1 -1
View File
@@ -194,7 +194,7 @@
#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 #define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1
#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 #define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2
#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_WEATHER_INSTITUTE_STATE 0x40B3
#define VAR_PORTHOLE_STATE 0x40B4 #define VAR_SS_TIDAL_STATE 0x40B4
#define VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR 0x40B5 #define VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR 0x40B5
#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 // Leftover from RS, never set #define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 // Leftover from RS, never set
#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 #define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7
include/event_scripts.h
+1 -1
View File
@@ -557,7 +557,7 @@ extern const u8 Route119_EventScript_ScottWonAtFortreeGymCall[];
extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[]; extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[];
extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[];
extern const u8 SSTidalCorridor_EventScript_23C050[]; extern const u8 SSTidalCorridor_EventScript_ReachedStepCount[];
extern const u8 EventScript_FallDownHoleMtPyre[]; extern const u8 EventScript_FallDownHoleMtPyre[];
// Secret Base // Secret Base
src/field_control_avatar.c
+1 -1
View File
@@ -597,7 +597,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
return TRUE; return TRUE;
if (CountSSTidalStep(1) == TRUE) if (CountSSTidalStep(1) == TRUE)
{ {
ScriptContext1_SetupScript(SSTidalCorridor_EventScript_23C050); ScriptContext1_SetupScript(SSTidalCorridor_EventScript_ReachedStepCount);
return TRUE; return TRUE;
} }
if (TryStartMatchCall()) if (TryStartMatchCall())
src/field_special_scene.c
+38 -29
View File
@@ -14,6 +14,8 @@
#include "sprite.h" #include "sprite.h"
#include "task.h" #include "task.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/field_specials.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/vars.h" #include "constants/vars.h"
#include "constants/metatile_labels.h" #include "constants/metatile_labels.h"
@@ -31,8 +33,18 @@ enum
//. rodata //. rodata
static const s8 gTruckCamera_HorizontalTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0}; static const s8 gTruckCamera_HorizontalTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0};
const u8 gUnknown_0858E8AB[] = {0x18, 0xFE};
const u8 gUnknown_0858E8AD[] = {0x17, 0xFE}; static const u8 sSSTidalSailEastMovementScript[] =
{
MOVEMENT_TYPE_ROTATE_CLOCKWISE,
MOVEMENT_ACTION_STEP_END
};
static const u8 sSSTidalSailWestMovementScript[] =
{
MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE,
MOVEMENT_ACTION_STEP_END
};
// .text // .text
static void Task_Truck3(u8); static void Task_Truck3(u8);
@@ -256,7 +268,7 @@ bool8 sub_80FB59C(void)
void Task_HandlePorthole(u8 taskId) void Task_HandlePorthole(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
u16 *var = GetVarPointer(VAR_PORTHOLE_STATE); u16 *cruiseState = GetVarPointer(VAR_SS_TIDAL_STATE);
struct WarpData *location = &gSaveBlock1Ptr->location; struct WarpData *location = &gSaveBlock1Ptr->location;
switch (data[0]) switch (data[0])
@@ -268,40 +280,41 @@ void Task_HandlePorthole(u8 taskId)
data[0] = EXECUTE_MOVEMENT; // execute movement before checking if should be exited. strange? data[0] = EXECUTE_MOVEMENT; // execute movement before checking if should be exited. strange?
} }
break; break;
case IDLE_CHECK: // idle and move. case IDLE_CHECK:
if (gMain.newKeys & A_BUTTON) if (gMain.newKeys & A_BUTTON)
data[1] = 1; data[1] = 1;
if (!ScriptMovement_IsObjectMovementFinished(0xFF, location->mapNum, location->mapGroup)) if (!ScriptMovement_IsObjectMovementFinished(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup))
return; return;
if (CountSSTidalStep(1) == TRUE) if (CountSSTidalStep(1) == TRUE)
{ {
if (*var == 2) if (*cruiseState == SS_TIDAL_DEPART_SLATEPORT)
*var = 9; *cruiseState = SS_TIDAL_EXIT_CURRENTS_RIGHT;
else else
*var = 10; *cruiseState = SS_TIDAL_EXIT_CURRENTS_LEFT;
data[0] = 3; data[0] = EXIT_PORTHOLE;
return; return;
} }
data[0] = 2; data[0] = EXECUTE_MOVEMENT;
case EXECUTE_MOVEMENT: // execute movement. //fallthrough
case EXECUTE_MOVEMENT:
if (data[1]) if (data[1])
{ {
data[0] = EXIT_PORTHOLE; // exit porthole. data[0] = EXIT_PORTHOLE;
return; return;
} }
// run this once.
if (*var == 2) // which direction? if (*cruiseState == SS_TIDAL_DEPART_SLATEPORT)
{ {
ScriptMovement_StartObjectMovementScript(0xFF, location->mapNum, location->mapGroup, gUnknown_0858E8AB); ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailEastMovementScript);
data[0] = IDLE_CHECK; // run case 1. data[0] = IDLE_CHECK;
} }
else else
{ {
ScriptMovement_StartObjectMovementScript(0xFF, location->mapNum, location->mapGroup, gUnknown_0858E8AD); ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailWestMovementScript);
data[0] = IDLE_CHECK; // run case 1. data[0] = IDLE_CHECK;
} }
break; break;
case EXIT_PORTHOLE: // exit porthole. case EXIT_PORTHOLE:
FlagClear(FLAG_DONT_TRANSITION_MUSIC); FlagClear(FLAG_DONT_TRANSITION_MUSIC);
FlagClear(FLAG_HIDE_MAP_NAME_POPUP); FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
SetWarpDestinationToDynamicWarp(0); SetWarpDestinationToDynamicWarp(0);
@@ -311,32 +324,28 @@ void Task_HandlePorthole(u8 taskId)
} }
} }
void sub_80FB6EC(void) static void ShowSSTidalWhileSailing(void)
{ {
u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0);
gSprites[spriteId].coordOffsetEnabled = FALSE; gSprites[spriteId].coordOffsetEnabled = FALSE;
if (VarGet(VAR_PORTHOLE_STATE) == 2) if (VarGet(VAR_SS_TIDAL_STATE) == SS_TIDAL_DEPART_SLATEPORT)
{ StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(DIR_EAST));
StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(4));
}
else else
{ StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(DIR_WEST));
StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(3));
}
} }
void sub_80FB768(void) void sub_80FB768(void)
{ {
sub_80FB6EC(); ShowSSTidalWhileSailing();
gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
pal_fill_black(); pal_fill_black();
CreateTask(Task_HandlePorthole, 80); CreateTask(Task_HandlePorthole, 80);
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
void sub_80FB7A4(void) void LookThroughPorthole(void)
{ {
FlagSet(FLAG_SYS_CRUISE_MODE); FlagSet(FLAG_SYS_CRUISE_MODE);
FlagSet(FLAG_DONT_TRANSITION_MUSIC); FlagSet(FLAG_DONT_TRANSITION_MUSIC);
src/field_specials.c
+13 -12
View File
@@ -303,9 +303,10 @@ void ResetSSTidalFlag(void)
FlagClear(FLAG_SYS_CRUISE_MODE); FlagClear(FLAG_SYS_CRUISE_MODE);
} }
// Returns TRUE if the Cruise is over
bool32 CountSSTidalStep(u16 delta) bool32 CountSSTidalStep(u16 delta)
{ {
if (!FlagGet(FLAG_SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) <= 0xcc) if (!FlagGet(FLAG_SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) < SS_TIDAL_MAX_STEPS)
{ {
return FALSE; return FALSE;
} }
@@ -315,21 +316,21 @@ bool32 CountSSTidalStep(u16 delta)
u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y) u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
{ {
u16 *varCruiseStepCount = GetVarPointer(VAR_CRUISE_STEP_COUNT); u16 *varCruiseStepCount = GetVarPointer(VAR_CRUISE_STEP_COUNT);
switch (*GetVarPointer(VAR_PORTHOLE_STATE)) switch (*GetVarPointer(VAR_SS_TIDAL_STATE))
{ {
case 1: case SS_TIDAL_BOARD_SLATEPORT:
case 8: case SS_TIDAL_LAND_SLATEPORT:
return SS_TIDAL_LOCATION_SLATEPORT; return SS_TIDAL_LOCATION_SLATEPORT;
case 3: case SS_TIDAL_HALFWAY_LILYCOVE:
case 9: case SS_TIDAL_EXIT_CURRENTS_RIGHT:
return SS_TIDAL_LOCATION_ROUTE131; return SS_TIDAL_LOCATION_ROUTE131;
case 4: case SS_TIDAL_LAND_LILYCOVE:
case 5: case SS_TIDAL_BOARD_LILYCOVE:
return SS_TIDAL_LOCATION_LILYCOVE; return SS_TIDAL_LOCATION_LILYCOVE;
case 6: case SS_TIDAL_DEPART_LILYCOVE:
case 10: case SS_TIDAL_EXIT_CURRENTS_LEFT:
return SS_TIDAL_LOCATION_ROUTE124; return SS_TIDAL_LOCATION_ROUTE124;
case 2: case SS_TIDAL_DEPART_SLATEPORT:
if (*varCruiseStepCount < 60) if (*varCruiseStepCount < 60)
{ {
*mapNum = MAP_NUM(ROUTE134); *mapNum = MAP_NUM(ROUTE134);
@@ -346,7 +347,7 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
*x = *varCruiseStepCount - 140; *x = *varCruiseStepCount - 140;
} }
break; break;
case 7: case SS_TIDAL_HALFWAY_SLATEPORT:
if (*varCruiseStepCount < 66) if (*varCruiseStepCount < 66)
{ {
*mapNum = MAP_NUM(ROUTE132); *mapNum = MAP_NUM(ROUTE132);