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

Update src/battle_script_commands.c

Browse Source 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
This commit is contained in:
SonikkuA-DatH 2022-12-19 17:18:43 -08:00 committed by GitHub
parent 459631eb96
commit 07a91b9e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/battle_script_commands.c
View File

@ -8166,21 +8166,19 @@ static bool32 IsAbilityMotorAffected(void)
static bool32 IsAbilityAbsorbAffected(void) static bool32 IsAbilityAbsorbAffected(void)
{ {
u32 moveType; u32 moveType;
if (gBattleStruct->dynamicMoveType == 0) if (gBattleStruct->dynamicMoveType == 0)
moveType = gBattleMoves[gCurrentMove].type; moveType = gBattleMoves[gCurrentMove].type;
else if (!(gBattleStruct->dynamicMoveType & 0x40)) else if (!(gBattleStruct->dynamicMoveType & 0x40))
moveType = gBattleStruct->dynamicMoveType & 0x3F; moveType = gBattleStruct->dynamicMoveType & 0x3F;
else else
moveType = gBattleMoves[gCurrentMove].type; moveType = gBattleMoves[gCurrentMove].type;
if (moveType == TYPE_ELECTRIC && GetBattlerAbility(gBattlerTarget) == ABILITY_VOLT_ABSORB) { if (moveType == TYPE_ELECTRIC && GetBattlerAbility(gBattlerTarget) == ABILITY_VOLT_ABSORB)
return TRUE; return TRUE;
} else
else { return FALSE;
return FALSE;
}
} }
static bool32 IsTeatimeAffected(u32 battlerId) static bool32 IsTeatimeAffected(u32 battlerId)