diff options
Diffstat (limited to 'data/maps/SSTidalCorridor/scripts.inc')
| -rw-r--r-- | data/maps/SSTidalCorridor/scripts.inc | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 0f2028476..18d42f009 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,5 +1,5 @@ SSTidalCorridor_MapScripts:: @ 815FC94 - map_script 2, SSTidalCorridor_MapScript2_15FC9A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_15FC9A .byte 0 SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A @@ -14,7 +14,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC setvar VAR_PORTHOLE_STATE, 2 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_199007, 4 + msgbox SSTidalCorridor_Text_199007, MSGBOX_DEFAULT releaseall end @@ -22,7 +22,7 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar VAR_PORTHOLE_STATE, 6 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_199088, 4 + msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT releaseall end @@ -30,14 +30,14 @@ SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 playse SE_PINPON - msgbox SSTidalRooms_Text_199007, 4 + msgbox SSTidalRooms_Text_199007, MSGBOX_DEFAULT return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 playse SE_PINPON - msgbox SSTidalRooms_Text_1990F8, 4 + msgbox SSTidalRooms_Text_1990F8, MSGBOX_DEFAULT return gUnknown_0815FD0D:: @ 815FD0D @@ -52,7 +52,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 setvar VAR_PORTHOLE_STATE, 3 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_199088, 4 + msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT releaseall end @@ -61,7 +61,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A setvar VAR_PORTHOLE_STATE, 8 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_1990B4, 4 + msgbox SSTidalCorridor_Text_1990B4, MSGBOX_DEFAULT releaseall end @@ -69,7 +69,7 @@ SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 playse SE_PINPON - msgbox SSTidalRooms_Text_1990B4, 4 + msgbox SSTidalRooms_Text_1990B4, MSGBOX_DEFAULT return SSTidalRooms_EventScript_15FD64:: @ 815FD64 @@ -81,7 +81,7 @@ SSTidalRooms_EventScript_15FD64:: @ 815FD64 return SSTidalCorridor_EventScript_15FD96:: @ 815FD96 - msgbox SSTidalCorridor_Text_199291, 2 + msgbox SSTidalCorridor_Text_199291, MSGBOX_NPC end SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F @@ -89,25 +89,25 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox SSTidalCorridor_Text_199388, 4 + msgbox SSTidalCorridor_Text_199388, MSGBOX_DEFAULT waitmoncry release end SSTidalCorridor_EventScript_15FDB2:: @ 815FDB2 - msgbox SSTidalCorridor_Text_1993A1, 3 + msgbox SSTidalCorridor_Text_1993A1, MSGBOX_SIGN end SSTidalCorridor_EventScript_15FDBB:: @ 815FDBB - msgbox SSTidalCorridor_Text_1993A9, 3 + msgbox SSTidalCorridor_Text_1993A9, MSGBOX_SIGN end SSTidalCorridor_EventScript_15FDC4:: @ 815FDC4 - msgbox SSTidalCorridor_Text_1993B1, 3 + msgbox SSTidalCorridor_Text_1993B1, MSGBOX_SIGN end SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD - msgbox SSTidalCorridor_Text_1993B9, 3 + msgbox SSTidalCorridor_Text_1993B9, MSGBOX_SIGN end SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 @@ -117,13 +117,13 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 goto_if_eq SSTidalCorridor_EventScript_15FDF8 compare VAR_PORTHOLE_STATE, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 - msgbox SSTidalCorridor_Text_19913B, 4 + msgbox SSTidalCorridor_Text_19913B, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 setrespawn HEAL_LOCATION_LILYCOVE_CITY - msgbox SSTidalCorridor_Text_1991F4, 4 + msgbox SSTidalCorridor_Text_1991F4, MSGBOX_DEFAULT call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate @@ -132,7 +132,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 SSTidalCorridor_EventScript_15FE17:: @ 815FE17 setrespawn HEAL_LOCATION_SLATEPORT_CITY - msgbox SSTidalCorridor_Text_1991F4, 4 + msgbox SSTidalCorridor_Text_1991F4, MSGBOX_DEFAULT call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate @@ -149,7 +149,7 @@ SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A goto_if_eq SSTidalCorridor_EventScript_15FE5B compare VAR_PORTHOLE_STATE, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B - msgbox SSTidalCorridor_Text_199268, 4 + msgbox SSTidalCorridor_Text_199268, MSGBOX_DEFAULT releaseall end @@ -163,24 +163,24 @@ SSTidalCorridor_EventScript_15FE60:: @ 815FE60 faceplayer goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 - msgbox SSTidalCorridor_Text_199203, 4 + msgbox SSTidalCorridor_Text_199203, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A - msgbox SSTidalCorridor_Text_199255, 4 + msgbox SSTidalCorridor_Text_199255, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - goto_if_trainer_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return |