From 41707389332b79fe771dea5efd3198f8e5da6659 Mon Sep 17 00:00:00 2001
From: infinitefusion <pkmninfinitefusion@gmail.com>
Date: Sun, 26 Dec 2021 17:09:56 -0500
Subject: [PATCH] Easy Mode

---
 Data/CommonEvents.rxdata                      | Bin 107359 -> 107301 bytes
 .../007_Objects and windows/011_Messages.rb   |   3 +++
 .../010_Data/002_PBS data/013_Trainer.rb      |   2 +-
 .../004_Battle_ExpAndMoveLearning.rb          |   2 +-
 Data/Scripts/049_Compatibility/Constants.rb   |   1 +
 Data/System.rxdata                            | Bin 27488 -> 27488 bytes
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index d7b68454fe10512d2817a6798410af16102ad585..c6e152721c3ec3da26d70813adafeccc24449119 100644
GIT binary patch
delta 212
zcmcbAjBV*LwuUW?dz$%`@~t^ItU05(G8umY(PWvms?#}I7-bpRrmM9u8i})6b7y8l
z)v#wWI51VpS#xEwP0w#(l%8C+LS*v&wG!;?nQRVBRdSOB?nr|8-0Yd`4ouY$g+GxL
z0wp*cm}(#r-mQ%CjO^31TN&LZhnNdYKiJAB31+-%WfTBP{BC7*0rUOa7!ARU32lrv
d)0xc~)u+cLGb&BCS;skfYo^Thn07{H836x{L0td<

delta 239
zcmZ2_jP3q0wuUW?dzu+lr{}9N%1=Mi%qTEfe4WVTm>V3^KQuGSGO|zSYhg6fWw++e
z%+9yw;IQV5X3u1BV5*k0=E?+#GEHKHigRQ#&13@M>G$**jak_om}=yve^g_XoV-C+
zVmiM8BP&}iSl9H2EsWCBAL}#fv2r*t)yYj4<Yp8W6m(52u2jg)Pf4|k$paeBF+I4I
z(QSHbF{8lrm931D)0Y5Qf`T52MJXt%9=9^OfaRu}w=o(*SQTxIHq&`)89k@}H)Pb_
K&eqN-F9QIjRz@QL

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 a8c50abc96cce3766116416d3d9192248f8be4a4..6e8647757ca1fbf604978945d76373e6407fbb2c 100644
GIT binary patch
delta 18
acmaEGjq$-X#tk#Yn0I<k**r(=NC*I04+!J{

delta 18
acmaEGjq$-X#tk#Yn9o@**gQw<NC*I0j|lYu