From 61aa6134725f8c3be99f9871196b0ee6b2c2ff97 Mon Sep 17 00:00:00 2001
From: Michael <goldtextwitch@outlook.com>
Date: Mon, 15 Jul 2019 00:25:22 -0700
Subject: [PATCH] add more theboy181 60fps patches

---
 Mods/CitizensOfEarth_60fps/patches.txt | 20 ++++++++++++++++++++
 Mods/CitizensOfEarth_60fps/rules.txt   |  8 ++++++++
 Mods/LostReavers_60fps/patches.txt     | 14 ++++++++++++++
 Mods/LostReavers_60fps/rules.txt       | 11 +++++++++++
 Mods/M&SRio2016_60FPS/patches.txt      | 19 +++++++++++++++++++
 Mods/M&SRio2016_60FPS/rules.txt        |  8 ++++++++
 Mods/M&SRio2016_60FPSTown/patches.txt  |  4 ----
 Mods/M&SRio2016_60FPSTown/rules.txt    |  6 ------
 8 files changed, 80 insertions(+), 10 deletions(-)
 create mode 100644 Mods/CitizensOfEarth_60fps/patches.txt
 create mode 100644 Mods/CitizensOfEarth_60fps/rules.txt
 create mode 100644 Mods/LostReavers_60fps/patches.txt
 create mode 100644 Mods/LostReavers_60fps/rules.txt
 create mode 100644 Mods/M&SRio2016_60FPS/patches.txt
 create mode 100644 Mods/M&SRio2016_60FPS/rules.txt
 delete mode 100644 Mods/M&SRio2016_60FPSTown/patches.txt
 delete mode 100644 Mods/M&SRio2016_60FPSTown/rules.txt

diff --git a/Mods/CitizensOfEarth_60fps/patches.txt b/Mods/CitizensOfEarth_60fps/patches.txt
new file mode 100644
index 00000000..4bdfe606
--- /dev/null
+++ b/Mods/CitizensOfEarth_60fps/patches.txt
@@ -0,0 +1,20 @@
+[CoF60fpsVer16]
+moduleMatches = 0xB87B357B
+
+# location where .float 0.0166666.. can be found in memory
+_FrameRate = 0x100A151C
+
+# Code Cave
+
+CodeCaveSize = 0x0c                    # = Last used instruction + 0x04 (4xINSTRUCTIONS in HEX)
+
+# Set 60fps
+
+_60fps = 0x00000000
+
+0x00000000 = lis   r12,_FrameRate@h
+0x00000004 = lfs   f0,_FrameRate@l(r12)
+0x00000008 = blr
+
+
+0x021de6c8 = bla _60fps
diff --git a/Mods/CitizensOfEarth_60fps/rules.txt b/Mods/CitizensOfEarth_60fps/rules.txt
new file mode 100644
index 00000000..f9d87c9d
--- /dev/null
+++ b/Mods/CitizensOfEarth_60fps/rules.txt
@@ -0,0 +1,8 @@
+[Definition]
+titleIds = 0005000010177200,0005000010180B00
+name = 60FPS
+path = "Citizens of Earth/Mods/60FPS"
+description = Important: This patches the gameplay to be in 60FPS. Getting under 60FPS will slow down the game's speed.
+version = 3
+
+# Made by theboy181
diff --git a/Mods/LostReavers_60fps/patches.txt b/Mods/LostReavers_60fps/patches.txt
new file mode 100644
index 00000000..ac86df30
--- /dev/null
+++ b/Mods/LostReavers_60fps/patches.txt
@@ -0,0 +1,14 @@
+[LR60FpsVer0,v16]
+moduleMatches = 0x67DBF490,0x165809E9
+
+# Code selects .float 60 from 0X1000333C
+
+_60fps = 0x00000000
+
+CodeCaveSize = 0x0c
+
+0X00000000 = lis r3,0x1000
+0X00000004 = lfs f1,0x333c(r3)    # NOP - Remove read to FPS .float = uncapped FPS
+0X00000008 = blr
+
+0X02571FC4 = bla _60fps
diff --git a/Mods/LostReavers_60fps/rules.txt b/Mods/LostReavers_60fps/rules.txt
new file mode 100644
index 00000000..7146df72
--- /dev/null
+++ b/Mods/LostReavers_60fps/rules.txt
@@ -0,0 +1,11 @@
+[Definition]
+titleIds = 00050000101A4800,00050000101B9900,000500001018D900
+name = 60FPS
+path = "Lost Reavers/Mods/60FPS"
+description = Important: This patches the gameplay to be in 60FPS. Getting under 60FPS will slow down the game's speed.
+version = 3
+
+[Control]
+vsyncFrequency = 120
+
+# Made by theboy181
diff --git a/Mods/M&SRio2016_60FPS/patches.txt b/Mods/M&SRio2016_60FPS/patches.txt
new file mode 100644
index 00000000..35a27734
--- /dev/null
+++ b/Mods/M&SRio2016_60FPS/patches.txt
@@ -0,0 +1,19 @@
+[M&S2016FpsVerv16]
+moduleMatches = 0xD44C22E3
+
+# 0x020C27D4 = li r3, 1 # original town patch
+
+# 0x2E713530 .original .float 30
+# 0x0298aa0c = lfs f0,0x10(31)
+
+# Code selects .float 60 from 0X1000333C
+
+_60fps = 0x00000000
+
+CodeCaveSize = 0x0c
+
+0X00000000 = lis r3,0x1000
+0X00000004 = lfs f0,0x45b0(r3)
+0X00000008 = blr
+
+0x0298aa0c = bla _60fps
diff --git a/Mods/M&SRio2016_60FPS/rules.txt b/Mods/M&SRio2016_60FPS/rules.txt
new file mode 100644
index 00000000..568cbf96
--- /dev/null
+++ b/Mods/M&SRio2016_60FPS/rules.txt
@@ -0,0 +1,8 @@
+[Definition]
+titleIds = 0005000010190300,00050000101E5300,00050000101E5400
+name = 60FPS
+path = "Mario & Sonic at the Rio 2016 Olympic Games/Mods/60FPS"
+description = Important: This patches the gameplay to be in 60FPS. Getting under 60FPS will slow down the game's speed.
+version = 3
+
+# Original Town patch made by Slashiee, full game patch made by theboy181
diff --git a/Mods/M&SRio2016_60FPSTown/patches.txt b/Mods/M&SRio2016_60FPSTown/patches.txt
deleted file mode 100644
index 0f752828..00000000
--- a/Mods/M&SRio2016_60FPSTown/patches.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[unison]
-moduleMatches = 0xD44C22E3
-
-0x020C27D4 = li r3, 1
diff --git a/Mods/M&SRio2016_60FPSTown/rules.txt b/Mods/M&SRio2016_60FPSTown/rules.txt
deleted file mode 100644
index 82e25b57..00000000
--- a/Mods/M&SRio2016_60FPSTown/rules.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[Definition]
-titleIds = 0005000010190300,00050000101E5300,00050000101E5400
-name = 60FPS Town
-path = "Mario & Sonic at the Rio 2016 Olympic Games/Mods/60FPS Town"
-description = Patches the town's 30FPS lock to operate at 60FPS instead
-version = 3