From aac3f9c3db7e53d77c5fab1d4fab9c6430aecdd0 Mon Sep 17 00:00:00 2001
From: Evan <eroelke@gmail.com>
Date: Wed, 6 Jan 2021 13:07:18 -0700
Subject: [PATCH] kee, maranga, sitrus beries

---
 include/constants/hold_effects.h |  9 +++--
 src/battle_util.c                | 56 ++++++++++++++++++++++++++++++--
 src/data/items.h                 |  4 +--
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h
index 52a3ffda4b..0b3236db9f 100644
--- a/include/constants/hold_effects.h
+++ b/include/constants/hold_effects.h
@@ -105,9 +105,12 @@
 #define HOLD_EFFECT_POWER_ITEM     99
 #define HOLD_EFFECT_RESTORE_PCT_HP 100
 #define HOLD_EFFECT_MICLE_BERRY    101
-#define HOLD_EFFECT_JABOCA_BERRY   102
-#define HOLD_EFFECT_CUSTAP_BERRY   103
-#define HOLD_EFFECT_RETALIATE_BERRY 104  // rowap, jaboca
+#define HOLD_EFFECT_CUSTAP_BERRY   102
+#define HOLD_EFFECT_JABOCA_BERRY   103
+#define HOLD_EFFECT_ROWAP_BERRY    104
+#define HOLD_EFFECT_KEE_BERRY      105
+#define HOLD_EFFECT_MARANGA_BERRY  106
+
 
 // Gen5 hold effects
 #define HOLD_EFFECT_FLOAT_STONE    115
diff --git a/src/battle_util.c b/src/battle_util.c
index 6981b811ab..b452c10b4b 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -5138,6 +5138,33 @@ static u8 TrySetMicleBerry(u32 battlerId, u32 itemId, bool32 end2)
     return 0;
 }
 
+static u8 DamagedStatBoostBerryEffect(u8 battlerId, u8 statId, u8 split)
+{
+    if (IsBattlerAlive(battlerId)
+      && TARGET_TURN_DAMAGED
+      && gBattleMons[battlerId].statStages[statId] < MAX_STAT_STAGE
+      && !DoesSubstituteBlockMove(gBattlerAttacker, battlerId, gCurrentMove)
+      && GetBattleMoveSplit(gCurrentMove) == split)
+    {
+        
+        PREPARE_STAT_BUFFER(gBattleTextBuff1, statId);
+        PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE);
+
+        gEffectBattler = battlerId;
+        if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
+            SET_STATCHANGER(statId, 2, FALSE);
+        else
+            SET_STATCHANGER(statId, 1, FALSE);
+        
+        gBattleScripting.animArg1 = 0xE + statId;
+        gBattleScripting.animArg2 = 0;
+        BattleScriptPushCursor();
+        gBattlescriptCurrInstr = BattleScript_BerryStatRaiseRet;
+        return ITEM_STATS_CHANGE;
+    }
+    return 0;
+}
+
 static u8 ItemHealHp(u32 battlerId, u32 itemId, bool32 end2, bool32 percentHeal)
 {
     if (HasEnoughHpToEatBerry(battlerId, 2, itemId))
@@ -5991,11 +6018,11 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                     gBattleScripting.statChanger = SET_STATCHANGER(STAT_SPATK, 1, FALSE);
                 }
                 break;
-            case HOLD_EFFECT_RETALIATE_BERRY:
+            case HOLD_EFFECT_JABOCA_BERRY:  // consume and damage attacker if used physical move
                 if (IsBattlerAlive(battlerId)
                   && TARGET_TURN_DAMAGED
                   && !DoesSubstituteBlockMove(gBattlerAttacker, battlerId, gCurrentMove)
-                  && GetBattleMoveSplit(gCurrentMove) == ItemId_GetHoldEffectParam(gLastUsedItem))
+                  && IS_MOVE_PHYSICAL(gCurrentMove))
                 {
                     gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 8;
                     if (gBattleMoveDamage == 0)
@@ -6010,6 +6037,31 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                     RecordItemEffectBattle(battlerId, HOLD_EFFECT_ROCKY_HELMET);
                 }
                 break;
+            case HOLD_EFFECT_ROWAP_BERRY:  // consume and damage attacker if used special move
+                if (IsBattlerAlive(battlerId)
+                  && TARGET_TURN_DAMAGED
+                  && !DoesSubstituteBlockMove(gBattlerAttacker, battlerId, gCurrentMove)
+                  && IS_MOVE_SPECIAL(gCurrentMove))
+                {
+                    gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 8;
+                    if (gBattleMoveDamage == 0)
+                        gBattleMoveDamage = 1;
+                    if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
+                        gBattleMoveDamage *= 2;
+                    
+                    effect = ITEM_HP_CHANGE;
+                    BattleScriptPushCursor();
+                    gBattlescriptCurrInstr = BattleScript_JabocaRowapBerryActivates;
+                    PREPARE_ITEM_BUFFER(gBattleTextBuff1, gLastUsedItem);
+                    RecordItemEffectBattle(battlerId, HOLD_EFFECT_ROCKY_HELMET);
+                }
+                break;
+            case HOLD_EFFECT_KEE_BERRY:  // consume and boost defense if used physical move
+                effect = DamagedStatBoostBerryEffect(battlerId, STAT_DEF, SPLIT_PHYSICAL);
+                break;
+            case HOLD_EFFECT_MARANGA_BERRY:  // consume and boost sp. defense if used special move
+                effect = DamagedStatBoostBerryEffect(battlerId, STAT_SPDEF, SPLIT_SPECIAL);
+                break;
             }
         }
         break;
diff --git a/src/data/items.h b/src/data/items.h
index 30beb53528..0f2e8461c6 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -1867,8 +1867,8 @@ const struct Item gItems[] =
         .name = _("SITRUS BERRY"),
         .itemId = ITEM_SITRUS_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_RESTORE_HP,
-        .holdEffectParam = 30,
+        .holdEffect = HOLD_EFFECT_RESTORE_PCT_HP,
+        .holdEffectParam = 25,
         .description = sSitrusBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,