ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

mental herb fixes

Browse Source
This commit is contained in:
ghoulslash 2021-09-15 12:56:58 -04:00
parent b85586a33a
commit 0bca01cb74
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -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

14
include/constants/battle_string_ids.h
View File

@ -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

12
src/battle_message.c
View File

@ -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[] =

2
src/battle_util.c
View File

@ -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;
}