diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
| commit | 8a8baaeaaaffd7528c13f064b664c31e747c8fdc (patch) | |
| tree | bbd238d169df88dc2dbbed17956daae2ad630227 /src/battle_main.c | |
| parent | 907ed3f5f5537d14ed6136daeb81e38c383239c2 (diff) | |
| parent | 6068495619364c8e0ccae15ad036a1b5a9eef171 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 9410946f6..0437eaef4 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3071,7 +3071,7 @@ static void BattleStartClearSetData(void) *(gBattleStruct->AI_monToSwitchIntoId + i) = PARTY_SIZE; } - gBattleStruct->field_DF = 0; + gBattleStruct->givenExpMons = 0; gBattleStruct->field_92 = 0; gRandomTurnNumber = Random(); @@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void) gBattleResources->flags->flags[gActiveBattler] = 0; gCurrentMove = 0; - gBattleStruct->field_DA = 0xFF; + gBattleStruct->arenaTurnCounter = 0xFF; ClearBattlerMoveHistory(gActiveBattler); ClearBattlerAbilityHistory(gActiveBattler); @@ -3994,7 +3994,7 @@ void BattleTurnPassed(void) if (gBattleResults.battleTurnCounter < 0xFF) { gBattleResults.battleTurnCounter++; - gBattleStruct->field_DA++; + gBattleStruct->arenaTurnCounter++; } for (i = 0; i < gBattlersCount; i++) @@ -4013,7 +4013,7 @@ void BattleTurnPassed(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) BattleScriptExecute(BattleScript_82DB881); - else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->arenaTurnCounter == 0) BattleScriptExecute(BattleScript_ArenaTurnBeginning); } |