[XCX] Fix overdrive (oops)

cemu-project · Jul 31, 2022 · e5d3d79 · e5d3d79
1 parent c6d1674
commit e5d3d79
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/XenobladeChroniclesX/Mods/60FPS/patch_Overdrive.asm b/src/XenobladeChroniclesX/Mods/60FPS/patch_Overdrive.asm
@@ -5,20 +5,25 @@ moduleMatches = 0xF882D5CF, 0x30B6E091, 0x7672271D ; 1.0.1E, 1.0.2U, 1.0.2J
 
 _over:
 	fmr f31, f1
-	lis r31, averageFPS1@ha
-	lfs f1, averageFPS1@l(r31)
+	lis r31, averageFPS1Inv@ha
+	lfs f1, averageFPS1Inv@l(r31)
 	fmuls f1, f31, f1
 	blr
 
+[XCX_FPS++_Overdrive_V101E] ; ########################################################
+moduleMatches = 0xF882D5CF ; 1.0.1E
 
-[XCX_FPS++_Overdrive_V101E_102U] ; ########################################################
-moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
+0x021BC904 = bla _over ; Gear::CGear::update((float))
+0x021E2020 = bla _over ; Gear::CMode::Update((float))
 
-0x021BC904 = bla _over
-0x021E2020 = bla _over ; Skell Overdrive
+[XCX_FPS++_Overdrive_V102U] ; ########################################################
+moduleMatches = 0x30B6E091 ; 1.0.2U
+
+0x021BC904 = bla _over ; Gear::CGear::update((float))
+0x021E2020 = bla _over ; Gear::CMode::Update((float))
 
 [XCX_FPS++_Overdrive_V102J] ; ########################################################
 moduleMatches = 0x7672271D ; 1.0.2J
 
-0x021BC3D0 = bla _over
-0x021E1AEC = bla _over ; Skell Overdrive
+0x021BC3D0 = bla _over ; Gear::CGear::update((float))
+0x021E1AEC = bla _over ; Gear::CMode::Update((float))
diff --git a/src/XenobladeChroniclesX/Mods/60FPS/patch_QTE.asm b/src/XenobladeChroniclesX/Mods/60FPS/patch_QTE.asm
@@ -76,7 +76,7 @@ _justFrame2:
 
     blr
 
-[XCX_FPS++_QTE_1E] ; ########################################################
+[XCX_FPS++_QTE_V101E] ; ########################################################
 moduleMatches = 0xF882D5CF ; 1.0.1E
 
 ; menu::MenuButtonChallenge::setup
@@ -87,7 +87,7 @@ moduleMatches = 0xF882D5CF ; 1.0.1E
 0x02ACE6E4 = bla _justFrame1
 0x02ACE700 = bla _justFrame2
 
-[XCX_FPS++_QTE_2U] ; ########################################################
+[XCX_FPS++_QTE_V102U] ; ########################################################
 moduleMatches = 0x30B6E091 ; 1.0.2U
 
 ; menu::MenuButtonChallenge::setup
@@ -98,7 +98,7 @@ moduleMatches = 0x30B6E091 ; 1.0.2U
 0x02ACE6D4 = bla _justFrame1
 0x02ACE6F0 = bla _justFrame2
 
-[XCX_FPS++_QTE_2J]
+[XCX_FPS++_QTE_V102J]
 moduleMatches = 0x7672271D ; 1.0.2J
 
 ; menu::MenuButtonChallenge::setup