mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-31 16:30:00 +01:00
fix dire hit and paralyze heal
This commit is contained in:
parent
52ce399240
commit
216b7a4dfd
@ -973,6 +973,8 @@ u32 GetItemStatus1Mask(u16 itemId)
|
|||||||
const u8 *effect = GetItemEffect(itemId);
|
const u8 *effect = GetItemEffect(itemId);
|
||||||
switch (effect[3])
|
switch (effect[3])
|
||||||
{
|
{
|
||||||
|
case ITEM3_PARALYSIS:
|
||||||
|
return STATUS1_PARALYSIS;
|
||||||
case ITEM3_FREEZE:
|
case ITEM3_FREEZE:
|
||||||
return STATUS1_FREEZE;
|
return STATUS1_FREEZE;
|
||||||
case ITEM3_BURN:
|
case ITEM3_BURN:
|
||||||
|
@ -1154,7 +1154,7 @@ static bool32 CannotUseBagBattleItem(u16 itemId)
|
|||||||
}
|
}
|
||||||
// Dire Hit
|
// Dire Hit
|
||||||
if (battleUsage == EFFECT_ITEM_SET_FOCUS_ENERGY
|
if (battleUsage == EFFECT_ITEM_SET_FOCUS_ENERGY
|
||||||
&& !(gBattleMons[gBattlerInMenuId].status2 & STATUS2_FOCUS_ENERGY))
|
&& (gBattleMons[gBattlerInMenuId].status2 & STATUS2_FOCUS_ENERGY))
|
||||||
{
|
{
|
||||||
cannotUse++;
|
cannotUse++;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user