diff options
| author | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
| commit | ac2e4adf2da2f30a741556e20e5bc9a494997581 (patch) | |
| tree | 1a05a202cfece044d546094581d8463a9b6e452c /data/maps/Route119_WeatherInstitute_1F/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_1F/scripts.inc')
| -rw-r--r-- | data/maps/Route119_WeatherInstitute_1F/scripts.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 3b36baf91..1131c42b2 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 faceplayer special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 - goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE + goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT release end @@ -30,15 +30,14 @@ Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, Route119_WeatherInstitute_1F_EventScript_26FB05 + goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_26FB05 setvar VAR_0x8004, 0 checkflag FLAG_0x1BE call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF checkflag FLAG_0x1BF call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF compare VAR_0x8004, 2 - goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 + goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FB05 msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT release end |