From 7f8fa16a52e416d90b14c45a71b2cdbf66f8b370 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Mon, 7 Mar 2022 23:16:13 +0000
Subject: [PATCH] Made Zacian/Zamazenta's rusted items unlosable, made bad
 poison icon be shown again in battle

---
 .../Scripts/010_Data/002_PBS data/006_Item.rb | 78 ++++++++++---------
 .../004_Scene/006_Battle_Scene_Objects.rb     |  2 +-
 .../003_Debug menus/001_Debug_Menus.rb        |  1 +
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/Data/Scripts/010_Data/002_PBS data/006_Item.rb b/Data/Scripts/010_Data/002_PBS data/006_Item.rb
index 529144fe8..2d89838f5 100644
--- a/Data/Scripts/010_Data/002_PBS data/006_Item.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/006_Item.rb	
@@ -147,44 +147,46 @@ module GameData
       return false if species == :ARCEUS && ability != :MULTITYPE
       return false if species == :SILVALLY && ability != :RKSSYSTEM
       combos = {
-        :ARCEUS   => [:FISTPLATE,   :FIGHTINIUMZ,
-                      :SKYPLATE,    :FLYINIUMZ,
-                      :TOXICPLATE,  :POISONIUMZ,
-                      :EARTHPLATE,  :GROUNDIUMZ,
-                      :STONEPLATE,  :ROCKIUMZ,
-                      :INSECTPLATE, :BUGINIUMZ,
-                      :SPOOKYPLATE, :GHOSTIUMZ,
-                      :IRONPLATE,   :STEELIUMZ,
-                      :FLAMEPLATE,  :FIRIUMZ,
-                      :SPLASHPLATE, :WATERIUMZ,
-                      :MEADOWPLATE, :GRASSIUMZ,
-                      :ZAPPLATE,    :ELECTRIUMZ,
-                      :MINDPLATE,   :PSYCHIUMZ,
-                      :ICICLEPLATE, :ICIUMZ,
-                      :DRACOPLATE,  :DRAGONIUMZ,
-                      :DREADPLATE,  :DARKINIUMZ,
-                      :PIXIEPLATE,  :FAIRIUMZ],
-        :SILVALLY => [:FIGHTINGMEMORY,
-                      :FLYINGMEMORY,
-                      :POISONMEMORY,
-                      :GROUNDMEMORY,
-                      :ROCKMEMORY,
-                      :BUGMEMORY,
-                      :GHOSTMEMORY,
-                      :STEELMEMORY,
-                      :FIREMEMORY,
-                      :WATERMEMORY,
-                      :GRASSMEMORY,
-                      :ELECTRICMEMORY,
-                      :PSYCHICMEMORY,
-                      :ICEMEMORY,
-                      :DRAGONMEMORY,
-                      :DARKMEMORY,
-                      :FAIRYMEMORY],
-        :GIRATINA => [:GRISEOUSORB],
-        :GENESECT => [:BURNDRIVE, :CHILLDRIVE, :DOUSEDRIVE, :SHOCKDRIVE],
-        :KYOGRE   => [:BLUEORB],
-        :GROUDON  => [:REDORB]
+        :ARCEUS    => [:FISTPLATE,   :FIGHTINIUMZ,
+                       :SKYPLATE,    :FLYINIUMZ,
+                       :TOXICPLATE,  :POISONIUMZ,
+                       :EARTHPLATE,  :GROUNDIUMZ,
+                       :STONEPLATE,  :ROCKIUMZ,
+                       :INSECTPLATE, :BUGINIUMZ,
+                       :SPOOKYPLATE, :GHOSTIUMZ,
+                       :IRONPLATE,   :STEELIUMZ,
+                       :FLAMEPLATE,  :FIRIUMZ,
+                       :SPLASHPLATE, :WATERIUMZ,
+                       :MEADOWPLATE, :GRASSIUMZ,
+                       :ZAPPLATE,    :ELECTRIUMZ,
+                       :MINDPLATE,   :PSYCHIUMZ,
+                       :ICICLEPLATE, :ICIUMZ,
+                       :DRACOPLATE,  :DRAGONIUMZ,
+                       :DREADPLATE,  :DARKINIUMZ,
+                       :PIXIEPLATE,  :FAIRIUMZ],
+        :SILVALLY  => [:FIGHTINGMEMORY,
+                       :FLYINGMEMORY,
+                       :POISONMEMORY,
+                       :GROUNDMEMORY,
+                       :ROCKMEMORY,
+                       :BUGMEMORY,
+                       :GHOSTMEMORY,
+                       :STEELMEMORY,
+                       :FIREMEMORY,
+                       :WATERMEMORY,
+                       :GRASSMEMORY,
+                       :ELECTRICMEMORY,
+                       :PSYCHICMEMORY,
+                       :ICEMEMORY,
+                       :DRAGONMEMORY,
+                       :DARKMEMORY,
+                       :FAIRYMEMORY],
+        :GIRATINA  => [:GRISEOUSORB],
+        :GENESECT  => [:BURNDRIVE, :CHILLDRIVE, :DOUSEDRIVE, :SHOCKDRIVE],
+        :KYOGRE    => [:BLUEORB],
+        :GROUDON   => [:REDORB],
+        :ZACIAN    => [:RUSTEDSWORD],
+        :ZAMAZENTA => [:RUSTEDSHIELD]
       }
       return combos[species]&.include?(@id)
     end
diff --git a/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb b/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
index 7c69964ad..3e7322430 100644
--- a/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
+++ b/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
@@ -251,7 +251,7 @@ class Battle::Scene::PokemonDataBox < SpriteWrapper
     # Draw status icon
     if @battler.status != :NONE
       if @battler.status == :POISON && @battler.statusCount > 0   # Badly poisoned
-        s = GameData::Status.count
+        s = GameData::Status.count - 1
       else
         s = GameData::Status.get(@battler.status).icon_position
       end
diff --git a/Data/Scripts/020_Debug/003_Debug menus/001_Debug_Menus.rb b/Data/Scripts/020_Debug/003_Debug menus/001_Debug_Menus.rb
index 8f0b2e07c..7b9dbc773 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/001_Debug_Menus.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/001_Debug_Menus.rb	
@@ -204,6 +204,7 @@ module Battle::DebugMixin
     cmdwindow = sprites["cmdwindow"]
     cmdwindow.x        = 0
     cmdwindow.y        = 0
+    cmdwindow.width    = Graphics.width / 2
     cmdwindow.height   = Graphics.height - sprites["textbox"].height
     cmdwindow.viewport = viewport
     cmdwindow.visible  = true