Update 6.8

Data/Scripts/019_Utilities/001_Utilities.rb

@@ -589,10 +589,10 @@ end
 
 def pbChooseLanguage
   commands=[]
-  for lang in Settings::LANGUAGES
+  for lang in Settings::LANGUAGES[Settings::GAME_ID]
     commands.push(lang[0])
   end
-  return pbShowCommands(nil,commands)
+  return pbShowCommands(nil, commands, 0, 0, nil, nil, MessageConfig::FONT_NAME_CHINESE)
 end
 
 def pbScreenCapture

Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb

@@ -61,6 +61,13 @@ def pbNicknameAndStore(pkmn)
   #pbStorePokemon(pkmn)
 end
 
+def pbAddRentalPokemon(species,level)
+  original_trainer = "RENTAL"
+  pokemon = Pokemon.new(species,level)
+  pokemon.owner.name=original_trainer
+  pbAddPokemon(pokemon,level)
+end
+
 #===============================================================================
 # Giving Pokémon to the player (will send to storage if party is full)
 #===============================================================================
@@ -141,20 +148,27 @@ def pbAddForeignPokemon(pkmn, level = 1, owner_name = nil, nickname = nil, owner
   return true
 end
 
-def pbGenerateEgg(pkmn, text = "")
+def receiveEgg(species)
+  pbGenerateEgg(species)
+  pbMEPlay("Egg get")
+  pbMessage(_INTL("{1} received a Pokémon egg!",$Trainer.name))
+end
+
+def pbGenerateEgg(pkmn, obtain_text = "")
   return false if !pkmn #|| $Trainer.party_full?
   pkmn = Pokemon.new(pkmn, Settings::EGG_LEVEL) if !pkmn.is_a?(Pokemon)
   # Set egg's details
   pkmn.name           = _INTL("Egg")
   pkmn.steps_to_hatch = pkmn.species_data.hatch_steps
-  pkmn.obtain_text    = text
+  pkmn.obtain_text    = obtain_text
   pkmn.calc_stats
+
   # Add egg to party
   if $Trainer.party.length<6
     $Trainer.party[$Trainer.party.length] = pkmn
   else
     $PokemonStorage.pbStoreCaught(pkmn)
-    Kernel.pbMessage(_INTL("The egg was transfered to the PC."))
+    Kernel.pbMessage(_INTL("The egg was transferred to the PC."))
   end
   return true
 end

Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb

@@ -17,7 +17,7 @@ def pbGetWildBattleBGM(_wildParty)   # wildParty is an array of Pokémon objects
     music = GameData::Metadata.get.wild_battle_BGM
     ret = pbStringToAudioFile(music) if music && music!=""
   end
-  ret = pbStringToAudioFile("Battle wild") if !ret
+  ret = pbStringToAudioFile("battle_wild") if !ret
   return ret
 end
 
@@ -86,7 +86,7 @@ def pbGetTrainerBattleBGM(trainer)   # can be a Player, NPCTrainer or an array o
       ret = pbStringToAudioFile(music)
     end
   end
-  ret = pbStringToAudioFile("Battle trainer") if !ret
+  ret = pbStringToAudioFile("battle_trainer") if !ret
   return ret
 end
 
@@ -107,7 +107,7 @@ def pbGetTrainerBattleBGMFromType(trainertype)
     music = GameData::Metadata.get.trainer_battle_BGM
     ret = pbStringToAudioFile(music) if music && music!=""
   end
-  ret = pbStringToAudioFile("Battle trainer") if !ret
+  ret = pbStringToAudioFile("battle_trainer") if !ret
   return ret
 end
 
@@ -124,6 +124,10 @@ begin
 
   if is_gym_leader(npcTrainer)
     ret = pbStringToAudioFile(Settings::LEADER_VICTORY_MUSIC)
+  elsif is_champion(npcTrainer)
+    ret = pbStringToAudioFile(Settings::CHAMPION_VICTORY_MUSIC)
+  elsif is_evil_team(npcTrainer)
+    ret = pbStringToAudioFile(Settings::GRUNT_VICTORY_MUSIC)
   else
     ret = pbStringToAudioFile(Settings::TRAINER_VICTORY_MUSIC)
   end
@@ -137,10 +141,31 @@ end
 
 end
 
-GYM_LEADERS=[:LEADER_Brock,:LEADER_Misty, :LEADER_Surge, :LEADER_Erika, :LEADER_Koga, :LEADER_Sabrina, :LEADER_Blaine,
+GYM_LEADERS_TYPES=[:LEADER_Brock,:LEADER_Misty, :LEADER_Surge, :LEADER_Erika, :LEADER_Koga, :LEADER_Sabrina, :LEADER_Blaine,
              :LEADER_Giovanni, :ELITEFOUR_Lorelei, :ELITEFOUR_Bruno, :ELITEFOUR_Agatha, :ELITEFOUR_Lance, :CHAMPION,
              :LEADER_Whitney, :LEADER_Kurt, :LEADER_Falkner, :LEADER_Clair, :LEADER_Morty, :LEADER_Pryce, :LEADER_Chuck,
-             :LEADER_Jasmine, :CHAMPION_Sinnoh]
+             :LEADER_Jasmine,
+                   :ROCKETBOSS,
+             :LEADER_Roxanne, :LEADER_Brawly, :LEADER_Wattson, :LEADER_Flannery, :LEADER_Norman, :LEADER_Winona,
+             :LEADER_Tate, :LEADER_Liza,
+             :LEADER_Wallace, :LEADER_Juan,
+             :ELITEFOUR_Sidney, :ELITEFOUR_Phoebe, :ELITEFOUR_Glacia, :ELITEFOUR_Drake,
+]
+EVIL_TEAM_TYPES=[:TEAMROCKET_M,:TEAMROCKET_F,:ROCKETEXEC_F, :ROCKETEXEC_M, :ROCKETEXEC_Ariana, :ROCKETEXEC_Archer,
+                 :TEAM_AQUA_GRUNT_M, :TEAM_AQUA_GRUNT_F, :TEAM_AQUA_EXEC_M, :TEAM_AQUA_EXEC_F, :TEAM_AQUA_BOSS,
+                 :TEAM_MAGMA_GRUNT_M, :TEAM_MAGMA_GRUNT_F, :TEAM_MAGMA_EXEC_M, :TEAM_MAGMA_EXEC_F, :TEAM_MAGMA_BOSS,
+                 :TEAM_MAGMAQUA_GRUNT_M, :TEAM_MAGMAQUA_GRUNT_F]
+
+CHAMPION_TYPES=[:CHAMPION_Steven, :CHAMPION, :CHAMPION_Sinnoh]
+
 def is_gym_leader(trainer)
-  return GYM_LEADERS.include?(trainer.trainer_type)
+  return GYM_LEADERS_TYPES.include?(trainer.trainer_type)
+end
+
+def is_evil_team(trainer)
+  return EVIL_TEAM_TYPES.include?(trainer.trainer_type)
+end
+
+def is_champion(trainer)
+  return CHAMPION_TYPES.include?(trainer.trainer_type)
 end