fight documentation

src/core1/code_1BE90.c

@@ -423,8 +423,8 @@ void func_8025A70C(enum comusic_e track_id){
 }
 
 void func_8025A788(enum comusic_e comusic_id, f32 delay1, f32 delay2){
-    timedFunc_set_1(delay1, (TFQM1) func_8025A70C, comusic_id);
-    timedFunc_set_1(delay1 + delay2, (TFQM1) func_8025A7DC, comusic_id);
+    timedFunc_set_1(delay1, (GenMethod_1) func_8025A70C, comusic_id);
+    timedFunc_set_1(delay1 + delay2, (GenMethod_1) func_8025A7DC, comusic_id);
 }
 
 void func_8025A7DC(enum comusic_e track_id){

src/core1/code_22E40.c

@@ -1,6 +1,8 @@
 #include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
+#include "n_libaudio.h"
+#include "n_synth.h"
+// #include "functions.h"
+// #include "variables.h"
 
 #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_22E40/func_80260860.s")
 
@@ -10,6 +12,9 @@
 
 #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_22E40/n_alEnvmixerPull.s")
 
+#ifdef NONMATCHING
+#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_22E40/__postNextSeqEvent.s")
+#else
 void __postNextSeqEvent(ALSeqPlayer *seqp) 
 {
     ALEvent     evt;
@@ -42,8 +47,8 @@ void __postNextSeqEvent(ALSeqPlayer *seqp)
     evt.type = AL_SEQ_REF_EVT;
     //alEvtqPostEvent(&seqp->evtq, &evt, deltaTicks * seqp->uspt);
     alEvtqPostEvent(&seqp->evtq, &evt, deltaTicks * seqp->uspt);
-
 }
+#endif
 
 #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_22E40/__setInstChanState.s")
 

src/core1/code_25E20.c

@@ -2,6 +2,24 @@
 #include "functions.h"
 #include "variables.h"
 
+typedef struct struct_core2_25E20_0{
+    s32 unk0;
+    s32 unk4;
+    s32 unk8;
+    s16 unkC;
+    u8 padE[2];
+    u8 pad10[0xA];
+    s16 unk1A;
+};
+
+typedef struct struct_core2_25E20_1{
+    s32 unk0;
+    s32 unk4;
+    s32 unk8;
+    s32 unkC;
+    u8 pad10[0xA];
+    s16 unk1A;
+};
 
 void func_80263840(void){}
 
@@ -9,7 +27,72 @@ void func_80263848(void){}
 
 #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_25E20/func_80263850.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_25E20/func_802639FC.s")
+void func_802639FC(struct struct_core2_25E20_1 *arg0, struct struct_core2_25E20_0 *arg1, u32 arg2) {
+    u32 var_v0;
+    s32 var_s4;
+    u32 var_s6;
+    s16 var_s5;
+    s16 sp50;
+    s32 sp4C;
+    s32 sp48;
+    u32 sp44;
+    s32 sp40;
+    s16 sp3E;
+
+    if(arg2 == 0){
+        arg1->unk0 = (s32) arg0->unk4;
+        arg1->unkC = 0;
+        arg1->unk4 = 0U;
+        arg1->unk8 = 0U;
+        return;
+    }
+
+    sp4C = arg0->unk8;
+    sp3E = arg0->unk1A;
+    sp44 = arg0->unkC;
+    arg0->unk1A = 0;
+    arg0->unkC = 0;
+    arg0->unk8 = arg0->unk4;
+
+    // var_v0 = 0;
+    do{
+        var_s4 = arg0->unk8;
+        var_s5 = arg0->unk1A;
+        var_s6 = arg0->unkC;
+        func_80263850(arg0, &sp50);
+        if(sp50 == 4){
+            var_s4 = arg0->unk8;
+            var_s5 = arg0->unk1A;
+            var_s6 = arg0->unkC;
+            break;
+        }
+        // var_v0 = arg0->unkC;
+    }while(arg0->unkC < arg2);
+
+    arg1->unk0 = var_s4;
+    arg1->unkC = var_s5;
+    arg1->unk4 = var_s6;
+    arg1->unk8 = arg0->unkC;
+    
+    arg0->unk8 = sp4C;
+    arg0->unk1A = sp3E;
+    arg0->unkC = sp44;
+
+//     var_v0 = 0;
+// loop_3:
+
+
+//     if (sp50 == 4) {
+
+//     } else {
+//         var_v0 = arg0->unkC;
+//         if (var_v0 < arg2) {
+//             goto loop_3;
+//         }
+//     }
+
+}
+
 
 void func_80263B1C(void){}
 

src/core1/done/audio/code_21A80.c

@@ -5,5 +5,5 @@
 
 u8 func_8025F4A0(N_ALCSPlayer *seqp, u8 chan)
 {
-    return seqp->chanState[chan].unk9;
+    return seqp->chanState[chan].unkA;
 }

src/core1/done/audio/n_csplayer.c

@@ -636,7 +636,7 @@ static void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event)
                     }
                     break;
                 case (0x7D):
-                    seqp->chanState[chan].unk9 = byte2;
+                    seqp->chanState[chan].unkA = byte2;
                     for (vs = seqp->vAllocHead; vs != 0; vs = vs->next)
                     {
                         if ((vs->channel == chan) && (vs->envPhase != AL_PHASE_RELEASE))