diff --git a/Credits.txt b/Credits.txt
index 2ed177b97..c2db0a3ed 100644
--- a/Credits.txt
+++ b/Credits.txt
@@ -111,6 +111,9 @@ with their respective authors' consent
 		Lorelei VS sprite by Nalty 		http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
 		Kiwi (Kurt battle sprite)
 		UnworthyPie (Bruno battle sprite, Lance backsprite)
+		
+	Triple Fusion sprites
+		Sinnoh legendaries: 	Blackboot
 ### Tileset graphics ### 
 	Jorginho (OutsideEmerald)
 	ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
@@ -173,6 +176,7 @@ Wootius				Turbo Speed		https://www.pokecommunity.com/showthread.php?t=306037
 Marin				Better maps script	https://www.pokecommunity.com/showthread.php?t=411299
 barafanatic			Safari Zone improvements
 M3rein				Easy Questing System 
+bo4p5687			Multisave
 
 
 #### Data sources ###			  
diff --git a/Data/Map146.rxdata b/Data/Map146.rxdata
index 186100de7..c7d759550 100644
Binary files a/Data/Map146.rxdata and b/Data/Map146.rxdata differ
diff --git a/Data/Map647.rxdata b/Data/Map647.rxdata
index 1a6c049f1..ac826ce96 100644
Binary files a/Data/Map647.rxdata and b/Data/Map647.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index b5d5d5f5f..638419312 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/004_Game classes/004_Game_Map.rb b/Data/Scripts/004_Game classes/004_Game_Map.rb
index 864f30739..23c0a772b 100644
--- a/Data/Scripts/004_Game classes/004_Game_Map.rb	
+++ b/Data/Scripts/004_Game classes/004_Game_Map.rb	
@@ -198,8 +198,9 @@ class Game_Map
         end
         return false
       # Can't walk onto ice
-      elsif terrain.ice
-        return false
+      # removed for mahogany gym. idk if this will cause problems, hopefully not
+      # elsif terrain.ice
+      #   return false
       elsif self_event != nil && self_event.x == x && self_event.y == y
         # Can't walk onto ledges
         for j in [2, 1, 0]
diff --git a/Data/System.rxdata b/Data/System.rxdata
index fa697f3e3..c80074570 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 986b43038..77bf1296b 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/mkxp.json b/mkxp.json
index 67179665d..326216c87 100644
--- a/mkxp.json
+++ b/mkxp.json
@@ -97,7 +97,7 @@
     // This option may be force-disabled at build time.
     // (0 = disabled)
     //
-    "fixedFramerate": 0,
+    "fixedFramerate": 60,
 
 
     // Skip (don't draw) frames when behind.