diff --git a/include/config/overworld.h b/include/config/overworld.h index a9c00b748e..dab8f6b153 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -13,6 +13,10 @@ #define OW_PC_JAPAN_WALDA_ICONS TRUE // In the US release of Emerald, the Cross, Bolt, and Plusle icons for Walda's wallpapers were left blank from the Japan release. Setting this to TRUE will restore them. // Berry settings +// These generational defines only make a distinction for Berries! +#define GEN_6_XY GEN_6 +#define GEN_6_ORAS (GEN_6 + 0.5) + #define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. #define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! #define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. @@ -21,6 +25,8 @@ #define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If moisture is enabled, this setting uses the Gen4 drain rates for different berries. #define OW_BERRY_SIX_STAGES FALSE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. +#define OW_BERRY_GROWTH_RATE GEN_3 // Presets for how long each Berry plant takes to grow. + // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. #define OW_COMPOUND_EYES GEN_LATEST // Prior to Gen9, if a Pokémon with Compound Eyes is leading the party, the wild held item rate is increased to 60%/20%. diff --git a/src/berry.c b/src/berry.c index 74a272673f..a9522fb9b0 100644 --- a/src/berry.c +++ b/src/berry.c @@ -166,6 +166,12 @@ static const u8 sBerryDescriptionPart2_Kee[] = _("first, then extremely bitter." static const u8 sBerryDescriptionPart1_Maranga[] = _("Its outside is very bitter, but its"); static const u8 sBerryDescriptionPart2_Maranga[] = _("inside tastes like a sweet drink."); +#if OW_BERRY_GROWTH_RATE < GEN_3 || OW_BERRY_GROWTH_RATE > GEN_7 +#error "OW_BERRY_GROWTH_RATE must be between GEN_3 and GEN_7!" +#endif + +#define GROWTH_DURATION(g3, g4, g5, xy, oras, g7) OW_BERRY_GROWTH_RATE == GEN_3 ? g3 : OW_BERRY_GROWTH_RATE == GEN_4 ? g4 : OW_BERRY_GROWTH_RATE == GEN_5 ? g5 : OW_BERRY_GROWTH_RATE == GEN_6_XY ? xy : OW_BERRY_GROWTH_RATE == GEN_6_ORAS ? oras : g7 + const struct Berry gBerries[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = @@ -178,7 +184,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Cheri, .description2 = sBerryDescriptionPart2_Cheri, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -198,7 +204,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chesto, .description2 = sBerryDescriptionPart2_Chesto, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 10, .sweet = 0, @@ -218,7 +224,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Pecha, .description2 = sBerryDescriptionPart2_Pecha, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 10, @@ -238,7 +244,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rawst, .description2 = sBerryDescriptionPart2_Rawst, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -258,7 +264,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Aspear, .description2 = sBerryDescriptionPart2_Aspear, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -278,7 +284,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Leppa, .description2 = sBerryDescriptionPart2_Leppa, - .growthDuration = 16, + .growthDuration = GROWTH_DURATION(16, 16, 24, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 10, @@ -298,7 +304,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Oran, .description2 = sBerryDescriptionPart2_Oran, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), .spicy = 10, .dry = 10, .sweet = 10, @@ -318,7 +324,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Persim, .description2 = sBerryDescriptionPart2_Persim, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), .spicy = 10, .dry = 10, .sweet = 10, @@ -338,7 +344,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Lum, .description2 = sBerryDescriptionPart2_Lum, - .growthDuration = 48, + .growthDuration = GROWTH_DURATION(48, 48, 72, 48, 32, 48), .spicy = 10, .dry = 10, .sweet = 10, @@ -358,7 +364,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Sitrus, .description2 = sBerryDescriptionPart2_Sitrus, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), .spicy = 10, .dry = 10, .sweet = 10, @@ -378,7 +384,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Figy, .description2 = sBerryDescriptionPart2_Figy, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -398,7 +404,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Wiki, .description2 = sBerryDescriptionPart2_Wiki, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 10, .sweet = 0, @@ -418,7 +424,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Mago, .description2 = sBerryDescriptionPart2_Mago, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 10, @@ -438,7 +444,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Aguav, .description2 = sBerryDescriptionPart2_Aguav, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -458,7 +464,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Iapapa, .description2 = sBerryDescriptionPart2_Iapapa, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -478,7 +484,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Razz, .description2 = sBerryDescriptionPart2_Razz, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 10, .dry = 10, .sweet = 0, @@ -498,7 +504,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Bluk, .description2 = sBerryDescriptionPart2_Bluk, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 10, .sweet = 10, @@ -518,7 +524,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Nanab, .description2 = sBerryDescriptionPart2_Nanab, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 10, @@ -538,7 +544,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Wepear, .description2 = sBerryDescriptionPart2_Wepear, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -558,7 +564,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Pinap, .description2 = sBerryDescriptionPart2_Pinap, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -578,7 +584,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Pomeg, .description2 = sBerryDescriptionPart2_Pomeg, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 0, .sweet = 10, @@ -598,7 +604,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kelpsy, .description2 = sBerryDescriptionPart2_Kelpsy, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 0, @@ -618,7 +624,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Qualot, .description2 = sBerryDescriptionPart2_Qualot, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 0, .sweet = 10, @@ -638,7 +644,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Hondew, .description2 = sBerryDescriptionPart2_Hondew, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 10, .sweet = 0, @@ -658,7 +664,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Grepa, .description2 = sBerryDescriptionPart2_Grepa, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 10, @@ -678,7 +684,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Tamato, .description2 = sBerryDescriptionPart2_Tamato, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), .spicy = 20, .dry = 10, .sweet = 0, @@ -698,7 +704,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Cornn, .description2 = sBerryDescriptionPart2_Cornn, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 20, .sweet = 10, @@ -718,7 +724,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Magost, .description2 = sBerryDescriptionPart2_Magost, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 20, @@ -738,7 +744,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rabuta, .description2 = sBerryDescriptionPart2_Rabuta, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -758,7 +764,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Nomel, .description2 = sBerryDescriptionPart2_Nomel, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -778,7 +784,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Spelon, .description2 = sBerryDescriptionPart2_Spelon, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 40, .dry = 10, .sweet = 0, @@ -798,7 +804,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Pamtre, .description2 = sBerryDescriptionPart2_Pamtre, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 40, .sweet = 10, @@ -818,7 +824,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Watmel, .description2 = sBerryDescriptionPart2_Watmel, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 40, @@ -838,7 +844,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Durin, .description2 = sBerryDescriptionPart2_Durin, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -858,7 +864,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Belue, .description2 = sBerryDescriptionPart2_Belue, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -878,7 +884,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chilan, .description2 = sBerryDescriptionPart2_Chilan, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 25, .sweet = 10, @@ -898,7 +904,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Occa, .description2 = sBerryDescriptionPart2_Occa, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 15, .dry = 0, .sweet = 10, @@ -918,7 +924,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Passho, .description2 = sBerryDescriptionPart2_Passho, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 15, .sweet = 0, @@ -938,7 +944,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Wacan, .description2 = sBerryDescriptionPart2_Wacan, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 15, @@ -958,7 +964,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rindo, .description2 = sBerryDescriptionPart2_Rindo, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 0, .sweet = 0, @@ -978,7 +984,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Yache, .description2 = sBerryDescriptionPart2_Yache, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 0, @@ -998,7 +1004,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chople, .description2 = sBerryDescriptionPart2_Chople, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 15, .dry = 0, .sweet = 0, @@ -1018,7 +1024,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kebia, .description2 = sBerryDescriptionPart2_Kebia, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 15, .sweet = 0, @@ -1038,7 +1044,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Shuca, .description2 = sBerryDescriptionPart2_Shuca, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 0, .sweet = 15, @@ -1058,7 +1064,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Coba, .description2 = sBerryDescriptionPart2_Coba, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 0, @@ -1078,7 +1084,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Payapa, .description2 = sBerryDescriptionPart2_Payapa, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 10, @@ -1098,7 +1104,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Tanga, .description2 = sBerryDescriptionPart2_Tanga, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 20, .dry = 0, .sweet = 0, @@ -1118,7 +1124,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Charti, .description2 = sBerryDescriptionPart2_Charti, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 20, .sweet = 0, @@ -1138,7 +1144,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kasib, .description2 = sBerryDescriptionPart2_Kasib, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 20, @@ -1158,7 +1164,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Haban, .description2 = sBerryDescriptionPart2_Haban, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 10, @@ -1178,7 +1184,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Colbur, .description2 = sBerryDescriptionPart2_Colbur, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 0, @@ -1198,7 +1204,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Babiri, .description2 = sBerryDescriptionPart2_Babiri, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 25, .dry = 10, .sweet = 0, @@ -1218,7 +1224,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Roseli, .description2 = sBerryDescriptionPart2_Roseli, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 25, @@ -1238,7 +1244,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Liechi, .description2 = sBerryDescriptionPart2_Liechi, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 40, .dry = 0, .sweet = 40, @@ -1258,7 +1264,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Ganlon, .description2 = sBerryDescriptionPart2_Ganlon, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 40, .sweet = 0, @@ -1278,7 +1284,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Salac, .description2 = sBerryDescriptionPart2_Salac, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 0, .sweet = 40, @@ -1298,7 +1304,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Petaya, .description2 = sBerryDescriptionPart2_Petaya, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 40, .dry = 0, .sweet = 0, @@ -1318,7 +1324,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Apicot, .description2 = sBerryDescriptionPart2_Apicot, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 40, .sweet = 0, @@ -1338,7 +1344,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Lansat, .description2 = sBerryDescriptionPart2_Lansat, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 120, 48, 72), .spicy = 10, .dry = 10, .sweet = 10, @@ -1358,7 +1364,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Starf, .description2 = sBerryDescriptionPart2_Starf, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 120, 48, 72), .spicy = 10, .dry = 10, .sweet = 10, @@ -1378,7 +1384,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Enigma, .description2 = sBerryDescriptionPart2_Enigma, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 40, .dry = 10, .sweet = 0, @@ -1398,7 +1404,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Micle, .description2 = sBerryDescriptionPart2_Micle, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 40, .sweet = 10, @@ -1418,7 +1424,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Custap, .description2 = sBerryDescriptionPart2_Custap, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 0, .sweet = 40, @@ -1438,7 +1444,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Jaboca, .description2 = sBerryDescriptionPart2_Jaboca, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 0, .sweet = 0, @@ -1458,7 +1464,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rowap, .description2 = sBerryDescriptionPart2_Rowap, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 10, .dry = 0, .sweet = 0, @@ -1478,7 +1484,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kee, .description2 = sBerryDescriptionPart2_Kee, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 30, .dry = 30, .sweet = 10, @@ -1498,7 +1504,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Maranga, .description2 = sBerryDescriptionPart2_Maranga, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 10, .dry = 10, .sweet = 30, @@ -1518,7 +1524,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Enigma, .description2 = sBerryDescriptionPart2_Enigma, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 40, .dry = 40, .sweet = 40, @@ -1805,7 +1811,7 @@ void BerryTreeTimeUpdate(s32 minutes) if (!BerryTreeGrow(tree)) break; if (tree->stage == BERRY_STAGE_BERRIES) - tree->minutesUntilNextStage *= ((tree->mulch == ITEM_TO_MULCH(ITEM_STABLE_MULCH)) ? 6 : 4); + tree->minutesUntilNextStage = GetStageDurationByBerryType(tree->berry) * ((tree->mulch == ITEM_TO_MULCH(ITEM_STABLE_MULCH)) ? 6 : 4); } } }