From 5c9c425590152e345becca48fa369fba3ba67b6d Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Thu, 9 Sep 2021 10:03:24 -0400 Subject: [PATCH 1/2] fix power herb actiation message --- src/battle_script_commands.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a44e473aee..e45926f6fa 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7288,9 +7288,14 @@ static void Cmd_various(void) return; case VARIOUS_JUMP_IF_NO_HOLD_EFFECT: if (GetBattlerHoldEffect(gActiveBattler, TRUE) != gBattlescriptCurrInstr[3]) + { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 4); + } else + { + gLastUsedItem = gBattleMons[gActiveBattler].item; // For B_LAST_USED_ITEM gBattlescriptCurrInstr += 8; + } return; case VARIOUS_JUMP_IF_NO_ALLY: if (!IsBattlerAlive(BATTLE_PARTNER(gActiveBattler))) From 875bc52d48dcdca1a9974721d0d30eb2be509f0a Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Thu, 9 Sep 2021 10:15:18 -0400 Subject: [PATCH 2/2] fix resist berry item print msg --- src/battle_script_commands.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index e45926f6fa..a75501862d 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2356,6 +2356,7 @@ static void Cmd_resultmessage(void) if (gSpecialStatuses[gBattlerTarget].berryReduced && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { + gLastUsedItem = gBattleMons[gBattlerTarget].item; gSpecialStatuses[gBattlerTarget].berryReduced = 0; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_PrintBerryReduceString;