From b938d44488a84ba5d506b1c11ed6d7de4b3dbe02 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Mon, 7 Nov 2022 16:00:15 -0600
Subject: [PATCH] core1/code_11AC0.c done

---
 src/core1/code_11AC0.c    | 9 ++++-----
 subyaml/core1.us.v10.yaml | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/core1/code_11AC0.c b/src/core1/code_11AC0.c
index 4b28d0c6..a6a7c985 100644
--- a/src/core1/code_11AC0.c
+++ b/src/core1/code_11AC0.c
@@ -631,12 +631,10 @@ void func_80250604(s32 arg0, s32 arg1, f32 arg2){
     }
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_11AC0/func_80250650.s")
-#else
 void func_80250650(void) {
     N_ALCSPlayer *csplayer;
     s32 i;
+    s32 channel;
 
     for(i = 0; i < 0x20; i++){
         csplayer = func_802500CC(D_80282110[i].unk0);
@@ -650,7 +648,9 @@ void func_80250650(void) {
                 alCSPSetTempo(csplayer, (s32) D_80282110[i].unk8);
             } else {
                 func_8025F510(csplayer,D_80282110[i].chan, D_80282110[i].unk8);
-                if (((csplayer->chanMask) & (1 << D_80282110[i].chan))) {
+                channel = D_80282110[i].chan;
+
+                if (((csplayer->chanMask) & (1 << channel))) {
                     if (D_80282110[i].unk8 == 0.0) {
                         func_8025F5C0(csplayer, D_80282110[i].chan);
                     }
@@ -663,4 +663,3 @@ void func_80250650(void) {
         }
     }
 }
-#endif
diff --git a/subyaml/core1.us.v10.yaml b/subyaml/core1.us.v10.yaml
index c650c264..497817e8 100644
--- a/subyaml/core1.us.v10.yaml
+++ b/subyaml/core1.us.v10.yaml
@@ -49,7 +49,7 @@ segments:
   - [0xE360, c, code_E360]    #DONE
   - [0xEAF0, c, code_EAF0]
   - [0x10A00, c,code_10A00]
-  - [0x11AC0, c, code_11AC0]
+  - [0x11AC0, c, code_11AC0] #DONE
   - [0x12F10, c, code_12F10] #DONE
   - [0x13640, c, code_13640] #DONE
   - [0x13680, c, code_13680] #DONE