5 files changed, 9 insertions, 8 deletions
diff --git a/include/battle.h b/include/battle.h
index 8f7141803..f05c7369d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -7,7 +7,7 @@
 #define BATTLE_TYPE_TRAINER         0x0008
 #define BATTLE_TYPE_FIRST_BATTLE    0x0010
 #define BATTLE_TYPE_20              0x0020
-#define BATTLE_TYPE_40              0x0040
+#define BATTLE_TYPE_MULTI           0x0040
 #define BATTLE_TYPE_SAFARI          0x0080
 #define BATTLE_TYPE_BATTLE_TOWER    0x0100
 #define BATTLE_TYPE_WALLY_TUTORIAL  0x0200
diff --git a/include/berry.h b/include/berry.h
index 0013b4dba..f0acbe0ad 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -22,7 +22,7 @@ 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);
diff --git a/include/dewford_trend.h b/include/dewford_trend.h
index af1b61363..a37de3389 100644
--- a/include/dewford_trend.h
+++ b/include/dewford_trend.h
@@ -4,7 +4,7 @@
 #define ARRAY_2007800 ((struct EasyChatPair *)(unk_2000000 + 0x7800))
 #define ARRAY_2007900 ((struct EasyChatPair *)(unk_2000000 + 0x7900))
 
-void InitDewfordTrends(void);
+void InitDewfordTrend(void);
 void sub_80FA4E4(void *, u32, u8);
 
 #endif
diff --git a/include/flags.h b/include/flags.h
index 0c0cebc5f..56325dea6 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -51,6 +51,7 @@
 #define SYS_BRAILLE_WAIT     0x851
 #define SYS_BRAILLE_FLY      0x852
 
+#define SYS_SHOAL_ITEM       0x85F
 #define SYS_B_DASH           0x860 // got Running Shoes
 #define SYS_CTRL_OBJ_DELETE  0x861
 #define SYS_RESET_RTC_ENABLE 0x862
diff --git a/include/global.berry.h b/include/global.berry.h
index b7938868d..6632e55e2 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -34,10 +34,10 @@ struct EnigmaBerry
 
 struct BattleEnigmaBerry
 {
-    u8 name[7];
-    u8 holdEffect;
-    u8 itemEffect[18];
-    u8 holdEffectParam;
+    /*0x00*/ u8 name[7];
+    /*0x07*/ u8 holdEffect;
+    /*0x08*/ u8 itemEffect[18];
+    /*0x1A*/ u8 holdEffectParam;
 };
 
 struct BerryTree
@@ -45,7 +45,7 @@ struct BerryTree
     u8 berry;
     u8 stage:7;
     u8 growthSparkle:1;
-    u16 secondsUntilNextStage;
+    u16 minutesUntilNextStage;
     u8 berryYield;
     u8 regrowthCount:4;
     u8 watered1:1;