diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 01:15:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 01:15:36 -0500 |
| commit | e5df61e362beaaab9ae4344f4f160397df9c54cc (patch) | |
| tree | 8bb86e5e523406b21daa08aff9bce080184fe31e /data/maps/BattleFrontier_BattleDomePreBattleRoom | |
| parent | 017fa294b5c88ddd7513cb4976b5c29cad0b94a5 (diff) | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Merge branch 'master' into doc-dome
Diffstat (limited to 'data/maps/BattleFrontier_BattleDomePreBattleRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 55a5fb48a..ffc399142 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222 compare VAR_0x8006, 1 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle - frontier_set FRONTIER_DATA_6, 1 + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE setvar VAR_TEMP_0, 1 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter waitmovement 0 @@ -28,7 +28,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B call BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage waitmessage switch VAR_RESULT @ No case? - call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 + call BattleFrontier_EventScript_GetCantRecordBattle compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1 |