From 492b5718e780628c8dadeeaddec0412d7131aae5 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:02:21 -0600 Subject: [PATCH 1/8] Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index b095ca0fb..f62228c46 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5205,7 +5205,7 @@ static bool32 UnnerveOn(u32 battlerId, u32 itemId) static bool32 GetMentalHerbEffect(u8 battlerId) { bool32 ret = FALSE; - // check infatuation + // Check infatuation if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION) { gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION); From d0f5528abb15b8580a5b7aea68b11c20f42ef1da Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:02:34 -0600 Subject: [PATCH 2/8] Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index f62228c46..bc3418a91 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5209,7 +5209,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId) if (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); ret = TRUE; } From 31cdf043ccfb4f8a7ad2a96ec05dd852c37db3d6 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:02:41 -0600 Subject: [PATCH 3/8] Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index bc3418a91..aecdb445d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5214,7 +5214,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId) ret = TRUE; } #if B_MENTAL_HERB >= GEN_5 - // check taunt + // Check taunt if (gDisableStructs[gBattlerTarget].tauntTimer != 0) { gDisableStructs[gBattlerTarget].tauntTimer = gDisableStructs[gBattlerTarget].tauntTimer2 = 0; From 97428b6e10668e2f1e2b6879f416574c9518e6cc Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:02:46 -0600 Subject: [PATCH 4/8] Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index aecdb445d..da9cae886 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5227,7 +5227,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId) { gDisableStructs[gActiveBattler].encoredMove = 0; gDisableStructs[gBattlerTarget].encoreTimerStartValue = gDisableStructs[gBattlerTarget].encoreTimer = 0; - gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREENCORE; //STRINGID_PKMNENCOREENDED + gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREENCORE; // STRINGID_PKMNENCOREENDED ret = TRUE; } // check torment From d7c7f808b8b8073fe09bdcb889f006a6935f3dcd Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:02:51 -0600 Subject: [PATCH 5/8] Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index da9cae886..e71db412e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5222,7 +5222,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId) PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_TAUNT); ret = TRUE; } - // check encore + // Check encore if (gDisableStructs[gBattlerTarget].encoreTimer != 0) { gDisableStructs[gActiveBattler].encoredMove = 0; From 332286ce0390e490518f0fcba4ffc345f83d719a Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:02:56 -0600 Subject: [PATCH 6/8] Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index e71db412e..f56a37a36 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5230,7 +5230,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId) gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREENCORE; // STRINGID_PKMNENCOREENDED ret = TRUE; } - // check torment + // Check torment if (gBattleMons[battlerId].status2 & STATUS2_TORMENT) { gBattleMons[battlerId].status2 &= ~(STATUS2_TORMENT); From a8c40a8d6f60640b12d9216bc7c8edf8110587ad Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:03:00 -0600 Subject: [PATCH 7/8] Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index f56a37a36..f44146f11 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5237,7 +5237,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId) gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CURETORMENT; ret = TRUE; } - // check heal block + // Check heal block if (gStatuses3[battlerId] & STATUS3_HEAL_BLOCK) { gStatuses3[battlerId] & ~(STATUS3_HEAL_BLOCK); From 856781ce56fbc852cb08587a0108f01d5c5b3fe5 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:03:05 -0600 Subject: [PATCH 8/8] Update src/battle_util.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index f44146f11..661f7068e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5244,7 +5244,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId) gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREHEALBLOCK; ret = TRUE; } - // disable + // Check disable if (gDisableStructs[gBattlerTarget].disableTimer != 0) { gDisableStructs[gBattlerTarget].disableTimer = gDisableStructs[gBattlerTarget].disableTimerStartValue = 0;