Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2072 from AsparagusEduardo/_pret/pr/fixStyle

Browse Source 
Fixed brace style inconsistencies
This commit is contained in:
Martin Griffin 2024-12-05 21:10:49 +00:00 committed by GitHub
commit 404818e441
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
37 changed files with 301 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AgbRfu_LinkManager.c
View File

@ -59,7 +59,9 @@ void rfu_LMAN_REQ_sendData(bool8 clockChangeFlag)
clockChangeFlag = FALSE;
}
else
{
lman.parentAck_flag = 0;
}
rfu_REQ_sendData(clockChangeFlag);
}

2
src/battle_anim_effects_1.c
View File

@ -4043,7 +4043,9 @@ static void AnimMilkBottle_Step1(struct Sprite *sprite)
sprite->data[6]++;
}
else if (sprite->data[7] > 0)
{
sprite->data[7]--;
}
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[6], sprite->data[7]));
if (sprite->data[6] == 16 && sprite->data[7] == 0)

4
src/battle_anim_effects_2.c
View File

@ -2209,7 +2209,9 @@ static void AnimTask_Splash_Step(u8 taskId)
task->data[4] -= 2;
}
else
{
task->data[1]++;
}
break;
case 3:
if (!RunAffineAnimFromTaskData(task))
@ -2956,7 +2958,9 @@ static void AnimTask_SpeedDust_Step(u8 taskId)
task->data[8] = 1;
}
else
{
task->data[8] = 2;
}
}
}
break;

6
src/battle_anim_electric.c
View File

@ -597,7 +597,9 @@ static void AnimZapCannonSpark_Step(struct Sprite *sprite)
sprite->invisible ^= 1;
}
else
{
DestroyAnimSprite(sprite);
}
}
static void AnimThunderboltOrb_Step(struct Sprite *sprite)
@ -870,7 +872,9 @@ static void AnimTask_ElectricChargingParticles_Step(u8 taskId)
}
}
else if(task->data[7] == 0)
{
DestroyAnimVisualTask(taskId);
}
}
static void AnimElectricChargingParticles_Step(struct Sprite *sprite)
@ -991,7 +995,9 @@ void AnimTask_VoltTackleAttackerReappear(u8 taskId)
gSprites[task->data[15]].x2 = task->data[14];
}
else
{
task->data[0]++;
}
}
break;

2
src/battle_anim_ghost.c
View File

@ -280,7 +280,9 @@ static void AnimConfuseRayBallBounce_Step2(struct Sprite *sprite)
sprite->callback = DestroyAnimSpriteAndDisableBlend;
}
else
{
UpdateConfuseRayBallBlend(sprite);
}
}
static void UpdateConfuseRayBallBlend(struct Sprite *sprite)

14
src/battle_anim_throw.c
View File

@ -1147,7 +1147,9 @@ static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite)
gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
}
else
{
gBattleSpritesDataPtr->animationData->ballSubpx += 176;
}
sprite->sTimer++;
sprite->affineAnimPaused = FALSE;
@ -1172,7 +1174,9 @@ static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite)
ChangeSpriteAffineAnim(sprite, BALL_ROTATE_RIGHT);
}
else
{
sprite->affineAnimPaused = TRUE;
}
break;
case BALL_ROLL_2:
if (gBattleSpritesDataPtr->animationData->ballSubpx > 255)
@ -1181,7 +1185,9 @@ static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite)
gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
}
else
{
gBattleSpritesDataPtr->animationData->ballSubpx += 176;
}
sprite->sTimer++;
sprite->affineAnimPaused = FALSE;
@ -1216,7 +1222,9 @@ static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite)
gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
}
else
{
gBattleSpritesDataPtr->animationData->ballSubpx += 176;
}
sprite->sTimer++;
sprite->affineAnimPaused = FALSE;
@ -1390,7 +1398,9 @@ static void SpriteCB_Ball_FadeOut(struct Sprite *sprite)
static void DestroySpriteAfterOneFrame(struct Sprite *sprite)
{
if (sprite->sFrame == 0)
{
sprite->sFrame = -1;
}
else
{
FreeSpriteOamMatrix(sprite);
@ -1410,7 +1420,9 @@ static void MakeCaptureStars(struct Sprite *sprite)
u8 subpriority;
if (sprite->subpriority)
{
subpriority = sprite->subpriority - 1;
}
else
{
subpriority = 0;
@ -2358,7 +2370,9 @@ static void SpriteCB_ShinyStars_Diagonal(struct Sprite *sprite)
{
// Delayed four frames to de-sync from encircling stars
if (sprite->sTimer < 4)
{
sprite->sTimer++;
}
else
{
sprite->invisible = FALSE;

12
src/battle_controller_opponent.c
View File

@ -257,7 +257,9 @@ static void Intro_WaitForShinyAnimAndHealthbox(void)
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
}
else
{
return;
}
}
else if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim)
{
@ -270,13 +272,17 @@ static void Intro_WaitForShinyAnimAndHealthbox(void)
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
}
else
{
return;
}
}
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE;
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE;
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE;
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE;
}
else
{
return;
}
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].introEndDelay = 3;
gBattlerControllerFuncs[gActiveBattler] = Intro_DelayAndEnd;
@ -331,7 +337,9 @@ static void Intro_TryShinyAnimShowHealthbox(void)
m4aMPlayContinue(&gMPlayInfo_BGM);
}
else
{
m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
}
}
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].bgmRestored = TRUE;
bgmRestored = TRUE;

8
src/battle_gfx_sfx_util.c
View File

@ -773,13 +773,21 @@ bool8 BattleLoadAllHealthBoxesGfx(u8 state)
LoadCompressedSpriteSheet(&sSpriteSheet_SinglesPlayerHealthbox);
}
else if (state == 3)
{
LoadCompressedSpriteSheet(&sSpriteSheet_SinglesOpponentHealthbox);
}
else if (state == 4)
{
LoadCompressedSpriteSheet(&sSpriteSheets_HealthBar[gBattlerPositions[0]]);
}
else if (state == 5)
{
LoadCompressedSpriteSheet(&sSpriteSheets_HealthBar[gBattlerPositions[1]]);
}
else
{
retVal = TRUE;
}
}
else
{

34
src/battle_main.c
View File

@ -1654,7 +1654,9 @@ static void CB2_HandleStartMultiBattle(void)
gBattleCommunication[MULTIUSE_STATE]++;
}
else
{
break;
}
// fall through
case 3:
if (IsLinkTaskFinished())
@ -3084,7 +3086,9 @@ static void BattleStartClearSetData(void)
gHitMarker |= HITMARKER_NO_ANIMATIONS;
}
else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) && GetBattleSceneInRecordedBattle())
{
gHitMarker |= HITMARKER_NO_ANIMATIONS;
}
gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle;
@ -3584,7 +3588,9 @@ static void BattleIntroPrintOpponentSendsOut(void)
return;
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
{
position = B_POSITION_OPPONENT_LEFT;
}
else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK)
{
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER)
@ -3593,7 +3599,9 @@ static void BattleIntroPrintOpponentSendsOut(void)
position = B_POSITION_PLAYER_LEFT;
}
else
{
position = B_POSITION_OPPONENT_LEFT;
}
PrepareStringBattle(STRINGID_INTROSENDOUT, GetBattlerAtPosition(position));
gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
@ -3604,7 +3612,9 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void)
u32 position;
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
{
position = B_POSITION_OPPONENT_RIGHT;
}
else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK)
{
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER)
@ -3613,7 +3623,9 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void)
position = B_POSITION_PLAYER_RIGHT;
}
else
{
position = B_POSITION_OPPONENT_RIGHT;
}
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
@ -3641,10 +3653,14 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void)
position = B_POSITION_PLAYER_LEFT;
}
else
{
position = B_POSITION_OPPONENT_LEFT;
}
}
else
{
position = B_POSITION_OPPONENT_LEFT;
}
if (gBattleControllerExecFlags)
return;
@ -3699,7 +3715,9 @@ static void BattleIntroPrintPlayerSendsOut(void)
u8 position;
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
{
position = B_POSITION_PLAYER_LEFT;
}
else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK)
{
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER)
@ -3708,7 +3726,9 @@ static void BattleIntroPrintPlayerSendsOut(void)
position = B_POSITION_OPPONENT_LEFT;
}
else
{
position = B_POSITION_PLAYER_LEFT;
}
if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
PrepareStringBattle(STRINGID_INTROSENDOUT, GetBattlerAtPosition(position));
@ -3722,7 +3742,9 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void)
u32 position;
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
{
position = B_POSITION_PLAYER_RIGHT;
}
else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK)
{
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER)
@ -3731,7 +3753,9 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void)
position = B_POSITION_OPPONENT_RIGHT;
}
else
{
position = B_POSITION_PLAYER_RIGHT;
}
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
@ -3754,7 +3778,9 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void)
u32 position;
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
{
position = B_POSITION_PLAYER_LEFT;
}
else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK)
{
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER)
@ -3763,7 +3789,9 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void)
position = B_POSITION_OPPONENT_LEFT;
}
else
{
position = B_POSITION_PLAYER_LEFT;
}
if (gBattleControllerExecFlags)
return;
@ -4678,7 +4706,9 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
moveBattler1 = gBattleMons[battler1].moves[*(gBattleStruct->chosenMovePositions + battler1)];
}
else
{
moveBattler1 = MOVE_NONE;
}
if (gChosenActionByBattler[battler2] == B_ACTION_USE_MOVE)
{
@ -4688,7 +4718,9 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
moveBattler2 = gBattleMons[battler2].moves[*(gBattleStruct->chosenMovePositions + battler2)];
}
else
{
moveBattler2 = MOVE_NONE;
}
}
// both move priorities are different than 0
@ -4705,7 +4737,9 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
// else battler1 has more speed
}
else if (gBattleMoves[moveBattler1].priority < gBattleMoves[moveBattler2].priority)
{
strikesFirst = 1; // battler2's move has greater priority
}
// else battler1's move has greater priority
}

6
src/battle_message.c
View File

@ -2350,7 +2350,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
toCpy = gStringVar2;
}
else
{
toCpy = gBattleTextBuff2;
}
break;
case B_TXT_BUFF3:
if (gBattleTextBuff3[0] == B_BUFF_PLACEHOLDER_BEGIN)
@ -2359,7 +2361,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
toCpy = gStringVar3;
}
else
{
toCpy = gBattleTextBuff3;
}
break;
case B_TXT_COPY_VAR_1:
toCpy = gStringVar1;
@ -2486,7 +2490,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
toCpy = text;
}
else
{
toCpy = sText_EnigmaBerry;
}
}
}
else

41
src/battle_script_commands.c
View File

@ -1769,7 +1769,9 @@ static void Cmd_attackanimation(void)
gActiveBattler = gBattlerAttacker;
if (gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE)
{
multihit = gMultiHitCounter;
}
else if (gMultiHitCounter != 0 && gMultiHitCounter != 1)
{
if (gBattleMons[gBattlerTarget].hp <= gBattleMoveDamage)
@ -1778,7 +1780,9 @@ static void Cmd_attackanimation(void)
multihit = gMultiHitCounter;
}
else
{
multihit = gMultiHitCounter;
}
BtlController_EmitMoveAnimation(BUFFER_A, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattlerAttacker].friendship, &gDisableStructs[gBattlerAttacker], multihit);
gBattleScripting.animTurn++;
@ -2276,7 +2280,9 @@ void SetMoveEffect(bool8 primary, u8 certain)
{}
}
else
{
gActiveBattler = gBattlersCount;
}
if (gBattleMons[gEffectBattler].status1)
break;
@ -2409,7 +2415,9 @@ void SetMoveEffect(bool8 primary, u8 certain)
RESET_RETURN
}
else
{
break;
}
}
if (gBattleMons[gEffectBattler].status1)
break;
@ -3111,7 +3119,9 @@ static void Cmd_jumpifability(void)
gBattleScripting.battlerWithAbility = battlerId - 1;
}
else
{
gBattlescriptCurrInstr += 7;
}
}
else if (gBattlescriptCurrInstr[1] == BS_NOT_ATTACKER_SIDE)
{
@ -3124,7 +3134,9 @@ static void Cmd_jumpifability(void)
gBattleScripting.battlerWithAbility = battlerId - 1;
}
else
{
gBattlescriptCurrInstr += 7;
}
}
else
{
@ -3137,7 +3149,9 @@ static void Cmd_jumpifability(void)
gBattleScripting.battlerWithAbility = battlerId;
}
else
{
gBattlescriptCurrInstr += 7;
}
}
}
@ -3387,13 +3401,10 @@ static void Cmd_getexp(void)
{
if (gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId && !(gAbsentBattlerFlags & gBitTable[2]))
gBattleStruct->expGetterBattlerId = 2;
else if (!(gAbsentBattlerFlags & gBitTable[0]))
gBattleStruct->expGetterBattlerId = 0;
else
{
if (!(gAbsentBattlerFlags & gBitTable[0]))
gBattleStruct->expGetterBattlerId = 0;
else
gBattleStruct->expGetterBattlerId = 2;
}
gBattleStruct->expGetterBattlerId = 2;
}
else
{
@ -8558,11 +8569,17 @@ static void Cmd_presentdamagecalculation(void)
s32 rand = Random() & 0xFF;
if (rand < 102)
{
gDynamicBasePower = 40;
}
else if (rand < 178)
{
gDynamicBasePower = 80;
}
else if (rand < 204)
{
gDynamicBasePower = 120;
}
else
{
gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 4;
@ -8570,10 +8587,15 @@ static void Cmd_presentdamagecalculation(void)
gBattleMoveDamage = 1;
gBattleMoveDamage *= -1;
}
if (rand < 204)
{
gBattlescriptCurrInstr = BattleScript_HitFromCritCalc;
}
else if (gBattleMons[gBattlerTarget].maxHP == gBattleMons[gBattlerTarget].hp)
{
gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp;
}
else
{
gMoveResultFlags &= ~MOVE_RESULT_DOESNT_AFFECT_FOE;
@ -8910,6 +8932,7 @@ static void Cmd_trydobeatup(void)
&& !GetMonData(&party[gBattleCommunication[0]], MON_DATA_STATUS))
break;
}
if (gBattleCommunication[0] < PARTY_SIZE)
{
PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattleCommunication[0])
@ -8927,9 +8950,13 @@ static void Cmd_trydobeatup(void)
gBattleCommunication[0]++;
}
else if (beforeLoop != 0)
{
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
}
else
{
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 5);
}
}
}
@ -9907,7 +9934,9 @@ static void Cmd_handleballthrow(void)
}
}
else
{
ballMultiplier = sBallCatchBonuses[gLastUsedItem - ITEM_ULTRA_BALL];
}
odds = (catchRate * ballMultiplier / 10)
* (gBattleMons[gBattlerTarget].maxHP * 3 - gBattleMons[gBattlerTarget].hp * 2)

10
src/battle_util.c
View File

@ -1336,9 +1336,13 @@ u8 DoFieldEndTurnEffects(void)
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_RAIN_STOPPED;
}
else if (gBattleWeather & B_WEATHER_RAIN_DOWNPOUR)
{
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DOWNPOUR_CONTINUES;
}
else
{
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_RAIN_CONTINUES;
}
}
else if (gBattleWeather & B_WEATHER_RAIN_DOWNPOUR)
{
@ -3824,7 +3828,9 @@ u8 GetMoveTarget(u16 move, u8 setTarget)
case MOVE_TARGET_SELECTED:
side = BATTLE_OPPOSITE(GetBattlerSide(gBattlerAttacker));
if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
{
targetBattler = gSideTimers[side].followmeTarget;
}
else
{
side = GetBattlerSide(gBattlerAttacker);
@ -3853,7 +3859,9 @@ u8 GetMoveTarget(u16 move, u8 setTarget)
case MOVE_TARGET_RANDOM:
side = BATTLE_OPPOSITE(GetBattlerSide(gBattlerAttacker));
if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
{
targetBattler = gSideTimers[side].followmeTarget;
}
else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & MOVE_TARGET_RANDOM)
{
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
@ -3874,7 +3882,9 @@ u8 GetMoveTarget(u16 move, u8 setTarget)
targetBattler ^= BIT_FLANK;
}
else
{
targetBattler = GetBattlerAtPosition(BATTLE_OPPOSITE(GET_BATTLER_SIDE(gBattlerAttacker)));
}
break;
case MOVE_TARGET_USER_OR_SELECTED:
case MOVE_TARGET_USER:

4
src/berry.c
View File

@ -980,7 +980,9 @@ bool32 IsEnigmaBerryValid(void)
const struct Berry *GetBerryInfo(u8 berry)
{
if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid())
{
return (struct Berry *)(&gSaveBlock1Ptr->enigmaBerry.berry);
}
else
{
if (berry == BERRY_NONE || berry > ITEM_TO_BERRY(LAST_BERRY_INDEX))
@ -1219,7 +1221,9 @@ static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water)
u32 extraYield;
if (water == 0)
{
return min;
}
else
{
randMin = (max - min) * (water - 1);

2
src/berry_crush.c
View File

@ -3398,7 +3398,9 @@ static u32 Cmd_StopGame(struct BerryCrushGame *game, u8 *args)
break;
case 2:
if (game->gfx.counter != 0)
{
game->gfx.counter--;
}
else
{
RunOrScheduleCommand(CMD_CLOSE_LINK, SCHEDULE_CMD, NULL);

2
src/bike.c
View File

@ -372,7 +372,9 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16
gPlayerAvatar.runningState = NOT_MOVING;
if (heldKeys & B_BUTTON)
{
gPlayerAvatar.bikeFrameCounter++;
}
else
{
// B button was released.

2
src/contest.c
View File

@ -2667,7 +2667,9 @@ static void Task_EndAppeals(u8 taskId)
CalculateFinalScores();
ContestClearGeneralTextWindow();
if (!(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK))
{
BravoTrainerPokemonProfile_BeforeInterview1(eContestantStatus[gContestPlayerMonIndex].prevMove);
}
else
{
CalculateContestLiveUpdateData();

15
src/contest_effect.c
View File

@ -619,15 +619,18 @@ static void ContestEffect_QualityDependsOnTiming(void)
{
appeal = 10;
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_APPEAL_NOT_VERY_WELL);
} else if (rval < 6)
}
else if (rval < 6)
{
appeal = 20;
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_APPEAL_SLIGHTLY_WELL2);
} else if (rval < 8)
}
else if (rval < 8)
{
appeal = 40;
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_APPEAL_PRETTY_WELL2);
} else if (rval < 9)
}
else if (rval < 9)
{
appeal = 60;
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_APPEAL_VERY_WELL);
@ -868,7 +871,9 @@ static void ContestEffect_ScrambleNextTurnOrder(void)
break;
}
else
{
rval--;
}
}
}
}
@ -908,7 +913,9 @@ static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void)
eContestAppealResults.jam = RoundUp(eContestAppealResults.jam);
}
else
{
eContestAppealResults.jam = 10;
}
eContestAppealResults.jamQueue[0] = i;
eContestAppealResults.jamQueue[1] = CONTESTANT_NONE;
if (WasAtLeastOneOpponentJammed())
@ -1071,7 +1078,9 @@ static s16 RoundTowardsZero(s16 score)
score -= 10 - absScore;
}
else
{
score -= absScore;
}
return score;
}

12
src/decompress.c
View File

@ -100,9 +100,13 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32
LZ77UnCompWram(gMonFrontPicTable[i].data, dest);
}
else if (species > NUM_SPECIES) // is species unknown? draw the ? icon
{
LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
}
else
{
LZ77UnCompWram(src->data, dest);
}
DuplicateDeoxysTiles(dest, species);
DrawSpindaSpots(species, personality, dest, isFrontPic);
@ -327,9 +331,13 @@ void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s
LZ77UnCompWram(gMonFrontPicTable[i].data, dest);
}
else if (species > NUM_SPECIES) // is species unknown? draw the ? icon
{
LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
}
else
{
LZ77UnCompWram(src->data, dest);
}
DuplicateDeoxysTiles(dest, species);
DrawSpindaSpots(species, personality, dest, isFrontPic);
@ -385,9 +393,13 @@ void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src
LZ77UnCompWram(gMonFrontPicTable[i].data, dest);
}
else if (species > NUM_SPECIES) // is species unknown? draw the ? icon
{
LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
}
else
{
LZ77UnCompWram(src->data, dest);
}
DrawSpindaSpots(species, personality, dest, isFrontPic);
}

32
src/evolution_graphics.c
View File

@ -150,7 +150,9 @@ static void SpriteCB_Sparkle_SpiralUpward(struct Sprite *sprite)
sprite->oam.matrixNum = matrixNum;
}
else
{
DestroySprite(sprite);
}
}
static void CreateSparkle_SpiralUpward(u8 trigIdx)
@ -178,7 +180,9 @@ static void SpriteCB_Sparkle_ArcDown(struct Sprite *sprite)
sprite->sTimer++;
}
else
{
DestroySprite(sprite);
}
}
static void CreateSparkle_ArcDown(u8 trigIdx)
@ -206,7 +210,9 @@ static void SpriteCB_Sparkle_CircleInward(struct Sprite *sprite)
sprite->sTrigIdx += 4;
}
else
{
DestroySprite(sprite);
}
}
static void CreateSparkle_CircleInward(u8 trigIdx, u8 speed)
@ -238,7 +244,9 @@ static void SpriteCB_Sparkle_Spray(struct Sprite *sprite)
sprite->sTrigIdx++;
matrixNum = 31 - (sprite->sTrigIdx * 12 / 128);
if (sprite->sTrigIdx > 64)
{
sprite->subpriority = 1;
}
else
{
sprite->invisible = FALSE;
@ -252,7 +260,9 @@ static void SpriteCB_Sparkle_Spray(struct Sprite *sprite)
sprite->sTimer++;
}
else
{
DestroySprite(sprite);
}
}
static void CreateSparkle_Spray(u8 id)
@ -348,7 +358,9 @@ static void Task_Sparkles_ArcDown(u8 taskId)
gTasks[taskId].tTimer++;
}
else
{
gTasks[taskId].func = Task_Sparkles_ArcDown_End;
}
}
static void Task_Sparkles_ArcDown_End(u8 taskId)
@ -388,7 +400,9 @@ static void Task_Sparkles_CircleInward(u8 taskId)
gTasks[taskId].tTimer++;
}
else
{
gTasks[taskId].func = Task_Sparkles_CircleInward_End;
}
}
static void Task_Sparkles_CircleInward_End(u8 taskId)
@ -437,7 +451,9 @@ static void Task_Sparkles_SprayAndFlash(u8 taskId)
gTasks[taskId].tTimer++;
}
else
{
gTasks[taskId].func = Task_Sparkles_SprayAndFlash_End;
}
}
static void Task_Sparkles_SprayAndFlash_End(u8 taskId)
@ -486,7 +502,9 @@ static void Task_Sparkles_SprayAndFlashTrade(u8 taskId)
gTasks[taskId].tTimer++;
}
else
{
gTasks[taskId].func = Task_Sparkles_SprayAndFlash_End;
}
}
#undef tTimer
@ -560,9 +578,13 @@ static void Task_CycleEvolutionMonSprite_Init(u8 taskId)
static void Task_CycleEvolutionMonSprite_TryEnd(u8 taskId)
{
if (gTasks[taskId].tEvoStopped)
{
EndOnPreEvoMon(taskId);
}
else if (gTasks[taskId].tScaleSpeed == 128)
{
EndOnPostEvoMon(taskId);
}
else
{
gTasks[taskId].tScaleSpeed += 2;
@ -574,7 +596,9 @@ static void Task_CycleEvolutionMonSprite_TryEnd(u8 taskId)
static void Task_CycleEvolutionMonSprite_UpdateSize(u8 taskId)
{
if (gTasks[taskId].tEvoStopped)
{
gTasks[taskId].func = EndOnPreEvoMon;
}
else
{
u16 oamMatrixArg;
@ -583,7 +607,9 @@ static void Task_CycleEvolutionMonSprite_UpdateSize(u8 taskId)
{
// Set pre-evo sprite growth
if (gTasks[taskId].tPreEvoScale < MON_MAX_SCALE - gTasks[taskId].tScaleSpeed)
{
gTasks[taskId].tPreEvoScale += gTasks[taskId].tScaleSpeed;
}
else
{
gTasks[taskId].tPreEvoScale = MON_MAX_SCALE;
@ -592,7 +618,9 @@ static void Task_CycleEvolutionMonSprite_UpdateSize(u8 taskId)
// Set post-evo sprite shrink
if (gTasks[taskId].tPostEvoScale > MON_MIN_SCALE + gTasks[taskId].tScaleSpeed)
{
gTasks[taskId].tPostEvoScale -= gTasks[taskId].tScaleSpeed;
}
else
{
gTasks[taskId].tPostEvoScale = MON_MIN_SCALE;
@ -603,7 +631,9 @@ static void Task_CycleEvolutionMonSprite_UpdateSize(u8 taskId)
{
// Set post-evo sprite growth
if (gTasks[taskId].tPostEvoScale < MON_MAX_SCALE - gTasks[taskId].tScaleSpeed)
{
gTasks[taskId].tPostEvoScale += gTasks[taskId].tScaleSpeed;
}
else
{
gTasks[taskId].tPostEvoScale = MON_MAX_SCALE;
@ -612,7 +642,9 @@ static void Task_CycleEvolutionMonSprite_UpdateSize(u8 taskId)
// Set pre-evo sprite shrink
if (gTasks[taskId].tPreEvoScale > MON_MIN_SCALE + gTasks[taskId].tScaleSpeed)
{
gTasks[taskId].tPreEvoScale -= gTasks[taskId].tScaleSpeed;
}
else
{
gTasks[taskId].tPreEvoScale = MON_MIN_SCALE;

2
src/field_camera.c
View File

@ -231,7 +231,9 @@ static void DrawMetatileAt(const struct MapLayout *mapLayout, u16 offset, int x,
if (metatileId > NUM_METATILES_TOTAL)
metatileId = 0;
if (metatileId < NUM_METATILES_IN_PRIMARY)
{
metatiles = mapLayout->primaryTileset->metatiles;
}
else
{
metatiles = mapLayout->secondaryTileset->metatiles;

2
src/field_door.c
View File

@ -437,7 +437,9 @@ static const struct DoorGraphics *GetDoorGraphics(const struct DoorGraphics *gfx
static s8 StartDoorAnimationTask(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frames, u32 x, u32 y)
{
if (FuncIsActiveTask(Task_AnimateDoor) == TRUE)
{
return -1;
}
else
{
u8 taskId = CreateTask(Task_AnimateDoor, 0x50);

15
src/field_effect.c
View File

@ -1293,7 +1293,8 @@ static void CreateHofMonitorSprite(s16 taskId, s16 x, s16 y, bool8 isSmallMonito
{
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_HofMonitorBig, x, y, 0);
SetSubspriteTables(&gSprites[spriteId], &sSubspriteTable_HofMonitorBig);
} else
}
else
{
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_HofMonitorSmall, x, y, 0);
}
@ -2003,7 +2004,8 @@ static bool8 LavaridgeGymB1FWarpEffect_Rise(struct Task *task, struct ObjectEven
{
task->data[1] <<= 1;
}
} else if (!(task->data[2] & 4) && (task->data[1] > 0))
}
else if (!(task->data[2] & 4) && (task->data[1] > 0))
{
task->data[1] >>= 1;
}
@ -2017,7 +2019,8 @@ static bool8 LavaridgeGymB1FWarpEffect_Rise(struct Task *task, struct ObjectEven
{
task->data[3]++;
}
} else
}
else
{
task->data[4] = 1;
}
@ -2169,7 +2172,8 @@ static bool8 LavaridgeGym1FWarpEffect_AshPuff(struct Task *task, struct ObjectEv
gFieldEffectArguments[3] = sprite->oam.priority;
task->data[1] = FieldEffectStart(FLDEFF_ASH_PUFF);
task->data[0]++;
} else
}
else
{
task->data[1]++;
ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFasterMovementAction(objectEvent->facingDirection));
@ -2499,7 +2503,8 @@ static void TeleportWarpInFieldEffect_SpinEnter(struct Task *task)
objectEvent->triggerGroundEffectsOnMove = TRUE;
sprite->subspriteMode = task->data[14];
}
} else
}
else
{
sprite->oam.priority = 1;
if (sprite->subspriteMode != SUBSPRITES_OFF)

12
src/item_use.c
View File

@ -122,7 +122,9 @@ static void SetUpItemUseOnFieldCallback(u8 taskId)
SetUpItemUseCallback(taskId);
}
else
{
sItemUseOnFieldCB(taskId);
}
}
static void FieldCB_UseItemOnField(void)
@ -148,7 +150,9 @@ static void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyIte
DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, Task_CloseBattlePyramidBagMessage);
}
else
{
DisplayItemMessageOnField(taskId, gStringVar4, Task_CloseCantUseKeyItemMessage);
}
}
static void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField)
@ -202,7 +206,9 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
PlayerGetDestCoords(&coordsX, &coordsY);
behavior = MapGridGetMetatileBehaviorAt(coordsX, coordsY);
if (FlagGet(FLAG_SYS_CYCLING_ROAD) == TRUE || MetatileBehavior_IsVerticalRail(behavior) == TRUE || MetatileBehavior_IsHorizontalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE)
{
DisplayCannotDismountBikeMessage(taskId, tUsingRegisteredKeyItem);
}
else
{
if (Overworld_IsBikingAllowed() == TRUE && IsBikingDisallowedByPlayer() == 0)
@ -211,7 +217,9 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
SetUpItemUseOnFieldCallback(taskId);
}
else
{
DisplayDadsAdviceCannotUseItemMessage(taskId, tUsingRegisteredKeyItem);
}
}
}
@ -264,7 +272,9 @@ void ItemUseOutOfBattle_Rod(u8 taskId)
SetUpItemUseOnFieldCallback(taskId);
}
else
{
DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem);
}
}
static void ItemUseOnFieldCB_Rod(u8 taskId)
@ -951,7 +961,9 @@ void ItemUseInBattle_PokeBall(u8 taskId)
DisplayItemMessage(taskId, FONT_NORMAL, gText_BoxFull, CloseItemMessage);
}
else
{
DisplayItemMessageInBattlePyramid(taskId, gText_BoxFull, Task_CloseBattlePyramidBagMessage);
}
}
static void Task_CloseStatIncreaseMessage(u8 taskId)

2
src/librfu_sio32id.c
View File

@ -145,7 +145,9 @@ static void Sio32IDIntr(void)
}
}
else
{
gRfuSIO32Id.lastId = regSIODATA32;
}
}
else
{

11
src/link_rfu_2.c
View File

@ -1175,7 +1175,9 @@ static void RfuHandleReceiveCommand(u8 unused)
gRfu.numBlocksReceived[i] = 0;
}
else
{
gRfu.numBlocksReceived[i]++;
}
}
}
}
@ -1302,7 +1304,9 @@ bool32 Rfu_InitBlockSend(const u8 *src, size_t size)
gRfu.sendBlock.count = (size / 12) + r4;
gRfu.sendBlock.next = 0;
if (size > BLOCK_BUFFER_SIZE)
{
gRfu.sendBlock.payload = src;
}
else
{
if (src != gBlockSendBuffer)
@ -1629,9 +1633,8 @@ static bool8 CheckForLeavingGroupMembers(void)
}
else if (gRfuSlotStatusNI[gRfu.childSlot]->recv.state == SLOT_STATE_RECV_FAILED)
rfu_clearSlot(TYPE_NI_RECV, i);
{
rfu_clearSlot(TYPE_NI_RECV, i);
}
}
}
@ -1777,7 +1780,9 @@ static void Task_PlayerExchange(u8 taskId)
gTasks[taskId].tState = 101;
}
else
{
gTasks[taskId].tState = 2;
}
break;
case 101:
if (gSendCmd[0] == 0)
@ -1798,7 +1803,9 @@ static void Task_PlayerExchange(u8 taskId)
}
}
else
{
gTasks[taskId].tState++;
}
break;
case 4:
if (AreAllPlayersFinishedReceiving())

4
src/lottery_corner.c
View File

@ -76,7 +76,9 @@ void PickLotteryCornerTicket(void)
}
}
else // Pokémon are always arranged from populated spots first to unpopulated, so the moment a NONE species is found, that's the end of the list.
{
break;
}
}
for (i = 0; i < TOTAL_BOXES_COUNT; i++)
@ -134,7 +136,9 @@ static u8 GetMatchingDigits(u16 winNumber, u16 otId)
matchingDigits++;
}
else
{
break;
}
}
return matchingDigits;
}

6
src/mauville_old_man.c
View File

@ -481,7 +481,9 @@ static void BardSing(struct Task *task, struct BardSong *song)
GetWordPhonemes(song, MACRO1(word));
song->currWord++;
if (song->sound->songLengthId != 0xFF)
{
song->state = 0;
}
else
{
song->state = 3;
@ -531,7 +533,9 @@ static void BardSing(struct Task *task, struct BardSong *song)
{
song->currPhoneme++;
if (song->currPhoneme != 6 && song->sound[song->currPhoneme].songLengthId != 0xFF)
{
song->state = 0;
}
else
{
song->state = 3;
@ -850,7 +854,9 @@ void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language
trader->language[i] = LANGUAGE_JAPANESE;
}
else
{
trader->language[i] = language;
}
}
}
else

18
src/mini_printf.c
View File

@ -167,9 +167,9 @@ static s32 _putsEncoded(char *s, s32 len, void *buf)
static s32 mini_strlen(const char *s)
{
s32 len = 0;
while (s[len] != '\0') len++;
return len;
s32 len = 0;
while (s[len] != '\0') len++;
return len;
}
static s32 mini_itoa(s32 value, u32 radix, s32 uppercase, bool32 unsig, char *buffer)
@ -274,7 +274,8 @@ s32 mini_vpprintf(void* buf, const char *fmt, va_list va)
{
len = 1;
len = _putsAscii(&ch, len, buf);
} else
}
else
{
char pad_char = ' ';
s32 pad_to = 0;
@ -310,7 +311,8 @@ s32 mini_vpprintf(void* buf, const char *fmt, va_list va)
if(l)
{
len = mini_itoa(va_arg(va, u32), 10, 0, (ch=='u'), bf2);
} else
}
else
{
if(ch == 'u')
{
@ -352,7 +354,8 @@ s32 mini_vpprintf(void* buf, const char *fmt, va_list va)
{
len = mini_pad(ptr, len, pad_char, pad_to, bf);
len = _putsAscii(bf, len, buf);
} else
}
else
{
len = _putsAscii(ptr, len, buf);
}
@ -364,7 +367,8 @@ s32 mini_vpprintf(void* buf, const char *fmt, va_list va)
{
len = mini_pad(ptr, len, pad_char, pad_to, bf);
len = _putsEncoded(bf, len, buf);
} else
}
else
{
len = _putsEncoded(ptr, len, buf);
}

2
src/party_menu.c
View File

@ -4800,7 +4800,9 @@ static void Task_LearnNextMoveOrClosePartyMenu(u8 taskId)
if (IsFanfareTaskInactive() && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))))
{
if (gPartyMenu.learnMoveState == 1)
{
Task_TryLearningNextMove(taskId);
}
else
{
if (gPartyMenu.learnMoveState == 2) // never occurs

2
src/player_pc.c
View File

@ -880,7 +880,9 @@ static void Mailbox_CancelMoveToBag(u8 taskId)
static void Mailbox_Give(u8 taskId)
{
if (CalculatePlayerPartyCount() == 0)
{
Mailbox_NoPokemonForMail(taskId);
}
else
{
FadeScreen(FADE_TO_BLACK, 0);

6
src/pokedex.c
View File

@ -2396,7 +2396,9 @@ static void CreateMonListEntry(u8 position, u16 b, u16 ignored)
if (vOffset >= LIST_SCROLL_STEP)
vOffset -= LIST_SCROLL_STEP;
if (entryNum < 0 || entryNum >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[entryNum].dexNum == 0xFFFF)
{
ClearMonListEntry(17, vOffset * 2, ignored);
}
else
{
ClearMonListEntry(17, vOffset * 2, ignored);
@ -2685,7 +2687,9 @@ static bool8 TryDoInfoScreenScroll(void)
}
if (sPokedexView->selectedPokemon == selectedPokemon)
{
return FALSE;
}
else
{
sPokedexView->selectedPokemon = selectedPokemon;
@ -2708,7 +2712,9 @@ static bool8 TryDoInfoScreenScroll(void)
}
if (sPokedexView->selectedPokemon == selectedPokemon)
{
return FALSE;
}
else
{
sPokedexView->selectedPokemon = selectedPokemon;

15
src/pokemon.c
View File

@ -2874,8 +2874,11 @@ void CalculateMonStats(struct Pokemon *mon)
else
{
if (currentHP == 0 && oldMaxHP == 0)
{
currentHP = newMaxHP;
else if (currentHP != 0) {
}
else if (currentHP != 0)
{
// BUG: currentHP is unintentionally able to become <= 0 after the instruction below. This causes the pomeg berry glitch.
currentHP += newMaxHP - oldMaxHP;
#ifdef BUGFIX
@ -2884,7 +2887,9 @@ void CalculateMonStats(struct Pokemon *mon)
#endif
}
else
{
return;
}
}
SetMonData(mon, MON_DATA_HP, &currentHP);
@ -6394,11 +6399,17 @@ void ClearBattleMonForms(void)
u16 GetBattleBGM(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
{
return MUS_VS_KYOGRE_GROUDON;
}
else if (gBattleTypeFlags & BATTLE_TYPE_REGI)
{
return MUS_VS_REGI;
}
else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))
{
return MUS_VS_TRAINER;
}
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{
u8 trainerClass;
@ -6445,7 +6456,9 @@ u16 GetBattleBGM(void)
}
}
else
{
return MUS_VS_WILD;
}
}
void PlayBattleBGM(void)

10
src/pokenav_conditions_search_results.c
View File

@ -184,13 +184,21 @@ static bool32 HandleConditionSearchInput_WaitSetup(struct Pokenav_SearchResults
static u32 HandleConditionSearchInput(struct Pokenav_SearchResults *menu)
{
if (JOY_REPEAT(DPAD_UP))
{
return CONDITION_SEARCH_FUNC_MOVE_UP;
}
else if (JOY_REPEAT(DPAD_DOWN))
{
return CONDITION_SEARCH_FUNC_MOVE_DOWN;
}
else if (JOY_NEW(DPAD_LEFT))
{
return CONDITION_SEARCH_FUNC_PAGE_UP;
}
else if (JOY_NEW(DPAD_RIGHT))
{
return CONDITION_SEARCH_FUNC_PAGE_DOWN;
}
else if (JOY_NEW(B_BUTTON))
{
// Exiting back to main search menu
@ -207,7 +215,9 @@ static u32 HandleConditionSearchInput(struct Pokenav_SearchResults *menu)
return CONDITION_SEARCH_FUNC_SELECT_MON;
}
else
{
return CONDITION_SEARCH_FUNC_NONE;
}
}
static u32 ReturnToConditionSearchList(struct Pokenav_SearchResults *menu)

2
src/pokenav_menu_handler_gfx.c
View File

@ -505,7 +505,9 @@ static u32 LoopedTask_OpenMenu(s32 state)
ShowBg(2);
ShowBg(3);
if (gfx->pokenavAlreadyOpen)
{
PokenavFadeScreen(POKENAV_FADE_FROM_BLACK);
}
else
{
PlaySE(SE_POKENAV_ON);

2
src/slot_machine.c
View File

@ -2324,7 +2324,9 @@ static bool8 ReelTask_MoveToStop(struct Task *task)
memcpy(reelStopShocks, sReelStopShocks, sizeof(sReelStopShocks));
reelPixelPos = sSlotMachine->reelPixelOffsets[task->tReelId] % REEL_SYMBOL_HEIGHT;
if (reelPixelPos != 0)
{
reelPixelPos = AdvanceSlotReelToNextSymbol(task->tReelId, sSlotMachine->reelSpeed);
}
else if (sSlotMachine->reelExtraTurns[task->tReelId])
{
sSlotMachine->reelExtraTurns[task->tReelId]--;

4
src/sprite.c
View File

@ -1090,9 +1090,13 @@ void ContinueAffineAnim(struct Sprite *sprite)
u8 matrixNum = GetSpriteMatrixNum(sprite);
if (sAffineAnimStates[matrixNum].delayCounter)
{
AffineAnimDelay(matrixNum, sprite);
}
else if (sprite->affineAnimPaused)
{
return;
}
else
{
s16 type;

3
src/tv.c
View File

@ -5364,7 +5364,8 @@ static void DoTVShow3CheersForPokeblocks(void)
if (show->threeCheers.sheen > 24)
{
StringCopy(gStringVar2, gText_Excellent);
} else if (show->threeCheers.sheen > 22)
}
else if (show->threeCheers.sheen > 22)
{
StringCopy(gStringVar2, gText_VeryGood);
}