1 files changed, 33 insertions, 52 deletions
diff --git a/include/berry.h b/include/berry.h
index a80e77512..152f92e38 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -1,57 +1,38 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H
 
-struct Berry
-{
-    u8 name[7];
-    u8 firmness;
-    u16 size;
-    u8 maxYield;
-    u8 minYield;
-    u8 *description1;
-    u8 *description2;
-    u8 stageDuration;
-    u8 spicy;
-    u8 dry;
-    u8 sweet;
-    u8 bitter;
-    u8 sour;
-    u8 smoothness;
-};
-
-struct EnigmaBerry
-{
-    struct Berry berry;
-    u8 pic[(6 * 6) * TILE_SIZE_4BPP];
-    u16 palette[16];
-    u8 description1[45];
-    u8 description2[45];
-    u8 itemEffect[18];
-    u8 holdEffect;
-    u8 holdEffectParam;
-    u32 checksum;
-};
-
-struct BattleEnigmaBerry
-{
-    u8 name[7];
-    u8 holdEffect;
-    u8 itemEffect[18];
-    u8 holdEffectParam;
-};
-
-struct BerryTree
-{
-    u8 berry;
-    u8 stage:7;
-    u8 growthSparkle:1;
-    u16 secondsUntilNextStage;
-    u8 berryYield;
-    u8 regrowthCount:4;
-    u8 watered1:1;
-    u8 watered2:1;
-    u8 watered3:1;
-    u8 watered4:1;
-};
+void ClearEnigmaBerries(void);
+void SetEnigmaBerry(u8 *src);
+u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
+bool32 IsEnigmaBerryValid(void);
+struct Berry *GetBerryInfo(u8 berry);
+struct BerryTree *GetBerryTreeInfo(u8 id);
+bool32 FieldObjectInteractionWaterBerryTree(void);
+bool32 IsPlayerFacingPlantedBerryTree(void);
+u8 TryToWaterBerryTree(void);
+void ClearBerryTrees(void);
+bool32 BerryTreeGrow(struct BerryTree *tree);
+void BerryTreeTimeUpdate(int time);
+void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle);
+void RemoveBerryTree(u8 id);
+u8 GetBerryTypeByBerryTreeId(u8 id);
+u8 GetStageByBerryTreeId(u8);
+u8 ItemIdToBerryType(u16 item);
+u16 BerryTypeToItemId(u16 berry);
+void GetBerryNameByBerryType(u8 berry, u8 *string);
+void ResetBerryTreeSparkleFlag(u8 id);
+u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree);
+u8 GetNumStagesWateredByBerryTreeId(u8 id);
+u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water);
+u8 CalcBerryYield(struct BerryTree *tree);
+u8 GetBerryCountByBerryTreeId(u8 id);
+u16 GetStageDurationByBerryType(u8);
+void FieldObjectInteractionGetBerryTreeData(void);
+void sub_80B4EE4(void);
+void FieldObjectInteractionPlantBerryTree(void);
+void FieldObjectInteractionPickBerryTree(void);
+void FieldObjectInteractionRemoveBerryTree(void);
+u8 PlayerHasBerries(void);
+void ResetBerryTreeSparkleFlags(void);
 
 #endif // GUARD_BERRY_H