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

Update battle_util.c

Browse Source 
Noted Protection Bypassing
This commit is contained in:
SonikkuA-DatH 2022-12-21 14:50:06 -08:00 committed by GitHub
parent 0a5154499e
commit c4db74460a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_util.c
View File

@ -8012,6 +8012,11 @@ bool32 IsBattlerProtected(u8 battlerId, u16 move)
else if (gProtectStructs[battlerId].protected) else if (gProtectStructs[battlerId].protected)
return FALSE; return FALSE;
} }
if (move == MOVE_TEATIME)
{
return FALSE;
}
// Protective Pads doesn't stop Unseen Fist from bypassing Protect effects, so IsMoveMakingContact() isn't used here. // Protective Pads doesn't stop Unseen Fist from bypassing Protect effects, so IsMoveMakingContact() isn't used here.
// This means extra logic is needed to handle Shell Side Arm. // This means extra logic is needed to handle Shell Side Arm.