diff --git a/src/battle_main.c b/src/battle_main.c index 50b8a10681..87f0a0dfca 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2991,8 +2991,8 @@ static void BattleStartClearSetData(void) gBattleStruct->usedHeldItems[i][B_SIDE_OPPONENT] = 0; gBattleStruct->itemStolen[i].originalItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); gPartyCriticalHits[i] = 0; - gBattleStruct->allowedToChangeFormInWeather[i][B_SIDE_PLAYER] = 0; - gBattleStruct->allowedToChangeFormInWeather[i][B_SIDE_OPPONENT] = 0; + gBattleStruct->allowedToChangeFormInWeather[i][B_SIDE_PLAYER] = FALSE; + gBattleStruct->allowedToChangeFormInWeather[i][B_SIDE_OPPONENT] = FALSE; } gBattleStruct->swapDamageCategory = FALSE; // Photon Geyser, Shell Side Arm, Light That Burns the Sky diff --git a/src/battle_util.c b/src/battle_util.c index e88b723b52..38414c0e73 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4008,9 +4008,9 @@ static void ShouldChangeFormInWeather(u8 battler) for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_EISCUE_NOICE_FACE) - gBattleStruct->allowedToChangeFormInWeather[i][side] = 1; + gBattleStruct->allowedToChangeFormInWeather[i][side] = TRUE; else - gBattleStruct->allowedToChangeFormInWeather[i][side] = 0; + gBattleStruct->allowedToChangeFormInWeather[i][side] = FALSE; } } @@ -4884,7 +4884,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move && !(gBattleMons[battler].status2 & STATUS2_TRANSFORMED) && gBattleStruct->allowedToChangeFormInWeather[gBattlerPartyIndexes[battler]][GetBattlerSide(battler)]) { - gBattleStruct->allowedToChangeFormInWeather[gBattlerPartyIndexes[battler]][GetBattlerSide(battler)] = 0; + gBattleStruct->allowedToChangeFormInWeather[gBattlerPartyIndexes[battler]][GetBattlerSide(battler)] = FALSE; gBattleMons[battler].species = SPECIES_EISCUE; gBattleScripting.battler = battler; // For STRINGID_PKMNTRANSFORMED BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeWithStringEnd3);