From de6947a6e5f0fd97e72af53e753d679aa2badcff Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 27 Feb 2026 15:10:52 +0100 Subject: [PATCH] Fix spacing for conditions (#9369) --- include/global.h | 2 +- include/test/battle.h | 2 +- src/battle_ai_main.c | 10 ++++---- src/battle_ai_switch.c | 4 +-- src/battle_ai_util.c | 10 ++++---- src/battle_anim_effects_1.c | 43 +++++++++++++++------------------ src/battle_anim_electric.c | 8 +++--- src/battle_anim_fire.c | 6 ++--- src/battle_anim_mons.c | 4 +-- src/battle_anim_normal.c | 2 +- src/battle_anim_water.c | 2 +- src/battle_dome.c | 18 +++++++------- src/battle_dynamax.c | 4 +-- src/battle_interface.c | 4 +-- src/battle_script_commands.c | 12 ++++----- src/battle_setup.c | 2 +- src/battle_tv.c | 2 +- src/battle_util.c | 2 +- src/berry.c | 4 +-- src/berry_blender.c | 2 +- src/berry_crush.c | 2 +- src/birch_pc.c | 2 +- src/chooseboxmon.c | 2 +- src/clear_save_data_screen.c | 8 +++--- src/contest.c | 12 ++++----- src/contest_ai.c | 2 +- src/contest_util.c | 4 +-- src/datetime.c | 4 +-- src/debug.c | 4 +-- src/dma3_manager.c | 2 +- src/event_object_movement.c | 24 +++++++++--------- src/field_control_avatar.c | 12 ++++----- src/field_effect.c | 2 +- src/field_specials.c | 4 +-- src/fishing.c | 4 +-- src/fldeff_softboiled.c | 8 +++--- src/frontier_util.c | 2 +- src/generational_changes.c | 2 +- src/intro.c | 12 ++++----- src/intro_credits_graphics.c | 2 +- src/item_menu.c | 2 +- src/item_use.c | 2 +- src/menu.c | 2 +- src/mini_printf.c | 20 +++++++-------- src/mystery_gift_view.c | 2 +- src/oak_speech.c | 2 +- src/overworld.c | 2 +- src/player_pc.c | 2 +- src/pokedex.c | 2 +- src/pokedex_area_screen.c | 4 +-- src/pokedex_plus_hgss.c | 8 +++--- src/pokemon.c | 14 +++++------ src/pokemon_sprite_visualizer.c | 4 +-- src/pokemon_storage_system.c | 2 +- src/pokemon_summary_screen.c | 2 +- src/random.c | 2 +- src/save.c | 4 +-- src/scrcmd.c | 2 +- src/script_pokemon_util.c | 2 +- src/slot_machine.c | 2 +- src/start_menu.c | 2 +- src/text.c | 2 +- src/trade.c | 4 +-- src/trainer_card.c | 2 +- src/tv.c | 6 ++--- 65 files changed, 176 insertions(+), 179 deletions(-) diff --git a/include/global.h b/include/global.h index d77bdf1fc3..e60275d59c 100644 --- a/include/global.h +++ b/include/global.h @@ -131,7 +131,7 @@ ({ \ s16 v = (val); \ float f = (float)v; \ - if(v < 0) f += 65536.0f; \ + if (v < 0) f += 65536.0f;\ f; \ }) diff --git a/include/test/battle.h b/include/test/battle.h index 536f18812b..a62cd40a2c 100644 --- a/include/test/battle.h +++ b/include/test/battle.h @@ -1039,7 +1039,7 @@ struct moveWithPP { #define SpDefenseIV(spDefenseIV) SpDefenseIV_(__LINE__, spDefenseIV) #define SpeedIV(speedIV) SpeedIV_(__LINE__, speedIV) #define Item(item) Item_(__LINE__, item) -#define Moves(move1, ...) do { u16 moves_[MAX_MON_MOVES] = {move1, __VA_ARGS__}; Moves_(__LINE__, moves_); } while(0) +#define Moves(move1, ...) do { u16 moves_[MAX_MON_MOVES] = {move1, __VA_ARGS__}; Moves_(__LINE__, moves_); } while (0) #define MovesWithPP(movewithpp1, ...) MovesWithPP_(__LINE__, (struct moveWithPP[MAX_MON_MOVES]) {movewithpp1, __VA_ARGS__}) #define Friendship(friendship) Friendship_(__LINE__, friendship) #define Status1(status1) Status1_(__LINE__, status1) diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index f8c1130474..3f5021660e 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -1265,7 +1265,7 @@ static s32 AI_CheckBadMove(enum BattlerId battlerAtk, enum BattlerId battlerDef, break; } - switch(nonVolatileStatus) + switch (nonVolatileStatus) { case MOVE_EFFECT_POISON: case MOVE_EFFECT_TOXIC: @@ -3057,7 +3057,7 @@ static s32 AI_CheckBadMove(enum BattlerId battlerAtk, enum BattlerId battlerDef, } // move effect checks // check non-volatile effects - switch(nonVolatileStatus) + switch (nonVolatileStatus) { case MOVE_EFFECT_POISON: case MOVE_EFFECT_TOXIC: @@ -4358,7 +4358,7 @@ static s32 AI_CalcMoveEffectScore(enum BattlerId battlerAtk, enum BattlerId batt ADJUST_SCORE(DECENT_EFFECT); // Non-volatile statuses - switch(GetMoveNonVolatileStatus(move)) + switch (GetMoveNonVolatileStatus(move)) { case MOVE_EFFECT_POISON: case MOVE_EFFECT_TOXIC: @@ -4779,7 +4779,7 @@ static s32 AI_CalcMoveEffectScore(enum BattlerId battlerAtk, enum BattlerId batt bool32 encourage = gBattleMoveEffects[GetMoveEffect(aiData->lastUsedMove[battlerDef])].encourageEncore; - switch(GetMoveNonVolatileStatus(aiData->lastUsedMove[battlerDef])) + switch (GetMoveNonVolatileStatus(aiData->lastUsedMove[battlerDef])) { case MOVE_EFFECT_POISON: case MOVE_EFFECT_PARALYSIS: @@ -6706,7 +6706,7 @@ static s32 AI_HPAware(enum BattlerId battlerAtk, enum BattlerId battlerDef, enum break; } - switch(GetMoveNonVolatileStatus(move)) + switch (GetMoveNonVolatileStatus(move)) { case MOVE_EFFECT_POISON: ADJUST_SCORE(-2); diff --git a/src/battle_ai_switch.c b/src/battle_ai_switch.c index 57a8bb3f1d..9c5d6bc669 100644 --- a/src/battle_ai_switch.c +++ b/src/battle_ai_switch.c @@ -120,7 +120,7 @@ static void GetIncomingHealInfo(enum BattlerId battler, struct IncomingHealInfo u32 GetSwitchChance(enum ShouldSwitchScenario shouldSwitchScenario) { // Modify these cases if you want unique behaviour based on other data (trainer class, difficulty, etc.) - switch(shouldSwitchScenario) + switch (shouldSwitchScenario) { case SHOULD_SWITCH_WONDER_GUARD: return SHOULD_SWITCH_WONDER_GUARD_PERCENTAGE; @@ -923,7 +923,7 @@ static bool32 ShouldSwitchIfAbilityBenefit(enum BattlerId battler) || IsNeutralizingGasOnField()) return FALSE; - switch(gAiLogicData->abilities[battler]) + switch (gAiLogicData->abilities[battler]) { case ABILITY_NATURAL_CURE: //Attempt to cure bad ailment diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 7aef8e4591..b024ecf38b 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -1922,7 +1922,7 @@ u32 AI_GetSwitchinWeather(enum BattlerId battler) return gBattleWeather; // Switchin will introduce new weather - switch(ability) + switch (ability) { case ABILITY_DRIZZLE: return B_WEATHER_RAIN_NORMAL; @@ -1957,7 +1957,7 @@ u32 AI_GetSwitchinFieldStatus(enum BattlerId battler) enum Ability ability = gBattleMons[battler].ability; u32 startingFieldStatus = gFieldStatuses; // Switchin will introduce new terrain - switch(ability) + switch (ability) { case ABILITY_ELECTRIC_SURGE: case ABILITY_HADRON_ENGINE: @@ -3177,7 +3177,7 @@ static inline bool32 IsMoveSleepClauseTrigger(enum Move move) default: break; } - switch(GetMoveNonVolatileStatus(move)) + switch (GetMoveNonVolatileStatus(move)) { case MOVE_EFFECT_SLEEP: return TRUE; @@ -4761,7 +4761,7 @@ static bool32 HasMoveThatChangesKOThreshold(enum BattlerId battlerId, u32 noOfHi static enum Stat GetStatBeingChanged(enum StatChange statChange) { - switch(statChange) + switch (statChange) { case STAT_CHANGE_ATK: case STAT_CHANGE_ATK_2: @@ -4794,7 +4794,7 @@ static enum Stat GetStatBeingChanged(enum StatChange statChange) static u32 GetStagesOfStatChange(enum StatChange statChange) { - switch(statChange) + switch (statChange) { case STAT_CHANGE_ATK: case STAT_CHANGE_DEF: diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 125bd7aef3..aa16daea3a 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -3254,11 +3254,8 @@ static void AnimMoveSmallCloudAnimate(struct Sprite *sprite) sprite->x2 += sprite->data[0]; sprite->y2 += sprite->data[1]; - if(sprite->affineAnimEnded) - { + if (sprite->affineAnimEnded) DestroyAnimSprite(sprite); - } - } #define ONE_IF_ZERO(x) ((x) > 0 ? (x) : 1) @@ -3279,13 +3276,13 @@ static void AnimMoveSmallCloud(struct Sprite *sprite) static void AnimPluckParticle(struct Sprite *sprite) { - if(sprite->data[0] > 0) + if (sprite->data[0] > 0) { s16 yVelocity = sprite->data[5]; s16 xVelocity = sprite->data[2]; sprite->y -= yVelocity; sprite->x += xVelocity; - if((sprite->data[0] % 7) == 0) + if ((sprite->data[0] % 7) == 0) { sprite->data[5] = yVelocity-1; } @@ -3318,10 +3315,10 @@ static void AnimPluck(struct Sprite *sprite) static void AnimMoveFeintSwipeStep(struct Sprite *sprite) { - switch(sprite->data[5]) + switch (sprite->data[5]) { case 0: - if(AnimTranslateLinear(sprite)) + if (AnimTranslateLinear(sprite)) { //Not the most elegant solution here, but it works without messing up the sprites coordinates sprite->x2 = 0; @@ -3336,7 +3333,7 @@ static void AnimMoveFeintSwipeStep(struct Sprite *sprite) } break; case 1: - if(AnimTranslateLinear(sprite)) + if (AnimTranslateLinear(sprite)) { sprite->callback = DestroyAnimSprite; } @@ -3372,7 +3369,7 @@ static void AnimMoveFeintZoom(struct Sprite *sprite) static void AnimMoveTrumpCardArc(struct Sprite *sprite) { - if(AnimTranslateLinear(sprite)) + if (AnimTranslateLinear(sprite)) { DestroyAnimSprite(sprite); } @@ -3405,22 +3402,22 @@ static void AnimMoveTrumpCard(struct Sprite *sprite) static void AnimMoveTrumpCardParticleAlive(struct Sprite *sprite) { - if(sprite->data[0] > 0) + if (sprite->data[0] > 0) { s16 yVelocity = sprite->data[2]; s16 xVelocity = sprite->data[1]; sprite->y -= yVelocity; sprite->x += xVelocity; - if((sprite->data[0] % 2) == 0) + if ((sprite->data[0] % 2) == 0) { - if(xVelocity > 0) + if (xVelocity > 0) xVelocity--; - else if(xVelocity < 0) + else if (xVelocity < 0) xVelocity++; - if(yVelocity > 0) + if (yVelocity > 0) yVelocity--; - else if(yVelocity < 0) + else if (yVelocity < 0) yVelocity++; sprite->data[1] = xVelocity; sprite->data[2] = yVelocity; @@ -3450,17 +3447,17 @@ static void AnimMoveTrumpCardParticle(struct Sprite *sprite) static void AnimMoveAccupressureTransition(struct Sprite *sprite) { - switch(sprite->data[5]) + switch (sprite->data[5]) { case 0: - if(AnimTranslateLinear(sprite)) + if (AnimTranslateLinear(sprite)) { StartSpriteAffineAnim(sprite, 1); sprite->data[5]++; } break; case 1: - if(sprite->affineAnimEnded) + if (sprite->affineAnimEnded) { DestroyAnimSprite(sprite); } @@ -3485,9 +3482,9 @@ static void AnimMoveWringOutCircle(struct Sprite *sprite) { sprite->x2 = Cos(sprite->data[3], sprite->data[2]); sprite->y2 = Sin(sprite->data[3], sprite->data[2]); - if(sprite->data[1] > 0) + if (sprite->data[1] > 0) { - if(sprite->data[3] + sprite->data[0] >= 256) + if (sprite->data[3] + sprite->data[0] >= 256) { sprite->data[3] = (sprite->data[0] + sprite->data[3]) % 256; sprite->data[1]--; @@ -3498,7 +3495,7 @@ static void AnimMoveWringOutCircle(struct Sprite *sprite) } } - else if(sprite->data[3] < 64) + else if (sprite->data[3] < 64) { //We need to go for an extra 90° sprite->data[3] += sprite->data[0]; @@ -3512,7 +3509,7 @@ static void AnimMoveWringOutCircle(struct Sprite *sprite) static void AnimMoveWringOut(struct Sprite *sprite) { InitSpritePosToAnimTarget(sprite, TRUE); - if(gBattleAnimArgs[5] == TRUE) + if (gBattleAnimArgs[5] == TRUE) { sprite->oam.objMode = ST_OAM_OBJ_BLEND; } diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c index 41d4807b27..5acca3a642 100644 --- a/src/battle_anim_electric.c +++ b/src/battle_anim_electric.c @@ -725,7 +725,7 @@ static void AnimZapCannonSpark_Step(struct Sprite *sprite) sprite->x2 += Sin(sprite->data[7], sprite->data[5]); sprite->y2 += Cos(sprite->data[7], sprite->data[5]); sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF; - if(!(sprite->data[7] % 3)) + if (!(sprite->data[7] % 3)) sprite->invisible ^= 1; } else @@ -1013,7 +1013,7 @@ static void AnimTask_ElectricChargingParticles_Step(u8 taskId) } } } - else if(task->data[7] == 0) + else if (task->data[7] == 0) { DestroyAnimVisualTask(taskId); } @@ -1164,7 +1164,7 @@ void AnimTask_VoltTackleBolt(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch(task->data[0]) + switch (task->data[0]) { case 0: task->data[1] = IsOnPlayerSide(gBattleAnimAttacker) ? 1 : -1; @@ -1237,7 +1237,7 @@ void AnimTask_VoltTackleBolt(u8 taskId) static bool8 CreateVoltTackleBolt(struct Task *task, u8 taskId) { u32 spriteId; - switch(gAnimMoveIndex) + switch (gAnimMoveIndex) { case MOVE_FAIRY_LOCK: spriteId = CreateSprite(&gFairyLockChainsSpriteTemplate, task->data[3], task->data[5] + 10, 35); diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c index c30f36c3b8..3de9fde905 100644 --- a/src/battle_anim_fire.c +++ b/src/battle_anim_fire.c @@ -628,7 +628,7 @@ static void AnimUnusedSmallEmber_Step(struct Sprite *sprite) { if (sprite->data[3]) { - if(sprite->data[5] > 10000) + if (sprite->data[5] > 10000) sprite->subpriority = 1; sprite->x2 = Sin(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); @@ -891,7 +891,7 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId) } } - if(!UpdateEruptAnimTask(task)) + if (!UpdateEruptAnimTask(task)) { SetBattlerSpriteYOffsetFromYScale(task->tAttackerSpriteId); gSprites[task->tAttackerSpriteId].x2 = 0; @@ -977,7 +977,7 @@ static void CreateEruptionLaunchRocks(u8 spriteId, u8 taskId, u8 activeSpritesId u16 y = GetEruptionLaunchRockInitialYPos(spriteId); u16 x = gSprites[spriteId].x; - if(IsOnPlayerSide(gBattleAnimAttacker)) + if (IsOnPlayerSide(gBattleAnimAttacker)) { x -= 12; sign = 1; diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 7d32a0e69f..9dcf854baa 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -1459,7 +1459,7 @@ void AnimSpriteOnMonPos(struct Sprite *sprite) else respectMonPicOffsets = FALSE; - switch(gBattleAnimArgs[2]) + switch (gBattleAnimArgs[2]) { case 0: InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets); @@ -1471,7 +1471,7 @@ void AnimSpriteOnMonPos(struct Sprite *sprite) InitSpritePosToAnimAttackerPartner(sprite, respectMonPicOffsets); break; case 3: - if(IsDoubleBattle()) + if (IsDoubleBattle()) InitSpritePosToAnimBothTargets(sprite, respectMonPicOffsets); else InitSpritePosToAnimTarget(sprite, respectMonPicOffsets); diff --git a/src/battle_anim_normal.c b/src/battle_anim_normal.c index 1679c0c121..0c235bef68 100644 --- a/src/battle_anim_normal.c +++ b/src/battle_anim_normal.c @@ -289,7 +289,7 @@ static void AnimMovePowerSwapGuardSwapWait(struct Sprite *sprite) static void AnimMovePowerSwapGuardSwap(struct Sprite *sprite) { StartSpriteAnim(sprite, gBattleAnimArgs[2]); - if(gBattleAnimArgs[3] == 0) + if (gBattleAnimArgs[3] == 0) { InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X); diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c index 1c9f62342b..c866c68598 100644 --- a/src/battle_anim_water.c +++ b/src/battle_anim_water.c @@ -810,7 +810,7 @@ void AnimFlyUpTarget(struct Sprite *sprite) static void AnimFlyUpTarget_Step(struct Sprite *sprite) { - if(sprite->y2 <= sprite->data[0]) + if (sprite->y2 <= sprite->data[0]) { DestroyAnimSprite(sprite); return; diff --git a/src/battle_dome.c b/src/battle_dome.c index 8523b80ea8..9ed288d5e5 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3891,7 +3891,7 @@ static bool32 IsDomeHealingMove(enum Move move) static bool32 IsDomeDefensiveMoveEffect(enum BattleMoveEffects effect) { - switch(effect) + switch (effect) { case EFFECT_REFLECT_DAMAGE: case EFFECT_EVASION_UP: @@ -3922,7 +3922,7 @@ static bool32 IsDomeDefensiveMoveEffect(enum BattleMoveEffects effect) static bool32 IsDomeRiskyMoveEffect(enum BattleMoveEffects effect) { - switch(effect) + switch (effect) { // TODO: Bring back Misty Explosion and Explosion. Also non of those functions have been updated from gen3 case EFFECT_SPITE: @@ -3938,7 +3938,7 @@ static bool32 IsDomeLuckyMove(enum Move move) { if (GetMoveAccuracy(move) <= 50 && GetMoveAccuracy(move) != 0) return TRUE; - switch(GetMoveEffect(move)) + switch (GetMoveEffect(move)) { case EFFECT_REFLECT_DAMAGE: if (GetMoveReflectDamage_DamageCategories(move) != (1u << DAMAGE_CATEGORY_PHYSICAL)) // if not Counter @@ -3975,7 +3975,7 @@ static bool32 IsDomePopularMove(enum Move move) if (GetMovePower(move) >= 90) return TRUE; - switch(GetMoveEffect(move)) + switch (GetMoveEffect(move)) { case EFFECT_PROTECT: case EFFECT_MAT_BLOCK: @@ -3990,7 +3990,7 @@ static bool32 IsDomePopularMove(enum Move move) static bool32 IsDomeStatusMoveEffect(enum Move move) { - switch(GetMoveEffect(move)) + switch (GetMoveEffect(move)) { case EFFECT_CONFUSE: case EFFECT_DISABLE: @@ -4018,12 +4018,12 @@ static bool32 IsDomeRareMove(enum Move move) { u16 i, j; u16 species = 0; - for(i = 0; i < NUM_SPECIES; i++) + for (i = 0; i < NUM_SPECIES; i++) { if (!IsSpeciesEnabled(i)) continue; const struct LevelUpMove *learnset = GetSpeciesLevelUpLearnset(i); - for(j = 0; learnset[j].move != LEVEL_UP_MOVE_END; j++) + for (j = 0; learnset[j].move != LEVEL_UP_MOVE_END; j++) { if (learnset[j].move == move) { @@ -4040,7 +4040,7 @@ static bool32 IsDomeRareMove(enum Move move) static bool32 IsDomeComboMove(enum Move move) { enum BattleMoveEffects effect = GetMoveEffect(move); - switch(effect) + switch (effect) { // Weather moves case EFFECT_WEATHER: @@ -4112,7 +4112,7 @@ static bool32 IsDomeComboMove(enum Move move) return TRUE; // Inflicting sleep & related effects - switch(GetMoveNonVolatileStatus(move)) + switch (GetMoveNonVolatileStatus(move)) { case MOVE_EFFECT_SLEEP: return TRUE; diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index db94ee1468..9ef4029759 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -359,7 +359,7 @@ static enum MaxPowerTier GetMaxPowerTier(enum Move move) u32 strikeCount = GetMoveStrikeCount(move); if (strikeCount >= 2 && strikeCount <= 5) { - switch(GetMovePower(move)) + switch (GetMovePower(move)) { case 0 ... 25: return MAX_POWER_TIER_2; case 26 ... 30: return MAX_POWER_TIER_3; @@ -372,7 +372,7 @@ static enum MaxPowerTier GetMaxPowerTier(enum Move move) if (IsMultiHitMove(move)) { - switch(GetMovePower(move)) + switch (GetMovePower(move)) { case 0 ... 15: return MAX_POWER_TIER_1; case 16 ... 18: return MAX_POWER_TIER_2; diff --git a/src/battle_interface.c b/src/battle_interface.c index cd56520f0c..718ed1a1dc 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -3061,7 +3061,7 @@ static void Task_BounceBall(u8 taskId) { struct Sprite *sprite = &gSprites[gBattleStruct->ballSpriteIds[0]]; struct Task *task = &gTasks[taskId]; - switch(task->sState) + switch (task->sState) { case 0: // Bounce up sprite->sBounce = TRUE; @@ -3096,7 +3096,7 @@ static void Task_BounceBall(u8 taskId) } break; case 4: // Destroy Task - if(!sprite->sMoving) + if (!sprite->sMoving) { sprite->callback = SpriteCB_LastUsedBall; DestroyTask(taskId); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 82eaac907d..dec8e64809 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10367,7 +10367,7 @@ static void Cmd_settypetoenvironment(void) CMD_ARGS(const u8 *failInstr); u8 environmentType; - switch(gFieldStatuses & STATUS_FIELD_TERRAIN_ANY) + switch (gFieldStatuses & STATUS_FIELD_TERRAIN_ANY) { case STATUS_FIELD_ELECTRIC_TERRAIN: environmentType = TYPE_ELECTRIC; @@ -12274,7 +12274,7 @@ void BS_TryTrainerSlideZMoveMsg(void) gBattleScripting.battler = gBattlerAttacker; BattleScriptPush(cmd->nextInstr); - switch(gBattlerAttacker) + switch (gBattlerAttacker) { case B_POSITION_OPPONENT_LEFT: gBattlescriptCurrInstr = BattleScript_TrainerASlideMsgRet; @@ -12303,7 +12303,7 @@ void BS_TryTrainerSlideMegaEvolutionMsg(void) gBattleScripting.battler = gBattlerAttacker; BattleScriptPush(cmd->nextInstr); - switch(gBattlerAttacker) + switch (gBattlerAttacker) { case B_POSITION_OPPONENT_LEFT: gBattlescriptCurrInstr = BattleScript_TrainerASlideMsgRet; @@ -12331,7 +12331,7 @@ void BS_TryTrainerSlideDynamaxMsg(void) { BattleScriptPush(cmd->nextInstr); - switch(gBattleScripting.battler) + switch (gBattleScripting.battler) { case B_POSITION_OPPONENT_LEFT: gBattlescriptCurrInstr = BattleScript_TrainerASlideMsgRet; @@ -14312,7 +14312,7 @@ void BS_TryTrainerSlideMsgFirstOff(void) { gBattleScripting.battler = battler; BattleScriptPush(cmd->nextInstr); - switch(battler) + switch (battler) { case B_POSITION_OPPONENT_LEFT: gBattlescriptCurrInstr = BattleScript_TrainerASlideMsgRet; @@ -14342,7 +14342,7 @@ void BS_TryTrainerSlideMsgLastOn(void) { gBattleScripting.battler = battler; BattleScriptPush(cmd->nextInstr); - switch(battler) + switch (battler) { case B_POSITION_OPPONENT_LEFT: gBattlescriptCurrInstr = BattleScript_TrainerASlideMsgRet; diff --git a/src/battle_setup.c b/src/battle_setup.c index 6aab3e2802..79c3935532 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -634,7 +634,7 @@ static void DowngradeBadPoison(void) u32 status = STATUS1_POISON; if (B_TOXIC_REVERSAL < GEN_5) return; - for(i = 0; i < PARTY_SIZE; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES) && GetMonData(&gPlayerParty[i], MON_DATA_STATUS) == STATUS1_TOXIC_POISON) SetMonData(&gPlayerParty[i], MON_DATA_STATUS, &status); diff --git a/src/battle_tv.c b/src/battle_tv.c index 766e5e6124..a4b76ee3b6 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -832,7 +832,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) } // Non-volatile statuses - switch(GetMoveNonVolatileStatus(arg2)) + switch (GetMoveNonVolatileStatus(arg2)) { case MOVE_EFFECT_SLEEP: baseFromEffect++; diff --git a/src/battle_util.c b/src/battle_util.c index 2e8179724b..1e9e4d0c92 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -10716,7 +10716,7 @@ bool32 IsBattlerInvalidForSpreadMove(enum BattlerId battlerAtk, enum BattlerId b bool32 IsAllowedToUseBag(void) { - switch(VarGet(B_VAR_NO_BAG_USE)) + switch (VarGet(B_VAR_NO_BAG_USE)) { case NO_BAG_RESTRICTION: return TRUE; diff --git a/src/berry.c b/src/berry.c index ad55240d89..6096bf71fe 100644 --- a/src/berry.c +++ b/src/berry.c @@ -2370,7 +2370,7 @@ static const u8 sBerryMutations[][3] = { static u8 GetMutationOutcome(u8 berry1, u8 berry2) { u8 i; - for(i = 0; i < ARRAY_COUNT(sBerryMutations); i++) + for (i = 0; i < ARRAY_COUNT(sBerryMutations); i++) { if ((sBerryMutations[i][0] == berry1 && sBerryMutations[i][1] == berry2) ||(sBerryMutations[i][0] == berry2 && sBerryMutations[i][1] == berry1)) @@ -2462,7 +2462,7 @@ static u16 GetBerryPestSpecies(u8 berryId) { #if OW_BERRY_PESTS == TRUE const struct Berry *berry = GetBerryInfo(berryId); - switch(berry->color) + switch (berry->color) { case BERRY_COLOR_RED: return P_FAMILY_LEDYBA ? SPECIES_LEDYBA : SPECIES_NONE; diff --git a/src/berry_blender.c b/src/berry_blender.c index 2c3d932300..00257e4b34 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1812,7 +1812,7 @@ static void ResetLinkCmds(void) static void Task_OpponentMiss(u8 taskId) { - if(++gTasks[taskId].tTimer > gTasks[taskId].tDelay) + if (++gTasks[taskId].tTimer > gTasks[taskId].tDelay) { gRecvCmds[gTasks[taskId].tPlayerId][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_MISS; DestroyTask(taskId); diff --git a/src/berry_crush.c b/src/berry_crush.c index 264a01b7db..3ff3a11b69 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -2190,7 +2190,7 @@ static u32 Cmd_WaitPaletteFade(struct BerryCrushGame *game, u8 *args) case 0: if (UpdatePaletteFade()) return 0; - if(args[0] != 0) + if (args[0] != 0) game->cmdState++; else game->cmdState = 3; diff --git a/src/birch_pc.c b/src/birch_pc.c index 8b1443722c..563331f632 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -53,7 +53,7 @@ const u8 *GetPokedexRatingText(u32 count) u32 i, j; u16 maxDex = REGIONAL_DEX_COUNT - 1; // doesNotCountForRegionalPokedex - for(i = 0; i < REGIONAL_DEX_COUNT; i++) + for (i = 0; i < REGIONAL_DEX_COUNT; i++) { j = NationalPokedexNumToSpecies(RegionalToNationalOrder(i + 1)); if (gSpeciesInfo[j].isMythical && !gSpeciesInfo[j].dexForceRequired) diff --git a/src/chooseboxmon.c b/src/chooseboxmon.c index 3ecfcaea59..ec2505dd17 100644 --- a/src/chooseboxmon.c +++ b/src/chooseboxmon.c @@ -194,7 +194,7 @@ s32 LearnMove(const struct MoveLearnUI *ui, u8 taskId) GetBoxMonNickname(boxmon, gStringVar1); StringCopy(gStringVar2, GetMoveName(move)); gSpecialVar_Result = FALSE; - switch(CanMonLearnMove(boxmon)) + switch (CanMonLearnMove(boxmon)) { case VALID_MON: return LEARN_MOVE; diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 39f9e1a0fc..bc407fa3df 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -124,7 +124,7 @@ static bool8 SetupClearSaveDataScreen(void) { u16 i; - switch(gMain.state) + switch (gMain.state) { case 0: default: @@ -170,7 +170,7 @@ static bool8 SetupClearSaveDataScreen(void) break; case 1: UpdatePaletteFade(); - if(!gPaletteFade.active) + if (!gPaletteFade.active) { SetMainCallback2(MainCB); return TRUE; @@ -181,7 +181,7 @@ static bool8 SetupClearSaveDataScreen(void) static void CB2_FadeAndDoReset(void) { - switch(gMain.state) + switch (gMain.state) { case 0: default: @@ -190,7 +190,7 @@ static void CB2_FadeAndDoReset(void) break; case 1: UpdatePaletteFade(); - if(!gPaletteFade.active) + if (!gPaletteFade.active) { FreeAllWindowBuffers(); DoSoftReset(); diff --git a/src/contest.c b/src/contest.c index 3264437608..eebecebbbd 100644 --- a/src/contest.c +++ b/src/contest.c @@ -3696,7 +3696,7 @@ static void FillContestantWindowBgs(void) { int i; - for(i = 0; i < CONTESTANT_COUNT; i++) + for (i = 0; i < CONTESTANT_COUNT; i++) ContestBG_FillBoxWithTile(0, 0, 0x16, 2 + i * 5, 8, 2, 0x11); } @@ -4245,12 +4245,12 @@ static void SpriteCB_EndBlinkContestantBox(struct Sprite *sprite) static void UNUSED ContestDebugTogglePointTotal(void) { - if(eContestDebugMode == CONTEST_DEBUG_MODE_PRINT_POINT_TOTAL) + if (eContestDebugMode == CONTEST_DEBUG_MODE_PRINT_POINT_TOTAL) eContestDebugMode = CONTEST_DEBUG_MODE_OFF; else eContestDebugMode = CONTEST_DEBUG_MODE_PRINT_POINT_TOTAL; - if(eContestDebugMode == CONTEST_DEBUG_MODE_OFF) + if (eContestDebugMode == CONTEST_DEBUG_MODE_OFF) { DrawContestantWindowText(); SwapMoveDescAndContestTilemaps(); @@ -5535,8 +5535,8 @@ void ResetContestLinkResults(void) s32 i; s32 j; - for(i = 0; i < CONTEST_CATEGORIES_COUNT; i++) - for(j = 0; j < CONTESTANT_COUNT; j++) + for (i = 0; i < CONTEST_CATEGORIES_COUNT; i++) + for (j = 0; j < CONTESTANT_COUNT; j++) gSaveBlock2Ptr->contestLinkResults[i][j] = 0; } @@ -5568,7 +5568,7 @@ bool8 SaveContestWinner(u8 rank) gSaveBlock1Ptr->contestWinners[id].trainerId = gContestMons[i].otId; StringCopyN(gSaveBlock1Ptr->contestWinners[id].monName, gContestMons[i].nickname, VANILLA_POKEMON_NAME_LENGTH); StringCopy(gSaveBlock1Ptr->contestWinners[id].trainerName, gContestMons[i].trainerName); - if(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) + if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) gSaveBlock1Ptr->contestWinners[id].contestRank = CONTEST_RANK_LINK; else gSaveBlock1Ptr->contestWinners[id].contestRank = gSpecialVar_ContestRank; diff --git a/src/contest_ai.c b/src/contest_ai.c index 7198d44d99..b1520fc504 100644 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -343,7 +343,7 @@ static void ContestAI_DoAIProcessing(void) { while (eContestAI.aiState != CONTESTAI_FINISHED) { - switch(eContestAI.aiState) + switch (eContestAI.aiState) { case CONTESTAI_DO_NOT_PROCESS: break; diff --git a/src/contest_util.c b/src/contest_util.c index 6930df6604..9131b7ea49 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -2616,7 +2616,7 @@ static void Task_ShowContestEntryMonPic(u8 taskId) struct Task *task = &gTasks[taskId]; struct Sprite *sprite; - switch(task->data[0]) + switch (task->data[0]) { case 0: task->data[0]++; @@ -2632,7 +2632,7 @@ static void Task_ShowContestEntryMonPic(u8 taskId) sprite = &gSprites[task->data[2]]; FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum)); - if(sprite->oam.affineMode) + if (sprite->oam.affineMode) FreeOamMatrix(sprite->oam.matrixNum); DestroySprite(sprite); diff --git a/src/datetime.c b/src/datetime.c index 51e009b3bb..625bfa8ac3 100644 --- a/src/datetime.c +++ b/src/datetime.c @@ -60,7 +60,7 @@ void DateTime_AddMinutes(struct DateTime *dateTime, u32 minutes) u32 hours = 0; dateTime->minute += minutes; - while(dateTime->minute >= MINUTES_PER_HOUR) + while (dateTime->minute >= MINUTES_PER_HOUR) { hours++; dateTime->minute -= MINUTES_PER_HOUR; @@ -74,7 +74,7 @@ void DateTime_AddSeconds(struct DateTime *dateTime, u32 seconds) u32 minutes = 0; dateTime->second += seconds; - while(dateTime->second >= SECONDS_PER_MINUTE) + while (dateTime->second >= SECONDS_PER_MINUTE) { minutes++; dateTime->second -= SECONDS_PER_MINUTE; diff --git a/src/debug.c b/src/debug.c index 6c902e0a08..625df85f5e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -2024,7 +2024,7 @@ static void DebugAction_ChooseTrainerID_Select(u8 taskId) max = PARTNER_COUNT - 1; } Debug_HandleInput_Numeric(taskId, min, max, DEBUG_NUMBER_DIGITS_TRAINERS); - switch(gTasks[taskId].tSelection) + switch (gTasks[taskId].tSelection) { case TRAINERS_DEBUG_SELECTION_TRAINER1: sDebugMenuListData->data[0] = gTasks[taskId].tInput; @@ -2077,7 +2077,7 @@ static void DebugAction_Trainers_ChooseTrainer(u8 taskId, u32 selection) gTasks[taskId].tDigit = 0; gTasks[taskId].tSelection = (s32)selection; - switch(gTasks[taskId].tSelection) + switch (gTasks[taskId].tSelection) { case TRAINERS_DEBUG_SELECTION_TRAINER1: gTasks[taskId].tInput = sDebugMenuListData->data[0]; diff --git a/src/dma3_manager.c b/src/dma3_manager.c index 8e7d8fbdf6..8ddc36f167 100644 --- a/src/dma3_manager.c +++ b/src/dma3_manager.c @@ -142,7 +142,7 @@ s16 RequestDma3Fill(s32 value, void *dest, u16 size, u32 mode) sDma3Requests[cursor].mode = mode; sDma3Requests[cursor].value = value; - if(mode == 1) + if (mode == 1) sDma3Requests[cursor].mode = DMA_REQUEST_FILL32; else sDma3Requests[cursor].mode = DMA_REQUEST_FILL16; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 1c4dc550a0..8fc6867608 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -10755,7 +10755,7 @@ static bool8 AnimateSpriteInFigure8(struct Sprite *sprite) { bool8 finished = FALSE; - switch(sprite->data[7]) + switch (sprite->data[7]) { case 0: sprite->x2 += GetFigure8XOffset(sprite->data[6]); @@ -10989,7 +10989,7 @@ static void UNUSED DestroyVirtualObjects(void) for (i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == SpriteCB_VirtualObject) + if (sprite->inUse && sprite->callback == SpriteCB_VirtualObject) DestroySprite(sprite); } } @@ -11083,7 +11083,7 @@ void SetVirtualObjectSpriteAnim(u8 virtualObjId, u8 animNum) static void MoveUnionRoomObjectUp(struct Sprite *sprite) { - switch(sprite->sAnimState) + switch (sprite->sAnimState) { case 0: sprite->y2 = 0; @@ -11102,14 +11102,14 @@ static void MoveUnionRoomObjectUp(struct Sprite *sprite) static void MoveUnionRoomObjectDown(struct Sprite *sprite) { - switch(sprite->sAnimState) + switch (sprite->sAnimState) { case 0: sprite->y2 = -DISPLAY_HEIGHT; sprite->sAnimState++; case 1: sprite->y2 += 8; - if(sprite->y2 == 0) + if (sprite->y2 == 0) { sprite->sAnimNum = 0; sprite->sAnimState = 0; @@ -11119,7 +11119,7 @@ static void MoveUnionRoomObjectDown(struct Sprite *sprite) static void VirtualObject_UpdateAnim(struct Sprite *sprite) { - switch(sprite->sAnimNum) + switch (sprite->sAnimNum) { case UNION_ROOM_SPAWN_IN: MoveUnionRoomObjectDown(sprite); @@ -11300,10 +11300,10 @@ static void ApplyLevitateMovement(u8 taskId) LoadWordFromTwoHalfwords((u16*) &task->data[0], (u32 *)&objectEvent); // load the map object pointer. sprite = &gSprites[objectEvent->spriteId]; - if(!(task->data[2] & 3)) + if (!(task->data[2] & 3)) sprite->y2 += task->data[3]; - if(!(task->data[2] & 15)) + if (!(task->data[2] & 15)) task->data[3] = -task->data[3]; task->data[2]++; @@ -11323,9 +11323,9 @@ void FreezeObjectEventsExceptTwo(u8 objectEventId1, u8 objectEventId2) { u8 i; - for(i = 0; i < OBJECT_EVENTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if(i != objectEventId1 && i != objectEventId2 && + if (i != objectEventId1 && i != objectEventId2 && gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) FreezeObjectEvent(&gObjectEvents[i]); } @@ -11342,7 +11342,7 @@ u8 MovementAction_FlyUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sp { sprite->y2 -= 8; - if(sprite->y2 == -DISPLAY_HEIGHT) + if (sprite->y2 == -DISPLAY_HEIGHT) sprite->sActionFuncId++; return FALSE; } @@ -11358,7 +11358,7 @@ u8 MovementAction_FlyDown_Step1(struct ObjectEvent *objectEvent, struct Sprite * { sprite->y2 += 8; - if(!sprite->y2) + if (!sprite->y2) sprite->sActionFuncId++; return FALSE; } diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index fad36cb512..201ede59c9 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -147,7 +147,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) else if (heldKeys & DPAD_RIGHT) input->dpadDirection = DIR_EAST; - if(DEBUG_OVERWORLD_MENU && !DEBUG_OVERWORLD_IN_MENU) + if (DEBUG_OVERWORLD_MENU && !DEBUG_OVERWORLD_IN_MENU) { if ((heldKeys & DEBUG_OVERWORLD_HELD_KEYS) && input->DEBUG_OVERWORLD_TRIGGER_EVENT) { @@ -238,7 +238,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) if (input->pressedRButton && TryStartDexNavSearch()) return TRUE; - if(input->input_field_1_2 && DEBUG_OVERWORLD_MENU && !DEBUG_OVERWORLD_IN_MENU) + if (input->input_field_1_2 && DEBUG_OVERWORLD_MENU && !DEBUG_OVERWORLD_IN_MENU) { PlaySE(SE_WIN_OPEN); FreezeObjectEvents(); @@ -564,14 +564,14 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me return CableClub_EventScript_ShowBattleRecords_Frlg; if (MetatileBehavior_IsIndigoPlateauSign1(metatileBehavior) == TRUE) { - if(direction != DIR_NORTH) + if (direction != DIR_NORTH) return NULL; SetMsgSignPostAndVarFacing(direction); return EventScript_Indigo_UltimateGoal; } if (MetatileBehavior_IsIndigoPlateauSign2(metatileBehavior) == TRUE) { - if(direction != DIR_NORTH) + if (direction != DIR_NORTH) return NULL; SetMsgSignPostAndVarFacing(direction); return EventScript_Indigo_HighestAuthority; @@ -580,14 +580,14 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me if (MetatileBehavior_IsPokeMartSign(metatileBehavior) == TRUE) { - if(direction != DIR_NORTH) + if (direction != DIR_NORTH) return NULL; SetMsgSignPostAndVarFacing(direction); return Common_EventScript_ShowPokemartSign; } if (MetatileBehavior_IsPokemonCenterSign(metatileBehavior) == TRUE) { - if(direction != DIR_NORTH) + if (direction != DIR_NORTH) return NULL; SetMsgSignPostAndVarFacing(direction); return Common_EventScript_ShowPokemonCenterSign; diff --git a/src/field_effect.c b/src/field_effect.c index 447860c1d5..cb5a2ff89b 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2354,7 +2354,7 @@ void StartLavaridgeGym1FWarp(u8 priority) static void Task_LavaridgeGym1FWarp(u8 taskId) { - while(sLavaridgeGym1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); + while (sLavaridgeGym1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } static bool8 LavaridgeGym1FWarpEffect_Init(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) diff --git a/src/field_specials.c b/src/field_specials.c index b6a261b1af..32d4d70f42 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -4625,7 +4625,7 @@ u8 GetLeadMonFriendship(void) u16 GetFirstPartnerMove(u16 species) { - switch(species) + switch (species) { case SPECIES_VENUSAUR: return MOVE_FRENZY_PLANT; @@ -4656,7 +4656,7 @@ bool8 CapeBrinkGetMoveToTeachLeadPokemon(void) return FALSE; moveId = GetFirstPartnerMove(GetMonData(leadMon, MON_DATA_SPECIES_OR_EGG)); - switch(moveId) + switch (moveId) { case MOVE_FRENZY_PLANT: tutorFlag = FLAG_TUTOR_FRENZY_PLANT; diff --git a/src/fishing.c b/src/fishing.c index 07b5d6effd..09a16fd0ee 100644 --- a/src/fishing.c +++ b/src/fishing.c @@ -268,7 +268,7 @@ static bool32 Fishing_CheckForBite(struct Task *task) firstMonHasSuctionOrSticky = Fishing_DoesFirstMonInPartyHaveSuctionCupsOrStickyHold(); - if(firstMonHasSuctionOrSticky && I_FISHING_STICKY_BOOST < GEN_4) + if (firstMonHasSuctionOrSticky && I_FISHING_STICKY_BOOST < GEN_4) bite = RandomPercentage(RNG_FISHING_GEN3_STICKY, FISHING_GEN3_STICKY_CHANCE); if (!bite) @@ -471,7 +471,7 @@ static bool32 Fishing_EndNoMon(struct Task *task) static bool32 DoesFishingMinigameAllowCancel(void) { - switch(I_FISHING_MINIGAME) + switch (I_FISHING_MINIGAME) { case GEN_1: case GEN_2: diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index 492577a50c..9b0261b558 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -45,7 +45,7 @@ void Task_TryUseSoftboiledOnPartyMon(u8 taskId) u8 userPartyId = gPartyMenu.slotId; u8 recipientPartyId = gPartyMenu.slotId2; - if(recipientPartyId > PARTY_SIZE) + if (recipientPartyId > PARTY_SIZE) { gPartyMenu.action = 0; DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON); @@ -54,7 +54,7 @@ void Task_TryUseSoftboiledOnPartyMon(u8 taskId) } hp = GetMonData(&gPlayerParty[recipientPartyId], MON_DATA_HP); - if(hp == 0 || userPartyId == recipientPartyId || GetMonData(&gPlayerParty[recipientPartyId], MON_DATA_MAX_HP) == hp) + if (hp == 0 || userPartyId == recipientPartyId || GetMonData(&gPlayerParty[recipientPartyId], MON_DATA_MAX_HP) == hp) { CantUseSoftboiledOnMon(taskId); return; @@ -82,7 +82,7 @@ static void Task_DisplayHPRestoredMessage(u8 taskId) static void Task_FinishSoftboiled(u8 taskId) { - if(IsPartyMenuTextPrinterActive() == TRUE) + if (IsPartyMenuTextPrinterActive() == TRUE) return; gPartyMenu.action = 0; AnimatePartySlot(gPartyMenu.slotId, 0); @@ -96,7 +96,7 @@ static void Task_FinishSoftboiled(u8 taskId) static void Task_ChooseNewMonForSoftboiled(u8 taskId) { - if(IsPartyMenuTextPrinterActive() == TRUE) + if (IsPartyMenuTextPrinterActive() == TRUE) return; DisplayPartyMenuStdMessage(PARTY_MSG_USE_ON_WHICH_MON); gTasks[taskId].func = Task_HandleChooseMonInput; diff --git a/src/frontier_util.c b/src/frontier_util.c index 08b77887d4..eb6978ea91 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -3231,7 +3231,7 @@ u16 GetRandomFrontierMonFromSet(u16 trainerId) // "High tier" Pokémon are only allowed on open level mode // 20 is not a possible value for level here monId = monSet[Random() % numMons]; - } while((level == FRONTIER_MAX_LEVEL_50 || level == 20) && monId > FRONTIER_MONS_HIGH_TIER); + } while ((level == FRONTIER_MAX_LEVEL_50 || level == 20) && monId > FRONTIER_MONS_HIGH_TIER); return monId; } diff --git a/src/generational_changes.c b/src/generational_changes.c index 682cfa305e..09a3359221 100644 --- a/src/generational_changes.c +++ b/src/generational_changes.c @@ -72,7 +72,7 @@ u32 GetConfigInternal(enum ConfigTag _genConfig) u32 GetClampedValue(enum ConfigTag _genConfig, u32 newValue) { u32 clampedValue = 0; - switch(_genConfig) + switch (_genConfig) { BATTLE_CONFIG_DEFINITIONS(UNPACK_CONFIG_CLAMPER) POKEMON_CONFIG_DEFINITIONS(UNPACK_CONFIG_CLAMPER) diff --git a/src/intro.c b/src/intro.c index 51d6a476a6..3ac589cddb 100644 --- a/src/intro.c +++ b/src/intro.c @@ -2003,7 +2003,7 @@ static void SpriteCB_GroudonRocks(struct Sprite *sprite) if (sprite->sTimer % 2 == 0) sprite->y2 ^= 3; - switch(sprite->sState) + switch (sprite->sState) { case 0: // Rock floats up @@ -2268,7 +2268,7 @@ static void CreateKyogreBubbleSprites_Fins(void) static void SpriteCB_KyogreBubbles(struct Sprite *sprite) { - switch(sprite->sState) + switch (sprite->sState) { case 0: if (sprite->sDelay == 0) @@ -2486,7 +2486,7 @@ static void SpriteCB_Lightning(struct Sprite *sprite) if (sprite->animEnded) sprite->invisible = TRUE; - switch(sprite->sState) + switch (sprite->sState) { case 0: sprite->sPalIdx = 0x1C2; @@ -2549,7 +2549,7 @@ static void Task_Scene3_Rayquaza(u8 taskId) tTimer++; - switch(tState) + switch (tState) { case 0: if ((tTimer & 1) != 0) @@ -2601,7 +2601,7 @@ static void Task_RayquazaAttack(u8 taskId) s16 *data = gTasks[taskId].data; data[2]++; - switch(tState) + switch (tState) { case 0: if ((data[2] & 1) != 0) @@ -3264,7 +3264,7 @@ static void SpriteCB_LogoLetter(struct Sprite *sprite) static void SpriteCB_GameFreakLogo(struct Sprite *sprite) { - switch(sprite->sState) + switch (sprite->sState) { case 0: if (gIntroFrameCounter == TIMER_LOGO_APPEAR) diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index ae45a52404..a8440096f6 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -1050,7 +1050,7 @@ static void CreateMovingScenerySprites(bool8 hasVerticalMove, const struct Intro { u8 i; - for(i = 0; i < numSprites; i++) + for (i = 0; i < numSprites; i++) { u8 sprite = CreateSprite(&sSpriteTemplate_MovingScenery, metadata[i].x, metadata[i].y, metadata[i].subpriority); CalcCenterToCornerVec(&gSprites[sprite], metadata[i].shape, metadata[i].size, ST_OAM_AFFINE_OFF); diff --git a/src/item_menu.c b/src/item_menu.c index 503c7e1366..8d1388f961 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -706,7 +706,7 @@ void VBlankCB_BagMenuRun(void) static void CB2_Bag(void) { - while(MenuHelpers_ShouldWaitForLinkRecv() != TRUE && SetupBagMenu() != TRUE && MenuHelpers_IsLinkActive() != TRUE) + while (MenuHelpers_ShouldWaitForLinkRecv() != TRUE && SetupBagMenu() != TRUE && MenuHelpers_IsLinkActive() != TRUE) {}; } diff --git a/src/item_use.c b/src/item_use.c index 9f1b10914c..e954daa113 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -1063,7 +1063,7 @@ void HandleUseExpiredLure(struct ScriptContext *ctx) static void Task_UsedBlackWhiteFlute(u8 taskId) { - if(++gTasks[taskId].data[8] > 7) + if (++gTasks[taskId].data[8] > 7) { PlaySE(SE_GLASS_FLUTE); if (CurrentBattlePyramidLocation() == PYRAMID_LOCATION_NONE) diff --git a/src/menu.c b/src/menu.c index 37bcf326af..beac8bd99d 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1956,7 +1956,7 @@ void HBlankCB_DoublePopupWindow(void) if (scanline < 80 || scanline > 160) { REG_BG0VOFS = offset; - if(OW_POPUP_BW_ALPHA_BLEND && !IsWeatherAlphaBlend()) + if (OW_POPUP_BW_ALPHA_BLEND && !IsWeatherAlphaBlend()) REG_BLDALPHA = BLDALPHA_BLEND(15, 5); } else diff --git a/src/mini_printf.c b/src/mini_printf.c index ded744ce85..6d5f62ea12 100644 --- a/src/mini_printf.c +++ b/src/mini_printf.c @@ -106,7 +106,7 @@ static s32 _putsAscii(char *s, s32 len, void *buf) /* Copy to buffer */ for (i = 0; i < len; i++) { - if(b->pbuffer == b->buffer + b->buffer_len - 1) + if (b->pbuffer == b->buffer + b->buffer_len - 1) { break; } @@ -131,7 +131,7 @@ static s32 _putsEncoded(char *s, s32 len, void *buf) /* Copy to buffer */ for (i = 0; i < len; i++) { - if(b->pbuffer == b->buffer + b->buffer_len - 1) + if (b->pbuffer == b->buffer + b->buffer_len - 1) { break; } @@ -219,23 +219,23 @@ static s32 mini_pad(char *ptr, s32 len, char pad_char, s32 pad_to, char *buffer) s32 i; bool32 overflow = FALSE; char *pbuffer = buffer; - if(pad_to == 0) + if (pad_to == 0) pad_to = len; if (len > pad_to) { len = pad_to; overflow = TRUE; } - for(i = pad_to - len; i > 0; i --) + for (i = pad_to - len; i > 0; i --) { *(pbuffer++) = pad_char; } - for(i = len; i > 0; i --) + for (i = len; i > 0; i --) { *(pbuffer++) = *(ptr++); } len = pbuffer - buffer; - if(overflow) + if (overflow) { for (i = 0; i < 3 && pbuffer > buffer; i ++) { @@ -292,7 +292,7 @@ s32 mini_vpprintf(void *buf, const char *fmt, va_list va) pad_to = pad_to * 10 + (ch - '0'); ch= *(fmt++); } - if(pad_to > (s32) sizeof(bf)) + if (pad_to > (s32) sizeof(bf)) { pad_to = sizeof(bf); } @@ -308,13 +308,13 @@ s32 mini_vpprintf(void *buf, const char *fmt, va_list va) goto end; case 'u': case 'd': - if(l) + if (l) { len = mini_itoa(va_arg(va, u32), 10, 0, (ch=='u'), bf2); } else { - if(ch == 'u') + if (ch == 'u') { len = mini_itoa((u32) va_arg(va, u32), 10, 0, 1, bf2); } @@ -329,7 +329,7 @@ s32 mini_vpprintf(void *buf, const char *fmt, va_list va) case 'x': case 'X': - if(l) + if (l) { len = mini_itoa(va_arg(va, u32), 16, (ch=='X'), 1, bf2); } diff --git a/src/mystery_gift_view.c b/src/mystery_gift_view.c index f65c00c4a6..707e13433a 100644 --- a/src/mystery_gift_view.c +++ b/src/mystery_gift_view.c @@ -212,7 +212,7 @@ s32 WonderCard_Enter(void) { if (sWonderCardData == NULL) return -1; - switch(sWonderCardData->enterExitState) + switch (sWonderCardData->enterExitState) { case 0: BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); diff --git a/src/oak_speech.c b/src/oak_speech.c index 80013f1929..869a0fc125 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -844,7 +844,7 @@ static void Task_ControlsGuide_HandleInput(u8 taskId) { if (!gPaletteFade.active) { - if(JOY_NEW((A_BUTTON | B_BUTTON))) + if (JOY_NEW((A_BUTTON | B_BUTTON))) { if (JOY_NEW(A_BUTTON)) { diff --git a/src/overworld.c b/src/overworld.c index da0f40f784..3600956d85 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -837,7 +837,7 @@ const struct MapConnection *GetMapConnection(u8 dir) if (connection == NULL) return NULL; - for(i = 0; i < count; i++, connection++) + for (i = 0; i < count; i++, connection++) if (connection->direction == dir) return connection; diff --git a/src/player_pc.c b/src/player_pc.c index bc0453c550..a4e1e11c6e 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -987,7 +987,7 @@ void ItemStorage_RefreshListMenu(void) u16 i; // Copy item names for all entries but the last (which is Cancel) - for(i = 0; i < gPlayerPCItemPageInfo.count - 1; i++) + for (i = 0; i < gPlayerPCItemPageInfo.count - 1; i++) { CopyItemName_PlayerPC(&sItemStorageMenu->itemNames[i][0], gSaveBlock1Ptr->pcItems[i].itemId); sItemStorageMenu->listItems[i].name = &sItemStorageMenu->itemNames[i][0]; diff --git a/src/pokedex.c b/src/pokedex.c index 6bf5a452cb..288574b013 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4245,7 +4245,7 @@ static u32 GetMeasurementTextPositions(u32 textElement) if (!POKEDEX_PLUS_HGSS) return textElement; - switch(textElement) + switch (textElement) { case DEX_HEADER_X: return (DEX_HEADER_X + DEX_HGSS_HEADER_X_PADDING); diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index fb5791b884..7698d99ff3 100644 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -775,11 +775,11 @@ static void Task_ShowPokedexAreaScreen(u8 taskId) CreateAreaMarkerSprites(); break; case 7: - if(!OW_TIME_OF_DAY_ENCOUNTERS) + if (!OW_TIME_OF_DAY_ENCOUNTERS) LoadAreaUnknownGraphics(); break; case 8: - if(!OW_TIME_OF_DAY_ENCOUNTERS) + if (!OW_TIME_OF_DAY_ENCOUNTERS) CreateAreaUnknownSprites(); break; case 9: diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index f652b7f36f..98162fef4c 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -6546,11 +6546,11 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept } enum EvolutionConditions condition = evolutions[i].params[j].condition; - switch(condition) + switch (condition) { // Gen 2 case IF_GENDER: - switch(evolutions[i].params[j].arg1) + switch (evolutions[i].params[j].arg1) { case MON_MALE: StringAppend(gStringVar4, COMPOUND_STRING("Male")); break; case MON_FEMALE: StringAppend(gStringVar4, COMPOUND_STRING("Female")); break; @@ -6569,7 +6569,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept StringAppend(gStringVar4, COMPOUND_STRING("Atk < Def")); break; case IF_TIME: - switch(evolutions[i].params[j].arg1) + switch (evolutions[i].params[j].arg1) { case TIME_MORNING: StringAppend(gStringVar4, COMPOUND_STRING("Morning")); break; case TIME_DAY: StringAppend(gStringVar4, COMPOUND_STRING("Day")); break; @@ -6578,7 +6578,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept } break; case IF_NOT_TIME: - switch(evolutions[i].params[j].arg1) + switch (evolutions[i].params[j].arg1) { case TIME_MORNING: StringAppend(gStringVar4, COMPOUND_STRING("NOT Morning")); break; case TIME_DAY: StringAppend(gStringVar4, COMPOUND_STRING("NOT Day")); break; diff --git a/src/pokemon.c b/src/pokemon.c index 9b34ab92b1..31704f2fe7 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4380,7 +4380,7 @@ bool8 HealStatusConditions(struct Pokemon *mon, u32 healMask, enum BattlerId bat if (gMain.inBattle && battler != MAX_BATTLERS_COUNT) { gBattleMons[battler].status1 &= ~healMask; - if((healMask & STATUS1_SLEEP)) + if ((healMask & STATUS1_SLEEP)) { u32 i = 0; u32 battlerSide = GetBattlerSide(battler); @@ -4661,7 +4661,7 @@ bool32 DoesMonMeetAdditionalConditions(struct Pokemon *mon, const struct Evoluti enum EvolutionConditions condition = params[i].condition; bool32 currentCondition = FALSE; - switch(condition) + switch (condition) { // Gen 2 case IF_GENDER: @@ -6734,7 +6734,7 @@ u32 GetFormChangeTargetSpecies_Internal(struct FormChangeContext ctx) { // We multiply by 100 to make sure that integer division doesn't mess with the health check. u32 hpCheck = ctx.hp * 100 * 100 / ctx.maxHP; - switch(formChanges[i].param2) + switch (formChanges[i].param2) { case HP_HIGHER_THAN: if (hpCheck > formChanges[i].param3 * 100) @@ -6754,7 +6754,7 @@ u32 GetFormChangeTargetSpecies_Internal(struct FormChangeContext ctx) { // We multiply by 100 to make sure that integer division doesn't mess with the health check. u32 hpCheck = ctx.hp * 100 * 100 / ctx.maxHP; - switch(formChanges[i].param2) + switch (formChanges[i].param2) { case HP_HIGHER_THAN: if (hpCheck > formChanges[i].param3 * 100) @@ -6873,7 +6873,7 @@ u16 MonTryLearningNewMoveEvolution(struct Pokemon *mon, bool8 firstMove) { sLearningMoveTableID = 0; } - while(learnset[sLearningMoveTableID].move != LEVEL_UP_MOVE_END) + while (learnset[sLearningMoveTableID].move != LEVEL_UP_MOVE_END) { while ((learnset[sLearningMoveTableID].level == 0 || learnset[sLearningMoveTableID].level == level) && !(P_EVOLUTION_LEVEL_1_LEARN >= GEN_8 && learnset[sLearningMoveTableID].level == 1)) @@ -6923,7 +6923,7 @@ void TryScriptEvolution(void) { GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_SCRIPT_TRIGGER, 0, NULL, &canStopEvo, DO_EVO); sTriedEvolving |= 1u << i; - if(gMain.callback2 == TryScriptEvolution) // This fixes small graphics glitches. + if (gMain.callback2 == TryScriptEvolution) // This fixes small graphics glitches. EvolutionScene(&gPlayerParty[i], targetSpecies, canStopEvo, i); else BeginEvolutionScene(&gPlayerParty[i], targetSpecies, canStopEvo, i); @@ -6954,7 +6954,7 @@ void TrySpecialOverworldEvo(void) { GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_OVERWORLD_SPECIAL, 0, NULL, &canStopEvo, DO_EVO); sTriedEvolving |= 1u << i; - if(gMain.callback2 == TrySpecialOverworldEvo) // This fixes small graphics glitches. + if (gMain.callback2 == TrySpecialOverworldEvo) // This fixes small graphics glitches. EvolutionScene(&gPlayerParty[i], targetSpecies, canStopEvo, i); else BeginEvolutionScene(&gPlayerParty[i], targetSpecies, canStopEvo, i); diff --git a/src/pokemon_sprite_visualizer.c b/src/pokemon_sprite_visualizer.c index 7180408d27..82793ede2e 100644 --- a/src/pokemon_sprite_visualizer.c +++ b/src/pokemon_sprite_visualizer.c @@ -1672,7 +1672,7 @@ static void OpenSubmenu(u32 submenu, u8 taskId) PrintInstructionsOnWindow(data); SetArrowInvisibility(data); - switch(submenu) + switch (submenu) { case SUBMENU_SPECIES: case SUBMENU_ANIMS_BG: @@ -1737,7 +1737,7 @@ static void HandleInput_PokemonSpriteVisualizer(u8 taskId) { data->isShiny = !data->isShiny; - if(data->isShiny) + if (data->isShiny) PlaySE(SE_SHINY); ReloadPokemonSprites(data); diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 624865d74a..7121853556 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1528,7 +1528,7 @@ static void Task_PCMainMenu(u8 taskId) break; case STATE_HANDLE_INPUT: task->tInput = Menu_ProcessInput(); - switch(task->tInput) + switch (task->tInput) { case MENU_NOTHING_CHOSEN: task->tNextOption = task->tSelectedOption; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 9499b6c7b6..163a5f335f 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3841,7 +3841,7 @@ static void PrintSkillsPageText(void) { PrintHeldItemName(); PrintRibbonCount(); - if(ShouldShowIvEvPrompt()) + if (ShouldShowIvEvPrompt()) ShowUtilityPrompt(SUMMARY_SKILLS_MODE_STATS); BufferLeftColumnStats(); PrintLeftColumnStats(); diff --git a/src/random.c b/src/random.c index b02d6a2a3f..835e95969f 100644 --- a/src/random.c +++ b/src/random.c @@ -33,7 +33,7 @@ static void SFC32_Seed(struct Sfc32State *state, u32 seed, u8 stream) state->a = state->b = 0; state->c = seed; state->ctr = stream; - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) { _SFC32_Next_Stream(state, stream); } diff --git a/src/save.c b/src/save.c index ff7cef5989..5e5dda80e5 100644 --- a/src/save.c +++ b/src/save.c @@ -753,9 +753,9 @@ u8 HandleSavingData(u8 saveType) // Used by link / Battle Frontier // Write only SaveBlocks 1 and 2 (skips the PC) CopyPartyAndObjectsToSave(); - for(i = SECTOR_ID_SAVEBLOCK2; i <= SECTOR_ID_SAVEBLOCK1_END; i++) + for (i = SECTOR_ID_SAVEBLOCK2; i <= SECTOR_ID_SAVEBLOCK1_END; i++) HandleReplaceSector(i, gRamSaveSectorLocations); - for(i = SECTOR_ID_SAVEBLOCK2; i <= SECTOR_ID_SAVEBLOCK1_END; i++) + for (i = SECTOR_ID_SAVEBLOCK2; i <= SECTOR_ID_SAVEBLOCK1_END; i++) WriteSectorSignatureByte_NoOffset(i, gRamSaveSectorLocations); break; case SAVE_OVERWRITE_DIFFERENT_FILE: diff --git a/src/scrcmd.c b/src/scrcmd.c index 614b683688..865b385941 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2524,7 +2524,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx) Script_RequestEffects(SCREFF_V1); - if(species2 == SPECIES_NONE) + if (species2 == SPECIES_NONE) { CreateScriptedWildMon(species, level, item); sIsScriptedWildDouble = FALSE; diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index 1415614643..d864595d09 100644 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -95,7 +95,7 @@ static bool32 CheckPartyMonHasHeldItem(enum Item item) { int i; - for(i = 0; i < PARTY_SIZE; i++) + for (i = 0; i < PARTY_SIZE; i++) { u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES_OR_EGG); if (species != SPECIES_NONE && species != SPECIES_EGG && GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) == item) diff --git a/src/slot_machine.c b/src/slot_machine.c index 04f1a7d098..1a792475e0 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -3728,7 +3728,7 @@ static void ReelTime_PikachuReact(struct Task *task) DestroyReelTimeBoltSprites(); DestroyReelTimePikachuAuraSprites(); task->tState++; // RT_TASK_WAIT_CLEAR_POWER - if(sSlotMachine->reelTimeDraw == 0) + if (sSlotMachine->reelTimeDraw == 0) { task->tTimer2 = 0xa0; StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], 5); diff --git a/src/start_menu.c b/src/start_menu.c index 7f87bf584a..269a034798 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -603,7 +603,7 @@ void Task_ShowStartMenu(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch(task->data[0]) + switch (task->data[0]) { case 0: if (InUnionRoom() == TRUE) diff --git a/src/text.c b/src/text.c index ed69e793e0..f239bbbaee 100644 --- a/src/text.c +++ b/src/text.c @@ -2789,7 +2789,7 @@ static void SpriteCB_TextCursor(struct Sprite *sprite) else { sprite->sDelay = 8; - switch(sprite->sState) + switch (sprite->sState) { case 0: sprite->y2 = 0; diff --git a/src/trade.c b/src/trade.c index 4b47c0eeca..350c8d28c3 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2967,7 +2967,7 @@ static void CB2_InitInGameTrade(void) { case 0: //If ChooseBoxMon points to a pc mon, we store it into gEnemyParty - if(gSpecialVar_0x8004 == PC_MON_CHOSEN) + if (gSpecialVar_0x8004 == PC_MON_CHOSEN) { gSelectedTradeMonPositions[TRADE_PLAYER] = TRADEMON_FROM_PC; RemoveSelectedPcMon(&gEnemyParty[TRADEMON_FROM_PC]); @@ -3341,7 +3341,7 @@ static void BufferTradeSceneStrings(void) ingameTrade = &sIngameTrades[gSpecialVar_0x8005]; StringCopy(gStringVar1, ingameTrade->otName); StringCopy_Nickname(gStringVar3, ingameTrade->nickname); - if(gSpecialVar_0x8004 == PC_MON_CHOSEN) + if (gSpecialVar_0x8004 == PC_MON_CHOSEN) GetMonData(&gEnemyParty[TRADEMON_FROM_PC], MON_DATA_NICKNAME, name); else GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, name); diff --git a/src/trainer_card.c b/src/trainer_card.c index cba0d1054a..7f6c51651b 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -1603,7 +1603,7 @@ static bool8 IsCardFlipTaskActive(void) static void Task_DoCardFlipTask(u8 taskId) { - while(sTrainerCardFlipTasks[gTasks[taskId].tFlipState](&gTasks[taskId])) + while (sTrainerCardFlipTasks[gTasks[taskId].tFlipState](&gTasks[taskId])) ; } diff --git a/src/tv.c b/src/tv.c index 81ed55e7ea..d696f1a92b 100644 --- a/src/tv.c +++ b/src/tv.c @@ -4038,7 +4038,7 @@ static void TranslateJapaneseEmeraldShows(TVShow *shows) for (curShow = shows; curShow < shows + LAST_TVSHOW_IDX; curShow++) { - switch(curShow->common.kind) + switch (curShow->common.kind) { case TVSHOW_FAN_CLUB_LETTER: curShow->fanclubLetter.language = GetStringLanguage(curShow->fanclubLetter.playerName); @@ -4351,7 +4351,7 @@ static void DoTVShowBravoTrainerBattleTower(void) show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004]; gSpecialVar_Result = FALSE; state = sTVShowState; - switch(state) + switch (state) { case BRAVOTOWER_STATE_INTRO: TVShowConvertInternationalString(gStringVar1, show->bravoTrainerTower.playerName, show->bravoTrainerTower.playerLanguage); @@ -4446,7 +4446,7 @@ static void DoTVShowTodaysSmartShopper(void) show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004]; gSpecialVar_Result = FALSE; state = sTVShowState; - switch(state) + switch (state) { case SMARTSHOPPER_STATE_INTRO: TVShowConvertInternationalString(gStringVar1, show->smartshopperShow.playerName, show->smartshopperShow.language);