6.6.2

Data/Scripts/001_Settings.rb

@@ -5,8 +5,8 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '6.6.1'
+  GAME_VERSION = '6.6.2'
-  GAME_VERSION_NUMBER = "6.6.1"
+  GAME_VERSION_NUMBER = "6.6.2"
   LATEST_GAME_RELEASE = "6.6"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17

Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb

@@ -65,12 +65,12 @@ module GameData
     def self.egg_sprite_filename(species, form)
       return "Graphics/Battlers/Eggs/000" if $PokemonSystem.use_custom_eggs
       dexNum = getDexNumberForSpecies(species)
-      bitmapFileName = sprintf("Graphics/Battlers/Eggs/%03d", dexNum) rescue nil
+      bitmapFileName = sprintf("Graphics/Battlers/Eggs/%d", dexNum) rescue nil
       if !pbResolveBitmap(bitmapFileName)
         if isTripleFusion?(dexNum)
           bitmapFileName = "Graphics/Battlers/Eggs/egg_base"
         else
-          bitmapFileName = sprintf("Graphics/Battlers/Eggs/%03d", dexNum)
+          bitmapFileName = sprintf("Graphics/Battlers/Eggs/%d", dexNum)
           if !pbResolveBitmap(bitmapFileName)
             bitmapFileName = sprintf("Graphics/Battlers/Eggs/000")
           end

Data/Scripts/015_Trainers and player/001_Trainer.rb

@@ -8,6 +8,7 @@ class Trainer
   attr_accessor :language
   attr_accessor :party
   attr_accessor :quests
+  attr_accessor :quests_repaired
   attr_accessor :sprite_override
   attr_accessor :custom_appearance
   attr_accessor :lowest_difficulty

Data/Scripts/020_Debug/003_Editor_Listers.rb

@@ -396,10 +396,17 @@ class ItemLister
     @commands.clear
     @ids.clear
     cmds = []
+    end_of_list = [:POKEBALL, :RARECANDY, :DNASPLICERS, :DNAREVERSER, :SLEEPINGBAG]
     GameData::Item.each do |item|
       cmds.push([item.id_number, item.id, item.real_name])
     end
     cmds.sort! { |a, b| a[2].downcase <=> b[2].downcase }
+
+    end_of_list.each do |item_sym|
+      item = GameData::Item.get(item_sym)
+      cmds.push([item.id_number, item.id, item.real_name])
+    end
+
     if @includeNew
       @commands.push(_INTL("[NEW ITEM]"))
       @ids.push(true)

Data/Scripts/052_InfiniteFusion/GameplayUtils.rb

@@ -1648,7 +1648,11 @@ end
 def displaySpriteWindowWithMessage(pif_sprite, message = "", x = 0, y = 0, z = 0)
   spriteLoader = BattleSpriteLoader.new
   sprite_bitmap = spriteLoader.load_pif_sprite_directly(pif_sprite)
-  pictureWindow = PictureWindow.new(sprite_bitmap.bitmap)
+  if sprite_bitmap
+    pictureWindow = PictureWindow.new(sprite_bitmap.bitmap)
+  else
+    pictureWindow = PictureWindow.new("")
+  end
 
   pictureWindow.opacity = 0
   pictureWindow.z = z
@@ -1867,6 +1871,14 @@ def giveJigglypuffScribbles(possible_versions = [1,2,3,4])
 end
 
 
+#type:
+# 0: default
+# 1: wood
+def sign(message,type=0)
+  signId= "sign_#{type}"
+  formatted_message = "\\sign[#{signId}]#{message}"
+  pbMessage(formatted_message)
+end
 
 
 

Data/Scripts/052_InfiniteFusion/Gen 2.rb

@@ -129,6 +129,9 @@ def GetSpriteName(poke1, poke2, isFused)
   return ret
 end
 
+def isPartPokemon(src, target)
+  return Kernel.isPartPokemon(src, target)
+end
 #in: pokemon number
 def Kernel.isPartPokemon(src, target)
 

Data/Scripts/052_InfiniteFusion/GeneralUtils.rb

@@ -376,7 +376,7 @@ def isHoennPokemon(species)
   body_dex = getDexNumberForSpecies(poke.get_body_species())
   list = [252, 253, 276, 277, 278, 279, 280, 281, 282, 283, 284,
           285, 286, 287, 289, 290, 291, 292, 293, 300, 301, 302, 303,
-          304, 309, 310, 311, 312, 313, 314, 333, 334, 335, 336, 340,
+          304, 309, 310, 311, 312, 313, 314, 325, 333, 334, 335, 336, 340,
           341, 342, 355, 356, 357, 378, 379, 380, 381, 382, 385, 386,
           387, 390, 391, 392, 393, 394, 395, 396, 401, 404, 405, 421,
           427, 428, 436, 437, 442, 443, 447, 448, 449, 457, 458, 488,

Data/Scripts/052_InfiniteFusion/MultiSaves.rb

@@ -393,11 +393,11 @@ class PokemonLoadScreen
           updateCreditsFile()
           updateOnlineCustomSpritesFile()
           reset_updated_spritesheets_cache()
+          $updated_spritesheets = []
           spritesLoader = BattleSpriteLoader.new
           spritesLoader.clear_sprites_cache(:CUSTOM)
           spritesLoader.clear_sprites_cache(:BASE)
 
-          $updated_spritesheets = []
           pbMessage("Data files updated. New sprites will now be downloaded as you play!")
         end
     }

Data/Scripts/052_InfiniteFusion/New Items effects.rb

@@ -297,6 +297,33 @@ def useSleepingBag()
   return 1
 end
 
+def useFieldSleepingBag()
+  currentSecondsValue = pbGet(UnrealTime::EXTRA_SECONDS)
+  confirmed = Kernel.pbConfirmMessage("Sleep for an hour?")
+  if confirmed
+    oldDay = getDayOfTheWeek()
+    timeAdded = 0
+    timeAdded = 3600
+
+    pbSet(UnrealTime::EXTRA_SECONDS, currentSecondsValue + timeAdded)
+    pbSEPlay("Sleep", 100)
+    pbFadeOutIn {
+      $game_weather.update_weather
+      Kernel.pbMessage(_INTL("{1} slept for a while...", $Trainer.name))
+      $scene.reset_map(false)
+    }
+    time = pbGetTimeNow.strftime("%I:%M %p")
+    newDay = getDayOfTheWeek()
+    if newDay != oldDay
+      Kernel.pbMessage(_INTL("The current time is now {1} on {2}.", time, newDay.downcase.capitalize))
+    else
+      Kernel.pbMessage(_INTL("The current time is now {1}.", time))
+    end
+    return 1
+  end
+
+end
+
 ItemHandlers::UseFromBag.add(:SLEEPINGBAG, proc { |item|
   mapMetadata = GameData::MapMetadata.try_get($game_map.map_id)
   if !mapMetadata || !mapMetadata.outdoor_map
@@ -315,6 +342,24 @@ ItemHandlers::UseInField.add(:SLEEPINGBAG, proc { |item|
   next useSleepingBag()
 })
 
+ItemHandlers::UseFromBag.add(:FIELDSLEEPINGBAG, proc { |item|
+  mapMetadata = GameData::MapMetadata.try_get($game_map.map_id)
+  if !mapMetadata || !mapMetadata.outdoor_map
+    Kernel.pbMessage(_INTL("Can't use that here..."))
+    next 0
+  end
+  next useFieldSleepingBag()
+})
+
+ItemHandlers::UseInField.add(:FIELDSLEEPINGBAG, proc { |item|
+  mapMetadata = GameData::MapMetadata.try_get($game_map.map_id)
+  if !mapMetadata || !mapMetadata.outdoor_map
+    Kernel.pbMessage(_INTL("Can't use that here..."))
+    next 0
+  end
+  next useFieldSleepingBag()
+})
+
 ItemHandlers::UseFromBag.add(:ROCKETUNIFORM, proc { |item|
   next useRocketUniform()
 })
@@ -1159,18 +1204,16 @@ ItemHandlers::UseFromBag.add(:EXPALLOFF, proc { |item|
   next 1 # Continue
 })
 
-ItemHandlers::BattleUseOnPokemon.add(:BANANA, proc { |item, pokemon, battler, scene|
+ItemHandlers::BattleUseOnPokemon.add(:BANANA,proc { |item,pokemon,battler,choices,scene|
-  next pbBattleHPItem(pokemon, battler, 30, scene)
+  pbBattleHPItem(pokemon,battler,30,scene)
 })
+
 ItemHandlers::UseOnPokemon.add(:BANANA, proc { |item, pokemon, scene|
   next pbHPItem(pokemon, 30, scene)
 })
 
-ItemHandlers::BattleUseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, battler, scene|
+ItemHandlers::BattleUseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, battler, choices, scene|
-  next pbBattleHPItem(pokemon, battler, 50, scene)
+  pbBattleHPItem(pokemon, battler, 50, scene)
-})
-ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, scene|
-  next pbHPItem(pokemon, 50, scene)
 })
 
 ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
@@ -1275,16 +1318,16 @@ ItemHandlers::UseOnPokemon.add(:ROCKETMEAL, proc { |item, pokemon, scene|
   next pbHPItem(pokemon, 100, scene)
 })
 
-ItemHandlers::BattleUseOnPokemon.add(:ROCKETMEAL, proc { |item, pokemon, battler, scene|
+ItemHandlers::BattleUseOnPokemon.add(:ROCKETMEAL, proc { |item, pokemon, battler, choices, scene|
-  next pbBattleHPItem(pokemon, battler, 100, scene)
+  pbBattleHPItem(pokemon, battler, 100, scene)
 })
 
 ItemHandlers::UseOnPokemon.add(:FANCYMEAL, proc { |item, pokemon, scene|
   next pbHPItem(pokemon, 100, scene)
 })
 
-ItemHandlers::BattleUseOnPokemon.add(:FANCYMEAL, proc { |item, pokemon, battler, scene|
+ItemHandlers::BattleUseOnPokemon.add(:FANCYMEAL, proc { |item, pokemon, battler, choices, scene|
-  next pbBattleHPItem(pokemon, battler, 100, scene)
+  pbBattleHPItem(pokemon, battler, 100, scene)
 })
 
 ItemHandlers::UseOnPokemon.add(:RAGECANDYBAR, proc { |item, pokemon, scene|
@@ -2043,19 +2086,6 @@ ItemHandlers::UseFromBag.add(:EXPALLOFF, proc { |item|
   next 1 # Continue
 })
 
-ItemHandlers::BattleUseOnPokemon.add(:BANANA, proc { |item, pokemon, battler, scene|
-  next pbBattleHPItem(pokemon, battler, 30, scene)
-})
-ItemHandlers::UseOnPokemon.add(:BANANA, proc { |item, pokemon, scene|
-  next pbHPItem(pokemon, 30, scene)
-})
-
-ItemHandlers::BattleUseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, battler, scene|
-  next pbBattleHPItem(pokemon, battler, 50, scene)
-})
-ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, scene|
-  next pbHPItem(pokemon, 50, scene)
-})
 
 ItemHandlers::UseInField.add(:BOXLINK, proc { |item|
   blacklisted_maps = [

Data/Scripts/052_InfiniteFusion/Quests/QuestIcons.rb

@@ -78,8 +78,6 @@ class Game_Event < Game_Character
     return nil unless match
     quest_id = match[1]
     quest_id = quest_id.gsub(/^['"]|['"]$/, '')  # Remove quotes if they exist
-    echoln "MATCH"
-    echoln quest_id
     return nil if isQuestAlreadyAccepted?(quest_id)
 
     return quest_id
@@ -173,7 +171,6 @@ class Sprite_Character
     end
     return if !iconPath
     @questIcon.bmp(iconPath)
-    echoln @questIcon.bitmap
     positionQuestIndicator if @questIcon
   end
 

Data/Scripts/052_InfiniteFusion/Quests/QuestLogScript.rb

@@ -81,118 +81,6 @@ QuestBranchField = "Field Quests"
 QuestBranchRocket = "Team Rocket Quests"
 QuestBranchLegendary = "Legendary Quests"
 
-#todo: convert to non-numerical ids like team rocket quests
-QUESTS = {
-  #Pokemart
-  "pokemart_johto" => Quest.new("pokemart_johto", "Johto Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Johto region.", QuestBranchHotels, "traveler_johto", "Cerulean City", HotelQuestColor),
-  "pokemart_hoenn" => Quest.new("pokemart_hoenn", "Hoenn Pokémon", "A traveler in the PokéMart you to show him a Pokémon native to the Hoenn region.", QuestBranchHotels, "traveler_hoenn", "Vermillion City", HotelQuestColor),
-  "pokemart_sinnoh" => Quest.new("pokemart_sinnoh", "Sinnoh Pokémon", "A traveler in the Department Center wants you to show him a Pokémon native to the Sinnoh region.", QuestBranchHotels, "traveler_sinnoh", "Celadon City", HotelQuestColor),
-  "pokemart_unova" => Quest.new( "pokemart_unova", "Unova Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Unova region.", QuestBranchHotels, "traveler_unova", "Fuchsia City", HotelQuestColor),
-  "pokemart_kalos" => Quest.new("pokemart_kalos", "Kalos Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Kalos region.", QuestBranchHotels, "traveler_kalos", "Saffron City", HotelQuestColor),
-  "pokemart_alola" => Quest.new("pokemart_alola", "Alola Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Alola region.", QuestBranchHotels, "traveler_alola", "Cinnabar Island", HotelQuestColor),
-
-
-  #Pewter hotel
-  "pewter_1" => Quest.new("pewter_1", "Mushroom Gathering", "A lady in Pewter City wants you to bring her 3 TinyMushroom from Viridian Forest to make a stew.", QuestBranchHotels, "BW (74)", "Pewter City", HotelQuestColor),
-  "pewter_2" =>Quest.new("pewter_2", "Lost Medicine", "A youngster in Pewter City needs your help to find a lost Revive. He lost it by sitting on a bench somewhere in Pewter City.", QuestBranchHotels, "BW (19)", "Pewter City", HotelQuestColor),
-  "pewter_3" =>Quest.new("pewter_3", "Bug Evolution ", "A Bug Catcher in Pewter City wants you to show him a fully-evolved Bug Pokémon.", QuestBranchHotels, "BWBugCatcher_male", "Pewter City", HotelQuestColor),
-  "pewter_field_1" => Quest.new("pewter_field_1", "Nectar garden", "An old man wants you to bring differently colored flowers for the city's garden.", QuestBranchField, "BW (039)", "Pewter City", FieldQuestColor),
-  "pewter_field_2" => Quest.new("pewter_field_2", "I Choose You!", "A Pikachu in the PokéMart has lost its official Pokémon League Hat. Find one and give it to the Pikachu!", QuestBranchField, "YOUNGSTER_LeagueHat", "Pewter City", FieldQuestColor),
-  "pewter_field_3" => Quest.new("pewter_field_3", "Prehistoric Amber!", "Meetup with a scientist in Viridian Forest to look for prehistoric amber.", QuestBranchField, "BW (82)", "Pewter City", FieldQuestColor),
-
-  #Cerulean hotel
-  "cerulean_1" => Quest.new("cerulean_1", "Playing Cupid", "A boy in Cerulean City wants you bring a love letter to a Pokémon Breeder named Maude. She's probably somewhere in one of the routes near Cerulean City", QuestBranchHotels, "BW (18)", "Cerulean City", HotelQuestColor),
-  "cerulean_2" => Quest.new("cerulean_2", "Type Experts", "Defeat all of the Type Experts scattered around the Kanto region (#{pbGet(VAR_TYPE_EXPERTS_BEATEN)}/#{TOTAL_NB_TYPE_EXPERTS})", QuestBranchHotels, "expert-normal", "Cerulean City", HotelQuestColor),
-
-  #Route 24
-  "cerulean_field_1" => Quest.new("cerulean_field_1", "Field Research (Part 1)", "Professor Oak's aide wants you to catch an Abra.", QuestBranchField, "BW (82)", "Route 24", FieldQuestColor),
-  "cerulean_field_2" => Quest.new("cerulean_field_2", "Field Research (Part 2)", "Professor Oak's aide wants you to encounter every Pokémon on Route 24.", QuestBranchField, "BW (82)", "Route 24", FieldQuestColor),
-  "cerulean_field_3" => Quest.new("cerulean_field_3", "Field Research (Part 3)", "Professor Oak's aide wants you to catch a Buneary using the Pokéradar.", QuestBranchField, "BW (82)", "Route 24", FieldQuestColor),
-
-  #Vermillion City
-  "vermillion_2" => Quest.new("vermillion_2", "Fishing for Sole", "A fisherman wants you to fish up an old boot. Hook it up with the old rod in any body of water.", QuestBranchHotels, "BW (71)", "Cerulean City", HotelQuestColor),
-  "vermillion_1" => Quest.new("vermillion_1", "Unusual Types 1", "A woman at the hotel wants you to show her a Water/Fire-type Pokémon", QuestBranchHotels, "BW (58)", "Vermillion City", HotelQuestColor),
-  "vermillion_3" => Quest.new("vermillion_3", "Seafood Cocktail ", "Get some steamed Krabby legs from the S.S. Anne's kitchen and bring them back to the hotel before they get cold", QuestBranchHotels, "BW (36)", "Vermillion City", HotelQuestColor),
-  "vermillion_field_1" => Quest.new("vermillion_field_1", "Building Materials ", "Get some wooden planks from Viridian City and some Bricks from Pewter City.", QuestBranchField, "BW (36)", "Vermillion City", FieldQuestColor),
-  "vermillion_field_2" => Quest.new("vermillion_field_2", "Waiter on the Water", "The S.S. Anne waiter wants you to take restaurant orders while he went to get a replacement cake.", QuestBranchField, "BW (53)", "S.S. Anne", FieldQuestColor),
-
-  #Celadon City
-  "celadon_1" => Quest.new("celadon_1", "Sun or Moon", "Show the Pokémon that Eevee evolves when exposed to a Moon or Sun stone to help the scientist with her research.", QuestBranchHotels, "BW (82)", "Celadon City", HotelQuestColor),
-  "celadon_2" => Quest.new("celadon_2", "For Whom the Bell Tolls", "Ring Lavender Town's bell when the time is right to reveal its secret.", QuestBranchHotels, "BW (40)", "Lavender Town", HotelQuestColor),
-  "celadon_3" => Quest.new("celadon_3", "Hardboiled", "A lady wants you to give her an egg to make an omelette.", QuestBranchHotels, "BW (24)", "Celadon City", HotelQuestColor),
-  "celadon_field_1" => Quest.new("celadon_field_1", "A stroll with Eevee!", "Walk Eevee around for a while until it gets tired.", QuestBranchField, "BW (37)", "Celadon City", FieldQuestColor),
-
-  #Fuchsia City
-  "fuchsia_1" => Quest.new("fuchsia_1", "Bicycle Race!", "Go meet the Cyclist at the bottom of Route 17 and beat her time up the Cycling Road!", QuestBranchHotels, "BW032", "Cycling Road", HotelQuestColor),
-  "fuchsia_2" => Quest.new("fuchsia_2", "Lost Pokémon!", "Find the lost Chansey's trainer!", QuestBranchHotels, "113", "Fuchsia City", HotelQuestColor),
-  "fuchsia_3" => Quest.new("fuchsia_3", "Cleaning up the Cycling Road", "Get rid of all the Pokémon dirtying up the Cycling Road.", QuestBranchHotels, "BW (77)", "Fuchsia City", HotelQuestColor),
-  "fuchsia_4" => Quest.new("fuchsia_4", "Bitey Pokémon", "A fisherman wants to know what is the sharp-toothed Pokémon that bit him in the Safari Zone's lake.", QuestBranchHotels, "BW (71)", "Fuchsia City", HotelQuestColor),
-
-  #Crimson City
-  "crimson_1" => Quest.new("crimson_1", "Shellfish Rescue", "Put all the stranded Shellders back in the water on the route to Crimson City.", QuestBranchHotels, "BW (48)", "Crimson City", HotelQuestColor),
-  "crimson_2" => Quest.new("crimson_2", "Fourth Round Rumble", "Defeat Jeanette and her high-level Bellsprout in a Pokémon Battle", QuestBranchHotels, "BW024", "Crimson City", HotelQuestColor),
-  "crimson_3" => Quest.new("crimson_3", "Unusual Types 2", "A woman at the hotel wants you to show her a Normal/Ghost-type Pokémon", QuestBranchHotels, "BW (58)", "Crimson City", HotelQuestColor),
-  "crimson_4" => Quest.new("crimson_4", "The Top of the Waterfall", "Someone wants you to go investigate the top of a waterfall near Crimson City", QuestBranchHotels, "BW (28)", "Crimson City", HotelQuestColor),
-
-  #Saffron City
-  "saffron_1" => Quest.new("saffron_1", "Lost Puppies", "Find all of the missing Growlithe in the routes around Saffron City.", QuestBranchHotels, "BW (73)", "Saffron City", HotelQuestColor),
-  "saffron_2" => Quest.new("saffron_2", "Invisible Pokémon", "Find an invisible Pokémon in the eastern part of Saffron City.", QuestBranchHotels, "BW (57)", "Saffron City", HotelQuestColor),
-  "saffron_3" => Quest.new("saffron_3", "Bad to the Bone!", "Find a Rare Bone using Rock Smash.", QuestBranchHotels, "BW (72)", "Saffron City", HotelQuestColor),
-  "saffron_field_1" => Quest.new("saffron_field_1", "Dancing Queen!", "Dance with the Copycat Girl!", QuestBranchField, "BW (24)", "Saffron City (nightclub)", FieldQuestColor),
-
-  #Cinnabar Island
-  "cinnabar_1" => Quest.new("cinnabar_1", "The transformation Pokémon", "The scientist wants you to find some Quick Powder that can sometimes be found with wild Ditto in the mansion's basement.", QuestBranchHotels, "BW (82)", "Cinnabar Island", HotelQuestColor),
-  "cinnabar_2" => Quest.new("cinnabar_2", "Diamonds and Pearls", "Find a Diamond Necklace to save the man's marriage.", QuestBranchHotels, "BW (71)", "Cinnabar Island", HotelQuestColor),
-  "cinnabar_3" => Quest.new("cinnabar_3", "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", QuestBranchHotels, "BW (21)", "Cinnabar Island", HotelQuestColor),
-
-  #Goldenrod City
-  "goldenrod_1" => Quest.new( "goldenrod_1", "Safari Souvenir!", "Bring back a souvenir from the Fuchsia City Safari Zone", QuestBranchHotels, "BW (28)", "Goldenrod City", HotelQuestColor),
-  "goldenrod_2" => Quest.new("goldenrod_2", "The Cursed Forest", "A child wants you to find a floating tree stump in Ilex Forest. What could she be talking about?", QuestBranchHotels, "BW109", "Goldenrod City", HotelQuestColor),
-
-  "goldenrod_police_1" => Quest.new("goldenrod_police_1", "Undercover police work!", "Go see the police in Goldenrod City to help them with an important police operation.", QuestBranchField, "BW (80)", "Goldenrod City", FieldQuestColor),
-  "pinkan_police" => Quest.new("pinkan_police", "Pinkan Island!", "Team Rocket is planning a heist on Pinkan Island. You joined forces with the police to stop them!", QuestBranchField, "BW (80)", "Goldenrod City", FieldQuestColor),
-
-  #Violet City
-  "violet_1" => Quest.new("violet_1", "Defuse the Pinecones!", "Get rid of all the Pineco on Route 31 and Route 30", QuestBranchHotels, "BW (64)", "Violet City", HotelQuestColor),
-  "violet_2" => Quest.new("violet_2", "Find Slowpoke's Tail!", "Find a SlowpokeTail in some flowers, somewhere around Violet City!", QuestBranchHotels, "BW (19)", "Violet City", HotelQuestColor),
-
-  #Blackthorn City
-  "blackthorn_1" => Quest.new( "blackthorn_1", "Dragon Evolution", "A Dragon Tamer in Blackthorn City wants you to show her a fully-evolved Dragon Pokémon.", QuestBranchHotels, "BW014", "Blackthorn City", HotelQuestColor),
-  "blackthorn_2" => Quest.new("blackthorn_2", "Sunken Treasure!", "Find an old memorabilia on a sunken ship near Cinnabar Island.", QuestBranchHotels, "BW (28)", "Blackthorn City", HotelQuestColor),
-  "blackthorn_3" => Quest.new("blackthorn_3", "The Largest Carp", "A fisherman wants you to fish up a Magikarp that's exceptionally high-level at Dragon's Den.", QuestBranchHotels, "BW (71)", "Blackthorn City", HotelQuestColor),
-
-  #Ecruteak City
-  "ecruteak_1" => Quest.new("ecruteak_1", "Ghost Evolution", "A girl in Ecruteak City wants you to show her a fully-evolved Ghost Pokémon.", QuestBranchHotels, "BW014", "Ecruteak City", HotelQuestColor),
-
-  #Kin Island
-  "kin_1" => Quest.new("kin_1", "Banana Slamma!", "Collect 30 bananas", QuestBranchHotels, "BW059", "Kin Island", HotelQuestColor),
-  "kin_2" => Quest.new("kin_2", "Fallen Meteor", "Investigate a crater near Bond Bridge.", QuestBranchHotels, "BW009", "Kin Island", HotelQuestColor),
-  "kin_field_1" => Quest.new("kin_field_1", "The rarest fish", "A fisherman wants you to show him a Feebas. Apparently they can be fished around the Sevii Islands when it rains.", QuestBranchField, "BW056", "Kin Island", FieldQuestColor),
-
-  "legendary_deoxys_1" => Quest.new("legendary_deoxys_1", "First Contact", "Find the missing pieces of a fallen alien spaceship", QuestBranchHotels, "BW (92)", "Bond Bridge", LegendaryQuestColor),
-  "legendary_deoxys_2" => Quest.new("legendary_deoxys_2", "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", QuestBranchHotels, "BW (92)", "Bond Bridge", LegendaryQuestColor),
-
-  #Necrozma quest
-  "legendary_necrozma_1" => Quest.new("legendary_necrozma_1", "Mysterious prisms", "You found a pedestal with a mysterious prism on it. There seems to be room for more prisms.", QuestBranchLegendary, "BW_Sabrina", "Pokémon Tower", LegendaryQuestColor),
-  "legendary_necrozma_2" => Quest.new("legendary_necrozma_2", "The long night (Part 1)", "A mysterious darkness has shrouded some of the region. Meet Sabrina outside of Saffron City's western gate to investigate.", QuestBranchLegendary, "BW_Sabrina", "Lavender Town", LegendaryQuestColor),
-  "legendary_necrozma_3" => Quest.new("legendary_necrozma_1", "The long night (Part 2)", "The mysterious darkness has expended. Meet Sabrina on top of Celadon City's Dept. Store to figure out the source of the darkness.", QuestBranchLegendary, "BW_Sabrina", "Route 7", LegendaryQuestColor),
-  "legendary_necrozma_4" => Quest.new("legendary_necrozma_4", "The long night (Part 3)", "Fuchsia City appears to be unaffected by the darkness. Go investigate to see if you can find out more information.", QuestBranchLegendary, "BW_Sabrina", "Celadon City", LegendaryQuestColor),
-  "legendary_necrozma_5" => Quest.new("legendary_necrozma_5", "The long night (Part 4)", "The mysterious darkness has expended yet again and strange plants have appeared. Follow the plants to see where they lead.", QuestBranchLegendary, "BW_koga", "Fuchsia City", LegendaryQuestColor),
-  "legendary_necrozma_6" => Quest.new("legendary_necrozma_6", "The long night (Part 5)", "You found a strange fruit that appears to be related to the mysterious darkness. Go see professor Oak to have it analyzed.", QuestBranchLegendary, "BW029", "Safari Zone", LegendaryQuestColor),
-  "legendary_necrozma_7" => Quest.new("legendary_necrozma_7", "The long night (Part 6)", "The strange plant you found appears to glow in the mysterious darkness that now covers the entire region. Try to follow the glow to find out the source of the disturbance.", QuestBranchLegendary, "BW-oak", "Pallet Town", LegendaryQuestColor),
-
-
-  "legendary_meloetta_1" => Quest.new("legendary_meloetta_1", "A legendary band (Part 1)", "The singer of a band in Saffron City wants you to help them recruit a drummer. They think they've heard some drumming around Crimson City...", QuestBranchLegendary, "BW107", "Saffron City", LegendaryQuestColor),
-  "legendary_meloetta_2" => Quest.new("legendary_meloetta_2", "A legendary band (Part 2)", "The drummer from a legendary Pokéband wants you to find its former bandmates. The band manager talked about two former guitarists...", QuestBranchLegendary, "band_drummer", "Saffron City", LegendaryQuestColor),
-  "legendary_meloetta_3" => Quest.new("legendary_meloetta_3", "A legendary band (Part 3)", "The drummer from a legendary Pokéband wants you to find its former bandmates. There are rumors about strange music that was heard around the region.", QuestBranchLegendary, "band_drummer", "Saffron City", LegendaryQuestColor),
-  "legendary_meloetta_4" => Quest.new("legendary_meloetta_4", "A legendary band (Part 4)", "You assembled the full band! Come watch the show on Saturday night.", QuestBranchLegendary, "BW117", "Saffron City", LegendaryQuestColor),
-
-  "legendary_cresselia_1" => Quest.new(61, "Mysterious Lunar feathers", "A mysterious entity asked you to collect Lunar Feathers for them. It said that they will come at night to tell you where to look. Whoever that may be...", QuestBranchLegendary, "lunarFeather", "Lavender Town", LegendaryQuestColor),
-  #removed
-  #11 => Quest.new(11, "Powering the Lighthouse", "Catch some Voltorb to power up the lighthouse", QuestBranchHotels, "BW (43)", "Vermillion City", HotelQuestColor),
-
-}
-
 class PokeBattle_Trainer
   attr_accessor :quests
 end
@@ -250,8 +138,11 @@ def pbCompletedQuest?(id)
 end
 
 def pbQuestlog
-  # pbMessage(_INTL("The quest log has been temporarily removed from the game and is planned to be added back in a future update"))
+  if !$Trainer.quests_repaired
-  # return
+    fix_quest_ids
+    $Trainer.quests_repaired=true
+  end
+
   Questlog.new
 end
 
@@ -271,10 +162,6 @@ end
 def pbSetQuest(id, completed)
   $Trainer.quests = [] if $Trainer.quests.class == NilClass
   for q in $Trainer.quests
-    # echoln id
-    # echoln q.id
-    # echoln q.completed
-    # echoln "----"
     q.completed = completed if q.id == id
   end
 end
@@ -879,149 +766,304 @@ def pbSynchronizeQuestLog()
   ########################
   ### Quest started    ###
   ########################
-  #Pewter
+  # Pewter
-  pbAddQuest(0) if $game_switches[926]
+  pbAddQuest("pewter_1") if $game_switches[926]
-  pbAddQuest(1) if $game_switches[927]
+  pbAddQuest("pewter_2") if $game_switches[927]
 
-  #Cerulean
+  # Cerulean
-  pbAddQuest(3) if $game_switches[931]
+  pbAddQuest("cerulean_1") if $game_switches[931]
-  pbAddQuest(4) if $game_switches[942] || $game_self_switches[[462, 7, "A"]]
+  pbAddQuest("cerulean_2") if $game_switches[942] || $game_self_switches[[462, 7, "A"]]
 
-  #Vermillion
+  # Vermillion
-  pbAddQuest(10) if $game_self_switches[[464, 6, "A"]]
+  pbAddQuest("vermillion_1") if $game_self_switches[[464, 6, "A"]]
-  pbAddQuest(11) if $game_switches[945]
+  pbAddQuest("vermillion_2") if $game_switches[945]
-  pbAddQuest(12) if $game_switches[929]
+  pbAddQuest("vermillion_3") if $game_switches[929]
-  pbAddQuest(13) if $game_switches[175]
+  pbAddQuest("vermillion_4") if $game_switches[175]
 
-  #Celadon
+  # Celadon
-  pbAddQuest(14) if $game_self_switches[[466, 10, "A"]]
+  pbAddQuest("celadon_1") if $game_self_switches[[466, 10, "A"]]
-  pbAddQuest(15) if $game_switches[185]
+  pbAddQuest("celadon_2") if $game_switches[185]
-  pbAddQuest(16) if $game_switches[946]
+  pbAddQuest("celadon_3") if $game_switches[946]
-  pbAddQuest(17) if $game_switches[172]
+  pbAddQuest("celadon_4") if $game_switches[172]
 
-  #Fuchsia
+  # Fuchsia
-  pbAddQuest(18) if $game_switches[941]
+  pbAddQuest("fuchsia_1") if $game_switches[941]
-  pbAddQuest(19) if $game_switches[943]
+  pbAddQuest("fuchsia_2") if $game_switches[943]
-  pbAddQuest(20) if $game_switches[949]
+  pbAddQuest("fuchsia_3") if $game_switches[949]
 
-  #Crimson
+  # Crimson
-  pbAddQuest(21) if $game_switches[940]
+  pbAddQuest("crimson_1") if $game_switches[940]
-  pbAddQuest(22) if $game_self_switches[[177, 9, "A"]]
+  pbAddQuest("crimson_2") if $game_self_switches[[177, 9, "A"]]
-  pbAddQuest(23) if $game_self_switches[[177, 8, "A"]]
+  pbAddQuest("crimson_3") if $game_self_switches[[177, 8, "A"]]
 
-  #Saffron
+  # Saffron
-  pbAddQuest(24) if $game_switches[932]
+  pbAddQuest("saffron_1") if $game_switches[932]
-  pbAddQuest(25) if $game_self_switches[[111, 19, "A"]]
+  pbAddQuest("saffron_2") if $game_self_switches[[111, 19, "A"]]
-  pbAddQuest(26) if $game_switches[948]
+  pbAddQuest("saffron_3") if $game_switches[948]
-  pbAddQuest(27) if $game_switches[339]
+  pbAddQuest("saffron_4") if $game_switches[339]
-  pbAddQuest(28) if $game_switches[300]
+  pbAddQuest("saffron_5") if $game_switches[300]
 
-  #Cinnabar
+  # Cinnabar
-  pbAddQuest(29) if $game_switches[904]
+  pbAddQuest("cinnabar_1") if $game_switches[904]
-  pbAddQuest(30) if $game_switches[903]
+  pbAddQuest("cinnabar_2") if $game_switches[903]
 
-  #Goldenrod
+  # Goldenrod
-  pbAddQuest(31) if $game_self_switches[[244, 5, "A"]]
+  pbAddQuest("goldenrod_1") if $game_self_switches[[244, 5, "A"]]
-  pbAddQuest(32) if $game_self_switches[[244, 8, "A"]]
+  pbAddQuest("goldenrod_2") if $game_self_switches[[244, 8, "A"]]
 
-  #Violet
+  # Violet
-  pbSetQuest(33, true) if $game_switches[908]
+  pbSetQuest("violet_1", true) if $game_switches[908]
-  pbSetQuest(34, true) if $game_switches[410]
+  pbSetQuest("violet_2", true) if $game_switches[410]
 
-  #Blackthorn
+  # Blackthorn
-  pbSetQuest(35, true) if $game_self_switches[[332, 10, "A"]]
+  pbSetQuest("blackthorn_1", true) if $game_self_switches[[332, 10, "A"]]
-  pbSetQuest(36, true) if $game_self_switches[[332, 8, "A"]]
+  pbSetQuest("blackthorn_2", true) if $game_self_switches[[332, 8, "A"]]
-  pbSetQuest(37, true) if $game_self_switches[[332, 5, "B"]]
+  pbSetQuest("blackthorn_3", true) if $game_self_switches[[332, 5, "B"]]
 
-  #Ecruteak
+  # Ecruteak
-  pbSetQuest(38, true) if $game_self_switches[[576, 9, "A"]]
+  pbSetQuest("ecruteak_1", true) if $game_self_switches[[576, 9, "A"]]
-  pbSetQuest(39, true) if $game_self_switches[[576, 8, "A"]]
+  pbSetQuest("ecruteak_2", true) if $game_self_switches[[576, 8, "A"]]
 
-  #Kin
+  # Kin
-  pbSetQuest(40, true) if $game_switches[526]
+  pbSetQuest("kin_1", true) if $game_switches[526]
-  pbSetQuest(41, true) if $game_self_switches[[565, 10, "A"]]
+  pbSetQuest("kin_2", true) if $game_self_switches[[565, 10, "A"]]
 
   ########################
   ### Quest finished    ###
   ########################
-  #Pewter
+  # Pewter
-  pbSetQuest(0, true) if $game_self_switches[[460, 5, "A"]]
+  pbSetQuest("pewter_1", true) if $game_self_switches[[460, 5, "A"]]
-  pbSetQuest(1, true) if $game_self_switches[[460, 7, "A"]] || $game_self_switches[[460, 7, "B"]]
+  pbSetQuest("pewter_2", true) if $game_self_switches[[460, 7, "A"]] || $game_self_switches[[460, 7, "B"]]
   if $game_self_switches[[460, 9, "A"]]
-    pbAddQuest(2)
+    pbAddQuest("pewter_3")
-    pbSetQuest(2, true)
+    pbSetQuest("pewter_3", true)
   end
 
-  #Cerulean
+  # Cerulean
   if $game_self_switches[[462, 8, "A"]]
-    pbAddQuest(5)
+    pbAddQuest("cerulean_3")
-    pbSetQuest(5, true)
+    pbSetQuest("cerulean_3", true)
   end
-  pbSetQuest(3, true) if $game_switches[931] && !$game_switches[939]
+  pbSetQuest("cerulean_1", true) if $game_switches[931] && !$game_switches[939]
-  pbSetQuest(4, true) if $game_self_switches[[462, 7, "A"]]
+  pbSetQuest("cerulean_2", true) if $game_self_switches[[462, 7, "A"]]
 
-  #Vermillion
+  # Vermillion
-  pbSetQuest(13, true) if $game_self_switches[[19, 19, "B"]]
+  pbSetQuest("vermillion_4", true) if $game_self_switches[[19, 19, "B"]]
   if $game_self_switches[[464, 8, "A"]]
-    pbAddQuest(9)
+    pbAddQuest("vermillion_0")
-    pbSetQuest(9, true)
+    pbSetQuest("vermillion_0", true)
   end
-  pbSetQuest(10, true) if $game_self_switches[[464, 6, "B"]]
+  pbSetQuest("vermillion_1", true) if $game_self_switches[[464, 6, "B"]]
-  pbSetQuest(11, true) if $game_variables[145] >= 1
+  pbSetQuest("vermillion_2", true) if $game_variables[145] >= 1
-  pbSetQuest(12, true) if $game_self_switches[[464, 5, "A"]]
+  pbSetQuest("vermillion_3", true) if $game_self_switches[[464, 5, "A"]]
 
-  #Celadon
+  # Celadon
-  pbSetQuest(14, true) if $game_self_switches[[466, 10, "A"]]
+  pbSetQuest("celadon_1", true) if $game_self_switches[[466, 10, "A"]]
-  pbSetQuest(15, true) if $game_switches[947]
+  pbSetQuest("celadon_2", true) if $game_switches[947]
-  pbSetQuest(16, true) if $game_self_switches[[466, 9, "A"]]
+  pbSetQuest("celadon_3", true) if $game_self_switches[[466, 9, "A"]]
-  pbSetQuest(17, true) if $game_self_switches[[509, 5, "D"]]
+  pbSetQuest("celadon_4", true) if $game_self_switches[[509, 5, "D"]]
 
-  #Fuchsia
+  # Fuchsia
-  pbSetQuest(18, true) if $game_self_switches[[478, 6, "A"]]
+  pbSetQuest("fuchsia_1", true) if $game_self_switches[[478, 6, "A"]]
-  pbSetQuest(19, true) if $game_self_switches[[478, 8, "A"]]
+  pbSetQuest("fuchsia_2", true) if $game_self_switches[[478, 8, "A"]]
-  pbSetQuest(20, true) if $game_switches[922]
+  pbSetQuest("fuchsia_3", true) if $game_switches[922]
 
-  #Crimson
+  # Crimson
-  pbSetQuest(21, true) if $game_self_switches[[177, 5, "A"]]
+  pbSetQuest("crimson_1", true) if $game_self_switches[[177, 5, "A"]]
-  pbSetQuest(22, true) if $game_self_switches[[177, 9, "A"]]
+  pbSetQuest("crimson_2", true) if $game_self_switches[[177, 9, "A"]]
-  pbSetQuest(23, true) if $game_self_switches[[177, 8, "A"]]
+  pbSetQuest("crimson_3", true) if $game_self_switches[[177, 8, "A"]]
 
-  #Saffron
+  # Saffron
-  pbSetQuest(24, true) if $game_switches[938]
+  pbSetQuest("saffron_1", true) if $game_switches[938]
-  pbSetQuest(25, true) if $game_self_switches[[111, 19, "A"]]
+  pbSetQuest("saffron_2", true) if $game_self_switches[[111, 19, "A"]]
-  pbSetQuest(26, true) if $game_self_switches[[111, 9, "A"]]
+  pbSetQuest("saffron_3", true) if $game_self_switches[[111, 9, "A"]]
-  pbSetQuest(27, true) if $game_switches[338]
+  pbSetQuest("saffron_4", true) if $game_switches[338]
-  pbSetQuest(28, true) if $game_self_switches[[111, 18, "A"]]
+  pbSetQuest("saffron_5", true) if $game_self_switches[[111, 18, "A"]]
 
-  #Cinnabar
+  # Cinnabar
-  pbSetQuest(29, true) if $game_self_switches[[136, 5, "A"]]
+  pbSetQuest("cinnabar_1", true) if $game_self_switches[[136, 5, "A"]]
-  pbSetQuest(30, true) if $game_self_switches[[136, 8, "A"]]
+  pbSetQuest("cinnabar_2", true) if $game_self_switches[[136, 8, "A"]]
 
-  #Goldenrod
+  # Goldenrod
-  pbSetQuest(31, true) if $game_self_switches[[244, 5, "A"]]
+  pbSetQuest("goldenrod_1", true) if $game_self_switches[[244, 5, "A"]]
-  pbSetQuest(32, true) if $game_self_switches[[244, 8, "B"]]
+  pbSetQuest("goldenrod_2", true) if $game_self_switches[[244, 8, "B"]]
 
-  #Violet
+  # Violet
-  pbSetQuest(33, true) if $game_self_switches[[274, 5, "A"]]
+  pbSetQuest("violet_1", true) if $game_self_switches[[274, 5, "A"]]
-  pbSetQuest(34, true) if $game_self_switches[[274, 8, "A"]] || $game_self_switches[[274, 8, "B"]]
+  pbSetQuest("violet_2", true) if $game_self_switches[[274, 8, "A"]] || $game_self_switches[[274, 8, "B"]]
 
-  #Blackthorn
+  # Blackthorn
-  pbSetQuest(35, true) if $game_self_switches[[332, 10, "A"]]
+  pbSetQuest("blackthorn_1", true) if $game_self_switches[[332, 10, "A"]]
-  pbSetQuest(36, true) if $game_switches[337]
+  pbSetQuest("blackthorn_2", true) if $game_switches[337]
-  pbSetQuest(37, true) if $game_self_switches[[332, 5, "A"]]
+  pbSetQuest("blackthorn_3", true) if $game_self_switches[[332, 5, "A"]]
 
-  #Ecruteak
+  # Ecruteak
-  pbSetQuest(38, true) if $game_self_switches[[576, 9, "A"]]
+  pbSetQuest("ecruteak_1", true) if $game_self_switches[[576, 9, "A"]]
-  pbSetQuest(39, true) if $game_self_switches[[576, 8, "A"]]
+  pbSetQuest("ecruteak_2", true) if $game_self_switches[[576, 8, "A"]]
 
-  #Kin
+  # Kin
-  pbSetQuest(40, true) if $game_self_switches[[565, 9, "A"]]
+  pbSetQuest("kin_1", true) if $game_self_switches[[565, 9, "A"]]
-  pbSetQuest(41, true) if $game_self_switches[[565, 10, "A"]]
+  pbSetQuest("kin_2", true) if $game_self_switches[[565, 10, "A"]]
+
+  pbSetQuest("pewter_field_1", true) if $game_self_switches[[380, 62, "C"]]
+  pbSetQuest("pewter_field_2", true) if $game_switches[1073]
+  pbSetQuest("pewter_field_3", true) if $game_self_switches[[381, 9, "A"]]
+
+  pbSetQuest("cerulean_field_1", true) if $game_self_switches[[8, 19, "A"]]
+  pbSetQuest("cerulean_field_2", true) if $game_self_switches[[8, 19, "C"]]
+  pbSetQuest("cerulean_field_3", true) if $game_self_switches[[8, 19, "D"]]
+
+  pbSetQuest("vermillion_field_1", true) if $game_self_switches[[19, 19, "B"]] || $game_self_switches[[19, 19, "C"]]
+  pbSetQuest("vermillion_field_2", true) if $game_self_switches[[29, 12, "C"]]
+
+  pbSetQuest("celadon_field_1", true) if $game_self_switches[[509, 5, "D"]]
+
+  pbSetQuest("fuchsia_4", true) if $game_self_switches[[478, 12, "B"]]
+
+  pbSetQuest("crimson_4", true) if $game_self_switches[[177, 11, "A"]]
+
+  pbSetQuest("saffron_field_1", true) if $game_switches[938]
+
+  pbSetQuest("cinnabar_3", true) if $game_self_switches[[136, 9, "B"]]
+
+  pbSetQuest("saffron_field_1", true) if $game_switches[938]
+
+  pbSetQuest("kin_field_1", true) if $game_self_switches[[563, 25, "B"]]
+
+  pbSetQuest("legendary_deoxys_1", true) if $game_switches[839]
+  pbSetQuest("legendary_deoxys_2", true) if $game_self_switches[[607, 2, "C"]]
+
+  pbSetQuest("legendary_necrozma_1", true) if $game_switches[710]
+  pbSetQuest("legendary_necrozma_2", true) if $game_switches[711]
+  pbSetQuest("legendary_necrozma_3", true) if $game_switches[719]
+  pbSetQuest("legendary_necrozma_4", true) if $game_switches[716]
+  pbSetQuest("legendary_necrozma_5", true) if $game_switches[718]
+  pbSetQuest("legendary_necrozma_6", true) if $game_self_switches[[42, 43, "A"]]
+  pbSetQuest("legendary_necrozma_7", true) if $game_switches[760] || $game_switches[761]
+
+  pbSetQuest("legendary_meloetta_1", true) if $game_switches[1011]
+  pbSetQuest("legendary_meloetta_2", true) if $game_switches[1014]
+  pbSetQuest("legendary_meloetta_3", true) if $game_switches[1015]
+  pbSetQuest("legendary_meloetta_4", true) if $game_switches[750]
+
+
+  pbSetQuest("pokemart_johto", true) if $game_switches[SWITCH_JOHTO_HAIR_COLLECTION]
+  pbSetQuest("pokemart_hoenn", true) if $game_switches[SWITCH_HOENN_HAIR_COLLECTION]
+  pbSetQuest("pokemart_sinnoh", true) if $game_switches[SWITCH_SINNOH_HAIR_COLLECTION]
+  pbSetQuest("pokemart_unova", true) if $game_switches[SWITCH_UNOVA_HAIR_COLLECTION]
+  pbSetQuest("pokemart_kalos", true) if $game_switches[SWITCH_KALOS_HAIR_COLLECTION]
+  pbSetQuest("pokemart_alola", true) if $game_switches[SWITCH_ALOLA_HAIR_COLLECTION]
 
 end
 
 
 
+def fix_quest_ids
+  $Trainer.quests.each do |quest|
+    new_id = get_new_quest_id(quest.id)
+    if new_id != quest.id
+      echoln "BEFORE FIX"
+      echoln "ID: #{quest.id} "
+      echoln "Name: #{quest.name}"
+      echoln "Completed: #{quest.completed}"
+      echoln ""
+
+      quest.id = new_id
+
+
+      echoln "AFTER FIX"
+      echoln "ID: #{quest.id} "
+      echoln "Name: #{quest.name}"
+      echoln "Completed: #{quest.completed}"
+      echoln ""
+    end
+  end
+  pbSynchronizeQuestLog
+end
+
+
+def get_new_quest_id(old_quest_id)
+  quest_id_map = {
+      3 => "cerulean_1",
+      4 => "vermillion_2",
+      5 => "pokemart_johto",
+
+      6 => "cerulean_field_1",
+      7 => "cerulean_field_2",
+      8 => "cerulean_field_3",
+
+      9 => "vermillion_1",
+      12 => "vermillion_3",
+      13 => "vermillion_field_1",
+
+      14 => "celadon_1",
+      15 => "celadon_2",
+      16 => "celadon_3",
+      17 => "celadon_field_1",
+
+      18 => "fuchsia_3",
+      19 => "fuchsia_2",
+      20 => "fuchsia_1",
+
+      21 => "crimson_1",
+      22 => "crimson_2",
+      23 => "crimson_3",
+
+      24 => "saffron_field_1",
+      25 => "pokemart_sinnoh",
+      26 => "saffron_1",
+      27 => "saffron_2",
+      28 => "saffron_3",
+
+      29 => "cinnabar_1",
+      30 => "cinnabar_2",
+
+      31 => "pokemart_hoenn",
+
+      32 => "goldenrod_1",
+
+      33 => "violet_1",
+      34 => "violet_2",
+
+      35 => "blackthorn_1",
+      36 => "blackthorn_2",
+      37 => "blackthorn_3",
+
+      38 => "pokemart_kalos",
+
+      39 => "ecruteak_1",
+      40 => "kin_1",
+      41 => "pokemart_unova",
+      42 => "cinnabar_3",
+      43 => "kin_2",
+      44 => "bond_1",
+      45 => "bond_2",
+      46 => "kin_3",
+      47 => "tower_1",
+      48 => "lavender_darkness_1",
+      49 => "celadon_darkness_2",
+      50 => "fuchsia_darkness_3",
+      51 => "fuchsia_darkness_4",
+      52 => "safari_darkness_5",
+      53 => "pallet_darkness_6",
+      54 => "pewter_field_1",
+      55 => "goldenrod_2",
+      56 => "fuchsia_4",
+      57 => "saffron_band_1",
+      58 => "saffron_band_2",
+      59 => "saffron_band_3",
+      60 => "saffron_band_4",
+      61 => "lavender_lunar",
+      62 => "pokemart_alola",
+      63 => "pewter_field_2",
+      64 => "vermillion_field_2",
+      65 => "goldenrod_police_1",
+      66 => "pinkan_police"
+  }
+  return quest_id_map[old_quest_id] || old_quest_id
+end
+
+
 def showQuestStatistics(eventId,includeRocketQuests=false)
   quests_accepted = []
   quests_in_progress=[]

Data/Scripts/052_InfiniteFusion/Quests/Quests.rb

@@ -15,110 +15,110 @@ end
 
 QUESTS = {
     #Pokemart
-    "pokemart_johto" => Quest.new("pokemart_johto", "Johto Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Johto region.", QuestBranchHotels, "traveler_johto", "Cerulean City", HotelQuestColor),
+    "pokemart_johto" => Quest.new("pokemart_johto", "Johto Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Johto region.", "traveler_johto", "Cerulean City", HotelQuestColor),
-    "pokemart_hoenn" => Quest.new("pokemart_hoenn", "Hoenn Pokémon", "A traveler in the PokéMart you to show him a Pokémon native to the Hoenn region.", QuestBranchHotels, "traveler_hoenn", "Vermillion City", HotelQuestColor),
+    "pokemart_hoenn" => Quest.new("pokemart_hoenn", "Hoenn Pokémon", "A traveler in the PokéMart you to show him a Pokémon native to the Hoenn region.", "traveler_hoenn", "Vermillion City", HotelQuestColor),
-    "pokemart_sinnoh" => Quest.new("pokemart_sinnoh", "Sinnoh Pokémon", "A traveler in the Department Center wants you to show him a Pokémon native to the Sinnoh region.", QuestBranchHotels, "traveler_sinnoh", "Celadon City", HotelQuestColor),
+    "pokemart_sinnoh" => Quest.new("pokemart_sinnoh", "Sinnoh Pokémon", "A traveler in the Department Center wants you to show him a Pokémon native to the Sinnoh region.", "traveler_sinnoh", "Celadon City", HotelQuestColor),
-    "pokemart_unova" => Quest.new( "pokemart_unova", "Unova Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Unova region.", QuestBranchHotels, "traveler_unova", "Fuchsia City", HotelQuestColor),
+    "pokemart_unova" => Quest.new( "pokemart_unova", "Unova Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Unova region.", "traveler_unova", "Fuchsia City", HotelQuestColor),
-    "pokemart_kalos" => Quest.new("pokemart_kalos", "Kalos Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Kalos region.", QuestBranchHotels, "traveler_kalos", "Saffron City", HotelQuestColor),
+    "pokemart_kalos" => Quest.new("pokemart_kalos", "Kalos Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Kalos region.", "traveler_kalos", "Saffron City", HotelQuestColor),
-    "pokemart_alola" => Quest.new("pokemart_alola", "Alola Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Alola region.", QuestBranchHotels, "traveler_alola", "Cinnabar Island", HotelQuestColor),
+    "pokemart_alola" => Quest.new("pokemart_alola", "Alola Pokémon", "A traveler in the PokéMart wants you to show him a Pokémon native to the Alola region.", "traveler_alola", "Cinnabar Island", HotelQuestColor),
 
 
     #Pewter hotel
-    "pewter_1" => Quest.new("pewter_1", "Mushroom Gathering", "A lady in Pewter City wants you to bring her 3 TinyMushroom from Viridian Forest to make a stew.", QuestBranchHotels, "BW (74)", "Pewter City", HotelQuestColor),
+    "pewter_1" => Quest.new("pewter_1", "Mushroom Gathering", "A lady in Pewter City wants you to bring her 3 TinyMushroom from Viridian Forest to make a stew.", "BW (74)", "Pewter City", HotelQuestColor),
-    "pewter_2" =>Quest.new("pewter_2", "Lost Medicine", "A youngster in Pewter City needs your help to find a lost Revive. He lost it by sitting on a bench somewhere in Pewter City.", QuestBranchHotels, "BW (19)", "Pewter City", HotelQuestColor),
+    "pewter_2" =>Quest.new("pewter_2", "Lost Medicine", "A youngster in Pewter City needs your help to find a lost Revive. He lost it by sitting on a bench somewhere in Pewter City.", "BW (19)", "Pewter City", HotelQuestColor),
-    "pewter_3" =>Quest.new("pewter_3", "Bug Evolution ", "A Bug Catcher in Pewter City wants you to show him a fully-evolved Bug Pokémon.", QuestBranchHotels, "BWBugCatcher_male", "Pewter City", HotelQuestColor),
+    "pewter_3" =>Quest.new("pewter_3", "Bug Evolution ", "A Bug Catcher in Pewter City wants you to show him a fully-evolved Bug Pokémon.", "BWBugCatcher_male", "Pewter City", HotelQuestColor),
-    "pewter_field_1" => Quest.new("pewter_field_1", "Nectar garden", "An old man wants you to bring differently colored flowers for the city's garden.", QuestBranchField, "BW (039)", "Pewter City", FieldQuestColor),
+    "pewter_field_1" => Quest.new("pewter_field_1", "Nectar garden", "An old man wants you to bring differently colored flowers for the city's garden.",  "BW (039)", "Pewter City", FieldQuestColor),
-    "pewter_field_2" => Quest.new("pewter_field_2", "I Choose You!", "A Pikachu in the PokéMart has lost its official Pokémon League Hat. Find one and give it to the Pikachu!", QuestBranchField, "YOUNGSTER_LeagueHat", "Pewter City", FieldQuestColor),
+    "pewter_field_2" => Quest.new("pewter_field_2", "I Choose You!", "A Pikachu in the PokéMart has lost its official Pokémon League Hat. Find one and give it to the Pikachu!",  "YOUNGSTER_LeagueHat", "Pewter City", FieldQuestColor),
-    "pewter_field_3" => Quest.new("pewter_field_3", "Prehistoric Amber!", "Meetup with a scientist in Viridian Forest to look for prehistoric amber.", QuestBranchField, "BW (82)", "Pewter City", FieldQuestColor),
+    "pewter_field_3" => Quest.new("pewter_field_3", "Prehistoric Amber!", "Meetup with a scientist in Viridian Forest to look for prehistoric amber.",  "BW (82)", "Pewter City", FieldQuestColor),
 
     #Cerulean hotel
-    "cerulean_1" => Quest.new("cerulean_1", "Playing Cupid", "A boy in Cerulean City wants you bring a love letter to a Pokémon Breeder named Maude. She's probably somewhere in one of the routes near Cerulean City", QuestBranchHotels, "BW (18)", "Cerulean City", HotelQuestColor),
+    "cerulean_1" => Quest.new("cerulean_1", "Playing Cupid", "A boy in Cerulean City wants you bring a love letter to a Pokémon Breeder named Maude. She's probably somewhere in one of the routes near Cerulean City", "BW (18)", "Cerulean City", HotelQuestColor),
-    "cerulean_2" => Quest.new("cerulean_2", "Type Experts", "Defeat all of the Type Experts scattered around the Kanto region (#{pbGet(VAR_TYPE_EXPERTS_BEATEN)}/#{TOTAL_NB_TYPE_EXPERTS})", QuestBranchHotels, "expert-normal", "Cerulean City", HotelQuestColor),
+    "cerulean_2" => Quest.new("cerulean_2", "Type Experts", "Defeat all of the Type Experts scattered around the Kanto region (#{pbGet(VAR_TYPE_EXPERTS_BEATEN)}/#{TOTAL_NB_TYPE_EXPERTS})", "expert-normal", "Cerulean City", HotelQuestColor),
 
     #Route 24
-    "cerulean_field_1" => Quest.new("cerulean_field_1", "Field Research (Part 1)", "Professor Oak's aide wants you to catch an Abra.", QuestBranchField, "BW (82)", "Route 24", FieldQuestColor),
+    "cerulean_field_1" => Quest.new("cerulean_field_1", "Field Research (Part 1)", "Professor Oak's aide wants you to catch an Abra.",  "BW (82)", "Route 24", FieldQuestColor),
-    "cerulean_field_2" => Quest.new("cerulean_field_2", "Field Research (Part 2)", "Professor Oak's aide wants you to encounter every Pokémon on Route 24.", QuestBranchField, "BW (82)", "Route 24", FieldQuestColor),
+    "cerulean_field_2" => Quest.new("cerulean_field_2", "Field Research (Part 2)", "Professor Oak's aide wants you to encounter every Pokémon on Route 24.",  "BW (82)", "Route 24", FieldQuestColor),
-    "cerulean_field_3" => Quest.new("cerulean_field_3", "Field Research (Part 3)", "Professor Oak's aide wants you to catch a Buneary using the Pokéradar.", QuestBranchField, "BW (82)", "Route 24", FieldQuestColor),
+    "cerulean_field_3" => Quest.new("cerulean_field_3", "Field Research (Part 3)", "Professor Oak's aide wants you to catch a Buneary using the Pokéradar.",  "BW (82)", "Route 24", FieldQuestColor),
 
     #Vermillion City
-    "vermillion_2" => Quest.new("vermillion_2", "Fishing for Sole", "A fisherman wants you to fish up an old boot. Hook it up with the old rod in any body of water.", QuestBranchHotels, "BW (71)", "Cerulean City", HotelQuestColor),
+    "vermillion_2" => Quest.new("vermillion_2", "Fishing for Sole", "A fisherman wants you to fish up an old boot. Hook it up with the old rod in any body of water.", "BW (71)", "Cerulean City", HotelQuestColor),
-    "vermillion_1" => Quest.new("vermillion_1", "Unusual Types 1", "A woman at the hotel wants you to show her a Water/Fire-type Pokémon", QuestBranchHotels, "BW (58)", "Vermillion City", HotelQuestColor),
+    "vermillion_1" => Quest.new("vermillion_1", "Unusual Types 1", "A woman at the hotel wants you to show her a Water/Fire-type Pokémon", "BW (58)", "Vermillion City", HotelQuestColor),
-    "vermillion_3" => Quest.new("vermillion_3", "Seafood Cocktail ", "Get some steamed Krabby legs from the S.S. Anne's kitchen and bring them back to the hotel before they get cold", QuestBranchHotels, "BW (36)", "Vermillion City", HotelQuestColor),
+    "vermillion_3" => Quest.new("vermillion_3", "Seafood Cocktail ", "Get some steamed Krabby legs from the S.S. Anne's kitchen and bring them back to the hotel before they get cold", "BW (36)", "Vermillion City", HotelQuestColor),
-    "vermillion_field_1" => Quest.new("vermillion_field_1", "Building Materials ", "Get some wooden planks from Viridian City and some Bricks from Pewter City.", QuestBranchField, "BW (36)", "Vermillion City", FieldQuestColor),
+    "vermillion_field_1" => Quest.new("vermillion_field_1", "Building Materials ", "Get some wooden planks from Viridian City and some Bricks from Pewter City.",  "BW (36)", "Vermillion City", FieldQuestColor),
-    "vermillion_field_2" => Quest.new("vermillion_field_2", "Waiter on the Water", "The S.S. Anne waiter wants you to take restaurant orders while he went to get a replacement cake.", QuestBranchField, "BW (53)", "S.S. Anne", FieldQuestColor),
+    "vermillion_field_2" => Quest.new("vermillion_field_2", "Waiter on the Water", "The S.S. Anne waiter wants you to take restaurant orders while he went to get a replacement cake.",  "BW (53)", "S.S. Anne", FieldQuestColor),
 
     #Celadon City
-    "celadon_1" => Quest.new("celadon_1", "Sun or Moon", "Show the Pokémon that Eevee evolves when exposed to a Moon or Sun stone to help the scientist with her research.", QuestBranchHotels, "BW (82)", "Celadon City", HotelQuestColor),
+    "celadon_1" => Quest.new("celadon_1", "Sun or Moon", "Show the Pokémon that Eevee evolves when exposed to a Moon or Sun stone to help the scientist with her research.", "BW (82)", "Celadon City", HotelQuestColor),
-    "celadon_2" => Quest.new("celadon_2", "For Whom the Bell Tolls", "Ring Lavender Town's bell when the time is right to reveal its secret.", QuestBranchHotels, "BW (40)", "Lavender Town", HotelQuestColor),
+    "celadon_2" => Quest.new("celadon_2", "For Whom the Bell Tolls", "Ring Lavender Town's bell when the time is right to reveal its secret.", "BW (40)", "Lavender Town", HotelQuestColor),
-    "celadon_3" => Quest.new("celadon_3", "Hardboiled", "A lady wants you to give her an egg to make an omelette.", QuestBranchHotels, "BW (24)", "Celadon City", HotelQuestColor),
+    "celadon_3" => Quest.new("celadon_3", "Hardboiled", "A lady wants you to give her an egg to make an omelette.", "BW (24)", "Celadon City", HotelQuestColor),
-    "celadon_field_1" => Quest.new("celadon_field_1", "A stroll with Eevee!", "Walk Eevee around for a while until it gets tired.", QuestBranchField, "BW (37)", "Celadon City", FieldQuestColor),
+    "celadon_field_1" => Quest.new("celadon_field_1", "A stroll with Eevee!", "Walk Eevee around for a while until it gets tired.",  "BW (37)", "Celadon City", FieldQuestColor),
 
     #Fuchsia City
-    "fuchsia_1" => Quest.new("fuchsia_1", "Bicycle Race!", "Go meet the Cyclist at the bottom of Route 17 and beat her time up the Cycling Road!", QuestBranchHotels, "BW032", "Cycling Road", HotelQuestColor),
+    "fuchsia_1" => Quest.new("fuchsia_1", "Bicycle Race!", "Go meet the Cyclist at the bottom of Route 17 and beat her time up the Cycling Road!", "BW032", "Cycling Road", HotelQuestColor),
-    "fuchsia_2" => Quest.new("fuchsia_2", "Lost Pokémon!", "Find the lost Chansey's trainer!", QuestBranchHotels, "113", "Fuchsia City", HotelQuestColor),
+    "fuchsia_2" => Quest.new("fuchsia_2", "Lost Pokémon!", "Find the lost Chansey's trainer!", "113", "Fuchsia City", HotelQuestColor),
-    "fuchsia_3" => Quest.new("fuchsia_3", "Cleaning up the Cycling Road", "Get rid of all the Pokémon dirtying up the Cycling Road.", QuestBranchHotels, "BW (77)", "Fuchsia City", HotelQuestColor),
+    "fuchsia_3" => Quest.new("fuchsia_3", "Cleaning up the Cycling Road", "Get rid of all the Pokémon dirtying up the Cycling Road.", "BW (77)", "Fuchsia City", HotelQuestColor),
-    "fuchsia_4" => Quest.new("fuchsia_4", "Bitey Pokémon", "A fisherman wants to know what is the sharp-toothed Pokémon that bit him in the Safari Zone's lake.", QuestBranchHotels, "BW (71)", "Fuchsia City", HotelQuestColor),
+    "fuchsia_4" => Quest.new("fuchsia_4", "Bitey Pokémon", "A fisherman wants to know what is the sharp-toothed Pokémon that bit him in the Safari Zone's lake.", "BW (71)", "Fuchsia City", HotelQuestColor),
 
     #Crimson City
-    "crimson_1" => Quest.new("crimson_1", "Shellfish Rescue", "Put all the stranded Shellders back in the water on the route to Crimson City.", QuestBranchHotels, "BW (48)", "Crimson City", HotelQuestColor),
+    "crimson_1" => Quest.new("crimson_1", "Shellfish Rescue", "Put all the stranded Shellders back in the water on the route to Crimson City.", "BW (48)", "Crimson City", HotelQuestColor),
-    "crimson_2" => Quest.new("crimson_2", "Fourth Round Rumble", "Defeat Jeanette and her high-level Bellsprout in a Pokémon Battle", QuestBranchHotels, "BW024", "Crimson City", HotelQuestColor),
+    "crimson_2" => Quest.new("crimson_2", "Fourth Round Rumble", "Defeat Jeanette and her high-level Bellsprout in a Pokémon Battle", "BW024", "Crimson City", HotelQuestColor),
-    "crimson_3" => Quest.new("crimson_3", "Unusual Types 2", "A woman at the hotel wants you to show her a Normal/Ghost-type Pokémon", QuestBranchHotels, "BW (58)", "Crimson City", HotelQuestColor),
+    "crimson_3" => Quest.new("crimson_3", "Unusual Types 2", "A woman at the hotel wants you to show her a Normal/Ghost-type Pokémon", "BW (58)", "Crimson City", HotelQuestColor),
-    "crimson_4" => Quest.new("crimson_4", "The Top of the Waterfall", "Someone wants you to go investigate the top of a waterfall near Crimson City", QuestBranchHotels, "BW (28)", "Crimson City", HotelQuestColor),
+    "crimson_4" => Quest.new("crimson_4", "The Top of the Waterfall", "Someone wants you to go investigate the top of a waterfall near Crimson City", "BW (28)", "Crimson City", HotelQuestColor),
 
     #Saffron City
-    "saffron_1" => Quest.new("saffron_1", "Lost Puppies", "Find all of the missing Growlithe in the routes around Saffron City.", QuestBranchHotels, "BW (73)", "Saffron City", HotelQuestColor),
+    "saffron_1" => Quest.new("saffron_1", "Lost Puppies", "Find all of the missing Growlithe in the routes around Saffron City.", "BW (73)", "Saffron City", HotelQuestColor),
-    "saffron_2" => Quest.new("saffron_2", "Invisible Pokémon", "Find an invisible Pokémon in the eastern part of Saffron City.", QuestBranchHotels, "BW (57)", "Saffron City", HotelQuestColor),
+    "saffron_2" => Quest.new("saffron_2", "Invisible Pokémon", "Find an invisible Pokémon in the eastern part of Saffron City.", "BW (57)", "Saffron City", HotelQuestColor),
-    "saffron_3" => Quest.new("saffron_3", "Bad to the Bone!", "Find a Rare Bone using Rock Smash.", QuestBranchHotels, "BW (72)", "Saffron City", HotelQuestColor),
+    "saffron_3" => Quest.new("saffron_3", "Bad to the Bone!", "Find a Rare Bone using Rock Smash.", "BW (72)", "Saffron City", HotelQuestColor),
-    "saffron_field_1" => Quest.new("saffron_field_1", "Dancing Queen!", "Dance with the Copycat Girl!", QuestBranchField, "BW (24)", "Saffron City (nightclub)", FieldQuestColor),
+    "saffron_field_1" => Quest.new("saffron_field_1", "Dancing Queen!", "Dance with the Copycat Girl!",  "BW (24)", "Saffron City (nightclub)", FieldQuestColor),
 
     #Cinnabar Island
-    "cinnabar_1" => Quest.new("cinnabar_1", "The transformation Pokémon", "The scientist wants you to find some Quick Powder that can sometimes be found with wild Ditto in the mansion's basement.", QuestBranchHotels, "BW (82)", "Cinnabar Island", HotelQuestColor),
+    "cinnabar_1" => Quest.new("cinnabar_1", "The transformation Pokémon", "The scientist wants you to find some Quick Powder that can sometimes be found with wild Ditto in the mansion's basement.", "BW (82)", "Cinnabar Island", HotelQuestColor),
-    "cinnabar_2" => Quest.new("cinnabar_2", "Diamonds and Pearls", "Find a Diamond Necklace to save the man's marriage.", QuestBranchHotels, "BW (71)", "Cinnabar Island", HotelQuestColor),
+    "cinnabar_2" => Quest.new("cinnabar_2", "Diamonds and Pearls", "Find a Diamond Necklace to save the man's marriage.", "BW (71)", "Cinnabar Island", HotelQuestColor),
-    "cinnabar_3" => Quest.new("cinnabar_3", "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", QuestBranchHotels, "BW (21)", "Cinnabar Island", HotelQuestColor),
+    "cinnabar_3" => Quest.new("cinnabar_3", "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", "BW (21)", "Cinnabar Island", HotelQuestColor),
 
     #Goldenrod City
-    "goldenrod_1" => Quest.new( "goldenrod_1", "Safari Souvenir!", "Bring back a souvenir from the Fuchsia City Safari Zone", QuestBranchHotels, "BW (28)", "Goldenrod City", HotelQuestColor),
+    "goldenrod_1" => Quest.new( "goldenrod_1", "Safari Souvenir!", "Bring back a souvenir from the Fuchsia City Safari Zone", "BW (28)", "Goldenrod City", HotelQuestColor),
-    "goldenrod_2" => Quest.new("goldenrod_2", "The Cursed Forest", "A child wants you to find a floating tree stump in Ilex Forest. What could she be talking about?", QuestBranchHotels, "BW109", "Goldenrod City", HotelQuestColor),
+    "goldenrod_2" => Quest.new("goldenrod_2", "The Cursed Forest", "A child wants you to find a floating tree stump in Ilex Forest. What could she be talking about?", "BW109", "Goldenrod City", HotelQuestColor),
 
-    "goldenrod_police_1" => Quest.new("goldenrod_police_1", "Undercover police work!", "Go see the police in Goldenrod City to help them with an important police operation.", QuestBranchField, "BW (80)", "Goldenrod City", FieldQuestColor),
+    "goldenrod_police_1" => Quest.new("goldenrod_police_1", "Undercover police work!", "Go see the police in Goldenrod City to help them with an important police operation.",  "BW (80)", "Goldenrod City", FieldQuestColor),
-    "pinkan_police" => Quest.new("pinkan_police", "Pinkan Island!", "Team Rocket is planning a heist on Pinkan Island. You joined forces with the police to stop them!", QuestBranchField, "BW (80)", "Goldenrod City", FieldQuestColor),
+    "pinkan_police" => Quest.new("pinkan_police", "Pinkan Island!", "Team Rocket is planning a heist on Pinkan Island. You joined forces with the police to stop them!",  "BW (80)", "Goldenrod City", FieldQuestColor),
 
     #Violet City
-    "violet_1" => Quest.new("violet_1", "Defuse the Pinecones!", "Get rid of all the Pineco on Route 31 and Route 30", QuestBranchHotels, "BW (64)", "Violet City", HotelQuestColor),
+    "violet_1" => Quest.new("violet_1", "Defuse the Pinecones!", "Get rid of all the Pineco on Route 31 and Route 30", "BW (64)", "Violet City", HotelQuestColor),
-    "violet_2" => Quest.new("violet_2", "Find Slowpoke's Tail!", "Find a SlowpokeTail in some flowers, somewhere around Violet City!", QuestBranchHotels, "BW (19)", "Violet City", HotelQuestColor),
+    "violet_2" => Quest.new("violet_2", "Find Slowpoke's Tail!", "Find a SlowpokeTail in some flowers, somewhere around Violet City!", "BW (19)", "Violet City", HotelQuestColor),
 
     #Blackthorn City
-    "blackthorn_1" => Quest.new( "blackthorn_1", "Dragon Evolution", "A Dragon Tamer in Blackthorn City wants you to show her a fully-evolved Dragon Pokémon.", QuestBranchHotels, "BW014", "Blackthorn City", HotelQuestColor),
+    "blackthorn_1" => Quest.new( "blackthorn_1", "Dragon Evolution", "A Dragon Tamer in Blackthorn City wants you to show her a fully-evolved Dragon Pokémon.", "BW014", "Blackthorn City", HotelQuestColor),
-    "blackthorn_2" => Quest.new("blackthorn_2", "Sunken Treasure!", "Find an old memorabilia on a sunken ship near Cinnabar Island.", QuestBranchHotels, "BW (28)", "Blackthorn City", HotelQuestColor),
+    "blackthorn_2" => Quest.new("blackthorn_2", "Sunken Treasure!", "Find an old memorabilia on a sunken ship near Cinnabar Island.", "BW (28)", "Blackthorn City", HotelQuestColor),
-    "blackthorn_3" => Quest.new("blackthorn_3", "The Largest Carp", "A fisherman wants you to fish up a Magikarp that's exceptionally high-level at Dragon's Den.", QuestBranchHotels, "BW (71)", "Blackthorn City", HotelQuestColor),
+    "blackthorn_3" => Quest.new("blackthorn_3", "The Largest Carp", "A fisherman wants you to fish up a Magikarp that's exceptionally high-level at Dragon's Den.", "BW (71)", "Blackthorn City", HotelQuestColor),
 
     #Ecruteak City
-    "ecruteak_1" => Quest.new("ecruteak_1", "Ghost Evolution", "A girl in Ecruteak City wants you to show her a fully-evolved Ghost Pokémon.", QuestBranchHotels, "BW014", "Ecruteak City", HotelQuestColor),
+    "ecruteak_1" => Quest.new("ecruteak_1", "Ghost Evolution", "A girl in Ecruteak City wants you to show her a fully-evolved Ghost Pokémon.", "BW014", "Ecruteak City", HotelQuestColor),
 
     #Kin Island
-    "kin_1" => Quest.new("kin_1", "Banana Slamma!", "Collect 30 bananas", QuestBranchHotels, "BW059", "Kin Island", HotelQuestColor),
+    "kin_1" => Quest.new("kin_1", "Banana Slamma!", "Collect 30 bananas", "BW059", "Kin Island", HotelQuestColor),
-    "kin_2" => Quest.new("kin_2", "Fallen Meteor", "Investigate a crater near Bond Bridge.", QuestBranchHotels, "BW009", "Kin Island", HotelQuestColor),
+    "kin_2" => Quest.new("kin_2", "Fallen Meteor", "Investigate a crater near Bond Bridge.", "BW009", "Kin Island", HotelQuestColor),
-    "kin_field_1" => Quest.new("kin_field_1", "The rarest fish", "A fisherman wants you to show him a Feebas. Apparently they can be fished around the Sevii Islands when it rains.", QuestBranchField, "BW056", "Kin Island", FieldQuestColor),
+    "kin_field_1" => Quest.new("kin_field_1", "The rarest fish", "A fisherman wants you to show him a Feebas. Apparently they can be fished around the Sevii Islands when it rains.",  "BW056", "Kin Island", FieldQuestColor),
 
-    "legendary_deoxys_1" => Quest.new("legendary_deoxys_1", "First Contact", "Find the missing pieces of a fallen alien spaceship", QuestBranchHotels, "BW (92)", "Bond Bridge", LegendaryQuestColor),
+    "legendary_deoxys_1" => Quest.new("legendary_deoxys_1", "First Contact", "Find the missing pieces of a fallen alien spaceship", "BW (92)", "Bond Bridge", LegendaryQuestColor),
-    "legendary_deoxys_2" => Quest.new("legendary_deoxys_2", "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", QuestBranchHotels, "BW (92)", "Bond Bridge", LegendaryQuestColor),
+    "legendary_deoxys_2" => Quest.new("legendary_deoxys_2", "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", "BW (92)", "Bond Bridge", LegendaryQuestColor),
 
     #Necrozma quest
-    "legendary_necrozma_1" => Quest.new("legendary_necrozma_1", "Mysterious prisms", "You found a pedestal with a mysterious prism on it. There seems to be room for more prisms.", QuestBranchLegendary, "BW_Sabrina", "Pokémon Tower", LegendaryQuestColor),
+    "legendary_necrozma_1" => Quest.new("legendary_necrozma_1", "Mysterious prisms", "You found a pedestal with a mysterious prism on it. There seems to be room for more prisms.", "BW_Sabrina", "Pokémon Tower", LegendaryQuestColor),
-    "legendary_necrozma_2" => Quest.new("legendary_necrozma_2", "The long night (Part 1)", "A mysterious darkness has shrouded some of the region. Meet Sabrina outside of Saffron City's western gate to investigate.", QuestBranchLegendary, "BW_Sabrina", "Lavender Town", LegendaryQuestColor),
+    "legendary_necrozma_2" => Quest.new("legendary_necrozma_2", "The long night (Part 1)", "A mysterious darkness has shrouded some of the region. Meet Sabrina outside of Saffron City's western gate to investigate.", "BW_Sabrina", "Lavender Town", LegendaryQuestColor),
-    "legendary_necrozma_3" => Quest.new("legendary_necrozma_1", "The long night (Part 2)", "The mysterious darkness has expended. Meet Sabrina on top of Celadon City's Dept. Store to figure out the source of the darkness.", QuestBranchLegendary, "BW_Sabrina", "Route 7", LegendaryQuestColor),
+    "legendary_necrozma_3" => Quest.new("legendary_necrozma_1", "The long night (Part 2)", "The mysterious darkness has expended. Meet Sabrina on top of Celadon City's Dept. Store to figure out the source of the darkness.", "BW_Sabrina", "Route 7", LegendaryQuestColor),
-    "legendary_necrozma_4" => Quest.new("legendary_necrozma_4", "The long night (Part 3)", "Fuchsia City appears to be unaffected by the darkness. Go investigate to see if you can find out more information.", QuestBranchLegendary, "BW_Sabrina", "Celadon City", LegendaryQuestColor),
+    "legendary_necrozma_4" => Quest.new("legendary_necrozma_4", "The long night (Part 3)", "Fuchsia City appears to be unaffected by the darkness. Go investigate to see if you can find out more information.", "BW_Sabrina", "Celadon City", LegendaryQuestColor),
-    "legendary_necrozma_5" => Quest.new("legendary_necrozma_5", "The long night (Part 4)", "The mysterious darkness has expended yet again and strange plants have appeared. Follow the plants to see where they lead.", QuestBranchLegendary, "BW_koga", "Fuchsia City", LegendaryQuestColor),
+    "legendary_necrozma_5" => Quest.new("legendary_necrozma_5", "The long night (Part 4)", "The mysterious darkness has expended yet again and strange plants have appeared. Follow the plants to see where they lead.", "BW_koga", "Fuchsia City", LegendaryQuestColor),
-    "legendary_necrozma_6" => Quest.new("legendary_necrozma_6", "The long night (Part 5)", "You found a strange fruit that appears to be related to the mysterious darkness. Go see professor Oak to have it analyzed.", QuestBranchLegendary, "BW029", "Safari Zone", LegendaryQuestColor),
+    "legendary_necrozma_6" => Quest.new("legendary_necrozma_6", "The long night (Part 5)", "You found a strange fruit that appears to be related to the mysterious darkness. Go see professor Oak to have it analyzed.", "BW029", "Safari Zone", LegendaryQuestColor),
-    "legendary_necrozma_7" => Quest.new("legendary_necrozma_7", "The long night (Part 6)", "The strange plant you found appears to glow in the mysterious darkness that now covers the entire region. Try to follow the glow to find out the source of the disturbance.", QuestBranchLegendary, "BW-oak", "Pallet Town", LegendaryQuestColor),
+    "legendary_necrozma_7" => Quest.new("legendary_necrozma_7", "The long night (Part 6)", "The strange plant you found appears to glow in the mysterious darkness that now covers the entire region. Try to follow the glow to find out the source of the disturbance.", "BW-oak", "Pallet Town", LegendaryQuestColor),
 
 
-    "legendary_meloetta_1" => Quest.new("legendary_meloetta_1", "A legendary band (Part 1)", "The singer of a band in Saffron City wants you to help them recruit a drummer. They think they've heard some drumming around Crimson City...", QuestBranchLegendary, "BW107", "Saffron City", LegendaryQuestColor),
+    "legendary_meloetta_1" => Quest.new("legendary_meloetta_1", "A legendary band (Part 1)", "The singer of a band in Saffron City wants you to help them recruit a drummer. They think they've heard some drumming around Crimson City...", "BW107", "Saffron City", LegendaryQuestColor),
-    "legendary_meloetta_2" => Quest.new("legendary_meloetta_2", "A legendary band (Part 2)", "The drummer from a legendary Pokéband wants you to find its former bandmates. The band manager talked about two former guitarists...", QuestBranchLegendary, "band_drummer", "Saffron City", LegendaryQuestColor),
+    "legendary_meloetta_2" => Quest.new("legendary_meloetta_2", "A legendary band (Part 2)", "The drummer from a legendary Pokéband wants you to find its former bandmates. The band manager talked about two former guitarists...", "band_drummer", "Saffron City", LegendaryQuestColor),
-    "legendary_meloetta_3" => Quest.new("legendary_meloetta_3", "A legendary band (Part 3)", "The drummer from a legendary Pokéband wants you to find its former bandmates. There are rumors about strange music that was heard around the region.", QuestBranchLegendary, "band_drummer", "Saffron City", LegendaryQuestColor),
+    "legendary_meloetta_3" => Quest.new("legendary_meloetta_3", "A legendary band (Part 3)", "The drummer from a legendary Pokéband wants you to find its former bandmates. There are rumors about strange music that was heard around the region.", "band_drummer", "Saffron City", LegendaryQuestColor),
-    "legendary_meloetta_4" => Quest.new("legendary_meloetta_4", "A legendary band (Part 4)", "You assembled the full band! Come watch the show on Saturday night.", QuestBranchLegendary, "BW117", "Saffron City", LegendaryQuestColor),
+    "legendary_meloetta_4" => Quest.new("legendary_meloetta_4", "A legendary band (Part 4)", "You assembled the full band! Come watch the show on Saturday night.", "BW117", "Saffron City", LegendaryQuestColor),
 
-    "legendary_cresselia_1" => Quest.new(61, "Mysterious Lunar feathers", "A mysterious entity asked you to collect Lunar Feathers for them. It said that they will come at night to tell you where to look. Whoever that may be...", QuestBranchLegendary, "lunarFeather", "Lavender Town", LegendaryQuestColor),
+    "legendary_cresselia_1" => Quest.new(61, "Mysterious Lunar feathers", "A mysterious entity asked you to collect Lunar Feathers for them. It said that they will come at night to tell you where to look. Whoever that may be...", "lunarFeather", "Lavender Town", LegendaryQuestColor),
     #removed
     #11 => Quest.new(11, "Powering the Lighthouse", "Catch some Voltorb to power up the lighthouse", QuestBranchHotels, "BW (43)", "Vermillion City", HotelQuestColor),
 }
@@ -129,8 +129,12 @@ QUESTS = {
 
     #Route 116
 define_quest("route116_glasses",:FIELD_QUEST,"Lost glasses", "A trainer has lost their glasses, help him find them!","Route 116","NPC_Hoenn_BugManiac")
-define_quest("petalburgwoods_spores",:FIELD_QUEST,"Spores harvest", "A scientist has tasked you to collect 4 spore samples from the large mushrooms that can be found imn the woods!","Petalburg Woods","NPC_Hoenn_Scientist")
+
-
+#Route 104 (South)
+define_quest("route104_rivalWeather",:FIELD_QUEST,"Weather Watch", "Help your rival with fieldwork and find a Pokémon that only appears when it's windy!","Route 104","rival")
+
+#Petalburg woods
+define_quest("petalburgwoods_spores",:FIELD_QUEST,"Spores harvest", "A scientist has tasked you to collect 4 spore samples from the large mushrooms that can be found in the woods!","Petalburg Woods","NPC_Hoenn_Scientist")
 
 
 

Data/Scripts/052_InfiniteFusion/Quests/TRQuests.rb

@@ -82,17 +82,17 @@ def finishTRQuest(id, status, silent = false)
 end
 
 TR_QUESTS = {
-  "tr_cerulean_1" => Quest.new("tr_cerulean_1", "Creepy Crawlies", "The Team Rocket Captain has tasked you with clearing the bug infestation in the temporary Rocket HQ in Cerulean City", QuestBranchRocket, "rocket_petrel", "Cerulean City", TRQuestColor),
+  "tr_cerulean_1" => Quest.new("tr_cerulean_1", "Creepy Crawlies", "The Team Rocket Captain has tasked you with clearing the bug infestation in the temporary Rocket HQ in Cerulean City",  "rocket_petrel", "Cerulean City", TRQuestColor),
-  "tr_cerulean_2" => Quest.new("tr_cerulean_2", "No Fishing Zone", "Intimidate the fishermen at Nugget Bridge until they leave the area.", QuestBranchRocket, "rocket_petrel", "Cerulean City", TRQuestColor),
+  "tr_cerulean_2" => Quest.new("tr_cerulean_2", "No Fishing Zone", "Intimidate the fishermen at Nugget Bridge until they leave the area.",  "rocket_petrel", "Cerulean City", TRQuestColor),
-  "tr_cerulean_3" => Quest.new("tr_cerulean_3", "Disobedient Pokémon", "Bring back the Pokémon given by the Team Rocket Captain fainted to teach it a lesson.", QuestBranchRocket, "rocket_petrel", "Cerulean City", TRQuestColor),
+  "tr_cerulean_3" => Quest.new("tr_cerulean_3", "Disobedient Pokémon", "Bring back the Pokémon given by the Team Rocket Captain fainted to teach it a lesson.",  "rocket_petrel", "Cerulean City", TRQuestColor),
-  "tr_cerulean_4" => Quest.new("tr_cerulean_4", "Gran Theft Pokémon!", "Follow Petrel and go steal a rare Pokémon from a young girl.", QuestBranchRocket, "rocket_petrel", "Cerulean City", TRQuestColor),
+  "tr_cerulean_4" => Quest.new("tr_cerulean_4", "Gran Theft Pokémon!", "Follow Petrel and go steal a rare Pokémon from a young girl.",  "rocket_petrel", "Cerulean City", TRQuestColor),
 
-  "tr_celadon_1" => Quest.new("tr_celadon_1", "Supplying the new grunts", "Catch 4 Pokémon with Rocket Balls in the outskirts of Celadon City.", QuestBranchRocket, "rocket_archer", "Celadon City", TRQuestColor),
+  "tr_celadon_1" => Quest.new("tr_celadon_1", "Supplying the new grunts", "Catch 4 Pokémon with Rocket Balls in the outskirts of Celadon City.",  "rocket_archer", "Celadon City", TRQuestColor),
-  "tr_celadon_2" => Quest.new("tr_celadon_2", "Interception!", "Intercept the TMs shipment to the Celadon Store and pose as the delivery person to deliver fake TMs.", QuestBranchRocket, "rocket_archer", "Celadon City", TRQuestColor),
+  "tr_celadon_2" => Quest.new("tr_celadon_2", "Interception!", "Intercept the TMs shipment to the Celadon Store and pose as the delivery person to deliver fake TMs.",  "rocket_archer", "Celadon City", TRQuestColor),
-  "tr_celadon_3" => Quest.new( "tr_celadon_3", "Pokémon Collector", "Go meet a Pokémon collector on Route 22, near Viridian City and get his rare Pokémon.", QuestBranchRocket, "rocket_archer", "Celadon City", TRQuestColor),
+  "tr_celadon_3" => Quest.new( "tr_celadon_3", "Pokémon Collector", "Go meet a Pokémon collector on Route 22, near Viridian City and get his rare Pokémon.",  "rocket_archer", "Celadon City", TRQuestColor),
-  "tr_celadon_4" => Quest.new("tr_celadon_4", "Operation Shutdown", "The Team Rocket HQ is being raided! Regroup with the rest of the grunts in Goldenrod Tunnel!", QuestBranchRocket, "rocket_archer", "Goldenrod City", TRQuestColor),
+  "tr_celadon_4" => Quest.new("tr_celadon_4", "Operation Shutdown", "The Team Rocket HQ is being raided! Regroup with the rest of the grunts in Goldenrod Tunnel!",  "rocket_archer", "Goldenrod City", TRQuestColor),
 
-  "tr_pinkan" => Quest.new("tr_pinkan", "Pinkan Island!", "Help Team Rocket with a heist on a Pokémon nature preserve!", QuestBranchRocket, "rocket_archer", "Goldenrod City", TRQuestColor),
+  "tr_pinkan" => Quest.new("tr_pinkan", "Pinkan Island!", "Help Team Rocket with a heist on a Pokémon nature preserve!",  "rocket_archer", "Goldenrod City", TRQuestColor),
 
 }
 

Data/Scripts/053_PIF_Hoenn/Hoenn_Rival.rb

@@ -64,8 +64,8 @@ class Sprite_Character
   def checkModifySpriteGraphics(character)
     PIF_typeExpert_checkModifySpriteGraphics(character)
     return if character == $game_player
-    setSpriteToAppearance($Trainer.rival_appearance) if isPlayerFemale && character.name == HOENN_RIVAL_EVENT_NAME && character.character_name == TEMPLATE_CHARACTER_FILE
+    setSpriteToAppearance($Trainer.rival_appearance) if isPlayerFemale && character.name.start_with?(HOENN_RIVAL_EVENT_NAME) && character.character_name == TEMPLATE_CHARACTER_FILE
-    setSpriteToAppearance($Trainer.rival_appearance) if isPlayerMale && character.name == HOENN_RIVAL_EVENT_NAME && character.character_name == TEMPLATE_CHARACTER_FILE
+    setSpriteToAppearance($Trainer.rival_appearance) if isPlayerMale && character.name.start_with?(HOENN_RIVAL_EVENT_NAME) && character.character_name == TEMPLATE_CHARACTER_FILE
   end
 end
 

Data/Scripts/053_PIF_Hoenn/PokemartMapTransfers.rb

@@ -6,7 +6,7 @@ CITIES_MAP_IDS = {
   :OLDALE => 8,
   :PETALBURG =>7,
   :RUSTBORO => 47,
-  :DEWFORD => 0,
+  :DEWFORD => 51,
   :SLATEPORT => 0,
   :MAUVILLE => 0,
   :VERDANTURF => 0,

Data/Scripts/DownloadedSettings.rb

@@ -1,6 +1,6 @@
 
 module Settings
-  LATEST_GAME_RELEASE = "6.4.0"
+  LATEST_GAME_RELEASE = "6.6.1"
 
   SHINY_POKEMON_CHANCE = 16
   DISCORD_URL = "https://discord.com/invite/infinitefusion"