From 299a86c8507540f50fddc4495d29c96f6d39d3da Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 13 Oct 2023 17:35:13 -0700
Subject: [PATCH] d_kyeff2

---
 configure.py                |  2 +-
 include/d/d_kankyo_wether.h |  4 +++
 src/d/d_kyeff2.cpp          | 66 +++++++++++++++++++++++++++++--------
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/configure.py b/configure.py
index 915abe385..380210db5 100644
--- a/configure.py
+++ b/configure.py
@@ -448,7 +448,7 @@ config.libs = [
             Object(NonMatching, "d/d_gameover.cpp"),
             Object(NonMatching, "d/d_kankyo.cpp"),
             Object(NonMatching, "d/d_kyeff.cpp"),
-            Object(NonMatching, "d/d_kyeff2.cpp"),
+            Object(Matching,    "d/d_kyeff2.cpp"),
             Object(NonMatching, "d/d_ky_thunder.cpp"),
             Object(Matching,    "d/d_letter.cpp"),
             Object(NonMatching, "d/d_level_se.cpp"),
diff --git a/include/d/d_kankyo_wether.h b/include/d/d_kankyo_wether.h
index 9d1a16328..28e890ff1 100644
--- a/include/d/d_kankyo_wether.h
+++ b/include/d/d_kankyo_wether.h
@@ -332,11 +332,15 @@ struct WINDEFF_SET {
 };
 
 void dKyw_wether_init();
+void dKyw_wether_init2();
 void dKyw_wether_move();
 void dKyw_wether_move_draw();
+void dKyw_wether_move_draw2();
 void dKyw_wether_draw();
+void dKyw_wether_draw2();
 void dKyw_wether_proc();
 void dKyw_wether_delete();
+void dKyw_wether_delete2();
 void dKyw_rain_set(int);
 void dKyw_wind_set();
 void dKyw_wind_init();
diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp
index 993001df7..8a7e34cc3 100644
--- a/src/d/d_kyeff2.cpp
+++ b/src/d/d_kyeff2.cpp
@@ -3,36 +3,74 @@
 // Translation Unit: d_kyeff2.cpp
 //
 
-#include "d_kyeff2.h"
-#include "dolphin/types.h"
+#include "f_op/f_op_kankyo.h"
+#include "f_op/f_op_camera.h"
+#include "d/d_com_inf_game.h"
+#include "d/d_kankyo.h"
+#include "d/d_kankyo_data.h"
+#include "d/d_kankyo_wether.h"
+#include "d/d_procname.h"
+#include "d/d_stage.h"
+#include "m_Do/m_Do_audio.h"
+#include "dolphin/os/OS.h"
+
+class dKyeff2_c : public kankyo_class {
+public:
+    BOOL execute();
+};
 
 /* 80198758-8019877C       .text dKyeff2_Draw__FP9dKyeff2_c */
-void dKyeff2_Draw(dKyeff2_c*) {
-    /* Nonmatching */
+BOOL dKyeff2_Draw(dKyeff2_c* i_this) {
+    dKyw_wether_draw2();
+    return TRUE;
 }
 
 /* 8019877C-801987A0       .text execute__9dKyeff2_cFv */
-void dKyeff2_c::execute() {
-    /* Nonmatching */
+BOOL dKyeff2_c::execute() {
+    dKyw_wether_move_draw2();
+    return TRUE;
 }
 
 /* 801987A0-801987C0       .text dKyeff2_Execute__FP9dKyeff2_c */
-void dKyeff2_Execute(dKyeff2_c*) {
-    /* Nonmatching */
+BOOL dKyeff2_Execute(dKyeff2_c* i_this) {
+    return i_this->execute();
 }
 
 /* 801987C0-801987C8       .text dKyeff2_IsDelete__FP9dKyeff2_c */
-void dKyeff2_IsDelete(dKyeff2_c*) {
-    /* Nonmatching */
+BOOL dKyeff2_IsDelete(dKyeff2_c* i_this) {
+    return TRUE;
 }
 
 /* 801987C8-801987EC       .text dKyeff2_Delete__FP9dKyeff2_c */
-void dKyeff2_Delete(dKyeff2_c*) {
-    /* Nonmatching */
+BOOL dKyeff2_Delete(dKyeff2_c* i_this) {
+    dKyw_wether_delete2();
+    return TRUE;
 }
 
 /* 801987EC-80198810       .text dKyeff2_Create__FP12kankyo_class */
-void dKyeff2_Create(kankyo_class*) {
-    /* Nonmatching */
+s32 dKyeff2_Create(kankyo_class*) {
+    dKyw_wether_init2();
+    return cPhs_COMPLEATE_e;
 }
 
+leafdraw_method_class l_dKyeff2_Method = {
+    (process_method_func)dKyeff2_Create,
+    (process_method_func)dKyeff2_Delete,
+    (process_method_func)dKyeff2_Execute,
+    (process_method_func)dKyeff2_IsDelete,
+    (process_method_func)dKyeff2_Draw,
+};
+
+extern kankyo_process_profile_definition g_profile_KYEFF2 = {
+    fpcLy_CURRENT_e,
+    12,
+    fpcPi_CURRENT_e,
+    PROC_KYEFF2,
+    &g_fpcLf_Method.mBase,
+    sizeof(dKyeff2_c),
+    0,
+    0,
+    &g_fopKy_Method,
+    0x003,
+    &l_dKyeff2_Method,
+};