diff --git a/.gitignore b/.gitignore
index a9b5f47cc..0757b7fe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 Graphics/CustomBattlers/local_sprites/*
 Graphics/Pokemon/FusionIcons/*
 Graphics/CustomBattlers/spritesheets
+Graphics/CustomBattlers/*
 Data/sprites/*
 Data/VERSION
 infinitefusion.sh
diff --git a/Data/Map813.rxdata b/Data/Map813.rxdata
index 582b61e2d..6884e3b73 100644
Binary files a/Data/Map813.rxdata and b/Data/Map813.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 8439473a8..93f61750b 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb
index 19929c3d4..786141aff 100644
--- a/Data/Scripts/049_Compatibility/Constants.rb
+++ b/Data/Scripts/049_Compatibility/Constants.rb
@@ -288,7 +288,7 @@ VAR_LATEST_CONSTELLATION=319
 VAR_TRAINER_CARD_BACKGROUND_PRICE=329
 VAR_GALLERY_TEAM_FLAGS=330
 
-
+VAR_REGI_PUZZLE_SWITCH_PRESSED = 1122
 ##############
 # COMMON EVENTS
 ################
diff --git a/Data/Scripts/052_AddOns/GameplayUtils.rb b/Data/Scripts/052_AddOns/GameplayUtils.rb
index 18af956da..0c997de10 100644
--- a/Data/Scripts/052_AddOns/GameplayUtils.rb
+++ b/Data/Scripts/052_AddOns/GameplayUtils.rb
@@ -654,11 +654,11 @@ def validate_regirock_steel_puzzle()
 end
 
 def registeel_ice_press_switch(letter)
-  order = pbGet(1)
+  order = pbGet(VAR_REGI_PUZZLE_SWITCH_PRESSED)
   solution = "ssBSBGG" # GGSBBss"
   registeel_ice_reset_switches() if !order.is_a?(String)
   order << letter
-  pbSet(1, order)
+  pbSet(VAR_REGI_PUZZLE_SWITCH_PRESSED, order)
   if order == solution
     echoln "OK"
     pbSEPlay("Evolution start", nil, 130)
@@ -674,7 +674,7 @@ def registeel_ice_reset_switches()
     pbSetSelfSwitch(switch_id, "A", false)
     echoln "reset" + switch_id.to_s
   end
-  pbSet(1, "")
+  pbSet(VAR_REGI_PUZZLE_SWITCH_PRESSED, "")
 end
 
 def regirock_steel_move_boulder()
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 46ab33c9b..196d54dd4 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ