From 7cf2a85d0c5d3eabf37f6a9c9552f06702cc5d30 Mon Sep 17 00:00:00 2001
From: Dylan Ascencio <empressglatia@gmail.com>
Date: Sun, 12 Nov 2023 21:41:22 -0500
Subject: [PATCH] Match d_a_swhit0_c::draw

---
 include/d/actor/d_a_swhit0.h |  2 ++
 src/d/actor/d_a_swhit0.cpp   | 27 ++++++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/include/d/actor/d_a_swhit0.h b/include/d/actor/d_a_swhit0.h
index bac103b28..87def4cdc 100644
--- a/include/d/actor/d_a_swhit0.h
+++ b/include/d/actor/d_a_swhit0.h
@@ -12,6 +12,8 @@ public:
         
     }
 
+    inline s32 draw();
+
     s32 getSwNo();
     u8 getEvNo();
     u8 getType();
diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp
index 35e0fb287..d5897be01 100644
--- a/src/d/actor/d_a_swhit0.cpp
+++ b/src/d/actor/d_a_swhit0.cpp
@@ -371,8 +371,7 @@ void daSwhit0_c::setDrawMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 000011E4-00001334       .text daSwhit0_Draw__FP10daSwhit0_c */
-static s32 daSwhit0_Draw(daSwhit0_c* i_swhit) {
+s32 daSwhit0_c::draw() {
     /* Nonmatching */
     static GXColorS10 l_color[] = {
         { 0xF0, 0xF5, 0xFF, 0x6E },
@@ -382,11 +381,16 @@ static s32 daSwhit0_Draw(daSwhit0_c* i_swhit) {
         { 0x78, 0x64, 0x32, 0x64 }
     };
 
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, i_swhit->getPositionP(), &i_swhit->mTevStr);
-    g_env_light.setLightTevColorType(i_swhit->mpModel, &i_swhit->mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, getPositionP(), &mTevStr);
+    g_env_light.setLightTevColorType(mpModel, &mTevStr);
 
-    J3DModelData* modelData = i_swhit->mpModel->getModelData();
-    GXColorS10* colors = i_swhit->checkFlag(0x01) ? l_color + 2 : l_color;
+    J3DModelData* modelData = mpModel->getModelData();
+    s32 flag = checkFlag(0x01);
+    
+    GXColorS10* colors = l_color;
+    if (flag) {
+        colors = l_color + 2;
+    }
 
     for (u16 i = 0; i < modelData->getMaterialNum(); i++) {
         J3DMaterial* mat = modelData->getMaterialNodePointer(i);
@@ -400,14 +404,19 @@ static s32 daSwhit0_Draw(daSwhit0_c* i_swhit) {
         }
     }
     
-    i_swhit->mAnm.entry(modelData);
-    i_swhit->mTexAnm.entry(modelData);
+    mAnm.entry(modelData);
+    mTexAnm.entry(modelData);
 
-    mDoExt_modelUpdateDL(i_swhit->mpModel);
+    mDoExt_modelUpdateDL(mpModel);
 
     return TRUE;
 }
 
+/* 000011E4-00001334       .text daSwhit0_Draw__FP10daSwhit0_c */
+static s32 daSwhit0_Draw(daSwhit0_c* i_swhit) {
+    return i_swhit->draw();
+}
+
 /* 00001334-00001420       .text daSwhit0_Execute__FP10daSwhit0_c */
 static s32 daSwhit0_Execute(daSwhit0_c* i_swhit) {
     i_swhit->mAnm.play();