diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index f3ebcd257..63fa8e47e 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map078.rxdata b/Data/Map078.rxdata
index 2482b7f64..ad61467a9 100644
Binary files a/Data/Map078.rxdata and b/Data/Map078.rxdata differ
diff --git a/Data/Map079.rxdata b/Data/Map079.rxdata
index fa53344b2..52be5cb48 100644
Binary files a/Data/Map079.rxdata and b/Data/Map079.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 4f69778dc..83faf5795 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb b/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
index 99210346d..3df2f73c5 100644
--- a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
+++ b/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
@@ -1803,7 +1803,7 @@ class PokeBattle_Move_05E < PokeBattle_Move
   def pbEffectGeneral(user)
     newType = @newTypes[@battle.pbRandom(@newTypes.length)]
     user.pbChangeTypes(newType)
-    typeName = GameData::Item.get(newType).name
+    typeName = GameData::Type.get(newType).name
     @battle.pbDisplay(_INTL("{1} transformed into the {2} type!",user.pbThis,typeName))
   end
 end
diff --git a/Data/Scripts/016_UI/006_UI_Summary.rb b/Data/Scripts/016_UI/006_UI_Summary.rb
index 58ab85ecf..a7aa1b33c 100644
--- a/Data/Scripts/016_UI/006_UI_Summary.rb
+++ b/Data/Scripts/016_UI/006_UI_Summary.rb
@@ -421,12 +421,12 @@ class PokemonSummary_Scene
     #     break
     #   end
     # end
-    if dexnum <= 0
-      textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow])
-    else
-      dexnum -= 1 if dexnumshift
-      textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow])
-    end
+    # if dexnum <= 0
+    #   textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow])
+    # else
+    #   dexnum -= 1 if dexnumshift
+    #   textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow])
+    # end
     # Write Original Trainer's name and ID number
     if @pokemon.owner.name.empty?
       textpos.push([_INTL("RENTAL"), 435, 170, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
index 25181fd37..fd7e9f6fc 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -1660,7 +1660,7 @@ class PokemonStorageScreen
               if pokemon != nil
                 if dexNum(pokemon.species) > NB_POKEMON
                   commands[cmdUnfuse = commands.length] = _INTL("Unfuse")
-                  commands[cmdReverse = commands.length] = _INTL("Reverse") if $PokemonBag.pbQuantity(:DNAREVERSER) > 0
+                  commands[cmdReverse = commands.length] = _INTL("Reverse") if $PokemonBag.pbQuantity(:DNAREVERSER) > 0 || $PokemonBag.pbQuantity(:INFINITEREVERSERS) > 0
                 else
                   commands[cmdFuse = commands.length] = _INTL("Fuse")
                 end
@@ -2285,7 +2285,7 @@ class PokemonStorageScreen
     if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be reversed?", pokemon.name))
       reverseFusion(pokemon)
     end
-    $PokemonBag.pbDeleteItem(:DNAREVERSER)
+    $PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0
   end
 
   def pbUnfuseFromPC(selected)
diff --git a/Data/Scripts/016_UI/020_UI_PokeMart.rb b/Data/Scripts/016_UI/020_UI_PokeMart.rb
index 9adf3442f..4d8387ca9 100644
--- a/Data/Scripts/016_UI/020_UI_PokeMart.rb
+++ b/Data/Scripts/016_UI/020_UI_PokeMart.rb
@@ -668,7 +668,7 @@ end
 #
 #===============================================================================
 def pbPokemonMart(stock,speech=nil,cantsell=false)
-  if $game_switches[SWITCH_RANDOM_ITEMS] && $game_switches[SWITCH_RANDOM_SHOP_ITEMS]
+  if $game_switches[SWITCH_RANDOM_ITEMS_GENERAL] && $game_switches[SWITCH_RANDOM_SHOP_ITEMS]
     stock = replaceShopStockWithRandomized(stock)
   end
 
diff --git a/Data/Scripts/025-Randomizer/RandomizerSettings.rb b/Data/Scripts/025-Randomizer/RandomizerSettings.rb
index 5754c34a9..2c4019b53 100644
--- a/Data/Scripts/025-Randomizer/RandomizerSettings.rb
+++ b/Data/Scripts/025-Randomizer/RandomizerSettings.rb
@@ -235,7 +235,7 @@ class RandomizerWildPokemonOptionsScene < PokemonOption_Scene
                               proc { $game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] ? 0 : 1 },
                               proc { |value|
                                 $game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] = value == 0
-                              }, "(For 'Fuse everything' and starters) Randomize only to Pokémon that have a custom sprite."
+                              }, "['Fuse everything' & starters] Include only  Pokémon with a custom sprite."
     )
 
     options << EnumOption.new(_INTL("Starters"), [_INTL("On"), _INTL("Off")],
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 36d66ee71..6acadf6db 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 6d18cb3a3..21025322b 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Data/encounters_randomized.dat b/Data/encounters_randomized.dat
index 71dceae31..1d239e623 100644
Binary files a/Data/encounters_randomized.dat and b/Data/encounters_randomized.dat differ