From b706843888eb3f962fa70804a5c9b2551ef20e48 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Tue, 14 Dec 2021 22:33:46 +0000
Subject: [PATCH] Added $player.has_box_link and $player.has_exp_all in
 addition to those items

---
 .../011_Battle/001_Battle/003_Battle_ExpAndMoveLearning.rb  | 2 +-
 Data/Scripts/015_Trainers and player/004_Player.rb          | 6 ++++++
 Data/Scripts/016_UI/005_UI_Party.rb                         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Data/Scripts/011_Battle/001_Battle/003_Battle_ExpAndMoveLearning.rb b/Data/Scripts/011_Battle/001_Battle/003_Battle_ExpAndMoveLearning.rb
index f589e524b..2f818fdec 100644
--- a/Data/Scripts/011_Battle/001_Battle/003_Battle_ExpAndMoveLearning.rb
+++ b/Data/Scripts/011_Battle/001_Battle/003_Battle_ExpAndMoveLearning.rb
@@ -8,7 +8,7 @@ class 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 = $bag.has?(:EXPALL)
+    expAll = $player.has_exp_all || $bag.has?(:EXPALL)
     p1 = pbParty(0)
     @battlers.each do |b|
       next unless b && b.opposes?   # Can only gain Exp from fainted foes
diff --git a/Data/Scripts/015_Trainers and player/004_Player.rb b/Data/Scripts/015_Trainers and player/004_Player.rb
index 0590ffaa3..cdedb0cba 100644
--- a/Data/Scripts/015_Trainers and player/004_Player.rb	
+++ b/Data/Scripts/015_Trainers and player/004_Player.rb	
@@ -24,8 +24,12 @@ class Player < Trainer
   attr_accessor :has_pokegear
   # @return [Boolean] whether the player has running shoes (i.e. can run)
   attr_accessor :has_running_shoes
+  # @return [Boolean] whether the player has an innate ability to access Pokémon storage
+  attr_accessor :has_box_link
   # @return [Boolean] whether the creator of the Pokémon Storage System has been seen
   attr_accessor :seen_storage_creator
+  # @return [Boolean] whether the effect of Exp All applies innately
+  attr_accessor :has_exp_all
   # @return [Boolean] whether Mystery Gift can be used from the load screen
   attr_accessor :mystery_gift_unlocked
   # @return [Array<Array>] downloaded Mystery Gift data
@@ -110,7 +114,9 @@ class Player < Trainer
     @has_pokedex           = false
     @has_pokegear          = false
     @has_running_shoes     = false
+    @has_box_link          = false
     @seen_storage_creator  = false
+    @has_exp_all           = false
     @mystery_gift_unlocked = false
     @mystery_gifts         = []
   end
diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb
index 09a683e69..40d510069 100644
--- a/Data/Scripts/016_UI/005_UI_Party.rb
+++ b/Data/Scripts/016_UI/005_UI_Party.rb
@@ -1151,7 +1151,7 @@ class PokemonPartyScreen
 
   def pbPokemonScreen
     can_access_storage = false
-    if $bag.has?(:POKEMONBOXLINK)
+    if $player.has_box_link || $bag.has?(:POKEMONBOXLINK)
       if !$game_switches[Settings::DISABLE_BOX_LINK_SWITCH] &&
          !$game_map.metadata&.has_flag?("DisableBoxLink")
         can_access_storage = true