diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 826e1e8a6..8e67182ba 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 382b3cb50..6450d6f5e 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map266.rxdata b/Data/Map266.rxdata index 9cb8cc847..4034e68c7 100644 Binary files a/Data/Map266.rxdata and b/Data/Map266.rxdata differ diff --git a/Data/Map634.rxdata b/Data/Map634.rxdata index b89ecddcf..7f3c486d0 100644 Binary files a/Data/Map634.rxdata and b/Data/Map634.rxdata differ diff --git a/Data/Map639.rxdata b/Data/Map639.rxdata index 28726cb71..0a46d2b0b 100644 Binary files a/Data/Map639.rxdata and b/Data/Map639.rxdata differ diff --git a/Data/Map640.rxdata b/Data/Map640.rxdata index 2cca95ffe..22cae448d 100644 Binary files a/Data/Map640.rxdata and b/Data/Map640.rxdata differ diff --git a/Data/Map641.rxdata b/Data/Map641.rxdata index 3b5ee42d5..3764a36fa 100644 Binary files a/Data/Map641.rxdata and b/Data/Map641.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 40098b8cf..b1be089bc 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index 6047d7210..c37634fba 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -6,14 +6,16 @@ module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. GAME_VERSION = '5.0.0' - GAME_VERSION_NUMBER = "5.0.25.1 - beta" + GAME_VERSION_NUMBER = "5.0.26 - beta" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18 POKERADAR_HIDDEN_ABILITY_POKE_CHANCE = 32 POKERADAR_BATTERY_STEPS = 0 - + LEADER_VICTORY_MUSIC="Battle victory leader" + TRAINER_VICTORY_MUSIC="trainer-victory" + WILD_VICTORY_MUSIC="wild-victory" # FUSION_ICON_SPRITE_OFFSET = 10 diff --git a/Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb b/Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb index 04b7a7dc5..cd60b221f 100644 --- a/Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb +++ b/Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb @@ -25,19 +25,7 @@ def pbGetWildVictoryME if $PokemonGlobal.nextBattleME return $PokemonGlobal.nextBattleME.clone end - ret = nil - if !ret - # Check map metadata - map_metadata = GameData::MapMetadata.try_get($game_map.map_id) - music = (map_metadata) ? map_metadata.wild_victory_ME : nil - ret = pbStringToAudioFile(music) if music && music != "" - end - if !ret - # Check global metadata - music = GameData::Metadata.get.wild_victory_ME - ret = pbStringToAudioFile(music) if music && music!="" - end - ret = pbStringToAudioFile("Battle victory") if !ret + ret = pbStringToAudioFile(Settings::WILD_VICTORY_MUSIC) ret.name = "../../Audio/ME/"+ret.name return ret end @@ -124,33 +112,35 @@ def pbGetTrainerBattleBGMFromType(trainertype) end def pbGetTrainerVictoryME(trainer) # can be a Player, NPCTrainer or an array of them +begin if $PokemonGlobal.nextBattleME return $PokemonGlobal.nextBattleME.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 + if trainer.is_a?(Array) + npcTrainer=trainer[0] + else + npcTrainer=trainer end - ret = nil - if music && music!="" - ret = pbStringToAudioFile(music) + + if is_gym_leader(npcTrainer) + ret = pbStringToAudioFile(Settings::LEADER_VICTORY_MUSIC) + else + ret = pbStringToAudioFile(Settings::TRAINER_VICTORY_MUSIC) end - if !ret - # Check map metadata - map_metadata = GameData::MapMetadata.try_get($game_map.map_id) - music = (map_metadata) ? map_metadata.trainer_victory_ME : nil - 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 - end - ret = pbStringToAudioFile("Battle victory") if !ret + ret.name = "../../Audio/ME/"+ret.name + return ret +rescue + ret = pbStringToAudioFile(Settings::TRAINER_VICTORY_MUSIC) ret.name = "../../Audio/ME/"+ret.name return ret end + +end + +GYM_LEADERS=[: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] +def is_gym_leader(trainer) + return GYM_LEADERS.include?(trainer.trainer_type) +end diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index e885fb571..f3d2f2147 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -16,6 +16,7 @@ TRUE = true #Game mode switches SWITCH_NEW_GAME_PLUS = 972 SWITCH_BEAT_MT_SILVER = 918 +BEAT_MT_SILVER = 918 #don't remove this - used in some events SWITCH_REVERSED_MODE = 47 SWITCH_GAME_DIFFICULTY_EASY = 665 SWITCH_GAME_DIFFICULTY_HARD = 666 diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index 48c34d573..ba9a840dd 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 8d113cbfb..2c6933d73 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ diff --git a/Data/messages.dat b/Data/messages.dat index f48830018..27da5905b 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ