Merge pull request #1 from pret/master

Update fork to match main fork.

1 files changed, 19 insertions, 9 deletions

diff --git a/include/berry.h b/include/berry.h
index 2b2933412..f0acbe0ad 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -1,18 +1,28 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H
 
-void unref_sub_80B4884(void);
-void sub_80B48A8(u8 *src);
-u32 sub_80B48F8(struct EnigmaBerry *enigmaBerry);
-bool32 sub_80B4940(void);
-struct Berry *GetBerryInfo(u8 berry);
+enum
+{
+    BERRY_FIRMNESS_UNKNOWN,
+    BERRY_FIRMNESS_VERY_SOFT,
+    BERRY_FIRMNESS_SOFT,
+    BERRY_FIRMNESS_HARD,
+    BERRY_FIRMNESS_VERY_HARD,
+    BERRY_FIRMNESS_SUPER_HARD,
+};
+
+void ClearEnigmaBerries(void);
+void SetEnigmaBerry(u8 *src);
+u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
+bool32 IsEnigmaBerryValid(void);
+const struct Berry *GetBerryInfo(u8 berry);
 struct BerryTree *GetBerryTreeInfo(u8 id);
 bool32 FieldObjectInteractionWaterBerryTree(void);
-bool32 IsPlayerFacingPlantedBerryTree(void);
-u8 WaterBerryTree(void);
-void sub_80B4A90(void);
+bool8 IsPlayerFacingPlantedBerryTree(void);
+bool8 TryToWaterBerryTree(void);
+void ClearBerryTrees(void);
 bool32 BerryTreeGrow(struct BerryTree *tree);
-void BerryTreeTimeUpdate(int time);
+void BerryTreeTimeUpdate(s32 minutes);
 void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle);
 void RemoveBerryTree(u8 id);
 u8 GetBerryTypeByBerryTreeId(u8 id);