Changed battle victory MEs to BGMs

This commit is contained in:
Maruno17
2022-04-21 21:43:11 +01:00
parent 77f9547687
commit a85ec1e51a
12 changed files with 181 additions and 192 deletions

View File

@@ -20,23 +20,21 @@ def pbGetWildBattleBGM(_wildParty) # wildParty is an array of Pokémon objects
return ret
end
def pbGetWildVictoryME
if $PokemonGlobal.nextBattleME
return $PokemonGlobal.nextBattleME.clone
def pbGetWildVictoryBGM
if $PokemonGlobal.nextBattleVictoryBGM
return $PokemonGlobal.nextBattleVictoryBGM.clone
end
ret = nil
if !ret
# Check map metadata
music = $game_map.metadata&.wild_victory_ME
ret = pbStringToAudioFile(music) if music && music != ""
end
# Check map metadata
music = $game_map.metadata&.wild_victory_BGM
ret = pbStringToAudioFile(music) if music && music != ""
if !ret
# Check global metadata
music = GameData::Metadata.get.wild_victory_ME
music = GameData::Metadata.get.wild_victory_BGM
ret = pbStringToAudioFile(music) if music && music != ""
end
ret = pbStringToAudioFile("Battle victory") if !ret
ret.name = "../../Audio/ME/" + ret.name
ret.name = "../../Audio/BGM/" + ret.name
return ret
end
@@ -92,9 +90,7 @@ def pbGetTrainerBattleBGM(trainer) # can be a Player, NPCTrainer or an array o
if !ret
# Check global metadata
music = GameData::Metadata.get.trainer_battle_BGM
if music && music != ""
ret = pbStringToAudioFile(music)
end
ret = pbStringToAudioFile(music) if music && music != ""
end
ret = pbStringToAudioFile("Battle trainer") if !ret
return ret
@@ -120,33 +116,29 @@ def pbGetTrainerBattleBGMFromType(trainertype)
return ret
end
def pbGetTrainerVictoryME(trainer) # can be a Player, NPCTrainer or an array of them
if $PokemonGlobal.nextBattleME
return $PokemonGlobal.nextBattleME.clone
def pbGetTrainerVictoryBGM(trainer) # can be a Player, NPCTrainer or an array of them
if $PokemonGlobal.nextBattleVictoryBGM
return $PokemonGlobal.nextBattleVictoryBGM.clone
end
music = nil
trainerarray = (trainer.is_a?(Array)) ? trainer : [trainer]
trainerarray.each do |t|
trainer_type_data = GameData::TrainerType.get(t.trainer_type)
music = trainer_type_data.victory_ME if trainer_type_data.victory_ME
music = trainer_type_data.victory_BGM if trainer_type_data.victory_BGM
end
ret = nil
if music && music != ""
ret = pbStringToAudioFile(music)
end
ret = pbStringToAudioFile(music) if music && music != ""
if !ret
# Check map metadata
music = $game_map.metadata&.trainer_victory_ME
music = $game_map.metadata&.trainer_victory_BGM
ret = pbStringToAudioFile(music) if music && music != ""
end
if !ret
# Check global metadata
music = GameData::Metadata.get.trainer_victory_ME
if music && music != ""
ret = pbStringToAudioFile(music)
end
music = GameData::Metadata.get.trainer_victory_BGM
ret = pbStringToAudioFile(music) if music && music != ""
end
ret = pbStringToAudioFile("Battle victory") if !ret
ret.name = "../../Audio/ME/" + ret.name
ret.name = "../../Audio/BGM/" + ret.name
return ret
end