From 0bca01cb743d96a4a36165604c9971691b7b917d Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Wed, 15 Sep 2021 12:56:58 -0400 Subject: [PATCH] mental herb fixes --- data/battle_scripts_1.s | 2 +- include/constants/battle_string_ids.h | 14 +++++++------- src/battle_message.c | 12 ++++++------ src/battle_util.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 4f30b3f307..a0e7b9445f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -7547,7 +7547,7 @@ BattleScript_BerryCureChosenStatusRet:: BattleScript_MentalHerbCureRet:: playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL printfromtable gMentalHerbCureStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_SCRIPTING removeitem BS_SCRIPTING copybyte gBattlerAttacker, sSAVED_BATTLER @ restore the original attacker just to be safe diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 344d1c596e..4ddae69907 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -813,12 +813,12 @@ #define B_MSG_SWITCHIN_ASONE 13 #define B_MSG_SWITCHIN_CURIOUS_MEDICINE 14 -// mental herb -#define MULTI_CUREINFATUATION 0 -#define MULTI_CURETAUNT 1 -#define MULTI_CUREENCORE 2 -#define MULTI_CURETORMENT 3 -#define MULTI_CUREHEALBLOCK 4 -#define MULTI_CUREDISABLE 5 +// gMentalHerbCureStringIds +#define B_MSG_MENTALHERBCURE_INFATUATION 0 +#define B_MSG_MENTALHERBCURE_TAUNT 1 +#define B_MSG_MENTALHERBCURE_ENCORE 2 +#define B_MSG_MENTALHERBCURE_TORMENT 3 +#define B_MSG_MENTALHERBCURE_HEALBLOCK 4 +#define B_MSG_MENTALHERBCURE_DISABLE 5 #endif // GUARD_CONSTANTS_BATTLE_STRING_IDS_H diff --git a/src/battle_message.c b/src/battle_message.c index 3c21604d80..bec1bf9a84 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1272,12 +1272,12 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = const u16 gMentalHerbCureStringIds[] = { - [MULTI_CUREINFATUATION] = STRINGID_ATKGOTOVERINFATUATION, - [MULTI_CURETAUNT] = STRINGID_BUFFERENDS, - [MULTI_CUREENCORE] = STRINGID_PKMNENCOREENDED, - [MULTI_CURETORMENT] = STRINGID_TORMENTEDNOMORE, - [MULTI_CUREHEALBLOCK] = STRINGID_HEALBLOCKEDNOMORE, - [MULTI_CUREDISABLE] = STRINGID_PKMNMOVEDISABLEDNOMORE, + [B_MSG_MENTALHERBCURE_INFATUATION] = STRINGID_ATKGOTOVERINFATUATION, + [B_MSG_MENTALHERBCURE_TAUNT] = STRINGID_BUFFERENDS, + [B_MSG_MENTALHERBCURE_ENCORE] = STRINGID_PKMNENCOREENDED, + [B_MSG_MENTALHERBCURE_TORMENT] = STRINGID_TORMENTEDNOMORE, + [B_MSG_MENTALHERBCURE_HEALBLOCK] = STRINGID_HEALBLOCKEDNOMORE, + [B_MSG_MENTALHERBCURE_DISABLE] = STRINGID_PKMNMOVEDISABLEDNOMORE, }; const u16 gTerrainStringIds[] = diff --git a/src/battle_util.c b/src/battle_util.c index 5027e48b97..27b4521f48 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5643,7 +5643,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId) // Check heal block if (gStatuses3[battlerId] & STATUS3_HEAL_BLOCK) { - gStatuses3[battlerId] & ~(STATUS3_HEAL_BLOCK); + gStatuses3[battlerId] &= ~(STATUS3_HEAL_BLOCK); gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREHEALBLOCK; ret = TRUE; }