From d4e9762894f0e826bdcd9984171ee91d58eebf24 Mon Sep 17 00:00:00 2001
From: Nayla Hanegan <naylahanegan@gmail.com>
Date: Mon, 10 Jun 2024 21:13:04 -0400
Subject: [PATCH] fix some codes

---
 Data/Sys/GameSettings/GMPE01.ini | 14 ++++++++++++++
 Data/Sys/GameSettings/GP5E01.ini | 10 ++++++++++
 Data/Sys/GameSettings/GP6E01.ini | 11 +++++++++++
 Data/Sys/GameSettings/GP7E01.ini | 10 +++++-----
 Data/Sys/GameSettings/RM8E01.ini | 20 ++++++++++++++++++++
 5 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/Data/Sys/GameSettings/GMPE01.ini b/Data/Sys/GameSettings/GMPE01.ini
index 615c1e97ea..de4478c592 100644
--- a/Data/Sys/GameSettings/GMPE01.ini
+++ b/Data/Sys/GameSettings/GMPE01.ini
@@ -215,6 +215,20 @@ C2085CEC 00000005
 48000008 38000002
 39C00000 00000000
 
+$Mechanics - Disable Most End of Turn Minigames [WolfGC64]
+C205C6E4 0000000A
+3C608018 6063FCFC
+89C30000 39E30001
+89EF0000 7DEE7850
+2C0F0005 41820010
+2C0F0000 41820008
+4800000C 38600000
+48000010 39CE0001
+99C30000 38600001
+39C00000 39E00000
+2C030000 00000000
+*End-of-turn minigames are needed in MP4 for the Last 5 Turns event to happen and the game to be able to end, so this code makes -most- turns end without a minigame, except the turn before the last 5 turns and the last turn.
+
 $Mechanics - Double the Amount of Turns [Airsola]
 C205BEF8 00000004
 2C000032 4182000C
diff --git a/Data/Sys/GameSettings/GP5E01.ini b/Data/Sys/GameSettings/GP5E01.ini
index 7d5a80991d..48a1cd2b57 100644
--- a/Data/Sys/GameSettings/GP5E01.ini
+++ b/Data/Sys/GameSettings/GP5E01.ini
@@ -226,6 +226,16 @@ E0000000 80008000
 *Disables all usage of Capsules.
 *Capsules already on spaces will continue to exist.
 
+$Mechanics - Disable Most End of Turn Minigames [WolfGC64]
+C208CC38 00000006
+3DC08022 61CEA494
+89EE0001 89CE0000
+7DEE7850 2C0FFFFF
+40810008 38600001
+39E00000 39C00000
+2C030000 00000000
+*A minigame will appear on the Last Turn, since the game requires it to be able to end.
+
 $Mechanics - Double the Amount of Turns [Airsola]
 C208DA0C 00000004
 2C000032 4182000C
diff --git a/Data/Sys/GameSettings/GP6E01.ini b/Data/Sys/GameSettings/GP6E01.ini
index bf8a803a8e..67f3586ca8 100644
--- a/Data/Sys/GameSettings/GP6E01.ini
+++ b/Data/Sys/GameSettings/GP6E01.ini
@@ -805,6 +805,17 @@ D2000004 00000002
 E0000000 80008000
 *Disables the Orbs.
 
+$Mechanics - Disable Most End of Turn Minigames [WolfGC64]
+C214B808 00000007
+3DC08026 61CE5B74
+89EE0001 89CE0000
+7DEE7850 2C0F0004
+41820010 2C0FFFFF
+41820008 38600001
+39E00000 39C00000
+2C030000 00000000
+*The game requires a minigame to appear on the last turn to end, and a glitch that causes P1 to lose their turn occurs if minigames are skipped during the last 5 turns. So the code stops skipping minigames during the last five to allow the game to end and to prevent glitches.
+
 $Mechanics - Double the Amount of Turns [Rain]
 C214C75C 00000004
 2C000032 4182000C
diff --git a/Data/Sys/GameSettings/GP7E01.ini b/Data/Sys/GameSettings/GP7E01.ini
index 0fa5660e84..bee0b43f4b 100644
--- a/Data/Sys/GameSettings/GP7E01.ini
+++ b/Data/Sys/GameSettings/GP7E01.ini
@@ -1107,6 +1107,11 @@ C2167A94 00000002
 386000FF 00000000
 *Disables the Orbs
 
+$Mechanics - Disable End of Turn Minigames [WolfGC64]
+C21523F0 00000002
+38000000 2C000000
+60000000 00000000
+
 $Mechanics - Disable Shops [gamemasterplc]
 04215688 480018C4
 *Disables Orb Shops
@@ -1365,11 +1370,6 @@ $Mechanics - Mic Minigames Have A 10% Chance Of Appearing Instead Of 20% [gamema
 042f7a04 41200000
 *Less Mic Minigames and see more standard minigames.
 
-$Mechanics - No Minigames [WolfGC64]
-C21523F0 00000002
-38000000 2C000000
-60000000 00000000
-
 $Mechanics - Orb Star Becomes Coin Star [Airsola]
 204e16b0 a8ca003c
 044e16b0 a8ca002c
diff --git a/Data/Sys/GameSettings/RM8E01.ini b/Data/Sys/GameSettings/RM8E01.ini
index 9292dd8f30..03486b62eb 100644
--- a/Data/Sys/GameSettings/RM8E01.ini
+++ b/Data/Sys/GameSettings/RM8E01.ini
@@ -427,6 +427,26 @@ e0000000 80008000
 *Disables the overpowered Lucky Spaces.
 *Disables certain happening spaces due to the level of assembly needed for this patch.
 
+$Mechanics - Disable End of Turn Minigames [WolfGC64]
+203FEA7C 2C030000
+043FEA7C 2C030001
+e2000001 80008000
+2040984C 2C030000
+0440984C 2C030001
+e2000001 80008000
+2042704C 2C030000
+0442704C 2C030001
+e2000001 80008000
+20402E40 2C030000
+04402E40 2C030001
+e2000001 80008000
+20400644 2C030000
+04400644 2C030001
+e2000001 80008000
+20406D14 2C030000
+04406D14 2C030001
+e2000001 80008000
+
 $Mechanics - Disable Slogo Candy [Nayla, Rain, jdaster]
 c0000000 00000010
 3821ffdc 90610010