From ef931dc1202ff6a98ea6c0cec4031cf4995c8a14 Mon Sep 17 00:00:00 2001
From: MissBismuth <194607097+MissBismuth@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:31:05 +0100
Subject: [PATCH 1/2] add LayoutUtil

---
 data/file_list.yml                   | 10 ++++----
 lib/al/Library/Layout/LayoutSystem.h |  2 ++
 lib/al/Library/Layout/LayoutUtil.cpp | 35 ++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 lib/al/Library/Layout/LayoutUtil.cpp

diff --git a/data/file_list.yml b/data/file_list.yml
index b77438eab3..9fd4f68211 100644
--- a/data/file_list.yml
+++ b/data/file_list.yml
@@ -243898,7 +243898,7 @@ Library/Layout/LayoutUtil.o:
   - offset: 0x8bc1b0
     size: 108
     label: _ZN2al18initLayoutInitInfoEPNS_14LayoutInitInfoEPKNS_9LayoutKitEPNS_14SceneObjHolderEPKNS_13AudioDirectorEPKNS_12LayoutSystemEPKNS_13MessageSystemEPKNS_13GamePadSystemE
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8bc21c
     size: 20
     label: _ZN2al15setRenderBufferEPNS_9LayoutKitEPKN3agl12RenderBufferE
@@ -243910,19 +243910,19 @@ Library/Layout/LayoutUtil.o:
   - offset: 0x8bc234
     size: 8
     label: _ZN2al17executeUpdateListEPNS_9LayoutKitEPKcS3_
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8bc23c
     size: 8
     label: _ZN2al19executeUpdateEffectEPNS_9LayoutKitE
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8bc244
     size: 8
     label: _ZN2al11executeDrawEPKNS_9LayoutKitEPKc
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8bc24c
     size: 12
     label: _ZN2al17executeDrawEffectEPKNS_9LayoutKitE
-    status: NotDecompiled
+    status: Matching
 Library/Light/BloomDirector.o:
   '.text':
   - offset: 0x8bc258
diff --git a/lib/al/Library/Layout/LayoutSystem.h b/lib/al/Library/Layout/LayoutSystem.h
index f2174587f1..7f319497ce 100644
--- a/lib/al/Library/Layout/LayoutSystem.h
+++ b/lib/al/Library/Layout/LayoutSystem.h
@@ -39,6 +39,8 @@ class LayoutKit {
 
     nn::ui2d::DrawInfo* getDrawInfo() const { return mDrawInfo; }
 
+    agl::DrawContext* getDrawContext() const { return mDrawContext; }
+
 private:
     FontHolder* mFontHolder;
     ExecuteDirector* mExecuteDirector;
diff --git a/lib/al/Library/Layout/LayoutUtil.cpp b/lib/al/Library/Layout/LayoutUtil.cpp
new file mode 100644
index 0000000000..64fcc57269
--- /dev/null
+++ b/lib/al/Library/Layout/LayoutUtil.cpp
@@ -0,0 +1,35 @@
+#include "Library/Layout/LayoutUtil.h"
+
+#include "LayoutInitInfo.h"
+#include "LayoutSystem.h"
+#include "Library/Effect/EffectKeeper.h"
+#include "Library/Effect/EffectSystem.h"
+#include "Library/Execute/ExecuteDirector.h"
+
+namespace al {
+void initLayoutInitInfo(LayoutInitInfo* info, const LayoutKit* kit, SceneObjHolder* sceneObjHolder,
+                        const AudioDirector* audioDirector, const LayoutSystem* layoutSystem,
+                        const MessageSystem* messageSystem, const GamePadSystem* gamePadSystem) {
+    info->init(kit->getExecuteDirector(), kit->getEffectSystem()->getEffectSystemInfo(),
+               sceneObjHolder, audioDirector, nullptr, layoutSystem, messageSystem, gamePadSystem,
+               nullptr);
+    info->setDrawContext(kit->getDrawContext());
+    info->setDrawInfo(kit->getDrawInfo());
+}
+
+void executeUpdateList(LayoutKit* kit, const char* tableName, const char* listName) {
+    kit->getExecuteDirector()->executeList(tableName, listName);
+}
+
+void executeUpdateEffect(LayoutKit* kit) {
+    alEffectSystemFunction::updateEffect2D(kit->getEffectSystem());
+}
+
+void executeDraw(const LayoutKit* kit, const char* tableName) {
+    kit->getExecuteDirector()->draw(tableName);
+}
+
+void executeDrawEffect(const LayoutKit* kit) {
+    alEffectSystemFunction::drawEffect2D(kit->getEffectSystem(), nullptr);
+}
+}  // namespace al

From 91e84c0518fb05069f1cc7a22a24ecd73007249a Mon Sep 17 00:00:00 2001
From: MissBismuth <194607097+MissBismuth@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:37:36 +0100
Subject: [PATCH 2/2] reorder includes

---
 lib/al/Library/Layout/LayoutUtil.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/al/Library/Layout/LayoutUtil.cpp b/lib/al/Library/Layout/LayoutUtil.cpp
index 64fcc57269..0aff17fcc2 100644
--- a/lib/al/Library/Layout/LayoutUtil.cpp
+++ b/lib/al/Library/Layout/LayoutUtil.cpp
@@ -1,10 +1,10 @@
 #include "Library/Layout/LayoutUtil.h"
 
-#include "LayoutInitInfo.h"
-#include "LayoutSystem.h"
 #include "Library/Effect/EffectKeeper.h"
 #include "Library/Effect/EffectSystem.h"
 #include "Library/Execute/ExecuteDirector.h"
+#include "Library/Layout/LayoutInitInfo.h"
+#include "Library/Layout/LayoutSystem.h"
 
 namespace al {
 void initLayoutInitInfo(LayoutInitInfo* info, const LayoutKit* kit, SceneObjHolder* sceneObjHolder,