Add caretaking bonuses to berry data

Fervstheone · Dec 7, 2023 · 2b71187 · 2b71187
1 parent d795987
commit 2b71187
Show file tree

Hide file tree

Showing 2 changed files with 240 additions and 6 deletions.
diff --git a/include/global.berry.h b/include/global.berry.h
@@ -4,14 +4,21 @@
 #define BERRY_NAME_LENGTH 6
 #define BERRY_ITEM_EFFECT_COUNT 18
 
+// water up to 15 (4 bits)
+// weeds up to 7 * 0.5 (3 bits), 0 => 0.1
+// pests up to 7 * 0.5 (3 bits), 0 => 0.2
+
 struct Berry
 {
     const u8 name[BERRY_NAME_LENGTH + 1];
     u8 firmness:4;
     u8 color:4;
-    u16 size;
+    u16 size:10;
+    u16 weedsBonus:3;
+    u16 pestsBonus:3;
     u8 maxYield;
-    u8 minYield;
+    u8 minYield:4;
+    u8 waterBonus:4;
     const u8 *description1;
     const u8 *description2;
     u8 growthDuration;
@@ -31,9 +38,12 @@ struct Berry2
     u8 name[BERRY_NAME_LENGTH + 1];
     u8 firmness:4;
     u8 color:4;
-    u16 size;
+    u16 size:10;
+    u16 weedsBonus:3;
+    u16 pestsBonus:3;
     u8 maxYield;
-    u8 minYield;
+    u8 minYield:4;
+    u8 waterBonus:4;
     u8 *description1;
     u8 *description2;
     u8 growthDuration;