ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-14 15:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Assigned boolean values to allowedToChangeFormInWeather

Browse Source
This commit is contained in:
LOuroboros 2022-08-25 11:10:43 -03:00
parent b7ca63d151
commit 5b74fa3fd3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_main.c
View File

@ -2991,8 +2991,8 @@ static void BattleStartClearSetData(void)
gBattleStruct->usedHeldItems[i][B_SIDE_OPPONENT] = 0; gBattleStruct->usedHeldItems[i][B_SIDE_OPPONENT] = 0;
gBattleStruct->itemStolen[i].originalItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); gBattleStruct->itemStolen[i].originalItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
gPartyCriticalHits[i] = 0; gPartyCriticalHits[i] = 0;
gBattleStruct->allowedToChangeFormInWeather[i][B_SIDE_PLAYER] = 0; gBattleStruct->allowedToChangeFormInWeather[i][B_SIDE_PLAYER] = FALSE;
gBattleStruct->allowedToChangeFormInWeather[i][B_SIDE_OPPONENT] = 0; gBattleStruct->allowedToChangeFormInWeather[i][B_SIDE_OPPONENT] = FALSE;
} }
gBattleStruct->swapDamageCategory = FALSE; // Photon Geyser, Shell Side Arm, Light That Burns the Sky gBattleStruct->swapDamageCategory = FALSE; // Photon Geyser, Shell Side Arm, Light That Burns the Sky

6
src/battle_util.c
View File

@ -4008,9 +4008,9 @@ static void ShouldChangeFormInWeather(u8 battler)
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
if (GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_EISCUE_NOICE_FACE) if (GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_EISCUE_NOICE_FACE)
gBattleStruct->allowedToChangeFormInWeather[i][side] = 1; gBattleStruct->allowedToChangeFormInWeather[i][side] = TRUE;
else 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) && !(gBattleMons[battler].status2 & STATUS2_TRANSFORMED)
&& gBattleStruct->allowedToChangeFormInWeather[gBattlerPartyIndexes[battler]][GetBattlerSide(battler)]) && 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; gBattleMons[battler].species = SPECIES_EISCUE;
gBattleScripting.battler = battler; // For STRINGID_PKMNTRANSFORMED gBattleScripting.battler = battler; // For STRINGID_PKMNTRANSFORMED
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeWithStringEnd3); BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeWithStringEnd3);