diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 826e1e8a6..8e67182ba 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index e51360759..95c02103c 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map089.rxdata b/Data/Map089.rxdata
index 795ff0269..c36e0fd75 100644
Binary files a/Data/Map089.rxdata and b/Data/Map089.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 939a2356b..3c142bd5e 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/013_Items/003_Item_BattleEffects.rb b/Data/Scripts/013_Items/003_Item_BattleEffects.rb
index 582535d68..019e105b2 100644
--- a/Data/Scripts/013_Items/003_Item_BattleEffects.rb
+++ b/Data/Scripts/013_Items/003_Item_BattleEffects.rb
@@ -69,7 +69,7 @@ ItemHandlers::CanUseInBattle.add(:POTION,proc { |item,pokemon,battler,move,first
 ItemHandlers::CanUseInBattle.copy(:POTION,
    :SUPERPOTION,:HYPERPOTION,:MAXPOTION,:BERRYJUICE,:SWEETHEART,:FRESHWATER,
    :SODAPOP,:LEMONADE,:MOOMOOMILK,:ORANBERRY,:SITRUSBERRY,:ENERGYPOWDER,
-   :ENERGYROOT)
+   :ENERGYROOT, :POISONMUSHROOM)
 ItemHandlers::CanUseInBattle.copy(:POTION,:RAGECANDYBAR) if !Settings::RAGE_CANDY_BAR_CURES_STATUS_PROBLEMS
 
 ItemHandlers::CanUseInBattle.add(:AWAKENING,proc { |item,pokemon,battler,move,firstAction,battle,scene,showMessages|
diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb
index 9778c106d..c76a94872 100644
--- a/Data/Scripts/021_Compiler/001_Compiler.rb
+++ b/Data/Scripts/021_Compiler/001_Compiler.rb
@@ -734,7 +734,7 @@ module Compiler
   end
 
   def main
-    return
+    #return
     return if !$DEBUG
     begin
       dataFiles = [
diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb
index fee167acd..3760c3281 100644
--- a/Data/Scripts/050_AddOns/New Items effects.rb	
+++ b/Data/Scripts/050_AddOns/New Items effects.rb	
@@ -927,6 +927,41 @@ ItemHandlers::UseOnPokemon.add(:SLOWPOKETAIL, proc { |item, pokemon, scene|
 #     next true
 #   end
 # })
+ItemHandlers::UseOnPokemon.add(:POISONMUSHROOM,proc { |item,pkmn,scene|
+  if pkmn.status != :POISON
+    pkmn.status= :POISON
+    scene.pbRefresh
+    scene.pbDisplay(_INTL("{1} was poisoned from eating the mushroom.",pkmn.name))
+  end
+  next pbHPItem(pkmn,10,scene)
+})
+ItemHandlers::BattleUseOnPokemon.add(:POISONMUSHROOM,proc { |item,pokemon,battler,choices,scene|
+  if battler.status != :POISON
+    battler.status= :POISON
+    scene.pbRefresh
+    scene.pbDisplay(_INTL("{1} was poisoned from eating the mushroom.",pokemon.name))
+  end
+  pbBattleHPItem(pokemon,battler,10,scene)
+})
+
+ItemHandlers::UseOnPokemon.add(:TINYMUSHROOM,proc { |item,pkmn,scene|
+  next pbHPItem(pkmn,10,scene)
+})
+ItemHandlers::BattleUseOnPokemon.add(:TINYMUSHROOM,proc { |item,pokemon,battler,choices,scene|
+  next pbBattleHPItem(pokemon,battler,50,scene)
+})
+ItemHandlers::UseOnPokemon.add(:BIGMUSHROOM,proc { |item,pkmn,scene|
+  next pbHPItem(pkmn,10,scene)
+})
+ItemHandlers::BattleUseOnPokemon.add(:BIGMUSHROOM,proc { |item,pokemon,battler,choices,scene|
+  next pbBattleHPItem(pokemon,battler,50,scene)
+})
+ItemHandlers::UseOnPokemon.add(:BALMMUSHROOM,proc { |item,pkmn,scene|
+  next pbHPItem(pkmn,999,scene)
+})
+ItemHandlers::BattleUseOnPokemon.add(:BALMMUSHROOM,proc { |item,pokemon,battler,choices,scene|
+  next pbBattleHPItem(pokemon,battler,999,scene)
+})
 
 #TRACKER (for roaming legendaries)
 ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item|
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 08192c352..b585a026c 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 9873e9ae6..8d34a0eef 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Data/items.dat b/Data/items.dat
index ecd8a5dad..c4f7b12e7 100644
Binary files a/Data/items.dat and b/Data/items.dat differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 9c6df5721..69b28ae25 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ