diff --git a/G2ME01.ini b/G2ME01.ini
index 518160c234..6817477b0b 100644
--- a/G2ME01.ini
+++ b/G2ME01.ini
@@ -8,218 +8,173 @@ EmulationStateId = 2
 #Add memory patches here.
 
 [ActionReplay]
-(M)
-062AE01C 88000000
-C4354E70 0000FF01
-C436F000 0000FF02
-4D30294C 4E800020
-C530294C 0000FF03
-0441FD80 00000000
-C6004010 000000FF
-
-This Code Must Be On!
-062AE01D 08000000
++$This Code Must Be On!
 043BC410 906D0000
 043BC414 88030004
 043BC418 4BC5C1F4
 04018608 483A3E08
 
-Infinite Health
-062AE01E 08000000
++$Infinite Health
 4241FD80 000A44BB
 4241FD80 000B6000
 
-Max Energy Tanks
-062AE01F 08000000
++$Max Energy Tanks
 4241FD80 012B000E
 4241FD80 012D000E
 
-#Infinite Missiles
-#062AE021 08000000
-#4241FD80 013700FA
++$Maximum Missiles
+4241FD80 013900FA
 
-Have Morph Ball Power Bomb
-062AE03C 04701D40
-4241FD80 01310001
-4241FD80 01330001
++$Infinite Missiles
+4241FD80 013700FA
 
-BEAM WEAPON CODES:
-062AE022 05008000
+#BEAM WEAPON CODES:
 
-Have Charge Beam
-062AE023 04701140
++$Have Charge Beam
 4241FD80 00310001
 4241FD80 00330001
 
-Have Dark Beam
-062AE024 04701140
++$Have Dark Beam
 4241FD80 0037000F
 4241FD80 0039000F
 
-Have Annihilator
-062AE026 04701140
++$Have Light Beam
+4241FD80 003D000F
+4241FD80 003F000F
+
++$Have Annihilator
 4241FD80 0043000F
 4241FD80 0045000F
 
-CHARGE COMBO CODES:
-062AE027 05008000
+#CHARGE COMBO CODES:
 
-Have Super Missile
-062AE028 047013C0
++$Have Super Missile
 4241FD80 00470001
 4241FD80 00490001
 
-Have Darkburst
-062AE029 047013C0
++$Have Darkburst
 4241FD80 004D0001
 4241FD80 004F0001
 
-Have Sunburst
-062AE02A 047013C0
++$Have Sunburst
 4241FD80 00530001
 4241FD80 00550001
 
-Have Sonic Boom
-062AE02B 047013C0
++$Have Sonic Boom
 4241FD80 00590001
 4241FD80 005B0001
 
-VISOR CODES:
-062AE02C 05008000
+#VISOR CODES:
 
-Have Combat Visor
-062AE02D 04701640
+$Have Combat Visor
 4241FD80 005F0001
 4241FD80 00610001
 
-Have Scan Visor
-062AE02E 04701640
+$Have Scan Visor
 4241FD80 00650001
 4241FD80 00670001
 
-Have Dark Visor
-062AE02F 04701640
+$Have Dark Visor
 4241FD80 006B0001
 4241FD80 006D0001
 
-Have Echo Visor
-062AE030 04701640
+$Have Echo Visor
 4241FD80 00710001
 4241FD80 00730001
 
-ARMOR CODES:
-062AE031 05008000
+#ARMOR CODES:
 
-Have Varia Suit
-062AE032 047018C0
++$Have Varia Suit
 4241FD80 00770001
 4241FD80 00790001
 
-Have Dark Suit
-062AE033 047018C0
++$Have Dark Suit
 4241FD80 007D0001
 4241FD80 007F0001
 
-Have Light Suit
-062AE034 047018C0
+$Have Light Suit (break)
 4241FD80 00830001
 4241FD80 00850001
 
-MOVEMENT SYSTEMS CODES:
+#MOVEMENT SYSTEMS CODES:
 062AE035 05008000
 
-Have Space Jump Boots
-062AE036 04701AC0
++$Have Space Jump Boots
 4241FD80 00BF0001
 4241FD80 00C10001
 
-Have Grapple Beam
-062AE037 04701AC0
++$Have Grapple Beam
 4241FD80 00B90001
 4241FD80 00BB0001
 
-Have Gravity Boost
-062AE038 04701AC0
++$Have Gravity Boost
 4241FD80 00C50001
 4241FD80 00C70001
 
-Have Screw Attack
-062AE039 04701AC0
++$Have Screw Attack
 4241FD80 00D10001
 4241FD80 00D30001
 
-MISCELLANEOUS CODES:
-062AE03A 05008000
+#MISCELLANEOUS CODES:
 
-Have Seeker Missile
-062AE03B 04701D40
++$Have Seeker Missile
 4241FD80 00CB0001
 4241FD80 00CD0001
 
-Have Beam Ammo Expansion
-062AE03D 04701D40
++$Have Morph Ball Power Bomb
+4241FD80 01310001
+4241FD80 01330001
+
++$Have Beam Ammo Expansion
 4241FD80 013D000F
 4241FD80 013F000F
 
-DARK TEMPLE KEYS:
-062AE03E 05008000
+#DARK TEMPLE KEYS:
 
-Have Sky Temple Key 1
-062AE03F 04701F40
+$Have Sky Temple Key 1
 4241FD80 00DD0001
 4241FD80 00DF0001
 
-Have Sky Temple Key 2
-062AE040 04701F40
+$Have Sky Temple Key 2
 4241FD80 00E30001
 4241FD80 00E50001
 
-Have Sky Temple Key 3
-062AE041 04701F40
+$Have Sky Temple Key 3
 4241FD80 00E90001
 4241FD80 00EB0001
 
-Have Agon Temple Key 1
-062AE042 04701F40
+$Have Agon Temple Key 1
 4241FD80 00EF0001
 4241FD80 00F10001
 
-Have Agon Temple Key 2
-062AE043 04701F40
+$Have Agon Temple Key 2
 4241FD80 00F50001
 4241FD80 00F70001
 
-Have Agon Temple Key 3
-062AE044 04701F40
+$Have Agon Temple Key 3
 4241FD80 00FB0001
 4241FD80 00FD0001
 
-Have Torvus Temple Key 1
-062AE045 04701F40
+$Have Torvus Temple Key 1
 4241FD80 01010001
 4241FD80 01030001
 
-Have Torvus Temple Key 2
-062AE046 04701F40
+$Have Torvus Temple Key 2
 4241FD80 01070001
 4241FD80 01090001
 
-Have Torvus Temple Key 3
-062AE047 04701F40
+$Have Torvus Temple Key 3
 4241FD80 010D0001
 4241FD80 010F0001
 
-Have Ing Hive Temple Key 1
-062AE048 04701F40
+$Have Ing Hive Temple Key 1
 4241FD80 01130001
 4241FD80 01150001
 
-Have Ing Hive Temple Key 2
-062AE049 04701F40
+$Have Ing Hive Temple Key 2
 4241FD80 01190001
 4241FD80 011B0001
 
-Have Ing Hive Temple Key 3
-062AE04A 04701F40
+$Have Ing Hive Temple Key 3
 4241FD80 011F0001
 4241FD80 01210001
\ No newline at end of file
diff --git a/GALP01.ini b/GALP01.ini
index 8a0748da08..ace8e13731 100644
--- a/GALP01.ini
+++ b/GALP01.ini
@@ -4,52 +4,136 @@ EmulationStateId = 4
 [OnFrame]
 #0x8044CD30=dword:0xFFFFFFFF
 [ActionReplay]
-mustcode? 
-003C04F4 98000000
-C434D344 00000800
-
-OpenAllCharacters
-003C015D 18000000
-0444CD30 FFFFFFFF
-
-infloterycoins
-003C1AB7 18000000
-0444CF10 0000270F
-
-P1MustbeON - Vs.CharMod
-003C629A 18000000
-08471634 00000040
-00471634 00000000
-
-P1 - No Damage
-003C0156 18000000
++$P1 - No Damage
 04443E80 00000000
 
-All Event matches open and complete 
-003C1ABF 18000000
-0444CF34 FFFFFFFF
+$P2 - No Damage
+04444D20 00000000
 
-Mega jumps 
-003C1AC1 18000000
-044CA1DC 40000000
+$P3 - No Damage
+04445BC0 00000000
 
-Item Appearance Modifier (bopie64)
-003C4BBF 18000000
-043FB838 00000003
-043FB850 41000000
-043FB854 3F800000
+$P4 - No Damage
+04446A60 00000000
 
++$Infinite Lives
+00443EAE 00000009
 
-P1 Turbo B Button (donny2112)
-003C0AFF 18000000
-0A45BF10 00000200
-0245BF10 00000000
-
-One Hit Kills
-003C26A9 18000000
++$One Hit Kills
 044C9578 40100000
 
-Infinite Jumps 
-003C3BAE 18000000
++$Infinite Jumps 
 040CC114 60000000
 
+$Infinite Retries
+0246A8C2 000005FA
+
+$Infinite Time
+0245C4D2 00000075
+
+$Open All Characters
+0444CD30 FFFFFFFF
+
+$Infinite lottery coins
+0444CF10 0000270F
+
+$All 292 Trophies
+0244D198 00000124
+0244D19C 0125FFFF
+
+$L+R+Y sets time to 10:00.00
+0A45BF10 00000860
+0445C4D0 00000258
+
+$L+R+X sets time to 00:10.00
+0A45BF10 00000460
+0445C4D0 0000000A
+
+$All Event matches open and complete
+0444CF34 FFFFFFFF
+
+$Bouncy pickups
+044C8DE0 40100000
+
+$Big jumps
+044CA1DC 3FC00000
+
+$Mega jumps
+044CA1DC 40000000
+
+$Move 2 x faster
+044CA19C 40000000
+
+$Move 4 x faster
+044CA19C 40800000
+
+$Stamina mode codes
+003C28CB 15018000
+
+$All start with 50%
+04034B74 38A00032
+
+$All start with 100%
+04034B74 38A00064
+
+$All start with 200%
+04034B74 38A000C8
+
+$All start with 300%
+04034B74 38A0012C
+
+$All start with 400%
+04034B74 38A00190
+
+$All start with 500%
+04034B74 38A001F4
+
+$All start with 600%
+04034B74 38A00258
+
+$All start with 700%
+04034B74 38A002BC
+
+$All start with 800%
+04034B74 38A00320
+
+$All start with 900%
+04034B74 38A00384
+
+$All start with 999%
+04034B74 38A003E7
+
+#Secret multi player level modifier
+
+$Metroidy level
+044C7FC4 00000D02
+
+$City rooftops level
+044C7FC4 00000F02
+
+$During F-Zero race
+044C7FC4 00001102
+
+$Ontop of giant pokemon
+044C7FC4 00001302
+
+$Mario Bros style level
+044C7FC4 00001502
+
+$Game and Watch level
+044C7FC4 00001702
+
+$Platforms in starfield 1 level
+044C7FC4 00001802
+
+$Platforms in starfield 2 level
+044C7FC4 00001902
+
+$Level with 'windy' tree
+044C7FC4 00001A02
+
+$Yoshi's story level
+044C7FC4 00001B02
+
+$Dusk jungle level
+044C7FC4 00001C02
\ No newline at end of file
diff --git a/GLME01.ini b/GLME01.ini
index a9e2809fee..1d03832fb4 100644
--- a/GLME01.ini
+++ b/GLME01.ini
@@ -5,18 +5,15 @@ EmulationStateId = 4
 [OnFrame]
 #Add memory patches here.
 [ActionReplay]
-Infinite Health
-00BA09FC 08000000
++$Infinite Health
 040B9524 60000000
 
-999 Cash
-00BA09FD 08000000
++$999 Cash
 040AE4D0 3C00270F
 040AE4E8 60000000
 040AE500 60000000
 
-99 of some treasures
-00BA09FE 08000000
++$99 of some treasures
 040AE518 63180063
 040AE51C 3F000063
 040AE520 3F000063
@@ -25,6 +22,5 @@ Infinite Health
 040AE52C 3F000063
 040AE530 3F000063
 
-End Boss Has No HP
-00BA09FF 08000000
++$End Boss Has No HP
 04126E6C 60000000
\ No newline at end of file
diff --git a/GM4E01.ini b/GM4E01.ini
index 6fc6eea889..5ee24acc96 100644
--- a/GM4E01.ini
+++ b/GM4E01.ini
@@ -6,49 +6,40 @@ EmulationStateId = 2
 #Add memory patches here.  
 
 [ActionReplay] 
-Everything Unlocked
-045633BE 08000000
+$Everything Unlocked
 023BC1C0 0003FFFF
 
-Stars Last Forever
+$Stars Last Forever
 045633BF 08000000
 042B0540 4BD53700
 
-Extra Speed
-045633C0 08000000
+$Extra Speed
 043D45A0 46C80000
 042B17A8 C3E20000
 
-Press Z to Jump
-045633C1 08000000
+$Press Z to Jump
 3A3A4D6C 00000010
 423CC118 019E4300
 
-D-Pad Up Freezes Timer
-045633C2 08000000
+$D-Pad Up Freezes Timer
 0A3A4D6C 00000008
 04189348 60000000
 
-D-Pad Down Unfreezes Timer
-045633C3 08000000
+$D-Pad Down Unfreezes Timer
 0A3A4D6C 00000004
 04189348 4BFFD9E9
 
-Other Karts Can't Move
-045633C4 08000000
+$Other Karts Can't Move
 04247504 60000000
 
-Tiny Karts
-045633C6 08000000
+$Tiny Karts
 043D45A4 3F000000
 042D3668 C0220004
 
-Max Race Points
-045633C7 08000000
+$Max Race Points
 043B11CC 000003E7
 
-Press D-Pad Left For Star
-045633C8 08000000
+$Press D-Pad Left For Star
 042B0540 4BD53700
 8A3A4D6C 00000001
 042AF120 48000208
@@ -61,24 +52,19 @@ Press D-Pad Left For Star
 042C7A00 80040008
 00000000 40000000
 
-Log Bridges Dont Sway
-0456573F 08000000
+$Log Bridges Dont Sway
 041EAC2C 4E800020
 
-Weapons Are Useless
-04565740 08000000
+$Weapons Are Useless
 041F35D4 4E800020
 
-Turn off Course Hazards
-04565741 08000000
+$Turn off Course Hazards
 041F4DA4 4E800020
 
-All Races: 1 Lap
-04565742 08000000
+$All Races: 1 Lap
 04187BAC 38000001
 
-Unrestricted Kart Selection
-04565743 08000000
+$Unrestricted Kart Selection
 04163B30 7C673214
 04163B34 2C030015
 04163B38 41820010
@@ -91,112 +77,86 @@ Unrestricted Kart Selection
 04163B54 48000004
 04163B58 4E800020
 
-Disable Course Collision (Hold D-Down)
-04565744 08000000
+$Disable Course Collision (Hold D-Down)
 043CE824 BF800000
 3A3A4D6C 00000004
 043CE824 420001CE
 
-Infinite Mushrooms
-0456576A 08000000
+$Infinite Mushrooms
 042BCC5C 480000EC
 
-Invisible Karts
-0456576B 08000000
+$Invisible Karts
 041908B4 4E800020
 
-Double Mushroom Boosts
-0456576C 08000000
+$Double Mushroom Boosts
 042AD3EC 380000A0
 
-Purely Random Items
-0456576D 08000000
+$Purely Random Items
 0420CF28 38800013
 0420CF30 2C030010
 0420CF34 40820008
 0420CF38 38630001
 0420CF3C 4800009C
 
-Item Always Green Shell
-0456576E 08000000
+$Item Always Green Shell
 0420CBC4 38600000
 
-Item Always Special Green Shell
-0456576F 08000000
+$Item Always Special Green Shell
 0420CBC4 38600001
 
-Item Always Red Shell
-04565770 08000000
+$Item Always Red Shell
 0420CBC4 38600002
 
-Item Always Banana
-04565771 08000000
+$Item Always Banana
 0420CBC4 38600003
 
-Item Always Special Banana
-04565772 08000000
+$Item Always Special Banana
 0420CBC4 38600004
 
-Item Always Mushroom
-04565773 08000000
+$Item Always Mushroom
 0420CBC4 38600005
 
-Item Always Star
-04565774 08000000
+$Item Always Star
 0420CBC4 38600006
 
-Item Always Wan Wan
-04565775 08000000
+$Item Always Wan Wan
 0420CBC4 38600007
 
-Item Always Bomb
-04565776 08000000
+$Item Always Bomb
 0420CBC4 38600008
 
-Item Always Bros Special
-04565777 08000000
+$Item Always Bros Special
 0420CBC4 38600009
 
-Item Always Lightning
-04565778 08000000
+$Item Always Lightning
 0420CBC4 3860000A
 
-Item Always Yoshi Egg
-04565779 08000000
+vItem Always Yoshi Egg
 0420CBC4 3860000B
 
-Item Always Golden Mushroom
-0456577A 08000000
+$Item Always Golden Mushroom
 0420CBC4 3860000C
 
-Item Always Homing Shell
-0456577B 08000000
+$Item Always Homing Shell
 0420CBC4 3860000D
 
-Item Always Heart
-0456577C 08000000
+$Item Always Heart
 0420CBC4 3860000E
 
-Item Always Fake Prezzie
-0456577D 08000000
+$Item Always Fake Prezzie
 0420CBC4 3860000F
 
-Item Always Special Shells
-0456577E 08000000
+$Item Always Special Shells
 0420CBC4 38600011
 
-Item Always 3 Mushrooms
-0456577F 08000000
+$Item Always 3 Mushrooms
 0420CBC4 38600012
 
-Goraud Shading
-04565780 08000000
+$Goraud Shading
 040A9714 4E800020
 
-Reduced Nintendo Blur
-04565781 08000000
+$Reduced Nintendo Blur
 022B3382 000000E8
 
-Increased Nintendo Blur
-04565782 08000000
+$Increased Nintendo Blur
 022B3382 000000CC
\ No newline at end of file
diff --git a/GM8E01.ini b/GM8E01.ini
index 9ec1c51831..6a0e0c73ac 100644
--- a/GM8E01.ini
+++ b/GM8E01.ini
@@ -6,141 +6,119 @@ EmulationStateId = 3
 #Add memory patches here.  
 
 [ActionReplay] 
-Infinite Health
-0116195B 08000000
++$This Code Must Be On
+043CB1A8 3C808000
+043CB1AC 93E4183C
+043CB1B0 809F0008
+043CB1B4 4BDE05A8
+041AB758 4821FA50
+
+$Infinite Health
 04049EA8 48000104
 
-#Infinite Missiles
-#0116195C 08000000
-#4200183C 002500FF
-#4200183C 002700FF
+$Infinite Missiles
+4200183C 002500FF
+4200183C 002700FF
 
-Infinite Balls
-0116195D 08000000
+$Infinite Balls
 00457D1B 00000003
 
-Infinite Power Balls
-0116195E 08000000
+$Infinite Power Balls
 4200183C 00310003
 
-Moonjump (Hold B)
-0116195F 08000000
+$Moonjump (Hold B)
 0A7A55A4 00000200
 0446BABC 41200000
 
-Play NES Metroid
-01161960 08000000
+$Play NES Metroid
 0A7A55A4 00000440
 0001CA64 00000041
 0A7A55A4 00000840
 0001CA64 00000040
 
-Press L+X at bonus screen
+#Press L+X at bonus screen
 
-Press L+Y before quitting
+#Press L+Y before quitting
 
-Press L+Y before quitting 
+#Press L+Y before quitting 
 
 #ARM CANNON
 
-Have Ice Beam
-01161962 08000000
++$Have Ice Beam
 4200183C 001B0001
 
-Have Wave Beam
-01161963 08000000
++$Have Wave Beam
 4200183C 001F0001
 
-Have Plasma Beam
-01161964 08000000
++$Have Plasma Beam
 4200183C 00230001
 
-Have Phazon Beam
-01161965 08000000
+$Have Phazon Beam (break)
 4200183C 00730001
 
 #MORPH BALL 
 
-Have Morph Ball
-01161967 08000000
+$Have Morph Ball
 4200183C 00570001
 
-Have Boost Ball
-01161968 08000000
+$Have Boost Ball
 4200183C 005F0001
 
-Have Spider Ball
-01161969 08000000
+$Have Spider Ball (break)
 4200183C 00630001
 
-Have Morph Ball Bomb
-0116196A 08000000
+$Have Morph Ball Bomb
 4200183C 002F0001
 
-Have Power Bomb
-0116196B 08000000
+$Have Power Bomb
 4200183C 00330001
 
 #SUITS
 
-Have Varia Suit
-0116196D 08000000
+$Have Varia Suit
 4200183C 006F0001
 
-Have Gravity Suit
-0116196E 08000000
+$Have Gravity Suit (break)
 4200183C 00670001
 4200183C 006B0001
 
-Have Phazon Suit
-0116196F 08000000
+$Have Phazon Suit (break)
 4200183C 00730001
 
 #VISORS
 
-Have Combat Visor
-01161971 08000000
++$Have Combat Visor
 4200183C 005B0001
 
-Have Scan Visor
-01161972 08000000
++$Have Scan Visor
 4200183C 002B0001
 
-Have X-Ray Visor
-01161973 08000000
++$Have X-Ray Visor
 4200183C 004B0001
 
-Have Thermal Visor
-01161974 08000000
++$Have Thermal Visor
 4200183C 003B0001
 
-SECONDARY ITEMS 
+#SECONDARY ITEMS 
 
-Have Space Jump Boots
-01161976 08000000
+$Have Space Jump Boots
 4200183C 00510001
 4200183C 00530001
 
-Have Grapple Beam
-01161977 08000000
+$Have Grapple Beam
 4200183C 00470001
 
-Have Missile Launcher
-01161978 08000000
+$Have Missile Launcher
 4200183C 00260001
 
-Have Charge Beam
-01161979 08000000
+$Have Charge Beam
 4200183C 003F0001
 
-Have Beam Combo A
-0116197A 08000000
+$Have Beam Combo A
 4200183C 00370001
 
-Have Beam Combo B
-0116197B 08000000
+$Have Beam Combo B
 4200183C 00430001
 
-Have Beam Combo C
-0116197C 08000000
+$Have Beam Combo C
 4200183C 004F0001
\ No newline at end of file
diff --git a/GMPE01.ini b/GMPE01.ini
index d6c98afd5f..d0ff35dbcc 100644
--- a/GMPE01.ini
+++ b/GMPE01.ini
@@ -6,101 +6,79 @@ EmulationStateId = 4
 #Add memory patches here.
 
 [ActionReplay]
-All Mini Games Unlocked01120BA8 08000000
+$All Mini Games Unlocked
 0218FDF0 
 0003FFFF
-Player 1 Max Coins
-01120BA9 08000000
+
+$Player 1 Max Coins
 0218FC54 000003E7
 
-Player 1 No Coins
-01120BAA 08000000
+$Player 1 No Coins
 0218FC54 00000000
 
-Player 1 Max Stars
-01120BAB 08000000
+$Player 1 Max Stars
 0218FC62 000003E7
 
-Player 1 No Stars
-01120BAC 08000000
+$Player 1 No Stars
 0218FC62 00000000
 
-Player 1 Always Has Magic Lamp
-01120BAD 08000000
+$Player 1 Always Has Magic Lamp
 0018FC3D 0000000C
 
-Player 2 Max Coins
-01120BAE 08000000
+$Player 2 Max Coins
 0218FC84 000003E7
 
-Player 2 No Coins
-01120BAF 08000000
+$Player 2 No Coins
 0218FC84 00000000
 
-Player 2 Max Stars
-01120BB0 08000000
+$Player 2 Max Stars
 0018FC92 000003E7
 
-Player 2 No Stars
-01120BB1 08000000
+$Player 2 No Stars
 0018FC92 00000000
 
-Player 2 Always Has Magic Lamp
-01120BB2 08000000
+$Player 2 Always Has Magic Lamp
 0018FC6D 0000000C
 
-Player 3 Max Coins
-01120BB3 08000000
+$Player 3 Max Coins
 0218FCB4 000003E7
 
-Player 3 No Coins
-01120BB4 08000000
+$Player 3 No Coins
 0218FCB4 000003E7
 
-Player 3 Max Stars
-01120BB5 08000000
+$Player 3 Max Stars
 0218FCC2 000003E7
 
-Player 3 No Stars
-01120BB6 08000000
+$Player 3 No Stars
 0218FCC2 00000000
 
-Player 3 Always Has Magic Lamp
-01120BB7 08000000
+$Player 3 Always Has Magic Lamp
 0018FC9D 0000000C
 
-Player 4 Max Coins
-01120BB8 08000000
+$Player 4 Max Coins
 0218FCE4 000003E7
 
-Player 4 No Coins
-01120BB9 08000000
+$Player 4 No Coins
 0218FCE4 00000000
 
-Player 4 Max Stars
-01120BBA 08000000
+$Player 4 Max Stars
 0218FCF2 000003E7
 
-Player 4 No Stars
-01120BBB 08000000
+$Player 4 No Stars
 0218FCF2 00000000
 
-Player 4 Always Has Magic Lamp
-01120BBC 08000000
+$Player 4 Always Has Magic Lamp
 0018FCCD 0000000C
 
-Hold Y To Roll 10
-01120BBD 08000000
+$Hold Y To Roll 10
 3A1E67F0 00000800
 0416B928 41200000
 
-Hold L To Roll 1
-01120BBE 08000000
+$Hold L To Roll 1
 3A1E67F0 00000040
 0416B928 3F000000
 
-L+X No More Moves(Use While Moving)
-01120BBF 08000000
+$L+X No More Moves(Use While Moving)
 8A1E67F0 00000440
 0018FC42 00000001
 0018FC72 00000001
@@ -108,8 +86,7 @@ L+X No More Moves(Use While Moving)
 0018FCD2 00000001
 00000000 40000000
 
-L+Y Infinite Moves(While Moving)
-01120BC0 08000000
+$L+Y Infinite Moves(While Moving)
 8A1E67F0 00000840
 0018FC42 0000000A
 0018FC72 0000000A
@@ -117,12 +94,10 @@ L+Y Infinite Moves(While Moving)
 0018FCD2 0000000A
 00000000 40000000
 
-Press Z+R To Be On Turn 20
-01120BC1 08000000
+$Press Z+R To Be On Turn 20
 0A1E67F0 00000030
 0018FCFC 00000014
 
-Press Z+L To Be On Turn 1
-01120BC2 08000000
+$Press Z+L To Be On Turn 1
 0A1E67F0 00000050
 0018FCFC 00000001
\ No newline at end of file
diff --git a/GMSE01.ini b/GMSE01.ini
index 74c181dd83..c4b52f49bd 100644
--- a/GMSE01.ini
+++ b/GMSE01.ini
@@ -4,68 +4,54 @@ EmulationStateId = 0
 [OnFrame]
 
 [ActionReplay]
-All Shines (not working)
-00E60AE1 18000000
++$All Shines (not working)
 045708E8 FFFFFFFF
 045708EC FFFFFFFF
 045708F0 FFFFFFFF
 
-Open all levels and nozzles (not working?)
-00E60AE0 18000000
+$Open all levels and nozzles (not working?)
 04570958 FFFFFFFF
 0457095C FFFFFFFF
 
-8 red coins(press L & B) (not working?)
-00E61642 18000000
+$8 red coins(press L & B) (not working?)
 0A3FBBF4 00000240
 025709DE 00000008
 
-Infinite hover time
-00E61520 18000000
+$Infinite hover time
 042640BC 60000000
 
-Infinite water
-00E6151F 18000000
+$Infinite water
 04263F58 38002710
 042635B0 60000000
 
-Infinite health (not working?)
-00E60ADF 18000000
+$Infinite health (not working?)
 424057F4 00040009
 
-Infinite Jetpack
-00B816CA 08000000
+$Infinite Jetpack
 0426C330 60000000
 
-Infinite Hose
-00B816C9 08000000
+$Infinite Hose
 0426B9C8 60000000
 
-Infinite Lives
-00B816CB 08000000
+$Infinite Lives
 04578A04 00000063
 
-Super Jump
-00B816CC 08000000
+$Super Jump
 0A404454 00000100
 4240E12C 05003DC0
 12404454 00000100
 4240E12C 05003E80
 
-99 lives
-00E60ADE 18000000
+$99 lives
 00570967 00000063
 
-Test Level
-00B86425 08000000
+$Test Level
 043E9710 00000C01
 
-Low Gravity
-00B809F5 08000000
+$Low Gravity
 4240E12C 05003E00
  
-Jesus Mode A.K.A. Walk on Water D-Pad Up/Down = On/Off (not supported yet)
-00B813BC 08000000
+$Jesus Mode A.K.A. Walk on Water D-Pad Up/Down = On/Off (not supported yet)
 04002F00 3C608041
 04002F04 8063E12C
 04002F08 80C3FFCC
@@ -85,76 +71,58 @@ Jesus Mode A.K.A. Walk on Water D-Pad Up/Down = On/Off (not supported yet)
 0A404454 00000004
 04189854 4E800020
 
-Do Not Have To Move Before Triple Jump
-00B819B3 08000000
+$Do Not Have To Move Before Triple Jump
 4240E10C 06B00000
 
-Spin Jump Gravity - Really Slow Fall
-00B86E48 08000000
+$Spin Jump Gravity - Really Slow Fall
 4240E10C 058E3D00
 
-Spin Jump Gravity - Almost No Fall
-00B8369D 08000000
+$Spin Jump Gravity - Almost No Fall
 4240E10C 058E0000
 
-Spin Jump Gravity - Fall Really Fast
-00B86350 08000000
+$Spin Jump Gravity - Fall Really Fast
 4240E10C 058E4200
 
-Spin Jump Gravity - Normal Speed
-00B80454 08000000
+$Spin Jump Gravity - Normal Speed
 4240E10C 058E3EB3
 
-Insane heat waves Crazy colors everywhere!
-00B80485 08000000
+$Insane heat waves Crazy colors everywhere!
 043AA070 41200000
 
-Double vision heat wave (narrow)
-00B856EB 08000000
+$Double vision heat wave (narrow)
 043AA070 3F600000
 
-Double vision heat wave (wide)
-00B85C4A 08000000
+$Double vision heat wave (wide)
 043AA070 3F400000
 
-Use only one of following two. Vanish point visual distortion
-00B842EC 08000000
+$Use only one of following two. Vanish point visual distortion
 043AB304 3E000000
 
-Hard to select file, activators will work if you add them.. Camera is far out
-00B82579 08000000
+$Hard to select file, activators will work if you add them.. Camera is far out
 043AB304 3F000000
 
-X textures
-00B80A69 08000000
+$X textures
 043DB210 41200000
 
-Y textures
-00B80605 08000000
+$Y textures
 043DB224 41200000
 
-Z textures
-00B86358 08000000
+$Z textures
 043DB238 41200000
 
-Strangely distorted people
-00B82C96 08000000
+$Strangely distorted people
 0440CC24 3F900000
 
-Mute game
-00B87829 08000000
+$Mute game
 04417248 00000000
 
-+Magnify camera
-00B87EB7 08000000
+$Magnify camera
 04417690 3F900000
 
-Warped camera view
-00B851AB 08000000
+$Warped camera view
 044176A8 3E000000
 
-Poorly Shaded Mario
-00B87DA5 08000000
+$Poorly Shaded Mario
 044176FC 00000000
 
 #Press the buttons below to switch to another nozzle. You must have your nozzle set to squirt for it to work
@@ -163,8 +131,7 @@ Poorly Shaded Mario
 #B+D-Pad Right: Hover Nozzle
 #B+D-PadDown: Jump Nozzle
 
-Nozzle Modifier
-00B83682 08000000
+$Nozzle Modifier
 0A404454 00000208
 04269F50 3BE00001
 0A404454 00000204
@@ -174,35 +141,30 @@ Nozzle Modifier
 0A404454 00000202
 04269F50 3BE00004
 
-Always Green Yoshi
-00B80C27 08000000
+$Always Green Yoshi
 405F3A90 04AE4C00
 
-Hold B To Run Super Fast (I think it works)
-00B816CD 08000000
+$Hold B To Run Super Fast
 0A404454 00000200
 4240E12C 06E44200
 12404454 00000200
 4240E12C 06E43F80
 
-D-Pad Up For Large Mario (not supported yet)
-00B816CE 08000000
+$D-Pad Up For Large Mario
 8A404454 00000008
 4240E12C 4DE43FF8
 4240E12C 4DE63FF8
 4240E12C 4DE83FF8
 00000000 40000000
 
-D-Pad Down For Mini Mario (not supported yet)
-00B816CF 08000000
+$D-Pad Down For Mini Mario
 8A404454 00000004
 4240E12C 4DE43E88
 4240E12C 4DE63E88
 4240E12C 4DE83E88
 00000000 40000000
 
-D-Pad Left For Normal Mario (not supported yet)
-00B816D0 08000000
+$D-Pad Left For Normal Mario
 8A404454 00000004
 4240E12C 4DE43F80
 4240E12C 4DE63F80
diff --git a/GSNP8P.ini b/GSNP8P.ini
index 88a8e6c53d..caeccbccbd 100644
--- a/GSNP8P.ini
+++ b/GSNP8P.ini
@@ -5,24 +5,16 @@ EmulationStateId = 5
 [OnFrame] 
 #Add memory patches here.  
 [ActionReplay]
-m
-007A04F1 98000000
-C40F0838 00000800
-
-999 Rings
-007A0489 18000000
++$999 Rings
 021CC430 000003E7
 
-99 Lives
-007A048A 18000000
++$99 Lives
 021CC42C 00000063
 
-Monster Score
-007A048B 18000000
+$Monster Score
 041CC458 05F5E0FF
 
-L to reset timer to 0:00.00
-007A1AD1 18000000
+$L to reset timer to 0:00.00
 4C1E5704 FFFDFFFF
 041CC3E0 00000000
 041CC3E4 00080000
@@ -33,162 +25,130 @@ L to reset timer to 0:00.00
 
 #updates the number of emblems held
 
-Green forest
-007A1AD5 18000000
+$Green forest
 041F2884 05050505
 041F2888 05050505
 
-White jungle
-007A1AD6 18000000
+$White jungle
 041F2948 05050505
 041F294C 05050505
 
-Pumpkin hill
-007A1AD7 18000000
+$Pumpkin hill
 041F2A0C 05050505
 041F2A10 05050505
 
-Sky rail
-007A1AD8 18000000
+$Sky rail
 041F2AD0 05050505
 041F2AD4 05050505
 
-Aquatic mine
-007A1AD9 18000000
+$Aquatic mine
 041F2B94 05050505
 041F2B98 05050505
 
-Security hall
-007A1ADA 18000000
+$Security hall
 041F2C58 05050505
 041F2C5C 05050505
 
-Prison lane
-007A1ADB 18000000
+$Prison lane
 041F2D1C 05050505
 041F2D20 05050505
 
-Metal harbor
-007A1ADC 18000000
+$Metal harbor
 041F2DE0 05050505
 041F2DE4 05050505
 
-Iron gate
-007A1ADD 18000000
+$Iron gate
 041F2EA4 05050505
 041F2EA8 05050505
 
-Weapons bed
-007A1ADE 18000000
+$Weapons bed
 041F2F68 05050505
 041F2F6C 05050505
 
-City escape
-007A1ADF 18000000
+$City escape
 041F302C 05050505
 041F3030 05050505
 
-Radical highway
-007A1AE0 18000000
+$Radical highway
 041F30F0 05050505
 041F30F4 05050505
 
-Wild canyon
-007A1AE1 18000000
+$Wild canyon
 041F3278 05050505
 041F327C 05050505
 
-Mission street
-007A1AE2 18000000
+$Mission street
 041F333C 05050505
 041F3340 05050505
 
-Dry lagoon
-007A1AE3 18000000
+$Dry lagoon
 041F3400 05050505
 041F3404 05050505
 
-Sand ocean
-007A1AE4 18000000
+$Sand ocean
 041F364C 05050505
 041F3650 05050505
 
-Crazy gadget
-007A1AE5 18000000
+$Crazy gadget
 041F3710 05050505
 041F3714 05050505
 
-Hidden base
-007A1AE6 18000000
+$Hidden base
 041F37D4 05050505
 041F37D8 05050505
 
-Eternal engine
-007A1AE7 18000000
+$Eternal engine
 041F3898 05050505
 041F389C 05050505
 
-Death chamber
-007A1AE8 18000000
+$Death chamber
 041F395C 05050505
 041F3960 05050505
 
-Egg quarters
-007A1AE9 18000000
+$Egg quarters
 041F3A20 05050505
 041F3A24 05050505
 
-Lost colony
-007A1AEA 18000000
+$Lost colony
 041F3AE4 05050505
 041F3AE8 05050505
 
-Pyramid cave
-007A1AEB 18000000
+$Pyramid cave
 041F3BA8 05050505
 041F3BAC 05050505
 
-Final rush
-007A1AEC 18000000
+$Final rush
 041F3D30 05050505
 041F3D34 05050505
 
-Green hills
-007A1AED 18000000
+$Green hills
 041F3DF4 05050505
 041F3DF8 05050505
 
-Meteor Head
-007A1AEE 18000000
+$Meteor Head
 041F3EB8 05050505
 041F3EBC 05050505
 
-Cannon's core
-007A1AEF 18000000
+$Cannon's core
 041F4040 05050505
 041F4044 05050505
 
-Final chase
-007A1AF0 18000000
+$Final chase
 041F44D8 05050505
 041F44DC 05050505
 
-Cosmic wall
-007A1AF1 18000000
+$Cosmic wall
 041F4724 05050505
 041F4728 05050505
 
-Mad space
-007A1AF2 18000000
+$Mad space
 041F47E8 05050505
 041F47EC 05050505
 
-Route 101
-007A1AF3 18000000
+$Route 101
 041F5428 05050505
 041F542C 05050505
 
-Route 280
-007A1AF4 18000000
+$Route 280
 041F54EC 05050505
 041F54F0 05050505
\ No newline at end of file
diff --git a/GZ2E01.ini b/GZ2E01.ini
index 38a64c4c13..9991809c16 100644
--- a/GZ2E01.ini
+++ b/GZ2E01.ini
@@ -5,112 +5,89 @@ EmulationStateId = 2
 [OnFrame]
 #Add memory patches here.
 [ActionReplay]
-(M)
-0774EB2B 88000000
+$(M)
 C435D468 0000FF01
 
-Infinite Health
-0774EB2C 08000000
++$Infinite Health
 004061C3 00000050
 
-Max Health
-0774EB2D 08000000
++$Max Health
 004061C1 00000064
 
-Infinite Rupees
-0774EB2E 08000000
+$Infinite Rupees
 024061C4 000003E8
 
-Infinite Oxygen
-0774EB2F 08000000
+$Infinite Oxygen
 0240BFA2 00000258
 
-Infinite Slingshot Pellets
-0774EB30 08000000
+$Infinite Slingshot Pellets
 004062B4 00000032
 
-Infinite Bombs
-0774EB31 08000000
+$Infinite Bombs
 004062AD 0000001E
 
-Infinite Arrows
-0774EB32 08000000
+$Infinite Arrows
 004062AC 0000001E
 
-Infinite Lantern Oil (breaks game)
-0774EB33 08000000
+$Infinite Lantern Oil (breaks game)
 024061C8 00005460
 
-Have All Swords/Shields/Tunics
-0774EB34 08000000
+$Have All Swords/Shields/Tunics
 04406290 FFFFFFFF
 
-All Hidden Skills Learned
-0774EB35 08000000
+$All Hidden Skills Learned
 004069D9 0000000F
 004069DA 000000F0
 
 #Do not use this code until you have the lantern in your inventory.
 
-Have Dungeon Map/Compass/Boss Key
-0774EB36 08000000
+$Have Dungeon Map/Compass/Boss Key
 28406B35 00000007
 00406B35 00000007
 
-Infinite Small Keys
-0774EB37 08000000
+$Infinite Small Keys
 00406B34 00000005
 
-Rupees Never Increase or Decrease
-0774EB38 08000000
+$Rupees Never Increase or Decrease
 04220C9C 60000000
 
-Have All Letters
-0774EB39 08000000
+$Have All Letters
 024062DE 0000FFFF
 044062EC 01020304
 044062F0 05060708
 044062F4 090A0B0C
 044062F8 0D0E0F10
 
-Have All Golden Bugs
-0774EB3A 08000000
+$Have All Golden Bugs
 004062A5 000002FF
 
-Have Giant Wallet
-0774EB3B 08000000
+$Have Giant Wallet
 004061D9 00000002
 
-EASY VESSEL OF LIGHT
-0774EB3C 05008000
+#EASY VESSEL OF LIGHT
 
 #Do not use these codes until you have explored all of the Twilight and activated the warp portals.
 
-One Tear Fills 1st Vessel of Light
-0774EB3D 04759E40
+$One Tear Fills 1st Vessel of Light
 284062D4 0000000F
 004062D4 0000000F
 
-One Tear Fills 2nd Vessel of Light
-0774EB3E 04759E40
+$One Tear Fills 2nd Vessel of Light
 284062D5 0000000F
 004062D5 0000000F
 
-One Tear Fills 3rd Vessel of Light
-0774EB3F 04759E40
+$One Tear Fills 3rd Vessel of Light
 284062D6 0000000F
 004062D6 0000000F
 
-RD-Pad Left/Right Controls Fog
-0774EB40 08000000
+$RD-Pad Left/Right Controls Fog
 0A3DD31A 00000022
 8440BF1C 00000005
 0A3DD31A 00000021
 8440BF1C FFFFFFFB
 
-RD-Pad Left/Right Controls Time
-0774EB41 08000000
+$RD-Pad Left/Right Controls Time
 0A3DD31A 00000022
 844061F4 00003000
 0A3DD31A 00000021
-844061F4 FFFFCFFF
+844061F4 FFFFCFFF
\ No newline at end of file
diff --git a/GZLE01.ini b/GZLE01.ini
index acbd9a3706..49eae82736 100644
--- a/GZLE01.ini
+++ b/GZLE01.ini
@@ -22,19 +22,16 @@ EmulationStateId = 2
 
 [ActionReplay]
 # Codes by GCNHacker87 (yes we forgot to ask permission)
-Master Code (useless)
-01E0197D 88000000
+$Master Code (useless)
 C4323EA8 0000FF00
 
-Shadow Link
-01E05E82 08000000
+$Shadow Link
 041926B8 60000000
 423BCDA0 00BCFFFF
 423BCDA0 00BDFF87
 403BCDA0 00017E3F
 
-Stuff at the top right of the screen is not visible
-01E00EFA 08000000
+$Stuff at the top right of the screen is not visible
 903ED848 00000000
 023F633C 00028000
 003F710A 00000080
@@ -44,8 +41,7 @@ Stuff at the top right of the screen is not visible
 403BB498 002F5080
 00000000 40000000
 
-Super Hookshot
-01E03C97 08000000
+$Super Hookshot
 043F9DFC 48420B00
 040F1E68 28030001
 043F9E00 43008700
@@ -54,21 +50,18 @@ Super Hookshot
 123ED84A 00000140
 040F2898 8001004C
 
-Teleport to Fire Mountain up R Y
-01E05660 08000000
+$Teleport to Fire Mountain up R Y
 4A3ED84A 00000828
 043E440C 482F85A1
 043E4414 C7EA36FD
 
-Hold A to swim fast
-01E0712B 08000000
+$Hold A to swim fast
 0A3ED84A 00000100
 0435D548 44610000
 123ED84A 00000100
 0435D548 41900000
 
-Run/Swim/Crawl fast Hold A
-01E06820 08000000
+$Run/Swim/Crawl fast Hold A
 4A3ED84A 00000100
 0435CEEC 42480000
 0435D548 44610000
@@ -80,40 +73,33 @@ Run/Swim/Crawl fast Hold A
 123ED84A 00000120
 0435DB94 40400000
 
-Max Health
-01E0197E 08000000
++$Max Health
 003C4C09 00000050
 
-Infinite Health
++$Infinite Health
 01E0197F 08000000
 003C4C0B 00000050
 
-Full Nintendo Gallery
-01E01A3B 08000000
+$Full Nintendo Gallery
 003C5260 00000001
 023C52AC 0003FFFF
 023C52B8 0005FFFF
 003C52C8 000000FF
 023C52DC 0000FFFF
 
-Small energy sword
-01E058C4 08000000
+$Small energy sword
 0435DF6C 004A004A
 
-Full energy Sword
-01E03B23 08000000
+$Full energy Sword
 0435DF6C 004C004C
 
-HookShot Head/beam sword
-01E064B0 08000000
+$HookShot Head/beam sword
 0435DF6C 004C001E
 
-Normal/no glow
-01E042B7 08000000
+$Normal/no glow
 0435DF6C 00460046
 
-Jesus Mode aka WalkOnWater
-01E071C7 08000000
+$Jesus Mode aka WalkOnWater
 04004010 2C070003
 04004014 C01EFFA0
 04004018 4182000C
@@ -137,29 +123,25 @@ Jesus Mode aka WalkOnWater
 040A2F7C 4BF61094
 0413D020 4BEC7028
 
-Use anything indoors
-01E01C68 08000000
+$Use anything indoors
 0020485F 0000007E
 
-Sink or Swim AD-pad down sink BD-pad down swim
-01E00949 08000000
+$Sink or Swim A+D-pad down sink B+D-pad down swim
 0A3ED84A 00000104
 0435D560 50000000
 0A3ED84A 00000204
 0435D560 42B40000
 
-Jump to a ledge at any height
-01E05CFA 08000000
+$Jump to a ledge at any height
 0435D734 469C4000
 
-Very Fast on Ladders (May have to barly tap forward on joystick inorder to get on vein walls)
-01E01534 08000000
++$Very Fast on Ladders (May have to barly tap forward on joystick inorder to get on vein walls)
 00000000 8435DB18
 41200000 00040002
 0435DB38 7F7FFFFF
 
-Extra deku leaf controls (Y makes you rise, Z keeps you at your current height, X wind pulls you instead of push, to stop it from rising you must close and reopen the leaf quickly)
-01E04637 08000000
+#Extra deku leaf controls (Y makes you rise, Z keeps you at your current height, X wind pulls you instead of
+$push, to stop it from rising you must close and reopen the leaf quickly)
 0A3ED84A 00000800
 0435DC90 40700000
 0A3ED84A 00000010
@@ -170,251 +152,193 @@ Extra deku leaf controls (Y makes you rise, Z keeps you at your current height,
 0435DC90 C0000000
 0435DCA4 41166666
 
-Roll further
-01E05AB9 08000000
+$Roll further
 0435D3D0 40000000
 
-Instead of rolling, you glide
-01E05AAE 08000000
+$Instead of rolling, you glide
 0435D3CC 45500000
 
 #DON'T USE ANY OF THE FOLLOWING CODES UNTIL AFTER MEETING THE DRAGON BOAT
-Max Magic
-01E01983 08000000
+$Max Magic
 003C4C1B 00000020
 
-Infinite Magic
-01E01984 08000000
+$Infinite Magic
 003C4C1C 00000020
 
-Can Carry 1000 Rupees
-01E01985 08000000
+$Can Carry 1000 Rupees
 003C4C1A 00000001
 
-Can Carry 5000 Rupees
-01E01986 08000000
+$Can Carry 5000 Rupees
 003C4C1A 00000002
 
-Always Have 1000 Rupees
-01E01987 08000000
+$Always Have 1000 Rupees
 023C4C0C 000003E8
 
 
-Always Have 5000 Rupees
-01E01988 08000000
+$Always Have 5000 Rupees
 023C4C0C 00001388
 
-Link Can Swim Forever
-01E01989 08000000
+$Link Can Swim Forever
 023CA76E 00000384
 
-Have All Songs
-01E0198A 08000000
+$Have All Songs
 003C4CC5 0000003F
 
-Have Hero's Sword
-01E0198B 08000000
+$Have Hero's Sword
 003C4C16 00000038
 003C4CBC 00000001
 
-Have Mirror Shield
-01E0198C 08000000
+$Have Mirror Shield
 003C4C17 0000003C
 003C4CBD 00000003
 
-Have Telescope
-01E0198D 08000000
+$Have Telescope
 003C4C44 00000020
 
-Have Sail
-01E0198E 08000000
+$Have Sail
 003C4C45 00000078
 
-Have Wind Waker
-01E0198F 08000000
+$Have Wind Waker
 003C4C46 00000022
 
-Have Grappling Hook
-01E01990 08000000
+$Have Grappling Hook
 003C4C47 00000025
 
-Have Boomerang
-01E01991 08000000
+$Have Boomerang
 003C4C49 0000002D
 
-Have Deku Leaf
-01E01992 08000000
+$Have Deku Leaf
 003C4C4A 00000034
 
-Have Tingle Tuner
-01E01993 08000000
+$Have Tingle Tuner
 003C4C4B 00000021
 
-Have DX Camera
-01E01994 08000000
+$Have DX Camera
 003C4C4C 00000026
 
-Have Iron Boots
-01E01995 08000000
+$Have Iron Boots
 003C4C4D 00000029
 
-Have Magic Shielding
-01E01996 08000000
+$Have Magic Shielding
 003C4C4E 0000002A
 
-Have Bow And All Arrows
-01E01997 08000000
+$Have Bow And All Arrows
 003C4C50 00000036
 
-Have Bombs
-01E01998 08000000
+$Have Bombs
 003C4C51 00000031
 
-Have Hookshot
-01E01999 08000000
+$Have Hookshot
 003C4C57 0000002F
 
-Have Megaton Hammer
-01E0199A 08000000
+$Have Megaton Hammer
 003C4C58 00000033
 
-Have Bottle 1
-01E0199B 08000000
+$Have Bottle 1
 003C4C52 00000050
 
-Have Bottle 2
-01E0199C 08000000
+$Have Bottle 2
 003C4C53 00000050
 
-Have Bottle 2 With Fairy
-01E01ACC 08000000
+$Have Bottle 2 With Fairy
 003C4C53 00000057
 
-Have Bottle 3
-01E0199D 08000000
+$Have Bottle 3
 003C4C54 00000050
 
-Have Bottle 3 With Blue Potion
-01E01ACD 08000000
+$Have Bottle 3 With Blue Potion
 003C4C54 00000053
 
-Have Bottle 4
-01E0199E 08000000
+$Have Bottle 4
 003C4C55 00000050
 
-Have Spoils Bag
-01E0199F 08000000
+$Have Spoils Bag
 003C4C48 00000024
 
-Have Bait Bag
-01E019A0 08000000
+$Have Bait Bag
 003C4C4F 0000002C
 
-Have Delivery Bag
-01E019A1 08000000
+$Have Delivery Bag
 003C4C56 00000030
 
-Infinite Berry Feed
-01E019A2 08000000
+$Infinite Berry Feed
 003C4C86 00000082
 003C4CAC 00000009
 
-Infinite Pear Feed
-01E019A3 08000000
+$Infinite Pear Feed
 003C4C87 00000083
 003C4CAD 00000009
 
-Max Red Chu Jelly
-01E019A4 08000000
+$Max Red Chu Jelly
 003C4C7E 00000049
 003C4CA4 00000063
 
-Max Green Chu Jelly
-01E019A5 08000000
+$Max Green Chu Jelly
 003C4C83 0000004A
 003C4CA5 00000063
 
-Max Blue Chu Jelly
-01E019A6 08000000
+$Max Blue Chu Jelly
 003C4C85 0000004B
 003C4CA6 00000063
 
-Max Joy Pendants
-01E019A7 08000000
+$Max Joy Pendants
 003C4C7F 0000001F
 003C4CA7 00000063
 
-Max Skull Necklaces
-01E019A8 08000000
+$Max Skull Necklaces
 003C4C80 00000045
 003C4CA8 00000063
 
-Max Knight's Crest
-01E019A9 08000000
+$Max Knight's Crest
 003C4C81 00000048
 003C4CA9 00000063
 
-Max Boko Baba Seeds
-01E019AA 08000000
+$Max Boko Baba Seeds
 003C4C82 00000046
 003C4CAA 00000063
 
-Max Golden Feathers
-01E019AB 08000000
+$Max Golden Feathers
 003C4C84 00000047
 003C4CAB 00000063
 
-Can Carry 99 Arrows
-01E019AC 08000000
+$Can Carry 99 Arrows
 003C4C77 00000063
 
-Can Carry 99 Bombs
-01E019AD 08000000
+$Can Carry 99 Bombs
 003C4C78 00000063
 
-Infinite Arrows
-01E019AE 08000000
+$Infinite Arrows
 003C4C71 00000063
 
-Infinite Bombs
-01E019AF 08000000
+$Infinite Bombs
 003C4C72 00000063
 
-Have Fully Detailed Map
-01E019B0 08000000
+$Have Fully Detailed Map
 023C4D0C 00170303
 003C4D3C 00000003
 
-Have All Quest Maps
-01E019B1 08000000
+$Have All Quest Maps
 023C4CDC 0003FFFF
 
-All Triforce Maps Translated
-01E019B2 08000000
+$All Triforce Maps Translated
 003C4D4D 000000FF
 
-Fully Charged Master Sword DON'T USE THIS CODE UNTIL YOU HAVE THE MASTER SWORD
-01E01A3E 08000000
+$Fully Charged Master Sword DON'T USE THIS CODE UNTIL YOU HAVE THE MASTER SWORD
 003C4C16 0000003E
 003C4CBC 0000000F
 
-Have All Element Stones DON'T USE THIS CODE UNTIL DRAGON ROOST ISLAND
-01E019B5 08000000
+$Have All Element Stones DON'T USE THIS CODE UNTIL DRAGON ROOST ISLAND
 003C4CC7 00000007
 003C524A 00000040
 
-
-Have Complete Triforce USE THIS CODE AFTER BEATING THE TOWER OF THE GODS
-01E019B8 08000000
+$Have Complete Triforce USE THIS CODE AFTER BEATING THE TOWER OF THE GODS
 003C4CC6 000000FF
 
-Press R to Jump
-01E019BB 08000000
+$Press R to Jump
 0A3ED84A 00000020
 863E4410 00000001
 
-Press R to Mega Jump
-01E019BC 08000000
+$Press R to Mega Jump
 0A3ED84A 00000020
 863E4410 00000003
 
@@ -422,119 +346,104 @@ Press R to Mega Jump
 
 #HOLD COMBO DURING LEVEL LOAD
 
-Test room 1 - Hold (L + Z)
-01E01F0E 08000000
+$Test room 1 - Hold (L + Z)
 8A3ED84A 00000050
 043C9D44 000000FF
 043C9D48 495F5465
 043C9D4C 73744D00
 00000000 40000000
 
-Test room 2 - Hold (L + Y)
-01E01F0F 08000000
+$Test room 2 - Hold (L + Y)
 8A3ED84A 00000840
 043C9D44 000000FF
 043C9D48 495F5465
 043C9D4C 73745200
 00000000 40000000
 
-Test room 3 - Hold (L + X)
-01E01F10 08000000
+$Test room 3 - Hold (L + X)
 8A3ED84A 00000440
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73743200
 00000000 40000000
 
-Test room 4 - Hold (L + A)
-01E01F11 08000000
+$Test room 4 - Hold (L + A)
 8A3ED84A 00000140
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73743300
 00000000 40000000
 
-Test room 5 - Hold (L + B)
-01E01F12 08000000
+$Test room 5 - Hold (L + B)
 8A3ED84A 00000240
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73743400
 00000000 40000000
 
-Test room 6 - Hold (L + DPad Up)
-01E01F13 08000000
+$Test room 6 - Hold (L + DPad Up)
 8A3ED84A 00000048
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73743500
 00000000 40000000
 
-Test room 7 - Hold (L + DPad Down)
-01E01F14 08000000
+$Test room 7 - Hold (L + DPad Down)
 8A3ED84A 00000044
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73743600
 00000000 40000000
 
-Test room 8 - Hold (L + Dpad Left)
-01E01F15 08000000
+$Test room 8 - Hold (L + Dpad Left)
 8A3ED84A 00000041
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73743800
 00000000 40000000
 
-Test room 9 - Hold (L + Dpad Right)
-01E01F16 08000000
+$Test room 9 - Hold (L + Dpad Right)
 8A3ED84A 00000042
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73743900
 00000000 40000000
 
-Test room 10 - Hold (L + R + Z)
-01E01F17 08000000
+$Test room 10 - Hold (L + R + Z)
 8A3ED84A 00000070
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73746100
 00000000 40000000
 
-Test room 11 - Hold (L + R+ Y)
-01E01F18 08000000
+$Test room 11 - Hold (L + R+ Y)
 8A3ED84A 00000860
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73746200
 00000000 40000000
 
-Test room 12 - Hold (L + R+ X)
-01E01F19 08000000
+$Test room 12 - Hold (L + R+ X)
 8A3ED84A 00000460
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73746300
 00000000 40000000
 
-Test room 13 - Hold (L + R+ A)
-01E01F1A 08000000
+$Test room 13 - Hold (L + R+ A)
 8A3ED84A 00000160
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73746400
 00000000 40000000
 
-Test room 14 - Hold (L + R+ B)
-01E01F1B 08000000
+$Test room 14 - Hold (L + R+ B)
 8A3ED84A 00000260
 043C9D44 000000FF
 043C9D48 4B5F5465
 043C9D4C 73746500
 00000000 40000000
 
-Unrestricted Camera
-01E05932 08000000
+$Unrestricted Camera
 04356D34 45000000
-04356D48 42B00000
+04356D48 42B00000
\ No newline at end of file
diff --git a/GZLP01.ini b/GZLP01.ini
index d6c6ac70a5..dca5dbc9d4 100644
--- a/GZLP01.ini
+++ b/GZLP01.ini
@@ -21,422 +21,283 @@ EmulationStateId = 2
 #only supports decrypted AR codes
 
 [ActionReplay]
-(M)
-02041EB3 98000000
+$(M)
 C4329400 0000FF00
 
-Maximum Health
-02041EB4 18000000
+$Maximum Health
 003CC531 00000050
 
-Infinite Health
-02041EB5 18000000
+$Infinite Health
 003CC533 00000050
 
-Never Lose Health
-0204D88D 18000000
+$Never Lose Health
 041F4A90 60000000
 
-Never Drown
-02041EB6 18000000
+$Never Drown
 023D2096 00000300
 
-Infinite Rupees
-02041EB7 18000000
+$Infinite Rupees
 023CC534 00001388
 
-Can Carry 5000 Rupees
-02041EB8 18000000
+$Can Carry 5000 Rupees
 003CC542 00000002
 
-Massive Link
-02041EB9 18000000
+$Massive Link
 423D1D38 010A4080
 423D1D38 010C4080
 423D1D38 010E4080
 
-Tiny Link
-02041EBA 18000000
+$Tiny Link
 423D1D38 010A3E80
 423D1D38 010C3E80
 423D1D38 010E3E80
 
-Unrestricted Camera
-02045931 18000000
+$Unrestricted Camera
 0435D084 45000000
 0435D098 42B00000
 
-Supersprint Link (Hold R)
-02041EBB 18000000
+$Supersprint Link (Hold R)
 0A3F5018 00000020
 423D1D38 1ADE4281
 
-Moon Jump (Hold DPad Down)
-02041EBC 18000000
+$Moon Jump (Hold DPad Down)
 0A3F5018 00000004
 423D1D38 01124204
 
-Maximum Magic
-02041EC0 18000000
+$Maximum Magic
 003CC543 00000020
 
-#Do not use this code until after meeting the Dragon Boat
+#Do not use the following codes until after meeting the Dragon Boat
 
-Infinite Magic
-02041EC1 18000000
+$Infinite Magic
 003CC544 00000020
 
-#Do not use this code until after meeting the Dragon Boat
-
-All Melodies
-02041EC2 18000000
+$All Melodies
 003CC5ED 0000003F
 
-#Do not use this code until after meeting the Dragon Boat
-
-Infinite Arrows
-02041ED1 18000000
+$Infinite Arrows
 003CC599 00000063
 
-#Do not use this code until after meeting the Dragon Boat
-
-Infinite Bombs
-02041ED3 18000000
+$Infinite Bombs
 003CC59A 00000063
 
-#Do not use this code until after meeting the Dragon Boat
-
-Infinite All-Purpose Bait
-02041EDF 18000000
+$Infinite All-Purpose Bait
 003CC5AE 00000082
 003CC5D4 00000009
 
-#Do not use this code until after meeting the Dragon Boat
-
-Infinite Hyoi Pear Bait
-02041EE0 18000000
+$Infinite Hyoi Pear Bait
 003CC5AF 00000082
 003CC5D5 00000009
 
-#Do not use this code until after meeting the Dragon Boat
-
-Night Mode
-02041EE8 18000000
+$Night Mode
 043ED010 3F000000
 043ED018 3F000000
 043ED020 300001CE
 043ED024 300001CE
 
-Glow in the Dark Link
-02041EE9 18000000
-043ED014 40800000
-
-Have Fully Detailed Map
-0204EB5F 18000000
-023CC634 00170303
-003CC664 00000003
-
-Item Codes
-0204D254 15008000
-
-Have Master Sword
-02041EC3 14692A40
-003CC53E 00000039
-003CC5E4 00000001
-
-#Do not use this code until after meeting the Dragon Boat
-
-Have Mirror Shield
-02041EC4 14692A40
+$Have Mirror Shield
 003CC53F 0000003C
 003CC5E5 00000002
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Power Bracelets
-02041EC5 14692A40
+$Have Power Bracelets
 003CC540 00000028
 003CC5E6 00000002
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Telescope
-02041EC6 14692A40
+$Have Telescope
 003CC56C 00000020
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Sail
-02041EC7 14692A40
+$Have Sail
 003CC56D 00000078
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Wind Waker
-02041EC8 14692A40
+$Have Wind Waker
 003CC56E 00000022
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Grappling Hook
-02041EC9 14692A40
+$Have Grappling Hook
 003CC56F 00000025
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Boomerang
-02041ECA 14692A40
+$Have Boomerang
 003CC571 0000002D
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Deku Leaf
-02041ECB 14692A40
+$Have Deku Leaf
 003CC572 00000034
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Tingle Tuner
-02041ECC 14692A40
+$Have Tingle Tuner
 003CC573 00000021
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Deluxe Picto Box
-02041ECD 14692A40
+$Have Deluxe Picto Box
 003CC574 00000026
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Iron Boots
-02041ECE 14692A40
+$Have Iron Boots
 003CC575 00000029
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Magic Armour
-02041ECF 14692A40
+$Have Magic Armour
 003CC576 0000002A
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bow And All Arrows
-02041ED0 14692A40
+$Have Bow And All Arrows
 003CC578 00000036
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bombs
-02041ED2 14692A40
+$Have Bombs
 003CC579 00000031
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Hookshot
-02041ED4 14692A40
+$Have Hookshot
 003CC57F 0000002F
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Skull Hammer
-02041ED5 14692A40
+$Have Skull Hammer
 003CC580 00000033
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bottle 1
-02041ED6 14692A40
+$Have Bottle 1
 003CC57A 00000050
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bottle 2
-02041ED7 14692A40
+$Have Bottle 2
 003CC57B 00000050
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bottle 2 With Fairy
-02041ED8 14692A40
+$Have Bottle 2 With Fairy
 003CC57B 00000057
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bottle 3
-02041ED9 14692A40
+$Have Bottle 3
 003CC57C 00000050
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bottle 3 With Blue Potion
-02041EDA 14692A40
+$Have Bottle 3 With Blue Potion
 003CC57C 00000053
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bottle 4
-02041EDB 14692A40
+$Have Bottle 4
 003CC57D 00000050
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Spoils Bag
-02041EDC 14692A40
+$Have Spoils Bag
 003CC570 00000024
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Bait Bag
-02041EDD 14692A40
+$Have Bait Bag
 003CC577 0000002C
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Delivery Bag
-02041EDE 14692A40
+$Have Delivery Bag
 003CC57E 00000030
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Red Chu Jelly
-02041EE1 14692A40
+$Have Red Chu Jelly
 003CC5B6 00000049
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Green Chu Jelly
-02041EE2 14692A40
+$Have Green Chu Jelly
 003CC5B7 0000004A
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have Blue Chu Jelly
-02041EE3 14692A40
+$Have Blue Chu Jelly
 003CC5B8 0000004A
 
-#Do not use this code until after meeting the Dragon Boat
-
-Have All Pearls
-02041EE6 14692A40
+$Have All Pearls
 003CC5EF 00000007
 
-#Dont use this code until you reach Dragon Roost Island
-
-Have Completed Triforce
-02041EE7 14692A40
+$Have Completed Triforce
 003CC5EE 000000FF
 
-Test Rooms
-0204D255 15008000
+#################################
+
+$Glow in the Dark Link
+043ED014 40800000
+
+$Have Fully Detailed Map
+023CC634 00170303
+003CC664 00000003
+
+#Item Codes
+
+$Have Master Sword
+003CC53E 00000039
+003CC5E4 00000001
+
+#Test Rooms
 
 #Hold the button combo when going through doors or warping
 
-Test Room 1 (Hold L+Z)
-02041EED 14692AC0
+$Test Room 1 (Hold L+Z)
 8A3F5018 00000050
 043D166C 000000FF
 043D1670 495F5465
 043D1674 73744D00
 00000000 40000000
 
-Test Room 2 (Hold L+Y)
-02041EEE 14692AC0
+$Test Room 2 (Hold L+Y)
 8A3F5018 00000840
 043D166C 000000FF
 043D1670 495F5465
 043D1674 73745200
 00000000 40000000
 
-Test Room 3 (Hold L+X)
-02041EEF 14692AC0
+$Test Room 3 (Hold L+X)
 8A3F5018 00000440
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73743200
 00000000 40000000
 
-Test Room 4 (Hold L+A)
-02041EF0 14692AC0
+$Test Room 4 (Hold L+A)
 8A3F5018 00000140
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73743300
 00000000 40000000
 
-Test Room 5 (Hold L+B)
-02041EF1 14692AC0
+$Test Room 5 (Hold L+B)
 8A3F5018 00000240
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73743400
 00000000 40000000
 
-Test Room 6 (Hold L+DPad Up)
-02041EF2 14692AC0
+$Test Room 6 (Hold L+DPad Up)
 8A3F5018 00000048
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73743500
 00000000 40000000
 
-Test Room 7 (Hold L+DPad Down)
-02041EF3 14692AC0
+$Test Room 7 (Hold L+DPad Down)
 8A3F5018 00000044
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73743600
 00000000 40000000
 
-Test Room 8 (Hold L+DPad Left )
-02041EF4 14692AC0
+$Test Room 8 (Hold L+DPad Left )
 8A3F5018 00000041
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73743800
 00000000 40000000
 
-Test Room 9 (Hold L+DPad Right)
-02041EF5 14692AC0
+$Test Room 9 (Hold L+DPad Right)
 8A3F5018 00000042
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73743900
 00000000 40000000
 
-Test Room 11 (Hold L+R+Y)
-02041EF7 14692AC0
+$Test Room 11 (Hold L+R+Y)
 8A3F5018 00000860
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73746200
 00000000 40000000
 
-Test Room 10 (Hold L+R+Z)
-02041EF6 14692AC0
+$Test Room 10 (Hold L+R+Z)
 8A3F5018 00000070
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73746100
 00000000 40000000
 
-Test Room 12 (Hold L+R+X)
-02041EF8 14692AC0
+$Test Room 12 (Hold L+R+X)
 8A3F5018 00000460
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73746300
 00000000 40000000
 
-Test Room 13 (Hold L+R+A)
-02041EF9 14692AC0
+$Test Room 13 (Hold L+R+A)
 8A3F5018 00000160
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73746400
 00000000 40000000
 
-Test Room 14 (Hold L+R+B)
-02041EFA 14692AC0
+$Test Room 14 (Hold L+R+B)
 8A3F5018 00000260
 043D166C 000000FF
 043D1670 4B5F5465