atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix conflicts

Browse source
This commit is contained in:
Eduardo Quezada 2024-12-01 14:28:26 -03:00
parent 7010080465
commit 720938f040
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/battle.h
View file

@ -828,9 +828,8 @@ struct BattleStruct
u8 commandingDondozo; u8 commandingDondozo;
u16 commanderActive[MAX_BATTLERS_COUNT]; u16 commanderActive[MAX_BATTLERS_COUNT];
u32 stellarBoostFlags[NUM_BATTLE_SIDES]; // stored as a bitfield of flags for all types for each side u32 stellarBoostFlags[NUM_BATTLE_SIDES]; // stored as a bitfield of flags for all types for each side
u8 fickleBeamBoosted:1;
u8 redCardActivates:1; u8 redCardActivates:1;
u8 padding:6; u8 padding:7;
u8 usedEjectItem; u8 usedEjectItem;
u8 usedMicleBerry; u8 usedMicleBerry;
}; };

9
src/battle_util.c
View file

@ -3314,7 +3314,14 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType)
break; break;
case DISOBEYS_HITS_SELF: case DISOBEYS_HITS_SELF:
gBattlerTarget = gBattlerAttacker; gBattlerTarget = gBattlerAttacker;
gBattleMoveDamage = CalculateMoveDamage(MOVE_NONE, gBattlerAttacker, gBattlerAttacker, TYPE_MYSTERY, 40, FALSE, FALSE, TRUE); struct DamageCalculationData damageCalcData;
damageCalcData.battlerAtk = damageCalcData.battlerDef = gBattlerAttacker;
damageCalcData.move = MOVE_NONE;
damageCalcData.moveType = TYPE_MYSTERY;
damageCalcData.isCrit = FALSE;
damageCalcData.randomFactor = FALSE;
damageCalcData.updateFlags = TRUE;
gBattleMoveDamage = CalculateMoveDamage(&damageCalcData, 40);
gBattlescriptCurrInstr = BattleScript_IgnoresAndHitsItself; gBattlescriptCurrInstr = BattleScript_IgnoresAndHitsItself;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
gHitMarker |= HITMARKER_OBEYS; gHitMarker |= HITMARKER_OBEYS;