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/DesertRuins/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/DesertRuins/scripts.inc')
| -rw-r--r-- | data/maps/DesertRuins/scripts.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 760336d91..87872b6c5 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -12,7 +12,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, DesertRuins_EventScript_27374E + goto_if_ne DesertRuins_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -42,8 +42,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9DB:: @ 822D9DB lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_eq DesertRuins_EventScript_22D9EE + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE braillemessage DesertRuins_Braille_2A6CA0 waitbuttonpress hidebox2 @@ -77,11 +76,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq DesertRuins_EventScript_22DA49 + goto_if_eq DesertRuins_EventScript_22DA49 compare VAR_RESULT, 4 - goto_eq DesertRuins_EventScript_22DA52 + goto_if_eq DesertRuins_EventScript_22DA52 compare VAR_RESULT, 5 - goto_eq DesertRuins_EventScript_22DA52 + goto_if_eq DesertRuins_EventScript_22DA52 setflag FLAG_0x1BB release end |