Changed: PBIntl
@@ -16,0 +16,1 @@
+     		 string.gsub!(/\\1/,"\1")
@@ -298,1 +299,1 @@
-  if str[/[\r\n\t]|^\s+|\s+$|\s{2,}/]
+  if str[/[\r\n\t\1]|^\s+|\s+$|\s{2,}/]
@@ -308,1 +309,1 @@
-  if value[/[\r\n\t]|^[\[\]]/]
+  if value[/[\r\n\t\x01]|^[\[\]]/]
@@ -315,0 +316,1 @@
+   ret.gsub!(/\x01/,"<<1>>")
@@ -320,1 +322,1 @@
-  if value[/<<[rnt\[\]]>>/]
+  if value[/<<[rnt1\[\]]>>/]
@@ -322,0 +324,1 @@
+   ret.gsub!(/<<1>>/,"\1")

Changed: Compiler
@@ -2591,1 +2591,1 @@
-  filename=sprintf("Data/map%03d")
+  filename=sprintf("Data/map%03d",mapID)
@@ -2889,1 +2889,1 @@
-    script.gsub!(/\s/,"")
+    script.gsub!(/\s+/,"")
@@ -2903,1 +2903,0 @@
-     # Using old method of recovering
@@ -3168,1 +3167,1 @@
-  pbTrainerBattleCheck(trtype,trname,battleid+i) if !$INEDITOR
+  trainerChecker.pbTrainerBattleCheck(trtype,trname,battleid+i) if !$INEDITOR
@@ -3348,1 +3347,1 @@
-if "#{e.class}"=="Reset" || e.is_a?(SystemExit)
+if "#{e.class}"=="Reset" || e.is_a?(Reset) || e.is_a?(SystemExit)
@@ -3357,0 +3356,3 @@
+end
+if e.is_a?(Hangup)
+ raise Reset.new

Changed: Game_Player*
@@ -370,1 +370,0 @@
-    $PokemonTemp.dependentEvents.updateDependentEvents
@@ -404,0 +403,1 @@
+    $PokemonTemp.dependentEvents.updateDependentEvents

Changed: PokemonEditor
@@ -1835,0 +1835,2 @@
+   # Skip if map no longer exists
+   next if !@mapinfos[conn[0]] || !@mapinfos[conn[3]]
@@ -1836,2 +1838,2 @@
-     @mapinfos[conn[0]].name,conn[0],
-     @mapinfos[conn[3]].name,conn[3]))
+     @mapinfos[conn[0]] ? @mapinfos[conn[0]].name : "???",conn[0],
+     @mapinfos[conn[3]] ? @mapinfos[conn[3]].name : "???",conn[3]))

Changed: PokemonUtilities
@@ -205,1 +205,1 @@
-def pbAddForeignPokemon(species,level,ownerName)
+def pbAddForeignPokemon(species,level,ownerName,nickname=nil)
@@ -215,0 +215,4 @@
+  # Set nickname
+  if nickname
+   pokemon.name=nickname[0,10]
+  end
@@ -219,-1 +223,11 @@
+end
+
+
+def pbAddPokemonToParty(species,level)
+  if $Trainer.party.length==6
+    return false
+  end
+  speciesname=PBSpecies.getName(species)
+  Kernel.pbMessage(_INTL("{1} obtained {2}!\1",$Trainer.name,speciesname))
+  pokemon=PokeBattle_Pokemon.new(species,level,$Trainer)
+  pbNicknameAndStore(pokemon)

Changed: DependentEvents
@@ -21,0 +21,3 @@
+  end
+  def set_starting
+    @starting=true
@@ -351,1 +354,8 @@
-    event.update
+    if (event.jumping? || event.moving?) ||
+      !($game_player.jumping? || $game_player.moving?)
+     event.update
+    elsif !event.starting
+     event.set_starting
+     event.update
+     event.clear_starting
+    end

Changed: PBIntl
Changed: Compiler
Changed: Game_Player*
Changed: PokemonEditor
Changed: PokemonUtilities
Changed: DependentEvents