diff options
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_1F/scripts.inc')
| -rw-r--r-- | data/maps/Route119_WeatherInstitute_1F/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 547241940..c97e25e29 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A - map_script 3, Route119_WeatherInstitute_1F_MapScript1_163C30 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_163C30 .byte 0 Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 - call Route119_WeatherInstitute_1F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if_eq Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -19,37 +19,37 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 - msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 + msgbox Route119_WeatherInstitute_1F_Text_19ED22, MSGBOX_DEFAULT release end Route119_WeatherInstitute_1F_EventScript_163C67:: @ 8163C67 - msgbox Route119_WeatherInstitute_1F_Text_19ECF4, 4 + msgbox Route119_WeatherInstitute_1F_Text_19ECF4, MSGBOX_DEFAULT release end Route119_WeatherInstitute_1F_EventScript_163C71:: @ 8163C71 - msgbox Route119_WeatherInstitute_1F_Text_19ED6B, 2 + msgbox Route119_WeatherInstitute_1F_Text_19ED6B, MSGBOX_NPC end Route119_WeatherInstitute_1F_EventScript_163C7A:: @ 8163C7A - msgbox Route119_WeatherInstitute_1F_Text_19EE25, 2 + msgbox Route119_WeatherInstitute_1F_Text_19EE25, MSGBOX_NPC end Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 lockall - msgbox Route119_WeatherInstitute_1F_Text_19EE8B, 4 + msgbox Route119_WeatherInstitute_1F_Text_19EE8B, MSGBOX_DEFAULT closemessage - call Route119_WeatherInstitute_1F_EventScript_1A02CA + call Common_EventScript_OutOfCenterPartyHeal releaseall end Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94 - trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE - msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6 + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_1, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE + msgbox Route119_WeatherInstitute_1F_Text_19EC0E, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB - trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 - msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6 + trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_2, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 + msgbox Route119_WeatherInstitute_1F_Text_19EC97, MSGBOX_AUTOCLOSE end |