diff options
Diffstat (limited to 'src/battle/battle_2.c')
| -rw-r--r-- | src/battle/battle_2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 32ffc57d4..6404efcf1 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1568,7 +1568,7 @@ void sub_8010874(void) { gStatuses3[i] = 0; - BAD_MEMSET(&gDisableStructs[i], 0, 0x1C, j, r4) + BAD_MEMSET(&gDisableStructs[i], 0, 0x1C, j, r4); gDisableStructs[i].isFirstTurn= 2; gUnknown_02024C70[i] = 0; gLastUsedMove[i] = 0; @@ -1584,14 +1584,14 @@ void sub_8010874(void) for (i = 0; i < 2; i++) { gSideAffecting[i] = 0; - BAD_MEMSET(&gSideTimer[i], 0, 12, j, r4) + BAD_MEMSET(&gSideTimer[i], 0, 12, j, r4); } gBankAttacker = 0; gBankTarget = 0; gBattleWeather = 0; - BAD_MEMSET(&gWishFutureKnock, 0, 0x2C, i, r4) + BAD_MEMSET(&gWishFutureKnock, 0, 0x2C, i, r4); gHitMarker = 0; if ((gBattleTypeFlags & BATTLE_TYPE_LINK) == 0 && gSaveBlock2.optionsBattleSceneOff == TRUE) @@ -1714,7 +1714,7 @@ void SwitchInClearStructs(void) gActionSelectionCursor[gActiveBank] = 0; gMoveSelectionCursor[gActiveBank] = 0; - BAD_MEMSET(&gDisableStructs[gActiveBank], 0, 0x1C, i, ptr) + BAD_MEMSET(&gDisableStructs[gActiveBank], 0, 0x1C, i, ptr); if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) { @@ -1769,7 +1769,7 @@ void UndoEffectsAfterFainting(void) gActionSelectionCursor[gActiveBank] = 0; gMoveSelectionCursor[gActiveBank] = 0; - BAD_MEMSET(&gDisableStructs[gActiveBank], 0, 0x1C, i, ptr) + BAD_MEMSET(&gDisableStructs[gActiveBank], 0, 0x1C, i, ptr); gProtectStructs[gActiveBank].protected = 0; gProtectStructs[gActiveBank].endured = 0; gProtectStructs[gActiveBank].onlyStruggle = 0; @@ -1862,13 +1862,13 @@ void sub_8011384(void) if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && GetBankSide(gActiveBank) == 0) { - BAD_MEMSET(&gBattleMons[gActiveBank], 0, 0x58, i, ptr) + BAD_MEMSET(&gBattleMons[gActiveBank], 0, 0x58, i, ptr); } else { u8 r0; - BAD_MEMSET(&gBattleMons[gActiveBank], gBattleBufferB[gActiveBank][4 + i], 0x58, i, ptr) + BAD_MEMSET(&gBattleMons[gActiveBank], gBattleBufferB[gActiveBank][4 + i], 0x58, i, ptr); gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1; gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2; gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility); |