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/BattleFrontier_OutsideEast | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/BattleFrontier_OutsideEast')
| -rw-r--r-- | data/maps/BattleFrontier_OutsideEast/scripts.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index bc154052d..317e818ba 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E + goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -136,11 +136,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 compare VAR_RESULT, 4 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 compare VAR_RESULT, 5 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 setflag FLAG_0x1C6 release end @@ -223,8 +223,7 @@ BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 lock faceplayer - checkflag FLAG_0x1C6 - goto_eq BattleFrontier_OutsideEast_EventScript_242DFE + goto_if_set FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242DFE msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT release end |