From cd096eaf158e3d78c6d692ed8c644bcd1e7395ad Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Thu, 21 Nov 2024 17:10:04 +0000
Subject: [PATCH] Bug fixes

* Fixed side images defaulting to the left side
* Fixed overlay screens being displayed below the doll
* Removed volume suggestion during quidditch matches (obsolete)
---
 game/scripts/gui/say.rpy                  | 2 +-
 game/scripts/utility/common_functions.rpy | 2 --
 game/scripts/utility/common_screens.rpy   | 5 +++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/game/scripts/gui/say.rpy b/game/scripts/gui/say.rpy
index 3723a1d7..33e0fd98 100644
--- a/game/scripts/gui/say.rpy
+++ b/game/scripts/gui/say.rpy
@@ -74,7 +74,7 @@ screen say(who, what, side_doll=None, side_image=None, icon=None):
     if side_doll:
         add side_doll
     elif side_image: # Compat
-        add side_image zoom 0.5 align (0.0, 1.0) xoffset 16
+        add side_image zoom 0.5 align (1.0, 1.0) xoffset 16
     else:
         add SideImage() # Proxy for _side_image
 
diff --git a/game/scripts/utility/common_functions.rpy b/game/scripts/utility/common_functions.rpy
index 47f5b592..c37313a2 100644
--- a/game/scripts/utility/common_functions.rpy
+++ b/game/scripts/utility/common_functions.rpy
@@ -14,8 +14,6 @@ init python early:
     from operator import itemgetter
     from collections import OrderedDict
 
-    get_volume_preference = renpy.game.preferences.get_volume
-
     def hashstring(input_string):
         return int(hashlib.md5(input_string.encode("utf-8")).hexdigest(), 16)
 
diff --git a/game/scripts/utility/common_screens.rpy b/game/scripts/utility/common_screens.rpy
index 255e79f9..ff70f4fe 100644
--- a/game/scripts/utility/common_screens.rpy
+++ b/game/scripts/utility/common_screens.rpy
@@ -1,23 +1,28 @@
 screen blkfade():
+    layer "overlay"
     tag blkfade
     zorder 25
     add Color("#000")
 
 screen whitefade():
+    layer "overlay"
     tag whitefade
     zorder 25
     add Color("#fff")
 
 screen blktone(alpha=0.5):
+    layer "overlay"
     tag blktone
     zorder 14
     add Color("#000", alpha=alpha)
 
 screen white():
+    layer "overlay"
     zorder 20
     add Color("#fff")
 
 screen bld1():
+    layer "overlay"
     zorder 10
     tag bld1