decomp calc dmg and clean up battle ai

2017-09-04 21:43:13 +02:00
parent 92892d140a
commit 2702b0ec9b
19 changed files with 1749 additions and 1249 deletions
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -19,9 +19,29 @@ struct Berry
    u8 smoothness;
 };

+// with no const fields
+
+struct Berry2
+{
+    u8 name[7];
+    u8 firmness;
+    u16 size;
+    u8 maxYield;
+    u8 minYield;
+    u8 *description1;
+    u8 *description2;
+    u8 stageDuration;
+    u8 spicy;
+    u8 dry;
+    u8 sweet;
+    u8 bitter;
+    u8 sour;
+    u8 smoothness;
+};
+
 struct EnigmaBerry
 {
-    struct Berry berry;
+    struct Berry2 berry;
    u8 pic[(6 * 6) * TILE_SIZE_4BPP];
    u16 palette[16];
    u8 description1[45];