Guess that fusion quiz

Data/Scripts/016_UI/017_UI_PokemonStorage.rb

@@ -1917,7 +1917,7 @@ class PokemonStorageScreen
             p = (heldpoke) ? heldpoke : @storage[-1, index]
             p.time_form_set = nil
             p.form = 0 if p.isSpecies?(:SHAYMIN)
-            p.heal
+            #p.heal
           end
           @scene.pbStore(selected, heldpoke, destbox, firstfree)
           if heldpoke
@@ -1964,7 +1964,7 @@ class PokemonStorageScreen
     if box >= 0
       @heldpkmn.time_form_set = nil
       @heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
-      @heldpkmn.heal
+      #@heldpkmn.heal
     end
     @scene.pbPlace(selected, @heldpkmn)
     @storage[box, index] = @heldpkmn
@@ -1993,7 +1993,7 @@ class PokemonStorageScreen
     if box >= 0
       @heldpkmn.time_form_set = nil
       @heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
-      @heldpkmn.heal
+      #@heldpkmn.heal
     end
     @scene.pbSwap(selected, @heldpkmn)
     tmp = @storage[box, index]

Data/Scripts/049_Compatibility/Constants.rb

@@ -148,6 +148,7 @@ VAR_GALLERY_ALL_ARTIST_SPRITES = 261
 VAR_GALLERY_SELECTED_ARTIST = 263
 VAR_NEXT_ARTIST_FORMATTED = 264
 
+VAR_RADIO_POINTS=266
 
 #Randomizer
 VAR_RANDOMIZER_WILD_POKE_BST=197

Data/Scripts/050_AddOns/GuessPokemonQuiz.rb

@@ -18,7 +18,7 @@ class FusionQuiz
     @head_id = nil
     @body_id = nil
     @choices = []
-
+    @abandonned=false
     @score = 0
   end
 
@@ -40,18 +40,18 @@ class FusionQuiz
 
       rounds_left = nb_rounds-i
       if rounds_left >0
-        pbMessage(_INTL("That's it for round {1}. You've accumulated {2} points so far.",i,@score))
+        pbMessage(_INTL("That's it for round {1}. You've cumulated {2} points so far.",i,@score))
         prompt_next_round = pbMessage(_INTL("Are you ready to move on to the next round?",i),["Yes","No"])
         if prompt_next_round != 0
           prompt_quit = pbMessage(_INTL("You still have {1} rounds to go. You'll only keep your points if you finish all {2} rounds. Do you really want to quit now?",rounds_left,nb_rounds),["Yes","No"])
           if prompt_quit
-            pbMessage(_INTL("Well that's the show, folks. Make sure to tune in next time for some more Guess The Fusion!"))
+            @abandonned=true
             return
           end
         end
         round_multiplier += round_multiplier_increase
       else
-        pbMessage(_INTL("That concludes our quiz! You've accumulated {1} points in total.",@score))
+        pbMessage(_INTL("That concludes our quiz! You've cumulated {1} points in total.",@score))
         pbMessage("Thanks for playing with us today!")
       end
     end
@@ -60,11 +60,17 @@ class FusionQuiz
   end
 
   def start_quiz_new_round(round_multiplier=1)
-    base_points_q1=300
-    base_points_q1_redemption=100
-
-    base_points_q2=400
-    base_points_q2_redemption=100
+    if @difficulty == :ADVANCED
+      base_points_q1=500
+      base_points_q1_redemption=200
+      base_points_q2=600
+      base_points_q2_redemption=200
+    else
+      base_points_q1=300
+      base_points_q1_redemption=100
+      base_points_q2=400
+      base_points_q2_redemption=100
+    end
 
 
     pick_random_pokemon()
@@ -92,7 +98,7 @@ class FusionQuiz
         new_question(base_points_q2_redemption,"Which Pokémon is this fusion's head?", @head_id,true,false )
       end
     else
-      pbMessage("A perfect round! Here's what this Pokémon looked like!")
+      pbMessage("Wow! A perfect round! Let's see what this Pokémon looked like!")
     end
     hide_fusion_picture()
     @viewport.dispose
@@ -139,7 +145,7 @@ class FusionQuiz
     bitmap.scale_bitmap(Settings::FRONTSPRITE_SCALE)
     @previewwindow = PictureWindow.new(bitmap)
     @previewwindow.y = 30
-    @previewwindow.x = 100
+    @previewwindow.x = @difficulty==:ADVANCED ? 200 : 100
     @previewwindow.z = 100000
     if obscured
       @previewwindow.picture.pbSetColor(255, 255, 255, 200)
@@ -212,16 +218,21 @@ class FusionQuiz
 
 
   def prompt_pick_answer_advanced(prompt_message,answer)
-    choices.each do |dex_num, i|
+    commands = []
+    for dex_num in 1..NB_POKEMON
       species = getPokemon(dex_num)
-      commands.push([i, species.real_name, species.real_name])
+      commands.push([dex_num-1, species.real_name, species.real_name])
     end
     pbMessage(prompt_message)
-    #chosen = pbChooseList(commands, 0, nil, 1)
+    return  pbChooseList(commands, 0, nil, 1)
   end
 
   def get_score
     return @score
   end
 
+  def player_abandonned
+    return @abandonned
+  end
+
 end

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

@@ -1865,3 +1865,17 @@ ItemHandlers::BattleUseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, battl
 ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, scene|
   next pbHPItem(pokemon, 50, scene)
 })
+
+ItemHandlers::UseInField.add(:BOXLINK, proc { |item|
+  blacklisted_maps = [
+    315,316,317,318,328,343,#Elite Four
+    776,777,778,779,780,781,782,783,784, #Mt. Silver
+    722,723,724,720 #Dream sequence
+  ]
+  if blacklisted_maps.include?($game_map.map_id)
+    Kernel.pbMessage("There doesn't seem to be any network coverage here...")
+  else
+    pbPokeCenterPC()
+  end
+  next 1
+})