diff --git a/GWRP01.ini b/GWRP01.ini
index 283ab48fad..f5f877bd4c 100644
--- a/GWRP01.ini
+++ b/GWRP01.ini
@@ -2,59 +2,37 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 2
-EmulationIssues = needs the frame cheats from ini
+EmulationIssues = goes to before race with framepatch
 [OnFrame] Add memory patches to be applied every frame here.
 +$Patches
 0x800FDAD8:dword:0x60000000
 0x800FAF08:dword:0x60000000
-0x800fdd38:dword:0x60000000 # Changing character
-0x800235f0:dword:0x60000000 # Crash through glass
-
+0x800FDD38:dword:0x60000000
+0x800235F0:dword:0x60000000
 [Video]
 Hack = -1
-
 [ActionReplay] Add action replay cheats here.
-
-$(M) 
-N6MT-J2RM-UEQBJ
-RCNH-BP8X-D8PK0
- 
-$Always First Place 
-DTH9-2UDE-DMNUK
-WJ47-HAPU-G26KM
- 
-$Never Out of Bounds 
-NQXA-WHEW-GWUYK
-8PUE-8GT1-KM3CT
- 
-$Stunt Mode: Freeze Timer 
-EAM0-GDKP-NVZ3N
-8DJC-Z6V1-0FMZ8
- 
-$Stunt Mode: Massive Score 
-06G8-QT8V-VPU9H
-KJ6P-AD6W-0B9Y7
- 
-$Zero buoys missed 
-8670-40XP-AFR1T
-KK0V-JRR5-B6ZMQ
- 
-$Always turbo 
-1VYB-RJ6C-MK7Y0
-1V67-N5JA-ZRXHM
- 
-$PAL2NTSC Fix 
-6E9V-GCWJ-6902V
-QQ1C-JHY4-JRH84
- 
-$All Championships/Tracks Open 
-WC5V-Z0Q2-FKKCB
-X79Q-YHBG-BDJHP
-WHWY-KKTH-XNTRN
-UBKW-4CP8-2CC2G
-RGFB-07T4-M3HUX
- 
-$All Weather Options Available 
-7Z4U-HWYN-C5012
-93CW-B27C-UHJYG
-UVCC-R1C9-E506D
+$(M)
+C411794C 00000800
+$Always First Place
+0061C57B 00000000
+$Never Out of Bounds
+0061C874 00000000
+$Stunt Mode: Freeze Timer
+0461C82C 00010488
+$Stunt Mode: Massive Score
+0461DF58 3B9AC9FF
+$Zero buoys missed
+0261C696 00000000
+$Always turbo
+04623C7E 0000004B
+$PAL2NTSC Fix
+04252AC0 00000010
+$All Championships/Tracks Open
+04694558 01010101
+046945E0 00000001
+046945D4 00010001
+046945D8 00010000
+$All Weather Options Available
+040AA930 38000001
+040A5FE8 38000001
diff --git a/HAAA01.ini b/HAAA01.ini
new file mode 100644
index 0000000000..5103ffbfef
--- /dev/null
+++ b/HAAA01.ini
@@ -0,0 +1,9 @@
+# HAAA01 - Photo Channel 
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+Hack = -1
diff --git a/HACA01.ini b/HACA01.ini
index a0e1012023..0e3783276b 100644
--- a/HACA01.ini
+++ b/HACA01.ini
@@ -1,7 +1,7 @@
 # HACA01 - Mii Channel 
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = -1
+EmulationStateId = 3
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.