Fixed some untranslatable messages, updated text files

Data/Scripts/001_Technical/003_Intl_Messages.rb

@@ -217,9 +217,9 @@ module Translator
       ret.gsub!(/\r/, "<<r>>")
       ret.gsub!(/\n/, "<<n>>")
       ret.gsub!(/\t/, "<<t>>")
-      ret.gsub!(/\[/, "<<[>>")
-      ret.gsub!(/\]/, "<<]>>")
       ret.gsub!(/\x01/, "<<1>>")
+      ret.gsub!(/^\[/, "<<[>>")
+      ret.gsub!(/^\]/, "<<]>>")
       return ret
     end
     return value
@@ -228,12 +228,12 @@ module Translator
   def denormalize_value(value)
     if value[/<<[rnt1\[\]]>>/]
       ret = value.dup
-      ret.gsub!(/<<1>>/, "\1")
       ret.gsub!(/<<r>>/, "\r")
       ret.gsub!(/<<n>>/, "\n")
+      ret.gsub!(/<<t>>/, "\t")
+      ret.gsub!(/<<1>>/, "\1")
       ret.gsub!(/<<\[>>/, "[")
       ret.gsub!(/<<\]>>/, "]")
-      ret.gsub!(/<<t>>/, "\t")
       return ret
     end
     return value

Data/Scripts/007_Objects and windows/010_DrawText.rb

@@ -420,7 +420,7 @@ def getFormattedText(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight =
   hadnonspace = false
   havenl = false
   position = 0
-  while position < textchars.length
+  while position <= textchars.length
     nextline = 0
     graphic = nil
     graphicX = 0
@@ -565,7 +565,10 @@ def getFormattedText(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight =
     else
       xStart = 0
       yStart = 0
-      width = isWaitChar(textchars[position]) ? 0 : bitmap.text_size(textchars[position]).width
+      width = 0
+      if textchars[position]
+        width = isWaitChar(textchars[position]) ? 0 : bitmap.text_size(textchars[position]).width
+      end
       width += 2 if width > 0 && outline2count > 0
     end
     if rightalign == 1 && nextline == 0
@@ -608,7 +611,10 @@ def getFormattedText(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight =
         end
       end
     end
-    isspace = (textchars[position][/\s/] || isWaitChar(textchars[position])) ? true : false
+    isspace = false
+    if textchars[position]
+      isspace = (textchars[position][/\s/] || isWaitChar(textchars[position])) ? true : false
+    end
     if hadspace && !isspace
       # set last word to here
       lastword[0] = characters.length
@@ -630,7 +636,7 @@ def getFormattedText(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight =
                        (boldcount > 0), (italiccount > 0), colors[0], colors[1],
                        (underlinecount > 0), (strikecount > 0), fontname, fontsize,
                        position, graphicRect,
-                       ((outlinecount > 0) ? 1 : 0) + ((outline2count > 0) ? 2 : 0)])
+                       ((outlinecount > 0) ? 1 : 0) + ((outline2count > 0) ? 2 : 0)]) if graphic || textchars[position]
       charactersInternal.push([alignment, y, xStart, textchars[position], extraspace])
     end
     x += width

Data/Scripts/012_Overworld/001_Overworld.rb

@@ -97,7 +97,7 @@ EventHandlers.add(:on_player_step_taken_can_transfer, :poison_party,
       pkmn.hp -= 1 if pkmn.hp > 1 || Settings::POISON_FAINT_IN_FIELD
       if pkmn.hp == 1 && !Settings::POISON_FAINT_IN_FIELD
         pkmn.status = :NONE
-        pbMessage(_INTL("{1} survived the poisoning.\\nThe poison faded away!", pkmn.name))
+        pbMessage(_INTL("{1} survived the poisoning.\nThe poison faded away!", pkmn.name))
         next
       elsif pkmn.hp == 0
         pkmn.changeHappiness("faint")
@@ -705,7 +705,7 @@ def pbItemBall(item, quantity = 1)
     else
       pbMessage("\\me[#{meName}]" + _INTL("You found a \\c[1]{1}\\c[0]!", itemname) + "\\wtnp[40]")
     end
-    pbMessage(_INTL("You put the {1} in\\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
+    pbMessage(_INTL("You put the {1} in\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
                     itemname, pocket, PokemonBag.pocket_names[pocket - 1]))
     return true
   end
@@ -755,7 +755,7 @@ def pbReceiveItem(item, quantity = 1)
     pbMessage("\\me[#{meName}]" + _INTL("You obtained a \\c[1]{1}\\c[0]!", itemname) + "\\wtnp[40]")
   end
   if $bag.add(item, quantity)   # If item can be added
-    pbMessage(_INTL("You put the {1} in\\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
+    pbMessage(_INTL("You put the {1} in\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
                     itemname, pocket, PokemonBag.pocket_names[pocket - 1]))
     return true
   end
@@ -771,7 +771,7 @@ def pbBuyPrize(item, quantity = 1)
   item_name = (quantity > 1) ? item.portion_name_plural : item.portion_name
   pocket = item.pocket
   return false if !$bag.add(item, quantity)
-  pbMessage("\\CN" + _INTL("You put the {1} in\\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
+  pbMessage("\\CN" + _INTL("You put the {1} in\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
                            item_name, pocket, PokemonBag.pocket_names[pocket - 1]))
   return true
 end

Data/Scripts/012_Overworld/006_Overworld_BerryPlants.rb

@@ -458,7 +458,7 @@ def pbPickBerry(berry, qty = 1)
     pbMessage("\\me[Berry get]" + _INTL("You picked the \\c[1]{1}\\c[0].", berry_name) + "\\wtnp[30]")
   end
   pocket = berry.pocket
-  pbMessage(_INTL("You put the {1} in\\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
+  pbMessage(_INTL("You put the {1} in\nyour Bag's <icon=bagPocket{2}>\\c[1]{3}\\c[0] pocket.",
                   berry_name, pocket, PokemonBag.pocket_names[pocket - 1]) + "\1")
   if Settings::NEW_BERRY_PLANTS
     pbMessage(_INTL("The soil returned to its soft and earthy state."))

Data/Scripts/013_Items/001_Item_Utilities.rb

@@ -612,7 +612,7 @@ def pbLearnMove(pkmn, move, ignore_if_known = false, by_machine = false, &block)
           pkmn.moves[move_index].pp = [oldmovepp, pkmn.moves[move_index].total_pp].min
         end
         pbMessage(_INTL("1, 2, and...\\wt[16] ...\\wt[16] ...\\wt[16] Ta-da!") + "\\se[Battle ball drop]\1", &block)
-        pbMessage(_INTL("{1} forgot how to use {2}.\\nAnd..." + "\1", pkmn_name, old_move_name), &block)
+        pbMessage(_INTL("{1} forgot how to use {2}.\nAnd..." + "\1", pkmn_name, old_move_name), &block)
         pbMessage("\\se[]" + _INTL("{1} learned {2}!", pkmn_name, move_name) + "\\se[Pkmn move learnt]", &block)
         pkmn.changeHappiness("machine") if by_machine
         return true

Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb

@@ -328,7 +328,7 @@ def pbDebugDayCare
         msg = _INTL("Cost: ${1}", slot.cost)
         if pkmn.level < GameData::GrowthRate.max_level
           end_exp = pkmn.growth_rate.minimum_exp_for_level(pkmn.level + 1)
-          msg += "\\n" + _INTL("Steps to next level: {1}", end_exp - pkmn.exp)
+          msg += "\n" + _INTL("Steps to next level: {1}", end_exp - pkmn.exp)
         end
         # Show level change and cost
         case pbMessage("\\ts[]" + msg,