ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-04 08:33:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mental_herb' of github.com:ghoulslash/pokeemerald into mental_herb

Browse Source
This commit is contained in:
ghoulslash 2021-09-03 17:41:09 -04:00
commit d66f3910d9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/battle_util.c
View File

@ -5605,16 +5605,16 @@ static bool32 UnnerveOn(u32 battlerId, u32 itemId)
static bool32 GetMentalHerbEffect(u8 battlerId) static bool32 GetMentalHerbEffect(u8 battlerId)
{ {
bool32 ret = FALSE; bool32 ret = FALSE;
// check infatuation // Check infatuation
if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION) if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION)
{ {
gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION); gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION);
gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREINFATUATION; //STRINGID_TARGETGOTOVERINFATUATION gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREINFATUATION; // STRINGID_TARGETGOTOVERINFATUATION
StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
ret = TRUE; ret = TRUE;
} }
#if B_MENTAL_HERB >= GEN_5 #if B_MENTAL_HERB >= GEN_5
// check taunt // Check taunt
if (gDisableStructs[gBattlerTarget].tauntTimer != 0) if (gDisableStructs[gBattlerTarget].tauntTimer != 0)
{ {
gDisableStructs[gBattlerTarget].tauntTimer = gDisableStructs[gBattlerTarget].tauntTimer2 = 0; gDisableStructs[gBattlerTarget].tauntTimer = gDisableStructs[gBattlerTarget].tauntTimer2 = 0;
@ -5622,29 +5622,29 @@ static bool32 GetMentalHerbEffect(u8 battlerId)
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_TAUNT); PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_TAUNT);
ret = TRUE; ret = TRUE;
} }
// check encore // Check encore
if (gDisableStructs[gBattlerTarget].encoreTimer != 0) if (gDisableStructs[gBattlerTarget].encoreTimer != 0)
{ {
gDisableStructs[gActiveBattler].encoredMove = 0; gDisableStructs[gActiveBattler].encoredMove = 0;
gDisableStructs[gBattlerTarget].encoreTimerStartValue = gDisableStructs[gBattlerTarget].encoreTimer = 0; gDisableStructs[gBattlerTarget].encoreTimerStartValue = gDisableStructs[gBattlerTarget].encoreTimer = 0;
gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREENCORE; //STRINGID_PKMNENCOREENDED gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREENCORE; // STRINGID_PKMNENCOREENDED
ret = TRUE; ret = TRUE;
} }
// check torment // Check torment
if (gBattleMons[battlerId].status2 & STATUS2_TORMENT) if (gBattleMons[battlerId].status2 & STATUS2_TORMENT)
{ {
gBattleMons[battlerId].status2 &= ~(STATUS2_TORMENT); gBattleMons[battlerId].status2 &= ~(STATUS2_TORMENT);
gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CURETORMENT; gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CURETORMENT;
ret = TRUE; ret = TRUE;
} }
// check heal block // Check heal block
if (gStatuses3[battlerId] & STATUS3_HEAL_BLOCK) if (gStatuses3[battlerId] & STATUS3_HEAL_BLOCK)
{ {
gStatuses3[battlerId] & ~(STATUS3_HEAL_BLOCK); gStatuses3[battlerId] & ~(STATUS3_HEAL_BLOCK);
gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREHEALBLOCK; gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREHEALBLOCK;
ret = TRUE; ret = TRUE;
} }
// disable // Check disable
if (gDisableStructs[gBattlerTarget].disableTimer != 0) if (gDisableStructs[gBattlerTarget].disableTimer != 0)
{ {
gDisableStructs[gBattlerTarget].disableTimer = gDisableStructs[gBattlerTarget].disableTimerStartValue = 0; gDisableStructs[gBattlerTarget].disableTimer = gDisableStructs[gBattlerTarget].disableTimerStartValue = 0;