diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
| commit | f8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch) | |
| tree | 81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /data/maps/Route119_WeatherInstitute_2F/scripts.inc | |
| parent | ee5a239534d7c4bd64ce7ced4146204579f5d598 (diff) | |
| parent | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_2F/scripts.inc')
| -rw-r--r-- | data/maps/Route119_WeatherInstitute_2F/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 6d54e62ad..e7d2cb03d 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -126,7 +126,7 @@ Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA msgbox Route119_WeatherInstitute_2F_Text_2706FE, MSGBOX_DEFAULT - setflag FLAG_0x097 + setflag FLAG_RECEIVED_CASTFORM release end @@ -138,8 +138,8 @@ Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A setvar VAR_0x8004, 0 - call_if_set FLAG_0x1BE, Route119_WeatherInstitute_2F_EventScript_270160 - call_if_set FLAG_0x1BF, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_270160 compare VAR_0x8004, 2 goto_if_eq Route119_WeatherInstitute_2F_EventScript_270166 call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159 @@ -207,7 +207,7 @@ Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B lock faceplayer - goto_if_set FLAG_0x097, Route119_WeatherInstitute_2F_EventScript_2700F7 + goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_2700F7 goto Route119_WeatherInstitute_2F_EventScript_27004D end |