mirror of
https://github.com/izzy2lost/Diddy-Kong-Racing.git
synced 2026-06-19 01:16:26 -07:00
match: update_camera_plane & func_8004CC20 (#622)
* match: update_camera_plane * refac: use 1/180.0 instead * match: func_8004CC20 * document: re-add function comment
This commit is contained in:
@@ -148,16 +148,6 @@ class ScoreFile:
|
||||
for nonMatching in self.nonMatchings:
|
||||
self.nonMatchingsSizes += MAP_FILE.functionSizes[nonMatching]
|
||||
self.numNonMatchings = len(self.nonMatchings)
|
||||
<<<<<<< HEAD
|
||||
|
||||
self.nonEquivalents = re.findall(NON_EQUVIALENT_REGEX, self.text)
|
||||
self.nonEquivalentsSizes = 0
|
||||
for nonEquivalent in self.nonEquivalents:
|
||||
if (nonEquivalent not in NOT_FUNCTION_NAMES):
|
||||
self.nonEquivalentsSizes += MAP_FILE.functionSizes[nonEquivalent]
|
||||
self.numNonEquivalents = len(self.nonEquivalents)
|
||||
|
||||
=======
|
||||
all_nonEquivalents = re.findall(NON_EQUVIALENT_REGEX, self.text)
|
||||
# Filter out the ones that are in NOT_FUNCTION_NAMES
|
||||
self.nonEquivalents = [ne for ne in all_nonEquivalents if ne not in NOT_FUNCTION_NAMES]
|
||||
@@ -166,7 +156,6 @@ class ScoreFile:
|
||||
for nonEquivalent in self.nonEquivalents:
|
||||
self.nonEquivalentsSizes += MAP_FILE.functionSizes[nonEquivalent]
|
||||
self.numNonEquivalents = len(self.nonEquivalents)
|
||||
>>>>>>> master
|
||||
self.text = re.sub(WIP_REGEX, r"GLOBAL_ASM(\1)", self.text)
|
||||
|
||||
def get_matches(self):
|
||||
|
||||
Reference in New Issue
Block a user