From c99dc9334775b5fdeeb1de5de85605ea811f0147 Mon Sep 17 00:00:00 2001
From: mattias-blum <142374929+mattias-blum@users.noreply.github.com>
Date: Wed, 21 May 2025 10:07:26 -0400
Subject: [PATCH] PR changes + added inlines

---
 include/d/d_menu_option.h | 16 +++++++++++++---
 src/d/d_menu_collect.cpp  | 14 +++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/include/d/d_menu_option.h b/include/d/d_menu_option.h
index 14131258f..38f78e262 100644
--- a/include/d/d_menu_option.h
+++ b/include/d/d_menu_option.h
@@ -16,9 +16,19 @@ class dMenu_Option_c : public dDlst_base_c {
 public:
     void alphaChange(fopMsgM_pane_class*, f32) {}
     void getQuitStatus() {}
-    void setArchive(JKRArchive*) {}
-    void setFont(JUTFont*, JUTFont*) {}
-    void setTextArea(char*, char*, char*, char*) {}
+    void setArchive(JKRArchive* archive) {
+        mpArchive = archive;
+    }
+    void setFont(JUTFont* font_1, JUTFont* font_2) {
+        mD2C = font_1;
+        mD30 = font_2;
+    }
+    void setTextArea(char* param_1, char* param_2, char* param_3, char* param_4) {
+        mD38 = param_1;
+        mD3C = param_2;
+        mD40 = param_3;
+        mD44 = param_4;
+    }
 
     void screenSet();
     void mainInit();
diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp
index 21eedf8e2..bf5f31bc7 100644
--- a/src/d/d_menu_collect.cpp
+++ b/src/d/d_menu_collect.cpp
@@ -25,7 +25,7 @@ dMc_HIO_c::dMc_HIO_c() {
     m52 = 130;
     m4E = 250;
     m50 = 20;
-    m58.set(-1, 170, 0, 0);
+    m58.set(0xFF, 0xAA, 0x00, 0x00);
     m44 = 13;
 }
 
@@ -157,13 +157,13 @@ void dMenu_Collect_c::screenSet() {
     ((J2DTextBox*)(m778).pane)->setFont(m2470);
 
     // Couple of functions missing here
-    ((J2DTextBox*)(m740).pane)->setWhite(-1);
-    ((J2DTextBox*)(m740).pane)->setCharColor(-1);
-    ((J2DTextBox*)(m740).pane)->setGradColor(-1);
+    ((J2DTextBox*)(m740).pane)->setWhite(0xFFFFFFFF);
+    ((J2DTextBox*)(m740).pane)->setCharColor(0xFFFFFFFF);
+    ((J2DTextBox*)(m740).pane)->setGradColor(0xFFFFFFFF);
 
-    ((J2DTextBox*)(m778).pane)->setWhite(-1);
-    ((J2DTextBox*)(m778).pane)->setCharColor(-1);
-    ((J2DTextBox*)(m778).pane)->setGradColor(-1);
+    ((J2DTextBox*)(m778).pane)->setWhite(0xFFFFFFFF);
+    ((J2DTextBox*)(m778).pane)->setCharColor(0xFFFFFFFF);
+    ((J2DTextBox*)(m778).pane)->setGradColor(0xFFFFFFFF);
     
 
     fopMsgM_setPaneData(&m858, m004, 'wd');