battle: func_800AD324 + D_800F5BB8 struct

Author: Xeeynamo

config/sym_ovl_export.us.txt

@@ -218,32 +218,7 @@ D_800F5B72 = 0x800f5b72;
 D_800F5B73 = 0x800f5b73;
 D_800F5B74 = 0x800f5b74;
 D_800F5BB8 = 0x800f5bb8;
-D_800F5BBA = 0x800f5bba;
-D_800F5BBC = 0x800f5bbc;
-D_800F5BBE = 0x800f5bbe;
-D_800F5BC0 = 0x800f5bc0;
-D_800F5BC2 = 0x800f5bc2;
-D_800F5BC4 = 0x800f5bc4;
-D_800F5BC5 = 0x800f5bc5;
-D_800F5BC6 = 0x800f5bc6;
-D_800F5BC7 = 0x800f5bc7;
-D_800F5BC8 = 0x800f5bc8;
-D_800F5BCC = 0x800f5bcc;
-D_800F5BCD = 0x800f5bcd;
-D_800F5BCE = 0x800f5bce;
-D_800F5BD7 = 0x800f5bd7;
-D_800F5BD8 = 0x800f5bd8;
-D_800F5BDF = 0x800f5bdf;
-D_800F5BE0 = 0x800f5be0;
-D_800F5BE1 = 0x800f5be1;
-D_800F5BE2 = 0x800f5be2;
-D_800F5BE3 = 0x800f5be3;
-D_800F5BE4 = 0x800f5be4;
-D_800F5BE8 = 0x800f5be8;
-D_800F5BEC = 0x800f5bec;
-D_800F5BF0 = 0x800f5bf0;
-D_800F5BF4 = 0x800f5bf4;
-D_800F5BF6 = 0x800f5bf6;
+D_800F5C84 = 0x800f5c84;
 D_800F5E60 = 0x800f5e60;
 D_800F5E64 = 0x800f5e64;
 D_800F5E65 = 0x800f5e65;

config/symbols.battle.txt

@@ -1,5 +1,6 @@
 BATTLE_EnqueueLoadImage = 0x800D2538;
 BATTLE_FlushImageQueue = 0x800D25E8;
+D_800F5BB8 = 0x800F5BB8; // size:0xCC
 D_800F5F44 = 0x800F5F44; // size:0x1E88
 D_800F83E4 = 0x800F83E4; // size:0x138
 D_800FA63C = 0x800FA63C; // size:0x38
@@ -12,4 +13,4 @@ D_80162978 = 0x80162978; // size:0xC80
 D_8016360C = 0x8016360C; // size:0xAC
 D_801636B8 = 0x801636B8; // size:0xA0
 D_80163798 = 0x80163798; // size:0x300
-D_80163C80 = 0x80163C80; // size:0xC
+D_80163C80 = 0x80163C80; // size:0xC

include/game.h

@@ -258,6 +258,12 @@ typedef struct {
     s32 unk23C;
     s32 unk240;
     s32 unk244;
+    s32 unk248;
+    s32 unk24C;
+    s32 unk250;
+    s32 unk254;
+    s32 unk258;
+    s32 unk25C;
 } Unk800A8D04; // size: ???
 
 // seems to be related to a party member during battle

src/battle/battle.c

@@ -442,7 +442,7 @@ INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800A6858);
 
 INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800A68FC);
 
-void func_800A6A3C(s32 arg0, s32 arg1) { D_800F5BB8[arg0].raw[6] |= arg1; }
+void func_800A6A3C(s32 arg0, s32 arg1) { D_800F5BB8[arg0].unkE |= arg1; }
 
 INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800A6A70);
 
@@ -695,7 +695,35 @@ INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800AD088);
 
 INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800AD0FC);
 
-INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800AD324);
+void func_800AD324(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
+    s32 temp_t0;
+    s32 var_a2;
+
+    var_a2 = arg2;
+    temp_t0 = D_80063014->unk220 & 1;
+    if (arg3 & 1) {
+        if (arg1 == D_80063014->unk208) {
+            if (D_80063014->unk25C < var_a2) {
+                var_a2 = D_80063014->unk25C;
+            }
+        }
+        if (temp_t0) {
+            var_a2 = -var_a2;
+        }
+        D_800F5BB8[arg0].unk30 -= var_a2;
+    }
+    if (arg3 & 2) {
+        if (arg1 == D_80063014->unk208) {
+            if (D_80063014->unk258 < var_a2) {
+                var_a2 = D_80063014->unk258;
+            }
+        }
+        if (temp_t0) {
+            var_a2 = -var_a2;
+        }
+        D_800F5BB8[arg0].unk2C -= var_a2;
+    }
+}
 
 INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800AD420);
 
@@ -836,7 +864,7 @@ void func_800AF380(s32 arg0) { func_800A7254(2, arg0, 0x15, 0xF); }
 
 INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800AF3AC);
 
-void func_800AF470(s32 arg0) { D_800F5BB8[arg0].raw[0x20] = 3; }
+void func_800AF470(s32 arg0) { D_800F5BB8[arg0].unk28 = 3; }
 
 INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800AF494);
 

src/battle/battle_private.h

@@ -18,8 +18,26 @@ typedef struct {
     s16 unk2;
     s16 unk4;
     s16 unk6;
-    u8 raw[0x3C];
-} Unk800AF470;
+    s32 unk8;
+    s16 unkC;
+    u8 unkE;
+    u8 unkF;
+    s32 unk10;
+    s32 unk14;
+    s32 unk18;
+    s32 unk1C;
+    s32 unk20;
+    s32 unk24;
+    s8 unk28;
+    s8 unk29;
+    s16 unk2A;
+    s32 unk2C;
+    s32 unk30;
+    s32 unk34;
+    s32 unk38;
+    s32 unk3C;
+    s32 unk40;
+} Unk800AF470; // 0x44
 
 typedef struct {
     s8 unk0;