Merge pull request #193 from BuffelSaft/ev-berries

EV berries
BuffelSaft · Sep 3, 2021 · 8016b2c · 8016b2c
2 parents 8aa18f2 + 405341c
commit 8016b2c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
@@ -94,6 +94,24 @@ Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442
 	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
+	giveitem ITEM_POMEG_BERRY
+	compare VAR_RESULT, 0
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	giveitem ITEM_KELPSY_BERRY
+	compare VAR_RESULT, 0
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	giveitem ITEM_QUALOT_BERRY
+	compare VAR_RESULT, 0
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	giveitem ITEM_HONDEW_BERRY
+	compare VAR_RESULT, 0
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	giveitem ITEM_GREPA_BERRY
+	compare VAR_RESULT, 0
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	giveitem ITEM_TAMATO_BERRY
+	compare VAR_RESULT, 0
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY
 	msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT
 	release

diff --git a/src/berry.c b/src/berry.c
@@ -530,8 +530,8 @@ const struct Berry gBerries[] =
         .name = _("Pomeg"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
         .size = 135,
-        .maxYield = 18,
-        .minYield = 8,
+        .maxYield = 48,
+        .minYield = 24,
         .description1 = sBerryDescriptionPart1_Pomeg,
         .description2 = sBerryDescriptionPart2_Pomeg,
         .stageDuration = 1,
@@ -548,8 +548,8 @@ const struct Berry gBerries[] =
         .name = _("Kelpsy"),
         .firmness = BERRY_FIRMNESS_HARD,
         .size = 150,
-        .maxYield = 18,
-        .minYield = 8,
+        .maxYield = 48,
+        .minYield = 24,
         .description1 = sBerryDescriptionPart1_Kelpsy,
         .description2 = sBerryDescriptionPart2_Kelpsy,
         .stageDuration = 1,
@@ -566,8 +566,8 @@ const struct Berry gBerries[] =
         .name = _("Qualot"),
         .firmness = BERRY_FIRMNESS_HARD,
         .size = 110,
-        .maxYield = 18,
-        .minYield = 8,
+        .maxYield = 48,
+        .minYield = 24,
         .description1 = sBerryDescriptionPart1_Qualot,
         .description2 = sBerryDescriptionPart2_Qualot,
         .stageDuration = 1,
@@ -584,8 +584,8 @@ const struct Berry gBerries[] =
         .name = _("Hondew"),
         .firmness = BERRY_FIRMNESS_HARD,
         .size = 162,
-        .maxYield = 18,
-        .minYield = 8,
+        .maxYield = 48,
+        .minYield = 24,
         .description1 = sBerryDescriptionPart1_Hondew,
         .description2 = sBerryDescriptionPart2_Hondew,
         .stageDuration = 1,
@@ -602,8 +602,8 @@ const struct Berry gBerries[] =
         .name = _("Grepa"),
         .firmness = BERRY_FIRMNESS_SOFT,
         .size = 149,
-        .maxYield = 18,
-        .minYield = 8,
+        .maxYield = 48,
+        .minYield = 24,
         .description1 = sBerryDescriptionPart1_Grepa,
         .description2 = sBerryDescriptionPart2_Grepa,
         .stageDuration = 1,
@@ -620,8 +620,8 @@ const struct Berry gBerries[] =
         .name = _("Tamato"),
         .firmness = BERRY_FIRMNESS_SOFT,
         .size = 200,
-        .maxYield = 18,
-        .minYield = 8,
+        .maxYield = 48,
+        .minYield = 24,
         .description1 = sBerryDescriptionPart1_Tamato,
         .description2 = sBerryDescriptionPart2_Tamato,
         .stageDuration = 1,