From e32a1571afc4a9c855c35b6ba17e84603d1b82e8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 12 Mar 2021 15:37:31 -0500
Subject: Resolve link comm buffers in gBattleStruct

---
 include/battle.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'include/battle.h')

diff --git a/include/battle.h b/include/battle.h
index c0baaf313..fa6c3aa96 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -344,6 +344,15 @@ struct BattleTvMovePoints
     s16 points[2][PARTY_SIZE * 4];
 };
 
+struct MultiPartnerEnigmaBerry
+{
+    u8 field_0;
+    u8 field_1;
+    u8 vsScreenHealthFlagsLo;
+    u8 vsScreenHealthFlagsHi;
+    struct BattleEnigmaBerry battleEnigmaBerry;
+};
+
 struct BattleStruct
 {
     u8 turnEffectsTracker;
@@ -419,11 +428,10 @@ struct BattleStruct
     u8 givenExpMons; // Bits for enemy party's pokemon that gave exp to player's party.
     u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte]
     u16 castformPalette[MAX_BATTLERS_COUNT][16];
-    u8 field_180; // weird field, used in battle_main.c, once accessed as an array of u32 overwriting the field below
-    u8 field_181;
-    u8 vsScreenHealthFlagsLo;
-    u8 vsScreenHealthFlagsHi; // Last bit is 'has frontier pass'
-    struct BattleEnigmaBerry battleEnigmaBerry;
+    union {
+        struct MultiPartnerEnigmaBerry multiPartnerEnigmaBerry;
+        u32 battleVideo[2];
+    } multiBuffer;
     u8 wishPerishSongState;
     u8 wishPerishSongBattlerId;
     bool8 overworldWeatherDone;
-- 
cgit v1.2.3


From 8d4dcb228afaf8dfc8198b1955d42d1794ac3d81 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 12 Mar 2021 16:55:58 -0500
Subject: More documentation in battle_main

---
 include/battle.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/battle.h')

diff --git a/include/battle.h b/include/battle.h
index fa6c3aa96..34910781b 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -346,8 +346,8 @@ struct BattleTvMovePoints
 
 struct MultiPartnerEnigmaBerry
 {
-    u8 field_0;
-    u8 field_1;
+    u8 versionSignatureLo;
+    u8 versionSignatureHi;
     u8 vsScreenHealthFlagsLo;
     u8 vsScreenHealthFlagsHi;
     struct BattleEnigmaBerry battleEnigmaBerry;
-- 
cgit v1.2.3


From 925e68c03ffe27b6f3467f1ee33be240f879f6b5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 15 Mar 2021 15:22:41 -0400
Subject: Update newly named fields

---
 include/battle.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/battle.h')

diff --git a/include/battle.h b/include/battle.h
index 34910781b..954d33b07 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -344,7 +344,7 @@ struct BattleTvMovePoints
     s16 points[2][PARTY_SIZE * 4];
 };
 
-struct MultiPartnerEnigmaBerry
+struct LinkBattlerHeader
 {
     u8 versionSignatureLo;
     u8 versionSignatureHi;
@@ -429,7 +429,7 @@ struct BattleStruct
     u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte]
     u16 castformPalette[MAX_BATTLERS_COUNT][16];
     union {
-        struct MultiPartnerEnigmaBerry multiPartnerEnigmaBerry;
+        struct LinkBattlerHeader linkBattlerHeader;
         u32 battleVideo[2];
     } multiBuffer;
     u8 wishPerishSongState;
-- 
cgit v1.2.3