diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /data/maps/Route119_WeatherInstitute_2F | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_2F')
| -rw-r--r-- | data/maps/Route119_WeatherInstitute_2F/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index df1021530..0433877a5 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -131,19 +131,19 @@ Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: @ 82700EA end Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather:: @ 82700F7 - goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather + goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather msgbox Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A +Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather:: @ 827010A setvar VAR_0x8004, 0 call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated compare VAR_0x8004, 2 @ Both defeated goto_if_eq Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather - call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather - specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType + call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather + specialvar VAR_RESULT, GetAbnormalWeatherMapNameAndType compare VAR_RESULT, 1 goto_if_eq Route119_WeatherInstitute_2F_EventScript_KyogreWeather msgbox Route119_WeatherInstitute_2F_Text_GroudonWeather, MSGBOX_DEFAULT @@ -155,8 +155,8 @@ Route119_WeatherInstitute_2F_EventScript_KyogreWeather:: @ 827014F release end -Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather:: @ 8270159 - special CreateUnusualWeatherEvent +Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather:: @ 8270159 + special CreateAbnormalWeatherEvent setflag FLAG_TEMP_2 return |