Merge branch 'master' into modern_gcc

1 files changed, 5 insertions, 5 deletions

diff --git a/include/berry.h b/include/berry.h
index 259ada634..9a7773779 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -39,7 +39,7 @@ void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam);
 void SetEnigmaBerry(u8 *src);
 bool32 IsEnigmaBerryValid(void);
 const struct Berry *GetBerryInfo(u8 berry);
-bool32 EventObjectInteractionWaterBerryTree(void);
+bool32 ObjectEventInteractionWaterBerryTree(void);
 bool8 IsPlayerFacingUnplantedSoil(void);
 bool8 TryToWaterBerryTree(void);
 void ClearBerryTrees(void);
@@ -51,11 +51,11 @@ u8 GetStageByBerryTreeId(u8);
 u8 ItemIdToBerryType(u16 item);
 void GetBerryNameByBerryType(u8 berry, u8 *string);
 void ResetBerryTreeSparkleFlag(u8 id);
-void EventObjectInteractionGetBerryTreeData(void);
+void ObjectEventInteractionGetBerryTreeData(void);
 void Berry_FadeAndGoToBerryBagMenu(void);
-void EventObjectInteractionPlantBerryTree(void);
-void EventObjectInteractionPickBerryTree(void);
-void EventObjectInteractionRemoveBerryTree(void);
+void ObjectEventInteractionPlantBerryTree(void);
+void ObjectEventInteractionPickBerryTree(void);
+void ObjectEventInteractionRemoveBerryTree(void);
 bool8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
 void debug_sub_80C2D24(u8 spicy, u8 dry, u8 sweet, u8 bitter, u8 sour, u8 smoothness);