diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
| commit | ef67f2d33b45348d76d722f250cdbcc8485be264 (patch) | |
| tree | 2fb5d08a962dea3329bcd876ea2d237cf8c6d3c1 /data/maps/BattleFrontier_BattleDomePreBattleRoom | |
| parent | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (diff) | |
Merge master into ObjEvent rename and prune accidental inclusions
Diffstat (limited to 'data/maps/BattleFrontier_BattleDomePreBattleRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index ca44f7b78..765a07e92 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 compare VAR_0x8006, 1 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 - frontier_set FRONTIER_DATA_6, 1 + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE setvar VAR_TEMP_0, 1 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 @@ -29,8 +29,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB waitmessage switch VAR_RESULT - call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1 switch VAR_RESULT |