From cff6edac5b034fd307bbfe1b521518b5beae3b15 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Tue, 2 Nov 2021 18:37:48 +0000
Subject: [PATCH] Fixed some bugs from recent commits

---
 .../011_Battle/002_Move/003_Move_Usage_Calculations.rb      | 2 +-
 Data/Scripts/012_Overworld/007_Overworld_DayCare.rb         | 6 +++---
 Data/Scripts/016_UI/005_UI_Party.rb                         | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb b/Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb
index 4c557825d..3dd808dde 100644
--- a/Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb
+++ b/Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb
@@ -207,7 +207,7 @@ class PokeBattle_Move
     c += 1 if user.inHyperMode? && @type == :SHADOW
     c = ratios.length-1 if c>=ratios.length
     # Calculation
-    return true if ratio[c] == 1
+    return true if ratios[c] == 1
     r = @battle.pbRandom(ratios[c])
     return true if r == 0
     if r == 1 && Settings::AFFECTION_EFFECTS && @battle.internalBattle &&
diff --git a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
index f5464721c..f51747877 100644
--- a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
+++ b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
@@ -281,11 +281,11 @@ class DayCare
     def choice_text
       return nil if !filled?
       if @pokemon.male?
-        return choices.push(_INTL("{1} (♂, Lv.{2})", @pokemon.name, @pokemon.level))
+        return _INTL("{1} (♂, Lv.{2})", @pokemon.name, @pokemon.level)
       elsif @pokemon.female?
-        return choices.push(_INTL("{1} (♀, Lv.{2})", @pokemon.name, @pokemon.level))
+        return _INTL("{1} (♀, Lv.{2})", @pokemon.name, @pokemon.level)
       end
-      return choices.push(_INTL("{1} (Lv.{2})", @pokemon.name, @pokemon.level))
+      return _INTL("{1} (Lv.{2})", @pokemon.name, @pokemon.level)
     end
 
     def add_exp(amount = 1)
diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb
index 9626a48b7..98b8274fa 100644
--- a/Data/Scripts/016_UI/005_UI_Party.rb
+++ b/Data/Scripts/016_UI/005_UI_Party.rb
@@ -453,6 +453,7 @@ class PokemonParty_Scene
     @can_access_storage = can_access_storage
     addBackgroundPlane(@sprites,"partybg","Party/bg",@viewport)
     @sprites["messagebox"] = Window_AdvancedTextPokemon.new("")
+    @sprites["messagebox"].z              = 50
     @sprites["messagebox"].viewport       = @viewport
     @sprites["messagebox"].visible        = false
     @sprites["messagebox"].letterbyletter = true
@@ -461,6 +462,7 @@ class PokemonParty_Scene
        @can_access_storage ? _INTL("[Special]: To Boxes") : "")
     @sprites["storagetext"].x           = 32
     @sprites["storagetext"].y           = Graphics.height - @sprites["messagebox"].height - 16
+    @sprites["storagetext"].z           = 10
     @sprites["storagetext"].viewport    = @viewport
     @sprites["storagetext"].baseColor   = Color.new(248, 248, 248)
     @sprites["storagetext"].shadowColor = Color.new(0, 0, 0)