diff --git a/Credits.txt b/Credits.txt
index 7e08ab1f3..2ed177b97 100644
--- a/Credits.txt
+++ b/Credits.txt
@@ -74,7 +74,6 @@ qt314xxx (Discord)
 ###			Graphics			  #
 ###########################################################
 Title screen background and logo by Doctor Miawoo
-
 Gen 4 Legendary trio eggs by calicorn
 
 ###########################################################
@@ -106,10 +105,12 @@ with their respective authors' consent
 		SailorVicious (Prof. Elm OW sprite) 	https://www.deviantart.com/sailorvicious
 		OceansLugiaSpirit (Koga OW sprite)  	http://oceanslugiaspirit.deviantart.com/
 		Knuckles (Kurt OW sprite)
+		UnworthyPie (Bruno and Agatha OW sprites)
 	Battle sprites: 
 		luckygirl88  (Misty VS sprite) 		http://luckygirl88.deviantart.com/art/Pokemon-BW-Misty-Sprite-Sheet-268364830
 		Lorelei VS sprite by Nalty 		http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
 		Kiwi (Kurt battle sprite)
+		UnworthyPie (Bruno battle sprite, Lance backsprite)
 ### Tileset graphics ### 
 	Jorginho (OutsideEmerald)
 	ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
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 b9a6bc5fe..b5413ec5f 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 b8d159f71..0f9a3f787 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/Map078.rxdata b/Data/Map078.rxdata
index 1e1dd0842..ba1aff3d4 100644
Binary files a/Data/Map078.rxdata and b/Data/Map078.rxdata differ
diff --git a/Data/Map086.rxdata b/Data/Map086.rxdata
index ff88d6070..8c454ccdb 100644
Binary files a/Data/Map086.rxdata and b/Data/Map086.rxdata differ
diff --git a/Data/Map161.rxdata b/Data/Map161.rxdata
index 0ed2d7f00..eee7b61c3 100644
Binary files a/Data/Map161.rxdata and b/Data/Map161.rxdata differ
diff --git a/Data/Map197.rxdata b/Data/Map197.rxdata
index 19e06ac33..127fd11e9 100644
Binary files a/Data/Map197.rxdata and b/Data/Map197.rxdata differ
diff --git a/Data/Map295.rxdata b/Data/Map295.rxdata
index 5b4ea64d5..56bcb78eb 100644
Binary files a/Data/Map295.rxdata and b/Data/Map295.rxdata differ
diff --git a/Data/Map315.rxdata b/Data/Map315.rxdata
index f2142be49..e8b2eca20 100644
Binary files a/Data/Map315.rxdata and b/Data/Map315.rxdata differ
diff --git a/Data/Map316.rxdata b/Data/Map316.rxdata
index b0d43a297..a79f0841c 100644
Binary files a/Data/Map316.rxdata and b/Data/Map316.rxdata differ
diff --git a/Data/Map317.rxdata b/Data/Map317.rxdata
index 245acfeb4..f143bdd0f 100644
Binary files a/Data/Map317.rxdata and b/Data/Map317.rxdata differ
diff --git a/Data/Map426.rxdata b/Data/Map426.rxdata
index 8942f70e1..f0eb776b9 100644
Binary files a/Data/Map426.rxdata and b/Data/Map426.rxdata differ
diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata
index 27bd666c6..6aec5c57a 100644
Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ
diff --git a/Data/Map705.rxdata b/Data/Map705.rxdata
index 60da2a238..f9d7e5ba1 100644
Binary files a/Data/Map705.rxdata and b/Data/Map705.rxdata differ
diff --git a/Data/Map725.rxdata b/Data/Map725.rxdata
index dd6f36f4f..b9b73743b 100644
Binary files a/Data/Map725.rxdata and b/Data/Map725.rxdata differ
diff --git a/Data/Map726.rxdata b/Data/Map726.rxdata
index d70a5ed22..6c754eb25 100644
Binary files a/Data/Map726.rxdata and b/Data/Map726.rxdata differ
diff --git a/Data/Map727.rxdata b/Data/Map727.rxdata
index e1f91fd35..0641dad0c 100644
Binary files a/Data/Map727.rxdata and b/Data/Map727.rxdata differ
diff --git a/Data/Map728.rxdata b/Data/Map728.rxdata
index 9216725e1..bcc82a648 100644
Binary files a/Data/Map728.rxdata and b/Data/Map728.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 5d5c0e2a2..3e7cb2b9e 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb b/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
index b4d2ed93a..de47a48bc 100644
--- a/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
+++ b/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
@@ -158,7 +158,7 @@ class PokeBattle_Battle
     if showMessages
       if isOutsider
         pbDisplayPaused(_INTL("{1} got a boosted {2} Exp. Points!",pkmn.name,expGained))
-      elsepbGenerateEgg
+        else
         pbDisplayPaused(_INTL("{1} got {2} Exp. Points!",pkmn.name,expGained))
       end
     end
diff --git a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb b/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb
index f98b92958..c6752b114 100644
--- a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb	
+++ b/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb	
@@ -500,6 +500,7 @@ class PokemonBattlerSprite < RPG::Sprite
     @spriteYExtra     = 0   # Offset due to "bobbing" animation
     @_iconBitmap      = nil
     self.visible      = false
+    @back=false
   end
 
   def dispose
@@ -514,11 +515,13 @@ class PokemonBattlerSprite < RPG::Sprite
 
   def x=(value)
     @spriteX = value
+    self.mirror=true if @back
     super(value+@spriteXExtra)
   end
 
   def y=(value)
     @spriteY = value
+    self.mirror=true if @back
     super(value+@spriteYExtra)
   end
 
@@ -533,6 +536,7 @@ class PokemonBattlerSprite < RPG::Sprite
   # Set sprite's origin to bottom middle
   def pbSetOrigin
     return if !@_iconBitmap
+    self.mirror=true if @back
     self.ox = @_iconBitmap.width/2
     self.oy = @_iconBitmap.height
   end
@@ -554,11 +558,12 @@ class PokemonBattlerSprite < RPG::Sprite
   end
 
   def setPokemonBitmap(pkmn,back=false)
+    @back = back
+    self.mirror=true if @back
     @pkmn = pkmn
     @_iconBitmap.dispose if @_iconBitmap
     @_iconBitmap = GameData::Species.sprite_bitmap_from_pokemon(@pkmn, back)
-    @_iconBitmap.mirror if back
-    if back
+    if @back
       @_iconBitmap.scale_bitmap(Settings::BACKRPSPRITE_SCALE)
     else
       @_iconBitmap.scale_bitmap(Settings::FRONTSPRITE_SCALE)
diff --git a/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb b/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb
index 0bd3ab098..11dc06775 100644
--- a/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb	
+++ b/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb	
@@ -494,8 +494,11 @@ class PokeBattle_Scene
   def pbAnimationCore(animation,user,target,oppMove=false)
     return if !animation
     @briefMessage = false
+
     userSprite   = (user) ? @sprites["pokemon_#{user.index}"] : nil
     targetSprite = (target) ? @sprites["pokemon_#{target.index}"] : nil
+
+
     # Remember the original positions of Pokémon sprites
     oldUserX = (userSprite) ? userSprite.x : 0
     oldUserY = (userSprite) ? userSprite.y : 0
@@ -535,5 +538,12 @@ class PokeBattle_Scene
       targetSprite.y = oldTargetY
       targetSprite.pbSetOrigin
     end
+    # if userSprite != nil
+    #   userSprite.mirror=true #if !@battle.opposes?(user.index)
+    # end
+    # if targetSprite != nil
+    #   targetSprite.mirror=true# if !@battle.opposes?(target.index)
+    # end
+
   end
 end
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index 8e0bf47d2..6adf99cfa 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -652,7 +652,7 @@ HiddenMoveHandlers::UseMove.add(:ROCKSMASH, proc { |move, pokemon|
 #===============================================================================
 def pbStrength
   if $PokemonMap.strengthUsed
-    pbMessage(_INTL("Strength made it possible to move boulders around."))
+    #pbMessage(_INTL("Strength made it possible to move boulders around."))
     return false
   end
   move = :STRENGTH
diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb
index 9d3662e1e..19573387f 100644
--- a/Data/Scripts/049_Compatibility/Constants.rb
+++ b/Data/Scripts/049_Compatibility/Constants.rb
@@ -13,4 +13,9 @@ BATTLE_FACTORY_TOKENS = 243
 #Settings
 # This is for settings that are used in scripts since it's a chore to change them everywhere to include the module name
 NUM_BADGES=Settings::NB_BADGES
-EGGINITIALLEVEL=Settings::EGG_LEVEL
\ No newline at end of file
+EGGINITIALLEVEL=Settings::EGG_LEVEL
+
+
+#this is fucking stupid but apparently necessary
+FALSE = false
+TRUE = true
\ No newline at end of file
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 b55d7e996..3524b4aed 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 7c69aad43..e301f0042 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