Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps

1 files changed, 5 insertions, 5 deletions

diff --git a/include/berry.h b/include/berry.h
index afd1bc499..22b9158ee 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -24,15 +24,15 @@ void ObjectEventInteractionPlantBerryTree(void);
 void ObjectEventInteractionPickBerryTree(void);
 void ObjectEventInteractionRemoveBerryTree(void);
 bool8 PlayerHasBerries(void);
-void ResetBerryTreeSparkleFlags(void);
+void SetBerryTreesSeen(void);
 
 extern const struct Berry gBerries[];
 
-struct UnkStruct_0858AB24 {
-    u8 unk0;
-    u16 unk1;
+struct BerryCrushBerryData {
+    u8 difficulty; // The number of A presses required to crush it
+    u16 powder;
 };
 
-extern const struct UnkStruct_0858AB24 gUnknown_0858AB24[];
+extern const struct BerryCrushBerryData gBerryCrush_BerryData[];
 
 #endif // GUARD_BERRY_H