fixes water currents + recompile for trainer teams

Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb

@@ -455,7 +455,8 @@ class PokeBattle_Battle
     # Register captured Pokémon in the Pokédex, and store them
     pbRecordAndStoreCaughtPokemon
 
-    isRematch = $game_switches[200]
+    isRematch = $game_switches[IS_REMATCH_SWITCH]
+    begin
     if isRematch
       if @opponent.is_a?(Array)
         for trainer in @opponent
@@ -467,6 +468,9 @@ class PokeBattle_Battle
         incrNbRematches(rematchId)
       end
     end
+    rescue
+      $game_switches[IS_REMATCH_SWITCH]=false
+    end
 
 
     # Collect Pay Day money in a wild battle that ended in a capture