quick surf + bug fixes

Data/Scripts/050_AddOns/BattleLounge.rb

@@ -160,7 +160,7 @@ def generateSameEggGroupFusionsTeam(eggGroup_id)
       while !foundFusionPartner
         species2 = rand(Settings::NB_POKEMON) + 1
         if getPokemonEggGroups(species2).include?(eggGroup)
-          generatedTeam << getFusionSpecies(species1, species2)
+          generatedTeam << getFusionSpecies(species1, specieres2)
           foundFusionPartner = true
         end
       end

Data/Scripts/050_AddOns/BetterRegionMap.rb

@@ -562,57 +562,55 @@ def calculatePointsAndCenter(mapwidth)
 end
 
 class PokemonReadyMenu
-  def pbStartReadyMenu(moves, items)
-    commands = [[], []] # Moves, items
+  def pbStartReadyMenu(moves,items)
+    commands = [[],[]]   # Moves, items
     for i in moves
-      commands[0].push([i[0], PBMoves.getName(i[0]), true, i[1]])
+      commands[0].push([i[0], GameData::Move.get(i[0]).name, true, i[1]])
     end
-    commands[0].sort! { |a, b| a[1] <=> b[1] }
+    commands[0].sort! { |a,b| a[1]<=>b[1] }
     for i in items
-      commands[1].push([i, PBItems.getName(i), false])
+      commands[1].push([i, GameData::Item.get(i).name, false])
     end
-    commands[1].sort! { |a, b| a[1] <=> b[1] }
-
+    commands[1].sort! { |a,b| a[1]<=>b[1] }
     @scene.pbStartScene(commands)
     loop do
       command = @scene.pbShowCommands
-      if command == -1
-        break
-      else
-        if command[0] == 0 # Use a move
-          move = commands[0][command[1]][0]
-          user = $Trainer.party[commands[0][command[1]][3]]
-          if isConst?(move, PBMoves, :FLY)
-            ###############################################
-            pbHideMenu
-            ret = pbBetterRegionMap(-1, true, true)
-            pbShowMenu unless ret
-            ###############################################
-            if ret
-              $PokemonTemp.flydata = ret
-              $game_temp.in_menu = false
-              Kernel.pbUseHiddenMove(user, move)
-              break
-            end
-          else
-            pbHideMenu
-            if Kernel.pbConfirmUseHiddenMove(user, move)
-              $game_temp.in_menu = false
-              Kernel.pbUseHiddenMove(user, move)
-              break
-            else
-              pbShowMenu
-            end
+      break if command==-1
+      if command[0]==0   # Use a move
+        move = commands[0][command[1]][0]
+        user = $Trainer.party[commands[0][command[1]][3]]
+        if move == :FLY || move == :TELEPORT
+          ###############################################
+          pbHideMenu
+          ret = pbBetterRegionMap(-1, true, true)
+          pbShowMenu unless ret
+          ###############################################
+          if ret
+            $PokemonTemp.flydata = ret
+            $game_temp.in_menu = false
+            Kernel.pbUseHiddenMove(user, move)
+            break
+          end
+        else
+          pbHideMenu
+          if pbConfirmUseHiddenMove(user,move)
+            $game_temp.in_menu = false
+            pbUseHiddenMove(user,move)
+            break
+          else
+            pbShowMenu
           end
-        else # Use an item
-        item = commands[1][command[1]][0]
-        pbHideMenu
-        if ItemHandlers.triggerConfirmUseInField(item)
-          break if Kernel.pbUseKeyItemInField(item)
         end
-        end
-        pbShowMenu
+      else   # Use an item
+      item = commands[1][command[1]][0]
+      pbHideMenu
+      if ItemHandlers.triggerConfirmUseInField(item)
+        $game_temp.in_menu = false
+        break if pbUseKeyItemInField(item)
+        $game_temp.in_menu = true
       end
+      end
+      pbShowMenu
     end
     @scene.pbEndScene
   end

Data/Scripts/050_AddOns/New Items effects.rb

@@ -80,8 +80,13 @@ def useLantern()
     return false
   end
   Kernel.pbMessage(_INTL("The Lantern illuminated the cave!"))
-  $PokemonGlobal.flashUsed = true
   darkness.radius += 176
+  while darkness.radius<176
+    Graphics.update
+    Input.update
+    pbUpdateSceneMapd
+    darkness.radius+=4
+  end
   return true
 end
 
@@ -104,12 +109,18 @@ ItemHandlers::UseInField.add(:TELEPORTER, proc { |item|
 def useTeleporter()
   if HiddenMoveHandlers.triggerCanUseMove(:TELEPORT, 0,true)
     Kernel.pbMessage(_INTL("Teleport to where?", $Trainer.name))
-    scene = PokemonRegionMapScene.new(-1, false)
-    screen = PokemonRegionMap.new(scene)
-    ret = screen.pbStartFlyScreen
+    ret = pbBetterRegionMap(-1, true, true)
+    pbShowMenu unless ret
+    ###############################################
     if ret
       $PokemonTemp.flydata = ret
     end
+    # scene = PokemonRegionMapScene.new(-1, false)
+    # screen = PokemonRegionMap.new(scene)
+    # ret = screen.pbStartFlyScreen
+    # if ret
+    #   $PokemonTemp.flydata = ret
+    # end
   end
 
   if !$PokemonTemp.flydata
@@ -194,18 +205,18 @@ ItemHandlers::UseFromBag.add(:LANTERN, proc { |item|
   darkness = $PokemonTemp.darknessSprite
   if !darkness || darkness.disposed?
     Kernel.pbMessage(_INTL("The cave is already illuminated."))
-    return false
+    next false
   end
   Kernel.pbMessage(_INTL("The Lantern illuminated the cave!"))
   $PokemonGlobal.flashUsed = true
   darkness.radius += 176
-  #while darkness.radius<176
-  #  Graphics.update
-  #  Input.update
-  #  pbUpdateSceneMap
-  #  darkness.radius+=4
-  #end
-  return true
+  while darkness.radius<176
+   Graphics.update
+   Input.update
+   pbUpdateSceneMap
+   darkness.radius+=4
+  end
+  next true
 })
 
 ItemHandlers::UseFromBag.add(:AZUREFLUTE, proc { |item|