diff options
| author | huderlem <huderlem@gmail.com> | 2019-01-03 20:37:25 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 20:37:25 -0600 |
| commit | cba2f81bf870734960492b2d586d5a0684d99cf5 (patch) | |
| tree | 5845c0ad7355d3568637287b19796be4668d1b36 /data/maps/Route119_WeatherInstitute_2F | |
| parent | fd201f8395fccaf26349b352d3b0eda98bec8593 (diff) | |
| parent | 97ebeef1dbe8b4954d234fda067651f63d7e6360 (diff) | |
Merge pull request #507 from Tetrable/master
Finish off labeling flags
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_2F')
| -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 |