From d00563d8302490530f87a2696398338b06e9853c Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun, 11 May 2025 11:34:47 +0200 Subject: [PATCH] Changed White Herb hold effect name (#6815) --- data/battle_scripts_1.s | 2 +- include/constants/hold_effects.h | 2 +- src/battle_ai_main.c | 2 +- src/battle_debug.c | 2 +- src/battle_end_turn.c | 2 +- src/battle_script_commands.c | 2 +- src/battle_util.c | 6 +++--- src/data/items.h | 2 +- test/battle/ability/pickup.c | 2 +- test/battle/hold_effect/restore_stats.c | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 9e44459200..00aaf02099 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -780,7 +780,7 @@ BattleScript_EffectFling:: jumpiflastuseditemholdeffect BS_ATTACKER, HOLD_EFFECT_MENTAL_HERB, BattleScript_FlingMentalHerb jumpiflastuseditemholdeffect BS_ATTACKER, HOLD_EFFECT_POISON_POWER, BattleScript_FlingPoisonBarb jumpiflastuseditemholdeffect BS_ATTACKER, HOLD_EFFECT_TOXIC_ORB, BattleScript_FlingToxicOrb - jumpiflastuseditemholdeffect BS_ATTACKER, HOLD_EFFECT_RESTORE_STATS, BattleScript_FlingWhiteHerb + jumpiflastuseditemholdeffect BS_ATTACKER, HOLD_EFFECT_WHITE_HERB, BattleScript_FlingWhiteHerb goto BattleScript_FlingEnd BattleScript_EffectFlingConsumeBerry: savebattleritem BS_TARGET diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index c85ec82302..096d9ad624 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -26,7 +26,7 @@ enum ItemHoldEffect HOLD_EFFECT_CRITICAL_UP, HOLD_EFFECT_RANDOM_STAT_UP, HOLD_EFFECT_EVASION_UP, - HOLD_EFFECT_RESTORE_STATS, + HOLD_EFFECT_WHITE_HERB, HOLD_EFFECT_MACHO_BRACE, HOLD_EFFECT_EXP_SHARE, HOLD_EFFECT_QUICK_CLAW, diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 20820cbcc6..f1f8e4de80 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -4449,7 +4449,7 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move) ADJUST_SCORE(IncreaseStatUpScore(battlerAtk, battlerDef, STAT_CHANGE_DEF)); break; case EFFECT_SHELL_SMASH: - if (aiData->holdEffects[battlerAtk] == HOLD_EFFECT_RESTORE_STATS) + if (aiData->holdEffects[battlerAtk] == HOLD_EFFECT_WHITE_HERB) ADJUST_SCORE(WEAK_EFFECT); ADJUST_SCORE(IncreaseStatUpScore(battlerAtk, battlerDef, STAT_CHANGE_SPEED)); diff --git a/src/battle_debug.c b/src/battle_debug.c index 944a40b12e..c2073754a0 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -2482,7 +2482,7 @@ static const u8 *const sHoldEffectNames[] = [HOLD_EFFECT_CRITICAL_UP] = sText_HoldEffectCriticalUp, [HOLD_EFFECT_RANDOM_STAT_UP] = sText_HoldEffectRandomStatUp, [HOLD_EFFECT_EVASION_UP] = sText_HoldEffectEvasionUp, - [HOLD_EFFECT_RESTORE_STATS] = sText_HoldEffectRestoreStats, + [HOLD_EFFECT_WHITE_HERB] = sText_HoldEffectRestoreStats, [HOLD_EFFECT_MACHO_BRACE] = sText_HoldEffectMachoBrace, [HOLD_EFFECT_EXP_SHARE] = sText_HoldEffectExpShare, [HOLD_EFFECT_QUICK_CLAW] = sText_HoldEffectQuickClaw, diff --git a/src/battle_end_turn.c b/src/battle_end_turn.c index 397bbe134f..089ff0de6e 100644 --- a/src/battle_end_turn.c +++ b/src/battle_end_turn.c @@ -1415,7 +1415,7 @@ static bool32 HandleEndTurnThirdEventBlock(u32 battler) if (ItemBattleEffects(ITEMEFFECT_ORBS, battler, FALSE)) effect = TRUE; break; - case HOLD_EFFECT_RESTORE_STATS: + case HOLD_EFFECT_WHITE_HERB: if (ItemBattleEffects(ITEMEFFECT_NORMAL, battler, FALSE)) effect = TRUE; break; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 067b06afb4..24786aa839 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7157,7 +7157,7 @@ static void Cmd_moveend(void) if (!IsBattlerAlive(i)) continue; - if (GetBattlerHoldEffect(i, TRUE) == HOLD_EFFECT_RESTORE_STATS + if (GetBattlerHoldEffect(i, TRUE) == HOLD_EFFECT_WHITE_HERB && RestoreWhiteHerbStats(i)) { BattleScriptPushCursor(); diff --git a/src/battle_util.c b/src/battle_util.c index 216361e6c6..3150dd9d96 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6649,7 +6649,7 @@ u32 ItemBattleEffects(enum ItemCaseId caseID, u32 battler, bool32 moveTurn) gBattleStruct->moneyMultiplierItem = 1; } break; - case HOLD_EFFECT_RESTORE_STATS: + case HOLD_EFFECT_WHITE_HERB: effect = RestoreWhiteHerbStats(battler); if (effect != 0) BattleScriptExecute(BattleScript_WhiteHerbEnd2); @@ -6868,7 +6868,7 @@ u32 ItemBattleEffects(enum ItemCaseId caseID, u32 battler, bool32 moveTurn) if (!moveTurn) effect = ItemRestorePp(battler, gLastUsedItem, caseID); break; - case HOLD_EFFECT_RESTORE_STATS: + case HOLD_EFFECT_WHITE_HERB: effect = RestoreWhiteHerbStats(battler); if (effect != 0) BattleScriptExecute(BattleScript_WhiteHerbEnd2); @@ -7415,7 +7415,7 @@ u32 ItemBattleEffects(enum ItemCaseId caseID, u32 battler, bool32 moveTurn) case ITEMEFFECT_STATS_CHANGED: switch (battlerHoldEffect) { - case HOLD_EFFECT_RESTORE_STATS: + case HOLD_EFFECT_WHITE_HERB: effect = RestoreWhiteHerbStats(battler); if (effect != 0) { diff --git a/src/data/items.h b/src/data/items.h index 93d7dbdb90..696c5f9954 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -8207,7 +8207,7 @@ const struct Item gItemsInfo[] = { .name = _("White Herb"), .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 100), - .holdEffect = HOLD_EFFECT_RESTORE_STATS, + .holdEffect = HOLD_EFFECT_WHITE_HERB, .description = COMPOUND_STRING( "A hold item that\n" "restores any\n" diff --git a/test/battle/ability/pickup.c b/test/battle/ability/pickup.c index 2ed7765dfa..501e7f37bd 100644 --- a/test/battle/ability/pickup.c +++ b/test/battle/ability/pickup.c @@ -276,7 +276,7 @@ DOUBLE_BATTLE_TEST("Pickup grants a random item used by another Pokémon") { PASSES_RANDOMLY(1, 3, RNG_PICKUP); GIVEN { - ASSUME(gItemsInfo[ITEM_WHITE_HERB].holdEffect == HOLD_EFFECT_RESTORE_STATS); + ASSUME(gItemsInfo[ITEM_WHITE_HERB].holdEffect == HOLD_EFFECT_WHITE_HERB); PLAYER(SPECIES_ZIGZAGOON) { Ability(ABILITY_PICKUP); } PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); } OPPONENT(SPECIES_WOBBUFFET) { MaxHP(100); HP(51); Item(ITEM_SITRUS_BERRY); } diff --git a/test/battle/hold_effect/restore_stats.c b/test/battle/hold_effect/restore_stats.c index f0f7bc5908..7f48a05f13 100644 --- a/test/battle/hold_effect/restore_stats.c +++ b/test/battle/hold_effect/restore_stats.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gItemsInfo[ITEM_WHITE_HERB].holdEffect == HOLD_EFFECT_RESTORE_STATS); + ASSUME(gItemsInfo[ITEM_WHITE_HERB].holdEffect == HOLD_EFFECT_WHITE_HERB); } SINGLE_BATTLE_TEST("White Herb restores stats when they're lowered")