Merge branch 'master' of https://github.com/project64/project64

2020-06-06 10:34:47 +09:30 · 2020-06-06 10:34:47 +09:30 · b9dac46bdc
parent ae0410487c f3747c2802
commit b9dac46bdc
630 changed files with 11811 additions and 11890 deletions
--- a/Config/Cheats/007
+++ b/Config/Cheats/007
@ -1,23 +1,23 @@
 [033F4C13-319EE7A7-C:45]
 Name=007 - The World is Not Enough (U)
-Cheat0="Have All\Levels Unlocked",E966813A 5979
+Cheat0="Have All\Levels Unlocked",81102EE6 0021
 Cheat0_N=For Single Player Mode Only
-Cheat1="Invincibility On All levels",E96582C0 5A59
-Cheat2="Skip Intro,",D03B0E5F 0004,E88F61B1 5961
-Cheat3="Level select",E88F61B1 5961
-Cheat4="Infinite\Ammo On All Levels",E95C9F34 755A
-Cheat5="Have All\Guns On All Levels",E959457C 616A,E959457A 595A,E9594580 759C,E959457E 5959,E9965758 8D5C,E9965756 5A5A,E996575C 759C,E996575A 59BB,E9965760 FFDC,E996575E 5BE2,E9965764 FFDC,E9965762 5BF2,E9965768 FFDC,E9965766 5BFA,E996576C FFDC,E996576A 5B02,E9965770 FFDC,E996576E 5B0A,E9965774 FFDC,E9965772 5B1A,E9965778 FFDC,E9965776 5B22,E996577C FFDC,E996577A 5B2A,E9965780 FFDC,E996577E 5B32,E9965784 FFDC,E9965782 5B42,E9965788 FFDC,E9965786 5B4A,E996578C FFDC,E996578A 5B52,E9965790 FFDC,E996578E 5C5A,E9965794 FFDC,E9965792 5C62,E9965798 FFDC,E9965796 5C6A,E996579C FFDC,E996579A 5C7A,E99657A0 FFDC,E996579E 5C8A,E99657A4 FFDC,E99657A2 5C92,E99657A8 FFDC,E99657A6 5CAA,E99657AC FFDC,E99657AA 5CB2,E99657B0 FFDC,E99657AE 5CBA,E99657B4 FFDC,E99657B2 5CCA,E99657B8 FFDC,E99657B6 5CD2,E99657BC FFDC,E99657BA 5CDA,E99657C0 FFDC,E99657BE 5CE2,E99657C4 FFDC,E99657C2 5C9A,E99657C8 FFDC,E99657C6 5CA2,E99657CC FFDC,E99657CA 5CAA,E99657D0 6159,E99657CE CDDE,E99657D4 F9C7,E99657D2 5A4E
+Cheat1="Invincibility On All levels",81112F68 0101
+Cheat2="Skip Intro",D03B0E5F 0004,803B0E5F 0009
+Cheat3="Level select",803B0E5F 0009
+Cheat4="Infinite\Ammo On All Levels",810648DC 2400
+Cheat5="Have All\Guns On All Levels",8105F224 0810,8105F226 0000,8105F228 2442,8105F22A 0001,81400000 3C02,81400002 0100,81400004 2442,81400006 0063,81400008 AE82,8140000A 0288,8140000C AE82,8140000E 0298,81400010 AE82,81400012 02A0,81400014 AE82,81400016 02A8,81400018 AE82,8140001A 02B0,8140001C AE82,8140001E 02C0,81400020 AE82,81400022 02C8,81400024 AE82,81400026 02D0,81400028 AE82,8140002A 02D8,8140002C AE82,8140002E 02E8,81400030 AE82,81400032 02F0,81400034 AE82,81400036 02F8,81400038 AE82,8140003A 0300,8140003C AE82,8140003E 0308,81400040 AE82,81400042 0310,81400044 AE82,81400046 0320,81400048 AE82,8140004A 0330,8140004C AE82,8140004E 0338,81400050 AE82,81400052 0350,81400054 AE82,81400056 0358,81400058 AE82,8140005A 0360,8140005C AE82,8140005E 0370,81400060 AE82,81400062 0378,81400064 AE82,81400066 0380,81400068 AE82,8140006A 0388,8140006C AE82,8140006E 0340,81400070 AE82,81400072 0348,81400074 AE82,81400076 0350,81400078 0801,8140007A 7C8C,8140007C A077,8140007E 01FC
 Cheat5_N=Once you pick up a Gun You will have all weapons
-Cheat6="Time Taken Clock At 0:00",E8668256 595A
-Cheat7="Infinite\Time",E98E418E 7212
+Cheat6="Time Taken Clock At 0:00",80102F02 0000
+Cheat7="Infinite\Time",8138EE3A 19B8
 Cheat7_N=Underground Uprising
-Cheat8="Have All\Skins + Everyone is Evil",50005C0C 0000,100BF687 0081
-Cheat9="Have All\Gadgets",E86582C3 5959
-Cheat10="Go Solo In Multiplayer",D00E0778 0042,E8665509 5959
-Cheat11="Stop Bond From Going Downhill on Cold Reception",D10E0778 0020,E890DBBA 5959,D10E0778 0010,E890DBBA 595A
+Cheat8="Have All\Skins + Everyone is Evil",50005C0C 0000,800BF687 0081
+Cheat9="Have All\Gadgets",80112F6D 0001
+Cheat10="Go Solo In Multiplayer",D00E0778 0042,801002B7 0001
+Cheat11="Stop Bond From Going Downhill on Cold Reception",D10E0778 0020,803A8466 0001,D10E0778 0010,803A8466 0000
 Cheat11_N=Press L to Stop, & R to Go
-Cheat12="Fail Objectives To Complete Them",E9576C10 755C,E9576C0E 5969
-Cheat13="Infinite\Ammo On Clip,",E95CA004 755A
-Cheat14="Have Tons Of Nightvision",E95CA3D6 665A
+Cheat12="Fail Objectives To Complete Them",810315B8 2402,810315BA 0011
+Cheat13="Infinite\Ammo On Clip",810649AC 2400
+Cheat14="Have Tons Of Nightvision",81064C82 1500
 Cheat14_N=For Battery Only
-Cheat15="Play Crate Yard Level",E8668131 5962
+Cheat15="Play Crate Yard Level",80102EDF 0008
--- a/Config/Cheats/007
+++ b/Config/Cheats/007
@ -1,13 +1,16 @@
 [3B941695-F90A5EEB-C:50]
-Name=007 The World is Not Enough (E)
-Cheat0="Invincible",E9659A30 5A59
-Cheat1="Access Levels & Difficulties",E9668EBA 5979,50000D01 0000,10118F38 0001
-Cheat2="Infinite Time",E9668ED6 595A
-Cheat3="Infinite Oxygen",E8647C3C 5956
-Cheat4="Multi Player\Access All Arenas",E8659A3D 5959,E9659A44 5A59,E8659A42 5959
-Cheat5="Multi Player\Access All Scenarios",E8659A41 5959,E9659A48 5A59
-Cheat6="Multi Player\Access All Weapon Modes",E9659A46 5A59,E8659A4C 5959
-Cheat7="Multi Player\Access All Evil Skins",50005C0C 0000,100C0167 0081
-Cheat8="Multi Player\Access Good Q",E8625941 5959
-Cheat9="Multi Player\Access Evil Q",E8625941 59D9
-Cheat10="Multi Player\Invincible",E9659A30 5A59
+Name=007 - The World is Not Enough (E) (M3)
+Cheat0="Invincible",811147D8 0101
+Cheat1="Access Levels & Difficulties",81103B66 0021,50000D01 0000,80118F38 0001
+Cheat2="Infinite Time",81103B82 0000
+Cheat3="Infinite Oxygen",800E25E4 0004
+Cheat4="Multi Player\Access All Arenas",801147EB 0001,811147EC 0101,801147EE 0001
+Cheat5="Multi Player\Access All Scenarios",801147EF 0001,811147F0 0101
+Cheat6="Multi Player\Access All Weapon Modes",811147F2 0101,801147F4 0001
+Cheat7="Multi Player\Access All Evil Skins",50005C0C 0000,800C0167 0081
+Cheat8="Multi Player\Access Good Q",800C06EF 0001
+Cheat9="Multi Player\Access Evil Q",800C06EF 0081
+Cheat10="Multi Player\Invincible",811147D8 0101
+Cheat11="Access\All Guns and Weapons",801147DC 0001
+Cheat11_N=This also comes with Ammo
+Cheat12="Access\All Gadgets and Items",801147DD 0001
--- a/Config/Cheats/1080
+++ b/Config/Cheats/1080
@ -1,29 +0,0 @@
-[58FD3F25-D92EAA8D-C:50]
-Name=1080 SNOWBOARDING
-Cheat0="Infinite Damage All Players and Levels",E893A357 595A
-Cheat1="Prees L For Infinite Lives & Continues",D00556A9 0020,E87C089D 595B
-Cheat1_N=Whenever you've lost a life, Press L.Do not press L when on the main menu or during the intro Only use this feature in Match Race
-Cheat2="Enable All Levels & Boarders",E8795D0F 594F,E8795D0D 5955,E9795D1A 4D4F,E8795D20 5957
-Cheat3="Stop Timer\Time Attack\Air Make",E885FD9E 595A
-Cheat4="Stop Timer\Time Attack\Half Pipe",E883B6DE 595A
-Cheat5="Stop Timer\Time Attack\Crystal Lake",E880AF7E 595A
-Cheat6="Stop Timer\Time Attack\Crystal Peak",E87F7E1E 595A
-Cheat7="Stop Timer\Time Attack\Golden Forrest",E87F66AE 595A
-Cheat8="Stop Timer\Time Attack\Mountain Village",E88210AE 595A
-Cheat9="Stop Timer\Time Attack\Dragon Cave",E88266CE 595A
-Cheat10="Stop Timer\Time Attack\Deadly Fall",E8824CBE 595A
-Cheat11="Stop Timer\Trick Attack\Air Make",E885FD0E 5915
-Cheat12="Stop Timer\Trick Attack\Half Pipe",E883B64E 5915
-Cheat13="Stop Timer\Trick Attack\Crystal Lake",E87D49BE 5915
-Cheat14="Stop Timer\Trick Attack\Crystal Peak",E8801F3E 5915
-Cheat15="Stop Timer\Trick Attack\Golden Forrest",E88002AE 5915
-Cheat16="Stop Timer\Trick Attack\Mountain Village",E882A72E 5915
-Cheat17="Stop Timer\Trick Attack\Dragon Cave",E87F048E 5915
-Cheat18="Stop Timer\Trick Attack\Deadly Fall",E882E15E 5915
-Cheat19="Stop Timer\Contest\Crystal Lake",E87D172E 5915
-Cheat20="Stop Timer\Contest\Crystal Peak",E880DFEE 5915
-Cheat21="Stop Timer\Contest\Golden Forest",E880C48E 5915
-Cheat22="Stop Timer\Contest\Air Make",E885EE0E 5915
-Cheat23="Stop Timer\Contest\Half Pipe",E883A84E 5915
-Cheat24="Play As",E855F739 59??
-Cheat24_O=$5A Dion Blaster,$59 Kensuke Kimachi,$5C Akari Hayami,$5B Ricky Winterborn,$56 Rob Haywood,$55 Silver Boarder,$58 Gold Boarder,$57 Panda Boarder
--- a/Config/Cheats/1080
+++ b/Config/Cheats/1080
@ -0,0 +1,29 @@
+[58FD3F25-D92EAA8D-C:50]
+Name=1080 Snowboarding (E) (M4)
+Cheat0="Infinite Damage All Players and Levels",803F4C01 0000
+Cheat1="Prees L For Infinite Lives & Continues",D00556A9 0020,8026B14B 0003
+Cheat1_N=Whenever you've lost a life, Press L.Do not press L when on the main menu or during the intro Only use this feature in Match Race
+Cheat2="Enable All Levels & Boarders",80250AB9 00FF,80250ABB 0005,81250AC6 FCFF,80250AC8 0007
+Cheat3="Stop Timer\Time Attack\Air Make",8031AA4A 0000
+Cheat4="Stop Timer\Time Attack\Half Pipe",802F638A 0000
+Cheat5="Stop Timer\Time Attack\Crystal Lake",802A582A 0000
+Cheat6="Stop Timer\Time Attack\Crystal Peak",802B2BCA 0000
+Cheat7="Stop Timer\Time Attack\Golden Forrest",802B135A 0000
+Cheat8="Stop Timer\Time Attack\Mountain Village",802CB95A 0000
+Cheat9="Stop Timer\Time Attack\Dragon Cave",802C137A 0000
+Cheat10="Stop Timer\Time Attack\Deadly Fall",802CF56A 0000
+Cheat11="Stop Timer\Trick Attack\Air Make",8031AABA 00C5
+Cheat12="Stop Timer\Trick Attack\Half Pipe",802F63FA 00C5
+Cheat13="Stop Timer\Trick Attack\Crystal Lake",8029F66A 00C5
+Cheat14="Stop Timer\Trick Attack\Crystal Peak",802AC8EA 00C5
+Cheat15="Stop Timer\Trick Attack\Golden Forrest",802AAF5A 00C5
+Cheat16="Stop Timer\Trick Attack\Mountain Village",802C50DA 00C5
+Cheat17="Stop Timer\Trick Attack\Dragon Cave",802BAD3A 00C5
+Cheat18="Stop Timer\Trick Attack\Deadly Fall",802C8E0A 00C5
+Cheat19="Stop Timer\Contest\Crystal Lake",8029C0DA 00C5
+Cheat20="Stop Timer\Contest\Crystal Peak",802A889A 00C5
+Cheat21="Stop Timer\Contest\Golden Forest",802A6D3A 00C5
+Cheat22="Stop Timer\Contest\Air Make",80319BBA 00C5
+Cheat23="Stop Timer\Contest\Half Pipe",802F51FA 00C5
+Cheat24="Play As",8001A0E7 00??
+Cheat24_O=$00 Dion Blaster,$01 Kensuke Kimachi,$02 Akari Hayami,$03 Ricky Winterborn,$04 Rob Haywood,$05 Silver Boarder,$06 Gold Boarder,$07 Panda Boarder
--- a/Config/Cheats/1080
+++ b/Config/Cheats/1080
@ -1,34 +1,34 @@
 [1FBAF161-2C1C54F1-C:41]
 Name=1080 Snowboarding (JU) (M2)
-Cheat0="Infinite Damage All Players & Levels",E893A393 595A
-Cheat1="Infinite Lives & Continues",E87C081D 595B
-Cheat2="Enable All Levels & Boarders",E879A7DF 594F,E879A7DD 5955,E979A7EA 4D4F,E879A7F0 5957
-Cheat3="Stop Timer\Time Attack\Air Make",E885FEAE 595A
-Cheat4="Stop Timer\Time Attack\Half Pipe",E883BBEE 595A
-Cheat5="Stop Timer\Time Attack\Crystal Lake",E880B08E 595A
-Cheat6="Stop Timer\Time Attack\Crystal Peak",E87F832E 595A
-Cheat7="Stop Timer\Time Attack\Golden Forrest",E87F6BBE 595A
-Cheat8="Stop Timer\Time Attack\Mountain Village",E8820DBE 595A
-Cheat9="Stop Timer\Time Attack\Dragon Cave",E8826BDE 595A
-Cheat10="Stop Timer\Time Attack\Deadly Fall",E88249CE 595A
-Cheat11="Stop Timer\Trick Attack\Air Make",E885FE1E 5915
-Cheat12="Stop Timer\Trick Attack\Half Pipe",E883BC5E 5915
-Cheat13="Stop Timer\Trick Attack\Crystal Lake",E87D4ACE 5915
-Cheat14="Stop Timer\Trick Attack\Crystal Peak",E880204E 5915
-Cheat15="Stop Timer\Trick Attack\Golden Forrest",E88007BE 5915
-Cheat16="Stop Timer\Trick Attack\Mountain Village",E882A83E 5915
-Cheat17="Stop Timer\Trick Attack\Dragon Cave",E87F019E 5915
-Cheat18="Stop Timer\Trick Attack\Deadly Fall",E882E26E 5915
-Cheat19="Stop Timer\Contest\Crystal Lake",E87D183E 5915
-Cheat20="Stop Timer\Contest\Crystal Peak",E880E0FE 5915
-Cheat21="Stop Timer\Contest\Golden Forest",E880C19E 5915
-Cheat22="Stop Timer\Contest\Air Make",E885F31E 5915
-Cheat23="Stop Timer\Contest\Half Pipe",E883A65E 5915
-Cheat24="Have All\Match Levels Completed",E879A7DE 5955
-Cheat25="Have All\Contest First Place Done",E87A97F0 5957
-Cheat26="Open Level Character Select",E979A7DE 59??
+Cheat0="Infinite Damage All Players & Levels",803F4C3D 0000
+Cheat1="Infinite Lives & Continues",8026B1CB 0003
+Cheat2="Enable All Levels & Boarders",80255089 00FF,8025508B 0005,81255096 FCFF,80255098 0007
+Cheat3="Stop Timer\Time Attack\Air Make",8031AB5A 0000
+Cheat4="Stop Timer\Time Attack\Half Pipe",802F649A 0000
+Cheat5="Stop Timer\Time Attack\Crystal Lake",802A593A 0000
+Cheat6="Stop Timer\Time Attack\Crystal Peak",802B2CDA 0000
+Cheat7="Stop Timer\Time Attack\Golden Forrest",802B146A 0000
+Cheat8="Stop Timer\Time Attack\Mountain Village",802CBA6A 0000
+Cheat9="Stop Timer\Time Attack\Dragon Cave",802C148A 0000
+Cheat10="Stop Timer\Time Attack\Deadly Fall",802CF67A 0000
+Cheat11="Stop Timer\Trick Attack\Air Make",8031ABCA 00C5
+Cheat12="Stop Timer\Trick Attack\Half Pipe",802F650A 00C5
+Cheat13="Stop Timer\Trick Attack\Crystal Lake",8029F77A 00C5
+Cheat14="Stop Timer\Trick Attack\Crystal Peak",802AC9FA 00C5
+Cheat15="Stop Timer\Trick Attack\Golden Forrest",802AB06A 00C5
+Cheat16="Stop Timer\Trick Attack\Mountain Village",802C51EA 00C5
+Cheat17="Stop Timer\Trick Attack\Dragon Cave",802BAE4A 00C5
+Cheat18="Stop Timer\Trick Attack\Deadly Fall",802C8F1A 00C5
+Cheat19="Stop Timer\Contest\Crystal Lake",8029C1EA 00C5
+Cheat20="Stop Timer\Contest\Crystal Peak",802A89AA 00C5
+Cheat21="Stop Timer\Contest\Golden Forest",802A6E4A 00C5
+Cheat22="Stop Timer\Contest\Air Make",80319CCA 00C5
+Cheat23="Stop Timer\Contest\Half Pipe",802F530A 00C5
+Cheat24="Have All\Match Levels Completed",8025508A 0005
+Cheat25="Have All\Contest First Place Done",80244098 0007
+Cheat26="Open Level Character Select",8125508A 00??
 Cheat26_N=With these codes, you have to press the buttons listed below when you are viewing a certain boarders stats. Highlight Akari Hayami's stats, and then hold down the C-Left button and then press the A button to be the Crystal Boarder. Highlight Kensuke Kimachi's stats, and then hold down the C-Up button and then press the A button to be the Metal Boarder. Hightlight Rob Haywood's stats, and then hold down the C-Right button and then press the A button to be the Panda Boarder
-Cheat26_O=$59 Easy Level,$5C Easy & Normal Level,$5B Easy Normal & Hard Levels,$56 Easy Normal Hard Levels & Crystal Boarder,$55 Easy Normal Hard Levels & Crystal & Metal Boarders
-Cheat27="Play As",E8585739 59??
-Cheat27_O=$5A Dion Blaster,$59 Kensuke Kimachi,$5C Akari Hayami,$5B Ricky Winterborn,$56 Rob Haywood,$55 Silver Boarder,$58 Gold Boarder,$57 Panda Boarder
-Cheat28="Have All\Trick Attacks Done",E979A7EA 4D4F
+Cheat26_O=$01 Easy Level,$02 Easy & Normal Level,$03 Easy Normal & Hard Levels,$04 Easy Normal Hard Levels & Crystal Boarder,$05 Easy Normal Hard Levels & Crystal & Metal Boarders
+Cheat27="Play As",800200E7 00??
+Cheat27_O=$00 Dion Blaster,$01 Kensuke Kimachi,$02 Akari Hayami,$03 Ricky Winterborn,$04 Rob Haywood,$05 Silver Boarder,$06 Gold Boarder,$07 Panda Boarder
+Cheat28="Have All\Trick Attacks Done",81255096 FCFF
--- a/Config/Cheats/A
+++ b/Config/Cheats/A
@ -1,16 +1,16 @@
 [2B38AEC0-6350B810-C:46]
 Name=A Bug's Life (F)
-Cheat0="Infinite\Lives",E8747A18 5961
-Cheat1="Infinite\Health",E8747A0B 5956
-Cheat2="Always Have\Super Jump",E9747A08 597A
-Cheat3="Always Have\50 pieces of corn",E8747A17 598C
-Cheat4="Have F-L-I-K",E8747A16 595F
-Cheat5="Unlock All Levels",E95DF1E8 595F
-Cheat6="Have All Goldberry Tokens",E9747A02 595A
-Cheat7="Start with Berry Weapon",E8747A09 59??
-Cheat7_O=$59 Blueberry,$5C Homing Berry,$5B Goldberry,$56 Super Berry ?
-Cheat8="No Music",E87130BA 595A
-Cheat9="Subtitles On",E8712E2D 59??
-Cheat9_O=$5A Off,$59 On
-Cheat10="Levitate",D0090001 0010,E9747A7A 695A,D0090001 0010,E9747A8A 695A
+Cheat0="Infinite\Lives",801E27C0 0009
+Cheat1="Infinite\Health",801E27B5 0004
+Cheat2="Always Have\Super Jump",811E27B0 0020
+Cheat3="Always Have\50 pieces of corn",801E27C1 0032
+Cheat4="Have F-L-I-K",801E27C2 000F
+Cheat5="Unlock All Levels",81099E90 000F
+Cheat6="Have All Goldberry Tokens",811E27AE 0000
+Cheat7="Start with Berry Weapon",801E27B7 00??
+Cheat7_O=$01 Blueberry,$02 Homing Berry,$03 Goldberry,$04 Super Berry ?
+Cheat8="No Music",801DD966 0000
+Cheat9="Subtitles On",801DDBDB 00??
+Cheat9_O=$00 Off,$01 On
+Cheat10="Levitate",D0090001 0010,811E2726 1000,D0090001 0010,811E2736 1000
 Cheat10_N="Press R To Levitate & Let go to land (:"
--- a/Config/Cheats/A
+++ b/Config/Cheats/A
@ -1,16 +1,16 @@
 [F63B89CE-4582D57D-C:49]
 Name=A Bug's Life (I)
-Cheat0="Infinite\Lives",E8747AB8 5961
-Cheat1="Infinite\Health",E8747AAB 5956
-Cheat2="Always Have\Super Jump",E9747AA8 597A
-Cheat3="Always Have\50 pieces of corn",E8747AB7 598C
-Cheat4="Have F-L-I-K",E8747AB6 595F
-Cheat5="Unlock All Levels",E95DF188 595F
-Cheat6="Have All Goldberry Tokens",E9747AA2 595A
-Cheat7="Start with Berry Weapon",E8747AA9 59??
-Cheat7_O=$59 Blueberry,$5C Homing Berry,$5B Goldberry,$56 Super Berry ?
-Cheat8="No Music",E871305A 595A
-Cheat9="Subtitles On",E8712ECD 59??
-Cheat9_O=$5A Off,$59 On
-Cheat10="Levitate",D008FFA1 0010,E974791A 695A,D008FFA1 0010,E974792A 695A
+Cheat0="Infinite\Lives",801E2760 0009
+Cheat1="Infinite\Health",801E2755 0004
+Cheat2="Always Have\Super Jump",811E2750 0020
+Cheat3="Always Have\50 pieces of corn",801E2761 0032
+Cheat4="Have F-L-I-K",801E2762 000F
+Cheat5="Unlock All Levels",81099E30 000F
+Cheat6="Have All Goldberry Tokens",811E274E 0000
+Cheat7="Start with Berry Weapon",801E2757 00??
+Cheat7_O=$01 Blueberry,$02 Homing Berry,$03 Goldberry,$04 Super Berry ?
+Cheat8="No Music",801DD906 0000
+Cheat9="Subtitles On",801DDB7B 00??
+Cheat9_O=$00 Off,$01 On
+Cheat10="Levitate",D008FFA1 0010,811E26C6 1000,D008FFA1 0010,811E26D6 1000
 Cheat10_N="Press R To Levitate & Let go to land (:"
--- a/Config/Cheats/A
+++ b/Config/Cheats/A
@ -1,13 +1,13 @@
 [82DC04FD-CF2D82F4-C:45]
 Name=A Bug's Life (U)
-Cheat0="Infinite\Lives",E8746D90 5961
-Cheat1="Infinite\Health",E8746D83 5956
-Cheat2="Always Have\Super Jump",E9746D80 597A
-Cheat3="Always Have\50 pieces of corn",E8746D8F 598C
-Cheat4="Have F-L-I-K",E8746D8E 595F
-Cheat5="Levitate",D008F2C1 0010,E87470F2 5959,D008F2C1 0010,E8747002 5959
+Cheat0="Infinite\Lives",801E1A38 0009
+Cheat1="Infinite\Health",801E1A2D 0004
+Cheat2="Always Have\Super Jump",811E1A28 0020
+Cheat3="Always Have\50 pieces of corn",801E1A39 0032
+Cheat4="Have F-L-I-K",801E1A3A 000F
+Cheat5="Levitate",D008F2C1 0010,801E199E 0001,D008F2C1 0010,801E19AE 0001
 Cheat5_N="Press R To Levitate & Let go to land (:"
-Cheat6="Unlock All Levels",E95DE8A8 595F
-Cheat7="Have All Goldberry Tokens",E8746D7A 595A
-Cheat8="Start with Berry Weapon",E9746D82 59??
-Cheat8_O=$59 Blueberry,$5C Homing Berry,$5B Goldberry,$56 Super Berry ?
+Cheat6="Unlock All Levels",81099150 000F
+Cheat7="Have All Goldberry Tokens",801E1A26 0000
+Cheat8="Start with Berry Weapon",811E1A2E 00??
+Cheat8_O=$01 Blueberry,$02 Homing Berry,$03 Goldberry,$04 Super Berry ?
--- a/Config/Cheats/A
+++ b/Config/Cheats/A
@ -1,31 +1,31 @@
 [8F12C096-45DC17E1-C:50]
-Name=A Bug's Life
-Cheat0="Infinite\Lives",E8747BB8 5961
-Cheat1="Infinite\Health",E8747BAB 5956
-Cheat2="Always Have\Super Jump",E9747BA8 597A
-Cheat3="Always Have\50 pieces of corn",E8747BB7 598C
-Cheat4="Have F-L-I-K",E8747BB6 595F
-Cheat5="Levitate",D008FCE1 0010,E874761A 5959,D008FCE1 0010,E874762A 5959
+Name=A Bug's Life (E)
+Cheat0="Infinite\Lives",801E2460 0009
+Cheat1="Infinite\Health",801E2455 0004
+Cheat2="Always Have\Super Jump",811E2450 0020
+Cheat3="Always Have\50 pieces of corn",801E2461 0032
+Cheat4="Have F-L-I-K",801E2462 000F
+Cheat5="Levitate",D008FCE1 0010,801E23C6 0001,D008FCE1 0010,801E23D6 0001
 Cheat5_N="Press R To Levitate & Let go to land (:"
-Cheat6="Unlock All Levels",E95DEEC8 595F
-Cheat7="Have All Goldberry Tokens",D01E244E 0000,E8747BA2 595A
-Cheat8="Start with Berry Weapon",E8747BA9 59??
-Cheat8_O=$59 Blueberry,$5C Homing Berry,$5B Goldberry,$56 Super Berry ?
-Cheat9="All enemies killed",E8747BA2 595A,E8747BA1 595A
+Cheat6="Unlock All Levels",81099B70 000F
+Cheat7="Have All Goldberry Tokens",D01E244E 0000,801E244E 0000
+Cheat8="Start with Berry Weapon",801E2457 00??
+Cheat8_O=$01 Blueberry,$02 Homing Berry,$03 Goldberry,$04 Super Berry ?
+Cheat9="All enemies killed",801E244E 0000,801E244F 0000

 [DFF227D9-0D4D8169-C:44]
-Name=A Bug's Life
-Cheat0="Infinite\Lives",E8747AB8 5961
-Cheat1="Infinite\Health",E8747AAB 5956
-Cheat2="Always Have\Super Jump",E9747AA8 597A
-Cheat3="Always Have\50 pieces of corn",E8747AB7 598C
-Cheat4="Have F-L-I-K",E8747AB6 595F
-Cheat5="Unlock All Levels",E95DF188 595F
-Cheat6="Have All Goldberry Tokens",E9747AA2 595A
-Cheat7="Start with Berry Weapon",E8747AA9 59??
-Cheat7_O=$59 Blueberry,$5C Homing Berry,$5B Goldberry,$56 Super Berry ?
-Cheat8="No Music",E871305A 595A
-Cheat9="Subtitles On",E8712ECD 59??
-Cheat9_O=$5A Off,$59 On
-Cheat10="Levitate",D008FFA1 0010,E974791A 695A,D008FFA1 0010,E974792A 695A
+Name=A Bug's Life (G)
+Cheat0="Infinite\Lives",801E2760 0009
+Cheat1="Infinite\Health",801E2755 0004
+Cheat2="Always Have\Super Jump",811E2750 0020
+Cheat3="Always Have\50 pieces of corn",801E2761 0032
+Cheat4="Have F-L-I-K",801E2762 000F
+Cheat5="Unlock All Levels",81099E30 000F
+Cheat6="Have All Goldberry Tokens",811E274E 0000
+Cheat7="Start with Berry Weapon",801E2757 00??
+Cheat7_O=$01 Blueberry,$02 Homing Berry,$03 Goldberry,$04 Super Berry ?
+Cheat8="No Music",801DD906 0000
+Cheat9="Subtitles On",801DDB7B 00??
+Cheat9_O=$00 Off,$01 On
+Cheat10="Levitate",D008FFA1 0010,811E26C6 1000,D008FFA1 0010,811E26D6 1000
 Cheat10_N="Press R To Levitate & Let go to land (:"
--- a/Config/Cheats/AERO
+++ b/Config/Cheats/AERO
@ -1,21 +0,0 @@
-[62F6BE95-F102D6D6-C:50]
-Name=AERO FIGHTERS ASSAUL
-Cheat0="Extra Planes",E97B29F4 504F
-Cheat1="Infinite\99 Lives",E889AAA0 59BB
-Cheat2="99 Bonus",E8676C89 59BB
-Cheat3="99 Accuracy",E8676C88 59BB
-Cheat4="Gun Select",E87B4025 59??
-Cheat4_O=$5A Chaff,$59 Jammings,$5C Air Mines,$5B Mahibishi,$64 22mm BB Shot,$63 22mm,$5E Hunai Shot,$5D Fireball,$60 Sabre,$66 Fire,$65 Tomahawk,$68 Ninja Glitch,$67 Fire Wave,$70 Rocket,$6F Phoenix,$7A Star,$79 Fire Arrow,$82 Ninjabeam
-Cheat5="Infinite\Chaffs",E87B4019 5964
-Cheat6="Infinite\Gun",E87B3D18 5959
-Cheat7="Infinite\Special Weapons",E87B41D6 595C
-Cheat8="Infinite\Armor",E97B30FC 95FA,E97B3000 95FA
-Cheat9="Infinite\Health",E87B30FB 5922,E87B30FF 5922
-Cheat10="Always Have\F-15J Eagle",E87B29F4 596A
-Cheat11="Always Have\X-29A A.T.D.",E87B29F3 597A
-Cheat12="Stage Select screen unlocked",D0281691 0030,E87B2C18 5964,D0281691 0030,E87B2C2E 5964
-Cheat12_N=Hold L + R at the Game Mode screen and it will unlock every single level in the game; from Tokyo to Space. Do not hold L + R on any other screen, as this may cause game to freeze
-Cheat13="All Boss Attack levels unlocked",E889AA57 598F
-Cheat13_N=Unlocks all planes in death match
-Cheat14="F-15J Eagle & X-29A A.T.D. planes unlocked",E889AAB4 59??
-Cheat14_O=$6A F-15J Eagle,$7A X-29A A.T.D.,$8F Both of the above planes
--- a/Config/Cheats/AEROGAUGE.cht
+++ b/Config/Cheats/AEROGAUGE.cht
@ -1,23 +0,0 @@
-[D83045C8-F29D3A36-C:50]
-Name=AEROGAUGE
-Cheat0="No Damage\Player 1",50000402 0000,1113F338 0000
-Cheat1="No Damage\Player 2",50000402 0000,111413D8 0000
-Cheat2="Unlock Hidden Tracks & Cars",E85D65D4 5959
-Cheat2_N=All of the Freeze All Lap Timers must be on. These codes will Stop the others from racing against you in Grand Prix mode. To win a race in Grand Prix you must finish at least one lap in the qualify round, then complete all laps in race for first.
-Cheat3="Freeze All Timers",E8674757 595A,E867475B 595A,E867475E 595A
-Cheat4="Freeze Overall Timer",E867424B 5959
-Cheat4_N=All of the Freeze All Lap Timers must be on. These codes will Stop the others from racing against you in Grand Prix mode. To win a race in Grand Prix you must finish at least one lap in the qualify round, then complete all laps in race for first.
-Cheat5="Laps Of Race",E8674241 59??
-Cheat5_O=$59 1 Lap,$5C 2 Laps,$5B 3 Laps,$56 4 Laps,$55 5 Laps,$58 Never Ending Laps
-Cheat6="Play As\Player 1",E867454B 59??
-Cheat6_O=$5A N64 Control Pad,$59 Interceptor,$5C Hornet,$5B Avenger,$56 Shredder,$55 Black Lightning,$58 Vengeance,$57 Prowler,$62 Reaper,$61 Dominator
-Cheat7="Play As\Player 2",E867454A 59??
-Cheat7_O=$5A N64 Control Pad,$59 Interceptor,$5C Hornet,$5B Avenger,$56 Shredder,$55 Black Lightning,$58 Vengeance,$57 Prowler,$62 Reaper,$61 Dominator
-Cheat8="Level Select",E867454D 59??
-Cheat8_N=For this cheat to work,as soon as you put the cheat on you must turn it back off,if not you wont beable to quit a Race or even finish one.
-Cheat8_O=$5A Canyon Rush,$59 Bikini Island,$5C China Town,$5B Neo Arena,$56 China Town Jam,$55 Neo Speed Way
-Cheat9="Always 1st",E8674798 5959
-Cheat10="Music Modifier",E863C8B1 59??
-Cheat10_O=$4F Music On,$5A Music Off
-Cheat11="Language Select",E85E22E5 59??
-Cheat11_O=$5A English,$59 French,$5C German
--- a/Config/Cheats/AeroFighters
+++ b/Config/Cheats/AeroFighters
@ -0,0 +1,21 @@
+[62F6BE95-F102D6D6-C:50]
+Name=AeroFighters Assault (E) (M3)
+Cheat0="Extra Planes",8127D69C FFFF
+Cheat1="Infinite\99 Lives",80355748 0063
+Cheat2="99 Bonus",80131537 0063
+Cheat3="99 Accuracy",80131530 0063
+Cheat4="Gun Select",8027E9D3 00??
+Cheat4_O=$00 Chaff,$01 Jammings,$02 Air Mines,$03 Mahibishi,$0A 22mm BB Shot,$0B 22mm,$0C Hunai Shot,$0D Fireball,$0E Sabre,$14 Fire,$15 Tomahawk,$16 Ninja Glitch,$17 Fire Wave,$1E Rocket,$1F Phoenix,$20 Star,$21 Fire Arrow,$28 Ninjabeam
+Cheat5="Infinite\Chaffs",8027E9C7 000A
+Cheat6="Infinite\Gun",8027EAC0 0001
+Cheat7="Infinite\Special Weapons",8027EE82 0002
+Cheat8="Infinite\Armor",8127D9A4 44A0,8127D9A8 44A0
+Cheat9="Infinite\Health",8027D9A5 00C8,8027D9A9 00C8
+Cheat10="Always Have\F-15J Eagle",8027D69C 0010
+Cheat11="Always Have\X-29A A.T.D.",8027D69D 0020
+Cheat12="Stage Select screen unlocked",D0281691 0030,8027D5C0 000A,D0281691 0030,8027D5DA 000A
+Cheat12_N=Hold L + R at the Game Mode screen and it will unlock every single level in the game; from Tokyo to Space. Do not hold L + R on any other screen, as this may cause game to freeze
+Cheat13="All Boss Attack levels unlocked",80355701 003F
+Cheat13_N=Unlocks all planes in death match
+Cheat14="F-15J Eagle & X-29A A.T.D. planes unlocked",8035575C 00??
+Cheat14_O=$10 F-15J Eagle,$20 X-29A A.T.D.,$3F Both of the above planes
--- a/Config/Cheats/AeroGauge
+++ b/Config/Cheats/AeroGauge
@ -0,0 +1,23 @@
+[D83045C8-F29D3A36-C:50]
+Name=AeroGauge (E) (M3)
+Cheat0="No Damage\Player 1",50000402 0000,8113F338 0000
+Cheat1="No Damage\Player 2",50000402 0000,811413D8 0000
+Cheat2="Unlock Hidden Tracks & Cars",8009127C 0001
+Cheat2_N=All of the Freeze All Lap Timers must be on. These codes will Stop the others from racing against you in Grand Prix mode. To win a race in Grand Prix you must finish at least one lap in the qualify round, then complete all laps in race for first.
+Cheat3="Freeze All Timers",8013F001 0000,8013F005 0000,8013F00A 0000
+Cheat4="Freeze Overall Timer",8013EFF5 0001
+Cheat4_N=All of the Freeze All Lap Timers must be on. These codes will Stop the others from racing against you in Grand Prix mode. To win a race in Grand Prix you must finish at least one lap in the qualify round, then complete all laps in race for first.
+Cheat5="Laps Of Race",8013EFEF 00??
+Cheat5_O=$01 1 Lap,$02 2 Laps,$03 3 Laps,$04 4 Laps,$05 5 Laps,$06 Never Ending Laps
+Cheat6="Play As\Player 1",8013F2F5 00??
+Cheat6_O=$00 N64 Control Pad,$01 Interceptor,$02 Hornet,$03 Avenger,$04 Shredder,$05 Black Lightning,$06 Vengeance,$07 Prowler,$08 Reaper,$09 Dominator
+Cheat7="Play As\Player 2",8013F2F6 00??
+Cheat7_O=$00 N64 Control Pad,$01 Interceptor,$02 Hornet,$03 Avenger,$04 Shredder,$05 Black Lightning,$06 Vengeance,$07 Prowler,$08 Reaper,$09 Dominator
+Cheat8="Level Select",8013F2FB 00??
+Cheat8_N=For this cheat to work,as soon as you put the cheat on you must turn it back off,if not you wont beable to quit a Race or even finish one.
+Cheat8_O=$00 Canyon Rush,$01 Bikini Island,$02 China Town,$03 Neo Arena,$04 China Town Jam,$05 Neo Speed Way
+Cheat9="Always 1st",8013F040 0001
+Cheat10="Music Modifier",800F715F 00??
+Cheat10_O=$FF Music On,$00 Music Off
+Cheat11="Language Select",8008CF93 00??
+Cheat11_O=$00 English,$01 French,$02 German
--- a/Config/Cheats/AeroGauge
+++ b/Config/Cheats/AeroGauge
@ -1,20 +1,20 @@
 [B00903C9-3916C146-C:4A]
 Name=AeroGauge (J) (V1.0) (Kiosk Demo)
-Cheat0="No Damage\Player 1",50000402 0000,1113D058 0000
-Cheat1="No Damage\Player 2",50000402 0000,1113F0E8 0000
-Cheat2="Unlock All Tracks and Vehicles",E85E2854 5959
-Cheat3="Freeze All Lap Timers",E8672477 5959,E867247B 5959,E867247F 5959
-Cheat4="Freeze Overall Timer",E867246B 5959
+Cheat0="No Damage\Player 1",50000402 0000,8113D058 0000
+Cheat1="No Damage\Player 2",50000402 0000,8113F0E8 0000
+Cheat2="Unlock All Tracks and Vehicles",8008D1FC 0001
+Cheat3="Freeze All Lap Timers",8013CD21 0001,8013CD25 0001,8013CD29 0001
+Cheat4="Freeze Overall Timer",8013CD15 0001
 Cheat4_N=All of the Freeze All Lap Timers must be on. These codes will Stop the others from racing against you in Grand Prix mode. To win a race in Grand Prix you must finish at least one lap in the qualify round, then complete all laps in race for first.
-Cheat5="Laps Of Race",E8672462 59??
-Cheat5_O=$59 1 Lap,$5C 2 Laps,$5B 3 Laps,$56 4 Laps,$55 5 Laps,$58 Never Ending Laps
-Cheat6="Play As\Player 1",E867276B 59??
-Cheat6_O=$5A N64 Control Pad,$59 Interceptor,$5C Hornet,$5B Avenger,$56 Shredder,$55 Black Lightning,$58 Vengeance,$57 Prowler,$62 Reaper,$61 Dominator
-Cheat7="Level Select",E867276D 59??
+Cheat5="Laps Of Race",8013CD0E 00??
+Cheat5_O=$01 1 Lap,$02 2 Laps,$03 3 Laps,$04 4 Laps,$05 5 Laps,$06 Never Ending Laps
+Cheat6="Play As\Player 1",8013D015 00??
+Cheat6_O=$00 N64 Control Pad,$01 Interceptor,$02 Hornet,$03 Avenger,$04 Shredder,$05 Black Lightning,$06 Vengeance,$07 Prowler,$08 Reaper,$09 Dominator
+Cheat7="Level Select",8013D01B 00??
 Cheat7_N=For this cheat to work,as soon as you put the cheat on you must turn it back off,if not you wont beable to quit a Race or even finish one.
-Cheat7_O=$5A Canyon Rush,$59 Bikini Island,$5C China Town,$5B Neo Arena,$56 China Town Jam,$55 Neo Speed Way
-Cheat8="Play As\Player 2",E867276A 59??
-Cheat8_O=$5A N64 Control Pad,$59 Interceptor,$5C Hornet,$5B Avenger,$56 Shredder,$55 Black Lightning,$58 Vengeance,$57 Prowler,$62 Reaper,$61 Dominator
-Cheat9="Always 1st",E86724B8 5959
-Cheat10="Music Modifier",E866C324 59??
-Cheat10_O=$4F Music On,$5A Music Off
+Cheat7_O=$00 Canyon Rush,$01 Bikini Island,$02 China Town,$03 Neo Arena,$04 China Town Jam,$05 Neo Speed Way
+Cheat8="Play As\Player 2",8013D016 00??
+Cheat8_O=$00 N64 Control Pad,$01 Interceptor,$02 Hornet,$03 Avenger,$04 Shredder,$05 Black Lightning,$06 Vengeance,$07 Prowler,$08 Reaper,$09 Dominator
+Cheat9="Always 1st",8013CD60 0001
+Cheat10="Music Modifier",80106CCC 00??
+Cheat10_O=$FF Music On,$00 Music Off
--- a/Config/Cheats/AeroGauge
+++ b/Config/Cheats/AeroGauge
@ -1,20 +1,20 @@
 [80F41131-384645F6-C:4A]
 Name=AeroGauge (J) (V1.1)
-Cheat0="No Damage\Player 1",50000402 0000,1113CF08 0000
-Cheat1="No Damage\Player 2",50000402 0000,1113EF98 0000
-Cheat2="Unlock All Tracks and Vehicles",E85E2704 5959
-Cheat3="Freeze All Lap Timers",E8671E27 5959,E8671E2B 5959,E8671E2F 5959
-Cheat4="Freeze Overall Timer",E8671E1B 5959
+Cheat0="No Damage\Player 1",50000402 0000,8113CF08 0000
+Cheat1="No Damage\Player 2",50000402 0000,8113EF98 0000
+Cheat2="Unlock All Tracks and Vehicles",8008D0AC 0001
+Cheat3="Freeze All Lap Timers",8013CBD1 0001,8013CBD5 0001,8013CBD9 0001
+Cheat4="Freeze Overall Timer",8013CBC5 0001
 Cheat4_N=All of the Freeze All Lap Timers must be on. These codes will Stop the others from racing against you in Grand Prix mode. To win a race in Grand Prix you must finish at least one lap in the qualify round, then complete all laps in race for first.
-Cheat5="Laps Of Race",E8671E12 59??
-Cheat5_O=$59 1 Lap,$5C 2 Laps,$5B 3 Laps,$56 4 Laps,$55 5 Laps,$58 Never Ending Laps
-Cheat6="Play As\Player 1",E867211B 59??
-Cheat6_O=$5A N64 Control Pad,$59 Interceptor,$5C Hornet,$5B Avenger,$56 Shredder,$55 Black Lightning,$58 Vengeance,$57 Prowler,$62 Reaper,$61 Dominator
-Cheat7="Level Select",E867211D 59??
+Cheat5="Laps Of Race",8013CBBE 00??
+Cheat5_O=$01 1 Lap,$02 2 Laps,$03 3 Laps,$04 4 Laps,$05 5 Laps,$06 Never Ending Laps
+Cheat6="Play As\Player 1",8013CEC5 00??
+Cheat6_O=$00 N64 Control Pad,$01 Interceptor,$02 Hornet,$03 Avenger,$04 Shredder,$05 Black Lightning,$06 Vengeance,$07 Prowler,$08 Reaper,$09 Dominator
+Cheat7="Level Select",8013CECB 00??
 Cheat7_N=For this cheat to work,as soon as you put the cheat on you must turn it back off,if not you wont beable to quit a Race or even finish one.
-Cheat7_O=$5A Canyon Rush,$59 Bikini Island,$5C China Town,$5B Neo Arena,$56 China Town Jam,$55 Neo Speed Way
-Cheat8="Play As\Player 2",E867211A 59??
-Cheat8_O=$5A N64 Control Pad,$59 Interceptor,$5C Hornet,$5B Avenger,$56 Shredder,$55 Black Lightning,$58 Vengeance,$57 Prowler,$62 Reaper,$61 Dominator
-Cheat9="Always 1st",E8672368 5959
-Cheat10="Music Modifier",E866BED4 59??
-Cheat10_O=$4F Music On,$5A Music Off
+Cheat7_O=$00 Canyon Rush,$01 Bikini Island,$02 China Town,$03 Neo Arena,$04 China Town Jam,$05 Neo Speed Way
+Cheat8="Play As\Player 2",8013CEC6 00??
+Cheat8_O=$00 N64 Control Pad,$01 Interceptor,$02 Hornet,$03 Avenger,$04 Shredder,$05 Black Lightning,$06 Vengeance,$07 Prowler,$08 Reaper,$09 Dominator
+Cheat9="Always 1st",8013CC10 0001
+Cheat10="Music Modifier",80106B7C 00??
+Cheat10_O=$FF Music On,$00 Music Off
--- a/Config/Cheats/AeroGauge
+++ b/Config/Cheats/AeroGauge
@ -1,19 +1,19 @@
 [AEBE463E-CC71464B-C:45]
 Name=AeroGauge (U)
-Cheat0="No Damage\Player 1",50000402 0000,1113FFD8 0000
-Cheat1="No Damage\Player 2",50000402 0000,11142078 0000
-Cheat2="Unlock Hidden Tracks & Cars",E85E45F4 5959
-Cheat3="Freeze All Lap Timers",E86753F7 5959,E86753FB 5959,E86753FF 5959
-Cheat4="Freeze Overall Timer",E86753EB 5959
+Cheat0="No Damage\Player 1",50000402 0000,8113FFD8 0000
+Cheat1="No Damage\Player 2",50000402 0000,81142078 0000
+Cheat2="Unlock Hidden Tracks & Cars",8008F29C 0001
+Cheat3="Freeze All Lap Timers",8013FCA1 0001,8013FCA5 0001,8013FCA9 0001
+Cheat4="Freeze Overall Timer",8013FC95 0001
 Cheat4_N=All of the Freeze All Lap Timers must be on. These codes will Stop the others from racing against you in Grand Prix mode. To win a race in Grand Prix you must finish at least one lap in the qualify round, then complete all laps in race for first.
-Cheat5="Laps Of Race",E86753E2 59??
-Cheat5_O=$59 1 Lap,$5C 2 Laps,$5B 3 Laps,$56 4 Laps,$55 5 Laps,$58 Never Ending Laps
-Cheat6="Play As\Player 1",E86752EB 59??
-Cheat6_O=$5A N64 Control Pad,$59 Interceptor,$5C Hornet,$5B Avenger,$56 Shredder,$55 Black Lightning,$58 Vengeance,$57 Prowler,$62 Reaper,$61 Dominator
-Cheat7="Play As\Player 2",E86752EA 59??
-Cheat7_O=$5A N64 Control Pad,$59 Interceptor,$5C Hornet,$5B Avenger,$56 Shredder,$55 Black Lightning,$58 Vengeance,$57 Prowler,$62 Reaper,$61 Dominator
-Cheat8="Level Select",E86752ED 59??
-Cheat8_O=$5A Canyon Rush,$59 Bikini Island,$5C China Town,$5B Neo Arena,$56 China Town Jam,$55 Neo Speed Way
-Cheat9="Always 1st",E8675338 5959
-Cheat10="Music Modifier",E866EE34 59??
-Cheat10_O=$4F Music On,$5A Music Off
+Cheat5="Laps Of Race",8013FC8E 00??
+Cheat5_O=$01 1 Lap,$02 2 Laps,$03 3 Laps,$04 4 Laps,$05 5 Laps,$06 Never Ending Laps
+Cheat6="Play As\Player 1",8013FF95 00??
+Cheat6_O=$00 N64 Control Pad,$01 Interceptor,$02 Hornet,$03 Avenger,$04 Shredder,$05 Black Lightning,$06 Vengeance,$07 Prowler,$08 Reaper,$09 Dominator
+Cheat7="Play As\Player 2",8013FF96 00??
+Cheat7_O=$00 N64 Control Pad,$01 Interceptor,$02 Hornet,$03 Avenger,$04 Shredder,$05 Black Lightning,$06 Vengeance,$07 Prowler,$08 Reaper,$09 Dominator
+Cheat8="Level Select",8013FF9B 00??
+Cheat8_O=$00 Canyon Rush,$01 Bikini Island,$02 China Town,$03 Neo Arena,$04 China Town Jam,$05 Neo Speed Way
+Cheat9="Always 1st",8013FCE0 0001
+Cheat10="Music Modifier",80109BDC 00??
+Cheat10_O=$FF Music On,$00 Music Off
--- a/Config/Cheats/Aerofighter's
+++ b/Config/Cheats/Aerofighter's
@ -1,19 +1,19 @@
 [1B598BF1-ECA29B45-C:45]
-Name=Aerofighter's Assault (U)
-Cheat0="Ultra Fast Missile Recharge",E87B3658 5959
-Cheat1="Rocket Squad",E87B3859 5959
-Cheat2="Tomahawk Squad",E87B385F 5959
-Cheat3="Extra Points",D027A20C 0000,E87BF564 594F
-Cheat4="Extra Planes",E97B2344 504F
-Cheat5="99 Bonus",E8675ED9 59BB
-Cheat6="99 Accuracy",E8675ED8 59BB
-Cheat7="Gun Select",E87B3775 59??
-Cheat7_O=$5A Chaff,$59 Jammings,$5C Air Mines,$5B Mahibishi,$64 22mm BB Shot,$63 22mm,$5E Hunai Shot,$5D Fireball,$60 Sabre,$66 Fire,$65 Tomahawk,$68 Ninja Glitch,$67 Fire Wave,$70 Rocket,$6F Phoenix,$7A Star,$79 Fire Arrow,$82 Ninjabeam
-Cheat8="Infinite\Chaffs",E87B3769 5964
-Cheat9="Infinite\Gun",E87B3868 5959
-Cheat10="Infinite\Special Weapons",E87B3B26 595C
-Cheat11="Infinite\Armor",E97B224C 95FA,E97B2250 95FA
-Cheat12="Infinite\Health",E87B224B 5922,E87B224F 5922
-Cheat13="Always Have\F-15J Eagle",E87B2344 596A
-Cheat14="Always Have\X-29A A.T.D.",E87B2343 597A
-Cheat15="Infinite\99 Lives",E88ADEF0 59BB
+Name=AeroFighters Assault (U)
+Cheat0="Ultra Fast Missile Recharge",8027E300 0001
+Cheat1="Rocket Squad",8027E107 0001
+Cheat2="Tomahawk Squad",8027E109 0001
+Cheat3="Extra Points",D027A20C 0000,8027A20C 00FF
+Cheat4="Extra Planes",8127CCEC FFFF
+Cheat5="99 Bonus",80130B87 0063
+Cheat6="99 Accuracy",80130B80 0063
+Cheat7="Gun Select",8027E023 00??
+Cheat7_O=$00 Chaff,$01 Jammings,$02 Air Mines,$03 Mahibishi,$0A 22mm BB Shot,$0B 22mm,$0C Hunai Shot,$0D Fireball,$0E Sabre,$14 Fire,$15 Tomahawk,$16 Ninja Glitch,$17 Fire Wave,$1E Rocket,$1F Phoenix,$20 Star,$21 Fire Arrow,$28 Ninjabeam
+Cheat8="Infinite\Chaffs",8027E017 000A
+Cheat9="Infinite\Gun",8027E110 0001
+Cheat10="Infinite\Special Weapons",8027E4D2 0002
+Cheat11="Infinite\Armor",8127CFF4 44A0,8127CFF8 44A0
+Cheat12="Infinite\Health",8027CFF5 00C8,8027CFF9 00C8
+Cheat13="Always Have\F-15J Eagle",8027CCEC 0010
+Cheat14="Always Have\X-29A A.T.D.",8027CCED 0020
+Cheat15="Infinite\99 Lives",80348B98 0063
--- a/Config/Cheats/Aidyn
+++ b/Config/Cheats/Aidyn
@ -1,9 +1,9 @@
 [2DC4FFCC-C8FF5A21-C:50]
 Name=Aidyn Chronicles - The First Mage (E)
-Cheat0="Infinite\Max Health",E87BE660 5970
-Cheat1="Infinite\99 Health Potions",E87BDABD 59BB
+Cheat0="Infinite\Max Health",80279308 001E
+Cheat1="Infinite\99 Health Potions",8027876B 0063
 Cheat1_N=Do Not put this cheat on until you have collected your 1st Health Potion from the 1st Cheat or you will not be able to get into the Sub menu and Continue the game.
-Cheat2="Have\Max Gold",50000401 0000,10277AA5 00FF
-Cheat3="Have\Max Total XP",50000401 0000,1027931D 00FF
-Cheat4="Have\Max Total XP Remaning to Start",50000401 0000,10279321 00FF
+Cheat2="Have\Max Gold",50000401 0000,80277AA5 00FF
+Cheat3="Have\Max Total XP",50000401 0000,8027931D 00FF
+Cheat4="Have\Max Total XP Remaning to Start",50000401 0000,80279321 00FF
 Cheat4_N=This will give you 16777215 Total XP Remaning to start with and after your 1st batle will allow you to buy your Max Stats
--- a/Config/Cheats/Aidyn
+++ b/Config/Cheats/Aidyn
@ -1,9 +1,9 @@
 [E6A95A4F-BAD2EA23-C:45]
-Name=Aidyn Chronicles - The First Mage (U) (V1.0)
-Cheat0="Infinite\Max Health",E87BDEF0 5970
-Cheat1="Infinite\99 Health Potions",E87BDC1D 59BB
+Name=Aidyn Chronicles - The First Mage (U) [!] (V1.0)
+Cheat0="Infinite\Max Health",80278B98 001E
+Cheat1="Infinite\99 Health Potions",802785CB 0063
 Cheat1_N=Do Not put this cheat on until you have collected your 1st Health Potion from the 1st Cheat or you will not be able to get into the Sub menu and Continue the game.
-Cheat2="Have\Max Gold",50000401 0000,10277335 00FF
-Cheat3="Have\Max Total XP",50000401 0000,10278BAD 00FF
-Cheat4="Have\Max Total XP Remaning to Start",50000401 0000,10278BB1 00FF
+Cheat2="Have\Max Gold",50000401 0000,80277335 00FF
+Cheat3="Have\Max Total XP",50000401 0000,80278BAD 00FF
+Cheat4="Have\Max Total XP Remaning to Start",50000401 0000,80278BB1 00FF
 Cheat4_N=This will give you 16777215 Total XP Remaning to start with and after your 1st batle will allow you to buy your Max Stats
--- a/Config/Cheats/Aidyn
+++ b/Config/Cheats/Aidyn
@ -1,9 +1,9 @@
 [112051D2-68BEF8AC-C:45]
-Name=Aidyn Chronicles - The First Mage (U) (V1.1)
-Cheat0="Infinite\Max Health",E87BDEF0 5970
-Cheat1="Infinite\99 Health Potions",E87BDC1D 59BB
+Name=Aidyn Chronicles - The First Mage (U) [!] (V1.1)
+Cheat0="Infinite\Max Health",80278B98 001E
+Cheat1="Infinite\99 Health Potions",802785CB 0063
 Cheat1_N=Do Not put this cheat on until you have collected your 1st Health Potion from the 1st Cheat or you will not be able to get into the Sub menu and Continue the game.
-Cheat2="Have\Max Gold",50000401 0000,10277335 00FF
-Cheat3="Have\Max Total XP",50000401 0000,10278BAD 00FF
-Cheat4="Have\Max Total XP Remaning to Start",50000401 0000,10278BB1 00FF
+Cheat2="Have\Max Gold",50000401 0000,80277335 00FF
+Cheat3="Have\Max Total XP",50000401 0000,80278BAD 00FF
+Cheat4="Have\Max Total XP Remaning to Start",50000401 0000,80278BB1 00FF
 Cheat4_N=This will give you 16777215 Total XP Remaning to start with and after your 1st batle will allow you to buy your Max Stats
--- a/Config/Cheats/Air
+++ b/Config/Cheats/Air
@ -1,74 +1,74 @@
 [26809B20-39A516A4-C:4A]
 Name=Air Boarder 64 (J)
-Cheat0="Infinite Turbo\Player 1",E86CB76F 5961
-Cheat1="Infinite Turbo\Player2",E86CD0E7 5961
-Cheat2="Infinite Time\Street Work & Coin",E8658A3F 5982
-Cheat3="Infinite Time\Attack Time Time 000000",E9658A3E 595A
-Cheat4="Infinite Time\Time Attack",E8658A3D 595A
-Cheat5="Access All Boards & Characters",E8595717 595E
-Cheat6="Maxed Out Turbo Bar",E96CA940 9BEF,E86CB769 59A9
-Cheat7="Class Score Select",E86CB7F2 59??
-Cheat7_O=$7A Class C,$9A Class B,$B6 Class A,$4F Class S
-Cheat8="Coin Perfect Select",E86CB705 59??
+Cheat0="Infinite Turbo\Player 1",80166019 0009
+Cheat1="Infinite Turbo\Player2",80167991 0009
+Cheat2="Infinite Time\Street Work & Coin",801137E9 0028
+Cheat3="Infinite Time\Attack Time Time 000000",811137EA 0000
+Cheat4="Infinite Time\Time Attack",801137EB 0000
+Cheat5="Access All Boards & Characters",800500C1 000C
+Cheat6="Maxed Out Turbo Bar",811656E8 429F,80166017 0051
+Cheat7="Class Score Select",8016609E 00??
+Cheat7_O=$20 Class C,$40 Class B,$64 Class A,$FF Class S
+Cheat8="Coin Perfect Select",801660B3 00??
 Cheat8_N=this is for Coin Mode to get Perfect Coin Collection Score straight away when you enter the level
-Cheat8_O=$66 Green Park Level 1,$74 Green park Level 2,$83 Green park Level 3,$A4 Lost Forest Level 1,$B1 Lost Forest Level 2,$DA Lost Forest Level 3,$CD Snow Festival 64 Levels 1 2 & 3,$BF Sunset Island  Level 1,$C6 Sunset Island  Level 2,$D9 Sunset Island  Level 3,$C0 Giant House Level 1,$C7 Giant House Level 2,$CC Giant House Level 3
-Cheat9="Options\Music Modifier",E85957FF 59??
-Cheat9_O=$4F BGM On,$5A BGM Off
-Cheat10="Options\Sound Effects Modifier",E95957FE 59??
-Cheat10_O=$4F SE On,$5A SE Off
-Cheat11="Options\Camera Type Modifier",E95957FA 59??
-Cheat11_O=$5A Roll On Near,$59 Roll On Mid,$5C Roll On Far,$5B Roll Off Near,$56 Roll Off Mid,$55 Roll Off Far
-Cheat12="Options\DJ Function Modifier",E9595704 59??
-Cheat12_O=$59 DJ Function On,$5A DJ Function Off
-Cheat13="All Street Work Levels Unlocked",50007801 0000,10050170 00??
-Cheat13_O=$59 Courses unlocked,$5B Courses unlocked with C rank,$56 Courses unlocked with B rank,$55 Courses unlocked with A rank,$58 Courses unlocked with S rank
+Cheat8_O=$14 Green Park Level 1,$1A Green park Level 2,$2B Green park Level 3,$4A Lost Forest Level 1,$59 Lost Forest Level 2,$80 Lost Forest Level 3,$7D Snow Festival 64 Levels 1 2 & 3,$6F Sunset Island  Level 1,$74 Sunset Island  Level 2,$81 Sunset Island  Level 3,$6E Giant House Level 1,$77 Giant House Level 2,$72 Giant House Level 3
+Cheat9="Options\Music Modifier",800500A9 00??
+Cheat9_O=$FF BGM On,$00 BGM Off
+Cheat10="Options\Sound Effects Modifier",810500AA 00??
+Cheat10_O=$FF SE On,$00 SE Off
+Cheat11="Options\Camera Type Modifier",810500A6 00??
+Cheat11_O=$00 Roll On Near,$01 Roll On Mid,$02 Roll On Far,$03 Roll Off Near,$04 Roll Off Mid,$05 Roll Off Far
+Cheat12="Options\DJ Function Modifier",810500AC 00??
+Cheat12_O=$01 DJ Function On,$00 DJ Function Off
+Cheat13="All Street Work Levels Unlocked",50007801 0000,80050170 00??
+Cheat13_O=$01 Courses unlocked,$03 Courses unlocked with C rank,$04 Courses unlocked with B rank,$05 Courses unlocked with A rank,$06 Courses unlocked with S rank

 [6C45B60C-DCE50E30-C:4A]
 Name=Air Boarder 64 (J)
-Cheat0="Infinite Turbo\Player 1",E86CB76F 5961
-Cheat1="Infinite Turbo\Player2",E86CD0E7 5961
-Cheat2="Infinite Time\Street Work & Coin",E8658A3F 5982
-Cheat3="Infinite Time\Attack Time Time 000000",E9658A3E 595A
-Cheat4="Infinite Time\Time Attack",E8658A3D 595A
-Cheat5="Access All Boards & Characters",E8595717 595E
-Cheat6="Maxed Out Turbo Bar",E96CA940 9BEF,E86CB769 59A9
-Cheat7="Class Score Select",E86CB7F2 59??
-Cheat7_O=$7A Class C,$9A Class B,$B6 Class A,$4F Class S
-Cheat8="Coin Perfect Select",E86CB705 59??
+Cheat0="Infinite Turbo\Player 1",80166019 0009
+Cheat1="Infinite Turbo\Player2",80167991 0009
+Cheat2="Infinite Time\Street Work & Coin",801137E9 0028
+Cheat3="Infinite Time\Attack Time Time 000000",811137EA 0000
+Cheat4="Infinite Time\Time Attack",801137EB 0000
+Cheat5="Access All Boards & Characters",800500C1 000C
+Cheat6="Maxed Out Turbo Bar",811656E8 429F,80166017 0051
+Cheat7="Class Score Select",8016609E 00??
+Cheat7_O=$20 Class C,$40 Class B,$64 Class A,$FF Class S
+Cheat8="Coin Perfect Select",801660B3 00??
 Cheat8_N=this is for Coin Mode to get Perfect Coin Collection Score straight away when you enter the level
-Cheat8_O=$66 Green Park Level 1,$74 Green park Level 2,$83 Green park Level 3,$A4 Lost Forest Level 1,$B1 Lost Forest Level 2,$DA Lost Forest Level 3,$CD Snow Festival 64 Levels 1 2 & 3,$BF Sunset Island  Level 1,$C6 Sunset Island  Level 2,$D9 Sunset Island  Level 3,$C0 Giant House Level 1,$C7 Giant House Level 2,$CC Giant House Level 3
-Cheat9="Options\Music Modifier",E85957FF 59??
-Cheat9_O=$4F BGM On,$5A BGM Off
-Cheat10="Options\Sound Effects Modifier",E95957FE 59??
-Cheat10_O=$4F SE On,$5A SE Off
-Cheat11="Options\Camera Type Modifier",E95957FA 59??
-Cheat11_O=$5A Roll On Near,$59 Roll On Mid,$5C Roll On Far,$5B Roll Off Near,$56 Roll Off Mid,$55 Roll Off Far
-Cheat12="Options\DJ Function Modifier",E9595704 59??
-Cheat12_O=$59 DJ Function On,$5A DJ Function Off
-Cheat13="All Street Work Levels Unlocked",50007801 0000,10050170 00??
-Cheat13_O=$59 Courses unlocked,$5B Courses unlocked with C rank,$56 Courses unlocked with B rank,$55 Courses unlocked with A rank,$58 Courses unlocked with S rank
+Cheat8_O=$14 Green Park Level 1,$1A Green park Level 2,$2B Green park Level 3,$4A Lost Forest Level 1,$59 Lost Forest Level 2,$80 Lost Forest Level 3,$7D Snow Festival 64 Levels 1 2 & 3,$6F Sunset Island  Level 1,$74 Sunset Island  Level 2,$81 Sunset Island  Level 3,$6E Giant House Level 1,$77 Giant House Level 2,$72 Giant House Level 3
+Cheat9="Options\Music Modifier",800500A9 00??
+Cheat9_O=$FF BGM On,$00 BGM Off
+Cheat10="Options\Sound Effects Modifier",810500AA 00??
+Cheat10_O=$FF SE On,$00 SE Off
+Cheat11="Options\Camera Type Modifier",810500A6 00??
+Cheat11_O=$00 Roll On Near,$01 Roll On Mid,$02 Roll On Far,$03 Roll Off Near,$04 Roll Off Mid,$05 Roll Off Far
+Cheat12="Options\DJ Function Modifier",810500AC 00??
+Cheat12_O=$01 DJ Function On,$00 DJ Function Off
+Cheat13="All Street Work Levels Unlocked",50007801 0000,80050170 00??
+Cheat13_O=$01 Courses unlocked,$03 Courses unlocked with C rank,$04 Courses unlocked with B rank,$05 Courses unlocked with A rank,$06 Courses unlocked with S rank

 [F255D6F1-B65D6728-C:4A]
 Name=Air Boarder 64 (J)
-Cheat0="Infinite Turbo\Player 1",E86CB76F 5961
-Cheat1="Infinite Turbo\Player2",E86CD0E7 5961
-Cheat2="Infinite Time\Street Work & Coin",E8658A3F 5982
-Cheat3="Infinite Time\Attack Time Time 000000",E9658A3E 595A
-Cheat4="Infinite Time\Time Attack",E8658A3D 595A
-Cheat5="Access All Boards & Characters",E8595717 595E
-Cheat6="Maxed Out Turbo Bar",E96CA940 9BEF,E86CB769 59A9
-Cheat7="Class Score Select",E86CB7F2 59??
-Cheat7_O=$7A Class C,$9A Class B,$B6 Class A,$4F Class S
-Cheat8="Coin Perfect Select",E86CB705 59??
+Cheat0="Infinite Turbo\Player 1",80166019 0009
+Cheat1="Infinite Turbo\Player2",80167991 0009
+Cheat2="Infinite Time\Street Work & Coin",801137E9 0028
+Cheat3="Infinite Time\Attack Time Time 000000",811137EA 0000
+Cheat4="Infinite Time\Time Attack",801137EB 0000
+Cheat5="Access All Boards & Characters",800500C1 000C
+Cheat6="Maxed Out Turbo Bar",811656E8 429F,80166017 0051
+Cheat7="Class Score Select",8016609E 00??
+Cheat7_O=$20 Class C,$40 Class B,$64 Class A,$FF Class S
+Cheat8="Coin Perfect Select",801660B3 00??
 Cheat8_N=this is for Coin Mode to get Perfect Coin Collection Score straight away when you enter the level
-Cheat8_O=$66 Green Park Level 1,$74 Green park Level 2,$83 Green park Level 3,$A4 Lost Forest Level 1,$B1 Lost Forest Level 2,$DA Lost Forest Level 3,$CD Snow Festival 64 Levels 1 2 & 3,$BF Sunset Island  Level 1,$C6 Sunset Island  Level 2,$D9 Sunset Island  Level 3,$C0 Giant House Level 1,$C7 Giant House Level 2,$CC Giant House Level 3
-Cheat9="Options\Music Modifier",E85957FF 59??
-Cheat9_O=$4F BGM On,$5A BGM Off
-Cheat10="Options\Sound Effects Modifier",E95957FE 59??
-Cheat10_O=$4F SE On,$5A SE Off
-Cheat11="Options\Camera Type Modifier",E95957FA 59??
-Cheat11_O=$5A Roll On Near,$59 Roll On Mid,$5C Roll On Far,$5B Roll Off Near,$56 Roll Off Mid,$55 Roll Off Far
-Cheat12="Options\DJ Function Modifier",E9595704 59??
-Cheat12_O=$59 DJ Function On,$5A DJ Function Off
-Cheat13="All Street Work Levels Unlocked",50007801 0000,10050170 00??
-Cheat13_O=$59 Courses unlocked,$5B Courses unlocked with C rank,$56 Courses unlocked with B rank,$55 Courses unlocked with A rank,$58 Courses unlocked with S rank
+Cheat8_O=$14 Green Park Level 1,$1A Green park Level 2,$2B Green park Level 3,$4A Lost Forest Level 1,$59 Lost Forest Level 2,$80 Lost Forest Level 3,$7D Snow Festival 64 Levels 1 2 & 3,$6F Sunset Island  Level 1,$74 Sunset Island  Level 2,$81 Sunset Island  Level 3,$6E Giant House Level 1,$77 Giant House Level 2,$72 Giant House Level 3
+Cheat9="Options\Music Modifier",800500A9 00??
+Cheat9_O=$FF BGM On,$00 BGM Off
+Cheat10="Options\Sound Effects Modifier",810500AA 00??
+Cheat10_O=$FF SE On,$00 SE Off
+Cheat11="Options\Camera Type Modifier",810500A6 00??
+Cheat11_O=$00 Roll On Near,$01 Roll On Mid,$02 Roll On Far,$03 Roll Off Near,$04 Roll Off Mid,$05 Roll Off Far
+Cheat12="Options\DJ Function Modifier",810500AC 00??
+Cheat12_O=$01 DJ Function On,$00 DJ Function Off
+Cheat13="All Street Work Levels Unlocked",50007801 0000,80050170 00??
+Cheat13_O=$01 Courses unlocked,$03 Courses unlocked with C rank,$04 Courses unlocked with B rank,$05 Courses unlocked with A rank,$06 Courses unlocked with S rank
--- a/Config/Cheats/Airboarder
+++ b/Config/Cheats/Airboarder
@ -1,24 +1,24 @@
 [27C425D0-8C2D99C1-C:50]
-Name=Airboarder 64 (E)
-Cheat0="Infinite Turbo\Player 1",E86CB76F 5961
-Cheat1="Infinite Turbo\Player2",E86CD0E7 5961
-Cheat2="Infinite Time\Street Work & Coin",E8664D5F 5982
-Cheat3="Infinite Time\Attack Time Time 000000",E9664D5E 595A
-Cheat4="Infinite Time\Time Attack",E8664D5D 595A
-Cheat5="Access All Boards & Characters",E85957C7 595E
-Cheat6="Maxed Out Turbo Bar",E96CA940 9BEF,E86CB769 59A9
-Cheat7="Class Score Select",E86CB7F2 59??
-Cheat7_O=$7A Class C,$9A Class B,$B6 Class A,$4F Class S
-Cheat8="Coin Perfect Select",E86CB705 59??
+Name=Air Boarder 64 (E)
+Cheat0="Infinite Turbo\Player 1",80166019 0009
+Cheat1="Infinite Turbo\Player2",80167991 0009
+Cheat2="Infinite Time\Street Work & Coin",8010FA09 0028
+Cheat3="Infinite Time\Attack Time Time 000000",8110FA0A 0000
+Cheat4="Infinite Time\Time Attack",8010FA0B 0000
+Cheat5="Access All Boards & Characters",80050071 000C
+Cheat6="Maxed Out Turbo Bar",811656E8 429F,80166017 0051
+Cheat7="Class Score Select",8016609E 00??
+Cheat7_O=$20 Class C,$40 Class B,$64 Class A,$FF Class S
+Cheat8="Coin Perfect Select",801660B3 00??
 Cheat8_N=this is for Coin Mode to get Perfect Coin Collection Score straight away when you enter the level
-Cheat8_O=$66 Green Park Level 1,$74 Green park Level 2,$83 Green park Level 3,$A4 Lost Forest Level 1,$B1 Lost Forest Level 2,$DA Lost Forest Level 3,$CD Snow Festival 64 Levels 1 2 & 3,$BF Sunset Island  Level 1,$C6 Sunset Island  Level 2,$D9 Sunset Island  Level 3,$C0 Giant House Level 1,$C7 Giant House Level 2,$CC Giant House Level 3
-Cheat9="Options\Music Modifier",E85957AF 59??
-Cheat9_O=$4F BGM On,$5A BGM Off
-Cheat10="Options\Sound Effects Modifier",E95957AE 59??
-Cheat10_O=$4F SE On,$5A SE Off
-Cheat11="Options\Camera Type Modifier",E95957AA 59??
-Cheat11_O=$5A Roll On Near,$59 Roll On Mid,$5C Roll On Far,$5B Roll Off Near,$56 Roll Off Mid,$55 Roll Off Far
-Cheat12="Options\DJ Function Modifier",E95957B4 59??
-Cheat12_O=$59 DJ Function On,$5A DJ Function Off
-Cheat13="All Street Work Levels Unlocked",50007801 0000,10050120 00??
-Cheat13_O=$59 Courses unlocked,$5B Courses unlocked with C rank,$56 Courses unlocked with B rank,$55 Courses unlocked with A rank,$58 Courses unlocked with S rank
+Cheat8_O=$14 Green Park Level 1,$1A Green park Level 2,$2B Green park Level 3,$4A Lost Forest Level 1,$59 Lost Forest Level 2,$80 Lost Forest Level 3,$7D Snow Festival 64 Levels 1 2 & 3,$6F Sunset Island  Level 1,$74 Sunset Island  Level 2,$81 Sunset Island  Level 3,$6E Giant House Level 1,$77 Giant House Level 2,$72 Giant House Level 3
+Cheat9="Options\Music Modifier",80050059 00??
+Cheat9_O=$FF BGM On,$00 BGM Off
+Cheat10="Options\Sound Effects Modifier",8105005A 00??
+Cheat10_O=$FF SE On,$00 SE Off
+Cheat11="Options\Camera Type Modifier",81050056 00??
+Cheat11_O=$00 Roll On Near,$01 Roll On Mid,$02 Roll On Far,$03 Roll Off Near,$04 Roll Off Mid,$05 Roll Off Far
+Cheat12="Options\DJ Function Modifier",8105005C 00??
+Cheat12_O=$01 DJ Function On,$00 DJ Function Off
+Cheat13="All Street Work Levels Unlocked",50007801 0000,80050120 00??
+Cheat13_O=$01 Courses unlocked,$03 Courses unlocked with C rank,$04 Courses unlocked with B rank,$05 Courses unlocked with A rank,$06 Courses unlocked with S rank
--- a/Config/Cheats/Akumajou
+++ b/Config/Cheats/Akumajou
@ -1,24 +1,24 @@
 [B6951A94-63C849AF-C:4A]
 Name=Akumajou Dracula Mokushiroku - Real Action Adventure (J)
-Cheat0="Infinite\Health",E98EF392 59B6
-Cheat1="Infinite\Throwing Weapon",E98EF3A0 59B6
-Cheat2="Throwing Weapon Modifier",E98EF396 59??
-Cheat2_O=$5A Nothing,$59 Knives,$5C Exploding Potions,$5B Cross,$56 Axes
-Cheat3="Press L To Levitate",D0387D7F 0020,E9895F68 9023
-Cheat4="Have\All Items",50000501 0000,10389C4A 0001,50000301 0000,10389C51 0001,E88EF3AE 5959,E88EF3AD 5959,E88EF3B3 5959,50000E01 0000,10389C60 0001
-Cheat5="Have\Invincibility",E88A7E52 5963
-Cheat6="Infinite\Red Jewels",E88EF39F 59BB
-Cheat7="Status",E88EF3E0 59??
-Cheat7_O=$59 Good,$62 Vamp,$69 Poison,$7C Good but depressed,$B8 Sto,$6F V+P
-Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,11389BD0 FFFF
-Cheat9="Infinite\Energy",E88EF391 59B6
-Cheat10="Infinite\Funds",E88EF39B 5959,E98EF39A D7EF
-Cheat11="Have\Exp Points",E88EF39F 59BB
-Cheat12="Max Power Up",E88EF343 595C
-Cheat13="Never Get Poisoned",E98EF3E0 595A
+Cheat0="Infinite\Health",81389C3E 0064
+Cheat1="Infinite\Throwing Weapon",81389C48 0064
+Cheat2="Throwing Weapon Modifier",81389C42 00??
+Cheat2_O=$00 Nothing,$01 Knives,$02 Exploding Potions,$03 Cross,$04 Axes
+Cheat3="Press L To Levitate",D0387D7F 0020,81350810 3FCB
+Cheat4="Have\All Items",50000501 0000,80389C4A 0001,50000301 0000,80389C51 0001,80389C5A 0001,80389C5B 0001,80389C5D 0001,50000E01 0000,80389C60 0001
+Cheat5="Have\Invincibility",80342BFE 000B
+Cheat6="Infinite\Red Jewels",80389C49 0063
+Cheat7="Status",80389C88 00??
+Cheat7_O=$01 Good,$08 Vamp,$11 Poison,$22 Good but depressed,$66 Sto,$1F V+P
+Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,81389BD0 FFFF
+Cheat9="Infinite\Energy",80389C3F 0064
+Cheat10="Infinite\Funds",80389C45 0001,81389C46 869F
+Cheat11="Have\Exp Points",80389C49 0063
+Cheat12="Max Power Up",80389CED 0002
+Cheat13="Never Get Poisoned",81389C88 0000
 Cheat14="Level Select",89389C90 ????,89389C92 0000
 Cheat14_N=You must use this code on a saved game, because the intro to the first level will mess up the game. Now select the saved game, and hold down the F9 button until the level loads. Some of the boss stages will not let you fight the boss unless you re-enter the area. Also, with the part of stage modifier, the second code modifies the part of the level that you are in, and 0000 is the level's start.
-Cheat14_O=$595A Forest of Silence,$595C Castle Wall,$595B Villa,$5956 Inside Villa,$5958 Garden Maze,$5957 Tunnel,$5962 Underground Waterway,$5961 Castle Center,$596A Tower of Execution,$5969 - Tower of Sorcery,$596C - Tower of Science,$596B - Duel Tower,$5966 - Fight With Death/Actrise,$5965 - Castle Keep,$5968 - Intro (Glitch),$5967 - Clock Tower,$5972 - Final Dracula,$5974 - Fight With Maze Boss,$5973 - Room of Clocks,$596E - ??,$596D - ??
-Cheat15="Switch From",E88EF393 59??
+Cheat14_O=$0000 Forest of Silence,$0002 Castle Wall,$0003 Villa,$0004 Inside Villa,$0006 Garden Maze,$0007 Tunnel,$0008 Underground Waterway,$0009 Castle Center,$0010 Tower of Execution,$0011 - Tower of Sorcery,$0012 - Tower of Science,$0013 - Duel Tower,$0014 - Fight With Death/Actrise,$0015 - Castle Keep,$0016 - Intro (Glitch),$0017 - Clock Tower,$0018 - Final Dracula,$001A - Fight With Maze Boss,$001B - Room of Clocks,$001C - ??,$001D - ??
+Cheat15="Switch From",80389C3D 00??
 Cheat15_N=This Switch From Cheat lets you switch characters on a saved game For example, if you are Reindhart and you want to be Carrie in the middle of your game save it and then enable this Cheat and press F1. when you start your saved game back up you'll be Carrie instead of Reindhart.
-Cheat15_O=$5A Carrie to Reindhart,$59 Reindhart to Carrie
+Cheat15_O=$00 Carrie to Reindhart,$01 Reindhart to Carrie
--- a/Config/Cheats/Akumajou
+++ b/Config/Cheats/Akumajou
@ -1,74 +1,74 @@
 [A5533106-B9F25E5B-C:4A]
 Name=Akumajou Dracula Mokushiroku Gaiden - Legend of Cornell (J)
-Cheat0="Infinite\Keys\Clocktower A",E8721C71 5964
-Cheat1="Infinite\Keys\Clocktower B",E8721C78 5964
-Cheat2="Infinite\Keys\Storeroom",E8721C68 5964
-Cheat3="Infinite\Keys\Garden",E8721C67 5964
-Cheat4="Infinite\Keys\Copper",E8721C66 5964
-Cheat5="Infinite\Keys\Chamber",E8721C65 5964
-Cheat6="Infinite\Keys\Execution",E8721C6C 5964
-Cheat7="Infinite\Keys\Deck",E8721C6B 5964
-Cheat8="Infinite\Keys\Rose Garden",E8721C6A 5964
-Cheat9="Infinite\Keys\Thorn",E8721C69 5964
-Cheat10="Infinite\Keys\Clocktower C",E8721C70 5964
-Cheat11="Infinite\Keys\Clocktower D",E8721C6F 5964
-Cheat12="Infinite\Keys\Art Tower 1",E8721C6E 5964
-Cheat13="Infinite\Keys\Art Tower 2",E8721C6D 5964
-Cheat14="Infinite\Keys\Control Room",E8721C74 5964
-Cheat15="Infinite\Keys\Wall",E8721C73 5964
-Cheat16="Infinite\Keys\Clocktower E",E8721C72 5964
-Cheat17="Infinite\Keys\Archives",E8721C62 5964
-Cheat18="Infinite\Keys\Left Tower",E8721C61 5964
-Cheat19="Infinite\Health",E9721B3E 786A
-Cheat20="Infinite\Gold",E9721B46 786A
-Cheat21="Infinite\Specials\Special 1",E8721B49 5964
-Cheat22="Infinite\Specials\Special 2",E8721B50 5964
-Cheat23="Infinite\Specials\Special 3",E8721B4F 5964
-Cheat24="Infinite\Items\Roast Chicken",E8721B4E 5964
-Cheat25="Infinite\Items\Roast Beef",E8721B4D 5964
-Cheat26="Infinite\Items\Healing Kit",E8721B54 5964
-Cheat27="Infinite\Items\Purifying",E8721B53 5964
-Cheat28="Infinite\Items\Cure Ampoule",E8721B52 5964
-Cheat29="Infinite\Items\Powerup",E8721B51 5964
-Cheat30="Infinite\Items\The Contract",E8721C5C 5964
-Cheat31="Infinite\Items\Magical Nitro",E8721C5B 5964
-Cheat32="Infinite\Items\Mandragora",E8721C5A 5964
-Cheat33="Infinite\Items\Sun Card",E8721C59 5964
-Cheat34="Infinite\Items\Moon Card",E8721C60 5964
-Cheat35="Infinite\Items\Winch Lever",E8721C5F 5964
-Cheat36="Infinite\Items\Oldrey's Diary",E8721C5E 5964
-Cheat37="Infinite\Items\Crest Half A",E8721C5D 5964
-Cheat38="Infinite\Items\Crest Half B",E8721C64 5964
-Cheat39="Infinite\Items\Rose Brooch",E8721C63 5964
-Cheat40="Infinite\Items\Throwing Weapons",E8721B4B 59B6
-Cheat41="Infinite\Items\Red Jewels on Pick-Up",E8721B4B 59C2
-Cheat42="Infinite\Bullets",E871AAA5 5958
+Cheat0="Infinite\Keys\Clocktower A",801CC51F 000A
+Cheat1="Infinite\Keys\Clocktower B",801CC520 000A
+Cheat2="Infinite\Keys\Storeroom",801CC510 000A
+Cheat3="Infinite\Keys\Garden",801CC511 000A
+Cheat4="Infinite\Keys\Copper",801CC512 000A
+Cheat5="Infinite\Keys\Chamber",801CC513 000A
+Cheat6="Infinite\Keys\Execution",801CC514 000A
+Cheat7="Infinite\Keys\Deck",801CC515 000A
+Cheat8="Infinite\Keys\Rose Garden",801CC516 000A
+Cheat9="Infinite\Keys\Thorn",801CC517 000A
+Cheat10="Infinite\Keys\Clocktower C",801CC518 000A
+Cheat11="Infinite\Keys\Clocktower D",801CC519 000A
+Cheat12="Infinite\Keys\Art Tower 1",801CC51A 000A
+Cheat13="Infinite\Keys\Art Tower 2",801CC51B 000A
+Cheat14="Infinite\Keys\Control Room",801CC51C 000A
+Cheat15="Infinite\Keys\Wall",801CC51D 000A
+Cheat16="Infinite\Keys\Clocktower E",801CC51E 000A
+Cheat17="Infinite\Keys\Archives",801CC50E 000A
+Cheat18="Infinite\Keys\Left Tower",801CC50F 000A
+Cheat19="Infinite\Health",811CC4EA 2710
+Cheat20="Infinite\Gold",811CC4F2 2710
+Cheat21="Infinite\Specials\Special 1",801CC4F7 000A
+Cheat22="Infinite\Specials\Special 2",801CC4F8 000A
+Cheat23="Infinite\Specials\Special 3",801CC4F9 000A
+Cheat24="Infinite\Items\Roast Chicken",801CC4FA 000A
+Cheat25="Infinite\Items\Roast Beef",801CC4FB 000A
+Cheat26="Infinite\Items\Healing Kit",801CC4FC 000A
+Cheat27="Infinite\Items\Purifying",801CC4FD 000A
+Cheat28="Infinite\Items\Cure Ampoule",801CC4FE 000A
+Cheat29="Infinite\Items\Powerup",801CC4FF 000A
+Cheat30="Infinite\Items\The Contract",801CC504 000A
+Cheat31="Infinite\Items\Magical Nitro",801CC505 000A
+Cheat32="Infinite\Items\Mandragora",801CC506 000A
+Cheat33="Infinite\Items\Sun Card",801CC507 000A
+Cheat34="Infinite\Items\Moon Card",801CC508 000A
+Cheat35="Infinite\Items\Winch Lever",801CC509 000A
+Cheat36="Infinite\Items\Oldrey's Diary",801CC50A 000A
+Cheat37="Infinite\Items\Crest Half A",801CC50B 000A
+Cheat38="Infinite\Items\Crest Half B",801CC50C 000A
+Cheat39="Infinite\Items\Rose Brooch",801CC50D 000A
+Cheat40="Infinite\Items\Throwing Weapons",801CC4F5 0064
+Cheat41="Infinite\Items\Red Jewels on Pick-Up",801CC4F5 0068
+Cheat42="Infinite\Bullets",801D5753 0006
 Cheat42_N=For Henry
-Cheat43="Wolfman Can Use Weapons",E8721B39 595C
+Cheat43="Wolfman Can Use Weapons",801CC4E7 0002
 Cheat43_N=For Cornell
-Cheat44="Wolfman Can't Use Weapons",E8721B39 5956
+Cheat44="Wolfman Can't Use Weapons",801CC4E7 0004
 Cheat44_N=For Cornell (Default)
-Cheat45="Rapid Fire Gun (Henry-Hold B)",D11CA1A6 0040,E871AAA5 5958
+Cheat45="Rapid Fire Gun (Henry-Hold B)",D11CA1A6 0040,801D5753 0006
 Cheat45_N=For Henry, Hold B
-Cheat46="Max Powerups",E8721A25 595C
-Cheat47="Stop Timer Input",E9721B26 5959
-Cheat48="Hard Mode Selected In A New Game",E888B661 595C
+Cheat46="Max Powerups",801CC7D3 0002
+Cheat47="Stop Timer Input",811CC4D2 0001
+Cheat48="Hard Mode Selected In A New Game",8032630F 0002
 Cheat48_N=With this code, you will not see the hard level status until you save and restart the game file. No special items are required to access this feature with this code turned on.
-Cheat49="Weapon Modifier",E9721B42 59??
-Cheat49_O=$5A Nothing,$59 Knife,$5C Potion,$5B Cross,$56 Axe
-Cheat50="Level Modifier",E8721F7F 59??
-Cheat50_O=$5A Forest Of Silence,$59 Left Tower,$5C Castle Wall,$5B Villa,$56 Villa,$55 Villa,$58 Villa,$74 Villa,$57 Tunnel,$62 Underground Waterway,$61 Castle Center,$64 Castle Center,$63 Castle Center,$5E Castle Center,$5D Castle Center,$60 Castle Center,$5F Castle Center,$6A Foggy Lake,$69 Foggy Lake,$6C Foggy Lake,$6B Cave Of Spiderwomen,$66 Castle Keep,$65 Castle Keep,$68 Falls Into Space(?),$67 Clock Tower,$72 Final Battle Site,$71 Castle Center,$73 Room Of Clocks,$6E Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$83 Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$6D Tower Of Sorcery,$70 Tower Of Execution,$6F Tower Of Execution,$7A Tower Of Execution,$79 Tower Of Science,$7C Tower Of Science,$7B Tower Of Ruins,$76 Tower Of Ruins,$75 Art Tower,$78 Art Tower,$77 Dual Tower,$82 Clock Tower,$81 Clock Tower,$84 Outer Wall,$7E Fall From Sky Ouside Of Castlevania Opening,$7D Another Free Fall. Forest Where Girl Runs In Opening,$80 Black Room(?)
-Cheat51="Inter-Level Modifier",E8721F7D 59??
-Cheat51_O=$5A Forest Of Silence,$59 Left Tower,$5C Castle Wall,$5B Villa,$56 Villa,$55 Villa,$58 Villa,$74 Villa,$57 Tunnel,$62 Underground Waterway,$61 Castle Center,$64 Castle Center,$63 Castle Center,$5E Castle Center,$5D Castle Center,$60 Castle Center,$5F Castle Center,$6A Foggy Lake,$69 Foggy Lake,$6C Foggy Lake,$6B Cave Of Spiderwomen,$66 Castle Keep,$65 Castle Keep,$68 Falls Into Space(?),$67 Clock Tower,$72 Final Battle Site,$71 Castle Center,$73 Room Of Clocks,$6E Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$83 Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$6D Tower Of Sorcery,$70 Tower Of Execution,$6F Tower Of Execution,$7A Tower Of Execution,$79 Tower Of Science,$7C Tower Of Science,$7B Tower Of Ruins,$76 Tower Of Ruins,$75 Art Tower,$78 Art Tower,$77 Dual Tower,$82 Clock Tower,$81 Clock Tower,$84 Outer Wall,$7E Fall From Sky Ouside Of Castlevania Opening,$7D Another Free Fall. Forest Where Girl Runs In Opening,$80 Black Room(?)
-Cheat52="Cut Scene Modifier",E8721F95 5961,E8721F8D 59??
+Cheat49="Weapon Modifier",811CC4EE 00??
+Cheat49_O=$00 Nothing,$01 Knife,$02 Potion,$03 Cross,$04 Axe
+Cheat50="Level Modifier",801CC829 00??
+Cheat50_O=$00 Forest Of Silence,$01 Left Tower,$02 Castle Wall,$03 Villa,$04 Villa,$05 Villa,$06 Villa,$1A Villa,$07 Tunnel,$08 Underground Waterway,$09 Castle Center,$0A Castle Center,$0B Castle Center,$0C Castle Center,$0D Castle Center,$0E Castle Center,$0F Castle Center,$10 Foggy Lake,$11 Foggy Lake,$12 Foggy Lake,$13 Cave Of Spiderwomen,$14 Castle Keep,$15 Castle Keep,$16 Falls Into Space(?),$17 Clock Tower,$18 Final Battle Site,$19 Castle Center,$1B Room Of Clocks,$1C Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$2B Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$1D Tower Of Sorcery,$1E Tower Of Execution,$1F Tower Of Execution,$20 Tower Of Execution,$21 Tower Of Science,$22 Tower Of Science,$23 Tower Of Ruins,$24 Tower Of Ruins,$25 Art Tower,$26 Art Tower,$27 Dual Tower,$28 Clock Tower,$29 Clock Tower,$2A Outer Wall,$2C Fall From Sky Ouside Of Castlevania Opening,$2D Another Free Fall. Forest Where Girl Runs In Opening,$2E Black Room(?)
+Cheat51="Inter-Level Modifier",801CC82B 00??
+Cheat51_O=$00 Forest Of Silence,$01 Left Tower,$02 Castle Wall,$03 Villa,$04 Villa,$05 Villa,$06 Villa,$1A Villa,$07 Tunnel,$08 Underground Waterway,$09 Castle Center,$0A Castle Center,$0B Castle Center,$0C Castle Center,$0D Castle Center,$0E Castle Center,$0F Castle Center,$10 Foggy Lake,$11 Foggy Lake,$12 Foggy Lake,$13 Cave Of Spiderwomen,$14 Castle Keep,$15 Castle Keep,$16 Falls Into Space(?),$17 Clock Tower,$18 Final Battle Site,$19 Castle Center,$1B Room Of Clocks,$1C Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$2B Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$1D Tower Of Sorcery,$1E Tower Of Execution,$1F Tower Of Execution,$20 Tower Of Execution,$21 Tower Of Science,$22 Tower Of Science,$23 Tower Of Ruins,$24 Tower Of Ruins,$25 Art Tower,$26 Art Tower,$27 Dual Tower,$28 Clock Tower,$29 Clock Tower,$2A Outer Wall,$2C Fall From Sky Ouside Of Castlevania Opening,$2D Another Free Fall. Forest Where Girl Runs In Opening,$2E Black Room(?)
+Cheat52="Cut Scene Modifier",801CC843 0009,801CC83B 00??
 Cheat52_N=With this code, you must use the appropiate level mod before you attemp to run these cut scenes. Not doing so will ruin the cut scene as the graphics will be glitched.
-Cheat52_O=$5B Castle Drawbridge Lowers,$56 Character Enters Castle,$55 (?),$64 (?),$5E (?),$7A (?),$79 (?),$7C (?),$58 Vampire In Main Entrance Hall Of Villa,$57 One Of The Working Gears Cut Scenes,$62 "I Smell Poison" From Underground Waterway,$61 Castle Gate Closes In Villa Upon Entering Villa,$63 Renon Appears For First Time,$5D Village Vampire In Upstairs Villa,$60 Malus Appears For The First Time,$5F Malus Leaves Garden,$6A Character In Boat On Foggy Lake,$69 Seal Removed From Wall In Arena,$6C Bleeding Statue,$6B Cosmic Lights,$66 Explosion At Wall In Arena,$65 Explosion At Wall In Castle That Leads To Hidden Room,$68 Malus Appears Again In Upstairs Room Of Castle,$67 Bull Awakens,$72 Vincent The Vampire,$71 One Of The Working Gears Cut Scenes,$74 Gate Opens In Forest Of Silence,$73 Meet Renon For The Last Time In Castle Keep.,$6E This Cut Scene Runs Cut Scene 27 And 2E,$70 Castle Keep Destructs,$6F Malus On Flying Horse Outside Castle Keep,$76 Spider People In Tunnel,$75 Rosa In Garden,$77 Castel Destruction,$82 Space Warp,$81 Castle Destruction,$84 Malus Is Saved By Reinhardt,$83 Malus And Reinhardt On Horse,$80 Rosa Returns,$8A Ada, Henry And Cornell At Game End,$89 Scrolling Text About Castle And Henry,$8B Vampire In Basement,$86 Vampire In Villa Basement Destroyed, Woman Vampire Rises,$85 Finds Hidden Path In Villa Basement,$87 Lever & Gear In Castle,$92 Harpie,$91 Harpie Destroyed,$96 Death(Grim Reaper),$95 Death Is Destroyed,$98 Castle Drawbridge Closes And Ortega Appears,$97 Thirsty Man,$A2 Cornell Meets Henry In Garden,$A1 Cornell And Henry Part In Garden,$A9 Monster Dracula Appears,$AC Actrise Appears In Castle Center,$A6 Actrise Appears Again With Cousin Fernandes Before Fight With Carrie,$A5 Cousin Fernandes Is Destroyed,$A8 Actrise Appears Again Before Fight With Carrie,$A7 Actrise Defeated By Carrie
-Cheat53="Enable All Characters",E8851E45 5956
-Cheat54="Character Modifier",E8851E2D 59??
-Cheat54_O=$55 Henry,$58 Reinhardt,$57 Carrie
-Cheat55="Status Modifier",E8721C8C 59??
-Cheat55_O=$5A Never Get Poisoned or Vamped,$59 Normal,$56 Vamp,$62 Poison,$5E Vamped & Poisoned,$4F Instant Death
-Cheat56="Max Weapon Power-Up",E8721A29 595C
-Cheat57="Day Modifier For Adult Henry",E8721B21 59??
-Cheat57_O=$5A 7 Days,$59 6 Days,$5C 5 Days,$5B 4 Days,$56 3 Days,$55 2 Days,$58 1 Day,$57 0 Days
-Cheat58="Infinite\Health Young Henry",D11CA1A6 0010,E990C468 815A
+Cheat52_O=$03 Castle Drawbridge Lowers,$04 Character Enters Castle,$05 (?),$0A (?),$0C (?),$20 (?),$21 (?),$22 (?),$06 Vampire In Main Entrance Hall Of Villa,$07 One Of The Working Gears Cut Scenes,$08 "I Smell Poison" From Underground Waterway,$09 Castle Gate Closes In Villa Upon Entering Villa,$0B Renon Appears For First Time,$0D Village Vampire In Upstairs Villa,$0E Malus Appears For The First Time,$0F Malus Leaves Garden,$10 Character In Boat On Foggy Lake,$11 Seal Removed From Wall In Arena,$12 Bleeding Statue,$13 Cosmic Lights,$14 Explosion At Wall In Arena,$15 Explosion At Wall In Castle That Leads To Hidden Room,$16 Malus Appears Again In Upstairs Room Of Castle,$17 Bull Awakens,$18 Vincent The Vampire,$19 One Of The Working Gears Cut Scenes,$1A Gate Opens In Forest Of Silence,$1B Meet Renon For The Last Time In Castle Keep.,$1C This Cut Scene Runs Cut Scene 27 And 2E,$1E Castle Keep Destructs,$1F Malus On Flying Horse Outside Castle Keep,$24 Spider People In Tunnel,$25 Rosa In Garden,$27 Castel Destruction,$28 Space Warp,$29 Castle Destruction,$2A Malus Is Saved By Reinhardt,$2B Malus And Reinhardt On Horse,$2E Rosa Returns,$30 Ada,$31 Scrolling Text About Castle And Henry,$33 Vampire In Basement,$34 Vampire In Villa Basement Destroyed,$35 Finds Hidden Path In Villa Basement,$37 Lever & Gear In Castle,$38 Harpie,$39 Harpie Destroyed,$44 Death(Grim Reaper),$45 Death Is Destroyed,$46 Castle Drawbridge Closes And Ortega Appears,$47 Thirsty Man,$48 Cornell Meets Henry In Garden,$49 Cornell And Henry Part In Garden,$51 Monster Dracula Appears,$52 Actrise Appears In Castle Center,$54 Actrise Appears Again With Cousin Fernandes Before Fight With Carrie,$55 Cousin Fernandes Is Destroyed,$56 Actrise Appears Again Before Fight With Carrie,$57 Actrise Defeated By Carrie
+Cheat53="Enable All Characters",8031CBF3 0004
+Cheat54="Character Modifier",8031CBDB 00??
+Cheat54_O=$05 Henry,$06 Reinhardt,$07 Carrie
+Cheat55="Status Modifier",801CC534 00??
+Cheat55_O=$00 Never Get Poisoned or Vamped,$01 Normal,$04 Vamp,$08 Poison,$0C Vamped & Poisoned,$FF Instant Death
+Cheat56="Max Weapon Power-Up",801CC7D7 0002
+Cheat57="Day Modifier For Adult Henry",801CC4CF 00??
+Cheat57_O=$00 7 Days,$01 6 Days,$02 5 Days,$03 4 Days,$04 3 Days,$05 2 Days,$06 1 Day,$07 0 Days
+Cheat58="Infinite\Health Young Henry",D11CA1A6 0010,813A6D10 2800
--- a/Config/Cheats/All
+++ b/Config/Cheats/All
@ -1,4 +1,4 @@
 [D9EDD54D-6BB8E274-C:50]
-Name=All Star Baseball '99 (E)
-Cheat0="The Home Team Has Max Score",E95BEA7E 504F
-Cheat1="The Away Team Has Max Score",E95E57D6 504F
+Name=All-Star Baseball '99 (E)
+Cheat0="The Home Team Has Max Score",8107972A FFFF
+Cheat1="The Away Team Has Max Score",81080082 FFFF
--- a/Config/Cheats/All
+++ b/Config/Cheats/All
@ -1,10 +1,10 @@
 [DFD784AD-AE426603-C:50]
-Name=All Star Tennis '99 (E)
-Cheat0="Game Win Select\Player 1",E86F0107 59??
-Cheat0_O=$5A 0 Games Won,$59 1 Game Won,$5C 2 Games Won,$5B 3 Games Won,$56 4 Games Won,$55 5 Games Won,$58 For Game Set & Match
-Cheat1="Game Win Select\Player 2",E86F0106 59??
-Cheat1_O=$5A 0 Games Won,$59 1 Game Won,$5C 2 Games Won,$5B 3 Games Won,$56 4 Games Won,$55 5 Games Won,$58 For Game Set & Match
-Cheat2="Points Select\Player 1",E872B8B8 59??
-Cheat2_O=$5A 0 Points,$65 15 Points,$8A 30 Points,$9A 40 Points
-Cheat3="Points Select\Player 2",E872B8B7 59??
-Cheat3_O=$5A 0 Points,$65 15 Points,$8A 30 Points,$9A 40 Points
+Name=All Star Tennis '99 (E) (M5)
+Cheat0="Game Win Select\Player 1",801BAEB1 00??
+Cheat0_O=$00 0 Games Won,$01 1 Game Won,$02 2 Games Won,$03 3 Games Won,$04 4 Games Won,$05 5 Games Won,$06 For Game Set & Match
+Cheat1="Game Win Select\Player 2",801BAEB2 00??
+Cheat1_O=$00 0 Games Won,$01 1 Game Won,$02 2 Games Won,$03 3 Games Won,$04 4 Games Won,$05 5 Games Won,$06 For Game Set & Match
+Cheat2="Points Select\Player 1",801C6160 00??
+Cheat2_O=$00 0 Points,$15 15 Points,$30 30 Points,$40 40 Points
+Cheat3="Points Select\Player 2",801C6161 00??
+Cheat3_O=$00 0 Points,$15 15 Points,$30 30 Points,$40 40 Points
--- a/Config/Cheats/All
+++ b/Config/Cheats/All
@ -1,14 +1,14 @@
 [E185E291-4E50766D-C:45]
 Name=All Star Tennis '99 (U)
-Cheat0="Game Win Select\Player 1",E86F12F7 59??
-Cheat0_O=$5A 0 Games Won,$59 1 Game Won,$5C 2 Games Won,$5B 3 Games Won,$56 4 Games Won,$55 5 Games Won,$58 For Game Set & Match
-Cheat1="Game Win Select\Player 2",E86F12F6 59??
-Cheat1_O=$5A 0 Games Won,$59 1 Game Won,$5C 2 Games Won,$5B 3 Games Won,$56 4 Games Won,$55 5 Games Won,$58 For Game Set & Match
-Cheat2="Points Select\Player 1",E872C5B8 59??
-Cheat2_O=$5A 0 Points,$65 15 Points,$8A 30 Points,$9A 40 Points
-Cheat3="Points Select\Player 2",E872C5B7 59??
-Cheat3_O=$5A 0 Points,$65 15 Points,$8A 30 Points,$9A 40 Points
-Cheat4="Play As\Player 1",E85F52FB 59??
-Cheat4_O=$5A Zoe Taylor,$59 Vanessa Child,$5C Amanda Coetzer,$5B Jana Novotna,$56 Conchita Martinez,$55 Leon Rodez,$58 Michael Chang,$57 Gustavo Kuerten,$62 Jonas Bjorkman,$61 Mark Philippoussis,$64 Randy Powell,$63 Richard Krajicek
-Cheat5="Play As\Player 2",E85F52FA 59??
-Cheat5_O=$5A Zoe Taylor,$59 Vanessa Child,$5C Amanda Coetzer,$5B Jana Novotna,$56 Conchita Martinez,$55 Leon Rodez,$58 Michael Chang,$57 Gustavo Kuerten,$62 Jonas Bjorkman,$61 Mark Philippoussis,$64 Randy Powell,$63 Richard Krajicek
+Cheat0="Game Win Select\Player 1",801BBFA1 00??
+Cheat0_O=$00 0 Games Won,$01 1 Game Won,$02 2 Games Won,$03 3 Games Won,$04 4 Games Won,$05 5 Games Won,$06 For Game Set & Match
+Cheat1="Game Win Select\Player 2",801BBFA2 00??
+Cheat1_O=$00 0 Games Won,$01 1 Game Won,$02 2 Games Won,$03 3 Games Won,$04 4 Games Won,$05 5 Games Won,$06 For Game Set & Match
+Cheat2="Points Select\Player 1",801C7260 00??
+Cheat2_O=$00 0 Points,$15 15 Points,$30 30 Points,$40 40 Points
+Cheat3="Points Select\Player 2",801C7261 00??
+Cheat3_O=$00 0 Points,$15 15 Points,$30 30 Points,$40 40 Points
+Cheat4="Play As\Player 1",800BFFA5 00??
+Cheat4_O=$00 Zoe Taylor,$01 Vanessa Child,$02 Amanda Coetzer,$03 Jana Novotna,$04 Conchita Martinez,$05 Leon Rodez,$06 Michael Chang,$07 Gustavo Kuerten,$08 Jonas Bjorkman,$09 Mark Philippoussis,$0A Randy Powell,$0B Richard Krajicek
+Cheat5="Play As\Player 2",800BFFA6 00??
+Cheat5_O=$00 Zoe Taylor,$01 Vanessa Child,$02 Amanda Coetzer,$03 Jana Novotna,$04 Conchita Martinez,$05 Leon Rodez,$06 Michael Chang,$07 Gustavo Kuerten,$08 Jonas Bjorkman,$09 Mark Philippoussis,$0A Randy Powell,$0B Richard Krajicek
--- a/Config/Cheats/All-Star
+++ b/Config/Cheats/All-Star
@ -1,20 +1,20 @@
 [C43E23A7-40B1681A-C:45]
 Name=All-Star Baseball '99 (U)
-Cheat0="Infinite\Character Creation Points",E8648387 590A
-Cheat1="Infinite\Strikes",E860120F 595A
-Cheat2="Infinite\Balls",E8601209 595A
-Cheat3="Infinite\Outs",E860120D 595A
-Cheat4="Max\Character Creation Accuracy",E9647E48 9ACA
-Cheat5="Max\Character Creation Clutch",E9647E4C 9ACA
-Cheat6="Max\Character Creation Contact",E9647E54 9ACA
-Cheat7="Max\Character Creation Power",E9648358 9ACA
-Cheat8="Max\Character Creation VS. LHP",E964835C 9ACA
-Cheat9="Max\Character Creation VS. RHP",E9648360 9ACA
-Cheat10="Max\Character Creation Bunting",E9648364 9ACA
-Cheat11="Max\Character Creation VS LHB",E9648368 9ACA
-Cheat12="Max\Character Creation VS RHB",E964836C 9ACA
-Cheat13="Max\Character Creation Speed",E9648370 9ACA
-Cheat14="Max\Character Creation Defense",E9648374 9ACA
-Cheat15="Max\Character Creation Arm Strength",E9648378 9ACA
-Cheat16="Max\Character Creation Streak",E964837C 9ACA
-Cheat17="Max\Character Creation Clutch",E9648380 9ACA
+Cheat0="Infinite\Character Creation Points",800E2C31 00B0
+Cheat1="Infinite\Strikes",800ABFB9 0000
+Cheat2="Infinite\Balls",800ABFB7 0000
+Cheat3="Infinite\Outs",800ABFBB 0000
+Cheat4="Max\Character Creation Accuracy",810E2BF0 4170
+Cheat5="Max\Character Creation Clutch",810E2BF4 4170
+Cheat6="Max\Character Creation Contact",810E2BFC 4170
+Cheat7="Max\Character Creation Power",810E2C00 4170
+Cheat8="Max\Character Creation VS. LHP",810E2C04 4170
+Cheat9="Max\Character Creation VS. RHP",810E2C08 4170
+Cheat10="Max\Character Creation Bunting",810E2C0C 4170
+Cheat11="Max\Character Creation VS LHB",810E2C10 4170
+Cheat12="Max\Character Creation VS RHB",810E2C14 4170
+Cheat13="Max\Character Creation Speed",810E2C18 4170
+Cheat14="Max\Character Creation Defense",810E2C1C 4170
+Cheat15="Max\Character Creation Arm Strength",810E2C20 4170
+Cheat16="Max\Character Creation Streak",810E2C24 4170
+Cheat17="Max\Character Creation Clutch",810E2C28 4170
--- a/Config/Cheats/All-Star
+++ b/Config/Cheats/All-Star
@ -1,21 +1,21 @@
 [5E547A4D-90E60795-C:45]
 Name=All-Star Baseball 2000 (U)
-Cheat0="Infinite\Strikes",E85C3B37 595A
-Cheat1="Infinite\Balls",E85C3B31 595A
-Cheat2="Infinite\Outs",E85C3B35 595A
-Cheat3="Infinite\Character Creation Points",E96686A8 9ACA
-Cheat4="Infinite\Pitch Type Creation Points",E9669014 9ACA,E9669018 9ACA
-Cheat5="Character Creation\Max\Accuracy",E965AD78 9ACA
-Cheat6="Character Creation\Max\Stamina",E965AD7C 9ACA
-Cheat7="Character Creation\Max\Contact",E965AD80 9ACA
-Cheat8="Character Creation\Max\Power",E965AD84 9ACA
-Cheat9="Character Creation\Max\VS LHP",E965AD88 9ACA
-Cheat10="Character Creation\Max\VS RHP",E965AD8C 9ACA
-Cheat11="Character Creation\Max\Bunting",E965AD90 9ACA
-Cheat12="Character Creation\Max\VS LHB",E965AD94 9ACA
-Cheat13="Character Creation\Max\VS RHB",E965AD98 9ACA
-Cheat14="Character Creation\Max\Speed",E965AD9C 9ACA
-Cheat15="Character Creation\Max\Defense",E965ADA0 9ACA
-Cheat16="Character Creation\Max\Arm Str.",E965ADA4 9ACA
-Cheat17="Character Creation\Max\Streak",E965ADA8 9ACA
-Cheat18="Character Creation\Max\Clutch",E965ADAC 9ACA
+Cheat0="Infinite\Strikes",8006E4E1 0000
+Cheat1="Infinite\Balls",8006E4DF 0000
+Cheat2="Infinite\Outs",8006E4E3 0000
+Cheat3="Infinite\Character Creation Points",81103350 4170
+Cheat4="Infinite\Pitch Type Creation Points",811039BC 4170,811039C0 4170
+Cheat5="Character Creation\Max\Accuracy",81115A20 4170
+Cheat6="Character Creation\Max\Stamina",81115A24 4170
+Cheat7="Character Creation\Max\Contact",81115A28 4170
+Cheat8="Character Creation\Max\Power",81115A2C 4170
+Cheat9="Character Creation\Max\VS LHP",81115A30 4170
+Cheat10="Character Creation\Max\VS RHP",81115A34 4170
+Cheat11="Character Creation\Max\Bunting",81115A38 4170
+Cheat12="Character Creation\Max\VS LHB",81115A3C 4170
+Cheat13="Character Creation\Max\VS RHB",81115A40 4170
+Cheat14="Character Creation\Max\Speed",81115A44 4170
+Cheat15="Character Creation\Max\Defense",81115A48 4170
+Cheat16="Character Creation\Max\Arm Str.",81115A4C 4170
+Cheat17="Character Creation\Max\Streak",81115A50 4170
+Cheat18="Character Creation\Max\Clutch",81115A54 4170
--- a/Config/Cheats/Armorines
+++ b/Config/Cheats/Armorines
@ -1,5 +1,5 @@
 [3CC77150-21CDB987-C:50]
 Name=Armorines - Project S.W.A.R.M. (E)
-Cheat0="Enable In-Game Cheat Menu & Level Select",E965B08A 5A9F
-Cheat1="Infinite Ammo (All Guns)",E95AE928 755A
-Cheat2="Don't Take Any Damage",E95AF5B8 755A
+Cheat0="Enable In-Game Cheat Menu & Level Select",81115936 014F
+Cheat1="Infinite Ammo (All Guns)",810496D0 2400
+Cheat2="Don't Take Any Damage",8104A260 2400
--- a/Config/Cheats/Armorines
+++ b/Config/Cheats/Armorines
@ -1,17 +1,17 @@
 [1FB5D932-3BA9481B-C:45]
 Name=Armorines - Project S.W.A.R.M. (U)
-Cheat0="Enable In-Game Cheat Menu & Level Select",E965B08A 5A9F
-Cheat1="Infinite Lewis Laser Rifle",E88474C1 5ACA
+Cheat0="Enable In-Game Cheat Menu & Level Select",81115936 014F
+Cheat1="Infinite Lewis Laser Rifle",802E1D6F 0170
 Cheat1_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
-Cheat2="Infinite Lewis Explosive Projectile Weapon",E88474BF 598A
+Cheat2="Infinite Lewis Explosive Projectile Weapon",802E1D69 0030
 Cheat2_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
-Cheat3="Infinite Jungle Chemical Gun",E88474CD 5ABA
+Cheat3="Infinite Jungle Chemical Gun",802E1D7B 0160
 Cheat3_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
-Cheat4="Level Select",E965B086 5962
-Cheat5="Infinite Ammo (All Guns)",E95AE928 755A
-Cheat6="Don't Take Any Damage",E95AF5B8 755A
-Cheat7="Invincible",E95AE3F8 755A
-Cheat8="Sound Modifier\Music Volume",E865B09C 59??
-Cheat8_O=$5A Off,$8E Low (5),$D2 Medium (1.0),$0E Defualt (1.5),$4A Max (2.0)
-Cheat9="Sound Modifier\SFX Volume",E865B09B 59??
-Cheat9_O=$5A Off,$8E Low (5),$D2 Medium (1.0),$0E Defualt (1.5),$4A Max (2.0)
+Cheat4="Level Select",81115932 0008
+Cheat5="Infinite Ammo (All Guns)",810496D0 2400
+Cheat6="Don't Take Any Damage",8104A260 2400
+Cheat7="Invincible",81048CA0 2400
+Cheat8="Sound Modifier\Music Volume",80115944 00??
+Cheat8_O=$00 Off,$3C Low (5),$78 Medium (1.0),$BC Defualt (1.5),$F0 Max (2.0)
+Cheat9="Sound Modifier\SFX Volume",80115945 00??
+Cheat9_O=$00 Off,$3C Low (5),$78 Medium (1.0),$BC Defualt (1.5),$F0 Max (2.0)
--- a/Config/Cheats/Army
+++ b/Config/Cheats/Army
@ -1,11 +1,11 @@
 [4C52BBB2-CEAB0F6B-C:45]
 Name=Army Men - Air Combat (U)
-Cheat0="Co-Pilot Modifier",E85F7BB4 59??
-Cheat0_O=$5A Lt. James Marshall "Woodstock",$59 Lt. John Lawless "Hardcore",$5C Lt. Dave Parker "Rawhide",$5B Lt. Felicity Wannamaker "Bombshell",$56 Sergeant Hawk "Sarge" (Hidden Character)
-Cheat1="Helicopter Modifier",E85F7C8C 59??
-Cheat1_O=$59 Huey,$5C Chinook (Hidden),$5B Super Stallion (Hidden),$56 Apache (Hidden)
-Cheat2="Always Play Level Modifier",E85F7CA4 59??
-Cheat2_O=$5A Mission 1-Plastic Pandemonium,$59 Mission 2-Going Car-razy,$5C Mission 3-The Train That Could,$5B Mission 4-Tan Terror-Tory,$56 Mission 5-Bug Bath,$55 Mission 6-Uninvited Guests,$58 Mission 7-Ants In The Pants,$57 Mission 8-Saucer Attack,$62 Mission 9-The Heat is On,$61 Mission 10-The Melting Pot,$64 Mission 11-River Rapids Riot,$63 Mission 12-Nighttime Teddy,$5E Mission 13-Demolition Time,$5D Mission 14-Pick Up The Pieces,$60 Mission 15-Have An Ice Day,$5F Mission 16-Plastro's Revenge,$6A Mission 17-Bug Hunt: Chew Chew Bug-B-Q,$69 Mission 18-Bug Hunt: Crispy Critters,$6C Mission 19-Flag-Nab-It: Fort Frenzy,$6B Mission 20-Flag-Nab-it: Freezer Burn,$66 Mission 21-Food Fight: Picnic Panic,$65 Mission 22-Food Fight: Cherry Surprise,$68 Mission 23-Rescue: Don't Feed The Crabs,$67 Mission 24-Rescue: Tide Pool Terror
-Cheat3="Start On Play Level Modifier",D00B254C 0000,E85F7CA4 59??
-Cheat3_O=$5A Mission 1-Plastic Pandemonium,$59 Mission 2-Going Car-razy,$5C Mission 3-The Train That Could,$5B Mission 4-Tan Terror-Tory,$56 Mission 5-Bug Bath,$55 Mission 6-Uninvited Guests,$58 Mission 7-Ants In The Pants,$57 Mission 8-Saucer Attack,$62 Mission 9-The Heat is On,$61 Mission 10-The Melting Pot,$64 Mission 11-River Rapids Riot,$63 Mission 12-Nighttime Teddy,$5E Mission 13-Demolition Time,$5D Mission 14-Pick Up The Pieces,$60 Mission 15-Have An Ice Day,$5F Mission 16-Plastro's Revenge,$6A Mission 17-Bug Hunt: Chew Chew Bug-B-Q,$69 Mission 18-Bug Hunt: Crispy Critters,$6C Mission 19-Flag-Nab-It: Fort Frenzy,$6B Mission 20-Flag-Nab-it: Freezer Burn,$66 Mission 21-Food Fight: Picnic Panic,$65 Mission 22-Food Fight: Cherry Surprise,$68 Mission 23-Rescue: Don't Feed The Crabs,$67 Mission 24-Rescue: Tide Pool Terror
-Cheat4="Unlock All Planes",E95F7C7E 5A55
+Cheat0="Co-Pilot Modifier",800B245C 00??
+Cheat0_O=$00 Lt. James Marshall "Woodstock",$01 Lt. John Lawless "Hardcore",$02 Lt. Dave Parker "Rawhide",$03 Lt. Felicity Wannamaker "Bombshell",$04 Sergeant Hawk "Sarge" (Hidden Character)
+Cheat1="Helicopter Modifier",800B2534 00??
+Cheat1_O=$01 Huey,$02 Chinook (Hidden),$03 Super Stallion (Hidden),$04 Apache (Hidden)
+Cheat2="Always Play Level Modifier",800B254C 00??
+Cheat2_O=$00 Mission 1-Plastic Pandemonium,$01 Mission 2-Going Car-razy,$02 Mission 3-The Train That Could,$03 Mission 4-Tan Terror-Tory,$04 Mission 5-Bug Bath,$05 Mission 6-Uninvited Guests,$06 Mission 7-Ants In The Pants,$07 Mission 8-Saucer Attack,$08 Mission 9-The Heat is On,$09 Mission 10-The Melting Pot,$0A Mission 11-River Rapids Riot,$0B Mission 12-Nighttime Teddy,$0C Mission 13-Demolition Time,$0D Mission 14-Pick Up The Pieces,$0E Mission 15-Have An Ice Day,$0F Mission 16-Plastro's Revenge,$10 Mission 17-Bug Hunt: Chew Chew Bug-B-Q,$11 Mission 18-Bug Hunt: Crispy Critters,$12 Mission 19-Flag-Nab-It: Fort Frenzy,$13 Mission 20-Flag-Nab-it: Freezer Burn,$14 Mission 21-Food Fight: Picnic Panic,$15 Mission 22-Food Fight: Cherry Surprise,$16 Mission 23-Rescue: Don't Feed The Crabs,$17 Mission 24-Rescue: Tide Pool Terror
+Cheat3="Start On Play Level Modifier",D00B254C 0000,800B254C 00??
+Cheat3_O=$00 Mission 1-Plastic Pandemonium,$01 Mission 2-Going Car-razy,$02 Mission 3-The Train That Could,$03 Mission 4-Tan Terror-Tory,$04 Mission 5-Bug Bath,$05 Mission 6-Uninvited Guests,$06 Mission 7-Ants In The Pants,$07 Mission 8-Saucer Attack,$08 Mission 9-The Heat is On,$09 Mission 10-The Melting Pot,$0A Mission 11-River Rapids Riot,$0B Mission 12-Nighttime Teddy,$0C Mission 13-Demolition Time,$0D Mission 14-Pick Up The Pieces,$0E Mission 15-Have An Ice Day,$0F Mission 16-Plastro's Revenge,$10 Mission 17-Bug Hunt: Chew Chew Bug-B-Q,$11 Mission 18-Bug Hunt: Crispy Critters,$12 Mission 19-Flag-Nab-It: Fort Frenzy,$13 Mission 20-Flag-Nab-it: Freezer Burn,$14 Mission 21-Food Fight: Picnic Panic,$15 Mission 22-Food Fight: Cherry Surprise,$16 Mission 23-Rescue: Don't Feed The Crabs,$17 Mission 24-Rescue: Tide Pool Terror
+Cheat4="Unlock All Planes",810B252A 0105
--- a/Config/Cheats/Army
+++ b/Config/Cheats/Army
@ -1,35 +1,35 @@
 [862C0657-8DFD896D-C:45]
 Name=Army Men - Sarge's Heroes (U)
-Cheat0="Incendiary Bullets",E859A3EC 5959
-Cheat1="All Weapons",E969E9F2 5959
-Cheat2="Start With Max Ammo",E9695312 5959
-Cheat3="Invincible",E9695342 5959
-Cheat4="Infinite Continues",E969E9E6 5959
-Cheat5="Invisible",E969E9D6 5959
-Cheat6="Tin Solider",E969E9F6 5959
-Cheat7="Maximum Visibility",E85B62A6 5959
-Cheat8="Flamethrowers Fire In All Directions",E85C14CF 597A
-Cheat9="No Flamethrowers Will Work",E85C29F3 5959
-Cheat10="Multiplayer Cheats\Incendiary Bullets",E859A3D7 5959
-Cheat11="Enemies Don't Recongnize You Easily",E859CB83 5959
-Cheat12="Play As",E96C60F6 59??
-Cheat12_O=$57 The Big Green One,$62 Vikki,$61 Plastro
-Cheat13="Play Level",E96C924E 5959,E96C9792 ????
-Cheat13_O=$E1FA Spy Blue,$E106 Bathroom,$E122 Riff Mission,$E13A Forest 81163FFA,$E14A Hoover Mission,$E262 Thick Mission,$E27A Snow Mission,$E292 Shrap Mission,$E2AA Fort Plastro,$E2C2 Scorch Mission,$E2DA Showdown,$E2E6 Sandbox,$E2F6 Kitchen,$E206 Living Room,$E222 The Way Home
-Cheat14="You Move Faster",E86014BF 594F,E86014FF 594F
-Cheat15="Press Start For Other Debug Info",E9695336 5959
-Cheat16="Enemies Fight Themselves",E859DC30 597A
-Cheat17="No Enemies In Levels",E859C4A4 597A
-Cheat18="Less Enemies In Levels",E859B9E0 597A
-Cheat19="Enemies Can't Aim",E85C28A4 597A
-Cheat20="Enemies Have To Reload Their Guns",E85C28BE 597A
-Cheat21="Walls Off For Enemies When Hit",E859B930 597A
-Cheat22="Bullets Only Damage At Extremely Short Range",E85C28AE 597A
-Cheat23="Improved Gun Handling",E85D176C 5990
-Cheat24="Can't Fail Missions",E9605B4E 3E9A
-Cheat25="Everyone Has Dark Camoflauge On",50000804 0000,11098F22 FAE4
-Cheat26="Flamethrower Has Air Buster Flame",E960A6BE A962,E960A6C6 A962
-Cheat27="Flamethrower Has Cloud Flame",E960A6BE AB76,E960A6C6 AB76
-Cheat28="Flamethrower Has Invisible Flame",E960A6BE ABFA,E960A6C6 ABFA
-Cheat29="Max Kills Multiplayer\Player 1",E8871014 504F
-Cheat30="Max Kills Multiplayer\Player 2",E8870ED0 504F
+Cheat0="Incendiary Bullets",80054C94 0001
+Cheat1="All Weapons",8115969E 0001
+Cheat2="Start With Max Ammo",8115FCBE 0001
+Cheat3="Invincible",8115FCEE 0001
+Cheat4="Infinite Continues",81159692 0001
+Cheat5="Invisible",81159682 0001
+Cheat6="Tin Solider",811596A2 0001
+Cheat7="Maximum Visibility",80070F52 0001
+Cheat8="Flamethrowers Fire In All Directions",8006BD79 0020
+Cheat9="No Flamethrowers Will Work",8006D69D 0001
+Cheat10="Multiplayer Cheats\Incendiary Bullets",80054C81 0001
+Cheat11="Enemies Don't Recongnize You Easily",8005742D 0001
+Cheat12="Play As",811609A2 00??
+Cheat12_O=$07 The Big Green One,$08 Vikki,$09 Plastro
+Cheat13="Play Level",81163FFA 0001,8116403E ????
+Cheat13_O=$88A0 Spy Blue,$88B4 Bathroom,$88C8 Riff Mission,$88E0 Forest 81163FFA,$88F0 Hoover Mission,$8908 Thick Mission,$8920 Snow Mission,$8938 Shrap Mission,$8950 Fort Plastro,$8968 Scorch Mission,$8980 Showdown,$8994 Sandbox,$89A4 Kitchen,$89B4 Living Room,$89C8 The Way Home
+Cheat14="You Move Faster",800ABD69 00FF,800ABDA9 00FF
+Cheat15="Press Start For Other Debug Info",8115FCE2 0001
+Cheat16="Enemies Fight Themselves",800585D8 0020
+Cheat17="No Enemies In Levels",80056D4C 0020
+Cheat18="Less Enemies In Levels",80056688 0020
+Cheat19="Enemies Can't Aim",8006D14C 0020
+Cheat20="Enemies Have To Reload Their Guns",8006D16A 0020
+Cheat21="Walls Off For Enemies When Hit",800566D8 0020
+Cheat22="Bullets Only Damage At Extremely Short Range",8006D15A 0020
+Cheat23="Improved Gun Handling",8009C014 003E
+Cheat24="Can't Fail Missions",810A04FA ED40
+Cheat25="Everyone Has Dark Camoflauge On",50000804 0000,81098F22 FAE4
+Cheat26="Flamethrower Has Air Buster Flame",810A536A 5008,810A5372 5008
+Cheat27="Flamethrower Has Cloud Flame",810A536A 5224,810A5372 5224
+Cheat28="Flamethrower Has Invisible Flame",810A536A 52A0,810A5372 52A0
+Cheat29="Max Kills Multiplayer\Player 1",8033B9BC FFFF
+Cheat30="Max Kills Multiplayer\Player 2",8033BB78 FFFF
--- a/Config/Cheats/Army
+++ b/Config/Cheats/Army
@ -1,14 +1,14 @@
 [B20F73B6-2975FC34-C:45]
 Name=Army Men - Sarge's Heroes 2 (U)
-Cheat0="Invincible",E9891C6A 575A
-Cheat1="All Weapons & Ammo",E96927C2 5959,E96C89E2 5959
-Cheat2="Max Ammo",E96C89E2 5959
-Cheat3="Continues",E96927B6 5959
-Cheat4="Invisible",E96927A6 5959
-Cheat5="Test Info",E969260A 5959
-Cheat6="Living Large",E96C8902 5959
-Cheat7="Mini Mode",E96927BE 5959
-Cheat8="Play as",E96C96C6 59??
-Cheat8_O=$57 Big Green One,$62 Vikki,$61 Plastro,$63 Mystery Women,$5E Hail Mendheimicus,$5D Mini Soldier
-Cheat9="Enemies Fight Themselves",E85941F4 597A
-Cheat10="Move Faster",E85FEA5B 594F,E85FEA9F 594F
+Cheat0="Invincible",8135C516 0600
+Cheat1="All Weapons & Ammo",8115D06E 0001,8116368E 0001
+Cheat2="Max Ammo",8116368E 0001
+Cheat3="Continues",8115D062 0001
+Cheat4="Invisible",8115D052 0001
+Cheat5="Test Info",8115D3B6 0001
+Cheat6="Living Large",811636AE 0001
+Cheat7="Mini Mode",8115D06A 0001
+Cheat8="Play as",81164372 00??
+Cheat8_O=$07 Big Green One,$08 Vikki,$09 Plastro,$0B Mystery Women,$0C Hail Mendheimicus,$0D Mini Soldier
+Cheat9="Enemies Fight Themselves",8005EE9C 0020
+Cheat10="Move Faster",800B9705 00FF,800B9749 00FF
--- a/Config/Cheats/Army
+++ b/Config/Cheats/Army
@ -1,17 +1,17 @@
 [B210DF19-98B58D1A-C:50]
-Name=Army Men Sarge
-Cheat0="Infinite Health",E86C9A71 5959
-Cheat1="Access\All Guns",E8693721 5959
-Cheat2="Access\Max Ammo",E86C9941 5959
-Cheat3="Have Small Mode",E869371F 5959
+Name=Army Men - Sarge's Heroes (E) (M3)
+Cheat0="Infinite Health",8016471F 0001
+Cheat1="Access\All Guns",8015E0CF 0001
+Cheat2="Access\Max Ammo",801646EF 0001
+Cheat3="Have Small Mode",8015E0C9 0001
 Cheat3_N=Do not use with Have Big Mode only use one at a time
-Cheat4="Play As Tin Soldier",E8693725 5959
+Cheat4="Play As Tin Soldier",8015E0D3 0001
 Cheat4_N=Do not use this with any other play as option.
-Cheat5="Invisible to most enemies",E8693705 5959
-Cheat6="Play As",E96CA626 59??
+Cheat5="Invisible to most enemies",8015E0B3 0001
+Cheat6="Play As",811653D2 00??
 Cheat6_N=Here you can choose who you would like to play as. But Do not use this with any other play as option..
-Cheat6_O=$57 The Big Green One,$62 Vikki,$61 Plastro
-Cheat7="Have Big Mode",E86C9A61 5959
+Cheat6_O=$07 The Big Green One,$08 Vikki,$09 Plastro
+Cheat7="Have Big Mode",8016470F 0001
 Cheat7_N=Do not use with Have Small Mode only use one at a time
-Cheat8="Have Debug Mode",E8693B69 5959
+Cheat8="Have Debug Mode",8015E417 0001
 Cheat8_N=When this code is activated, a display of numbers will show on the screen as the players move around
--- a/Config/Cheats/Asteroids
+++ b/Config/Cheats/Asteroids
@ -1,8 +1,8 @@
 [D1F7D8AB-293B0446-C:45]
 Name=Asteroids Hyper 64 (U)
-Cheat0="Extra Lives",E85B5062 59BB
-Cheat1="Extra Points",E95B4F52 504F
-Cheat2="Infinite Armageddon",E95B4FE6 5959
-Cheat3="Infinite Items On Pickup",E95B4FF6 785F
-Cheat4="Unlock Classic Asteroids",E95C32AE 5959
-Cheat5="Infinite Lives (Classic Asteroids)",E85B5061 597F
+Cheat0="Extra Lives",8007F90E 0063
+Cheat1="Extra Points",8107F8FE FFFF
+Cheat2="Infinite Armageddon",8107F892 0001
+Cheat3="Infinite Items On Pickup",8107F8A2 270F
+Cheat4="Unlock Classic Asteroids",8106DF5A 0001
+Cheat5="Infinite Lives (Classic Asteroids)",8007F90F 002F
--- a/Config/Cheats/Automobili
+++ b/Config/Cheats/Automobili
@ -0,0 +1,9 @@
+[FC7797BF-4A95E83C-C:50]
+Name=Automobili Lamborghini (E)
+Cheat0="Access All Bonus Cars",50000302 0000,80098583 0001,50000302 0000,8009858B 0001
+Cheat1="Max Points",810CE702 010A
+Cheat2="Infinite Lap Time",8109872C 0000,8109872E 0000
+Cheat3="Always 1st Place",810A5F30 0001
+Cheat4="Start On Lap Modifier",D00A5F35 0000,810A5F34 00??
+Cheat4_O=$00 Normal,$01 Lap 1,$02 Lap 2,$03 Lap 3,$04 Lap 4,$06 Lap 5,$06 Lap 6,$07 Last Lap from Start
+Cheat5="Track Direction Unlocked (All Levels)",800A4131 0003
--- a/Config/Cheats/Automobili
+++ b/Config/Cheats/Automobili
@ -1,10 +1,10 @@
 [41B25DC4-1B726786-C:45]
 Name=Automobili Lamborghini (U)
-Cheat0="Extra Vehicles",50000302 0000,100985C3 0001,50000302 0000,100985CB 0001
-Cheat1="Max Points",E8623A95 504F
-Cheat2="Infinite Time",E9623AC2 5B46
-Cheat3="Difficulty Modifier",E9623AFC 59??
-Cheat3_O=$5A Novice,$59 Expert
-Cheat4="Speeds In Modifier",E8623F55 59??
-Cheat4_O=$5A KM/H,$59 MPH
-Cheat5="Always 1st Place",E960B2C8 5959
+Cheat0="Extra Vehicles",50000302 0000,800985C3 0001,50000302 0000,800985CB 0001
+Cheat1="Max Points",800CE743 FFFF
+Cheat2="Infinite Time",810CE76E 02F4
+Cheat3="Difficulty Modifier",810CE7A4 00??
+Cheat3_O=$00 Novice,$01 Expert
+Cheat4="Speeds In Modifier",800CE803 00??
+Cheat4_O=$00 KM/H,$01 MPH
+Cheat5="Always 1st Place",810A5F70 0001
--- a/Config/Cheats/BANJO
+++ b/Config/Cheats/BANJO
@ -1,138 +0,0 @@
-[155B7CDF-F0DA7325-C:55]
-Name=BANJO TOOIE
-Cheat0="Infinite\Energy\Banjo and Kazooie",E86552FF 59BB,E9685CDC 6364
-Cheat0_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat1="Infinite\Energy\Snowball",E86552FF 59BB,E8685CD9 5955
-Cheat1_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat2="Infinite\Energy\Bee",E86552FF 59BB,E8685CE5 5964,E8685CEC 5964
-Cheat2_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat3="Infinite\Energy\Washing Machine",E86552FF 59BB,E9685CEA 6364
-Cheat3_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat4="Infinite\Energy\Stony",E86552FF 59BB,E8685CEF 5964,E8650B9E 5964
-Cheat4_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat5="Infinite\Energy\Banjo",E86552FF 59BB,E8685CF1 5964,E8685CF8 5964
-Cheat5_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat6="Infinite\Energy\Kazooie",E86552FF 59BB,E9685CF6 6364
-Cheat6_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat7="Infinite\Energy\Submarine",E86552FF 59BB,E8685CFB 5964,E8685CFA 5964
-Cheat7_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat8="Infinite\Energy\Mumbo",E86552FF 59BB,E9685C00 6364
-Cheat8_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat9="Infinite\Energy\Detonator",E86552FF 59BB,E9685C02 6364
-Cheat9_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat10="Infinite\Energy\T-Rex Baby",E86552FF 59BB,E8685C11 5964,E8685C18 5964
-Cheat11="Infinite\Air",E9685416 9B22
-Cheat12="Instant Warp\Options\Not sure",D008B284 0000,E86816E8 ????,E86816E5 5959
-Cheat12_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat12_O=$594E Lord woo fak fak,$5951 Mr Patch,$5A79 Inside Chuffy's wagon,$5A86 Mumbo's Skull,$5A85 Humba Wumba's wigwam 1,$5AA7 Humba Wumba's wigwam 2,$5AF3 Jingalings Zombified Palace,$5AF8 Smuggler cavern,$5A99 Inside the digger tunnel,$5A9B Bottles house,$5AC1 Bottles house still,$5AE4 HAG Inside,$5AF4 HAG1 Final Boss
-Cheat13="Instant Warp\Options\Cauldron Keep",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat13_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat13_O=$5AAD Cauldron Keep,$5AB0 The gatehouse,$5AAF Tower of Tragedy Quiz,$5ABA Gun chamber,$5AC4 Gun room still,$5AD3 Crazy Castle Stockade balloon burst multi,$5ACE Crazy Castle Stockade Jump the hoops multi,$5ACD Grunty Industries packing game,$5ADA Colosseum kickball arena,$5AD8 Dodgems
-Cheat14="Instant Warp\Options\Spiral Mountain",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat14_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat14_O=$59FD Grunty's Old Lair,$5900 Behind The Waterfall,$59FF Top Of Castle,$5ACB Banjo's house
-Cheat15="Instant Warp\Options\Jinjo Village",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat15_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat15_O=$5A9C Jinjo Village,$5A96 King Jingalings throne room,$5A9B Bottles house,$5A95 Green Jinjo's House,$5A98 Black Jinjo's House,$5A97 Yellow Jinjo's House,$5AA2 Blue Jinjo's House,$5AA4 Brown Jinjo's House,$5AA3 Orange Jinjo's House,$5A9E Purple Jinjo's House,$5A9D Red Jinjo's House,$5AA0 White Jinjo's House
-Cheat16="Instant Warp\Options\Mayahem Temple",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat16_O=$5908 Humba's Wigwam,$5907 Mumbo's skull,$5912 The Temple,$5911 Prison Compound,$590E Code chamber,$5916 Jade Snake Grove,$5915 Treasure Chamber,$5918 Kickball Arena,$5AC7 Targitzan's Slighty Sacred Temple,$5AD2 Inside Targitzans Temple,$5AD1 Targitzan Temple Lobby,$5AD4 Targitzan's Temple Boss,$5ACF Mayan Kickball Arena,$5AB8 Multi,$5AB7 Still,$5922 Kickball Arena,$5921 Kickball Arena
-Cheat16_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat17="Instant Warp\Options\Glitter Gulch Mine",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat17_O=$5917 Mine,$5924 Fuel depot,$5923 Crushing shed,$591E Flooded caves,$591D Water storage,$5920 Waterfall cavern,$591F Power hut basement,$592A Chuffy's cab,$5929 Inside chuffy's boiler boss,$592C Gloomy caverns,$592B Generator caverns,$5926 Power hut,$5925 Wumba's wigwam,$5927 Train station,$5932 Prospectors hut,$5931 Mumbo's hut,$5934 Toxic gas cave,$5933 Canary cave,$592E Ordnance storage,$5941 Humba,$5A78 Water supply pipe,$5ABB Ordnance Storage entrance,$5AB6 Ordnance Storage game,$5AB5 Ordnance Storage game Multi,$5ABF Testing,$5ACA Testing,$5AC9 Mumbo's skull
-Cheat17_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat18="Instant Warp\Options\Witchy World",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat18_O=$5928 Witcy World,$592D Dodgem dome lobby,$5930 Dodgem challenge "1 vs 1",$592F Dodgem challenge "2 vs 1",$593A Dodgem challenge "3 vs 1",$5939 Crazy castle stockade,$593C Crazy castle lobby,$593B Crazy castle pump room,$5936 Balloon burst game,$5935 Hoop hurry game,$5938 Star spinner,$5937 The inferno,$5944 Cave of horrors,$5943 Haunted cavern,$593E Train station,$5A76 Saucer of Peril,$5A93 Crazy castle stockade "sop",$5A8E Star spinner "sop",$5AC8 Mumbo's skull
-Cheat18_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat19="Instant Warp\Options\Jolly Roger's Lagoon",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat19_O=$593D Jolly's,$5940 Pawno's emporium,$593F mumbo's skull,$5946 Ancient Swimming Baths,$5948 Electric Eels lair,$5947 Seaweed Sanctum,$5952 Inside the big fish,$5954 temple of the fishes,$5A02 Atlantis,$5A01 Seabottom,$5AD9 sea bottom cavern,$5ADC submarine multi,$5AF7 Jolly Roger's Lagoon,$594F Blubber's wave race hire
-Cheat19_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat20="Instant Warp\Options\Terrydacty Land",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat20_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat20_O=$5A6C Terrydacty Land,$5A6B Terry's nest,$5A66 Train station,$5A65 Oogle boogles cave,$5A68 Inside the mountain,$5A67 River passage,$5A72 Styracosaurus family cave,$5A71 Unga bunga's cave,$5A74 Stomping plains,$5A73 Bonfire caverns,$5A70 Humba's Wigwam,$5A7B Inside chompa's belly,$5ADB Chompa's belly multi
-Cheat21="Instant Warp\Options\Grunty Industries",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat21_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat21_O=$5A5A Outside,$5A59 Inside,$5A5C Train station,$5A5B Workers quarters,$5A56 Trash compactor,$5A55 Elevator shaft,$5A58 Floor 2,$5A57 Floor 2 "electromagnet chamber",$5A62 Floor 3,$5A61 Floor 3 "boiler plant",$5A64 Floor 3 "packing room",$5A63 Floor 4,$5A5E Floor 4 "cable room",$5A5D Floor 4 "quality control",$5A60 Floor 5,$5A5F Basement,$5A6A Basement "repair depot,$5A69 Basement "waste disposal",$5A75 Water supply pipe,$5ACC Mumbo's skull,$5ABC Floor 4 "clinkers cavern",$5AD7 Sewer entrance
-Cheat22="Instant Warp\Options\Hailfire Peaks",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat22_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat22_O=$5A77 Lava side,$5A82 Icy side,$5A81 Lava train station,$5A84 Ice train station,$5A83 Chilli billi,$5A7E Chilly willy,$5A7D Colosseum kickball stadium lobby,$5A89 Boggy's igloo,$5A8C Icicle grotto,$5A8B Inside the volcano,$5AC2 Icy side still
-Cheat23="Instant Warp\Options\Cloud Cuckoo Land",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat23_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat23_O=$5A88 Cloud Cuckoo Land 1,$5A87 Inside the trashcan,$5A92 Inside the cheesewedge,$5A91 Zubba's nest,$5A94 Central cavern,$5A8D Inside the pot o gold,$5A90 Mumbo's skull,$5A8F Mingy jongo's skull,$5A9A Humba wumba's wigwam,$5AB9 Cloud Cuckoo Land 2,$5AE2 Zubba's nest multi,$5AD5 Trash can mini
-Cheat24="Instant Warp\Options\Isle O Hags",D008B284 0000,E96816E8 ????,E86816E5 5959
-Cheat24_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat24_O=$5A9F Wooded Hollow,$5AAA Heggy's egg shed,$5AA9 Jiggywiggy's temple,$5AAC Plateau,$5AAB Plateau "Honey B's Hive",$5AA6 Pine Grove,$5AA5 Cliff top,$5AA8 Cliff top Mumbo's skull,$5AB4 wasteland,$5AB3 inside another digger tunnel,$5AAE Quagmire
-Cheat25="Play As",D108B284 0000,E86814F4 59??
-Cheat25_N=To use this cheat, put the cheat on, then press L as you walk through a door to become that chosen character
-Cheat25_O=$59 Banjo and Kazooie,$5C Snowball,$58 Bee,$57 Washing machine,$62 Stony,$64 Banjo,$63 Kazooie,$5E Submarine,$5D Mumbo,$60 Golden Goliath,$5F Detonator,$6A Truck,$6C T-rex baby,$6B T-rex daddy
-Cheat26="Beta Bottles Revenge Mode",E86758C6 5959,E85E0B27 595C
-Cheat26_N=Bottles Revenge is a Beta mode from Banjo Tooie that the RWP team recently uncovered after an extraordinary amount of effort. Bottles the Spirit transforms into Bottles the Devil and posses enemies nearby and allows a second player hooked up to Pad 2 to play as that Posses character to try to foil Banjos Plans. As player one goes about its business, player two uses every enemy nearby to try to nab Banjo and take away some life. This mode is incredible, and you can control almost every enemy in the game: slot machines, flying creatures, uggers, zubbas...and this is just the beginning. (Congrats Rare Witch Project)
-
-[C9176D39-EA4779D1-C:50]
-Name=BANJO TOOIE
-Cheat0="Infinite\Energy\Banjo and Kazooie",E868580F 6364,E9685AEC 6364
-Cheat0_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat1="Infinite\Energy\Snowball",E868580F 59BB,E8685AE9 5955
-Cheat1_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat2="Infinite\Energy\Bee",E868580F 59BB,E8685AF5 5964,E8685AFC 5964
-Cheat2_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat3="Infinite\Energy\Washing Machine",E868580F 59BB,E9685AFA 6364
-Cheat3_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat4="Infinite\Energy\Stony",E868580F 59BB,E8685AFF 5964,E86509AE 5964
-Cheat4_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat5="Infinite\Energy\Banjo",E868580F 59BB,E8685A01 5964,E8685A08 5964
-Cheat5_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat6="Infinite\Energy\Kazooie",E868580F 59BB,E9685A06 6364
-Cheat6_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat7="Infinite\Energy\Submarine",E868580F 59BB,E8685A0B 5964,E8685A0A 5964
-Cheat7_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat8="Infinite\Energy\Mumbo",E868580F 59BB,E9685A10 6364
-Cheat8_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat9="Infinite\Energy\Detonator",E868580F 59BB,E9685A12 6364
-Cheat9_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat10="Infinite\Energy\T-Rex Baby",E868580F 59BB,E8685A21 5964,E8685A28 5964
-Cheat10_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat11="Infinite\Air",E9685226 9B22
-Cheat12="Play As",D008B494 0020,E8681204 59??
-Cheat12_N=To use this cheat, put the cheat on, then press L as you walk through a door to become that chosen character
-Cheat12_O=$59 Banjo and Kazooie,$5C Snowball,$58 Bee,$57 Washing machine,$62 Stony,$64 Banjo,$63 Kazooie,$5E Submarine,$5D Mumbo,$60 Golden Goliath,$5F Detonator,$6A Truck,$6C T-rex baby,$6B T-rex daddy
-Cheat13="Instant Warp\Options\Not sure",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat13_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat13_O=$594E Lord woo fak fak,$5951 Mr Patch,$5A79 Inside Chuffy's wagon,$5A86 Mumbo's Skull,$5A85 Humba Wumba's wigwam 1,$5AA7 Humba Wumba's wigwam 2,$5AF3 Jingalings Zombified Palace,$5AF8 Smuggler cavern,$5A99 Inside the digger tunnel,$5A9B Bottles house,$5AC1 Bottles house still,$5AE4 HAG Inside,$5AF4 HAG1 Final Boss
-Cheat14="Instant Warp\Options\Spiral Mountain",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat14_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat14_O=$59FD Grunty's Old Lair,$5900 Behind The Waterfall,$59FF Top Of Castle,$5ACB Banjo's house
-Cheat15="Instant Warp\Options\Jinjo Village",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat15_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat15_O=$5A9C Jinjo Village,$5A96 King Jingalings throne room,$5A9B Bottles house,$5A95 Green Jinjo's House,$5A98 Black Jinjo's House,$5A97 Yellow Jinjo's House,$5AA2 Blue Jinjo's House,$5AA4 Brown Jinjo's House,$5AA3 Orange Jinjo's House,$5A9E Purple Jinjo's House,$5A9D Red Jinjo's House,$5AA0 White Jinjo's House
-Cheat16="Instant Warp\Options\Mayahem Temple",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat16_O=$5908 Humba's Wigwam,$5907 Mumbo's skull,$5912 The Temple,$5911 Prison Compound,$590E Code chamber,$5916 Jade Snake Grove,$5915 Treasure Chamber,$5918 Kickball Arena,$5AC7 Targitzan's Slighty Sacred Temple,$5AD2 Inside Targitzans Temple,$5AD1 Targitzan Temple Lobby,$5AD4 Targitzan's Temple Boss,$5ACF Mayan Kickball Arena,$5AB8 Multi,$5AB7 Still,$5922 Kickball Arena,$5921 Kickball Arena
-Cheat16_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat17="Instant Warp\Options\Glitter Gulch Mine",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat17_O=$5917 Mine,$5924 Fuel depot,$5923 Crushing shed,$591E Flooded caves,$591D Water storage,$5920 Waterfall cavern,$591F Power hut basement,$592A Chuffy's cab,$5929 Inside chuffy's boiler boss,$592C Gloomy caverns,$592B Generator caverns,$5926 Power hut,$5925 Wumba's wigwam,$5927 Train station,$5932 Prospectors hut,$5931 Mumbo's hut,$5934 Toxic gas cave,$5933 Canary cave,$592E Ordnance storage,$5941 Humba,$5A78 Water supply pipe,$5ABB Ordnance Storage entrance,$5AB6 Ordnance Storage game,$5AB5 Ordnance Storage game Multi,$5ABF Testing,$5ACA Testing,$5AC9 Mumbo's skull
-Cheat17_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat18="Instant Warp\Options\Witchy World",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat18_O=$5928 Witcy World,$592D Dodgem dome lobby,$5930 Dodgem challenge "1 vs 1",$592F Dodgem challenge "2 vs 1",$593A Dodgem challenge "3 vs 1",$5939 Crazy castle stockade,$593C Crazy castle lobby,$593B Crazy castle pump room,$5936 Balloon burst game,$5935 Hoop hurry game,$5938 Star spinner,$5937 The inferno,$5944 Cave of horrors,$5943 Haunted cavern,$593E Train station,$5A76 Saucer of Peril,$5A93 Crazy castle stockade "sop",$5A8E Star spinner "sop",$5AC8 Mumbo's skull
-Cheat18_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat19="Instant Warp\Options\Jolly Roger's Lagoon",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat19_O=$593D Jolly's,$5940 Pawno's emporium,$593F mumbo's skull,$5946 Ancient Swimming Baths,$5948 Electric Eels lair,$5947 Seaweed Sanctum,$5952 Inside the big fish,$5954 temple of the fishes,$5A02 Atlantis,$5A01 Seabottom,$5AD9 sea bottom cavern,$5ADC submarine multi,$5AF7 Jolly Roger's Lagoon,$594F Blubber's wave race hire
-Cheat19_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat20="Instant Warp\Options\Terrydacty Land",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat20_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat20_O=$5A6C Terrydacty Land,$5A6B Terry's nest,$5A66 Train station,$5A65 Oogle boogles cave,$5A68 Inside the mountain,$5A67 River passage,$5A72 Styracosaurus family cave,$5A71 Unga bunga's cave,$5A74 Stomping plains,$5A73 Bonfire caverns,$5A70 Humba's Wigwam,$5A7B Inside chompa's belly,$5ADB Chompa's belly multi
-Cheat21="Instant Warp\Options\Grunty Industries",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat21_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat21_O=$5A5A Outside,$5A59 Inside,$5A5C Train station,$5A5B Workers quarters,$5A56 Trash compactor,$5A55 Elevator shaft,$5A58 Floor 2,$5A57 Floor 2 "electromagnet chamber",$5A62 Floor 3,$5A61 Floor 3 "boiler plant",$5A64 Floor 3 "packing room",$5A63 Floor 4,$5A5E Floor 4 "cable room",$5A5D Floor 4 "quality control",$5A60 Floor 5,$5A5F Basement,$5A6A Basement "repair depot,$5A69 Basement "waste disposal",$5A75 Water supply pipe,$5ACC Mumbo's skull,$5ABC Floor 4 "clinkers cavern",$5AD7 Sewer entrance
-Cheat22="Instant Warp\Options\Hailfire Peaks",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat22_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat22_O=$5A77 Lava side,$5A82 Icy side,$5A81 Lava train station,$5A84 Ice train station,$5A83 Chilli billi,$5A7E Chilly willy,$5A7D Colosseum kickball stadium lobby,$5A89 Boggy's igloo,$5A8C Icicle grotto,$5A8B Inside the volcano,$5AC2 Icy side still
-Cheat23="Instant Warp\Options\Cloud Cuckoo Land",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat23_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat23_O=$5A88 Cloud Cuckoo Land 1,$5A87 Inside the trashcan,$5A92 Inside the cheesewedge,$5A91 Zubba's nest,$5A94 Central cavern,$5A8D Inside the pot o gold,$5A90 Mumbo's skull,$5A8F Mingy jongo's skull,$5A9A Humba wumba's wigwam,$5AB9 Cloud Cuckoo Land 2,$5AE2 Zubba's nest multi,$5AD5 Trash can mini
-Cheat24="Instant Warp\Options\Isle O Hags",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat24_O=$5A9F Wooded Hollow,$5AAA Heggy's egg shed,$5AA9 Jiggywiggy's temple,$5AAC Plateau,$5AAB Plateau "Honey B's Hive",$5AA6 Pine Grove,$5AA5 Cliff top,$5AA8 Cliff top Mumbo's skull,$5AB4 wasteland,$5AB3 inside another digger tunnel,$5AAE Quagmire
-Cheat24_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat25="Instant Warp\Options\Cauldron Keep",D008B494 0000,E9681CF8 ????,E8681CF5 5959
-Cheat25_O=$5AAD Cauldron Keep,$5AB0 The gatehouse,$5AAF Tower of Tragedy Quiz,$5ABA Gun chamber,$5AC4 Gun room still,$5AD3 Crazy Castle Stockade balloon burst multi,$5ACE Crazy Castle Stockade Jump the hoops multi,$5ACD Grunty Industries packing game,$5ADA Colosseum kickball arena,$5AD8 Dodgems
-Cheat25_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat26="Beta Bottles Revenge Mode",E8675B56 5959,E85E0B27 595C
-Cheat26_N=Bottles Revenge is a Beta mode from Banjo Tooie that the RWP team recently uncovered after an extraordinary amount of effort. Bottles the Spirit transforms into Bottles the Devil and posses enemies nearby and allows a second player hooked up to Pad 2 to play as that Posses character to try to foil Banjos Plans. As player one goes about its business, player two uses every enemy nearby to try to nab Banjo and take away some life. This mode is incredible, and you can control almost every enemy in the game: slot machines, flying creatures, uggers, zubbas...and this is just the beginning. (Congrats Rare Witch Project)
--- a/Config/Cheats/Baku
+++ b/Config/Cheats/Baku
@ -1,13 +1,13 @@
 [E340A49C-74318D41-C:4A]
 Name=Baku Bomberman (J)
-Cheat0="Invincible\Player 1",E8604157 5959
-Cheat1="Have\Pumped up Red Remote Bombs",E88019A5 5956
-Cheat2="Infinite\Lives",E8800FA9 59BB
-Cheat3="Infinite\Gems",E8800FB1 59BB
-Cheat4="Infinite\Credits",E8800FAD 5961
-Cheat5="Infinite\Time",E8800FC5 5959
-Cheat6="Carry 20 Bombs At A Time",E8604161 5966
-Cheat7="Infinite\Energy\Player 1",E8604159 595C
-Cheat8="Infinite\Energy\Player 2",E8604121 595C
-Cheat9="Infinite\Energy\Player 3",E86042E9 595C
-Cheat10="Infinite\Energy\Player 4",E86047B1 595C
+Cheat0="Invincible\Player 1",800AEE01 0001
+Cheat1="Have\Pumped up Red Remote Bombs",802AC653 0004
+Cheat2="Infinite\Lives",802AB857 0063
+Cheat3="Infinite\Gems",802AB85F 0063
+Cheat4="Infinite\Credits",802AB85B 0009
+Cheat5="Infinite\Time",802AB873 0001
+Cheat6="Carry 20 Bombs At A Time",800AEE0F 0014
+Cheat7="Infinite\Energy\Player 1",800AEE07 0002
+Cheat8="Infinite\Energy\Player 2",800AEECF 0002
+Cheat9="Infinite\Energy\Player 3",800AEF97 0002
+Cheat10="Infinite\Energy\Player 4",800AF05F 0002
--- a/Config/Cheats/Baku
+++ b/Config/Cheats/Baku
@ -1,11 +1,11 @@
 [E73C7C4F-AF93B838-C:4A]
 Name=Baku Bomberman 2 (J)
-Cheat0="Infinite\Money",E960EE06 504F
-Cheat1="Infinite\Bombs",E8600C10 595B
-Cheat2="Have\Max Fire Level",E8600CE5 595B
-Cheat3="Infinite\Health",E8600C11 5955
-Cheat4="Infinite\Continue Time",E95F8E8A 59EA
-Cheat5="Have\Fire Bombs",E8600CED 595B
-Cheat6="Have\Kick Bombs Anytime",E8600CF5 595B
-Cheat7="Flashing Invincible",E8600C19 5964
+Cheat0="Infinite\Money",810A9BB2 FFFF
+Cheat1="Infinite\Bombs",800AB5B8 0003
+Cheat2="Have\Max Fire Level",800AB593 0003
+Cheat3="Infinite\Health",800AB5BF 0005
+Cheat4="Infinite\Continue Time",810B3B36 0090
+Cheat5="Have\Fire Bombs",800AB59B 0003
+Cheat6="Have\Kick Bombs Anytime",800AB5A3 0003
+Cheat7="Flashing Invincible",800AB5C7 000A
 Cheat7_N=This cheat Makes you Flash But you cant be harmed,Once out of danger Turn the cheat off to stop the flashing.also do not put this on if you have already been hurt or you will stay on the floor.
--- a/Config/Cheats/Banjo
+++ b/Config/Cheats/Banjo
@ -1,14 +1,14 @@
 [5168D520-CA5FCD0D-C:4A]
 Name=Banjo to Kazooie no Daibouken (J)
-Cheat0="Infinite\Eggs",E88EBDF9 594F
-Cheat1="Infinite\Lives",E88EBD1D 594F
-Cheat2="Infinite\Jiggies",E88EBE5D 594F
-Cheat3="Infinite\Notes",E88EBE86 594F,E88EBDF6 5959
+Cheat0="Infinite\Eggs",80386AA7 00FF
+Cheat1="Infinite\Lives",80386ACB 00FF
+Cheat2="Infinite\Jiggies",80386B0B 00FF
+Cheat3="Infinite\Notes",80386B32 00FF,80386AA2 0001
 Cheat3_N=Just collect one Note to Have 255 Notes in all Worlds.
-Cheat4="Infinite\Health",E88EBD15 5962,E88EBD19 5962
-Cheat5="Infinite\Air",E98EBD22 5F6A
-Cheat6="Infinite\Gold Feathers",E88EBD05 594F
-Cheat7="Infinite\Red Feathers",E88EBD01 594F
-Cheat8="Infinite\Always Have All Jinjos",E88EBD0D 594F
-Cheat9="Have Zero Time all Levels",50000B04 0000,11386B44 3000
-Cheat10="Infinite\Mumbo Tokens",E88EBE59 594F
+Cheat4="Infinite\Health",80386AC3 0008,80386AC7 0008
+Cheat5="Infinite\Air",81386ACE 0E10
+Cheat6="Infinite\Gold Feathers",80386AB3 00FF
+Cheat7="Infinite\Red Feathers",80386AAF 00FF
+Cheat8="Infinite\Always Have All Jinjos",80386ABB 00FF
+Cheat9="Have Zero Time all Levels",50000B04 0000,81386B44 3000
+Cheat10="Infinite\Mumbo Tokens",80386B07 00FF
--- a/Config/Cheats/Banjo
+++ b/Config/Cheats/Banjo
@ -1,69 +1,69 @@
 [514B6900-B4B19881-C:4A]
 Name=Banjo to Kazooie no Daibouken 2 (J)
-Cheat0="Infinite\Energy\Banjo and Kazooie",E865A67F 59BB,E965AD5C 6364
+Cheat0="Infinite\Energy\Banjo and Kazooie",80115329 0063,81115A04 0A0A
 Cheat0_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat1="Infinite\Air",E868A576 9B22
-Cheat2="Infinite\Energy\Snowball",E865A67F 59BB,E865B059 5955
+Cheat1="Infinite\Air",80125222 42C8
+Cheat2="Infinite\Energy\Snowball",80115329 0063,80115907 0005
 Cheat2_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat3="Infinite\Energy\Bee",E865A67F 59BB,E865B065 5964,E865B06C 5964
+Cheat3="Infinite\Energy\Bee",80115329 0063,80115913 000A,80115914 000A
 Cheat3_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat4="Infinite\Energy\Washing Machine",E865A67F 59BB,E965B06A 6364
+Cheat4="Infinite\Energy\Washing Machine",80115329 0063,81115916 0A0A
 Cheat4_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat5="Infinite\Energy\Stony",E865A67F 59BB,E865B06F 5964,E865B06E 5964
+Cheat5="Infinite\Energy\Stony",80115329 0063,80115919 000A,8011591A 000A
 Cheat5_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat6="Infinite\Energy\Banjo",E865A67F 59BB,E865B071 5964,E865B078 5964
+Cheat6="Infinite\Energy\Banjo",80115329 0063,8011591F 000A,80115920 000A
 Cheat6_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat7="Infinite\Energy\Kazooie",E865A67F 59BB,E965B076 6364
+Cheat7="Infinite\Energy\Kazooie",80115329 0063,81115922 0A0A
 Cheat7_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat8="Infinite\Energy\Submarine",E865A67F 59BB,E865B07B 5964,E865B07A 5964
+Cheat8="Infinite\Energy\Submarine",80115329 0063,80115925 000A,80115926 000A
 Cheat8_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat9="Infinite\Energy\Mumbo",E865A67F 59BB,E965B080 6364
+Cheat9="Infinite\Energy\Mumbo",80115329 0063,81115928 0A0A
 Cheat9_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat10="Infinite\Energy\Detonator",E865A67F 59BB,E965B082 6364
+Cheat10="Infinite\Energy\Detonator",80115329 0063,8111592E 0A0A
 Cheat10_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat11="Infinite\Energy\T-Rex Baby",E865A67F 59BB,E865B091 5964,E865B098 5964
+Cheat11="Infinite\Energy\T-Rex Baby",80115329 0063,8011593F 000A,80115940 000A
 Cheat11_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat12="Play As",D0080845 0020,E8686854 59??
-Cheat12_O=$59 Banjo and Kazooie,$5C Snowball,$58 Bee,$57 Washing machine,$62 Stony,$64 Banjo,$63 Kazooie,$5E Submarine,$5D Mumbo,$60 Golden Goliath,$5F Detonator,$6A Truck,$6C T-rex baby,$6B T-rex daddy
+Cheat12="Play As",D0080845 0020,801211FC 00??
 Cheat12_N=To use this cheat, put the cheat on, then press L as you walk through a door to become that chosen character
-Cheat13="Instant Warp\Options\Spiral Mountain",D1080844 0000,E9686A48 59??,E8686A45 5959
+Cheat12_O=$01 Banjo and Kazooie,$02 Snowball,$06 Bee,$07 Washing machine,$08 Stony,$0A Banjo,$0B Kazooie,$0C Submarine,$0D Mumbo,$0E Golden Goliath,$0F Detonator,$10 Truck,$12 T-rex baby,$13 T-rex daddy
+Cheat13="Instant Warp\Options\Spiral Mountain",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat13_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat13_O=$5A AD Grunty's Old Lair,$5A AE Behind The Waterfall,$5A AF Top Of Castle,$59 73 Banjo's house
-Cheat14="Instant Warp\Options\Jinjo Village",D1080844 0000,E9686A48 59??,E8686A45 5959
+Cheat13_O=$00 AD Grunty's Old Lair,$00 AE Behind The Waterfall,$00 AF Top Of Castle,$01 73 Banjo's house
+Cheat14="Instant Warp\Options\Jinjo Village",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat14_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat14_O=$59 42 Jinjo Village,$59 44 King Jingalings throne room,$59 43 Bottles house,$59 45 Green Jinjo's House,$59 46 Black Jinjo's House,$59 47 Yellow Jinjo's House,$59 48 Blue Jinjo's House,$59 4A Brown Jinjo's House,$59 4B Orange Jinjo's House,$59 4C Purple Jinjo's House,$59 4D Red Jinjo's House,$59 4E White Jinjo's House
-Cheat15="Instant Warp\Options\Mayahem Temple",D1080844 0000,E9686A48 59??,E8686A45 5959
+Cheat14_O=$01 42 Jinjo Village,$01 44 King Jingalings throne room,$01 43 Bottles house,$01 45 Green Jinjo's House,$01 46 Black Jinjo's House,$01 47 Yellow Jinjo's House,$01 48 Blue Jinjo's House,$01 4A Brown Jinjo's House,$01 4B Orange Jinjo's House,$01 4C Purple Jinjo's House,$01 4D Red Jinjo's House,$01 4E White Jinjo's House
+Cheat15="Instant Warp\Options\Mayahem Temple",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat15_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat15_O=$5A B6 Humba's Wigwam,$5A B7 Mumbo's skull,$5A B8 The Temple,$5A B9 Prison Compound,$5A BC Code chamber,$5A C4 Jade Snake Grove,$5A C5 Treasure Chamber,$5A C6 Kickball Arena,$59 77 Targitzan's Slighty Sacred Temple,$59 78 Inside Targitzans Temple,$59 79 Targitzan Temple Lobby,$59 7A Targitzan's Temple Boss,$59 7F Mayan Kickball Arena,$59 66 Multi,$59 67 Still,$5A C8 Kickball Arena,$5A C9 Kickball Arena
-Cheat16="Instant Warp\Options\Glitter Gulch Mine",D1080844 0000,E9686A48 59??,E8686A45 5959
-Cheat16_O=$5A C7 Mine,$5A CA Fuel depot,$5A CB Crushing shed,$5A CC Flooded caves,$5A CD Water storage,$5A CE Waterfall cavern,$5A CF Power hut basement,$5A D0 Chuffy's cab,$5A D1 Inside chuffy's boiler boss,$5A D2 Gloomy caverns,$5A D3 Generator caverns,$5A D4 Power hut,$5A D5 Wumba's wigwam,$5A D7 Train station,$5A D8 Prospectors hut,$5A D9 Mumbo's hut,$5A DA Toxic gas cave,$5A DB Canary cave,$5A DC Ordnance storage,$5A E9 Humba,$59 26 Water supply pipe,$59 63 Ordnance Storage entrance,$59 64 Ordnance Storage game,$59 65 Ordnance Storage game Multi,$59 6F Testing,$59 70 Testing,$59 71 Mumbo's skull
+Cheat15_O=$00 B6 Humba's Wigwam,$00 B7 Mumbo's skull,$00 B8 The Temple,$00 B9 Prison Compound,$00 BC Code chamber,$00 C4 Jade Snake Grove,$00 C5 Treasure Chamber,$00 C6 Kickball Arena,$01 77 Targitzan's Slighty Sacred Temple,$01 78 Inside Targitzans Temple,$01 79 Targitzan Temple Lobby,$01 7A Targitzan's Temple Boss,$01 7F Mayan Kickball Arena,$01 66 Multi,$01 67 Still,$00 C8 Kickball Arena,$00 C9 Kickball Arena
+Cheat16="Instant Warp\Options\Glitter Gulch Mine",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat16_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat17="Instant Warp\Options\Witchy World",D1080844 0000,E9686A48 59??,E8686A45 5959
-Cheat17_O=$5A D6 Witcy World,$5A DD Dodgem dome lobby,$5A DE Dodgem challenge "1 vs 1",$5A DF Dodgem challenge "2 vs 1",$5A E0 Dodgem challenge "3 vs 1",$5A E1 Crazy castle stockade,$5A E2 Crazy castle lobby,$5A E3 Crazy castle pump room,$5A E4 Balloon burst game,$5A E5 Hoop hurry game,$5A E6 Star spinner,$5A E7 The inferno,$5A EA Cave of horrors,$5A EB Haunted cavern,$5A EC Train station,$59 24 Saucer of Peril,$59 3B Crazy castle stockade "sop",$59 3C Star spinner "sop",$59 76 Mumbo's skull
+Cheat16_O=$00 C7 Mine,$00 CA Fuel depot,$00 CB Crushing shed,$00 CC Flooded caves,$00 CD Water storage,$00 CE Waterfall cavern,$00 CF Power hut basement,$00 D0 Chuffy's cab,$00 D1 Inside chuffy's boiler boss,$00 D2 Gloomy caverns,$00 D3 Generator caverns,$00 D4 Power hut,$00 D5 Wumba's wigwam,$00 D7 Train station,$00 D8 Prospectors hut,$00 D9 Mumbo's hut,$00 DA Toxic gas cave,$00 DB Canary cave,$00 DC Ordnance storage,$00 E9 Humba,$01 26 Water supply pipe,$01 63 Ordnance Storage entrance,$01 64 Ordnance Storage game,$01 65 Ordnance Storage game Multi,$01 6F Testing,$01 70 Testing,$01 71 Mumbo's skull
+Cheat17="Instant Warp\Options\Witchy World",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat17_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat18="Instant Warp\Options\Jolly Roger's Lagoon",D1080844 0000,E9686A48 59??,E8686A45 5959
-Cheat18_O=$5A ED Jolly's,$5A EE Pawno's emporium,$5A EF mumbo's skull,$5A F4 Ancient Swimming Baths,$5A F6 Electric Eels lair,$5A F7 Seaweed Sanctum,$5A F8 Inside the big fish,$5A FA temple of the fishes,$59 A8 Atlantis,$59 A9 Seabottom,$59 81 sea bottom cavern,$59 82 submarine multi,$59 A7 Jolly Roger's Lagoon,$5A FF Blubber's wave race hire
+Cheat17_O=$00 D6 Witcy World,$00 DD Dodgem dome lobby,$00 DE Dodgem challenge "1 vs 1",$00 DF Dodgem challenge "2 vs 1",$00 E0 Dodgem challenge "3 vs 1",$00 E1 Crazy castle stockade,$00 E2 Crazy castle lobby,$00 E3 Crazy castle pump room,$00 E4 Balloon burst game,$00 E5 Hoop hurry game,$00 E6 Star spinner,$00 E7 The inferno,$00 EA Cave of horrors,$00 EB Haunted cavern,$00 EC Train station,$01 24 Saucer of Peril,$01 3B Crazy castle stockade "sop",$01 3C Star spinner "sop",$01 76 Mumbo's skull
+Cheat18="Instant Warp\Options\Jolly Roger's Lagoon",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat18_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat19="Instant Warp\Options\Terrydacty Land",D1080844 0000,E9686A48 59??,E8686A45 5959
-Cheat19_O=$59 12 Terrydacty Land,$59 13 Terry's nest,$59 14 Train station,$59 15 Oogle boogles cave,$59 16 Inside the mountain,$59 17 River passage,$59 18 Styracosaurus family cave,$59 19 Unga bunga's cave,$59 1A Stomping plains,$59 1B Bonfire caverns,$59 1E Humba's Wigwam,$59 23 Inside chompa's belly,$59 83 Chompa's belly multi
+Cheat18_O=$00 ED Jolly's,$00 EE Pawno's emporium,$00 EF mumbo's skull,$00 F4 Ancient Swimming Baths,$00 F6 Electric Eels lair,$00 F7 Seaweed Sanctum,$00 F8 Inside the big fish,$00 FA temple of the fishes,$01 A8 Atlantis,$01 A9 Seabottom,$01 81 sea bottom cavern,$01 82 submarine multi,$01 A7 Jolly Roger's Lagoon,$00 FF Blubber's wave race hire
+Cheat19="Instant Warp\Options\Terrydacty Land",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat19_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat20="Instant Warp\Options\Grunty Industries",D1080844 0000,E9686A48 59??,E8686A45 5959
+Cheat19_O=$01 12 Terrydacty Land,$01 13 Terry's nest,$01 14 Train station,$01 15 Oogle boogles cave,$01 16 Inside the mountain,$01 17 River passage,$01 18 Styracosaurus family cave,$01 19 Unga bunga's cave,$01 1A Stomping plains,$01 1B Bonfire caverns,$01 1E Humba's Wigwam,$01 23 Inside chompa's belly,$01 83 Chompa's belly multi
+Cheat20="Instant Warp\Options\Grunty Industries",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat20_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat20_O=$59 00 Outside,$59 01 Inside,$59 02 Train station,$59 03 Workers quarters,$59 04 Trash compactor,$59 05 Elevator shaft,$59 06 Floor 2,$59 07 Floor 2 "electromagnet chamber",$59 08 Floor 3,$59 09 Floor 3 "boiler plant",$59 0A Floor 3 "packing room",$59 0B Floor 4,$59 0C Floor 4 "cable room",$59 0D Floor 4 "quality control",$59 0E Floor 5,$59 0F Basement,$59 10 Basement "repair depot,$59 11 Basement "waste disposal",$59 25 Water supply pipe,$59 72 Mumbo's skull,$59 62 Floor 4 "clinkers cavern",$59 87 Sewer entrance
-Cheat21="Instant Warp\Options\Hailfire Peaks",D1080844 0000,E9686A48 59??,E8686A45 5959
+Cheat20_O=$01 00 Outside,$01 01 Inside,$01 02 Train station,$01 03 Workers quarters,$01 04 Trash compactor,$01 05 Elevator shaft,$01 06 Floor 2,$01 07 Floor 2 "electromagnet chamber",$01 08 Floor 3,$01 09 Floor 3 "boiler plant",$01 0A Floor 3 "packing room",$01 0B Floor 4,$01 0C Floor 4 "cable room",$01 0D Floor 4 "quality control",$01 0E Floor 5,$01 0F Basement,$01 10 Basement "repair depot,$01 11 Basement "waste disposal",$01 25 Water supply pipe,$01 72 Mumbo's skull,$01 62 Floor 4 "clinkers cavern",$01 87 Sewer entrance
+Cheat21="Instant Warp\Options\Hailfire Peaks",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat21_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat21_O=$59 27 Lava side,$59 28 Icy side,$59 29 Lava train station,$59 2A Ice train station,$59 2B Chilli billi,$59 2C Chilly willy,$59 2D Colosseum kickball stadium lobby,$59 31 Boggy's igloo,$59 32 Icicle grotto,$59 33 Inside the volcano,$59 68 Icy side still
-Cheat22="Instant Warp\Options\Cloud Cuckoo Land",D1080844 0000,E9686A48 59??,E8686A45 5959
+Cheat21_O=$01 27 Lava side,$01 28 Icy side,$01 29 Lava train station,$01 2A Ice train station,$01 2B Chilli billi,$01 2C Chilly willy,$01 2D Colosseum kickball stadium lobby,$01 31 Boggy's igloo,$01 32 Icicle grotto,$01 33 Inside the volcano,$01 68 Icy side still
+Cheat22="Instant Warp\Options\Cloud Cuckoo Land",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat22_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat22_O=$59 36 Cloud Cuckoo Land 1,$59 37 Inside the trashcan,$59 38 Inside the cheesewedge,$59 39 Zubba's nest,$59 3A Central cavern,$59 3D Inside the pot o gold,$59 3E Mumbo's skull,$59 3F Mingy jongo's skull,$59 40 Humba wumba's wigwam,$59 61 Cloud Cuckoo Land 2,$59 88 Zubba's nest multi,$59 85 Trash can mini
-Cheat23="Instant Warp\Options\Isle O Hags",D1080844 0000,E9686A48 59??,E8686A45 5959
+Cheat22_O=$01 36 Cloud Cuckoo Land 1,$01 37 Inside the trashcan,$01 38 Inside the cheesewedge,$01 39 Zubba's nest,$01 3A Central cavern,$01 3D Inside the pot o gold,$01 3E Mumbo's skull,$01 3F Mingy jongo's skull,$01 40 Humba wumba's wigwam,$01 61 Cloud Cuckoo Land 2,$01 88 Zubba's nest multi,$01 85 Trash can mini
+Cheat23="Instant Warp\Options\Isle O Hags",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat23_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat23_O=$59 4F Wooded Hollow,$59 50 Heggy's egg shed,$59 51 Jiggywiggy's temple,$59 52 Plateau,$59 53 Plateau "Honey B's Hive",$59 54 Pine Grove,$59 55 Cliff top,$59 56 Cliff top Mumbo's skull,$59 5A wasteland,$59 5B inside another digger tunnel,$59 5C Quagmire
-Cheat24="Instant Warp\Options\Cauldron Keep",D1080844 0000,E9686A48 59??,E8686A45 5959
-Cheat24_O=$59 5D Cauldron Keep,$59 5E The gatehouse,$59 5F Tower of Tragedy Quiz,$59 60 Gun chamber,$59 6A Gun room still,$59 7B Crazy Castle Stockade balloon burst multi,$59 7C Crazy Castle Stockade Jump the hoops multi,$59 7D Grunty Industries packing game,$59 80 Colosseum kickball arena,$59 86 Dodgems
+Cheat23_O=$01 4F Wooded Hollow,$01 50 Heggy's egg shed,$01 51 Jiggywiggy's temple,$01 52 Plateau,$01 53 Plateau "Honey B's Hive",$01 54 Pine Grove,$01 55 Cliff top,$01 56 Cliff top Mumbo's skull,$01 5A wasteland,$01 5B inside another digger tunnel,$01 5C Quagmire
+Cheat24="Instant Warp\Options\Cauldron Keep",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat24_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat25="Instant Warp\Options\Not sure",D1080844 0000,E9686A48 59??,E8686A45 5959
-Cheat25_O=$5A FC Lord woo fak fak,$5A F9 Mr Patch,$59 21 Inside Chuffy's wagon,$59 34 Mumbo's Skull,$59 35 Humba Wumba's wigwam 1,$59 57 Humba Wumba's wigwam 2,$59 9B Jingalings Zombified Palace,$59 A6 Smuggler cavern,$59 41 Inside the digger tunnel,$59 43 Bottles house,$59 69 Bottles house still,$59 8A HAG Inside,$59 9A HAG1 Final Boss
+Cheat24_O=$01 5D Cauldron Keep,$01 5E The gatehouse,$01 5F Tower of Tragedy Quiz,$01 60 Gun chamber,$01 6A Gun room still,$01 7B Crazy Castle Stockade balloon burst multi,$01 7C Crazy Castle Stockade Jump the hoops multi,$01 7D Grunty Industries packing game,$01 80 Colosseum kickball arena,$01 86 Dodgems
+Cheat25="Instant Warp\Options\Not sure",D1080844 0000,811217F0 00??,801217F3 0001
 Cheat25_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat26="Beta Bottles Revenge Mode",E868AC16 5959,E85E5FD7 595C
+Cheat25_O=$00 FC Lord woo fak fak,$00 F9 Mr Patch,$01 21 Inside Chuffy's wagon,$01 34 Mumbo's Skull,$01 35 Humba Wumba's wigwam 1,$01 57 Humba Wumba's wigwam 2,$01 9B Jingalings Zombified Palace,$01 A6 Smuggler cavern,$01 41 Inside the digger tunnel,$01 43 Bottles house,$01 69 Bottles house still,$01 8A HAG Inside,$01 9A HAG1 Final Boss
+Cheat26="Beta Bottles Revenge Mode",801255C2 0001,80080881 0002
 Cheat26_N=Bottles Revenge is a Beta mode from Banjo Tooie that the RWP team recently uncovered after an extraordinary amount of effort. Bottles the Spirit transforms into Bottles the Devil and posses enemies nearby and allows a second player hooked up to Pad 2 to play as that Posses character to try to foil Banjos Plans. As player one goes about its business, player two uses every enemy nearby to try to nab Banjo and take away some life. This mode is incredible, and you can control almost every enemy in the game: slot machines, flying creatures, uggers, zubbas...and this is just the beginning. (Congrats Rare Witch Project)
--- a/Config/Cheats/Banjo-Kazooie
+++ b/Config/Cheats/Banjo-Kazooie
@ -1,28 +1,28 @@
 [733FCCB1-444892F9-C:50]
-Name=Banjo-Kazooie (E)
-Cheat0="Infinite\Lives",E88EC0BD 5961
-Cheat1="Have\Running Shoes",E98B1DE0 A971
-Cheat2="Have\Zero Time all Levels",50000B04 0000,113869E4 3000
-Cheat3="Have\Blubbers Gold",E88EC0C5 594F
-Cheat4="Have\Present Option\Green",E88EC0E1 594F
-Cheat5="Have\Present Option\Blue",E88EC0E5 594F
-Cheat6="Have\Present Option\Red",E88EC0E9 594F
-Cheat7="Have\Nabnuts Acorns",E88EC0F1 594F
-Cheat8="Have\Eyries Caterpillars",E88EC0ED 594F
-Cheat9="Have\Chimpys Oranges",E88EC0C9 594F
-Cheat10="Have\All Jinjos",E88EC0AD 594F
-Cheat11="Yumblies Counter\Mr Vile",E88EC0D4 594F
-Cheat12="Yumblies Counter\Banjo",E88EC0CD 594F
-Cheat13="Press L To Levitate",D0285735 0020,E98B21E4 9C3A
+Name=Banjo-Kazooie (E) (M3)
+Cheat0="Infinite\Lives",8038696B 0009
+Cheat1="Have\Running Shoes",8137CA88 5019
+Cheat2="Have\Zero Time all Levels",50000B04 0000,813869E4 3000
+Cheat3="Have\Blubbers Gold",80386973 00FF
+Cheat4="Have\Present Option\Green",8038698F 00FF
+Cheat5="Have\Present Option\Blue",80386993 00FF
+Cheat6="Have\Present Option\Red",80386997 00FF
+Cheat7="Have\Nabnuts Acorns",8038699F 00FF
+Cheat8="Have\Eyries Caterpillars",8038699B 00FF
+Cheat9="Have\Chimpys Oranges",80386977 00FF
+Cheat10="Have\All Jinjos",8038695B 00FF
+Cheat11="Yumblies Counter\Mr Vile",8038697C 00FF
+Cheat12="Yumblies Counter\Banjo",8038697B 00FF
+Cheat13="Press L To Levitate",D0285735 0020,8137CE8C 43E0
 Cheat13_N=Press L To Levitate & Let go to land
-Cheat14="Do Anywhere Option\Take off anywhere",D0285734 0080,E88B1EF7 5959
+Cheat14="Do Anywhere Option\Take off anywhere",D0285734 0080,8037CBA1 0001
 Cheat14_N=Press A
-Cheat15="Infinite\Health",E88EC0B5 5962,E88EC0BB 5959
-Cheat16="Infinite\8 Skulls",E88EC0F9 5962
-Cheat17="Infinite\255 Jigsaws",E88EC0FD 594F
-Cheat18="Infinite\Air",E88EC0C2 5963
-Cheat19="Infinite\255 Notes",E88EC095 594F
-Cheat20="Infinite\255 Eggs",E88EC099 594F
-Cheat21="Infinite\255 Gold Feathers",E88EC0A5 594F
-Cheat22="Infinite\255 Red Feathers",E88EC0A1 594F
-Cheat23="Access All Moves",E88B24C8 5959,E88B24C7 59CF,E88B24C6 594F,E88B24C5 594F
+Cheat15="Infinite\Health",80386963 0008,80386965 0001
+Cheat16="Infinite\8 Skulls",803869A7 0008
+Cheat17="Infinite\255 Jigsaws",803869AB 00FF
+Cheat18="Infinite\Air",8038696E 000B
+Cheat19="Infinite\255 Notes",80386943 00FF
+Cheat20="Infinite\255 Eggs",80386947 00FF
+Cheat21="Infinite\255 Gold Feathers",80386953 00FF
+Cheat22="Infinite\255 Red Feathers",8038694F 00FF
+Cheat23="Access All Moves",8037CD70 0001,8037CD71 007F,8037CD72 00FF,8037CD73 00FF
--- a/Config/Cheats/Banjo-Kazooie
+++ b/Config/Cheats/Banjo-Kazooie
@ -1,26 +1,26 @@
 [A4BF9306-BF0CDFD1-C:45]
 Name=Banjo-Kazooie (U) (V1.0)
-Cheat0="Infinite\Eggs",E88EB2B9 594F
-Cheat1="Infinite\Lives",E88EB2DD 594F
-Cheat2="Infinite\Jiggies",E88EB21D 594F
-Cheat3="Press L To Levitate",D0281251 0020,E98B1B14 9C3A
+Cheat0="Infinite\Eggs",80385F67 00FF
+Cheat1="Infinite\Lives",80385F8B 00FF
+Cheat2="Infinite\Jiggies",80385FCB 00FF
+Cheat3="Press L To Levitate",D0281251 0020,8137C4BC 43E0
 Cheat3_N=Press L To Levitate & Let go to land
-Cheat4="Infinite\Notes",E88EB246 594F,E88EB2B6 5959
+Cheat4="Infinite\Notes",80385FF2 00FF,80385F62 0001
 Cheat4_N=Just collect one Note to Have 255 Notes in all Worlds.
-Cheat5="Infinite\Health",E88EB2D5 5962,E88EB2D9 5962
-Cheat6="Infinite\Air",E98EB2E2 5F6A
-Cheat7="Infinite\Gold Feathers",E88EB2C5 594F
-Cheat8="Infinite\Red Feathers",E88EB2C1 594F
-Cheat9="Infinite\Always Have All Jinjos",E88EB2CD 594F
-Cheat10="Have Zero Time all Levels",50000B04 0000,11386004 3000
-Cheat11="Character Select",D0281251 0008,E88B1525 595C,D0281251 0001,E88B1525 595B,D0281251 0004,E88B1525 5956,D0281251 0002,E88B1525 5955,D0281251 0010,E88B1525 5958,D0281251 0020,E88B1525 5957
+Cheat5="Infinite\Health",80385F83 0008,80385F87 0008
+Cheat6="Infinite\Air",81385F8E 0E10
+Cheat7="Infinite\Gold Feathers",80385F73 00FF
+Cheat8="Infinite\Red Feathers",80385F6F 00FF
+Cheat9="Infinite\Always Have All Jinjos",80385F7B 00FF
+Cheat10="Have Zero Time all Levels",50000B04 0000,81386004 3000
+Cheat11="Character Select",D0281251 0008,8037C2D3 0002,D0281251 0001,8037C2D3 0003,D0281251 0004,8037C2D3 0004,D0281251 0002,8037C2D3 0005,D0281251 0010,8037C2D3 0006,D0281251 0020,8037C2D3 0007
 Cheat11_N=When Mumbo transforms you hold:C-Up for the Termite,C-Right for the Pumpkin,C-Down for the Walrus,C-Left for the Crocc,R for the Bumble Bee,L for the Washing Machine,Press nothing to turn into Banjo
-Cheat12="Infinite\Mumbo Tokens",E88EB21A 594F,E88EB2F6 594F
-Cheat13="Take Off And Fly From Anywhere",E88B1827 595C
+Cheat12="Infinite\Mumbo Tokens",80385FC6 00FF,80385FA2 00FF
+Cheat13="Take Off And Fly From Anywhere",8037C1D1 0002
 Cheat13_N=Press A Button. Do not use with Do Shock Spring Jump From Anywhere
-Cheat14="Access All Moves",E88B16F8 5959,E88B16F7 59CF,E88B16F6 594F,E88B16F5 594F
-Cheat15="Game 100% Complete",E98B16F8 596F,50000302 0000,1137C3A2 FFFF,50000602 0000,113832C0 FFFF,E98E921E 59B6,E98E9234 59B6,50000802 0000,113832F0 FFFF,E98EB2F8 59BB,E98EB21C 59BB,E98EB248 59B6,50000602 0000,11385FF2 6464,50001002 0000,113831A8 FFFF,E98E8808 50CF,E98E8806 500A,E98E880C 8EF8,E98E880A 4BB6,E98E881A 50CF
-Cheat16="Secret Items ",E97E8B58 ????
-Cheat16_O=$504F Have All Collected,$595A Have None
-Cheat17="Do Shock Spring Jump From Anywhere",E88B1826 595C
+Cheat14="Access All Moves",8037C3A0 0001,8037C3A1 007F,8037C3A2 00FF,8037C3A3 00FF
+Cheat15="Game 100% Complete",8137C3A0 001F,50000302 0000,8137C3A2 FFFF,50000602 0000,813832C0 FFFF,81383FCA 0064,81383FDC 0064,50000802 0000,813832F0 FFFF,81385FA0 0063,81385FC4 0063,81385FF0 0064,50000602 0000,81385FF2 6464,50001002 0000,813831A8 FFFF,813831B0 FF7F,813831B2 FFB0,813831B4 3DA6,813831B6 F264,813831C6 FF7F
+Cheat16="Secret Items",81283400 ????
+Cheat16_O=$FFFF Have All Collected,$0000 Have None
+Cheat17="Do Shock Spring Jump From Anywhere",8037C1D2 0002
 Cheat17_N=Press A Button. Do not use with Take Off And Fly From Anywhere
--- a/Config/Cheats/Banjo-Kazooie
+++ b/Config/Cheats/Banjo-Kazooie
@ -1,26 +1,26 @@
 [CD7559AC-B26CF5AE-C:45]
 Name=Banjo-Kazooie (U) (V1.1)
-Cheat0="Infinite\Eggs",E88EB2B9 594F
-Cheat1="Infinite\Lives",E88EB2DD 594F
-Cheat2="Infinite\Jiggies",E88EB21D 594F
-Cheat3="Press L To Levitate",D0281251 0020,E98B1B14 9C3A
+Cheat0="Infinite\Eggs",80385F67 00FF
+Cheat1="Infinite\Lives",80385F8B 00FF
+Cheat2="Infinite\Jiggies",80385FCB 00FF
+Cheat3="Press L To Levitate",D0281251 0020,8137C4BC 43E0
 Cheat3_N=Press L To Levitate & Let go to land
-Cheat4="Infinite\Notes",E88EB246 594F,E88EB2B6 5959
+Cheat4="Infinite\Notes",80385FF2 00FF,80385F62 0001
 Cheat4_N=Just collect one Note to Have 255 Notes in all Worlds.
-Cheat5="Infinite\Health",E88EB2D5 5962,E88EB2D9 5962
-Cheat6="Infinite\Air",E98EB2E2 5F6A
-Cheat7="Infinite\Gold Feathers",E88EB2C5 594F
-Cheat8="Infinite\Red Feathers",E88EB2C1 594F
-Cheat9="Infinite\Always Have All Jinjos",E88EB2CD 594F
-Cheat10="Have Zero Time all Levels",50000B04 0000,11386004 3000
-Cheat11="Character Select",D0281251 0008,E88B1525 595C,D0281251 0001,E88B1525 595B,D0281251 0004,E88B1525 5956,D0281251 0002,E88B1525 5955,D0281251 0010,E88B1525 5958,D0281251 0020,E88B1525 5957
+Cheat5="Infinite\Health",80385F83 0008,80385F87 0008
+Cheat6="Infinite\Air",81385F8E 0E10
+Cheat7="Infinite\Gold Feathers",80385F73 00FF
+Cheat8="Infinite\Red Feathers",80385F6F 00FF
+Cheat9="Infinite\Always Have All Jinjos",80385F7B 00FF
+Cheat10="Have Zero Time all Levels",50000B04 0000,81386004 3000
+Cheat11="Character Select",D0281251 0008,8037C2D3 0002,D0281251 0001,8037C2D3 0003,D0281251 0004,8037C2D3 0004,D0281251 0002,8037C2D3 0005,D0281251 0010,8037C2D3 0006,D0281251 0020,8037C2D3 0007
 Cheat11_N=When Mumbo transforms you hold:C-Up for the Termite,C-Right for the Pumpkin,C-Down for the Walrus,C-Left for the Crocc,R for the Bumble Bee,L for the Washing Machine,Press nothing to turn into Banjo
-Cheat12="Infinite\Mumbo Tokens",E88EB21A 594F,E88EB2F6 594F
-Cheat13="Take Off And Fly From Anywhere",E88B1827 595C
+Cheat12="Infinite\Mumbo Tokens",80385FC6 00FF,80385FA2 00FF
+Cheat13="Take Off And Fly From Anywhere",8037C1D1 0002
 Cheat13_N=Press A Button. Do not use with Do Shock Spring Jump From Anywhere
-Cheat14="Access All Moves",E88B16F8 5959,E88B16F7 59CF,E88B16F6 594F,E88B16F5 594F
-Cheat15="Game 100% Complete",E98B16F8 596F,50000302 0000,1137C3A2 FFFF,50000602 0000,113832C0 FFFF,E98E921E 59B6,E98E9234 59B6,50000802 0000,113832F0 FFFF,E98EB2F8 59BB,E98EB21C 59BB,E98EB248 59B6,50000602 0000,11385FF2 6464,50001002 0000,113831A8 FFFF,E98E8808 50CF,E98E8806 500A,E98E880C 8EF8,E98E880A 4BB6,E98E881A 50CF
-Cheat16="Secret Items ",E97E8B58 ????
-Cheat16_O=$504F Have All Collected,$595A Have None
-Cheat17="Do Shock Spring Jump From Anywhere",E88B1826 595C
+Cheat14="Access All Moves",8037C3A0 0001,8037C3A1 007F,8037C3A2 00FF,8037C3A3 00FF
+Cheat15="Game 100% Complete",8137C3A0 001F,50000302 0000,8137C3A2 FFFF,50000602 0000,813832C0 FFFF,81383FCA 0064,81383FDC 0064,50000802 0000,813832F0 FFFF,81385FA0 0063,81385FC4 0063,81385FF0 0064,50000602 0000,81385FF2 6464,50001002 0000,813831A8 FFFF,813831B0 FF7F,813831B2 FFB0,813831B4 3DA6,813831B6 F264,813831C6 FF7F
+Cheat16="Secret Items",81283400 ????
+Cheat16_O=$FFFF Have All Collected,$0000 Have None
+Cheat17="Do Shock Spring Jump From Anywhere",8037C1D2 0002
 Cheat17_N=Press A Button. Do not use with Take Off And Fly From Anywhere
--- a/Config/Cheats/Banjo-Tooie
+++ b/Config/Cheats/Banjo-Tooie
@ -0,0 +1,138 @@
+[155B7CDF-F0DA7325-C:55]
+Name=Banjo-Tooie (A)
+Cheat0="Infinite\Energy\Banjo and Kazooie",8011FFA9 0063,81120584 0A0A
+Cheat0_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat1="Infinite\Energy\Snowball",8011FFA9 0063,80120587 0005
+Cheat1_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat2="Infinite\Energy\Bee",8011FFA9 0063,80120593 000A,80120594 000A
+Cheat2_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat3="Infinite\Energy\Washing Machine",8011FFA9 0063,81120596 0A0A
+Cheat3_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat4="Infinite\Energy\Stony",8011FFA9 0063,80120599 000A,8011B44A 000A
+Cheat4_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat5="Infinite\Energy\Banjo",8011FFA9 0063,8012059F 000A,801205A0 000A
+Cheat5_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat6="Infinite\Energy\Kazooie",8011FFA9 0063,811205A2 0A0A
+Cheat6_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat7="Infinite\Energy\Submarine",8011FFA9 0063,801205A5 000A,801205A6 000A
+Cheat7_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat8="Infinite\Energy\Mumbo",8011FFA9 0063,811205A8 0A0A
+Cheat8_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat9="Infinite\Energy\Detonator",8011FFA9 0063,811205AE 0A0A
+Cheat9_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat10="Infinite\Energy\T-Rex Baby",8011FFA9 0063,801205BF 000A,801205C0 000A
+Cheat11="Infinite\Air",8112FDC2 42C8
+Cheat12="Instant Warp\Options\Not sure",D008B284 0000,8012C390 ????,8012C393 0001
+Cheat12_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat12_O=$00FC Lord woo fak fak,$00F9 Mr Patch,$0121 Inside Chuffy's wagon,$0134 Mumbo's Skull,$0135 Humba Wumba's wigwam 1,$0157 Humba Wumba's wigwam 2,$019B Jingalings Zombified Palace,$01A6 Smuggler cavern,$0141 Inside the digger tunnel,$0143 Bottles house,$0169 Bottles house still,$018A HAG Inside,$019A HAG1 Final Boss
+Cheat13="Instant Warp\Options\Cauldron Keep",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat13_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat13_O=$015D Cauldron Keep,$015E The gatehouse,$015F Tower of Tragedy Quiz,$0160 Gun chamber,$016A Gun room still,$017B Crazy Castle Stockade balloon burst multi,$017C Crazy Castle Stockade Jump the hoops multi,$017D Grunty Industries packing game,$0180 Colosseum kickball arena,$0186 Dodgems
+Cheat14="Instant Warp\Options\Spiral Mountain",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat14_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat14_O=$00AD Grunty's Old Lair,$00AE Behind The Waterfall,$00AF Top Of Castle,$0173 Banjo's house
+Cheat15="Instant Warp\Options\Jinjo Village",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat15_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat15_O=$0142 Jinjo Village,$0144 King Jingalings throne room,$0143 Bottles house,$0145 Green Jinjo's House,$0146 Black Jinjo's House,$0147 Yellow Jinjo's House,$0148 Blue Jinjo's House,$014A Brown Jinjo's House,$014B Orange Jinjo's House,$014C Purple Jinjo's House,$014D Red Jinjo's House,$014E White Jinjo's House
+Cheat16="Instant Warp\Options\Mayahem Temple",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat16_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat16_O=$00B6 Humba's Wigwam,$00B7 Mumbo's skull,$00B8 The Temple,$00B9 Prison Compound,$00BC Code chamber,$00C4 Jade Snake Grove,$00C5 Treasure Chamber,$00C6 Kickball Arena,$0177 Targitzan's Slighty Sacred Temple,$0178 Inside Targitzans Temple,$0179 Targitzan Temple Lobby,$017A Targitzan's Temple Boss,$017F Mayan Kickball Arena,$0166 Multi,$0167 Still,$00C8 Kickball Arena,$00C9 Kickball Arena
+Cheat17="Instant Warp\Options\Glitter Gulch Mine",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat17_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat17_O=$00C7 Mine,$00CA Fuel depot,$00CB Crushing shed,$00CC Flooded caves,$00CD Water storage,$00CE Waterfall cavern,$00CF Power hut basement,$00D0 Chuffy's cab,$00D1 Inside chuffy's boiler boss,$00D2 Gloomy caverns,$00D3 Generator caverns,$00D4 Power hut,$00D5 Wumba's wigwam,$00D7 Train station,$00D8 Prospectors hut,$00D9 Mumbo's hut,$00DA Toxic gas cave,$00DB Canary cave,$00DC Ordnance storage,$00E9 Humba,$0126 Water supply pipe,$0163 Ordnance Storage entrance,$0164 Ordnance Storage game,$0165 Ordnance Storage game Multi,$016F Testing,$0170 Testing,$0171 Mumbo's skull
+Cheat18="Instant Warp\Options\Witchy World",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat18_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat18_O=$00D6 Witcy World,$00DD Dodgem dome lobby,$00DE Dodgem challenge "1 vs 1",$00DF Dodgem challenge "2 vs 1",$00E0 Dodgem challenge "3 vs 1",$00E1 Crazy castle stockade,$00E2 Crazy castle lobby,$00E3 Crazy castle pump room,$00E4 Balloon burst game,$00E5 Hoop hurry game,$00E6 Star spinner,$00E7 The inferno,$00EA Cave of horrors,$00EB Haunted cavern,$00EC Train station,$0124 Saucer of Peril,$013B Crazy castle stockade "sop",$013C Star spinner "sop",$0176 Mumbo's skull
+Cheat19="Instant Warp\Options\Jolly Roger's Lagoon",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat19_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat19_O=$00ED Jolly's,$00EE Pawno's emporium,$00EF mumbo's skull,$00F4 Ancient Swimming Baths,$00F6 Electric Eels lair,$00F7 Seaweed Sanctum,$00F8 Inside the big fish,$00FA temple of the fishes,$01A8 Atlantis,$01A9 Seabottom,$0181 sea bottom cavern,$0182 submarine multi,$01A7 Jolly Roger's Lagoon,$00FF Blubber's wave race hire
+Cheat20="Instant Warp\Options\Terrydacty Land",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat20_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat20_O=$0112 Terrydacty Land,$0113 Terry's nest,$0114 Train station,$0115 Oogle boogles cave,$0116 Inside the mountain,$0117 River passage,$0118 Styracosaurus family cave,$0119 Unga bunga's cave,$011A Stomping plains,$011B Bonfire caverns,$011E Humba's Wigwam,$0123 Inside chompa's belly,$0183 Chompa's belly multi
+Cheat21="Instant Warp\Options\Grunty Industries",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat21_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat21_O=$0100 Outside,$0101 Inside,$0102 Train station,$0103 Workers quarters,$0104 Trash compactor,$0105 Elevator shaft,$0106 Floor 2,$0107 Floor 2 "electromagnet chamber",$0108 Floor 3,$0109 Floor 3 "boiler plant",$010A Floor 3 "packing room",$010B Floor 4,$010C Floor 4 "cable room",$010D Floor 4 "quality control",$010E Floor 5,$010F Basement,$0110 Basement "repair depot,$0111 Basement "waste disposal",$0125 Water supply pipe,$0172 Mumbo's skull,$0162 Floor 4 "clinkers cavern",$0187 Sewer entrance
+Cheat22="Instant Warp\Options\Hailfire Peaks",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat22_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat22_O=$0127 Lava side,$0128 Icy side,$0129 Lava train station,$012A Ice train station,$012B Chilli billi,$012C Chilly willy,$012D Colosseum kickball stadium lobby,$0131 Boggy's igloo,$0132 Icicle grotto,$0133 Inside the volcano,$0168 Icy side still
+Cheat23="Instant Warp\Options\Cloud Cuckoo Land",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat23_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat23_O=$0136 Cloud Cuckoo Land 1,$0137 Inside the trashcan,$0138 Inside the cheesewedge,$0139 Zubba's nest,$013A Central cavern,$013D Inside the pot o gold,$013E Mumbo's skull,$013F Mingy jongo's skull,$0140 Humba wumba's wigwam,$0161 Cloud Cuckoo Land 2,$0188 Zubba's nest multi,$0185 Trash can mini
+Cheat24="Instant Warp\Options\Isle O Hags",D008B284 0000,8112C390 ????,8012C393 0001
+Cheat24_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat24_O=$014F Wooded Hollow,$0150 Heggy's egg shed,$0151 Jiggywiggy's temple,$0152 Plateau,$0153 Plateau "Honey B's Hive",$0154 Pine Grove,$0155 Cliff top,$0156 Cliff top Mumbo's skull,$015A wasteland,$015B inside another digger tunnel,$015C Quagmire
+Cheat25="Play As",D108B284 0000,8012BD9C 00??
+Cheat25_N=To use this cheat, put the cheat on, then press L as you walk through a door to become that chosen character
+Cheat25_O=$01 Banjo and Kazooie,$02 Snowball,$06 Bee,$07 Washing machine,$08 Stony,$0A Banjo,$0B Kazooie,$0C Submarine,$0D Mumbo,$0E Golden Goliath,$0F Detonator,$10 Truck,$12 T-rex baby,$13 T-rex daddy
+Cheat26="Beta Bottles Revenge Mode",80130172 0001,8008B4D1 0002
+Cheat26_N=Bottles Revenge is a Beta mode from Banjo Tooie that the RWP team recently uncovered after an extraordinary amount of effort. Bottles the Spirit transforms into Bottles the Devil and posses enemies nearby and allows a second player hooked up to Pad 2 to play as that Posses character to try to foil Banjos Plans. As player one goes about its business, player two uses every enemy nearby to try to nab Banjo and take away some life. This mode is incredible, and you can control almost every enemy in the game: slot machines, flying creatures, uggers, zubbas...and this is just the beginning. (Congrats Rare Witch Project)
+
+[C9176D39-EA4779D1-C:50]
+Name=Banjo-Tooie (E) (M4)
+Cheat0="Infinite\Energy\Banjo and Kazooie",801201B9 0A0A,81120794 0A0A
+Cheat0_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat1="Infinite\Energy\Snowball",801201B9 0063,80120797 0005
+Cheat1_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat2="Infinite\Energy\Bee",801201B9 0063,801207A3 000A,801207A4 000A
+Cheat2_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat3="Infinite\Energy\Washing Machine",801201B9 0063,811207A6 0A0A
+Cheat3_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat4="Infinite\Energy\Stony",801201B9 0063,801207A9 000A,8011B65A 000A
+Cheat4_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat5="Infinite\Energy\Banjo",801201B9 0063,801207AF 000A,801207B0 000A
+Cheat5_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat6="Infinite\Energy\Kazooie",801201B9 0063,811207B2 0A0A
+Cheat6_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat7="Infinite\Energy\Submarine",801201B9 0063,801207B5 000A,801207B6 000A
+Cheat7_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat8="Infinite\Energy\Mumbo",801201B9 0063,811207B8 0A0A
+Cheat8_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat9="Infinite\Energy\Detonator",801201B9 0063,811207BE 0A0A
+Cheat9_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat10="Infinite\Energy\T-Rex Baby",801201B9 0063,801207CF 000A,801207D0 000A
+Cheat10_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
+Cheat11="Infinite\Air",8112FFD2 42C8
+Cheat12="Play As",D008B494 0020,8012BFAC 00??
+Cheat12_N=To use this cheat, put the cheat on, then press L as you walk through a door to become that chosen character
+Cheat12_O=$01 Banjo and Kazooie,$02 Snowball,$06 Bee,$07 Washing machine,$08 Stony,$0A Banjo,$0B Kazooie,$0C Submarine,$0D Mumbo,$0E Golden Goliath,$0F Detonator,$10 Truck,$12 T-rex baby,$13 T-rex daddy
+Cheat13="Instant Warp\Options\Not sure",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat13_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat13_O=$00FC Lord woo fak fak,$00F9 Mr Patch,$0121 Inside Chuffy's wagon,$0134 Mumbo's Skull,$0135 Humba Wumba's wigwam 1,$0157 Humba Wumba's wigwam 2,$019B Jingalings Zombified Palace,$01A6 Smuggler cavern,$0141 Inside the digger tunnel,$0143 Bottles house,$0169 Bottles house still,$018A HAG Inside,$019A HAG1 Final Boss
+Cheat14="Instant Warp\Options\Spiral Mountain",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat14_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat14_O=$00AD Grunty's Old Lair,$00AE Behind The Waterfall,$00AF Top Of Castle,$0173 Banjo's house
+Cheat15="Instant Warp\Options\Jinjo Village",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat15_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat15_O=$0142 Jinjo Village,$0144 King Jingalings throne room,$0143 Bottles house,$0145 Green Jinjo's House,$0146 Black Jinjo's House,$0147 Yellow Jinjo's House,$0148 Blue Jinjo's House,$014A Brown Jinjo's House,$014B Orange Jinjo's House,$014C Purple Jinjo's House,$014D Red Jinjo's House,$014E White Jinjo's House
+Cheat16="Instant Warp\Options\Mayahem Temple",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat16_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat16_O=$00B6 Humba's Wigwam,$00B7 Mumbo's skull,$00B8 The Temple,$00B9 Prison Compound,$00BC Code chamber,$00C4 Jade Snake Grove,$00C5 Treasure Chamber,$00C6 Kickball Arena,$0177 Targitzan's Slighty Sacred Temple,$0178 Inside Targitzans Temple,$0179 Targitzan Temple Lobby,$017A Targitzan's Temple Boss,$017F Mayan Kickball Arena,$0166 Multi,$0167 Still,$00C8 Kickball Arena,$00C9 Kickball Arena
+Cheat17="Instant Warp\Options\Glitter Gulch Mine",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat17_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat17_O=$00C7 Mine,$00CA Fuel depot,$00CB Crushing shed,$00CC Flooded caves,$00CD Water storage,$00CE Waterfall cavern,$00CF Power hut basement,$00D0 Chuffy's cab,$00D1 Inside chuffy's boiler boss,$00D2 Gloomy caverns,$00D3 Generator caverns,$00D4 Power hut,$00D5 Wumba's wigwam,$00D7 Train station,$00D8 Prospectors hut,$00D9 Mumbo's hut,$00DA Toxic gas cave,$00DB Canary cave,$00DC Ordnance storage,$00E9 Humba,$0126 Water supply pipe,$0163 Ordnance Storage entrance,$0164 Ordnance Storage game,$0165 Ordnance Storage game Multi,$016F Testing,$0170 Testing,$0171 Mumbo's skull
+Cheat18="Instant Warp\Options\Witchy World",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat18_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat18_O=$00D6 Witcy World,$00DD Dodgem dome lobby,$00DE Dodgem challenge "1 vs 1",$00DF Dodgem challenge "2 vs 1",$00E0 Dodgem challenge "3 vs 1",$00E1 Crazy castle stockade,$00E2 Crazy castle lobby,$00E3 Crazy castle pump room,$00E4 Balloon burst game,$00E5 Hoop hurry game,$00E6 Star spinner,$00E7 The inferno,$00EA Cave of horrors,$00EB Haunted cavern,$00EC Train station,$0124 Saucer of Peril,$013B Crazy castle stockade "sop",$013C Star spinner "sop",$0176 Mumbo's skull
+Cheat19="Instant Warp\Options\Jolly Roger's Lagoon",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat19_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat19_O=$00ED Jolly's,$00EE Pawno's emporium,$00EF mumbo's skull,$00F4 Ancient Swimming Baths,$00F6 Electric Eels lair,$00F7 Seaweed Sanctum,$00F8 Inside the big fish,$00FA temple of the fishes,$01A8 Atlantis,$01A9 Seabottom,$0181 sea bottom cavern,$0182 submarine multi,$01A7 Jolly Roger's Lagoon,$00FF Blubber's wave race hire
+Cheat20="Instant Warp\Options\Terrydacty Land",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat20_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat20_O=$0112 Terrydacty Land,$0113 Terry's nest,$0114 Train station,$0115 Oogle boogles cave,$0116 Inside the mountain,$0117 River passage,$0118 Styracosaurus family cave,$0119 Unga bunga's cave,$011A Stomping plains,$011B Bonfire caverns,$011E Humba's Wigwam,$0123 Inside chompa's belly,$0183 Chompa's belly multi
+Cheat21="Instant Warp\Options\Grunty Industries",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat21_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat21_O=$0100 Outside,$0101 Inside,$0102 Train station,$0103 Workers quarters,$0104 Trash compactor,$0105 Elevator shaft,$0106 Floor 2,$0107 Floor 2 "electromagnet chamber",$0108 Floor 3,$0109 Floor 3 "boiler plant",$010A Floor 3 "packing room",$010B Floor 4,$010C Floor 4 "cable room",$010D Floor 4 "quality control",$010E Floor 5,$010F Basement,$0110 Basement "repair depot,$0111 Basement "waste disposal",$0125 Water supply pipe,$0172 Mumbo's skull,$0162 Floor 4 "clinkers cavern",$0187 Sewer entrance
+Cheat22="Instant Warp\Options\Hailfire Peaks",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat22_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat22_O=$0127 Lava side,$0128 Icy side,$0129 Lava train station,$012A Ice train station,$012B Chilli billi,$012C Chilly willy,$012D Colosseum kickball stadium lobby,$0131 Boggy's igloo,$0132 Icicle grotto,$0133 Inside the volcano,$0168 Icy side still
+Cheat23="Instant Warp\Options\Cloud Cuckoo Land",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat23_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat23_O=$0136 Cloud Cuckoo Land 1,$0137 Inside the trashcan,$0138 Inside the cheesewedge,$0139 Zubba's nest,$013A Central cavern,$013D Inside the pot o gold,$013E Mumbo's skull,$013F Mingy jongo's skull,$0140 Humba wumba's wigwam,$0161 Cloud Cuckoo Land 2,$0188 Zubba's nest multi,$0185 Trash can mini
+Cheat24="Instant Warp\Options\Isle O Hags",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat24_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat24_O=$014F Wooded Hollow,$0150 Heggy's egg shed,$0151 Jiggywiggy's temple,$0152 Plateau,$0153 Plateau "Honey B's Hive",$0154 Pine Grove,$0155 Cliff top,$0156 Cliff top Mumbo's skull,$015A wasteland,$015B inside another digger tunnel,$015C Quagmire
+Cheat25="Instant Warp\Options\Cauldron Keep",D008B494 0000,8112C5A0 ????,8012C5A3 0001
+Cheat25_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
+Cheat25_O=$015D Cauldron Keep,$015E The gatehouse,$015F Tower of Tragedy Quiz,$0160 Gun chamber,$016A Gun room still,$017B Crazy Castle Stockade balloon burst multi,$017C Crazy Castle Stockade Jump the hoops multi,$017D Grunty Industries packing game,$0180 Colosseum kickball arena,$0186 Dodgems
+Cheat26="Beta Bottles Revenge Mode",80130402 0001,8008B4D1 0002
+Cheat26_N=Bottles Revenge is a Beta mode from Banjo Tooie that the RWP team recently uncovered after an extraordinary amount of effort. Bottles the Spirit transforms into Bottles the Devil and posses enemies nearby and allows a second player hooked up to Pad 2 to play as that Posses character to try to foil Banjos Plans. As player one goes about its business, player two uses every enemy nearby to try to nab Banjo and take away some life. This mode is incredible, and you can control almost every enemy in the game: slot machines, flying creatures, uggers, zubbas...and this is just the beginning. (Congrats Rare Witch Project)
--- a/Config/Cheats/Banjo-Tooie
+++ b/Config/Cheats/Banjo-Tooie
@ -1,78 +1,78 @@
 [C2E9AA9A-475D70AA-C:45]
 Name=Banjo-Tooie (U)
-Cheat0="Infinite\Energy\Banjo and Kazooie",E86507BF 59BB,E965099C 6364
+Cheat0="Infinite\Energy\Banjo and Kazooie",8011B069 0063,8111B644 0A0A
 Cheat0_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat1="Infinite\Air",E96807A6 9B22
-Cheat2="Have\AllMoves",D1081084 0800,E9681AC8 D981,D1081084 0800,E9681AC6 595A,E97D5770 504F,E97D576E 504F,E97D5774 504F,E97D5772 504F
+Cheat1="Infinite\Air",8112B052 42C8
+Cheat2="Have\AllMoves",D1081084 0800,8112C770 8029,D1081084 0800,8112C772 0000,81290018 FFFF,8129001A FFFF,8129001C FFFF,8129001E FFFF
 Cheat2_N=Press Top D-pad Up
-Cheat3="Have Most of the Game Finished",5000AC01 0000,10290000 00FF,E87D577D 59CF,E87D57B5 5953,E87D57C5 59AF,D1081084 0800,E9681AC8 D981,D1081084 0800,E9681AC6 595A
+Cheat3="Have Most of the Game Finished",5000AC01 0000,80290000 00FF,8029002B 007F,80290063 00FB,80290073 005F,D1081084 0800,8112C770 8029,D1081084 0800,8112C772 0000
 Cheat3_N=Start a new game,when you appear in Spiral Mountain press Top D-Pad. Go to the menu and you will notice all eggs, all moves are available. All the jiggies have been collected. Simply Save and Restart.
-Cheat4="Infinite\Energy\Snowball",E86507BF 59BB,E8650999 5955
+Cheat4="Infinite\Energy\Snowball",8011B069 0063,8011B647 0005
 Cheat4_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat5="Infinite\Energy\Bee",E86507BF 59BB,E86509A5 5964,E86509AC 5964
+Cheat5="Infinite\Energy\Bee",8011B069 0063,8011B653 000A,8011B654 000A
 Cheat5_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat6="Infinite\Energy\Washing Machine",E86507BF 59BB,E96509AA 6364
+Cheat6="Infinite\Energy\Washing Machine",8011B069 0063,8111B656 0A0A
 Cheat6_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat7="Infinite\Energy\Stony",E86507BF 59BB,E86509AF 5964,E86509AE 5964
+Cheat7="Infinite\Energy\Stony",8011B069 0063,8011B659 000A,8011B65A 000A
 Cheat7_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat8="Infinite\Energy\Banjo",E86507BF 59BB,E86509B1 5964,E86509B8 5964
+Cheat8="Infinite\Energy\Banjo",8011B069 0063,8011B65F 000A,8011B660 000A
 Cheat8_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat9="Infinite\Energy\Kazooie",E86507BF 59BB,E96509B6 6364
+Cheat9="Infinite\Energy\Kazooie",8011B069 0063,8111B662 0A0A
 Cheat9_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat10="Infinite\Energy\Submarine",E86507BF 59BB,E86509BB 5964,E86509BA 5964
+Cheat10="Infinite\Energy\Submarine",8011B069 0063,8011B665 000A,8011B666 000A
 Cheat10_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat11="Infinite\Energy\Mumbo",E86507BF 59BB,E96509C0 6364
+Cheat11="Infinite\Energy\Mumbo",8011B069 0063,8111B668 0A0A
 Cheat11_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat12="Infinite\Energy\Detonator",E86507BF 59BB,E96509C2 6364
+Cheat12="Infinite\Energy\Detonator",8011B069 0063,8111B66E 0A0A
 Cheat12_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat13="Infinite\Energy\T-Rex Baby",E86507BF 59BB,E86509D1 5964,E86509D8 5964
+Cheat13="Infinite\Energy\T-Rex Baby",8011B069 0063,8011B67F 000A,8011B680 000A
 Cheat13_N=With Infinite Energy On Avoid Picking up the ! Or ? Stop Energy Honey Combs or you will be stuck.
-Cheat14="Have\All Moves & Dragon Kazooie",D1081084 0800,E9681AC8 D981,D1081084 0800,E9681AC6 595A,E97D5770 504F,E97D576E 504F,E97D5774 504F,E97D5772 504F,E97D57D0 504F,E97D57CE 504F
+Cheat14="Have\All Moves & Dragon Kazooie",D1081084 0800,8112C770 8029,D1081084 0800,8112C772 0000,81290018 FFFF,8129001A FFFF,8129001C FFFF,8129001E FFFF,81290078 FFFF,8129007A FFFF
 Cheat14_N=Press Top D-pad,Do not use with either Have all Moves,Or Have Dragon Kazooie
-Cheat15="Have\Dragon Kazooie",D1081084 0800,E9681AC8 D981,D1081084 0800,E9681AC6 595A,E97D57D0 504F,E97D57CE 504F
+Cheat15="Have\Dragon Kazooie",D1081084 0800,8112C770 8029,D1081084 0800,8112C772 0000,81290078 FFFF,8129007A FFFF
 Cheat15_N=Press Top D-pad,Do not use with Have All Modes Or Have All Moves & Dragon Kazooie
-Cheat16="Play As",D0081085 0020,E868C7A4 59??
+Cheat16="Play As",D0081085 0020,8012704C 00??
 Cheat16_N=To use this cheat, put the cheat on, then press L as you walk through a door to become that chosen character. Do not try to use the following character in Banjos house or anywhere as small or you will get stuck and wont be able to continue. Snowball Washing machine Submarine Golden Goliath Truck T-rex baby and T-rex daddy
-Cheat16_O=$59 Banjo and Kazooie,$5C Snowball,$58 Bee,$57 Washing machine,$62 Stony,$64 Banjo,$63 Kazooie,$5E Submarine,$5D Mumbo,$60 Golden Goliath,$5F Detonator,$6A Truck,$6C T-rex baby,$6B T-rex daddy
-Cheat17="Instant Warp\Options\Spiral Mountain",D0081084 0000,E968C998 ????,E868C995 5959
+Cheat16_O=$01 Banjo and Kazooie,$02 Snowball,$06 Bee,$07 Washing machine,$08 Stony,$0A Banjo,$0B Kazooie,$0C Submarine,$0D Mumbo,$0E Golden Goliath,$0F Detonator,$10 Truck,$12 T-rex baby,$13 T-rex daddy
+Cheat17="Instant Warp\Options\Spiral Mountain",D0081084 0000,81127640 ????,80127643 0001
 Cheat17_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat17_O=$59FD Grunty's Old Lair,$5900 Behind The Waterfall,$59FF Top Of Castle,$5ACB Banjo's house
-Cheat18="Instant Warp\Options\Jinjo Village",D0081084 0000,E968C998 ????,E868C995 5959
+Cheat17_O=$00AD Grunty's Old Lair,$00AE Behind The Waterfall,$00AF Top Of Castle,$0173 Banjo's house
+Cheat18="Instant Warp\Options\Jinjo Village",D0081084 0000,81127640 ????,80127643 0001
 Cheat18_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat18_O=$5A9C Jinjo Village,$5A96 King Jingalings throne room,$5A9B Bottles house,$5A95 Green Jinjo's House,$5A98 Black Jinjo's House,$5A97 Yellow Jinjo's House,$5AA2 Blue Jinjo's House,$5AA4 Brown Jinjo's House,$5AA3 Orange Jinjo's House,$5A9E Purple Jinjo's House,$5A9D Red Jinjo's House,$5AA0 White Jinjo's House
-Cheat19="Instant Warp\Options\Mayahem Temple",D0081084 0000,E968C998 ????,E868C995 5959
+Cheat18_O=$0142 Jinjo Village,$0144 King Jingalings throne room,$0143 Bottles house,$0145 Green Jinjo's House,$0146 Black Jinjo's House,$0147 Yellow Jinjo's House,$0148 Blue Jinjo's House,$014A Brown Jinjo's House,$014B Orange Jinjo's House,$014C Purple Jinjo's House,$014D Red Jinjo's House,$014E White Jinjo's House
+Cheat19="Instant Warp\Options\Mayahem Temple",D0081084 0000,81127640 ????,80127643 0001
 Cheat19_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat19_O=$5908 Humba's Wigwam,$5907 Mumbo's skull,$5912 The Temple,$5911 Prison Compound,$590E Code chamber,$5916 Jade Snake Grove,$5915 Treasure Chamber,$5918 Kickball Arena,$5AC7 Targitzan's Slighty Sacred Temple,$5AD2 Inside Targitzans Temple,$5AD1 Targitzan Temple Lobby,$5AD4 Targitzan's Temple Boss,$5ACF Mayan Kickball Arena,$5AB8 Multi,$5AB7 Still,$5922 Kickball Arena,$5921 Kickball Arena
-Cheat20="Instant Warp\Options\Glitter Gulch Mine",D0081084 0000,E968C998 ????,E868C995 5959
-Cheat20_O=$5917 Mine,$5924 Fuel depot,$5923 Crushing shed,$591E Flooded caves,$591D Water storage,$5920 Waterfall cavern,$591F Power hut basement,$592A Chuffy's cab,$5929 Inside chuffy's boiler boss,$592C Gloomy caverns,$592B Generator caverns,$5926 Power hut,$5925 Wumba's wigwam,$5927 Train station,$5932 Prospectors hut,$5931 Mumbo's hut,$5934 Toxic gas cave,$5933 Canary cave,$592E Ordnance storage,$5941 Humba,$5A78 Water supply pipe,$5ABB Ordnance Storage entrance,$5AB6 Ordnance Storage game,$5AB5 Ordnance Storage game Multi,$5ABF Testing,$5ACA Testing,$5AC9 Mumbo's skull
+Cheat19_O=$00B6 Humba's Wigwam,$00B7 Mumbo's skull,$00B8 The Temple,$00B9 Prison Compound,$00BC Code chamber,$00C4 Jade Snake Grove,$00C5 Treasure Chamber,$00C6 Kickball Arena,$0177 Targitzan's Slighty Sacred Temple,$0178 Inside Targitzans Temple,$0179 Targitzan Temple Lobby,$017A Targitzan's Temple Boss,$017F Mayan Kickball Arena,$0166 Multi,$0167 Still,$00C8 Kickball Arena,$00C9 Kickball Arena
+Cheat20="Instant Warp\Options\Glitter Gulch Mine",D0081084 0000,81127640 ????,80127643 0001
 Cheat20_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat21="Instant Warp\Options\Witchy World",D0081084 0000,E968C998 ????,E868C995 5959
-Cheat21_O=$5928 Witcy World,$592D Dodgem dome lobby,$5930 Dodgem challenge "1 vs 1",$592F Dodgem challenge "2 vs 1",$593A Dodgem challenge "3 vs 1",$5939 Crazy castle stockade,$593C Crazy castle lobby,$593B Crazy castle pump room,$5936 Balloon burst game,$5935 Hoop hurry game,$5938 Star spinner,$5937 The inferno,$5944 Cave of horrors,$5943 Haunted cavern,$593E Train station,$5A76 Saucer of Peril,$5A93 Crazy castle stockade "sop",$5A8E Star spinner "sop",$5AC8 Mumbo's skull
+Cheat20_O=$00C7 Mine,$00CA Fuel depot,$00CB Crushing shed,$00CC Flooded caves,$00CD Water storage,$00CE Waterfall cavern,$00CF Power hut basement,$00D0 Chuffy's cab,$00D1 Inside chuffy's boiler boss,$00D2 Gloomy caverns,$00D3 Generator caverns,$00D4 Power hut,$00D5 Wumba's wigwam,$00D7 Train station,$00D8 Prospectors hut,$00D9 Mumbo's hut,$00DA Toxic gas cave,$00DB Canary cave,$00DC Ordnance storage,$00E9 Humba,$0126 Water supply pipe,$0163 Ordnance Storage entrance,$0164 Ordnance Storage game,$0165 Ordnance Storage game Multi,$016F Testing,$0170 Testing,$0171 Mumbo's skull
+Cheat21="Instant Warp\Options\Witchy World",D0081084 0000,81127640 ????,80127643 0001
 Cheat21_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat22="Instant Warp\Options\Jolly Roger's Lagoon",D0081084 0000,E968C998 ????,E868C995 5959
-Cheat22_O=$593D Jolly's,$5940 Pawno's emporium,$593F mumbo's skull,$5946 Ancient Swimming Baths,$5948 Electric Eels lair,$5947 Seaweed Sanctum,$5952 Inside the big fish,$5954 temple of the fishes,$5A02 Atlantis,$5A01 Seabottom,$5AD9 sea bottom cavern,$5ADC submarine multi,$5AF7 Jolly Roger's Lagoon,$594F Blubber's wave race hire
+Cheat21_O=$00D6 Witcy World,$00DD Dodgem dome lobby,$00DE Dodgem challenge "1 vs 1",$00DF Dodgem challenge "2 vs 1",$00E0 Dodgem challenge "3 vs 1",$00E1 Crazy castle stockade,$00E2 Crazy castle lobby,$00E3 Crazy castle pump room,$00E4 Balloon burst game,$00E5 Hoop hurry game,$00E6 Star spinner,$00E7 The inferno,$00EA Cave of horrors,$00EB Haunted cavern,$00EC Train station,$0124 Saucer of Peril,$013B Crazy castle stockade "sop",$013C Star spinner "sop",$0176 Mumbo's skull
+Cheat22="Instant Warp\Options\Jolly Roger's Lagoon",D0081084 0000,81127640 ????,80127643 0001
 Cheat22_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat23="Instant Warp\Options\Terrydacty Land",D0081084 0000,E968C998 ????,E868C995 5959
-Cheat23_O=$5A6C Terrydacty Land,$5A6B Terry's nest,$5A66 Train station,$5A65 Oogle boogles cave,$5A68 Inside the mountain,$5A67 River passage,$5A72 Styracosaurus family cave,$5A71 Unga bunga's cave,$5A74 Stomping plains,$5A73 Bonfire caverns,$5A70 Humba's Wigwam,$5A7B Inside chompa's belly,$5ADB Chompa's belly multi
+Cheat22_O=$00ED Jolly's,$00EE Pawno's emporium,$00EF mumbo's skull,$00F4 Ancient Swimming Baths,$00F6 Electric Eels lair,$00F7 Seaweed Sanctum,$00F8 Inside the big fish,$00FA temple of the fishes,$01A8 Atlantis,$01A9 Seabottom,$0181 sea bottom cavern,$0182 submarine multi,$01A7 Jolly Roger's Lagoon,$00FF Blubber's wave race hire
+Cheat23="Instant Warp\Options\Terrydacty Land",D0081084 0000,81127640 ????,80127643 0001
 Cheat23_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat24="Instant Warp\Options\Grunty Industries",D0081084 0000,E968C998 ????,E868C995 5959
+Cheat23_O=$0112 Terrydacty Land,$0113 Terry's nest,$0114 Train station,$0115 Oogle boogles cave,$0116 Inside the mountain,$0117 River passage,$0118 Styracosaurus family cave,$0119 Unga bunga's cave,$011A Stomping plains,$011B Bonfire caverns,$011E Humba's Wigwam,$0123 Inside chompa's belly,$0183 Chompa's belly multi
+Cheat24="Instant Warp\Options\Grunty Industries",D0081084 0000,81127640 ????,80127643 0001
 Cheat24_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat24_O=$5A5A Outside,$5A59 Inside,$5A5C Train station,$5A5B Workers quarters,$5A56 Trash compactor,$5A55 Elevator shaft,$5A58 Floor 2,$5A57 Floor 2 "electromagnet chamber",$5A62 Floor 3,$5A61 Floor 3 "boiler plant",$5A64 Floor 3 "packing room",$5A63 Floor 4,$5A5E Floor 4 "cable room",$5A5D Floor 4 "quality control",$5A60 Floor 5,$5A5F Basement,$5A6A Basement "repair depot,$5A69 Basement "waste disposal",$5A75 Water supply pipe,$5ACC Mumbo's skull,$5ABC Floor 4 "clinkers cavern",$5AD7 Sewer entrance
-Cheat25="Instant Warp\Options\Hailfire Peaks",D0081084 0000,E968C998 ????,E868C995 5959
+Cheat24_O=$0100 Outside,$0101 Inside,$0102 Train station,$0103 Workers quarters,$0104 Trash compactor,$0105 Elevator shaft,$0106 Floor 2,$0107 Floor 2 "electromagnet chamber",$0108 Floor 3,$0109 Floor 3 "boiler plant",$010A Floor 3 "packing room",$010B Floor 4,$010C Floor 4 "cable room",$010D Floor 4 "quality control",$010E Floor 5,$010F Basement,$0110 Basement "repair depot,$0111 Basement "waste disposal",$0125 Water supply pipe,$0172 Mumbo's skull,$0162 Floor 4 "clinkers cavern",$0187 Sewer entrance
+Cheat25="Instant Warp\Options\Hailfire Peaks",D0081084 0000,81127640 ????,80127643 0001
 Cheat25_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat25_O=$5A77 Lava side,$5A82 Icy side,$5A81 Lava train station,$5A84 Ice train station,$5A83 Chilli billi,$5A7E Chilly willy,$5A7D Colosseum kickball stadium lobby,$5A89 Boggy's igloo,$5A8C Icicle grotto,$5A8B Inside the volcano,$5AC2 Icy side still
-Cheat26="Instant Warp\Options\Cloud Cuckoo Land",D0081084 0000,E968C998 ????,E868C995 5959
-Cheat26_O=$5A88 Cloud Cuckoo Land 1,$5A87 Inside the trashcan,$5A92 Inside the cheesewedge,$5A91 Zubba's nest,$5A94 Central cavern,$5A8D Inside the pot o gold,$5A90 Mumbo's skull,$5A8F Mingy jongo's skull,$5A9A Humba wumba's wigwam,$5AB9 Cloud Cuckoo Land 2,$5AE2 Zubba's nest multi,$5AD5 Trash can mini
+Cheat25_O=$0127 Lava side,$0128 Icy side,$0129 Lava train station,$012A Ice train station,$012B Chilli billi,$012C Chilly willy,$012D Colosseum kickball stadium lobby,$0131 Boggy's igloo,$0132 Icicle grotto,$0133 Inside the volcano,$0168 Icy side still
+Cheat26="Instant Warp\Options\Cloud Cuckoo Land",D0081084 0000,81127640 ????,80127643 0001
 Cheat26_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat27="Instant Warp\Options\Isle O Hags",D0081084 0000,E968C998 ????,E868C995 5959
-Cheat27_O=$5A9F Wooded Hollow,$5AAA Heggy's egg shed,$5AA9 Jiggywiggy's temple,$5AAC Plateau,$5AAB Plateau "Honey B's Hive",$5AA6 Pine Grove,$5AA5 Cliff top,$5AA8 Cliff top Mumbo's skull,$5AB4 wasteland,$5AB3 inside another digger tunnel,$5AAE Quagmire
+Cheat26_O=$0136 Cloud Cuckoo Land 1,$0137 Inside the trashcan,$0138 Inside the cheesewedge,$0139 Zubba's nest,$013A Central cavern,$013D Inside the pot o gold,$013E Mumbo's skull,$013F Mingy jongo's skull,$0140 Humba wumba's wigwam,$0161 Cloud Cuckoo Land 2,$0188 Zubba's nest multi,$0185 Trash can mini
+Cheat27="Instant Warp\Options\Isle O Hags",D0081084 0000,81127640 ????,80127643 0001
 Cheat27_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat28="Instant Warp\Options\Cauldron Keep",D0081084 0000,E968C998 ????,E868C995 5959
-Cheat28_O=$5AAD Cauldron Keep,$5AB0 The gatehouse,$5AAF Tower of Tragedy Quiz,$5ABA Gun chamber,$5AC4 Gun room still,$5AD3 Crazy Castle Stockade balloon burst multi,$5ACE Crazy Castle Stockade Jump the hoops multi,$5ACD Grunty Industries packing game,$5ADA Colosseum kickball arena,$5AD8 Dodgems
+Cheat27_O=$014F Wooded Hollow,$0150 Heggy's egg shed,$0151 Jiggywiggy's temple,$0152 Plateau,$0153 Plateau "Honey B's Hive",$0154 Pine Grove,$0155 Cliff top,$0156 Cliff top Mumbo's skull,$015A wasteland,$015B inside another digger tunnel,$015C Quagmire
+Cheat28="Instant Warp\Options\Cauldron Keep",D0081084 0000,81127640 ????,80127643 0001
 Cheat28_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat29="Instant Warp\Options\Not sure",D0081084 0000,E968C998 ????,E868C995 5959
+Cheat28_O=$015D Cauldron Keep,$015E The gatehouse,$015F Tower of Tragedy Quiz,$0160 Gun chamber,$016A Gun room still,$017B Crazy Castle Stockade balloon burst multi,$017C Crazy Castle Stockade Jump the hoops multi,$017D Grunty Industries packing game,$0180 Colosseum kickball arena,$0186 Dodgems
+Cheat29="Instant Warp\Options\Not sure",D0081084 0000,81127640 ????,80127643 0001
 Cheat29_N=Only use one Instant Warp Option At once, Make sure the other is off before putting this one on
-Cheat29_O=$594E Lord woo fak fak,$5951 Mr Patch,$5A79 Inside Chuffy's wagon,$5A86 Mumbo's Skull,$5A85 Humba Wumba's wigwam 1,$5AA7 Humba Wumba's wigwam 2,$5AF3 Jingalings Zombified Palace,$5AF8 Smuggler cavern,$5A99 Inside the digger tunnel,$5A9B Bottles house,$5AC1 Bottles house still,$5AE4 HAG Inside,$5AF4 HAG1 Final Boss
-Cheat30="Monsters dont Hurt Banjo",50002430 0000,10132EF5 0000,50002430 0000,10132EF6 0000,50002430 0000,10132EF7 0000,50002430 0000,10132EF8 0000,50002430 0000,10132EF9 0000
-Cheat31="Beta Bottles Revenge Mode",E8680646 5959,E85E6717 595C
+Cheat29_O=$00FC Lord woo fak fak,$00F9 Mr Patch,$0121 Inside Chuffy's wagon,$0134 Mumbo's Skull,$0135 Humba Wumba's wigwam 1,$0157 Humba Wumba's wigwam 2,$019B Jingalings Zombified Palace,$01A6 Smuggler cavern,$0141 Inside the digger tunnel,$0143 Bottles house,$0169 Bottles house still,$018A HAG Inside,$019A HAG1 Final Boss
+Cheat30="Monsters dont Hurt Banjo",50002430 0000,80132EF5 0000,50002430 0000,80132EF6 0000,50002430 0000,80132EF7 0000,50002430 0000,80132EF8 0000,50002430 0000,80132EF9 0000
+Cheat31="Beta Bottles Revenge Mode",8012B3F2 0001,800810C1 0002
 Cheat31_N=Bottles Revenge is a Beta mode from Banjo Tooie that the RWP team recently uncovered after an extraordinary amount of effort. Bottles the Spirit transforms into Bottles the Devil and posses enemies nearby and allows a second player hooked up to Pad 2 to play as that Posses character to try to foil Banjos Plans. As player one goes about its business, player two uses every enemy nearby to try to nab Banjo and take away some life. This mode is incredible, and you can control almost every enemy in the game: slot machines, flying creatures, uggers, zubbas...and this is just the beginning. (Congrats Rare Witch Project)
--- a/Config/Cheats/Bass
+++ b/Config/Cheats/Bass
@ -1,18 +1,18 @@
 [B088FBB4-441E4B1D-C:50]
 Name=Bass Hunter 64 (E)
-Cheat0="All Lakes Available",E865EF58 5959
-Cheat1="Unbreakable Line",E865EF5B 5959
-Cheat2="Large Fish",E865EF5A 5959
-Cheat3="Fish Are More Active",E865EF59 5959
-Cheat4="No Penalties During Tournamet",E865EF60 5959
-Cheat5="No Snags While Fishing",E865EF5F 5959
-Cheat6="Extra $300",E865EF5D 5959
-Cheat7="More fish in Lakes",E865EF63 5959
-Cheat8="Super Lure",E865EF62 5959
-Cheat9="Easy Win Current Tournament",E865EF61 5959
-Cheat10="Access\All Lures",E86DF8FF 595B,E96DF8FE 504F
+Cheat0="All Lakes Available",80119800 0001
+Cheat1="Unbreakable Line",80119805 0001
+Cheat2="Large Fish",80119806 0001
+Cheat3="Fish Are More Active",80119807 0001
+Cheat4="No Penalties During Tournamet",80119808 0001
+Cheat5="No Snags While Fishing",80119809 0001
+Cheat6="Extra $300",8011980B 0001
+Cheat7="More fish in Lakes",8011980D 0001
+Cheat8="Super Lure",8011980E 0001
+Cheat9="Easy Win Current Tournament",8011980F 0001
+Cheat10="Access\All Lures",8019A1A9 0003,8119A1AA FFFF
 Cheat10_N=Codes To Be Used With Save Slot 1
-Cheat11="Access\All Poles 2",E86DF804 5957
+Cheat11="Access\All Poles 2",8019A1AC 0007
 Cheat11_N=Codes To Be Used With Slot 1
-Cheat12="Access\Extra Boat 2",E86DF803 5959
+Cheat12="Access\Extra Boat 2",8019A1AD 0001
 Cheat12_N=Codes To Be Used With Slot 1
--- a/Config/Cheats/Bassmasters
+++ b/Config/Cheats/Bassmasters
@ -1,4 +1,4 @@
 [BCFACCAA-B814D8EF-C:45]
 Name=Bassmasters 2000 (U)
-Cheat0="Player 1 Max Score (Casting Game)",E95BFB66 504F
-Cheat1="Player 2 Max Score (Casting Game)",E95BFB6A 504F
+Cheat0="Player 1 Max Score (Casting Game)",8107A412 FFFF
+Cheat1="Player 2 Max Score (Casting Game)",8107A416 FFFF
--- a/Config/Cheats/Batman
+++ b/Config/Cheats/Batman
@ -1,6 +0,0 @@
-[259F7F84-7C9EED26-C:50]
-Name=Batman Beyond - Return of the Joker (E)
-Cheat0="Infinite\Health",E871D294 59B6
-Cheat1="Infinite\99 Lives",E871D293 59BB
-Cheat2="Infinite\Infinite 99 Dark Night Discus's",E871D29E 59BB
-Cheat3="Infinite\Max Charge & Magnetic Nun Chaku",E871D25B 59B6
--- a/Config/Cheats/Batman
+++ b/Config/Cheats/Batman
@ -1,6 +1,6 @@
 [204489C1-1286CF2B-C:45]
 Name=Batman Beyond - Return of the Joker (U)
-Cheat0="Infinite\Infinite Health",E876D946 59B6
-Cheat1="Infinite\Infinite Lives",E876D947 59BB
-Cheat2="Infinite\Infinite Batarangs",E876D952 59BB
-Cheat3="Infinite\Max Charge & Magnetic Nun Chaku",E876D90F 59B6
+Cheat0="Infinite\Infinite Health",802086F2 0064
+Cheat1="Infinite\Infinite Lives",802086F1 0063
+Cheat2="Infinite\Infinite Batarangs",802086FE 0063
+Cheat3="Infinite\Max Charge & Magnetic Nun Chaku",802086B9 0064
--- a/Config/Cheats/Batman
+++ b/Config/Cheats/Batman
@ -0,0 +1,6 @@
+[259F7F84-7C9EED26-C:50]
+Name=Batman of the Future - Return of the Joker (E) (M3)
+Cheat0="Infinite\Health",801D7F3C 0064
+Cheat1="Infinite\99 Lives",801D7F3D 0063
+Cheat2="Infinite\Infinite 99 Dark Night Discus's",801D7F4A 0063
+Cheat3="Infinite\Max Charge & Magnetic Nun Chaku",801D7F05 0064
--- a/Config/Cheats/BattleTanx
+++ b/Config/Cheats/BattleTanx
@ -1,81 +1,81 @@
 [6AA4DDE7-E3E2F4E7-C:45]
 Name=BattleTanx (U)
-Cheat0="Have Storm Ravens Gang",E867AAC5 5959
-Cheat1="Run Story",E867AAC8 5959
-Cheat2="Start With All Weapons",E867AABB 5959
-Cheat3="Toads",E867AACA 5959
-Cheat4="Trippy",E867AAC7 5959
-Cheat5="Unlimited Ammo",E867AAB8 5959
-Cheat6="Frogs",E867AACB 5959
-Cheat7="Have All Levels",E867AAB9 5959
-Cheat8="Hurl Mode",E867AABD 5959
-Cheat9="Invincible",E867AAB5 5959
-Cheat10="Invisible",E867AABE 5959
-Cheat11="Unlimited Lives",E867AAC6 5959
-Cheat12="Regenerated Allied Tanks Are Indestrucible In Campaign",E85D4E7E 5959
-Cheat13="Multiplayer\Player 1\Infinite Ammo",E881D955 594F
-Cheat14="Multiplayer\Player 2\Infinite Ammo",E881F27D 594F
-Cheat15="Multiplayer\Player 1\Tank Turret Always On (Use Right/Left C Button)",E8813A4D 5969,E8813A51 595C
-Cheat16="Multiplayer\Player 2\Tank Turret Always On",E8813E95 5969,E8813E99 595C
-Cheat17="Multiplayer\Player 3\Tank Turret Always On",E88141DD 5969,E88141E1 595C
-Cheat18="Multiplayer\Player 4\Tank Turret Always On",E8814825 5969,E8814829 595C
-Cheat19="Multiplayer\Player 1\Always Have Radar",E881D8EB 59DA
-Cheat20="Multiplayer\Player 2\Always Have Radar",E881ED13 59DA
-Cheat21="Multiplayer\Player 1\Always Has Cloaked On",E881D8E3 5959
-Cheat22="Multiplayer\Player 2\Always Has Cloaked On",E881ED0B 5959
-Cheat23="Multiplayer\Player 1\Your Goalith Tank On Tracks Always Has Radar",E881D9F3 59DA
-Cheat24="Multiplayer\Player 2\Your Goalith Tank On Tracks Always Has Radar",E881F21B 59DA
-Cheat25="Multiplayer\Player 1\Your Goalith Tank On Tracks Always Has Cloaked On",E881D9EB 5959
-Cheat26="Multiplayer\Player 2\Your Goalith Tank On Tracks Always Has Cloaked On",E881F213 5959
-Cheat27="Multiplayer\Plater 1\One Hit And You Bite It",E881D8F1 5959
-Cheat28="MultiPlayer\Player 2\One Hit And You Bite It",E881ED19 5959
-Cheat29="Area 51\Shock Wave Weapons",E881ADD3 59FF
-Cheat30="Area 51\Mines Are Invisible",E881AD1D 591E
-Cheat31="Area 51\Mines Are Toxic Waste",E881AD1D 59CE
-Cheat32="Area 51\Turn Ammo Pickup Picture To Flamer Picture",E881AD01 59FE
-Cheat33="Area 51\Turn Nuke Into Toxic Waste Nuke",E881ADCD 59CE
-Cheat34="Multiplayer\Balltlelord Mode\Player 1\All Special Weapons & Infinite Ammo",50000E02 0000,111AD7EE FFFF
-Cheat35="Multiplayer\Balltlelord Mode\Player 2\All Special Weapons & Infinite Ammo",50000E02 0000,111AE186 FFFF
-Cheat36="Multiplayer\Balltlelord Mode\Player 3\All Special Weapons & Infinite Ammo",50000E02 0000,111AEB1E FFFF
-Cheat37="Multiplayer\Balltlelord Mode\Player 4\All Special Weapons & Infinite Ammo",50000E02 0000,111AF4B6 FFFF
-Cheat38="Multiplayer\Deathmatch, Frenzy & Convoy Modes\Player 1\All Special Weapons & Infinite Ammo",50000E02 0000,111AD322 FFFF
-Cheat39="Multiplayer\Deathmatch, Frenzy & Convoy Modes\Player 2\All Special Weapons & Infinite Ammo",50000E02 0000,111ADCBA FFFF
-Cheat40="Multiplayer\Deathmatch, Frenzy & Convoy Modes\Player 3\All Special Weapons & Infinite Ammo",50000E02 0000,111AE652 FFFF
-Cheat41="Multiplayer\Deathmatch, Frenzy & Convoy Modes\Player 4\All Special Weapons & Infinite Ammo",50000E02 0000,111AEFEA FFFF
-Cheat42="Multiplayer\Hold 'Em Mode\Player 1\All Special Weapons & Infinite Ammo",50000E02 0000,111AD7EE FFFF
-Cheat43="Multiplayer\Hold 'Em Mode\Player 2\All Special Weapons & Infinite Ammo",50000E02 0000,111AE186 FFFF
-Cheat44="Multiplayer\Hold 'Em Mode\Player 3\All Special Weapons & Infinite Ammo",50000E02 0000,111AEB1E FFFF
-Cheat45="Multiplayer\Hold 'Em Mode\Player 4\All Special Weapons & Infinite Ammo",50000E02 0000,111AF4B6 FFFF
-Cheat46="All Batteries Have Hellfire",E8608BF6 5959
-Cheat47="All Batteries Have Bad Aim",E86072D4 5959
-Cheat48="Buildings Implode Instead Of Explode, And Remain Afire",E85D80E2 5959
-Cheat49="Shoot Through Walls",E85E3C7F 5959
-Cheat50="All Battletanx Are Invincible",E85DDB93 5959
-Cheat51="Can't Pick Up Queen Lords",E85EF548 5959
-Cheat52="Auto Win All Queen Lord Levels",E860BA9B 5959
-Cheat53="Auto Lose All Queen Lord Levels",E860BA9A 5959
-Cheat54="Slow Battle Tanks",E85DFCBE 5959
-Cheat55="Buildings Fall Fast",E85D6E14 5959
-Cheat56="Nuke Blast Leaves Air Yellow",E8638685 5959
-Cheat57="Nuke Blast Pink",E85E5CB1 5959
-Cheat58="Laser Fire Invisible",E85E9943 5959
-Cheat59="Full Control Of Tank In Bonus,Extra Side Player In Battlelord Multi!",E85DC842 5959
-Cheat60="Multiplayer\Balltlelord Mode\Player 1\Infinite Secondary Weapons In Battlelord",E881D95F 594F,E881D95D 594F,E881D963 594F,E881D961 594F,E881D967 594F,E881D96B 594F,E881D969 594F,E881D96F 594F,E881D96D 594F,E881D973 594F,E881D971 594F,E881D977 594F
-Cheat61="Multiplayer\Balltlelord Mode\Player 2\Infinite Secondary Weapons In Battlelord",E881F287 594F,E881F285 594F,E881F28B 594F,E881F289 594F,E881F28F 594F,E881F293 594F,E881F291 594F,E881F297 594F,E881F295 594F,E881F29B 594F,E881F299 594F,E881F29F 594F
-Cheat62="In Campaign 3 Enemy Tanks May Join You",E881ED04 595A,E881062C 595A,E8812354 595A
-Cheat63="Multiplayer\Player 1\Main Weapon",E881DC3D 59??
-Cheat63_O=$5A Nothing,$59 Normal Tank Shells,$5C Motor Tank Shells,$5B Big Tank Shells,$56 Rockets,$55 Laser,$58 Nuke,$57 Gernades,$62 ?,$61 ?,$64 Nuclear Lasers,$63 Remote Rockets,$5E Mines,$5D Gun Buddies,$60 Smoke Screen,$5F Cloaking,$6A Health
-Cheat64="Multiplayer\Player 2\Main Weapon",E881F265 59??
-Cheat64_O=$5A Nothing,$59 Normal Tank Shells,$5C Motor Tank Shells,$5B Big Tank Shells,$56 Rockets,$55 Laser,$58 Nuke,$57 Gernades,$62 ?,$61 ?,$64 Nuclear Lasers,$63 Remote Rockets,$5E Mines,$5D Gun Buddies,$60 Smoke Screen,$5F Cloaking,$6A Health
-Cheat65="Multiplayer\Player 1\Secondary Weapon",E881DC49 59??
-Cheat65_O=$5A Nothing,$59 Normal Tank Shells,$5C Motor Tank Shells,$5B Big Tank Shells,$56 Rockets,$55 Laser,$58 Nuke,$57 Gernades,$62 ?,$61 ?,$64 Nuclear Lasers,$63 Remote Rockets,$5E Mines,$5D Gun Buddies,$60 Smoke Screen,$5F Cloaking,$6A Health
-Cheat66="Multiplayer\Player 2\Secondary Weapon",E881F271 59??
-Cheat66_O=$5A Nothing,$59 Normal Tank Shells,$5C Motor Tank Shells,$5B Big Tank Shells,$56 Rockets,$55 Laser,$58 Nuke,$57 Gernades,$62 ?,$61 ?,$64 Nuclear Lasers,$63 Remote Rockets,$5E Mines,$5D Gun Buddies,$60 Smoke Screen,$5F Cloaking,$6A Health
-Cheat67="Multiplayer\Player 1\Tank Body Modifier",E881D8ED 59??
-Cheat67_O=$5A Normal Tank,$59 Motor Tank,$5C Big Tank
-Cheat68="Multiplayer\Player 2\Tank Body Modifier",E881ED15 59??
-Cheat68_O=$5A Normal Tank,$59 Motor Tank,$5C Big Tank
-Cheat69="Multiplayer\Player 1\Goalith Tank On Tracks Body Modifier",E881D9F5 59??
-Cheat69_O=$5A Normal Tank,$59 Motor Tank,$5C Big Tank
-Cheat70="Multiplayer\Player 2\Goalith Tank On Tracks Body Modifier",E881F21D 59??
-Cheat70_O=$5A Normal Tank,$59 Motor Tank,$5C Big Tank
+Cheat0="Have Storm Ravens Gang",80135773 0001
+Cheat1="Run Story",80135770 0001
+Cheat2="Start With All Weapons",80135765 0001
+Cheat3="Toads",80135776 0001
+Cheat4="Trippy",80135771 0001
+Cheat5="Unlimited Ammo",80135760 0001
+Cheat6="Frogs",80135775 0001
+Cheat7="Have All Levels",80135767 0001
+Cheat8="Hurl Mode",8013576B 0001
+Cheat9="Invincible",80135763 0001
+Cheat10="Invisible",8013576A 0001
+Cheat11="Unlimited Lives",80135772 0001
+Cheat12="Regenerated Allied Tanks Are Indestrucible In Campaign",8009FB2A 0001
+Cheat13="Multiplayer\Player 1\Infinite Ammo",802D8603 00FF
+Cheat14="Multiplayer\Player 2\Infinite Ammo",802D9F2B 00FF
+Cheat15="Multiplayer\Player 1\Tank Turret Always On (Use Right/Left C Button)",802DE7FB 0011,802DE7FF 0002
+Cheat16="Multiplayer\Player 2\Tank Turret Always On",802DEB43 0011,802DEB47 0002
+Cheat17="Multiplayer\Player 3\Tank Turret Always On",802DEE8B 0011,802DEE8F 0002
+Cheat18="Multiplayer\Player 4\Tank Turret Always On",802DF1D3 0011,802DF1D7 0002
+Cheat19="Multiplayer\Player 1\Always Have Radar",802D8195 0080
+Cheat20="Multiplayer\Player 2\Always Have Radar",802D9ABD 0080
+Cheat21="Multiplayer\Player 1\Always Has Cloaked On",802D818D 0001
+Cheat22="Multiplayer\Player 2\Always Has Cloaked On",802D9AB5 0001
+Cheat23="Multiplayer\Player 1\Your Goalith Tank On Tracks Always Has Radar",802D869D 0080
+Cheat24="Multiplayer\Player 2\Your Goalith Tank On Tracks Always Has Radar",802D9FC5 0080
+Cheat25="Multiplayer\Player 1\Your Goalith Tank On Tracks Always Has Cloaked On",802D8695 0001
+Cheat26="Multiplayer\Player 2\Your Goalith Tank On Tracks Always Has Cloaked On",802D9FBD 0001
+Cheat27="Multiplayer\Plater 1\One Hit And You Bite It",802D819F 0001
+Cheat28="MultiPlayer\Player 2\One Hit And You Bite It",802D9AC7 0001
+Cheat29="Area 51\Shock Wave Weapons",802D5A7D 00AF
+Cheat30="Area 51\Mines Are Invisible",802D5ACB 00CC
+Cheat31="Area 51\Mines Are Toxic Waste",802D5ACB 007C
+Cheat32="Area 51\Turn Ammo Pickup Picture To Flamer Picture",802D5AAF 00AC
+Cheat33="Area 51\Turn Nuke Into Toxic Waste Nuke",802D5A7B 007C
+Cheat34="Multiplayer\Balltlelord Mode\Player 1\All Special Weapons & Infinite Ammo",50000E02 0000,811AD7EE FFFF
+Cheat35="Multiplayer\Balltlelord Mode\Player 2\All Special Weapons & Infinite Ammo",50000E02 0000,811AE186 FFFF
+Cheat36="Multiplayer\Balltlelord Mode\Player 3\All Special Weapons & Infinite Ammo",50000E02 0000,811AEB1E FFFF
+Cheat37="Multiplayer\Balltlelord Mode\Player 4\All Special Weapons & Infinite Ammo",50000E02 0000,811AF4B6 FFFF
+Cheat38="Multiplayer\Deathmatch, Frenzy & Convoy Modes\Player 1\All Special Weapons & Infinite Ammo",50000E02 0000,811AD322 FFFF
+Cheat39="Multiplayer\Deathmatch, Frenzy & Convoy Modes\Player 2\All Special Weapons & Infinite Ammo",50000E02 0000,811ADCBA FFFF
+Cheat40="Multiplayer\Deathmatch, Frenzy & Convoy Modes\Player 3\All Special Weapons & Infinite Ammo",50000E02 0000,811AE652 FFFF
+Cheat41="Multiplayer\Deathmatch, Frenzy & Convoy Modes\Player 4\All Special Weapons & Infinite Ammo",50000E02 0000,811AEFEA FFFF
+Cheat42="Multiplayer\Hold 'Em Mode\Player 1\All Special Weapons & Infinite Ammo",50000E02 0000,811AD7EE FFFF
+Cheat43="Multiplayer\Hold 'Em Mode\Player 2\All Special Weapons & Infinite Ammo",50000E02 0000,811AE186 FFFF
+Cheat44="Multiplayer\Hold 'Em Mode\Player 3\All Special Weapons & Infinite Ammo",50000E02 0000,811AEB1E FFFF
+Cheat45="Multiplayer\Hold 'Em Mode\Player 4\All Special Weapons & Infinite Ammo",50000E02 0000,811AF4B6 FFFF
+Cheat46="All Batteries Have Hellfire",800A34A2 0001
+Cheat47="All Batteries Have Bad Aim",800A1F7C 0001
+Cheat48="Buildings Implode Instead Of Explode, And Remain Afire",8009298E 0001
+Cheat49="Shoot Through Walls",8008E529 0001
+Cheat50="All Battletanx Are Invincible",8009843D 0001
+Cheat51="Can't Pick Up Queen Lords",8008A2F0 0001
+Cheat52="Auto Win All Queen Lord Levels",800A6745 0001
+Cheat53="Auto Lose All Queen Lord Levels",800A6746 0001
+Cheat54="Slow Battle Tanks",8009A56A 0001
+Cheat55="Buildings Fall Fast",80091BBC 0001
+Cheat56="Nuke Blast Leaves Air Yellow",800F3333 0001
+Cheat57="Nuke Blast Pink",8008055F 0001
+Cheat58="Laser Fire Invisible",800846ED 0001
+Cheat59="Full Control Of Tank In Bonus,Extra Side Player In Battlelord Multi!",800971EE 0001
+Cheat60="Multiplayer\Balltlelord Mode\Player 1\Infinite Secondary Weapons In Battlelord",802D8609 00FF,802D860B 00FF,802D860D 00FF,802D860F 00FF,802D8611 00FF,802D8615 00FF,802D8617 00FF,802D8619 00FF,802D861B 00FF,802D861D 00FF,802D861F 00FF,802D8621 00FF
+Cheat61="Multiplayer\Balltlelord Mode\Player 2\Infinite Secondary Weapons In Battlelord",802D9F31 00FF,802D9F33 00FF,802D9F35 00FF,802D9F37 00FF,802D9F39 00FF,802D9F3D 00FF,802D9F3F 00FF,802D9F41 00FF,802D9F43 00FF,802D9F45 00FF,802D9F47 00FF,802D9F49 00FF
+Cheat62="In Campaign 3 Enemy Tanks May Join You",802D9AAC 0000,802DB3D4 0000,802DCCFC 0000
+Cheat63="Multiplayer\Player 1\Main Weapon",802D85EB 00??
+Cheat63_O=$00 Nothing,$01 Normal Tank Shells,$02 Motor Tank Shells,$03 Big Tank Shells,$04 Rockets,$05 Laser,$06 Nuke,$07 Gernades,$08 ?,$09 ?,$0A Nuclear Lasers,$0B Remote Rockets,$0C Mines,$0D Gun Buddies,$0E Smoke Screen,$0F Cloaking,$10 Health
+Cheat64="Multiplayer\Player 2\Main Weapon",802D9F13 00??
+Cheat64_O=$00 Nothing,$01 Normal Tank Shells,$02 Motor Tank Shells,$03 Big Tank Shells,$04 Rockets,$05 Laser,$06 Nuke,$07 Gernades,$08 ?,$09 ?,$0A Nuclear Lasers,$0B Remote Rockets,$0C Mines,$0D Gun Buddies,$0E Smoke Screen,$0F Cloaking,$10 Health
+Cheat65="Multiplayer\Player 1\Secondary Weapon",802D85F7 00??
+Cheat65_O=$00 Nothing,$01 Normal Tank Shells,$02 Motor Tank Shells,$03 Big Tank Shells,$04 Rockets,$05 Laser,$06 Nuke,$07 Gernades,$08 ?,$09 ?,$0A Nuclear Lasers,$0B Remote Rockets,$0C Mines,$0D Gun Buddies,$0E Smoke Screen,$0F Cloaking,$10 Health
+Cheat66="Multiplayer\Player 2\Secondary Weapon",802D9F1F 00??
+Cheat66_O=$00 Nothing,$01 Normal Tank Shells,$02 Motor Tank Shells,$03 Big Tank Shells,$04 Rockets,$05 Laser,$06 Nuke,$07 Gernades,$08 ?,$09 ?,$0A Nuclear Lasers,$0B Remote Rockets,$0C Mines,$0D Gun Buddies,$0E Smoke Screen,$0F Cloaking,$10 Health
+Cheat67="Multiplayer\Player 1\Tank Body Modifier",802D819B 00??
+Cheat67_O=$00 Normal Tank,$01 Motor Tank,$02 Big Tank
+Cheat68="Multiplayer\Player 2\Tank Body Modifier",802D9AC3 00??
+Cheat68_O=$00 Normal Tank,$01 Motor Tank,$02 Big Tank
+Cheat69="Multiplayer\Player 1\Goalith Tank On Tracks Body Modifier",802D86A3 00??
+Cheat69_O=$00 Normal Tank,$01 Motor Tank,$02 Big Tank
+Cheat70="Multiplayer\Player 2\Goalith Tank On Tracks Body Modifier",802D9FCB 00??
+Cheat70_O=$00 Normal Tank,$01 Motor Tank,$02 Big Tank
--- a/Config/Cheats/BattleTanx
+++ b/Config/Cheats/BattleTanx
@ -1,9 +1,9 @@
 [0CAD17E6-71A5B797-C:50]
-Name=BattleTanx - Global Assault (E)
-Cheat0="Infinite Tank Credits",E97AFE92 5B46
-Cheat1="Score Aid",E97AF8A6 4DF4
-Cheat2="Inincibility",E9686B78 5A5A
-Cheat3="All Weapons & Invulnerable",E9686B78 5A59
-Cheat4="Level Select",E965A710 5959
-Cheat5="All Tanx & All Campaigns",50001370 0000,11120546 FFFF,50001370 0000,1112054A FFFF
-Cheat6="Infinite Edge Power",E970E478 5964,E9650460 5964,E970183C 5964,E9701ED2 5964,E970010C 5964,E97036D0 5964,E9702C6C 5964,E970FC74 5964
+Name=BattleTanx - Global Assault (E) (M3)
+Cheat0="Infinite Tank Credits",8124AB3E 02F4
+Cheat1="Score Aid",8124A152 FC9A
+Cheat2="Inincibility",81121420 0100
+Cheat3="All Weapons & Invulnerable",81121420 0101
+Cheat4="Level Select",811150B8 0001
+Cheat5="All Tanx & All Campaigns",50001370 0000,81120546 FFFF,50001370 0000,8112054A FFFF
+Cheat6="Infinite Edge Power",811A8D20 000A,8111AD08 000A,811AC1E4 000A,811ACB7E 000A,811AAEB4 000A,811AE378 000A,811AD514 000A,811AA51C 000A
--- a/Config/Cheats/BattleTanx
+++ b/Config/Cheats/BattleTanx
@ -1,17 +1,17 @@
 [75A4E247-6008963D-C:45]
 Name=BattleTanx - Global Assault (U)
-Cheat0="Rapid Fire",E85E3A48 5959
-Cheat1="Edge Hits Everything",E85B6D48 599B
-Cheat2="Mini-Tanks 1",E868AD10 5959
-Cheat3="Mini-Tanks 2",E868AD0F 5959
-Cheat4="Mini-Tanks 3",E868AD0F 5959
-Cheat5="Mini-Tanks 4",E868AD0D 5959
-Cheat6="Mini-Tanks 5",E868AD14 5959
-Cheat7="Infinite Tank Bucks",E877BDF1 59B6
-Cheat8="Level Select",E865D29F 5959
-Cheat9="Invulnerability",E868AD08 5959
-Cheat10="Start With All Weapons",E868AD07 5959
-Cheat11="Secret Level",E868AD06 5959
-Cheat12="Enable Models",E868AD05 5959
-Cheat13="Cassandra Gang",E868AD0B 5959
-Cheat14="Brandon Gang",E868AD0A 5959
+Cheat0="Rapid Fire",8008E7F0 0001
+Cheat1="Edge Hits Everything",80071AF0 0043
+Cheat2="Mini-Tanks 1",80125AB8 0001
+Cheat3="Mini-Tanks 2",80125AB9 0001
+Cheat4="Mini-Tanks 3",80125AB9 0001
+Cheat5="Mini-Tanks 4",80125ABB 0001
+Cheat6="Mini-Tanks 5",80125ABC 0001
+Cheat7="Infinite Tank Bucks",80236A9F 0064
+Cheat8="Level Select",80117F49 0001
+Cheat9="Invulnerability",80125AB0 0001
+Cheat10="Start With All Weapons",80125AB1 0001
+Cheat11="Secret Level",80125AB2 0001
+Cheat12="Enable Models",80125AB3 0001
+Cheat13="Cassandra Gang",80125AB5 0001
+Cheat14="Brandon Gang",80125AB6 0001
--- a/Config/Cheats/Battlezone
+++ b/Config/Cheats/Battlezone
@ -1,20 +1,20 @@
 [55D4C4CE-7753C78A-C:45]
 Name=Battlezone - Rise of the Black Dogs (U)
-Cheat0="Infinite\Weapons",E971493E 550A
-Cheat1="Infinite\Ship Health",E9714932 6401
-Cheat2="Infinite\Shots For Sniper Rifle",E971F9D6 595B
-Cheat3="Have\All\Levels Unlocked & Completed For Americans",E85CF848 5969
-Cheat4="Have\All\Levels Unlocked & Completed For Soviets",E85CF847 5962
-Cheat5="Have\All\Levels Unlocked & Completed For Black Dogs",E85CF845 5964
-Cheat6="Have\All\Missions Open And Complete For Americans",E85CF844 5969
-Cheat7="Have\All\Missions Open And Complete For Soviets",E85CF843 5962
-Cheat8="Have\All\Missions Open And Complete For Black Dogs",E85CF841 5964
-Cheat9="Infinite\Scrap Collected",E973131A 504F
-Cheat10="Max\Scrap Limit",E973131E 504F
-Cheat11="Infinite\Pilots",E9731322 504F
-Cheat12="Max\Pilot Limits",E9731326 504F
-Cheat13="Infinite\Armor",E85CF816 5959
-Cheat14="Infinite\Ammo",E85CF817 5959
-Cheat15="Level Select",E85CF84B 5959
-Cheat16="Add\Building",E85CF818 5959
-Cheat17="Add\Satellite",E85CF815 5959
+Cheat0="Infinite\Weapons",811DF6EA 04B0
+Cheat1="Infinite\Ship Health",811DF6DE 0BA9
+Cheat2="Infinite\Shots For Sniper Rifle",811DA682 0003
+Cheat3="Have\All\Levels Unlocked & Completed For Americans",8006A1F0 0011
+Cheat4="Have\All\Levels Unlocked & Completed For Soviets",8006A1F1 0008
+Cheat5="Have\All\Levels Unlocked & Completed For Black Dogs",8006A1F3 000A
+Cheat6="Have\All\Missions Open And Complete For Americans",8006A1EC 0011
+Cheat7="Have\All\Missions Open And Complete For Soviets",8006A1ED 0008
+Cheat8="Have\All\Missions Open And Complete For Black Dogs",8006A1EF 000A
+Cheat9="Infinite\Scrap Collected",811FBCC6 FFFF
+Cheat10="Max\Scrap Limit",811FBCCA FFFF
+Cheat11="Infinite\Pilots",811FBCCE FFFF
+Cheat12="Max\Pilot Limits",811FBCD2 FFFF
+Cheat13="Infinite\Armor",8006A1C2 0001
+Cheat14="Infinite\Ammo",8006A1C1 0001
+Cheat15="Level Select",8006A1F5 0001
+Cheat16="Add\Building",8006A1C0 0001
+Cheat17="Add\Satellite",8006A1C3 0001
--- a/Config/Cheats/Beetle
+++ b/Config/Cheats/Beetle
@ -1,14 +0,0 @@
-[A1B64A61-D014940B-C:50]
-Name=Beetle Adventure Racing (E)
-Cheat0="Access All\Cars",E8582249 5963
-Cheat1="Access All\Tracks",E8582245 5958
-Cheat2="Access All\Difficulties",E858224D 595B
-Cheat3="Access All\Multiplayer Levels",50000901 0000,1002D000 0001
-Cheat4="Access In-Game Cheats",50001301 0000,1002D008 0001
-Cheat5="Display On",E958B11A 5A5A
-Cheat6="Map Full",E958B1BE 5A5C
-Cheat7="Speed units\Kph or Mph",E958B1C0 ????
-Cheat7_N=Here you can choose what you would like to be Displayed on your Speed Ometer, As in Kilometres Per Hour, Or Miles Per Hour.
-Cheat7_O=$5A5A Kph,$5959 Mph
-Cheat8="Max Race Points",E9581E18 5C37
-Cheat9="Flat Shading",E958B34A 595A
--- a/Config/Cheats/Beetle
+++ b/Config/Cheats/Beetle
@ -0,0 +1,14 @@
+[A1B64A61-D014940B-C:50]
+Name=Beetle Adventure Racing! (E) (M3)
+Cheat0="Access All\Cars",8002CFF7 000B
+Cheat1="Access All\Tracks",8002CFF3 0006
+Cheat2="Access All\Difficulties",8002CFFB 0003
+Cheat3="Access All\Multiplayer Levels",50000901 0000,8002D000 0001
+Cheat4="Access In-Game Cheats",50001301 0000,8002D008 0001
+Cheat5="Display On",81025EC6 0100
+Cheat6="Map Full",81025E6A 0102
+Cheat7="Speed units\Kph or Mph",81025E68 ????
+Cheat7_N=Here you can choose what you would like to be Displayed on your Speed Ometer, As in Kilometres Per Hour, Or Miles Per Hour.
+Cheat7_O=$0100 Kph,$0001 Mph
+Cheat8="Max Race Points",8102CBC0 03E7
+Cheat9="Flat Shading",81025CF6 0000
--- a/Config/Cheats/Beetle
+++ b/Config/Cheats/Beetle
@ -1,9 +1,9 @@
 [EDF419A8-BF1904CC-C:45]
 Name=Beetle Adventure Racing! (U) (M3)
-Cheat0="Have\All Cars",E8582249 5963
-Cheat1="Have\All Tracks",E8582245 5958
-Cheat2="Low Timer",E958B42C 909A
-Cheat3="Open All Difficulties",E858224D 595B
-Cheat4="Infinite Continues",E85823A9 5955
-Cheat5="Always Place 1st",E958B42C 6A6A,E958B434 909A
-Cheat6="Multi-Player Unlock All Levels",50000901 0000,1002D000 0001
+Cheat0="Have\All Cars",8002CFF7 000B
+Cheat1="Have\All Tracks",8002CFF3 0006
+Cheat2="Low Timer",81025DD4 3F40
+Cheat3="Open All Difficulties",8002CFFB 0003
+Cheat4="Infinite Continues",8002CC57 0005
+Cheat5="Always Place 1st",81025DD4 1110,81025DDC 3F40
+Cheat6="Multi-Player Unlock All Levels",50000901 0000,8002D000 0001
--- a/Config/Cheats/Berney
+++ b/Config/Cheats/Berney
@ -1,3 +1,3 @@
 [3A089BBC-54AB2C06-C:0]
-Name=Berney must die!
-Cheat0="Infinite Health",E85BEB1D 5961
+Name=Berney Must Die! by Nop_ (POM '99) (PD)
+Cheat0="Infinite Health",800794CB 0009
--- a/Config/Cheats/Big
+++ b/Config/Cheats/Big
@ -1,29 +1,29 @@
 [08FFA4B7-01F453B6-C:45]
 Name=Big Mountain 2000 (U)
-Cheat0="Always 1st/Low Time",E9896356 595A,E8896369 59BB
-Cheat1="Infinite Stamina",E88A4AF0 596C
-Cheat2="Free Ride Complete\Stage 1-Skier",E85F8CD0 5959
-Cheat3="Slalom Complete\Stage 1-Skier",E85F8CD4 5959
-Cheat4="Giant Slalom Complete\Stage 1-Skier",E85F8CD8 5959
-Cheat5="Free Ride Complete\Stage 2-Skier",E85F8CDC 5959
-Cheat6="Slalom Complete\Stage 2-Skier",E85F8CE0 5959
-Cheat7="Giant Slalom Complete\Stage 2-Skier",E85F8CE4 5959
-Cheat8="Free Ride Complete\Stage 3-Skier",E85F8CE8 5959
-Cheat9="Slalom Complete\Stage 3-Skier",E85F8CEC 5959
-Cheat10="Giant Slalom Complete\Stage 3-Skier",E85F8CF0 5959
-Cheat11="Free Ride Complete\Stage 4-Skier",E85F8CF4 5959
-Cheat12="Slalom Complete\Stage 4-Skier",E85F8CF8 5959
-Cheat13="Giant Slalom Complete\Stage 4-Skier",E85F8CFC 5959
-Cheat14="Free Ride Complete\Stage 1-Boarder",E85F8CCE 5959
-Cheat15="Slalom Complete\Stage 1-Boarder",E85F8CD2 5959
-Cheat16="Giant Slalom Complete\Stage 1-Boarder",E85F8CD6 5959
-Cheat17="Free Ride Complete\Stage 2-Boarder",E85F8CDA 5959
-Cheat18="Slalom Complete\Stage 2-Boarder",E85F8CDE 5959
-Cheat19="Giant Slalom Complete\Stage 2-Boarder",E85F8CE2 5959
-Cheat20="Free Ride Complete\Stage 3-Boarder",E85F8CE6 5959
-Cheat21="Slalom Complete\Stage 3-Boarder",E85F8CEA 5959
-Cheat22="Giant Slalom Complete\Stage 3-Boarder",E85F8CEE 5959
-Cheat23="Free Ride Complete\Stage 4-Boarder",E85F8CF2 5959
-Cheat24="Slalom Complete\Stage 4-Boarder",E85F8CF6 5959
-Cheat25="Giant Slalom Complete\Stage 4-Boarder",E85F8CFA 5959
-Cheat26="All Boards Complete",50001802 0000,110B3578 0001
+Cheat0="Always 1st/Low Time",81350C02 0000,80350C17 0063
+Cheat1="Infinite Stamina",8034F798 0012
+Cheat2="Free Ride Complete\Stage 1-Skier",800B3578 0001
+Cheat3="Slalom Complete\Stage 1-Skier",800B357C 0001
+Cheat4="Giant Slalom Complete\Stage 1-Skier",800B3580 0001
+Cheat5="Free Ride Complete\Stage 2-Skier",800B3584 0001
+Cheat6="Slalom Complete\Stage 2-Skier",800B3588 0001
+Cheat7="Giant Slalom Complete\Stage 2-Skier",800B358C 0001
+Cheat8="Free Ride Complete\Stage 3-Skier",800B3590 0001
+Cheat9="Slalom Complete\Stage 3-Skier",800B3594 0001
+Cheat10="Giant Slalom Complete\Stage 3-Skier",800B3598 0001
+Cheat11="Free Ride Complete\Stage 4-Skier",800B359C 0001
+Cheat12="Slalom Complete\Stage 4-Skier",800B35A0 0001
+Cheat13="Giant Slalom Complete\Stage 4-Skier",800B35A4 0001
+Cheat14="Free Ride Complete\Stage 1-Boarder",800B357A 0001
+Cheat15="Slalom Complete\Stage 1-Boarder",800B357E 0001
+Cheat16="Giant Slalom Complete\Stage 1-Boarder",800B3582 0001
+Cheat17="Free Ride Complete\Stage 2-Boarder",800B3586 0001
+Cheat18="Slalom Complete\Stage 2-Boarder",800B358A 0001
+Cheat19="Giant Slalom Complete\Stage 2-Boarder",800B358E 0001
+Cheat20="Free Ride Complete\Stage 3-Boarder",800B3592 0001
+Cheat21="Slalom Complete\Stage 3-Boarder",800B3596 0001
+Cheat22="Giant Slalom Complete\Stage 3-Boarder",800B359A 0001
+Cheat23="Free Ride Complete\Stage 4-Boarder",800B359E 0001
+Cheat24="Slalom Complete\Stage 4-Boarder",800B35A2 0001
+Cheat25="Giant Slalom Complete\Stage 4-Boarder",800B35A6 0001
+Cheat26="All Boards Complete",50001802 0000,810B3578 0001
--- a/Config/Cheats/Bio
+++ b/Config/Cheats/Bio
@ -1,14 +1,14 @@
 [AB7C101D-EC58C8B0-C:50]
 Name=Bio F.R.E.A.K.S. (E)
-Cheat0="Infinite Health\Player One",E9695A4E B55A
-Cheat1="Infinite Shields\Player One",E9695A52 B55A
-Cheat2="Shields Always Active\Player One",E8695F5E 597C
-Cheat3="Infinite Jet Pack\Player One",E9695F56 8B5A
-Cheat4="Smoke Trail\Player One",E8695F5C 5959
-Cheat5="Player 2 Easily Defeated\Player One",E96981CA 5A5A,E96981CE 5A5A
-Cheat6="Infinite Health\Player Two",E96981CA B55A
-Cheat7="Infinite Shields\Player Two",E96981CE B55A
-Cheat8="Shields Always Active\Player Two",E86981DA 597C
-Cheat9="Infinite Jet Pack\Player Two",E96981D2 8B5A
-Cheat10="Smoke Trail\Player Two",E86981D8 5959
-Cheat11="Player 1 Easily Defeated\Player Two",E9695A4E 5A5A,E9695A52 5A5A
+Cheat0="Infinite Health\Player One",811507FA 6400
+Cheat1="Infinite Shields\Player One",811507FE 6400
+Cheat2="Shields Always Active\Player One",8015080A 0022
+Cheat3="Infinite Jet Pack\Player One",81150802 3200
+Cheat4="Smoke Trail\Player One",80150804 0001
+Cheat5="Player 2 Easily Defeated\Player One",81152E76 0100,81152E7A 0100
+Cheat6="Infinite Health\Player Two",81152E76 6400
+Cheat7="Infinite Shields\Player Two",81152E7A 6400
+Cheat8="Shields Always Active\Player Two",80152E86 0022
+Cheat9="Infinite Jet Pack\Player Two",81152E7E 3200
+Cheat10="Smoke Trail\Player Two",80152E80 0001
+Cheat11="Player 1 Easily Defeated\Player Two",811507FA 0100,811507FE 0100
--- a/Config/Cheats/Bio
+++ b/Config/Cheats/Bio
@ -1,16 +1,16 @@
 [08123595-0510F1DE-C:45]
 Name=Bio F.R.E.A.K.S. (U)
-Cheat0="Never Wins\Player 1",E86955ED 595A
-Cheat1="Needs 1 Match to Win\Player 1",D015029B 0000,E86955ED 5959
-Cheat2="Infinite Health\Player 1",E96955FE B55A
-Cheat3="1-Hit Death\Player 1",D01502AA 0064,E96955FE 5A5A
-Cheat4="Infinite Shield\Player 1",E9695502 B55A
-Cheat5="Infinite Jetpack\Player 1",E9695506 8B5A
-Cheat6="Play As\Player 1",E8700E7D 59??
-Cheat6_O=$64 She-Freak,$63 PainMaster,$5E Mutilator,$5D ChainSaw
-Cheat7="Never Wins\Player 2",E8698069 595A
-Cheat8="Needs 1 Match to Win\Player 2",D0152917 0000,E8698069 5959
-Cheat9="Infinite Health\Player 2",E96955FE B55A
-Cheat10="1-Hit Death\Player 2",D0152926 0064,E969807A 5A5A
-Cheat11="Infinite Shield\Player 2",E969807E B55A
-Cheat12="Infinite Jetpack\Player 2",E9698082 8B5A
+Cheat0="Never Wins\Player 1",8015029B 0000
+Cheat1="Needs 1 Match to Win\Player 1",D015029B 0000,8015029B 0001
+Cheat2="Infinite Health\Player 1",811502AA 6400
+Cheat3="1-Hit Death\Player 1",D01502AA 0064,811502AA 0100
+Cheat4="Infinite Shield\Player 1",811502AE 6400
+Cheat5="Infinite Jetpack\Player 1",811502B2 3200
+Cheat6="Play As\Player 1",801ABB2B 00??
+Cheat6_O=$0A She-Freak,$0B PainMaster,$0C Mutilator,$0D ChainSaw
+Cheat7="Never Wins\Player 2",80152917 0000
+Cheat8="Needs 1 Match to Win\Player 2",D0152917 0000,80152917 0001
+Cheat9="Infinite Health\Player 2",811502AA 6400
+Cheat10="1-Hit Death\Player 2",D0152926 0064,81152926 0100
+Cheat11="Infinite Shield\Player 2",8115292A 6400
+Cheat12="Infinite Jetpack\Player 2",8115292E 3200
--- a/Config/Cheats/Blast
+++ b/Config/Cheats/Blast
@ -1,9 +1,9 @@
 [7C64E6DB-55B924DB-C:50]
 Name=Blast Corps (E)
-Cheat0="Infinite Hydraulics Sidesweeper",E8942EA7 59BB
-Cheat1="Infinite Missiles Motor Bike",E893DD15 59BB
-Cheat2="Infinite Boosts Buggy Vehicle",E8943657 59B6
-Cheat3="Ballista Can Drive Through Anything",E893DDC0 5959
-Cheat4="Found All RDUS",E88C4024 1CAA
-Cheat5="Found All Survivors",E88C401F 594F
-Cheat6="Found All Scientists",E88C9D28 598F
+Cheat0="Infinite Hydraulics Sidesweeper",803EDB51 0063
+Cheat1="Infinite Missiles Motor Bike",803F8AC3 0063
+Cheat2="Infinite Boosts Buggy Vehicle",803EE301 0064
+Cheat3="Ballista Can Drive Through Anything",803F8A68 0001
+Cheat4="Found All RDUS",8036E9CC C350
+Cheat5="Found All Survivors",8036E9C9 00FF
+Cheat6="Found All Scientists",80364AD0 003F
--- a/Config/Cheats/Blast
+++ b/Config/Cheats/Blast
@ -1,10 +1,10 @@
 [7C647C25-D9D901E6-C:45]
 Name=Blast Corps (U) (V1.0)
-Cheat0="Infinite\Hydraulics Sidesweeper",E8942EA7 59BB
-Cheat1="Infinite\Missiles Motor Bike",E893DD15 59BB
-Cheat2="Infinite\Boosts Buggy Vehicle",E8943657 59B6
-Cheat3="Ballista Can Drive Through Anything",E893DDC0 5959
-Cheat4="Found All\RDUS",E88C4024 1CAA
-Cheat5="Found All\Survivors",E88C401F 594F
-Cheat6="Found All\Scientists",E88C9D28 598F
-Cheat7="Infinite Time",D0315610 0000,E985A968 595A,D0315612 0001,E985A966 595A
+Cheat0="Infinite\Hydraulics Sidesweeper",803EDB51 0063
+Cheat1="Infinite\Missiles Motor Bike",803F8AC3 0063
+Cheat2="Infinite\Boosts Buggy Vehicle",803EE301 0064
+Cheat3="Ballista Can Drive Through Anything",803F8A68 0001
+Cheat4="Found All\RDUS",8036E9CC C350
+Cheat5="Found All\Survivors",8036E9C9 00FF
+Cheat6="Found All\Scientists",80364AD0 003F
+Cheat7="Infinite Time",D0315610 0000,81315610 0000,D0315612 0001,81315612 0000
--- a/Config/Cheats/Blast
+++ b/Config/Cheats/Blast
@ -1,10 +1,10 @@
 [7C647E65-1948D305-C:45]
 Name=Blast Corps (U) (V1.1)
-Cheat0="Infinite\Hydraulics Sidesweeper",E8943358 59BB
-Cheat1="Infinite\Missiles Motor Bike",E893DEC6 59BB
-Cheat2="Infinite\Boosts Buggy Vehicle",E8943608 59B6
-Cheat3="Ballista Can Drive Through Anything",E893DE69 5959
-Cheat4="Found All\RDUS",E88C3DD4 1CAA
-Cheat5="Found All\Survivors",E88C3DC8 594F
-Cheat6="Found All\Scientists",E88C9ED8 598F
-Cheat7="Infinite Time",D03156C0 0000,E985A918 595A,D03156C2 0001,E985A916 595A
+Cheat0="Infinite\Hydraulics Sidesweeper",803EDC00 0063
+Cheat1="Infinite\Missiles Motor Bike",803F8B72 0063
+Cheat2="Infinite\Boosts Buggy Vehicle",803EE3B0 0064
+Cheat3="Ballista Can Drive Through Anything",803F8B17 0001
+Cheat4="Found All\RDUS",8036EA7C C350
+Cheat5="Found All\Survivors",8036EA70 00FF
+Cheat6="Found All\Scientists",80364B80 003F
+Cheat7="Infinite Time",D03156C0 0000,813156C0 0000,D03156C2 0001,813156C2 0000
--- a/Config/Cheats/Blast
+++ b/Config/Cheats/Blast
@ -1,17 +1,17 @@
 [65234451-EBD3346F-C:4A]
 Name=Blast Dozer (J)
-Cheat0="Infinite\Hydraulics Sidesweeper",E8943337 59BB
-Cheat1="Infinite\Missiles Motor Bike",E893E3A5 59BB
-Cheat2="Infinite\Boosts Buggy Vehicle",E8943BE7 59B6
-Cheat3="Sideswipe\Can Go In Water",E8943336 59BB
-Cheat4="Sidesweep\Can Go Through Anything",E8943336 504F
-Cheat5="J-Bomb Floats Through Anything",E893D3AE 5959
-Cheat6="Rapid Fire\Ballista",E893E3B3 595A
-Cheat7="Rapid Fire\Sideswipe",E894333A 595A
-Cheat8="Drive Through Anything\Ballista",E893DE50 5959
-Cheat9="Drive Through Anything\Dump Truck",E9943E40 5A59
-Cheat10="Drive Through Anything\Red, White, & Blue Car",E9944220 5A59
-Cheat11="Drive Through Anything\Skyfall",E9943B90 5A59
-Cheat12="Drive Through Anything\Police Car",E993E230 5A59
-Cheat13="Drive Through Anything\Red Car",E99319B0 5A59
-Cheat14="Drive Through Anything\Van",E993E600 5A59
+Cheat0="Infinite\Hydraulics Sidesweeper",803EDCE1 0063
+Cheat1="Infinite\Missiles Motor Bike",803F8C53 0063
+Cheat2="Infinite\Boosts Buggy Vehicle",803EE491 0064
+Cheat3="Sideswipe\Can Go In Water",803EDCE2 0063
+Cheat4="Sidesweep\Can Go Through Anything",803EDCE2 FFFF
+Cheat5="J-Bomb Floats Through Anything",803F7C5A 0001
+Cheat6="Rapid Fire\Ballista",803F8C5D 0000
+Cheat7="Rapid Fire\Sideswipe",803EDCE6 0000
+Cheat8="Drive Through Anything\Ballista",803F8BF8 0001
+Cheat9="Drive Through Anything\Dump Truck",813EEBE8 0101
+Cheat10="Drive Through Anything\Red, White, & Blue Car",813EEFC8 0101
+Cheat11="Drive Through Anything\Skyfall",813EE438 0101
+Cheat12="Drive Through Anything\Police Car",813F8FD8 0101
+Cheat13="Drive Through Anything\Red Car",813FC658 0101
+Cheat14="Drive Through Anything\Van",813F93A8 0101
--- a/Config/Cheats/Blues
+++ b/Config/Cheats/Blues
@ -1,11 +1,11 @@
 [D571C883-822D3FCF-C:50]
-Name=Blues Brothers 2000 (E)
-Cheat0="Have All\Keys",E85F35C0 594F,E85F35C3 594F,E85F35C2 594F
+Name=Blues Brothers 2000 (E) (M6)
+Cheat0="Have All\Keys",800BE268 00FF,800BE26D 00FF,800BE26E 00FF
 Cheat0_N=This will give you the Grey & Red,Green & Gold Keys
-Cheat1="Have All\Music Notes",50000A01 0000,100BE3A0 0001
+Cheat1="Have All\Music Notes",50000A01 0000,800BE3A0 0001
 Cheat1_N=This will give you all 10 Music Notes
-Cheat2="Infinite\Lives",E85F35E5 5961
-Cheat3="Infinite\Health",E85F35F9 595C
-Cheat4="Press L to Levitate",D017E975 0020,E96114E0 9523
+Cheat2="Infinite\Lives",800BE293 0009
+Cheat3="Infinite\Health",800BE2A7 0002
+Cheat4="Press L to Levitate",D017E975 0020,810DBD88 44CB
 Cheat4_N=Press L to levitate & let go to come back down
-Cheat5="Max Money",E95F35EA 5C37
+Cheat5="Max Money",810BE296 03E7
--- a/Config/Cheats/Blues
+++ b/Config/Cheats/Blues
@ -1,12 +1,12 @@
 [7CD08B12-1153FF89-C:45]
 Name=Blues Brothers 2000 (U)
-Cheat0="Have All\Keys",E85F2710 594F,E85F2712 594F,E85F2713 594F
+Cheat0="Have All\Keys",800BD0B8 00FF,800BD0BE 00FF,800BD0BD 00FF
 Cheat0_N=This will give you the Grey & Red,Green & Gold Keys
-Cheat1="Have All\Music Notes",50000A01 0000,100BD1F0 0001
+Cheat1="Have All\Music Notes",50000A01 0000,800BD1F0 0001
 Cheat1_N=This will give you all 10 Music Notes
-Cheat2="Infinite\Lives",E85F2735 5961
-Cheat3="Infinite\Health",E85F2749 595C
-Cheat4="Press L to Levitate",D017DBC5 0020,E9610230 9523
+Cheat2="Infinite\Lives",800BD0E3 0009
+Cheat3="Infinite\Health",800BD0F7 0002
+Cheat4="Press L to Levitate",D017DBC5 0020,810DAFD8 44CB
 Cheat4_N=Press L to levitate & let go to come back down
-Cheat5="Max Money",E95F273A 5C37
-Cheat6="Can Walk When The Game Is Paused",E960100A 5959
+Cheat5="Max Money",810BD0E6 03E7
+Cheat6="Can Walk When The Game Is Paused",810AB9B6 0001
--- a/Config/Cheats/Body
+++ b/Config/Cheats/Body
@ -1,29 +1,29 @@
 [0B58B8CD-B7B291D2-C:50]
-Name=Body Harvest (E)
-Cheat0="Infinite\Greece",E9597EA0 59F2,E9597E9E E7CF
-Cheat1="Infinite\Health",E85A3474 595C
-Cheat2="No Humans Killed",E95AD8EE 595A
-Cheat3="Have Alien Artifact",E85A33E1 5959
-Cheat4="Item Modifier",E85A33D1 ????
-Cheat4_O=$595A Nothing,$595C Howitzer Shells,$599A Crank,$59DA Windmill Cog,$5A5A Heirglyph Map Piece,$555A Hangar Key,$504F All Items
-Cheat5="Weapon Select\1st Position",E85AD8C0 59??
-Cheat5_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat6="Weapon Select\2nd Position",E85AD8BF 59??
-Cheat6_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat7="Weapon Select\3rd Position",E85AD8BE 59??
-Cheat7_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat8="Weapon Select\4th Position",E85AD8BD 59??
-Cheat8_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat9="Weapon Select\5th Position",E85AD8C4 59??
-Cheat9_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat10="Weapon Select\6th Position",E85AD8C3 59??
-Cheat10_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat11="Weapon Select\7th Position",E85AD8C2 59??
-Cheat11_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat12="Weapon Select\8th Position",E85AD8C1 59??
-Cheat12_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat13="Infinite Ammo All Weapons",50001102 0000,11048176 8000
-Cheat14="Level Select",E85AD215 59??
-Cheat14_O=$59 Greece,$5C Java,$5B America,$56 Siberia,$55 Comet
-Cheat15="Press L To Wall Over Water, Climb Hills",D0047609 0020,E95A3456 6162
-Cheat16="Infinite\Fuel",E85A3BC4 59AA
+Name=Body Harvest (E) (M3)
+Cheat0="Infinite\Greece",81052B48 0098,81052B4A 967F
+Cheat1="Infinite\Health",8004DD1C 0002
+Cheat2="No Humans Killed",8104819A 0000
+Cheat3="Have Alien Artifact",8004DC8F 0001
+Cheat4="Item Modifier",8004DC7F ????
+Cheat4_O=$0000 Nothing,$0002 Howitzer Shells,$0040 Crank,$0080 Windmill Cog,$0100 Heirglyph Map Piece,$0400 Hangar Key,$FFFF All Items
+Cheat5="Weapon Select\1st Position",80048168 00??
+Cheat5_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat6="Weapon Select\2nd Position",80048169 00??
+Cheat6_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat7="Weapon Select\3rd Position",8004816A 00??
+Cheat7_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat8="Weapon Select\4th Position",8004816B 00??
+Cheat8_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat9="Weapon Select\5th Position",8004816C 00??
+Cheat9_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat10="Weapon Select\6th Position",8004816D 00??
+Cheat10_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat11="Weapon Select\7th Position",8004816E 00??
+Cheat11_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat12="Weapon Select\8th Position",8004816F 00??
+Cheat12_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat13="Infinite Ammo All Weapons",50001102 0000,81048176 8000
+Cheat14="Level Select",80047FC3 00??
+Cheat14_O=$01 Greece,$02 Java,$03 America,$04 Siberia,$05 Comet
+Cheat15="Press L To Wall Over Water, Climb Hills",D0047609 0020,8104DD02 0808
+Cheat16="Infinite\Fuel",8004E46C 0050
--- a/Config/Cheats/Body
+++ b/Config/Cheats/Body
@ -1,28 +1,28 @@
 [5326696F-FE9A99C3-C:45]
 Name=Body Harvest (U)
-Cheat0="Infinite\Greece",E9597E70 59F2,E9597E6E E7CF
-Cheat1="Infinite\Health",E9613344 5BB2
-Cheat2="No Humans Killed",E95AD8BE 595A
-Cheat3="Have Alien Artifact",E85A33B1 5959
-Cheat4="Item Modifier",E85A33A1 ????
-Cheat4_O=$595A Nothing,$595C Howitzer Shells,$599A Crank,$59DA Windmill Cog,$5A5A Heirglyph Map Piece,$555A Hangar Key,$504F All Items
-Cheat5="Weapon Select\1st Position",E85AD890 59??
-Cheat5_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat6="Weapon Select\2nd Position",E85AD88F 59??
-Cheat6_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat7="Weapon Select\3rd Position",E85AD88E 59??
-Cheat7_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat8="Weapon Select\4th Position",E85AD88D 59??
-Cheat8_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat9="Weapon Select\5th Position",E85AD894 59??
-Cheat9_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat10="Weapon Select\6th Position",E85AD893 59??
-Cheat10_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat11="Weapon Select\7th Position",E85AD892 59??
-Cheat11_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat12="Weapon Select\8th Position",E85AD891 59??
-Cheat12_O=$5A Nothing,$59 Fuel,$5C Pistol,$5B Shotgun,$56 Rifle,$55 Machine Gun,$58 Rocket Launcher,$57 TNT,$62 Sun Shield,$61 Grenades,$64 Tri-Spinner,$63 Vehicle Weapon 1,$5E Vehicle Weapon 2,$5D Arme 2,$60 Waffe 2,$6A Fragcannon,$69 Lazer Missiles,$6C Resonator,$6B Plasma Bombs
-Cheat13="Infinite Ammo All Weapons",50001102 0000,11048146 8000
-Cheat14="Level Select",E85AD2E5 59??
-Cheat14_O=$59 Greece,$5C Java,$5B America,$56 Siberia,$55 Comet
-Cheat15="Press L To Wall Over Water, Climb Hills",D00475D9 0020,E95A3326 6162
+Cheat0="Infinite\Greece",81052B18 0098,81052B1A 967F
+Cheat1="Infinite\Health",810DDCEC 0258
+Cheat2="No Humans Killed",8104816A 0000
+Cheat3="Have Alien Artifact",8004DC5F 0001
+Cheat4="Item Modifier",8004DC4F ????
+Cheat4_O=$0000 Nothing,$0002 Howitzer Shells,$0040 Crank,$0080 Windmill Cog,$0100 Heirglyph Map Piece,$0400 Hangar Key,$FFFF All Items
+Cheat5="Weapon Select\1st Position",80048138 00??
+Cheat5_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat6="Weapon Select\2nd Position",80048139 00??
+Cheat6_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat7="Weapon Select\3rd Position",8004813A 00??
+Cheat7_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat8="Weapon Select\4th Position",8004813B 00??
+Cheat8_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat9="Weapon Select\5th Position",8004813C 00??
+Cheat9_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat10="Weapon Select\6th Position",8004813D 00??
+Cheat10_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat11="Weapon Select\7th Position",8004813E 00??
+Cheat11_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat12="Weapon Select\8th Position",8004813F 00??
+Cheat12_O=$00 Nothing,$01 Fuel,$02 Pistol,$03 Shotgun,$04 Rifle,$05 Machine Gun,$06 Rocket Launcher,$07 TNT,$08 Sun Shield,$09 Grenades,$0A Tri-Spinner,$0B Vehicle Weapon 1,$0C Vehicle Weapon 2,$0D Arme 2,$0E Waffe 2,$10 Fragcannon,$11 Lazer Missiles,$12 Resonator,$13 Plasma Bombs
+Cheat13="Infinite Ammo All Weapons",50001102 0000,81048146 8000
+Cheat14="Level Select",80047F93 00??
+Cheat14_O=$01 Greece,$02 Java,$03 America,$04 Siberia,$05 Comet
+Cheat15="Press L To Wall Over Water, Climb Hills",D00475D9 0020,8104DCD2 0808
--- a/Config/Cheats/Bomberman
+++ b/Config/Cheats/Bomberman
@ -1,9 +1,9 @@
 [5A160336-BC7B37B0-C:50]
 Name=Bomberman 64 (E)
-Cheat0="Infinite\Lives",E8801969 59BB
-Cheat1="Infinite\Gems",E8801971 59BB
-Cheat2="Infinite\Credits",E880196D 59BB
-Cheat3="Infinite\Time",E8801985 595A
-Cheat4="Have All Gold Cards",E85E3CCB 594F,E95E3CCA 504F,E95E3CD0 504F,E95E3CCE 504F,E95E3CD4 504F
-Cheat5="All Levels & Stages Unlocked",50001804 0000,1008E5CF 0001
-Cheat6="Infinite Red Pumped-Up Bombs",E8801995 5956
+Cheat0="Infinite\Lives",802AC617 0063
+Cheat1="Infinite\Gems",802AC61F 0063
+Cheat2="Infinite\Credits",802AC61B 0063
+Cheat3="Infinite\Time",802AC633 0000
+Cheat4="Have All Gold Cards",8008E575 00FF,8108E576 FFFF,8108E578 FFFF,8108E57A FFFF,8108E57C FFFF
+Cheat5="All Levels & Stages Unlocked",50001804 0000,8008E5CF 0001
+Cheat6="Infinite Red Pumped-Up Bombs",802AC643 0004
--- a/Config/Cheats/Bomberman
+++ b/Config/Cheats/Bomberman
@ -1,21 +0,0 @@
-[DF6FF0F4-29D14238-C:4A]
-Name=Bomberman 64 (J)
-Cheat0="Have\Max Fire",E87AF6F2 594F
-Cheat1="Have\Max Bombs",E87AF6F1 594F
-Cheat2="Bomb Select",E87AF6F7 59??
-Cheat2_O=$5C Power Bomb,$5B Jelly Bomb,$56 Shock Wave Bomb,$55 Blue Remote Bomb,$58 Red Beem Bomb,$57 Invisible Mine Bomb,$6D Crazy Bomb,$5A Clear All Special Bombs.
-Cheat3="Walk through\Blocks",E87AF6FB 59??
-Cheat3_N=Walk through Blocks like they are not there.Turn cheat to off to go back to normal.
-Cheat3_O=$5A Off,$59 On
-Cheat4="Bomberman Speed",E87AF6F8 59??
-Cheat4_O=$56 Slow,$62 Normal,$60 Fast,$6A Turbo
-Cheat5="Have\Infinite\Kick",E87AF6FA 595C
-Cheat6="Invincible",E87AF600 59??
-Cheat6_N=Enemies & Bomb Blasts cant harm you.But if you walk & keep laying Bombs it will most likly freeze.so try to avoid constant bombing while walking.Turn cheat to off to go back to normal.
-Cheat6_O=$5A Off,$59 On
-Cheat7="Walk through\Bombs",E87AF6FA 59??
-Cheat7_N=Walk through Bombs like they are not there.Turn cheat to off to go back to normal.
-Cheat7_O=$5A Off,$59 On
-Cheat8="Infinite\Health Hearts",E87AF602 594F
-Cheat9="Infinite\Lives",E8847339 594F
-Cheat10="Infinite\Timer",E86334C6 5984
--- a/Config/Cheats/Bomberman
+++ b/Config/Cheats/Bomberman
@ -1,13 +1,13 @@
 [F568D51E-7E49BA1E-C:45]
 Name=Bomberman 64 (U)
-Cheat0="Invincible\Player 1",E8604157 5959
-Cheat1="Have\Pumped up Red Remote Bombs",E88019A5 5956
-Cheat2="Infinite\Lives",E8801979 59BB
-Cheat3="Infinite\Gems",E8801981 59BB
-Cheat4="Infinite\Credits",E880197D 5961
-Cheat5="Infinite\Time",E8801995 5959
-Cheat6="Carry 20 Bombs At A Time",E8604161 5966
-Cheat7="Infinite\Energy\Player 1",E8604159 595C
-Cheat8="Infinite\Energy\Player 2",E8604121 595C
-Cheat9="Infinite\Energy\Player 3",E86042E9 595C
-Cheat10="Infinite\Energy\Player 4",E86047B1 595C
+Cheat0="Invincible\Player 1",800AEE01 0001
+Cheat1="Have\Pumped up Red Remote Bombs",802AC653 0004
+Cheat2="Infinite\Lives",802AC627 0063
+Cheat3="Infinite\Gems",802AC62F 0063
+Cheat4="Infinite\Credits",802AC62B 0009
+Cheat5="Infinite\Time",802AC643 0001
+Cheat6="Carry 20 Bombs At A Time",800AEE0F 0014
+Cheat7="Infinite\Energy\Player 1",800AEE07 0002
+Cheat8="Infinite\Energy\Player 2",800AEECF 0002
+Cheat9="Infinite\Energy\Player 3",800AEF97 0002
+Cheat10="Infinite\Energy\Player 4",800AF05F 0002
--- a/Config/Cheats/Bomberman
+++ b/Config/Cheats/Bomberman
@ -0,0 +1,21 @@
+[DF6FF0F4-29D14238-C:4A]
+Name=Bomberman 64 - Arcade Edition (J)
+Cheat0="Have\Max Fire",8024A39E 00FF
+Cheat1="Have\Max Bombs",8024A39F 00FF
+Cheat2="Bomb Select",8024A3A1 00??
+Cheat2_O=$02 Power Bomb,$03 Jelly Bomb,$04 Shock Wave Bomb,$05 Blue Remote Bomb,$06 Red Beem Bomb,$07 Invisible Mine Bomb,$1D Crazy Bomb,$00 Clear All Special Bombs.
+Cheat3="Walk through\Blocks",8024A3A5 00??
+Cheat3_N=Walk through Blocks like they are not there.Turn cheat to off to go back to normal.
+Cheat3_O=$00 Off,$01 On
+Cheat4="Bomberman Speed",8024A3A0 00??
+Cheat4_O=$04 Slow,$08 Normal,$0E Fast,$10 Turbo
+Cheat5="Have\Infinite\Kick",8024A3A6 0002
+Cheat6="Invincible",8024A3A8 00??
+Cheat6_N=Enemies & Bomb Blasts cant harm you.But if you walk & keep laying Bombs it will most likly freeze.so try to avoid constant bombing while walking.Turn cheat to off to go back to normal.
+Cheat6_O=$00 Off,$01 On
+Cheat7="Walk through\Bombs",8024A3A6 00??
+Cheat7_N=Walk through Bombs like they are not there.Turn cheat to off to go back to normal.
+Cheat7_O=$00 Off,$01 On
+Cheat8="Infinite\Health Hearts",8024A3AE 00FF
+Cheat9="Infinite\Lives",802E1CE7 00FF
+Cheat10="Infinite\Timer",800FDD72 002A
--- a/Config/Cheats/Bomberman
+++ b/Config/Cheats/Bomberman
@ -1,11 +1,11 @@
 [237E73B4-D63B6B37-C:45]
 Name=Bomberman 64 - The Second Attack! (U)
-Cheat0="Infinite\Money",E96014A6 504F
-Cheat1="Infinite\Bombs",E8602AB0 595B
-Cheat2="Have\Max Fire Level",E8602A85 595B
-Cheat3="Infinite\Health",E8602AB1 5955
-Cheat4="Infinite\Continue Time",E95FB32A 59EA
-Cheat5="Have\Fire Bombs",E8602A8D 595B
-Cheat6="Have\Kick Bombs Anytime",E8601A95 595B
-Cheat7="Flashing Invincible",E8602AB9 5964
+Cheat0="Infinite\Money",810ABD52 FFFF
+Cheat1="Infinite\Bombs",800AD758 0003
+Cheat2="Have\Max Fire Level",800AD733 0003
+Cheat3="Infinite\Health",800AD75F 0005
+Cheat4="Infinite\Continue Time",810B5CD6 0090
+Cheat5="Have\Fire Bombs",800AD73B 0003
+Cheat6="Have\Kick Bombs Anytime",800AC743 0003
+Cheat7="Flashing Invincible",800AD767 000A
 Cheat7_N=This cheat Makes you Flash But you cant be harmed,Once out of danger Turn the cheat off to stop the flashing.also do not put this on if you have already been hurt or you will stay on the floor.
--- a/Config/Cheats/Bomberman
+++ b/Config/Cheats/Bomberman
@ -1,12 +1,12 @@
 [D85C4E29-88E276AF-C:50]
 Name=Bomberman Hero (E)
-Cheat0="Full\Bomb Power",E86CA591 595B
-Cheat1="Full\Fire Power",E86CA598 5962
-Cheat2="Infinite\Health",E86CA59C 5956
-Cheat3="Infinite\Lives",E86CA595 5961
-Cheat4="Extra Gems",D0165241 0000,E86CA597 59A3
-Cheat5="Max\Bombs",E86CA591 5962
-Cheat6="Press L to Levitate",D005A465 0020,E96998D0 9A23,D005A465 0020,D0154154 0000,E86998AC 599A
+Cheat0="Full\Bomb Power",8016523F 0003
+Cheat1="Full\Fire Power",80165240 0008
+Cheat2="Infinite\Health",80165244 0004
+Cheat3="Infinite\Lives",80165243 0009
+Cheat4="Extra Gems",D0165241 0000,80165241 004B
+Cheat5="Max\Bombs",8016523F 0008
+Cheat6="Press L to Levitate",D005A465 0020,81154178 41CB,D005A465 0020,D0154154 0000,80154154 0040
 Cheat6_N=Press L to levitate & let go to come back down
-Cheat7="Max\Score",E86BC960 504F
-Cheat8="Max\Explosion",E86CA598 5962
+Cheat7="Max\Score",80177608 FFFF
+Cheat8="Max\Explosion",80165240 0008
--- a/Config/Cheats/Bomberman
+++ b/Config/Cheats/Bomberman
@ -1,12 +1,12 @@
 [4446FDD6-E3788208-C:45]
 Name=Bomberman Hero (U)
-Cheat0="Full\Bomb Power",E86CA591 595B
-Cheat1="Full\Fire Power",E86CA598 595B
-Cheat2="Infinite\Health",E86CA59C 5956
-Cheat3="Infinite\Lives",E86CA595 5961
-Cheat4="Extra Gems",D0165241 0000,E86CA597 59A3
-Cheat5="Max\Bombs",E86CA591 5962
-Cheat6="Press L to Levitate",D005A455 0020,E96998D0 9A23,D005A455 0020,D0154154 0000,E86998AC 599A
+Cheat0="Full\Bomb Power",8016523F 0003
+Cheat1="Full\Fire Power",80165240 0003
+Cheat2="Infinite\Health",80165244 0004
+Cheat3="Infinite\Lives",80165243 0009
+Cheat4="Extra Gems",D0165241 0000,80165241 004B
+Cheat5="Max\Bombs",8016523F 0008
+Cheat6="Press L to Levitate",D005A455 0020,81154178 41CB,D005A455 0020,D0154154 0000,80154154 0040
 Cheat6_N=Press L to levitate & let go to come back down
-Cheat7="Max\Score",E86BC960 504F
-Cheat8="Max\Explosion",E86CA598 5962
+Cheat7="Max\Score",80177608 FFFF
+Cheat8="Max\Explosion",80165240 0008
--- a/Config/Cheats/Bomberman
+++ b/Config/Cheats/Bomberman
@ -1,12 +1,12 @@
 [67FF12CC-76BF0212-C:4A]
 Name=Bomberman Hero - Mirian Oujo wo Sukue! (J)
-Cheat0="Full\Bomb Power",E86CA58F 595B
-Cheat1="Full\Fire Power",E86CA58E 595B
-Cheat2="Infinite\Health",E86CA592 5956
-Cheat3="Infinite\Lives",E86CA593 5961
-Cheat4="Extra Gems",D016523B 0000,E86CA58D 59A3
-Cheat5="Max\Bombs",E86CA58F 5962
-Cheat6="Press L to Levitate",D005A2F5 0020,E96998D0 9A23,D005A2F5 0020,D0154154 0000,E86998AC 599A
+Cheat0="Full\Bomb Power",80165239 0003
+Cheat1="Full\Fire Power",8016523A 0003
+Cheat2="Infinite\Health",8016523E 0004
+Cheat3="Infinite\Lives",8016523D 0009
+Cheat4="Extra Gems",D016523B 0000,8016523B 004B
+Cheat5="Max\Bombs",80165239 0008
+Cheat6="Press L to Levitate",D005A2F5 0020,81154178 41CB,D005A2F5 0020,D0154154 0000,80154154 0040
 Cheat6_N=Press L to levitate & let go to come back down
-Cheat7="Max\Score",E86BC957 594F,E86BC956 594F
-Cheat8="Max\Explosion",E86CA58E 5962
+Cheat7="Max\Score",80177601 00FF,80177602 00FF
+Cheat8="Max\Explosion",8016523A 0008
--- a/Config/Cheats/Buck
+++ b/Config/Cheats/Buck
@ -1,11 +1,11 @@
 [D5B2339C-CABCCAED-C:50]
-Name=Buck Bumble (E)
-Cheat0="Have All\Guns & Infinite Ammo",E966835E 5959,50000B04 0000,110EBF66 03E8
+Name=Buck Bumble (E) (M5)
+Cheat0="Have All\Guns & Infinite Ammo",81102C0A 0001,50000B04 0000,810EBF66 03E8
 Cheat0_N=Press C Left to receive all Guns
-Cheat1="Infinite\Health",E96412B0 9B32
+Cheat1="Infinite\Health",810EBF58 42D8
 Cheat1_N=If you fall into Water just turn off the Infinite Health & put back on when you restrat.
-Cheat2="Infinite\99 Lives",E9641526 5C37
-Cheat3="Level Select Menu",E866751E 5F4A
-Cheat4="Have All\Keys",E96412B8 5959,E86412B7 5959,E96412B6 5959
-Cheat5="High Score",E96412A2 504F
-Cheat6="Max Bonus",E964151E 785F
+Cheat2="Infinite\99 Lives",810EC2D2 03E7
+Cheat3="Level Select Menu",801022CA 0EF0
+Cheat4="Have All\Keys",810EBF60 0001,800EBF61 0001,810EBF62 0001
+Cheat5="High Score",810EBF4E FFFF
+Cheat6="Max Bonus",810EC2CA 270F
--- a/Config/Cheats/Buck
+++ b/Config/Cheats/Buck
@ -1,9 +1,9 @@
 [D7C762B6-F83D9642-C:4A]
 Name=Buck Bumble (J)
-Cheat0="Have All\Guns & Infinite Ammo",E966744E 5959,50000B04 0000,110EB156 03E7
+Cheat0="Have All\Guns & Infinite Ammo",81101DFA 0001,50000B04 0000,810EB156 03E7
 Cheat0_N=Press C Left to receive all Guns
-Cheat1="Infinite\Health",E96408A0 9B32
+Cheat1="Infinite\Health",810EB148 42D8
 Cheat1_N=If you fall into Water just turn off the Infinite Health & put back on after.
-Cheat2="Infinite\99 Lives",E9640B18 5955
-Cheat3="Have All\Keys",E96408A8 5A59,E86408A6 5959
-Cheat4="Max Bonus",E9640B0E 785F
+Cheat2="Infinite\99 Lives",810EB4C0 0005
+Cheat3="Have All\Keys",810EB150 0101,800EB152 0001
+Cheat4="Max Bonus",810EB4BA 270F
--- a/Config/Cheats/Buck
+++ b/Config/Cheats/Buck
@ -1,11 +1,11 @@
 [85AE781A-C756F05D-C:45]
 Name=Buck Bumble (U)
-Cheat0="Have All\Guns & Infinite Ammo",E96352DE 5959,50000B04 0000,110E92E6 03E8
+Cheat0="Have All\Guns & Infinite Ammo",810FFF8A 0001,50000B04 0000,810E92E6 03E8
 Cheat0_N=Press C Left to receive all Guns
-Cheat1="Infinite\Health",E964E530 9B32
+Cheat1="Infinite\Health",810E92D8 42D8
 Cheat1_N=If you fall into Water just turn off the Infinite Health & put back on after.
-Cheat2="Infinite\99 Lives",E964E9A8 5955
-Cheat3="Have All\Keys",E964E538 5A59,E864E536 5959
-Cheat4="Max Bonus",E964E99E 785F
-Cheat5="Level Select",E96352E6 59??
-Cheat5_O=$59 Mission 1 Shock Strike,$5C Mission 2 Radar Run,$5B Mission 3 Return Fire,$56 Mission 4 The Sonar Tower,$55 Mission 5 Big Blips,$58 Mission 6 Short Fuse,$57 Mission 7 Outpost,$62 Mission 8 Sewer,$61 Mission 9 Clean Up,$64 Mission 10 Scramble Pylon,$63 Mission 11 Herding Research,$5E Mission 12 The Extractor,$5D Mission 13 Nuke Tower,$60 Mission 14 Mucus Storage,$5F Mission 15 Depot Attack,$6A Boss Mission Destroy Carrier Level,$69 Mission 16 Sterilization,$6C Mission 17 Scorpion Killer,$6B Mission 18 Core Nuke,$66 Mission 19 Gate Keeper,$65 Queen Mission
+Cheat2="Infinite\99 Lives",810E9650 0005
+Cheat3="Have All\Keys",810E92E0 0101,800E92E2 0001
+Cheat4="Max Bonus",810E964A 270F
+Cheat5="Level Select",810FFF92 00??
+Cheat5_O=$01 Mission 1 Shock Strike,$02 Mission 2 Radar Run,$03 Mission 3 Return Fire,$04 Mission 4 The Sonar Tower,$05 Mission 5 Big Blips,$06 Mission 6 Short Fuse,$07 Mission 7 Outpost,$08 Mission 8 Sewer,$09 Mission 9 Clean Up,$0A Mission 10 Scramble Pylon,$0B Mission 11 Herding Research,$0C Mission 12 The Extractor,$0D Mission 13 Nuke Tower,$0E Mission 14 Mucus Storage,$0F Mission 15 Depot Attack,$10 Boss Mission Destroy Carrier Level,$11 Mission 16 Sterilization,$12 Mission 17 Scorpion Killer,$13 Mission 18 Core Nuke,$14 Mission 19 Gate Keeper,$15 Queen Mission
--- a/Config/Cheats/Bust
+++ b/Config/Cheats/Bust
@ -1,18 +1,18 @@
 [4222D89F-AFE0B637-C:45]
-Name=Bust A Move '99 (U)
-Cheat0="Ceiling Never Drops\Player 1",E9642442 595A
-Cheat1="Ceiling Never Drops\Player 2",E9642132 595A
-Cheat2="Ceiling Never Drops\Player 3",E969DF9A 595A
-Cheat3="Ceiling Never Drops\Player 4",E969E0CC 595A
-Cheat4="Infinite Time To Set Pieces\Player 1",E9642184 595A
-Cheat5="Infinite Time To Set Pieces\Player 2",E9642274 595A
-Cheat6="Infinite Time To Set Pieces\Player 3",E969DFDC 595A
-Cheat7="Infinite Time To Set Pieces\Player 4",E969E08A 595A
-Cheat8="Always Gets Bubbles\Player 1",E86421AF 5957
-Cheat9="Never Gets Bubbles\Player 1",E86421AF 595A
-Cheat10="Always Gets Bubbles\Player 2",E864229F 5957
-Cheat11="Never Gets Bubbles\Player 2",E864229F 595A
-Cheat12="Always Gets Bubbles\Player 3",E869DF07 5957
-Cheat13="Never Gets Bubbles\Player 3",E869DF07 595A
-Cheat14="Always Gets Bubbles\Player 4",E869E0F7 5957
-Cheat15="Never Gets Bubbles\Player 4",E869E0F7 595A
+Name=Bust-A-Move '99 (U)
+Cheat0="Ceiling Never Drops\Player 1",810ECDEE 0000
+Cheat1="Ceiling Never Drops\Player 2",810ECEDE 0000
+Cheat2="Ceiling Never Drops\Player 3",81158846 0000
+Cheat3="Ceiling Never Drops\Player 4",81158974 0000
+Cheat4="Infinite Time To Set Pieces\Player 1",810ECE2C 0000
+Cheat5="Infinite Time To Set Pieces\Player 2",810ECF1C 0000
+Cheat6="Infinite Time To Set Pieces\Player 3",81158884 0000
+Cheat7="Infinite Time To Set Pieces\Player 4",81158936 0000
+Cheat8="Always Gets Bubbles\Player 1",800ECE59 0007
+Cheat9="Never Gets Bubbles\Player 1",800ECE59 0000
+Cheat10="Always Gets Bubbles\Player 2",800ECF49 0007
+Cheat11="Never Gets Bubbles\Player 2",800ECF49 0000
+Cheat12="Always Gets Bubbles\Player 3",801588B1 0007
+Cheat13="Never Gets Bubbles\Player 3",801588B1 0000
+Cheat14="Always Gets Bubbles\Player 4",801589A1 0007
+Cheat15="Never Gets Bubbles\Player 4",801589A1 0000
--- a/Config/Cheats/Bust-A-Move
+++ b/Config/Cheats/Bust-A-Move
@ -1,8 +1,8 @@
 [CEDCDE1E-513A0502-C:50]
 Name=Bust-A-Move 2 - Arcade Edition (E)
-Cheat0="Infinite Credit",E86858C7 594F
-Cheat1="Bubble Pointer Puzzle",E86E5A23 5959
-Cheat2="Bubble Pointer 1P V CPU",E86B3853 5959
-Cheat3="Access Another World",E96C2858 5959
+Cheat0="Infinite Credit",80120171 00FF
+Cheat1="Bubble Pointer Puzzle",801807CD 0001
+Cheat2="Bubble Pointer 1P V CPU",8017E1FD 0001
+Cheat3="Access Another World",8116D100 0001
 Cheat3_N=This is for Puzzle Mode
-Cheat4="Max Points Aid",E96B619E 761C
+Cheat4="Max Points Aid",81170E4A 25C2
--- a/Config/Cheats/Bust-A-Move
+++ b/Config/Cheats/Bust-A-Move
@ -1,9 +1,9 @@
 [8A86F073-CD45E54B-C:45]
 Name=Bust-A-Move 2 - Arcade Edition (U)
-Cheat0="Infinite Credits",E86858C7 5955
-Cheat1="Player 1\Always Gets Bubbles",E86B6887 5958
-Cheat2="Player 1\Never Gets Bubbles",E86B6887 595A
-Cheat3="Computer\Always Gets Bubbles",E86B8957 5958
-Cheat4="Computer\Never Gets Bubbles",E86B8957 595A
-Cheat5="Player 1\Infinite Time To Set Pieces",E96BFD54 595A
-Cheat6="Player 1\Screen Never Fills Over Time",E86B687B 5964
+Cheat0="Infinite Credits",80120171 0005
+Cheat1="Player 1\Always Gets Bubbles",80171131 0006
+Cheat2="Player 1\Never Gets Bubbles",80171131 0000
+Cheat3="Computer\Always Gets Bubbles",80173601 0006
+Cheat4="Computer\Never Gets Bubbles",80173601 0000
+Cheat5="Player 1\Infinite Time To Set Pieces",8117AAFC 0000
+Cheat6="Player 1\Screen Never Fills Over Time",80171125 000A
--- a/Config/Cheats/CONKER
+++ b/Config/Cheats/CONKER
@ -1,35 +0,0 @@
-[373F5889-9A6CA80A-C:50]
-Name=CONKER BFD
-Cheat0="Infinite\Health\Player 1",E8621F0E 5958
-Cheat1="Infinite\Oxygen",E8621AF6 5959
-Cheat2="Infinite\Pots of cash",E9617CBE 504F
-Cheat3="Access All\Chapters, Scenes,& Multi-Player Characters",50002401 0000,100EA120 00FF
-Cheat4="Play as",E8617CB1 59??
-Cheat4_N=Here you can Choose Options who you want to play as,But only one Option at a time.
-Cheat4_O=$59 Wessle,$5B Tedi,$56 Combat Squirrel,$55 Conker,$63 Uga,$5E Bald Caveman,$5D Caveman,$60 Mohican Caveman,$6A Neo Conker,$73 Villager,$79 Zombie,$7B Enemy Bat,$76 Conkers Bat,$75 Army Captain,$78 Tedi Boss,$77 Gregg,$82 Gregg skeleton
-Cheat5="Infinite\Lives Player 1",E8617CBC 59BB
-Cheat6="Infinite\Health\Player 2",E8621E3A 785F
-Cheat7="Infinite\Health\Player 3",E8622266 785F
-Cheat8="Infinite\Health\Player 4",E8622592 785F
-Cheat9="Infinite\Time In Multi",E95D58EE C65A
-Cheat10="Infinite\Bags In Heist",E864675C 594F
-Cheat11="Access All\Characters & Weapons In Multi Race",E964F876 ??4F
-Cheat11_O=$50 All Characters & Baseball bat,$54 All Characters & Frying Pan,$4C All Characters & Bones
-Cheat12="Infinite\Bombs",E876B03E 598A
-Cheat13="Infinite\Max Kills Player 1",E86462B9 5C37
-Cheat13_N=MULTI ONLY. Only put this code on once you are in the game
-Cheat14="Infinite\Accuracy Count Player 1",E86462D9 5959
-Cheat14_N=MULTI ONLY. Only put this code on once you are in the game,Once you pick up a Gun a shoot once, you will 100%.
-Cheat15="Infinite\Head Shot Count Player 1",E86462DD 59B6
-Cheat15_N=MULTI ONLY. Only put this code on once you are in the game
-Cheat16="Press L To Levitate\Player 1",D0042DA5 0020,E9621A68 9A23
-Cheat16_N=Press L Button to Levitate & Let go to come back down
-Cheat17="Press L To Levitate\Player 2",D0042DAE 0020,E9621D94 9A23
-Cheat17_N=Press L Button to Levitate & Let go to come back down
-Cheat18="Press L To Levitate\Player 3",D0042DB5 0020,E96224C0 9A23
-Cheat18_N=Press L Button to Levitate & Let go to come back down
-Cheat19="Press L To Levitate\Player 4",D0042DBE 0020,E96227EC 9A23
-Cheat19_N=Press L Button to Levitate & Let go to come back down
-Cheat20="Weapon Select In Multi (On Pick Up)",E86E639D 59??
-Cheat20_N=Select what Weapon you would like in Multi Player and then on a Weapon Pickup you will have the weapon of your choice.to change for another just Enable the one of your choice to have that instead.(you must have a weapon already to change for the next.
-Cheat20_O=$59 Sword,$5C Nothing,$5B Yellow Chain-Ssaw,$56 Throwing Knives,$55 Riffle,$58 Long Pistol with Sight,$57 Rocket Launcher,$62 Buck Shot,$64 High Powred Riffle With Scope,$5E Two Automatic Machine Guns,$6B Gas Mask
--- a/Config/Cheats/California
+++ b/Config/Cheats/California
@ -1,5 +1,5 @@
 [AC16400E-CF5D071A-C:45]
 Name=California Speed (U)
-Cheat0="Always Place 1st",E8697357 595A
-Cheat1="Have All\Tracks",E96CE2E4 504F
-Cheat2="Have All\Cars",50001504 0000,100AAE5B 0001
+Cheat0="Always Place 1st",80151C01 0000
+Cheat1="Have All\Tracks",81168F8C FFFF
+Cheat2="Have All\Cars",50001504 0000,800AAE5B 0001
--- a/Config/Cheats/CASTLEVANIA.cht
+++ b/Config/Cheats/CASTLEVANIA.cht
@ -1,24 +1,24 @@
 [64F1B7CA-71A23755-C:50]
-Name=CASTLEVANIA
-Cheat0="Infinite\Health",E98EF396 59B6
-Cheat1="Infinite\Throwing Weapon",E98EF3A4 59B6
-Cheat2="Throwing Weapon Modifier",E98EF39A 59??
-Cheat2_O=$5A Nothing,$59 Knives,$5C Exploding Potions,$5B Cross,$56 Axes
-Cheat3="Press L To Levitate",D0387D7F 0020,E9895F68 9023
-Cheat4="Have\All Items",50000501 0000,10389C4E 0001,50000301 0000,10389C55 0001,E88EF3B2 5959,E88EF3B1 5959,E88EF3B7 5959,50000E01 0000,10389C64 0001
-Cheat5="Have\Invincibility",E88A7E52 5963
-Cheat6="Infinite\Red Jewels",E88EF3A3 59B6
-Cheat7="Status",E88EF3E4 59??
-Cheat7_O=$59 Good,$62 Vamp,$69 Poison,$7C Good but depressed,$B8 Sto,$6F V+P
-Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,11389BD0 FFFF
-Cheat9="Infinite\Energy",E88EF385 59B6
-Cheat10="Infinite\Funds",E88EF39F 5959,E98EF39E D7EF
-Cheat11="Have\Exp Points",E88EF3A3 59BB
-Cheat12="Max Power Up",E88EF347 595C
-Cheat13="Never Get Poisoned",E98EF3E4 595A
+Name=Castlevania (E) (M3)
+Cheat0="Infinite\Health",81389C42 0064
+Cheat1="Infinite\Throwing Weapon",81389C4C 0064
+Cheat2="Throwing Weapon Modifier",81389C46 00??
+Cheat2_O=$00 Nothing,$01 Knives,$02 Exploding Potions,$03 Cross,$04 Axes
+Cheat3="Press L To Levitate",D0387D7F 0020,81350810 3FCB
+Cheat4="Have\All Items",50000501 0000,80389C4E 0001,50000301 0000,80389C55 0001,80389C5E 0001,80389C5F 0001,80389C61 0001,50000E01 0000,80389C64 0001
+Cheat5="Have\Invincibility",80342BFE 000B
+Cheat6="Infinite\Red Jewels",80389C4D 0064
+Cheat7="Status",80389C8C 00??
+Cheat7_O=$01 Good,$08 Vamp,$11 Poison,$22 Good but depressed,$66 Sto,$1F V+P
+Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,81389BD0 FFFF
+Cheat9="Infinite\Energy",80389C33 0064
+Cheat10="Infinite\Funds",80389C49 0001,81389C4A 869F
+Cheat11="Have\Exp Points",80389C4D 0063
+Cheat12="Max Power Up",80389CF1 0002
+Cheat13="Never Get Poisoned",81389C8C 0000
 Cheat14="Level Select",89389C94 ????,89389C91 0000
 Cheat14_N=You must use this code on a saved game, because the intro to the first level will mess up the game. Now select the saved game, and hold down the F9 button until the level loads. Some of the boss stages will not let you fight the boss unless you re-enter the area. Also, with the part of stage modifier, the second code modifies the part of the level that you are in, and 0000 is the level's start.
 Cheat14_O=$595A Forest of Silence,$595C Castle Wall,$595B Villa,$5956 Inside Villa,$5958 Garden Maze,$5957 Tunnel,$5962 Underground Waterway,$5961 Castle Center,$596A Tower of Execution,$5969 - Tower of Sorcery,$596C - Tower of Science,$596B - Duel Tower,$5966 - Fight With Death/Actrise,$5965 - Castle Keep,$5968 - Intro (Glitch),$5967 - Clock Tower,$5972 - Final Dracula,$5974 - Fight With Maze Boss,$5973 - Room of Clocks,$596E - ??,$596D - ??
-Cheat15="Switch From",E88EF397 59??
+Cheat15="Switch From",80389C41 00??
 Cheat15_N=This Switch From Cheat lets you switch characters on a saved game For example, if you are Reindhart and you want to be Carrie in the middle of your game save it and then enable this Cheat and press F1. when you start your saved game back up you'll be Carrie instead of Reindhart.
-Cheat15_O=$5A Carrie to Reindhart,$59 Reindhart to Carrie
+Cheat15_O=$00 Carrie to Reindhart,$01 Reindhart to Carrie
--- a/Config/Cheats/Castlevania
+++ b/Config/Cheats/Castlevania
@ -1,24 +1,24 @@
 [F35D5F95-8AFE3D69-C:45]
 Name=Castlevania (U) (V1.0)
-Cheat0="Infinite\Health",E98EF392 59B6
-Cheat1="Infinite\Throwing Weapon",E98EF3A0 59B6
-Cheat2="Throwing Weapon Modifier",E98EF396 59??
-Cheat2_O=$5A Nothing,$59 Knives,$5C Exploding Potions,$5B Cross,$56 Axes
-Cheat3="Press L To Levitate",D0387D7F 0020,E9895F68 9023
-Cheat4="Have\All Items",50000501 0000,10389C4A 0001,50000301 0000,10389C51 0001,E88EF3AE 5959,E88EF3AD 5959,E88EF3B3 5959,50000E01 0000,10389C60 0001
-Cheat5="Have\Invincibility",E88A7E52 5963
-Cheat6="Infinite\Red Jewels",E88EF39F 59BB
-Cheat7="Status",E88EF3E0 59??
-Cheat7_O=$59 Good,$62 Vamp,$69 Poison,$7C Good but depressed,$B8 Sto,$6F V+P
-Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,11389BD0 FFFF
-Cheat9="Infinite\Energy",E88EF391 59B6
-Cheat10="Infinite\Funds",E88EF39B 5959,E98EF39A D7EF
-Cheat11="Have\Exp Points",E88EF39F 59BB
-Cheat12="Max Power Up",E88EF343 595C
-Cheat13="Never Get Poisoned",E98EF3E0 595A
+Cheat0="Infinite\Health",81389C3E 0064
+Cheat1="Infinite\Throwing Weapon",81389C48 0064
+Cheat2="Throwing Weapon Modifier",81389C42 00??
+Cheat2_O=$00 Nothing,$01 Knives,$02 Exploding Potions,$03 Cross,$04 Axes
+Cheat3="Press L To Levitate",D0387D7F 0020,81350810 3FCB
+Cheat4="Have\All Items",50000501 0000,80389C4A 0001,50000301 0000,80389C51 0001,80389C5A 0001,80389C5B 0001,80389C5D 0001,50000E01 0000,80389C60 0001
+Cheat5="Have\Invincibility",80342BFE 000B
+Cheat6="Infinite\Red Jewels",80389C49 0063
+Cheat7="Status",80389C88 00??
+Cheat7_O=$01 Good,$08 Vamp,$11 Poison,$22 Good but depressed,$66 Sto,$1F V+P
+Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,81389BD0 FFFF
+Cheat9="Infinite\Energy",80389C3F 0064
+Cheat10="Infinite\Funds",80389C45 0001,81389C46 869F
+Cheat11="Have\Exp Points",80389C49 0063
+Cheat12="Max Power Up",80389CED 0002
+Cheat13="Never Get Poisoned",81389C88 0000
 Cheat14="Level Select",89389C90 ????,89389C92 0000
 Cheat14_N=You must use this code on a saved game, because the intro to the first level will mess up the game. Now select the saved game, and hold down the F9 button until the level loads. Some of the boss stages will not let you fight the boss unless you re-enter the area. Also, with the part of stage modifier, the second code modifies the part of the level that you are in, and 0000 is the level's start.
 Cheat14_O=$595A Forest of Silence,$595C Castle Wall,$595B Villa,$5956 Inside Villa,$5958 Garden Maze,$5957 Tunnel,$5962 Underground Waterway,$5961 Castle Center,$596A Tower of Execution,$5969 - Tower of Sorcery,$596C - Tower of Science,$596B - Duel Tower,$5966 - Fight With Death/Actrise,$5965 - Castle Keep,$5968 - Intro (Glitch),$5967 - Clock Tower,$5972 - Final Dracula,$5974 - Fight With Maze Boss,$5973 - Room of Clocks,$596E - ??,$596D - ??
-Cheat15="Switch From",E88EF393 59??
+Cheat15="Switch From",80389C3D 00??
 Cheat15_N=This Switch From Cheat lets you switch characters on a saved game For example, if you are Reindhart and you want to be Carrie in the middle of your game save it and then enable this Cheat and press F1. when you start your saved game back up you'll be Carrie instead of Reindhart.
-Cheat15_O=$5A Carrie to Reindhart,$59 Reindhart to Carrie
+Cheat15_O=$00 Carrie to Reindhart,$01 Reindhart to Carrie
--- a/Config/Cheats/Castlevania
+++ b/Config/Cheats/Castlevania
@ -1,24 +1,24 @@
 [F35D5335-B7667CB7-C:45]
 Name=Castlevania (U) (V1.1)
-Cheat0="Infinite\Health",E98EF392 59B6
-Cheat1="Infinite\Throwing Weapon",E98EF3A0 59B6
-Cheat2="Throwing Weapon Modifier",E98EF396 59??
-Cheat2_O=$5A Nothing,$59 Knives,$5C Exploding Potions,$5B Cross,$56 Axes
-Cheat3="Press L To Levitate",D0387D7F 0020,E9895F68 9023
-Cheat4="Have\All Items",50000501 0000,10389C4A 0001,50000301 0000,10389C51 0001,E88EF3AE 5959,E88EF3AD 5959,E88EF3B3 5959,50000E01 0000,10389C60 0001
-Cheat5="Have\Invincibility",E88A7E52 5963
-Cheat6="Infinite\Red Jewels",E88EF39F 59BB
-Cheat7="Status",E88EF3E0 59??
-Cheat7_O=$59 Good,$62 Vamp,$69 Poison,$7C Good but depressed,$B8 Sto,$6F V+P
-Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,11389BD0 FFFF
-Cheat9="Infinite\Energy",E88EF391 59B6
-Cheat10="Infinite\Funds",E88EF39B 5959,E98EF39A D7EF
-Cheat11="Have\Exp Points",E88EF39F 59BB
-Cheat12="Max Power Up",E88EF343 595C
-Cheat13="Never Get Poisoned",E98EF3E0 595A
+Cheat0="Infinite\Health",81389C3E 0064
+Cheat1="Infinite\Throwing Weapon",81389C48 0064
+Cheat2="Throwing Weapon Modifier",81389C42 00??
+Cheat2_O=$00 Nothing,$01 Knives,$02 Exploding Potions,$03 Cross,$04 Axes
+Cheat3="Press L To Levitate",D0387D7F 0020,81350810 3FCB
+Cheat4="Have\All Items",50000501 0000,80389C4A 0001,50000301 0000,80389C51 0001,80389C5A 0001,80389C5B 0001,80389C5D 0001,50000E01 0000,80389C60 0001
+Cheat5="Have\Invincibility",80342BFE 000B
+Cheat6="Infinite\Red Jewels",80389C49 0063
+Cheat7="Status",80389C88 00??
+Cheat7_O=$01 Good,$08 Vamp,$11 Poison,$22 Good but depressed,$66 Sto,$1F V+P
+Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,81389BD0 FFFF
+Cheat9="Infinite\Energy",80389C3F 0064
+Cheat10="Infinite\Funds",80389C45 0001,81389C46 869F
+Cheat11="Have\Exp Points",80389C49 0063
+Cheat12="Max Power Up",80389CED 0002
+Cheat13="Never Get Poisoned",81389C88 0000
 Cheat14="Level Select",89389C90 ????,89389C92 0000
 Cheat14_N=You must use this code on a saved game, because the intro to the first level will mess up the game. Now select the saved game, and hold down the F9 button until the level loads. Some of the boss stages will not let you fight the boss unless you re-enter the area. Also, with the part of stage modifier, the second code modifies the part of the level that you are in, and 0000 is the level's start.
 Cheat14_O=$595A Forest of Silence,$595C Castle Wall,$595B Villa,$5956 Inside Villa,$5958 Garden Maze,$5957 Tunnel,$5962 Underground Waterway,$5961 Castle Center,$596A Tower of Execution,$5969 - Tower of Sorcery,$596C - Tower of Science,$596B - Duel Tower,$5966 - Fight With Death/Actrise,$5965 - Castle Keep,$5968 - Intro (Glitch),$5967 - Clock Tower,$5972 - Final Dracula,$5974 - Fight With Maze Boss,$5973 - Room of Clocks,$596E - ??,$596D - ??
-Cheat15="Switch From",E88EF393 59??
+Cheat15="Switch From",80389C3D 00??
 Cheat15_N=This Switch From Cheat lets you switch characters on a saved game For example, if you are Reindhart and you want to be Carrie in the middle of your game save it and then enable this Cheat and press F1. when you start your saved game back up you'll be Carrie instead of Reindhart.
-Cheat15_O=$5A Carrie to Reindhart,$59 Reindhart to Carrie
+Cheat15_O=$00 Carrie to Reindhart,$01 Reindhart to Carrie
--- a/Config/Cheats/Castlevania
+++ b/Config/Cheats/Castlevania
@ -1,24 +1,24 @@
 [4BCDFF47-AAA3AF8F-C:45]
 Name=Castlevania (U) (V1.2)
-Cheat0="Infinite\Health",E98EF392 59B6
-Cheat1="Infinite\Throwing Weapon",E98EF3A0 59B6
-Cheat2="Throwing Weapon Modifier",E98EF396 59??
-Cheat2_O=$5A Nothing,$59 Knives,$5C Exploding Potions,$5B Cross,$56 Axes
-Cheat3="Press L To Levitate",D0387D7F 0020,E9895F68 9023
-Cheat4="Have\All Items",50000501 0000,10389C4A 0001,50000301 0000,10389C51 0001,E88EF3AE 5959,E88EF3AD 5959,E88EF3B3 5959,50000E01 0000,10389C60 0001
-Cheat5="Have\Invincibility",E88A7E52 5963
-Cheat6="Infinite\Red Jewels",E88EF39F 59BB
-Cheat7="Status",E88EF3E0 59??
-Cheat7_O=$59 Good,$62 Vamp,$69 Poison,$7C Good but depressed,$B8 Sto,$6F V+P
-Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,11389BD0 FFFF
-Cheat9="Infinite\Energy",E88EF391 59B6
-Cheat10="Infinite\Funds",E88EF39B 5959,E98EF39A D7EF
-Cheat11="Have\Exp Points",E88EF39F 59BB
-Cheat12="Max Power Up",E88EF343 595C
-Cheat13="Never Get Poisoned",E98EF3E0 595A
+Cheat0="Infinite\Health",81389C3E 0064
+Cheat1="Infinite\Throwing Weapon",81389C48 0064
+Cheat2="Throwing Weapon Modifier",81389C42 00??
+Cheat2_O=$00 Nothing,$01 Knives,$02 Exploding Potions,$03 Cross,$04 Axes
+Cheat3="Press L To Levitate",D0387D7F 0020,81350810 3FCB
+Cheat4="Have\All Items",50000501 0000,80389C4A 0001,50000301 0000,80389C51 0001,80389C5A 0001,80389C5B 0001,80389C5D 0001,50000E01 0000,80389C60 0001
+Cheat5="Have\Invincibility",80342BFE 000B
+Cheat6="Infinite\Red Jewels",80389C49 0063
+Cheat7="Status",80389C88 00??
+Cheat7_O=$01 Good,$08 Vamp,$11 Poison,$22 Good but depressed,$66 Sto,$1F V+P
+Cheat8="Open All Doors and Gates,No Bosses",50002A02 0000,81389BD0 FFFF
+Cheat9="Infinite\Energy",80389C3F 0064
+Cheat10="Infinite\Funds",80389C45 0001,81389C46 869F
+Cheat11="Have\Exp Points",80389C49 0063
+Cheat12="Max Power Up",80389CED 0002
+Cheat13="Never Get Poisoned",81389C88 0000
 Cheat14="Level Select",89389C90 ????,89389C92 0000
 Cheat14_N=You must use this code on a saved game, because the intro to the first level will mess up the game. Now select the saved game, and hold down the F9 button until the level loads. Some of the boss stages will not let you fight the boss unless you re-enter the area. Also, with the part of stage modifier, the second code modifies the part of the level that you are in, and 0000 is the level's start.
 Cheat14_O=$595A Forest of Silence,$595C Castle Wall,$595B Villa,$5956 Inside Villa,$5958 Garden Maze,$5957 Tunnel,$5962 Underground Waterway,$5961 Castle Center,$596A Tower of Execution,$5969 - Tower of Sorcery,$596C - Tower of Science,$596B - Duel Tower,$5966 - Fight With Death/Actrise,$5965 - Castle Keep,$5968 - Intro (Glitch),$5967 - Clock Tower,$5972 - Final Dracula,$5974 - Fight With Maze Boss,$5973 - Room of Clocks,$596E - ??,$596D - ??
-Cheat15="Switch From",E88EF393 59??
+Cheat15="Switch From",80389C3D 00??
 Cheat15_N=This Switch From Cheat lets you switch characters on a saved game For example, if you are Reindhart and you want to be Carrie in the middle of your game save it and then enable this Cheat and press F1. when you start your saved game back up you'll be Carrie instead of Reindhart.
-Cheat15_O=$5A Carrie to Reindhart,$59 Reindhart to Carrie
+Cheat15_O=$00 Carrie to Reindhart,$01 Reindhart to Carrie
--- a/Config/Cheats/Castlevania
+++ b/Config/Cheats/Castlevania
@ -1,53 +1,53 @@
 [A2C54BE7-6719CBB2-C:50]
-Name=Castlevania - Legacy of Darkness (E)
-Cheat0="Keys Option\Have Clocktower Key B",E8721798 5959
-Cheat1="Keys Option\Have Clocktower Key A",E8721791 5959
-Cheat2="Keys Option\Have Clocktower Key E",E8721792 5959
-Cheat3="Keys Option\Have Wall key",E8721793 5959
-Cheat4="Keys Option\Have Control Room Key",E8721794 5959
-Cheat5="Keys Option\Have Art Tower Key 2",E872178D 5959
-Cheat6="Keys Option\Have Art Tower Key 1",E872178E 5959
-Cheat7="Keys Option\Have Clocktower Key D",E872178F 5959
-Cheat8="Keys Option\Have Clocktower Key C",E8721790 5959
-Cheat9="Keys Option\Have Thorn Key",E8721789 5959
-Cheat10="Keys Option\Have Rose Garden Key",E872176E 5959
-Cheat11="Keys Option\Have Deck Key",E872178B 5959
-Cheat12="Keys Option\Have Execution Key",E872178C 5959
-Cheat13="Keys Option\Have Chamber Key",E8721785 5959
-Cheat14="Keys Option\Have Copper Key",E8721786 5959
-Cheat15="Keys Option\Have Garden Key",E8721787 5959
-Cheat16="Keys Option\Have Storeroom Key",E8721788 5959
-Cheat17="Keys Option\Have Left Tower Key",E8721781 5959
-Cheat18="Keys Option\Have Archives Key",E8721782 5959
-Cheat19="Have Options\Rose Brooch",E8721783 5959
-Cheat20="Have Options\Crest Half B",E8721784 5959
-Cheat21="Have Options\Crest Half A",E872177D 5959
-Cheat22="Have Options\Oldreys Diary",E872177E 5959
-Cheat23="Have Options\Winch lever",E872177F 5959
-Cheat24="Infinite Options\Moon Cards",E8721780 5959
-Cheat25="Infinite Options\Sun Cards",E8721779 5959
-Cheat26="Have Options\Mandragora",E872177A 5959
-Cheat27="Have Options\Magical Nitro",E872177B 5959
-Cheat28="Have Options\Contract",E872177C 5959
-Cheat29="Have Options\Powerup",E8721771 5959
-Cheat30="Infinite Options\Cure Ampoule",E8721772 5959
-Cheat31="Infinite Options\Purifying",E8721773 5959
-Cheat32="Infinite Options\Healing kit",E8721774 5959
-Cheat33="Infinite Options\beef",E872176D 5959
-Cheat34="Infinite Options\chicken",E872176E 5959
-Cheat35="Have Options\Special Crystal 3",E872176F 5959
-Cheat36="Have Options\Special Crystal 2",E8721770 5959
-Cheat37="Have Options\Special Crystal 1",E8721769 5959
-Cheat38="Infinite Options\Red Jewels",E872176B 59C2
-Cheat39="Infinite Options\Gold",E9721766 786A
-Cheat40="Infinite Options\Health",E972175E 786A
-Cheat41="Weapon Modifier",E8721761 59??
-Cheat41_O=$5A Nothing,$59 Knife,$5C Potion,$5B Cross,$56 Axe
-Cheat42="Status Modifier",E87217AC 59??
-Cheat42_O=$5A Never Get Poisoned or Vamped,$59 Normal,$56 Vamp,$62 Poison,$5E Vamped & Poisoned,$4F Instant Death
-Cheat43="Level Modifier",E872169F 59??
-Cheat43_O=$5A Forest Of Silence,$59 Left Tower,$5C Castle Wall,$5B Villa,$56 Villa,$55 Villa,$58 Villa,$74 Villa,$57 Tunnel,$62 Underground Waterway,$61 Castle Center,$64 Castle Center,$63 Castle Center,$5E Castle Center,$5D Castle Center,$60 Castle Center,$5F Castle Center,$6A Foggy Lake,$69 Foggy Lake,$6C Foggy Lake,$6B Cave Of Spiderwomen,$66 Castle Keep,$65 Castle Keep,$68 Falls Into Space(?),$67 Clock Tower,$72 Final Battle Site,$71 Castle Center,$73 Room Of Clocks,$6E Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$83 Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$6D Tower Of Sorcery,$70 Tower Of Execution,$6F Tower Of Execution,$7A Tower Of Execution,$79 Tower Of Science,$7C Tower Of Science,$7B Tower Of Ruins,$76 Tower Of Ruins,$75 Art Tower,$78 Art Tower,$77 Dual Tower,$82 Clock Tower,$81 Clock Tower,$84 Outer Wall,$7E Fall From Sky Ouside Of Castlevania Opening,$7D Another Free Fall. Forest Where Girl Runs In Opening,$80 Black Room(?)
-Cheat44="Inter-Level Modifier",E872169D 59??
-Cheat44_O=$5A Forest Of Silence,$59 Left Tower,$5C Castle Wall,$5B Villa,$56 Villa,$55 Villa,$58 Villa,$74 Villa,$57 Tunnel,$62 Underground Waterway,$61 Castle Center,$64 Castle Center,$63 Castle Center,$5E Castle Center,$5D Castle Center,$60 Castle Center,$5F Castle Center,$6A Foggy Lake,$69 Foggy Lake,$6C Foggy Lake,$6B Cave Of Spiderwomen,$66 Castle Keep,$65 Castle Keep,$68 Falls Into Space(?),$67 Clock Tower,$72 Final Battle Site,$71 Castle Center,$73 Room Of Clocks,$6E Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$83 Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$6D Tower Of Sorcery,$70 Tower Of Execution,$6F Tower Of Execution,$7A Tower Of Execution,$79 Tower Of Science,$7C Tower Of Science,$7B Tower Of Ruins,$76 Tower Of Ruins,$75 Art Tower,$78 Art Tower,$77 Dual Tower,$82 Clock Tower,$81 Clock Tower,$84 Outer Wall,$7E Fall From Sky Ouside Of Castlevania Opening,$7D Another Free Fall. Forest Where Girl Runs In Opening,$80 Black Room(?)
-Cheat45="Cut Scene Modifier",E87216B5 5961,E87216AD 59??
-Cheat45_O=$5B Castle Drawbridge Lowers,$56 Character Enters Castle,$55 (?),$64 (?),$5E (?),$7A (?),$79 (?),$7C (?),$58 Vampire In Main Entrance Hall Of Villa,$57 One Of The Working Gears Cut Scenes,$62 "I Smell Poison" From Underground Waterway,$61 Castle Gate Closes In Villa Upon Entering Villa,$63 Renon Appears For First Time,$5D Village Vampire In Upstairs Villa,$60 Malus Appears For The First Time,$5F Malus Leaves Garden,$6A Character In Boat On Foggy Lake,$69 Seal Removed From Wall In Arena,$6C Bleeding Statue,$6B Cosmic Lights,$66 Explosion At Wall In Arena,$65 Explosion At Wall In Castle That Leads To Hidden Room,$68 Malus Appears Again In Upstairs Room Of Castle,$67 Bull Awakens,$72 Vincent The Vampire,$71 One Of The Working Gears Cut Scenes,$74 Gate Opens In Forest Of Silence,$73 Meet Renon For The Last Time In Castle Keep.,$6E This Cut Scene Runs Cut Scene 27 And 2E,$70 Castle Keep Destructs,$6F Malus On Flying Horse Outside Castle Keep,$76 Spider People In Tunnel,$75 Rosa In Garden,$77 Castel Destruction,$82 Space Warp,$81 Castle Destruction,$84 Malus Is Saved By Reinhardt,$83 Malus And Reinhardt On Horse,$80 Rosa Returns,$8A Ada Henry And Cornell At Game End,$89 Scrolling Text About Castle And Henry,$8B Vampire In Basement,$86 Vampire In Villa Basement Destroyed Woman Vampire Rises,$85 Finds Hidden Path In Villa Basement,$87 Lever & Gear In Castle,$92 Harpie,$91 Harpie Destroyed,$96 Death(Grim Reaper),$95 Death Is Destroyed,$98 Castle Drawbridge Closes And Ortega Appears,$97 Thirsty Man,$A2 Cornell Meets Henry In Garden,$A1 Cornell And Henry Part In Garden,$A9 Monster Dracula Appears,$AC Actrise Appears In Castle Center,$A6 Actrise Appears Again With Cousin Fernandes Before Fight With Carrie,$A5 Cousin Fernandes Is Destroyed,$A8 Actrise Appears Again Before Fight With Carrie,$A7 Actrise Defeated By Carrie
+Name=Castlevania - Legacy of Darkness (E) (M3)
+Cheat0="Keys Option\Have Clocktower Key B",801CC040 0001
+Cheat1="Keys Option\Have Clocktower Key A",801CC03F 0001
+Cheat2="Keys Option\Have Clocktower Key E",801CC03E 0001
+Cheat3="Keys Option\Have Wall key",801CC03D 0001
+Cheat4="Keys Option\Have Control Room Key",801CC03C 0001
+Cheat5="Keys Option\Have Art Tower Key 2",801CC03B 0001
+Cheat6="Keys Option\Have Art Tower Key 1",801CC03A 0001
+Cheat7="Keys Option\Have Clocktower Key D",801CC039 0001
+Cheat8="Keys Option\Have Clocktower Key C",801CC038 0001
+Cheat9="Keys Option\Have Thorn Key",801CC037 0001
+Cheat10="Keys Option\Have Rose Garden Key",801CC01A 0001
+Cheat11="Keys Option\Have Deck Key",801CC035 0001
+Cheat12="Keys Option\Have Execution Key",801CC034 0001
+Cheat13="Keys Option\Have Chamber Key",801CC033 0001
+Cheat14="Keys Option\Have Copper Key",801CC032 0001
+Cheat15="Keys Option\Have Garden Key",801CC031 0001
+Cheat16="Keys Option\Have Storeroom Key",801CC030 0001
+Cheat17="Keys Option\Have Left Tower Key",801CC02F 0001
+Cheat18="Keys Option\Have Archives Key",801CC02E 0001
+Cheat19="Have Options\Rose Brooch",801CC02D 0001
+Cheat20="Have Options\Crest Half B",801CC02C 0001
+Cheat21="Have Options\Crest Half A",801CC02B 0001
+Cheat22="Have Options\Oldreys Diary",801CC02A 0001
+Cheat23="Have Options\Winch lever",801CC029 0001
+Cheat24="Infinite Options\Moon Cards",801CC028 0001
+Cheat25="Infinite Options\Sun Cards",801CC027 0001
+Cheat26="Have Options\Mandragora",801CC026 0001
+Cheat27="Have Options\Magical Nitro",801CC025 0001
+Cheat28="Have Options\Contract",801CC024 0001
+Cheat29="Have Options\Powerup",801CC01F 0001
+Cheat30="Infinite Options\Cure Ampoule",801CC01E 0001
+Cheat31="Infinite Options\Purifying",801CC01D 0001
+Cheat32="Infinite Options\Healing kit",801CC01C 0001
+Cheat33="Infinite Options\beef",801CC01B 0001
+Cheat34="Infinite Options\chicken",801CC01A 0001
+Cheat35="Have Options\Special Crystal 3",801CC019 0001
+Cheat36="Have Options\Special Crystal 2",801CC018 0001
+Cheat37="Have Options\Special Crystal 1",801CC017 0001
+Cheat38="Infinite Options\Red Jewels",801CC015 0068
+Cheat39="Infinite Options\Gold",811CC012 2710
+Cheat40="Infinite Options\Health",811CC00A 2710
+Cheat41="Weapon Modifier",801CC00F 00??
+Cheat41_O=$00 Nothing,$01 Knife,$02 Potion,$03 Cross,$04 Axe
+Cheat42="Status Modifier",801CC054 00??
+Cheat42_O=$00 Never Get Poisoned or Vamped,$01 Normal,$04 Vamp,$08 Poison,$0C Vamped & Poisoned,$FF Instant Death
+Cheat43="Level Modifier",801CC349 00??
+Cheat43_O=$00 Forest Of Silence,$01 Left Tower,$02 Castle Wall,$03 Villa,$04 Villa,$05 Villa,$06 Villa,$1A Villa,$07 Tunnel,$08 Underground Waterway,$09 Castle Center,$0A Castle Center,$0B Castle Center,$0C Castle Center,$0D Castle Center,$0E Castle Center,$0F Castle Center,$10 Foggy Lake,$11 Foggy Lake,$12 Foggy Lake,$13 Cave Of Spiderwomen,$14 Castle Keep,$15 Castle Keep,$16 Falls Into Space(?),$17 Clock Tower,$18 Final Battle Site,$19 Castle Center,$1B Room Of Clocks,$1C Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$2B Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$1D Tower Of Sorcery,$1E Tower Of Execution,$1F Tower Of Execution,$20 Tower Of Execution,$21 Tower Of Science,$22 Tower Of Science,$23 Tower Of Ruins,$24 Tower Of Ruins,$25 Art Tower,$26 Art Tower,$27 Dual Tower,$28 Clock Tower,$29 Clock Tower,$2A Outer Wall,$2C Fall From Sky Ouside Of Castlevania Opening,$2D Another Free Fall. Forest Where Girl Runs In Opening,$2E Black Room(?)
+Cheat44="Inter-Level Modifier",801CC34B 00??
+Cheat44_O=$00 Forest Of Silence,$01 Left Tower,$02 Castle Wall,$03 Villa,$04 Villa,$05 Villa,$06 Villa,$1A Villa,$07 Tunnel,$08 Underground Waterway,$09 Castle Center,$0A Castle Center,$0B Castle Center,$0C Castle Center,$0D Castle Center,$0E Castle Center,$0F Castle Center,$10 Foggy Lake,$11 Foggy Lake,$12 Foggy Lake,$13 Cave Of Spiderwomen,$14 Castle Keep,$15 Castle Keep,$16 Falls Into Space(?),$17 Clock Tower,$18 Final Battle Site,$19 Castle Center,$1B Room Of Clocks,$1C Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$2B Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$1D Tower Of Sorcery,$1E Tower Of Execution,$1F Tower Of Execution,$20 Tower Of Execution,$21 Tower Of Science,$22 Tower Of Science,$23 Tower Of Ruins,$24 Tower Of Ruins,$25 Art Tower,$26 Art Tower,$27 Dual Tower,$28 Clock Tower,$29 Clock Tower,$2A Outer Wall,$2C Fall From Sky Ouside Of Castlevania Opening,$2D Another Free Fall. Forest Where Girl Runs In Opening,$2E Black Room(?)
+Cheat45="Cut Scene Modifier",801CC363 0009,801CC35B 00??
+Cheat45_O=$03 Castle Drawbridge Lowers,$04 Character Enters Castle,$05 (?),$0A (?),$0C (?),$20 (?),$21 (?),$22 (?),$06 Vampire In Main Entrance Hall Of Villa,$07 One Of The Working Gears Cut Scenes,$08 "I Smell Poison" From Underground Waterway,$09 Castle Gate Closes In Villa Upon Entering Villa,$0B Renon Appears For First Time,$0D Village Vampire In Upstairs Villa,$0E Malus Appears For The First Time,$0F Malus Leaves Garden,$10 Character In Boat On Foggy Lake,$11 Seal Removed From Wall In Arena,$12 Bleeding Statue,$13 Cosmic Lights,$14 Explosion At Wall In Arena,$15 Explosion At Wall In Castle That Leads To Hidden Room,$16 Malus Appears Again In Upstairs Room Of Castle,$17 Bull Awakens,$18 Vincent The Vampire,$19 One Of The Working Gears Cut Scenes,$1A Gate Opens In Forest Of Silence,$1B Meet Renon For The Last Time In Castle Keep.,$1C This Cut Scene Runs Cut Scene 27 And 2E,$1E Castle Keep Destructs,$1F Malus On Flying Horse Outside Castle Keep,$24 Spider People In Tunnel,$25 Rosa In Garden,$27 Castel Destruction,$28 Space Warp,$29 Castle Destruction,$2A Malus Is Saved By Reinhardt,$2B Malus And Reinhardt On Horse,$2E Rosa Returns,$30 Ada Henry And Cornell At Game End,$31 Scrolling Text About Castle And Henry,$33 Vampire In Basement,$34 Vampire In Villa Basement Destroyed Woman Vampire Rises,$35 Finds Hidden Path In Villa Basement,$37 Lever & Gear In Castle,$38 Harpie,$39 Harpie Destroyed,$44 Death(Grim Reaper),$45 Death Is Destroyed,$46 Castle Drawbridge Closes And Ortega Appears,$47 Thirsty Man,$48 Cornell Meets Henry In Garden,$49 Cornell And Henry Part In Garden,$51 Monster Dracula Appears,$52 Actrise Appears In Castle Center,$54 Actrise Appears Again With Cousin Fernandes Before Fight With Carrie,$55 Cousin Fernandes Is Destroyed,$56 Actrise Appears Again Before Fight With Carrie,$57 Actrise Defeated By Carrie
--- a/Config/Cheats/Castlevania
+++ b/Config/Cheats/Castlevania
@ -1,74 +1,74 @@
 [1CC06338-87388926-C:45]
 Name=Castlevania - Legacy of Darkness (U)
-Cheat0="Infinite\Keys\Clocktower A",E872FEC1 5964
-Cheat1="Infinite\Keys\Clocktower B",E872FEC8 5964
-Cheat2="Infinite\Keys\Storeroom",E872FEB8 5964
-Cheat3="Infinite\Keys\Garden",E872FEB7 5964
-Cheat4="Infinite\Keys\Copper",E872FEB6 5964
-Cheat5="Infinite\Keys\Chamber",E872FEB5 5964
-Cheat6="Infinite\Keys\Execution",E872FEBC 5964
-Cheat7="Infinite\Keys\Deck",E872FEBB 5964
-Cheat8="Infinite\Keys\Rose Garden",E872FEBA 5964
-Cheat9="Infinite\Keys\Thorn",E872FEB9 5964
-Cheat10="Infinite\Keys\Clocktower C",E872FEC0 5964
-Cheat11="Infinite\Keys\Clocktower D",E872FEBF 5964
-Cheat12="Infinite\Keys\Art Tower 1",E872FEBE 5964
-Cheat13="Infinite\Keys\Art Tower 2",E872FEBD 5964
-Cheat14="Infinite\Keys\Control Room",E872FEC4 5964
-Cheat15="Infinite\Keys\Wall",E872FEC3 5964
-Cheat16="Infinite\Keys\Clocktower E",E872FEC2 5964
-Cheat17="Infinite\Keys\Archives",E872FEB2 5964
-Cheat18="Infinite\Keys\Left Tower",E872FEB1 5964
-Cheat19="Infinite\Health",E972FE8E 786A
-Cheat20="Infinite\Gold",E972FE96 786A
-Cheat21="Infinite\Specials\Special 1",E872FE99 5964
-Cheat22="Infinite\Specials\Special 2",E872FEA0 5964
-Cheat23="Infinite\Specials\Special 3",E872FE9F 5964
-Cheat24="Infinite\Items\Roast Chicken",E872FE9E 5964
-Cheat25="Infinite\Items\Roast Beef",E872FE9D 5964
-Cheat26="Infinite\Items\Healing Kit",E872FEA4 5964
-Cheat27="Infinite\Items\Purifying",E872FEA3 5964
-Cheat28="Infinite\Items\Cure Ampoule",E872FEA2 5964
-Cheat29="Infinite\Items\Powerup",E872FEA1 5964
-Cheat30="Infinite\Items\The Contract",E872FEAC 5964
-Cheat31="Infinite\Items\Magical Nitro",E872FEAB 5964
-Cheat32="Infinite\Items\Mandragora",E872FEAA 5964
-Cheat33="Infinite\Items\Sun Card",E872FEA9 5964
-Cheat34="Infinite\Items\Moon Card",E872FEB0 5964
-Cheat35="Infinite\Items\Winch Lever",E872FEAF 5964
-Cheat36="Infinite\Items\Oldrey's Diary",E872FEAE 5964
-Cheat37="Infinite\Items\Crest Half A",E872FEAD 5964
-Cheat38="Infinite\Items\Crest Half B",E872FEB4 5964
-Cheat39="Infinite\Items\Rose Brooch",E872FEB3 5964
-Cheat40="Infinite\Items\Throwing Weapons",E872FE9B 59B6
-Cheat41="Infinite\Items\Red Jewels",E872FE9B 59C2
-Cheat42="Infinite\Bullets",E87194F5 5958
+Cheat0="Infinite\Keys\Clocktower A",801CAB6F 000A
+Cheat1="Infinite\Keys\Clocktower B",801CAB70 000A
+Cheat2="Infinite\Keys\Storeroom",801CAB60 000A
+Cheat3="Infinite\Keys\Garden",801CAB61 000A
+Cheat4="Infinite\Keys\Copper",801CAB62 000A
+Cheat5="Infinite\Keys\Chamber",801CAB63 000A
+Cheat6="Infinite\Keys\Execution",801CAB64 000A
+Cheat7="Infinite\Keys\Deck",801CAB65 000A
+Cheat8="Infinite\Keys\Rose Garden",801CAB66 000A
+Cheat9="Infinite\Keys\Thorn",801CAB67 000A
+Cheat10="Infinite\Keys\Clocktower C",801CAB68 000A
+Cheat11="Infinite\Keys\Clocktower D",801CAB69 000A
+Cheat12="Infinite\Keys\Art Tower 1",801CAB6A 000A
+Cheat13="Infinite\Keys\Art Tower 2",801CAB6B 000A
+Cheat14="Infinite\Keys\Control Room",801CAB6C 000A
+Cheat15="Infinite\Keys\Wall",801CAB6D 000A
+Cheat16="Infinite\Keys\Clocktower E",801CAB6E 000A
+Cheat17="Infinite\Keys\Archives",801CAB5E 000A
+Cheat18="Infinite\Keys\Left Tower",801CAB5F 000A
+Cheat19="Infinite\Health",811CAB3A 2710
+Cheat20="Infinite\Gold",811CAB42 2710
+Cheat21="Infinite\Specials\Special 1",801CAB47 000A
+Cheat22="Infinite\Specials\Special 2",801CAB48 000A
+Cheat23="Infinite\Specials\Special 3",801CAB49 000A
+Cheat24="Infinite\Items\Roast Chicken",801CAB4A 000A
+Cheat25="Infinite\Items\Roast Beef",801CAB4B 000A
+Cheat26="Infinite\Items\Healing Kit",801CAB4C 000A
+Cheat27="Infinite\Items\Purifying",801CAB4D 000A
+Cheat28="Infinite\Items\Cure Ampoule",801CAB4E 000A
+Cheat29="Infinite\Items\Powerup",801CAB4F 000A
+Cheat30="Infinite\Items\The Contract",801CAB54 000A
+Cheat31="Infinite\Items\Magical Nitro",801CAB55 000A
+Cheat32="Infinite\Items\Mandragora",801CAB56 000A
+Cheat33="Infinite\Items\Sun Card",801CAB57 000A
+Cheat34="Infinite\Items\Moon Card",801CAB58 000A
+Cheat35="Infinite\Items\Winch Lever",801CAB59 000A
+Cheat36="Infinite\Items\Oldrey's Diary",801CAB5A 000A
+Cheat37="Infinite\Items\Crest Half A",801CAB5B 000A
+Cheat38="Infinite\Items\Crest Half B",801CAB5C 000A
+Cheat39="Infinite\Items\Rose Brooch",801CAB5D 000A
+Cheat40="Infinite\Items\Throwing Weapons",801CAB45 0064
+Cheat41="Infinite\Items\Red Jewels",801CAB45 0068
+Cheat42="Infinite\Bullets",801D3DA3 0006
 Cheat42_N=For Henry
-Cheat43="Wolfman Can Use Weapons",E872FE89 595C
+Cheat43="Wolfman Can Use Weapons",801CAB37 0002
 Cheat43_N=For Cornell
-Cheat44="Wolfman Can't Use Weapons",E872FE89 5956
+Cheat44="Wolfman Can't Use Weapons",801CAB37 0004
 Cheat44_N=For Cornell (Default)
-Cheat45="Rapid Fire Gun (Henry-Hold B)",D11C87F6 0040,E87194F5 5958
+Cheat45="Rapid Fire Gun (Henry-Hold B)",D11C87F6 0040,801D3DA3 0006
 Cheat45_N=For Henry, Hold B
-Cheat46="Max Powerups",E8720175 595C
-Cheat47="Stop Timer Input",E972FE76 5959
-Cheat48="Hard Mode Selected In A New Game",E888A0B1 595C
+Cheat46="Max Powerups",801CAE23 0002
+Cheat47="Stop Timer Input",811CAB22 0001
+Cheat48="Hard Mode Selected In A New Game",8032495F 0002
 Cheat48_N=With this code, you will not see the hard level status until you save and restart the game file. No special items are required to access this feature with this code turned on.
-Cheat49="Weapon Modifier",E972FE92 59??
-Cheat49_O=$5A Nothing,$59 Knife,$5C Potion,$5B Cross,$56 Axe
-Cheat50="Level Modifier",E87201CF 59??
-Cheat50_O=$5A Forest Of Silence,$59 Left Tower,$5C Castle Wall,$5B Villa,$56 Villa,$55 Villa,$58 Villa,$74 Villa,$57 Tunnel,$62 Underground Waterway,$61 Castle Center,$64 Castle Center,$63 Castle Center,$5E Castle Center,$5D Castle Center,$60 Castle Center,$5F Castle Center,$6A Foggy Lake,$69 Foggy Lake,$6C Foggy Lake,$6B Cave Of Spiderwomen,$66 Castle Keep,$65 Castle Keep,$68 Falls Into Space(?),$67 Clock Tower,$72 Final Battle Site,$71 Castle Center,$73 Room Of Clocks,$6E Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$83 Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$6D Tower Of Sorcery,$70 Tower Of Execution,$6F Tower Of Execution,$7A Tower Of Execution,$79 Tower Of Science,$7C Tower Of Science,$7B Tower Of Ruins,$76 Tower Of Ruins,$75 Art Tower,$78 Art Tower,$77 Dual Tower,$82 Clock Tower,$81 Clock Tower,$84 Outer Wall,$7E Fall From Sky Ouside Of Castlevania Opening,$7D Another Free Fall. Forest Where Girl Runs In Opening,$80 Black Room(?)
-Cheat51="Inter-Level Modifier",E87201CD 59??
-Cheat51_O=$5A Forest Of Silence,$59 Left Tower,$5C Castle Wall,$5B Villa,$56 Villa,$55 Villa,$58 Villa,$74 Villa,$57 Tunnel,$62 Underground Waterway,$61 Castle Center,$64 Castle Center,$63 Castle Center,$5E Castle Center,$5D Castle Center,$60 Castle Center,$5F Castle Center,$6A Foggy Lake,$69 Foggy Lake,$6C Foggy Lake,$6B Cave Of Spiderwomen,$66 Castle Keep,$65 Castle Keep,$68 Falls Into Space(?),$67 Clock Tower,$72 Final Battle Site,$71 Castle Center,$73 Room Of Clocks,$6E Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$83 Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$6D Tower Of Sorcery,$70 Tower Of Execution,$6F Tower Of Execution,$7A Tower Of Execution,$79 Tower Of Science,$7C Tower Of Science,$7B Tower Of Ruins,$76 Tower Of Ruins,$75 Art Tower,$78 Art Tower,$77 Dual Tower,$82 Clock Tower,$81 Clock Tower,$84 Outer Wall,$7E Fall From Sky Ouside Of Castlevania Opening,$7D Another Free Fall. Forest Where Girl Runs In Opening,$80 Black Room(?)
-Cheat52="Cut Scene Modifier",E87201E5 5961,E87201DD 59??
+Cheat49="Weapon Modifier",811CAB3E 00??
+Cheat49_O=$00 Nothing,$01 Knife,$02 Potion,$03 Cross,$04 Axe
+Cheat50="Level Modifier",801CAE79 00??
+Cheat50_O=$00 Forest Of Silence,$01 Left Tower,$02 Castle Wall,$03 Villa,$04 Villa,$05 Villa,$06 Villa,$1A Villa,$07 Tunnel,$08 Underground Waterway,$09 Castle Center,$0A Castle Center,$0B Castle Center,$0C Castle Center,$0D Castle Center,$0E Castle Center,$0F Castle Center,$10 Foggy Lake,$11 Foggy Lake,$12 Foggy Lake,$13 Cave Of Spiderwomen,$14 Castle Keep,$15 Castle Keep,$16 Falls Into Space(?),$17 Clock Tower,$18 Final Battle Site,$19 Castle Center,$1B Room Of Clocks,$1C Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$2B Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$1D Tower Of Sorcery,$1E Tower Of Execution,$1F Tower Of Execution,$20 Tower Of Execution,$21 Tower Of Science,$22 Tower Of Science,$23 Tower Of Ruins,$24 Tower Of Ruins,$25 Art Tower,$26 Art Tower,$27 Dual Tower,$28 Clock Tower,$29 Clock Tower,$2A Outer Wall,$2C Fall From Sky Ouside Of Castlevania Opening,$2D Another Free Fall. Forest Where Girl Runs In Opening,$2E Black Room(?)
+Cheat51="Inter-Level Modifier",801CAE7B 00??
+Cheat51_O=$00 Forest Of Silence,$01 Left Tower,$02 Castle Wall,$03 Villa,$04 Villa,$05 Villa,$06 Villa,$1A Villa,$07 Tunnel,$08 Underground Waterway,$09 Castle Center,$0A Castle Center,$0B Castle Center,$0C Castle Center,$0D Castle Center,$0E Castle Center,$0F Castle Center,$10 Foggy Lake,$11 Foggy Lake,$12 Foggy Lake,$13 Cave Of Spiderwomen,$14 Castle Keep,$15 Castle Keep,$16 Falls Into Space(?),$17 Clock Tower,$18 Final Battle Site,$19 Castle Center,$1B Room Of Clocks,$1C Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$2B Countryside Where Carrie's Mom Is Buried.(Fall Through Ground),$1D Tower Of Sorcery,$1E Tower Of Execution,$1F Tower Of Execution,$20 Tower Of Execution,$21 Tower Of Science,$22 Tower Of Science,$23 Tower Of Ruins,$24 Tower Of Ruins,$25 Art Tower,$26 Art Tower,$27 Dual Tower,$28 Clock Tower,$29 Clock Tower,$2A Outer Wall,$2C Fall From Sky Ouside Of Castlevania Opening,$2D Another Free Fall. Forest Where Girl Runs In Opening,$2E Black Room(?)
+Cheat52="Cut Scene Modifier",801CAE93 0009,801CAE8B 00??
 Cheat52_N=With this code, you must use the appropiate level mod before you attemp to run these cut scenes. Not doing so will ruin the cut scene as the graphics will be glitched.
-Cheat52_O=$5B Castle Drawbridge Lowers,$56 Character Enters Castle,$55 (?),$64 (?),$5E (?),$7A (?),$79 (?),$7C (?),$58 Vampire In Main Entrance Hall Of Villa,$57 One Of The Working Gears Cut Scenes,$62 "I Smell Poison" From Underground Waterway,$61 Castle Gate Closes In Villa Upon Entering Villa,$63 Renon Appears For First Time,$5D Village Vampire In Upstairs Villa,$60 Malus Appears For The First Time,$5F Malus Leaves Garden,$6A Character In Boat On Foggy Lake,$69 Seal Removed From Wall In Arena,$6C Bleeding Statue,$6B Cosmic Lights,$66 Explosion At Wall In Arena,$65 Explosion At Wall In Castle That Leads To Hidden Room,$68 Malus Appears Again In Upstairs Room Of Castle,$67 Bull Awakens,$72 Vincent The Vampire,$71 One Of The Working Gears Cut Scenes,$74 Gate Opens In Forest Of Silence,$73 Meet Renon For The Last Time In Castle Keep.,$6E This Cut Scene Runs Cut Scene 27 And 2E,$70 Castle Keep Destructs,$6F Malus On Flying Horse Outside Castle Keep,$76 Spider People In Tunnel,$75 Rosa In Garden,$77 Castel Destruction,$82 Space Warp,$81 Castle Destruction,$84 Malus Is Saved By Reinhardt,$83 Malus And Reinhardt On Horse,$80 Rosa Returns,$8A Ada, Henry And Cornell At Game End,$89 Scrolling Text About Castle And Henry,$8B Vampire In Basement,$86 Vampire In Villa Basement Destroyed, Woman Vampire Rises,$85 Finds Hidden Path In Villa Basement,$87 Lever & Gear In Castle,$92 Harpie,$91 Harpie Destroyed,$96 Death(Grim Reaper),$95 Death Is Destroyed,$98 Castle Drawbridge Closes And Ortega Appears,$97 Thirsty Man,$A2 Cornell Meets Henry In Garden,$A1 Cornell And Henry Part In Garden,$A9 Monster Dracula Appears,$AC Actrise Appears In Castle Center,$A6 Actrise Appears Again With Cousin Fernandes Before Fight With Carrie,$A5 Cousin Fernandes Is Destroyed,$A8 Actrise Appears Again Before Fight With Carrie,$A7 Actrise Defeated By Carrie
-Cheat53="Enable Characters All Charactors",E8850595 5956
-Cheat54="Character Modifier",E885057D 59??
-Cheat54_O=$5A Cornell,$59 Reinhardt,$5C Carrie,$5B Henry
-Cheat55="Status Modifier",E872FEDC 59??
-Cheat55_O=$5A Never Get Poisoned or Vamped,$59 Normal,$56 Vamp,$62 Poison,$5E Vamped & Poisoned,$4F Instant Death
-Cheat56="Max Weapon Power-Up",E8720179 595C
-Cheat57="Day Modifier For Adult Henry",E872FE71 59??
-Cheat57_O=$5A 7 Days,$59 6 Days,$5C 5 Days,$5B 4 Days,$56 3 Days,$55 2 Days,$58 1 Day,$57 0 Days
-Cheat58="Infinite\Health Young Henry",D11C87F6 0010,E990A6B8 815A
+Cheat52_O=$03 Castle Drawbridge Lowers,$04 Character Enters Castle,$05 (?),$0A (?),$0C (?),$20 (?),$21 (?),$22 (?),$06 Vampire In Main Entrance Hall Of Villa,$07 One Of The Working Gears Cut Scenes,$08 "I Smell Poison" From Underground Waterway,$09 Castle Gate Closes In Villa Upon Entering Villa,$0B Renon Appears For First Time,$0D Village Vampire In Upstairs Villa,$0E Malus Appears For The First Time,$0F Malus Leaves Garden,$10 Character In Boat On Foggy Lake,$11 Seal Removed From Wall In Arena,$12 Bleeding Statue,$13 Cosmic Lights,$14 Explosion At Wall In Arena,$15 Explosion At Wall In Castle That Leads To Hidden Room,$16 Malus Appears Again In Upstairs Room Of Castle,$17 Bull Awakens,$18 Vincent The Vampire,$19 One Of The Working Gears Cut Scenes,$1A Gate Opens In Forest Of Silence,$1B Meet Renon For The Last Time In Castle Keep.,$1C This Cut Scene Runs Cut Scene 27 And 2E,$1E Castle Keep Destructs,$1F Malus On Flying Horse Outside Castle Keep,$24 Spider People In Tunnel,$25 Rosa In Garden,$27 Castel Destruction,$28 Space Warp,$29 Castle Destruction,$2A Malus Is Saved By Reinhardt,$2B Malus And Reinhardt On Horse,$2E Rosa Returns,$30 Ada,$31 Scrolling Text About Castle And Henry,$33 Vampire In Basement,$34 Vampire In Villa Basement Destroyed,$35 Finds Hidden Path In Villa Basement,$37 Lever & Gear In Castle,$38 Harpie,$39 Harpie Destroyed,$44 Death(Grim Reaper),$45 Death Is Destroyed,$46 Castle Drawbridge Closes And Ortega Appears,$47 Thirsty Man,$48 Cornell Meets Henry In Garden,$49 Cornell And Henry Part In Garden,$51 Monster Dracula Appears,$52 Actrise Appears In Castle Center,$54 Actrise Appears Again With Cousin Fernandes Before Fight With Carrie,$55 Cousin Fernandes Is Destroyed,$56 Actrise Appears Again Before Fight With Carrie,$57 Actrise Defeated By Carrie
+Cheat53="Enable Characters All Charactors",8031B243 0004
+Cheat54="Character Modifier",8031B22B 00??
+Cheat54_O=$00 Cornell,$01 Reinhardt,$02 Carrie,$03 Henry
+Cheat55="Status Modifier",801CAB84 00??
+Cheat55_O=$00 Never Get Poisoned or Vamped,$01 Normal,$04 Vamp,$08 Poison,$0C Vamped & Poisoned,$FF Instant Death
+Cheat56="Max Weapon Power-Up",801CAE27 0002
+Cheat57="Day Modifier For Adult Henry",801CAB1F 00??
+Cheat57_O=$00 7 Days,$01 6 Days,$02 5 Days,$03 4 Days,$04 3 Days,$05 2 Days,$06 1 Day,$07 0 Days
+Cheat58="Infinite\Health Young Henry",D11C87F6 0010,813A5360 2800
--- a/Config/Cheats/Centre
+++ b/Config/Cheats/Centre
@ -1,15 +1,15 @@
 [DCCF2134-9DD63578-C:50]
 Name=Centre Court Tennis (E)
-Cheat0="Infinite Character Creation Points",E86B0E69 5964
-Cheat1="Maximum\Serve Smash",E96B0E62 6364
-Cheat2="Maximum\Volley Lob",E96B0E68 6364
-Cheat3="Maximum\Stroke Spin",E96B0E66 6364
-Cheat4="Maximum\Back,Front,Left & Right Move",E96B0E6C 5964
-Cheat5="Left vs Right Side",E86B0E6A 5955
-Cheat6="Max Score In Mini Games",E965B588 5645,E965B586 394F
-Cheat7="Practice\Balls Always Zero",E865BFA1 595A
-Cheat8="Practice\Time Always Zero",E965BF9E 595A
-Cheat9="Scoreboard\Max sets top",E865C0D5 5961
-Cheat10="Scoreboard\Max games top",E865C0DD 5961
-Cheat11="Scoreboard\Max sets bottom",E865C0D9 5961
-Cheat12="Scoreboard\Max games bottom",E865C0E1 5961
+Cheat0="Infinite Character Creation Points",8017BB17 000A
+Cheat1="Maximum\Serve Smash",8117BB0E 0A0A
+Cheat2="Maximum\Volley Lob",8117BB10 0A0A
+Cheat3="Maximum\Stroke Spin",8117BB12 0A0A
+Cheat4="Maximum\Back,Front,Left & Right Move",8117BB14 000A
+Cheat5="Left vs Right Side",8017BB16 0005
+Cheat6="Max Score In Mini Games",81116230 05F5,81116232 E0FF
+Cheat7="Practice\Balls Always Zero",8011684F 0000
+Cheat8="Practice\Time Always Zero",8111684A 0000
+Cheat9="Scoreboard\Max sets top",80116983 0009
+Cheat10="Scoreboard\Max games top",8011698B 0009
+Cheat11="Scoreboard\Max sets bottom",80116987 0009
+Cheat12="Scoreboard\Max games bottom",8011698F 0009
--- a/Config/Cheats/Chameleon
+++ b/Config/Cheats/Chameleon
@ -1,6 +1,6 @@
 [B9AF8CC6-DEC9F19F-C:50]
 Name=Chameleon Twist (E)
-Cheat0="Access All Levels",E876D962 594F,E876D968 594F
-Cheat1="Extra Crowns",E8796FA9 5965
-Cheat2="Infinite Health",E86BA445 5964
-Cheat3="Extended Tongue",E9876FB2 504F
+Cheat0="Access All Levels",8020860E 00FF,80208610 00FF
+Cheat1="Extra Crowns",80251857 0015
+Cheat2="Infinite Health",80174DF3 000A
+Cheat3="Extended Tongue",8133185E FFFF
--- a/Config/Cheats/Chameleon
+++ b/Config/Cheats/Chameleon
@ -1,8 +1,8 @@
 [A4F2F521-F0EB168E-C:4A]
 Name=Chameleon Twist (J)
-Cheat0="Extra Crowns",E87AD05D 5965
-Cheat1="Infinite Health",E86CE1C5 5964
-Cheat2="Extended Tongue",E988D062 504F
-Cheat3="Level Select",E87D12CD 59??
+Cheat0="Extra Crowns",8024790B 0015
+Cheat1="Infinite Health",80168E73 000A
+Cheat2="Extended Tongue",8132790E FFFF
+Cheat3="Level Select",8029BF7B 00??
 Cheat3_N=When you press Pause in-game and Stage Quit yo will go to the Stage Screen this cheat lets you choose what Stage you would like to go to but make sure you turn the cheat off and press A to continue to that stage.
-Cheat3_O=$5A Stage 1,$59 Stage 2,$5C Stage 3,$5B Stage 4,$56 Stage 5,$55 Stage 6,$58 Stage 7
+Cheat3_O=$00 Stage 1,$01 Stage 2,$02 Stage 3,$03 Stage 4,$04 Stage 5,$05 Stage 6,$06 Stage 7
--- a/Config/Cheats/Chameleon
+++ b/Config/Cheats/Chameleon
@ -1,8 +1,8 @@
 [6420535A-50028062-C:45]
 Name=Chameleon Twist (U) (V1.0)
-Cheat0="Access All Levels",E876DC62 594F,E876DC68 594F
-Cheat1="Extra Crowns",E8796AB9 5965
-Cheat2="Infinite Health",E86BA345 5964
-Cheat3="Extended Tongue",E9876AC2 504F
-Cheat4="Level Select",E87D5FCD 59??
-Cheat4_O=$5A Stage 1,$59 Stage 2,$5C Stage 3,$5B Stage 4,$56 Stage 5,$55 Stage 6,$58 Stage 7
+Cheat0="Access All Levels",8020850E 00FF,80208510 00FF
+Cheat1="Extra Crowns",80251767 0015
+Cheat2="Infinite Health",80174CF3 000A
+Cheat3="Extended Tongue",8133176E FFFF
+Cheat4="Level Select",8029087B 00??
+Cheat4_O=$00 Stage 1,$01 Stage 2,$02 Stage 3,$03 Stage 4,$04 Stage 5,$05 Stage 6,$06 Stage 7
--- a/Config/Cheats/Chameleon
+++ b/Config/Cheats/Chameleon
@ -1,8 +1,8 @@
 [D81963C7-4271A3AA-C:45]
 Name=Chameleon Twist (U) (V1.1)
-Cheat0="Access All Levels",E876DC62 594F,E876DC68 594F
-Cheat1="Extra Crowns",E8796AB9 5965
-Cheat2="Infinite Health",E86BA345 5964
-Cheat3="Extended Tongue",E9876AC2 504F
-Cheat4="Level Select",E87D5FCD 59??
-Cheat4_O=$5A Stage 1,$59 Stage 2,$5C Stage 3,$5B Stage 4,$56 Stage 5,$55 Stage 6,$58 Stage 7
+Cheat0="Access All Levels",8020850E 00FF,80208510 00FF
+Cheat1="Extra Crowns",80251767 0015
+Cheat2="Infinite Health",80174CF3 000A
+Cheat3="Extended Tongue",8133176E FFFF
+Cheat4="Level Select",8029087B 00??
+Cheat4_O=$00 Stage 1,$01 Stage 2,$02 Stage 3,$03 Stage 4,$04 Stage 5,$05 Stage 6,$06 Stage 7
--- a/Config/Cheats/Chameleon
+++ b/Config/Cheats/Chameleon
@ -1,15 +1,15 @@
 [07A69D01-9A7D41A1-C:50]
 Name=Chameleon Twist 2 (E)
-Cheat0="Infinite Health",E86E0DD3 595F
-Cheat1="Max Collectable Items",E86C9C57 5966
-Cheat2="Have 6 Carrots",E86C9C6F 59D0
-Cheat3="Have All\Levels",E86C9C60 598F
-Cheat4="Have All\Costumes",E86C9C6E 5950
-Cheat5="Have All\Collectibles\Stage 1",E86C9C68 5966
-Cheat6="Have All\Collectibles\Stage 2",E86C9C67 5966
-Cheat7="Have All\Collectibles\Stage 3",E86C9C66 5966
-Cheat8="Have All\Collectibles\Stage 4",E86C9C65 5966
-Cheat9="Have All\Collectibles\Stage 5",E86C9C6C 5966
-Cheat10="Have All\Collectibles\Stage 6",E86C9C6B 5966
-Cheat11="Press L To levitate",D018BAB5 0020,E96E1038 9B5A
+Cheat0="Infinite Health",8018BA7D 000F
+Cheat1="Max Collectable Items",80164501 0014
+Cheat2="Have 6 Carrots",80164519 007E
+Cheat3="Have All\Levels",80164508 003F
+Cheat4="Have All\Costumes",8016451A 00FE
+Cheat5="Have All\Collectibles\Stage 1",80164510 0014
+Cheat6="Have All\Collectibles\Stage 2",80164511 0014
+Cheat7="Have All\Collectibles\Stage 3",80164512 0014
+Cheat8="Have All\Collectibles\Stage 4",80164513 0014
+Cheat9="Have All\Collectibles\Stage 5",80164514 0014
+Cheat10="Have All\Collectibles\Stage 6",80164515 0014
+Cheat11="Press L To levitate",D018BAB5 0020,8118B9E0 4200
 Cheat11_N=Press L To Levitate & Let go to land
--- a/Show More
+++ b/Show More