diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-04 22:03:17 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-04 22:03:17 -0400 |
commit | eb802f60a26d72e23c5e381bc06de2a7f3bfc7c0 (patch) | |
tree | 48db7717078baa94e05f80e5c5208e2abf4785e2 | |
parent | 003d16e7a178e440c41f2bca365bf8f8f2a60b0e (diff) |
add semicolons to BAD_MEMSET and BAD_MEMCPY
-rw-r--r-- | src/battle/battle_2.c | 14 | ||||
-rw-r--r-- | src/battle/battle_ai.c | 4 | ||||
-rw-r--r-- | src/battle/battle_controller_linkopponent.c | 6 | ||||
-rw-r--r-- | src/battle/battle_controller_linkpartner.c | 6 | ||||
-rw-r--r-- | src/battle/battle_controller_opponent.c | 8 | ||||
-rw-r--r-- | src/battle/battle_controller_player.c | 8 | ||||
-rw-r--r-- | src/battle/battle_controller_wally.c | 4 |
7 files changed, 25 insertions, 25 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); diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 3a5fb3d0d..5cf0a7ca6 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -269,7 +269,7 @@ void BattleAI_HandleItemUseBeforeAISetup(void) s32 i; u8 *data; - BAD_MEMSET(UNK_2016A00_STRUCT, 0, sizeof(struct UnkBattleStruct1), i, data) + BAD_MEMSET(UNK_2016A00_STRUCT, 0, sizeof(struct UnkBattleStruct1), i, data); if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 0x400 @@ -295,7 +295,7 @@ void BattleAI_SetupAIData(void) u8 *data; // clear AI data and set default move score to 100. strange that they didn't use memset here. - BAD_MEMSET(AI_THINKING_STRUCT, 0, sizeof(struct AI_ThinkingStruct), i, data) + BAD_MEMSET(AI_THINKING_STRUCT, 0, sizeof(struct AI_ThinkingStruct), i, data); for (i = 0; i < MAX_MON_MOVES; i++) AI_THINKING_STRUCT->score[i] = 100; diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 70cd636bd..c51e1a7f2 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -638,7 +638,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer) StringCopy10(battlePokemon.nickname, nickname); GetMonData(&gEnemyParty[a], MON_DATA_OT_NAME, battlePokemon.otName); - BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src) + BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src); break; case 1: data16 = GetMonData(&gEnemyParty[a], MON_DATA_SPECIES); @@ -659,7 +659,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer) moveData.pp[size] = GetMonData(&gEnemyParty[a], MON_DATA_PP1 + size); } moveData.ppBonuses = GetMonData(&gEnemyParty[a], MON_DATA_PP_BONUSES); - BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src) + BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src); break; case 4: case 5: @@ -1143,7 +1143,7 @@ void LinkOpponentHandlecmd3(void) u8 i; BAD_MEMSET(&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1], - gBattleBufferA[gActiveBank][3 + i], gBattleBufferA[gActiveBank][2], i, dst) + gBattleBufferA[gActiveBank][3 + i], gBattleBufferA[gActiveBank][2], i, dst); LinkOpponentBufferExecCompleted(); } diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index 718afa6bd..5500d5d0c 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -593,7 +593,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) GetMonData(&gPlayerParty[a], MON_DATA_NICKNAME, nickname); StringCopy10(battlePokemon.nickname, nickname); GetMonData(&gPlayerParty[a], MON_DATA_OT_NAME, battlePokemon.otName); - BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src) + BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src); break; case 1: data16 = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES); @@ -614,7 +614,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) moveData.pp[size] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + size); } moveData.ppBonuses = GetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES); - BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src) + BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src); break; case 4: case 5: @@ -1100,7 +1100,7 @@ void LinkPartnerHandlecmd3(void) u8 i; BAD_MEMSET(&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1], - gBattleBufferA[gActiveBank][3 + i], gBattleBufferA[gActiveBank][2], i, dst) + gBattleBufferA[gActiveBank][3 + i], gBattleBufferA[gActiveBank][2], i, dst); LinkPartnerBufferExecCompleted(); } diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index c36f5fd82..e2eed8308 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -601,7 +601,7 @@ u32 sub_8033598(u8 a, u8 *buffer) GetMonData(&gEnemyParty[a], MON_DATA_NICKNAME, nickname); StringCopy10(battlePokemon.nickname, nickname); GetMonData(&gEnemyParty[a], MON_DATA_OT_NAME, battlePokemon.otName); - BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src) + BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src); break; case 1: data16 = GetMonData(&gEnemyParty[a], MON_DATA_SPECIES); @@ -622,7 +622,7 @@ u32 sub_8033598(u8 a, u8 *buffer) moveData.pp[size] = GetMonData(&gEnemyParty[a], MON_DATA_PP1 + size); } moveData.ppBonuses = GetMonData(&gEnemyParty[a], MON_DATA_PP_BONUSES); - BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src) + BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src); break; case 4: case 5: @@ -865,7 +865,7 @@ void OpponentHandlecmd1(void) u8 *src = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1]; u8 *dst; - BAD_MEMSET(&buffer + gBattleBufferA[gActiveBank][1], src[i], gBattleBufferA[gActiveBank][2], i, dst) + BAD_MEMSET(&buffer + gBattleBufferA[gActiveBank][1], src[i], gBattleBufferA[gActiveBank][2], i, dst); Emitcmd29(1, gBattleBufferA[gActiveBank][2], dst); OpponentBufferExecCompleted(); } @@ -1114,7 +1114,7 @@ void OpponentHandlecmd3(void) u8 i; BAD_MEMSET(&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][3 + i], - gBattleBufferA[gActiveBank][2], i, dst) + gBattleBufferA[gActiveBank][2], i, dst); OpponentBufferExecCompleted(); } diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 8f63cd1ee..214f15ed7 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -1773,7 +1773,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer) GetMonData(&gPlayerParty[a], MON_DATA_NICKNAME, nickname); StringCopy10(battlePokemon.nickname, nickname); GetMonData(&gPlayerParty[a], MON_DATA_OT_NAME, battlePokemon.otName); - BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src) + BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src); break; case 1: data16 = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES); @@ -1794,7 +1794,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer) moveData.pp[size] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + size); } moveData.ppBonuses = GetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES); - BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src) + BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src); break; case 4: case 5: @@ -2037,7 +2037,7 @@ void PlayerHandlecmd1(void) u8 *src = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1]; u8 *dst; - BAD_MEMSET(&battleMon + gBattleBufferA[gActiveBank][1], src[i], gBattleBufferA[gActiveBank][2], i, dst) + BAD_MEMSET(&battleMon + gBattleBufferA[gActiveBank][1], src[i], gBattleBufferA[gActiveBank][2], i, dst); Emitcmd29(1, gBattleBufferA[gActiveBank][2], dst); PlayerBufferExecCompleted(); } @@ -2288,7 +2288,7 @@ void PlayerHandlecmd3(void) u8 *dst; BAD_MEMSET(&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][3 + i], - gBattleBufferA[gActiveBank][2], i, dst) + gBattleBufferA[gActiveBank][2], i, dst); PlayerBufferExecCompleted(); } diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index eefdc5e50..7f41d5b52 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -569,7 +569,7 @@ u32 sub_8137A84(u8 a, u8 *buffer) GetMonData(&gPlayerParty[a], MON_DATA_NICKNAME, nickname); StringCopy10(battlePokemon.nickname, nickname); GetMonData(&gPlayerParty[a], MON_DATA_OT_NAME, battlePokemon.otName); - BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src) + BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src); break; case 1: data16 = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES); @@ -590,7 +590,7 @@ u32 sub_8137A84(u8 a, u8 *buffer) moveData.pp[size] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + size); } moveData.ppBonuses = GetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES); - BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src) + BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src); break; case 4: case 5: |