diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index d7b68454f..c6e152721 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Scripts/007_Objects and windows/011_Messages.rb b/Data/Scripts/007_Objects and windows/011_Messages.rb index 2fe29e4a2..d0837a6b5 100644 --- a/Data/Scripts/007_Objects and windows/011_Messages.rb +++ b/Data/Scripts/007_Objects and windows/011_Messages.rb @@ -862,6 +862,9 @@ end def pbShowCommands(msgwindow, commands = nil, cmdIfCancel = 0, defaultCmd = 0) return 0 if !commands + if defaultCmd == 0 && $game_variables[COMMAND_WINDOW_INDEX] != 0 + defaultCmd = $game_variables[COMMAND_WINDOW_INDEX] + end cmdwindow = Window_CommandPokemonEx.new(commands) cmdwindow.z = 99999 cmdwindow.visible = true diff --git a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb index a3f15215e..15d387987 100644 --- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb +++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb @@ -145,7 +145,7 @@ module GameData end level = pkmn_data[:level] if $game_switches[GAME_DIFFICULTY_HARD] - level *= Settings::HARD_MODE_LEVEL_MODIFIER.ceil + level = (level*Settings::HARD_MODE_LEVEL_MODIFIER).ceil if level > Settings::MAXIMUM_LEVEL level = Settings::MAXIMUM_LEVEL end diff --git a/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb b/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb index de47a48bc..c233b46e2 100644 --- a/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb +++ b/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb @@ -8,7 +8,7 @@ class PokeBattle_Battle return if !@internalBattle || !@expGain # Go through each battler in turn to find the Pokémon that participated in # battle against it, and award those Pokémon Exp/EVs - expAll = (GameData::Item.exists?(:EXPALL) && $PokemonBag.pbHasItem?(:EXPALL)) + expAll = (GameData::Item.exists?(:EXPALL) && $PokemonBag.pbHasItem?(:EXPALL)) || $game_switches[GAME_DIFFICULTY_EASY] p1 = pbParty(0) @battlers.each do |b| next unless b && b.opposes? # Can only gain Exp from fainted foes diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 84fd7a5f6..84ae60972 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -28,6 +28,7 @@ DEFAULT_BATTLE_TYPE = 242 BATTLE_FACTORY_TOKENS = 243 NB_GYM_REMATCHES = 162 CUSTOM_SPRITES_ENABLED= 196 +COMMAND_WINDOW_INDEX=249 #Settings # This is for settings that are used in scripts since it's a chore to change them everywhere to include the module name NUM_BADGES = Settings::NB_BADGES diff --git a/Data/System.rxdata b/Data/System.rxdata index a8c50abc9..6e8647757 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ