Removed redundant "\r" from various messages, removed usages of BitmapWrapper, fixed Lure Ball error in battles started in the Debug menu, improved Terrain Tag editor, fixed some Compiler errors, enabled vsync, fixed event graphics frozen to the screen when using $game_player.moveto directly.

Data/Scripts/011_Battle/001_Battle/002_Battle_StartAndEnd.rb

@@ -202,7 +202,7 @@ class Battle
       # Opposing trainers and partner trainers's messages about sending out Pokémon
       trainers.each_with_index do |t, i|
         next if side == 0 && i == 0   # The player's message is shown last
-        msg += "\r\n" if msg.length > 0
+        msg += "\n" if msg.length > 0
         sent = sendOuts[side][i]
         case sent.length
         when 1
@@ -218,7 +218,7 @@ class Battle
       end
       # The player's message about sending out Pokémon
       if side == 0
-        msg += "\r\n" if msg.length > 0
+        msg += "\n" if msg.length > 0
         sent = sendOuts[side][0]
         case sent.length
         when 1

Data/Scripts/011_Battle/001_Battle/003_Battle_ExpAndMoveLearning.rb

@@ -173,7 +173,7 @@ class Battle
     newLevel = growth_rate.level_from_exp(expFinal)
     if newLevel < curLevel
       debugInfo = "Levels: #{curLevel}->#{newLevel} | Exp: #{pkmn.exp}->#{expFinal} | gain: #{expGained}"
-      raise _INTL("{1}'s new level is less than its current level, which shouldn't happen.", pkmn.name) + "\r\n[#{debugInfo}]"
+      raise _INTL("{1}'s new level is less than its current level, which shouldn't happen.", pkmn.name) + "\n[#{debugInfo}]"
     end
     # Give Exp
     if pkmn.shadowPokemon?

Data/Scripts/011_Battle/004_Scene/004_Scene_PlayAnimations.rb

@@ -297,12 +297,12 @@ class Battle::Scene
   #=============================================================================
   def pbLevelUp(pkmn, _battler, oldTotalHP, oldAttack, oldDefense, oldSpAtk, oldSpDef, oldSpeed)
     pbTopRightWindow(
-      _INTL("Max. HP<r>+{1}\r\nAttack<r>+{2}\r\nDefense<r>+{3}\r\nSp. Atk<r>+{4}\r\nSp. Def<r>+{5}\r\nSpeed<r>+{6}",
+      _INTL("Max. HP<r>+{1}\nAttack<r>+{2}\nDefense<r>+{3}\nSp. Atk<r>+{4}\nSp. Def<r>+{5}\nSpeed<r>+{6}",
             pkmn.totalhp - oldTotalHP, pkmn.attack - oldAttack, pkmn.defense - oldDefense,
             pkmn.spatk - oldSpAtk, pkmn.spdef - oldSpDef, pkmn.speed - oldSpeed)
     )
     pbTopRightWindow(
-      _INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
+      _INTL("Max. HP<r>{1}\nAttack<r>{2}\nDefense<r>{3}\nSp. Atk<r>{4}\nSp. Def<r>{5}\nSpeed<r>{6}",
             pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed)
     )
   end

Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb

@@ -93,7 +93,7 @@ class Battle::Scene::PokemonDataBox < Sprite
     @expBar.bitmap = @expBarBitmap.bitmap
     @sprites["expBar"] = @expBar
     # Create sprite wrapper that displays everything except the above
-    @contents = BitmapWrapper.new(@databoxBitmap.width, @databoxBitmap.height)
+    @contents = Bitmap.new(@databoxBitmap.width, @databoxBitmap.height)
     self.bitmap  = @contents
     self.visible = false
     self.z       = 150 + ((@battler.index / 2) * 5)
@@ -420,7 +420,7 @@ class Battle::Scene::AbilitySplashBar < Sprite
     @bgSprite.src_rect.y      = (side == 0) ? 0 : @bgBitmap.height / 2
     @bgSprite.src_rect.height = @bgBitmap.height / 2
     # Create bitmap that displays the text
-    @contents = BitmapWrapper.new(@bgBitmap.width, @bgBitmap.height / 2)
+    @contents = Bitmap.new(@bgBitmap.width, @bgBitmap.height / 2)
     self.bitmap = @contents
     pbSetSystemFont(self.bitmap)
     # Position the bar

Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb

@@ -114,8 +114,11 @@ Battle::PokeBallEffects::ModifyCatchRate.add(:LEVELBALL, proc { |ball, catchRate
 })
 
 Battle::PokeBallEffects::ModifyCatchRate.add(:LUREBALL, proc { |ball, catchRate, battle, battler|
-  multiplier = (Settings::NEW_POKE_BALL_CATCH_RATES) ? 5 : 3
-  catchRate *= multiplier if GameData::EncounterType.get($game_temp.encounter_type).type == :fishing
+  if $game_temp.encounter_type &&
+     GameData::EncounterType.get($game_temp.encounter_type).type == :fishing
+    multiplier = (Settings::NEW_POKE_BALL_CATCH_RATES) ? 5 : 3
+    catchRate *= multiplier
+  end
   next [catchRate, 255].min
 })
 

Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb

@@ -67,7 +67,7 @@ class Battle::Scene::SafariDataBox < Sprite
     @databox     = AnimatedBitmap.new("Graphics/UI/Battle/databox_safari")
     self.x       = Graphics.width - 232
     self.y       = Graphics.height - 184
-    @contents    = BitmapWrapper.new(@databox.width, @databox.height)
+    @contents    = Bitmap.new(@databox.width, @databox.height)
     self.bitmap  = @contents
     self.visible = false
     self.z       = 50