From 34c465815c5cf13c44a26a3660e9f733cb895413 Mon Sep 17 00:00:00 2001
From: David <benepe96@gmail.com>
Date: Thu, 2 Nov 2023 21:33:35 -0500
Subject: [PATCH] Added non matching score to score script.

---
 src/audio.c                   |  2 +-
 tools/python/score.py         | 21 +++++++++++++++++----
 tools/python/score_display.py |  4 ++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/audio.c b/src/audio.c
index 88172515..e1dc0e56 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -469,7 +469,7 @@ UNUSED u8 music_channel_volume(u8 channel) {
 /**
  * Set this channel to fade in over time.
 */
-void music_channel_fade_set(u8 channel, u8 fade) {
+void music_channel_fade_set(u8 channel, ALPan fade) {
     if (channel < AUDIO_CHANNELS) {
         alCSPSetFadeIn(gMusicPlayer, channel, fade);
     }
diff --git a/tools/python/score.py b/tools/python/score.py
index 22e20749..664ece56 100644
--- a/tools/python/score.py
+++ b/tools/python/score.py
@@ -52,7 +52,7 @@ LIB_SRC_DIRECTORY = './lib/src'
 FUNCTION_REGEX = r'^(?<!static\s)(?:(\/[*][*!][*]*\n(?:[^/]*\n)+?\s*[*]\/\n)(?:\s*)*?)?(?:\s*UNUSED\s+)?([^\s]+)\s(?:\s|[*])*?([0-9A-Za-z_]+)\s*[(][^)]*[)]\s*{'
 GLOBAL_ASM_REGEX = r'GLOBAL_ASM[(]".*(?=\/)\/([^.]+).s"[)]'
 WIP_REGEX = r'#ifdef\s+(?:NON_MATCHING|NON_EQUIVALENT)(?:.|\n)*?#else\s*(GLOBAL_ASM[(][^)]*[)])(.|\n)*?#endif'
-NON_MATCHING_REGEX = re.compile(r'^#ifdef[ ]+NON_MATCHING', re.MULTILINE)
+NON_MATCHING_REGEX = re.compile(r'^#ifdef[ ]+NON_MATCHING(?:.|\n)*?(?:\s*UNUSED\s+)?(?:[^\s]+)\s(?:\s|[*])*?([0-9A-Za-z_]+)\s*[(][^)]*[)]\s*{', re.MULTILINE)
 NON_EQUVIALENT_REGEX = re.compile(r'^#ifdef[ ]+NON_EQUIVALENT', re.MULTILINE)
 
 CODE_START = 0x80000400
@@ -107,7 +107,11 @@ class ScoreFile:
     def read_file(self):
         with open(self.path, "r") as inFile:
             self.text = inFile.read()
-            self.numNonMatchings = len(re.findall(NON_MATCHING_REGEX, self.text))
+            self.nonMatchings = re.findall(NON_MATCHING_REGEX, self.text)
+            self.nonMatchingsSizes = 0
+            for nonMatching in self.nonMatchings:
+                self.nonMatchingsSizes += MAP_FILE.functionSizes[nonMatching]
+            self.numNonMatchings = len(self.nonMatchings)
             self.numNonEquivalents = len(re.findall(NON_EQUVIALENT_REGEX, self.text))
             self.text = re.sub(WIP_REGEX, r"GLOBAL_ASM(\1)", self.text)
             
@@ -142,6 +146,9 @@ class ScoreFile:
             size += func.size
         return size
         
+    def get_size_of_functions_with_nonmatching(self):
+        return self.get_size_of_functions() + self.nonMatchingsSizes
+        
     def get_size_of_documented_functions(self):
         size = 0
         for func in self.functions:
@@ -170,6 +177,7 @@ def main():
     totalNumberOfNonMatching = 0
     totalNumberOfNonEquivalent = 0
     totalSizeOfDecompiledFunctions = 0
+    totalSizeOfDecompiledAndNonMatchingFunctions = 0
     totalSizeOfDocumentedFunctions = 0
     ignoreNumberDocumentedFunctions = 0
     ignoreSizeDocumentedFunctions = 0
@@ -190,6 +198,7 @@ def main():
             totalNumberOfNonEquivalent += scoreFile.numNonEquivalents
             totalNumberOfDocumentedFunctions += scoreFile.get_number_of_documented_functions()
             totalSizeOfDecompiledFunctions += scoreFile.get_size_of_functions()
+            totalSizeOfDecompiledAndNonMatchingFunctions += scoreFile.get_size_of_functions_with_nonmatching()
             totalSizeOfDocumentedFunctions += scoreFile.get_size_of_documented_functions()
             scoreFiles.append(scoreFile)
     # Get score properties of libultra functions.
@@ -201,6 +210,7 @@ def main():
         #totalNumberOfDocumentedFunctions += scoreFile.get_number_of_documented_functions()
         ignoreNumberDocumentedFunctions += scoreFile.get_number_of_functions()
         totalSizeOfDecompiledFunctions += scoreFile.get_size_of_functions()
+        totalSizeOfDecompiledAndNonMatchingFunctions += scoreFile.get_size_of_functions_with_nonmatching()
         #totalSizeOfDocumentedFunctions += scoreFile.get_size_of_documented_functions()
         ignoreSizeDocumentedFunctions += scoreFile.get_size_of_functions()
         scoreFiles.append(scoreFile)
@@ -209,9 +219,12 @@ def main():
     totalNumberOfFunctions = totalNumberOfDecompiledFunctions + totalNumberOfGlobalAsms
     for asm_function in ASM_LABELS:
         if asm_function in MAP_FILE.functionSizes:
-            totalSizeOfDecompiledFunctions += MAP_FILE.functionSizes[asm_function]
+            asmFuncSize = MAP_FILE.functionSizes[asm_function]
+            totalSizeOfDecompiledFunctions += asmFuncSize
+            totalSizeOfDecompiledAndNonMatchingFunctions += asmFuncSize
     
     adventureOnePercentage = (totalSizeOfDecompiledFunctions / CODE_SIZE) * 100
+    adventureOnePercentageWithNonMatching = (totalSizeOfDecompiledAndNonMatchingFunctions / CODE_SIZE) * 100
     adventureTwoPercentage = (totalSizeOfDocumentedFunctions / (CODE_SIZE - ignoreSizeDocumentedFunctions)) * 100
     
     if args.summary:
@@ -219,7 +232,7 @@ def main():
         print(f"Documentation progress: {adventureTwoPercentage:5.2f}%")
         sys.exit(0)
     scoreDisplay = ScoreDisplay()
-    print(scoreDisplay.getDisplay(adventureOnePercentage, adventureTwoPercentage, adventureSelect, totalNumberOfDecompiledFunctions, totalNumberOfGlobalAsms, totalNumberOfNonMatching, totalNumberOfNonEquivalent, totalNumberOfDocumentedFunctions, (totalNumberOfFunctions - ignoreNumberDocumentedFunctions) - totalNumberOfDocumentedFunctions))
+    print(scoreDisplay.getDisplay(adventureOnePercentage, adventureOnePercentageWithNonMatching, adventureTwoPercentage, adventureSelect, totalNumberOfDecompiledFunctions, totalNumberOfGlobalAsms, totalNumberOfNonMatching, totalNumberOfNonEquivalent, totalNumberOfDocumentedFunctions, (totalNumberOfFunctions - ignoreNumberDocumentedFunctions) - totalNumberOfDocumentedFunctions))
     
     if showTopFiles > 0:
         if showTopFiles > len(scoreFiles):
diff --git a/tools/python/score_display.py b/tools/python/score_display.py
index e1525d94..86f7e4a9 100644
--- a/tools/python/score_display.py
+++ b/tools/python/score_display.py
@@ -107,7 +107,7 @@ class ScoreDisplay:
         out += self.makeLine(' ', dashLen, status['Msg'])
         return [out, dashLen]
     
-    def getDisplay(self, advOnePer, advTwoPer, showFlags=3, totalDecompFunctions=0, totalGlobalAsm=0, totalNonMatching=0, totalNonEquivalent=0, totalDocumented=0, totalUndocumented=0):
+    def getDisplay(self, advOnePer, advOneNonMatchPer, advTwoPer, showFlags=3, totalDecompFunctions=0, totalGlobalAsm=0, totalNonMatching=0, totalNonEquivalent=0, totalDocumented=0, totalUndocumented=0):
         advOneStatus = self.getStatus(advOnePer)
         advTwoStatus = self.getStatus(advTwoPer)
         if showFlags == 3:
@@ -127,7 +127,7 @@ class ScoreDisplay:
             if advOnePer >= 100.0:
                 out += self.makeLine('-', dashLen, '{:5.1f}% Complete'.format(advOnePer))
             else:
-                out += self.makeLine('-', dashLen, '{:5.2f}% Complete'.format(advOnePer))
+                out += self.makeLine('-', dashLen, '{:5.2f}% ({:5.2f}%) Complete'.format(advOnePer, advOneNonMatchPer))
             out += self.makeLine(' ', dashLen, '# Decompiled functions: ' + str(totalDecompFunctions))
             out += self.makeLine(' ', dashLen, '# GLOBAL_ASM remaining: ' + str(totalGlobalAsm))
             out += self.makeLine(' ', dashLen, '# NON_MATCHING functions: ' + str(totalNonMatching))