From 93c0b24da0f9950debf2c7d987f6d42221b04a13 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Wed, 15 May 2024 23:02:05 +0100
Subject: [PATCH] Detach dolls from screens

---
 game/scripts/doll/main.rpy | 2 +-
 game/scripts/gui/say.rpy   | 3 ++-
 game/scripts/options.rpy   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy
index 32ed62ad..2e8a4513 100644
--- a/game/scripts/doll/main.rpy
+++ b/game/scripts/doll/main.rpy
@@ -64,7 +64,7 @@ init python:
 
             # Image properties
             self.zorder = 15
-            self.layer = "screens"
+            self.layer = "dolls"
             self.animation = None
             self.tag = f"{name}_main"
 
diff --git a/game/scripts/gui/say.rpy b/game/scripts/gui/say.rpy
index f583a782..7c0c2f93 100644
--- a/game/scripts/gui/say.rpy
+++ b/game/scripts/gui/say.rpy
@@ -210,7 +210,8 @@ define choice_width = int(config.screen_width/2)
 screen choice(items, menu_yalign=.6):
     tag menu
     modal True
-    zorder 30
+    zorder 0
+    layer "interface"
 
     style_prefix gui.theme("menu")
 
diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy
index 2d956da9..dc9e72d2 100644
--- a/game/scripts/options.rpy
+++ b/game/scripts/options.rpy
@@ -56,6 +56,7 @@ define config.menu_clear_layers = ["interface", "dolls"]
 define config.default_tag_layer = "screens"
 define config.top_layers = ["interface"]
 define config.say_layer = "interface"
+define config.choice_layer = "interface"
 define config.transparent_tile = False
 define config.narrator_menu = True
 define config.hard_rollback_limit = 100