ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move touchedProtectLike to protect structs

Browse Source 
This makes more sense than putting it in DisableStruct.
This commit is contained in:
BuffelSaft 2021-09-01 21:34:47 +12:00
parent eb0f0b7ce8
commit 3371773e5c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@ -100,7 +100,6 @@ struct DisableStruct
u8 truantCounter:1;
u8 truantSwitchInHack:1;
u8 mimickedMoves:4;
u8 touchedProtectLike: 1;
u8 rechargeTimer;
u8 autotomizeCount;
u8 slowStartTimer;
@ -145,6 +144,7 @@ struct ProtectStruct
u32 usedThroatChopPreventedMove:1;
u32 micle:1;
u32 custap:1; // also quick claw
u32 touchedProtectLike:1;
u32 physicalDmg;
u32 specialDmg;
u8 physicalBattlerId;

10
src/battle_script_commands.c
View File

@ -1456,7 +1456,7 @@ static void Cmd_attackcanceler(void)
&& gBattleMoves[gCurrentMove].effect != EFFECT_SUCKER_PUNCH)
{
if (gBattleMoves[gCurrentMove].flags & FLAG_MAKES_CONTACT)
gDisableStructs[gBattlerAttacker].touchedProtectLike = 1;
gProtectStructs[gBattlerAttacker].touchedProtectLike = 1;
CancelMultiTurnMoves(gBattlerAttacker);
gMoveResultFlags |= MOVE_RESULT_MISSED;
gLastLandedMoves[gBattlerTarget] = 0;
@ -4779,11 +4779,11 @@ static void Cmd_moveend(void)
switch (gBattleScripting.moveendState)
{
case MOVEEND_PROTECT_LIKE_EFFECT:
if (gDisableStructs[gBattlerAttacker].touchedProtectLike)
if (gProtectStructs[gBattlerAttacker].touchedProtectLike)
{
if (gProtectStructs[gBattlerTarget].spikyShielded && GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
{
gDisableStructs[gBattlerAttacker].touchedProtectLike = 0;
gProtectStructs[gBattlerAttacker].touchedProtectLike = 0;
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 8;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
@ -4794,7 +4794,7 @@ static void Cmd_moveend(void)
}
else if (gProtectStructs[gBattlerTarget].kingsShielded)
{
gDisableStructs[gBattlerAttacker].touchedProtectLike = 0;
gProtectStructs[gBattlerAttacker].touchedProtectLike = 0;
i = gBattlerAttacker;
gBattlerAttacker = gBattlerTarget;
gBattlerTarget = i; // gBattlerTarget and gBattlerAttacker are swapped in order to activate Defiant, if applicable
@ -4805,7 +4805,7 @@ static void Cmd_moveend(void)
}
else if (gProtectStructs[gBattlerTarget].banefulBunkered)
{
gDisableStructs[gBattlerAttacker].touchedProtectLike = 0;
gProtectStructs[gBattlerAttacker].touchedProtectLike = 0;
gBattleScripting.moveEffect = MOVE_EFFECT_POISON | MOVE_EFFECT_AFFECTS_USER;
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_BANEFUL_BUNKER);
BattleScriptPushCursor();