From b2218c7d2ba5a2a2b9ff1258dfb454479241c3b6 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Wed, 10 May 2017 00:54:02 -0500
Subject: tired. finish later

---
 include/global.berry.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/global.berry.h b/include/global.berry.h
index b7938868d..3f835f075 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
-- 
cgit v1.2.3


From c202c65442594b6a2a272043948c0e39d697db67 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 16 May 2017 21:09:06 -0500
Subject: more decompilation

---
 include/battle.h | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/battle.h b/include/battle.h
index f05c7369d..be474b59f 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -124,17 +124,22 @@ struct BattleStruct /* 0x2000000 */
 
 struct UnknownStruct4
 {
-    u8 filler0[0x3];
-    u16 unk4;
-    u16 unk6;
-    u8 unk8;
-    u8 unk9;
-    u8 fillerA[0x9];
-    u8 taunt:4;
-    u8 unkC:4;
-    u8 fillerD[0x2];
-    u8 unk16;
-    u8 filler17[0x4];
+    /*0x00*/ u8 filler0[0x3];
+    /*0x04*/ u16 unk4;
+    /*0x06*/ u16 unk6;
+    /*0x08*/ u8 unk8;
+    /*0x09*/ u8 unk9;
+    /*0x0A*/ u8 unkA;
+             u8 fillerB[4];
+             u8 unkF_0:4;
+             u8 unkF_4:4;
+             u8 filler10[3];
+    /*0x13*/ u8 taunt:4;
+    /*0x13*/ u8 unkC:4;
+    /*0x14*/ u8 unk14;
+    /*0x15*/ u8 unk15;
+    /*0x16*/ u8 unk16;
+    /*0x17*/ u8 filler17[0x4];
 };
 
 extern struct UnknownStruct1 unk_2016A00;
-- 
cgit v1.2.3