6.7.2 patch

Data/Scripts/001_Settings.rb

@@ -5,8 +5,7 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '6.7.1'
+  GAME_VERSION_NUMBER = "6.7.2"
-  GAME_VERSION_NUMBER = GAME_VERSION  #kinda used interchangibly #todo: refactor
   LATEST_GAME_RELEASE = "6.6"
 
   KANTO = GAME_ID == :IF_KANTO

Data/Scripts/002_Save data/003_SaveData_Conversion.rb

@@ -203,7 +203,7 @@ module SaveData
     end
     echoln '' if conversions_to_run.length > 0
     save_data[:essentials_version] = Essentials::VERSION
-    save_data[:game_version] = Settings::GAME_VERSION
+    save_data[:game_version] = Settings::GAME_VERSION_NUMBER
     return true
   end
 

Data/Scripts/002_Save data/004_Game_SaveValues.rb

@@ -129,7 +129,7 @@ end
 SaveData.register(:game_version) do
   load_in_bootup
   ensure_class :String
-  save_value { Settings::GAME_VERSION }
+  save_value { Settings::GAME_VERSION_NUMBER }
   load_value { |value| $game_version = value }
-  new_game_value { Settings::GAME_VERSION }
+  new_game_value { Settings::GAME_VERSION_NUMBER }
 end

Data/Scripts/002_Save data/005_Game_SaveConversions.rb

@@ -8,7 +8,7 @@ SaveData.register_conversion(:v19_define_versions) do
       save_data[:essentials_version] = Essentials::VERSION
     end
     unless save_data.has_key?(:game_version)
-      save_data[:game_version] = Settings::GAME_VERSION
+      save_data[:game_version] = Settings::GAME_VERSION_NUMBER
     end
   end
 end

Data/Scripts/007_Objects and windows/002_MessageConfig.rb

@@ -745,6 +745,7 @@ def addBackgroundPlane(sprites,planename,background,viewport=nil)
       end
     end
   end
+  return sprites[planename]
 end
 
 # Adds a background to the sprite hash.

Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb

@@ -48,8 +48,10 @@ class HallOfFame_Scene
     @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
     @viewport.z = 99999
     # Comment the below line to doesn't use a background
-    bgFile = @singlerow ? "hallfamebg" : "hallfamebg_multiline"
+    @sprites["bg"] = IconSprite.new(@viewport)
-    addBackgroundPlane(@sprites, "bg", bgFile, @viewport)
+    @sprites["bg"].setBitmap(getHallOfFameBackground)
+    @sprites["bg"].z = 0
+
     @sprites["hallbars"] = IconSprite.new(@viewport)
     @sprites["hallbars"].setBitmap("Graphics/Pictures/hallfamebars")
     @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@@ -73,12 +75,25 @@ class HallOfFame_Scene
     pbFadeInAndShow(@sprites) { pbUpdate }
   end
 
+  def getHallOfFameBackground
+    if @singlerow #in the e4
+      rank = pbGet(VAR_LEAGUE_REMATCH_TIER)
+      background = "Graphics/Pictures/HallOfFame/hallfamebg"
+    else  #from PC
+      rank = $PokemonGlobal.hallOfFame[@hallIndex][:TIER]
+      background = "Graphics/Pictures/HallOfFame/hallfamebg_multiline"
+    end
+    if rank && rank.to_i > 0
+      background += "_#{rank}"
+    end
+    return background
+  end
+
   def pbStartScenePC
     @singlerow = false
-    pbStartScene
     @hallIndex = $PokemonGlobal.hallOfFame.size - 1
 
-    echoln $PokemonGlobal.hallOfFame[-1]
+    pbStartScene
     @hallEntry = $PokemonGlobal.hallOfFame[-1][:TEAM]
     createBattlers(false)
     pbFadeInAndShow(@sprites) { pbUpdate }
@@ -136,6 +151,7 @@ class HallOfFame_Scene
     entryData[:DIFFICULTY] = getDifficulty
     entryData[:MODE] = getCurrentGameMode()
     entryData[:DATE] = getCurrentDate()
+    entryData[:TIER] = getCurrentE4Tier()
 
     #Save trainer data (unused for now)
     entryData[:TRAINER_HAT] = $Trainer.hat
@@ -381,7 +397,12 @@ class HallOfFame_Scene
   def writeWelcomePC
     overlay = @sprites["overlay"].bitmap
     overlay.clear
-    pbDrawTextPositions(overlay, [[_INTL("Entered the Hall of Fame!"),
+    text = _INTL("Entered the Hall of Fame!")
+    rank = $PokemonGlobal.hallOfFame[@hallIndex][:TIER]
+    if rank && rank.to_i > 0
+      text += _INTL(" (Rematch Tier {1})",rank.to_i)
+    end
+    pbDrawTextPositions(overlay, [[text,
                                    Graphics.width / 2, Graphics.height - 80, 2, BASECOLOR, SHADOWCOLOR]])
 
     date = $PokemonGlobal.hallOfFame[@hallIndex][:DATE]
@@ -397,11 +418,17 @@ class HallOfFame_Scene
     pbDrawTextPositions(overlay, [[_INTL("{1}", timeString), x, y, 2, BASECOLOR, SHADOWCOLOR]])
   end
 
+
   def getCurrentDate()
     currentTime = Time.new
     return currentTime.year.to_s + "-" + ("%02d" % currentTime.month) + "-" + ("%02d" % currentTime.day)
   end
 
+  def getCurrentE4Tier()
+    return pbGet(VAR_LEAGUE_REMATCH_TIER)
+  end
+
+
   def getCurrentGameMode()
     gameMode = "Classic mode"
     if $game_switches[SWITCH_MODERN_MODE]
@@ -563,6 +590,7 @@ class HallOfFame_Scene
       @battlerIndex = @hallEntry.size - 1
       createBattlers(false)
     end
+    @sprites["bg"].setBitmap(getHallOfFameBackground)
     # Change the pokemon
     @hallEntry[@battlerIndex].play_cry
     setPokemonSpritesOpacity(@battlerIndex, OPACITY)

Data/Scripts/016_UI/021_UI_MoveRelearner.rb

@@ -24,7 +24,11 @@ class MoveRelearner_Scene
     @pokemon=pokemon
     @moves=moves
     moveCommands=[]
-    moves.each { |m| moveCommands.push(GameData::Move.get(m).name) }
+    echoln moves
+    moves.each do |m|
+      echoln m.name
+      moveCommands.push(GameData::Move.get(m).name)
+    end
     # Create sprite hash
     @viewport=Viewport.new(0,0,Graphics.width,Graphics.height)
     @viewport.z=99999
@@ -169,7 +173,9 @@ class MoveRelearnerScreen
     end
 
     pkmn.learned_moves.each do |move|
-      moves.push(move) if !moves.include?(move)
+      move_id = move.is_a?(Symbol) ? move : move.id
+      next if pkmn.hasMove?(move_id)
+      moves.push(move_id) if !moves.include?(move_id)
     end
 
     tmoves = []
@@ -178,6 +184,7 @@ class MoveRelearnerScreen
         tmoves.push(i) if !pkmn.hasMove?(i) && !moves.include?(i)
       end
     end
+
     moves = tmoves + moves
     return moves | []   # remove duplicates
   end

Data/Scripts/052_InfiniteFusion/Constants/CONSTANTS_Switches.rb

@@ -41,6 +41,7 @@ SWITCH_GOT_BADGE_14 = 44
 SWITCH_GOT_BADGE_15 = 45
 SWITCH_GOT_BADGE_16 = 50
 
+SWITCH_LEAGUE_TIER_1= 1155
 SWITCH_LEAGUE_TIER_2= 1151
 SWITCH_LEAGUE_TIER_3= 1152
 SWITCH_LEAGUE_TIER_4= 1153

Data/Scripts/052_InfiniteFusion/Gameplay/Utilities/BattleUtils.rb

@@ -43,7 +43,7 @@ end
 def getCurrentLevelCap()
   current_max_level = Settings::LEVEL_CAPS[$Trainer.badge_count]
   current_max_level *= Settings::HARD_MODE_LEVEL_MODIFIER if $game_switches[SWITCH_GAME_DIFFICULTY_HARD]
-  return current_max_level
+  return current_max_level.floor
 end
 
 def pokemonExceedsLevelCap(pokemon)

Data/Scripts/052_InfiniteFusion/System/GameModes/LegendaryMode.rb

@@ -156,7 +156,7 @@ def addLegendaryEggsToPC()
   legendaries_species = LEGENDARIES_LIST.shuffle
   legendaries_species.each do |species|
     pokemon = Pokemon.new(species, Settings::EGG_LEVEL)
-    pokemon.steps_to_hatch = pokemon.species_data.hatch_steps
+    pokemon.steps_to_hatch = pokemon.species_data.hatch_steps/2
     pokemon.name = "Egg"
     $PokemonStorage.pbStoreCaught(pokemon)
   end

Data/Scripts/052_InfiniteFusion/System/MultiSaves.rb

@@ -225,7 +225,7 @@ module SaveData
     end
     echoln '' if conversions_to_run.length > 0
     save_data[:essentials_version] = Essentials::VERSION
-    save_data[:game_version] = Settings::GAME_VERSION
+    save_data[:game_version] = Settings::GAME_VERSION_NUMBER
     return true
   end
 end

Data/Scripts/054_PIF_Kanto/EliteFourRematches/EliteFourRematches.rb

@@ -99,7 +99,7 @@ end
 
 def list_unlocked_league_tiers
   unlocked_tiers =[]
-  unlocked_tiers << 1 if $game_switches[SWITCH_BEAT_THE_LEAGUE]
+  unlocked_tiers << 1 if $game_switches[SWITCH_LEAGUE_TIER_1]
   unlocked_tiers << 2 if $game_switches[SWITCH_LEAGUE_TIER_2]
   unlocked_tiers << 3 if $game_switches[SWITCH_LEAGUE_TIER_3]
   unlocked_tiers << 4 if $game_switches[SWITCH_LEAGUE_TIER_4]
@@ -111,7 +111,7 @@ def select_league_tier
   #validateE4Data
   available_tiers = list_unlocked_league_tiers
   return 0 if available_tiers.empty?
-  return available_tiers[0] if available_tiers.length == 1
+  #return available_tiers[0] if available_tiers.length == 1
 
   available_tiers.reverse!
   commands = []
@@ -139,17 +139,16 @@ def unlock_new_league_tiers
   tiers_to_unlock << 3 if current_tier == 2 && $game_switches[SWITCH_BEAT_MT_SILVER]
   tiers_to_unlock << 4 if current_tier == 3 && $game_variables[VAR_NB_GYM_REMATCHES] >= 16
   tiers_to_unlock << 5 if current_tier == 4
-
   tiers_to_unlock.each do |tier|
-    next if tier == 1 || tier == 0
+    next if tier == 0
-
+    $game_switches[SWITCH_LEAGUE_TIER_1] = true if tiers_to_unlock.include?(1)
     $game_switches[SWITCH_LEAGUE_TIER_2] = true if tiers_to_unlock.include?(2)
     $game_switches[SWITCH_LEAGUE_TIER_3] = true if tiers_to_unlock.include?(3)
     $game_switches[SWITCH_LEAGUE_TIER_4] = true if tiers_to_unlock.include?(4)
     $game_switches[SWITCH_LEAGUE_TIER_5] = true if tiers_to_unlock.include?(5)
     unless currently_unlocked_tiers.include?(tier)
       pbMEPlay("Key item get")
-      pbMessage(_INTL("{1} unlocked the \\C[1]Tier {2} League Rematches\\C[0]!",$Trainer.name,tier))
+      pbMessage(_INTL("{1} unlocked \\C[1]Tier {2} League Rematches\\C[0]!",$Trainer.name,tier))
     end
   end
 end