From 0f17d7c40ec92db19190de3c61fead7c6338dc83 Mon Sep 17 00:00:00 2001
From: elijah-thomas774 <elijahthomas774@gmail.com>
Date: Thu, 14 Nov 2024 22:38:56 -0500
Subject: [PATCH] d_a_npc sinit :)

---
 include/d/a/npc/d_a_npc.h |  2 ++
 src/d/a/npc/d_a_npc.cpp   | 28 ++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/include/d/a/npc/d_a_npc.h b/include/d/a/npc/d_a_npc.h
index 6fc590a8..b0785692 100644
--- a/include/d/a/npc/d_a_npc.h
+++ b/include/d/a/npc/d_a_npc.h
@@ -197,6 +197,8 @@ private:
     /* 0x4FC */ u8 field_0x4FC[0x684 - 0x4FC];
     /* 0x684 */ u8 field_0x684;
     /* 0x685 */ u8 field_0x685[0x6E4 - 0x685];
+
+    static fLiMgBa_c NPC_ACTOR_LIST;
 };
 
 #endif
diff --git a/src/d/a/npc/d_a_npc.cpp b/src/d/a/npc/d_a_npc.cpp
index aea7745b..fa18bc45 100644
--- a/src/d/a/npc/d_a_npc.cpp
+++ b/src/d/a/npc/d_a_npc.cpp
@@ -1,26 +1,34 @@
 #include "d/a/npc/d_a_npc.h"
 
+#include "f/f_list_mg.h"
+#include "nw4r/ut/ut_Color.h"
 #include "s/s_StateID.hpp"
 #include "sized_string.h"
 
-fLiMgBa_c NPC_ACTOR_LIST;
+fLiMgBa_c dAcNpc_c::NPC_ACTOR_LIST;
 
 STATE_VIRTUAL_DEFINE(dAcNpc_c, Wait);
 STATE_VIRTUAL_DEFINE(dAcNpc_c, Demo);
 
-extern nw4r::ut::Color sColors[] = {
+static const nw4r::ut::Color sColors0[] = {
     nw4r::ut::Color(0xEF, 0x30, 0x27, 0xFF),
-    nw4r::ut::Color(0, 0, 0, 0xFF),
-    nw4r::ut::Color(0xEF, 0x30, 0x27, 0),
-    nw4r::ut::Color(0xFF, 0xFF, 0xFF, 0),
+    nw4r::ut::Color(0x00, 0x00, 0x00, 0xFF),
+    nw4r::ut::Color(0xEF, 0x30, 0x27, 0x00),
+};
+static const nw4r::ut::Color sColors1[] = {
+    nw4r::ut::Color(0xFF, 0xFF, 0xFF, 0x00),
     nw4r::ut::Color(0xFE, 0xF8, 0x9D, 0xFF),
     nw4r::ut::Color(0x88, 0x63, 0x36, 0x80),
+};
+static const nw4r::ut::Color sColors2[] = {
     nw4r::ut::Color(0x4F, 0x46, 0x33, 0xFF),
     nw4r::ut::Color(0xD8, 0xC5, 0x8D, 0xFF),
     nw4r::ut::Color(0x95, 0x69, 0x3B, 0xFF),
-    nw4r::ut::Color(0x50, 0x46, 0x32, 0),
-    nw4r::ut::Color(0xD8, 0xC5, 0x8D, 0),
-    nw4r::ut::Color(0x96, 0x69, 0x3C, 0),
+};
+static const nw4r::ut::Color sColors3[] = {
+    nw4r::ut::Color(0x50, 0x46, 0x32, 0x00),
+    nw4r::ut::Color(0xD8, 0xC5, 0x8D, 0x00),
+    nw4r::ut::Color(0x96, 0x69, 0x3C, 0x00),
 };
 
 SizedString<128> sNpcStr1;
@@ -29,3 +37,7 @@ SizedString<128> sNpcStr3;
 SizedString<128> sNpcStr4;
 
 dAcNpc_c::dAcNpc_c() : mStateMgr(*this, sStateID::null), mActorListEntry(this) {}
+
+dAcNpc_c::~dAcNpc_c() {
+    // TODO
+}