Merge pull request #174 from garakmon/object_event

Dissassemble Event Object Data

1 files changed, 6 insertions, 6 deletions

diff --git a/include/berry.h b/include/berry.h
index d55192301..5bf272d42 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -25,7 +25,7 @@ enum
 
 #define NUM_BERRIES 44
 
-extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES];
+extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[NUM_BERRIES];
 extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[NUM_BERRIES];
 extern const u8 *const gBerryTreePaletteSlotTablePointers[NUM_BERRIES];
 
@@ -35,7 +35,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
 bool32 IsEnigmaBerryValid(void);
 const struct Berry *GetBerryInfo(u8 berry);
 struct BerryTree *GetBerryTreeInfo(u8 id);
-bool32 FieldObjectInteractionWaterBerryTree(void);
+bool32 ObjectEventInteractionWaterBerryTree(void);
 bool8 IsPlayerFacingPlantedBerryTree(void);
 bool8 TryToWaterBerryTree(void);
 void ClearBerryTrees(void);
@@ -56,10 +56,10 @@ u8 CalcBerryYield(struct BerryTree *tree);
 u8 GetBerryCountByBerryTreeId(u8 id);
 u16 GetStageDurationByBerryType(u8);
 void Bag_ChooseBerry(void);
-void FieldObjectInteractionGetBerryTreeData(void);
-void FieldObjectInteractionPlantBerryTree(void);
-void FieldObjectInteractionPickBerryTree(void);
-void FieldObjectInteractionRemoveBerryTree(void);
+void ObjectEventInteractionGetBerryTreeData(void);
+void ObjectEventInteractionPlantBerryTree(void);
+void ObjectEventInteractionPickBerryTree(void);
+void ObjectEventInteractionRemoveBerryTree(void);
 u8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
 void sub_809C794(void);