battle: func_800B3CD0, func_800B8268

Author: Xeeynamo

config/sym_ovl_export.us.txt

@@ -1101,7 +1101,6 @@ func_800B3A04 = 0x800b3a04;
 func_800B3AB8 = 0x800b3ab8;
 func_800B3B84 = 0x800b3b84;
 func_800B3C50 = 0x800b3c50;
-func_800B3CD0 = 0x800b3cd0;
 func_800B3E2C = 0x800b3e2c;
 func_800B3FAC = 0x800b3fac;
 func_800B3FFC = 0x800b3ffc;
@@ -1131,7 +1130,6 @@ func_800B7DB4 = 0x800b7db4;
 func_800B7FB4 = 0x800b7fb4;
 func_800B7FDC = 0x800b7fdc;
 func_800B8234 = 0x800b8234;
-func_800B8268 = 0x800b8268;
 func_800B8360 = 0x800b8360;
 func_800B8438 = 0x800b8438;
 func_800B888C = 0x800b888c;

config/us.yaml

@@ -57,7 +57,7 @@ overlays:
       - [0x888, .rodata, battle2]
       - [0xDD4, .rodata, battle3]
       - [0x1158, c, battle]
-      - [0x18360, c, battle1]
+      - [0x18268, c, battle1]
       - [0x27B60, c, battle2]
       - [0x38A04, c, battle3]
       - [0x47A38, data]

src/battle/battle.c

@@ -1042,8 +1042,16 @@ INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800B3B84);
 
 INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800B3C50);
 
-void func_800B3CD0(void);
-INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800B3CD0);
+static void func_800B3CD0(void) {
+    Yamada* y;
+    u_long* dst;
+
+    dst = (u_long*)0x801B0000;
+    func_800D2980(dst, 0, 0, 0);
+    y = &D_800E8068[D_800FA9C4];
+    DS_read(y->loc, *&D_800E8068[D_800FA9C4].len, dst, func_800B3AB8);
+    func_800B7FB4();
+}
 
 static void func_800B3D38(void) {
     func_800C5E94();
@@ -1146,5 +1154,3 @@ void func_800B8234(s32 arg0) {
         D_801517BC = 0;
     }
 }
-
-INCLUDE_ASM("asm/us/battle/nonmatchings/battle", func_800B8268);

src/battle/battle.h

@@ -186,7 +186,7 @@ typedef struct {
     /* 0x023 */ u8 D_80151907;
     /* 0x024 */ s8 D_80151908;
     /* 0x025 */ s8 D_80151909;
-    /* 0x026 */ s8 D_8015190A;
+    /* 0x026 */ u8 D_8015190A;
     /* 0x027 */ s8 D_8015190B;
     /* 0x028 */ s16 D_8015190C;
     /* 0x02A */ s8 D_8015190E;

src/battle/battle1.c

@@ -6,6 +6,28 @@ static void func_800BB75C(Unk800BB75C* arg0, MATRIX* m, s16* arg2, s16* arg3);
 static void func_800BB804(void);
 static void func_800BB864(void);
 
+static void func_800B8268(void) {
+    s32 i;
+    u8* var_a1;
+    s32 var_t1;
+
+    i = 0;
+    var_t1 = 1;
+    var_a1 = &D_80163784;
+    while (i < 10) {
+        *var_a1 = D_801636B8[i].D_801636B9;
+        if (!(D_80151200[i].D_8015120C & 8) &&
+            D_801518E4[i].D_801518E6 != *var_a1 &&
+            D_801518E4[i].D_8015190A == var_t1) {
+            D_801518E4[i].D_80151922 |= 1;
+            D_801518E4[i].D_801518E6 = *var_a1;
+        }
+        var_a1++;
+        i += 1;
+    }
+    D_80163787 = 0;
+}
+
 INCLUDE_ASM("asm/us/battle/nonmatchings/battle1", func_800B8360);
 
 static void func_800B83C4() {

src/battle/battle_private.h

@@ -304,6 +304,8 @@ extern Unk801636B8 D_801636B8[5];
 extern u16 D_80163758[]; // part of a struct
 extern u8 D_80163774[];
 extern u16 D_8016376E[];
+extern u8 D_80163784;
+extern s8 D_80163787;
 extern Unk800A2F4C D_80163798[0x40];
 extern s8 D_80163A98;
 extern u16 D_80163B80;