From e559c44113e4d437f3ca9c65a22e4a4304fb4341 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Wed, 22 Feb 2023 16:58:03 -0600
Subject: [PATCH] func_80307CA0() match

---
 src/core2/code_7AF80.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/core2/code_7AF80.c b/src/core2/code_7AF80.c
index 3c6a2a79..71703127 100644
--- a/src/core2/code_7AF80.c
+++ b/src/core2/code_7AF80.c
@@ -2021,8 +2021,8 @@ void func_80307CA0(ActorMarker *marker) {
     s32 temp_s4;
     s32 sp58[3];
     s32 i;
-    Cube **var_s2;
-    NodeProp *temp_v0_2;
+    Cube **cubePtrList;
+    NodeProp *node;
     s32 sp40[3];
     s32 temp_v0_3;
     s32 var_s0;
@@ -2030,17 +2030,17 @@ void func_80307CA0(ActorMarker *marker) {
     temp_s4 = D_8036A9E4[marker->unk14_20];
     if ((temp_s4 != 0xFF) && (bitfield_isBitSet(D_8036A9E0, temp_s4) == 1)) {
         func_8032E010(marker->propPtr, sp58);
-        var_s2 = func_80307948(sp58);
-        for(i = 0; var_s2[i] != NULL; i++) {
-            for(var_s0 = 0; var_s0 < var_s2[i]->unk0_4; var_s0++){
-                temp_v0_2 = func_8032E02C(var_s2[i], var_s0);
-                if (func_80330F74(temp_v0_2) == temp_s4) {
-                    temp_v0_3 = func_80330F94(temp_v0_2, sp40);
+        cubePtrList = func_80307948(sp58);
+        for(i = 0; cubePtrList[i] != NULL; i++) {
+            for(var_s0 = 0; var_s0 < cubePtrList[i]->unk0_4; var_s0++){
+                node = func_8032E02C(cubePtrList[i], var_s0);
+                if (func_80330F74(node) == temp_s4) {
+                    temp_v0_3 = func_80330F94(node, sp40);
                     if( ((sp40[0] - temp_v0_3) < sp58[0]) && (sp58[0] < (sp40[0] + temp_v0_3)) 
                         && ((sp40[1] - temp_v0_3) < sp58[1]) && (sp58[1] < (sp40[1] + temp_v0_3)) 
                         && ((sp40[2] - temp_v0_3) < sp58[2]) && (sp58[2] < (sp40[2] + temp_v0_3))
                     ) {
-                        func_80334448(temp_v0_2, marker);
+                        func_80334448(node, marker);
                     }
                 }
             }
@@ -2048,7 +2048,6 @@ void func_80307CA0(ActorMarker *marker) {
     }
 }
 
-
 u32 func_80307E1C(void) {
     Cube *phi_v0;
     s32 i;