diff options
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_2F/scripts.inc')
| -rw-r--r-- | data/maps/Route119_WeatherInstitute_2F/scripts.inc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index a2317a791..18aba2003 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 - map_script 3, Route119_WeatherInstitute_2F_MapScript1_163CC8 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_163CC8 .byte 0 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 - call Route119_WeatherInstitute_2F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4 compare VAR_WEATHER_INSTITUTE_STATE, 1 @@ -21,32 +21,32 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 return Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC - trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B - msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6 + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_3, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B + msgbox Route119_WeatherInstitute_2F_Text_19EF3E, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13 - trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD - msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6 + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_4, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD + msgbox Route119_WeatherInstitute_2F_Text_19EFE9, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A - trainerbattle 2, TRAINER_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 - msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6 + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_5, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 + msgbox Route119_WeatherInstitute_2F_Text_19F11B, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 - msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 + msgbox Route119_WeatherInstitute_2F_Text_19F11B, MSGBOX_DEFAULT closemessage setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm - fadescreen 1 + fadescreen FADE_TO_BLACK setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE removeobject 1 removeobject 2 removeobject 3 - fadescreen 0 + fadescreen FADE_FROM_BLACK applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmovement 0 moveobjectoffscreen 5 @@ -54,7 +54,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 end Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A - msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 + msgbox Route119_WeatherInstitute_2F_Text_19F1CF, MSGBOX_DEFAULT getpartysize compare VAR_RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 @@ -62,19 +62,19 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage - givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER setflag FLAG_RECEIVED_CASTFORM - msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 + msgbox Route119_WeatherInstitute_2F_Text_19F27D, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_163DB4:: @ 8163DB4 - msgbox Route119_WeatherInstitute_2F_Text_19F231, 4 + msgbox Route119_WeatherInstitute_2F_Text_19F231, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE - msgbox Route119_WeatherInstitute_2F_Text_19F2FE, 4 + msgbox Route119_WeatherInstitute_2F_Text_19F2FE, MSGBOX_DEFAULT release end @@ -82,7 +82,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 walk_right walk_right walk_right - end_movement + step_end Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock |