d_kyeff, d_kyeff2, m_Do_printf, and m_Do_graphic (#109)

* Split d_kyeff

* Partially matched d_kyeff

* split d_kyeff2

* Match d_kyeff2

* split m_Do_printf

* m_Do_printf partially matched

* hotfix and clang-format

* split m_Do_graphic

* rename symbols in m_Do_graphic

* Match a few functions in m_Do_graphic

* Fix Merge Errors

* Delete sh.exe.stackdump

* Update OSReportInit

src/d/d_a/d_a_alink.cpp

@@ -1,5 +1,6 @@
 #include "d/d_a/d_a_alink/d_a_alink.h"
 #include "SComponent/c_bg_w.h"
+#include "SComponent/c_lib.h"
 #include "SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature/Z2Creature.h"
 #include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h"
@@ -7,6 +8,7 @@
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h"
 #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h"
+#include "d/d_kankyo/d_kankyo.h"
 #include "f/f_pc/f_pc_manager.h"
 #include "f/f_pc/f_pc_searcher.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"

src/d/d_camera.cpp

@@ -12,6 +12,7 @@
 #include "f/f_pc/f_pc_searcher.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
+#include "m_Do/m_Do_graphic/m_Do_graphic.h"
 
 extern "C" {
 void __dt__8cM3dGLinFv(void);

src/d/d_com/d_com_inf_game.cpp

@@ -3,6 +3,7 @@
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "d/d_bg/d_bg_s/d_bg_s.h"
 #include "d/d_item/d_item/d_item.h"
+#include "d/d_kankyo/d_kankyo.h"
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"

src/d/d_kankyo.cpp

@@ -1,9 +1,11 @@
 /* d_kankyo.cpp autogenerated by split.py v0.3 at 2021-01-01 22:51:09.344700 */
 
+#include "d/d_kankyo/d_kankyo.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
+#include "m_Do/m_Do_graphic/m_Do_graphic.h"
 #include "os/OS.h"
 
 extern "C" {
@@ -279,14 +281,14 @@ asm void dKy_FiveSenses_fullthrottle_dark_static1(void) {
     nofralloc
 #include "d/d_kankyo/asm/func_8019D8CC.s"
 }
-
+};
 // dKy_FiveSenses_fullthrottle_dark__Fv
 // dKy_FiveSenses_fullthrottle_dark(void)
 asm void dKy_FiveSenses_fullthrottle_dark(void) {
     nofralloc
 #include "d/d_kankyo/asm/func_8019DD4C.s"
 }
-
+extern "C" {
 // dKy_light_influence_id__F4cXyzi
 // dKy_light_influence_id(cXyz, int)
 asm void dKy_light_influence_id(void) {

src/d/d_kankyo/d_kankyo_data.cpp

@@ -1,5 +1,6 @@
 /* d_kankyo_data.cpp autogenerated by split.py v0.3 at 2021-01-01 22:11:10.952715 */
 
+#include "d/d_kankyo/d_kankyo.h"
 #include "global.h"
 
 extern "C" {

src/d/d_kankyo/d_kankyo_rain.cpp

@@ -3,6 +3,7 @@
 #include "SComponent/c_math.h"
 #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "d/d_kankyo/d_kankyo.h"
 #include "global.h"
 
 extern "C" {

src/d/d_kankyo/d_kankyo_wether.cpp

@@ -3,6 +3,7 @@
 #include "SComponent/c_xyz.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "d/d_kankyo/d_kankyo.h"
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
@@ -477,7 +478,7 @@ asm void dKyw_evil_Draw(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_800574BC.s"
 }
-
+};
 // dKyw_wether_init__Fv
 // dKyw_wether_init(void)
 asm void dKyw_wether_init(void) {
@@ -498,7 +499,7 @@ asm void dKyw_wether_delete(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_80057A04.s"
 }
-
+extern "C" {
 // __dt__19dKankyo_evil_PacketFv
 // dKankyo_evil_Packet::~dKankyo_evil_Packet(void)
 asm void func_80057C84(void) {
@@ -568,14 +569,14 @@ asm void func_80058128(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_80058128.s"
 }
-
+};
 // dKyw_wether_delete2__Fv
 // dKyw_wether_delete2(void)
 asm void dKyw_wether_delete2(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_800581AC.s"
 }
-
+extern "C" {
 // __dt__21dKankyo_vrkumo_PacketFv
 // dKankyo_vrkumo_Packet::~dKankyo_vrkumo_Packet(void)
 asm void func_8005820C(void) {
@@ -589,14 +590,14 @@ asm void wether_move_thunder(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_80058290.s"
 }
-
+};
 // dKyw_wether_move__Fv
 // dKyw_wether_move(void)
 asm void dKyw_wether_move(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_800582F8.s"
 }
-
+extern "C" {
 // wether_move_sun__Fv
 // wether_move_sun(void)
 asm void wether_move_sun(void) {
@@ -666,14 +667,13 @@ asm void wether_move_evil(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_80059F74.s"
 }
-
+};
 // dKyw_wether_move_draw__Fv
 // dKyw_wether_move_draw(void)
 asm void dKyw_wether_move_draw(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_8005A0B8.s"
 }
-
 // dKyw_wether_move_draw2__Fv
 // dKyw_wether_move_draw2(void)
 asm void dKyw_wether_move_draw2(void) {
@@ -694,7 +694,7 @@ asm void dKyw_wether_draw2(void) {
     nofralloc
 #include "d/d_kankyo/d_kankyo_wether/asm/func_8005A304.s"
 }
-
+extern "C" {
 // dKyw_wether_proc__Fv
 // dKyw_wether_proc(void)
 asm void dKyw_wether_proc(void) {

src/d/d_ky/d_kyeff.cpp

@@ -1 +1,81 @@
-// ok
+#include "d/d_ky/d_kyeff/d_kyeff.h"
+#include "SComponent/c_lib.h"
+#include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
+#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "d/d_kankyo/d_kankyo.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
+#include "os/OS.h"
+
+bool dKyeff_Draw(dKyeff_c* dKyeff_c_ptr) {
+    dKyw_wether_draw();
+    return true;
+}
+
+// const char* lbl_80394F38 = "Name";
+
+#ifdef NONMATCHING  // matching but gameinfoplay struct is messed up
+bool dKyeff_c::execute(void) {
+    char* stageName = dComIfGp_getStartStageName();
+    int strcmp_result = strcmp(stageName, "Name");  // strcmp(stageName,"Name");
+    if (strcmp_result != 0) {
+        dKyw_wether_move();
+    }
+    dKyw_wether_move_draw();
+    dKy_FiveSenses_fullthrottle_dark();
+    mDoAud_mEnvse_framework();
+    return true;
+}
+#else
+asm bool dKyeff_c::execute(void) {
+    nofralloc
+#include "d/d_ky/d_kyeff/asm/func_801ADD5C.s"
+}
+#endif
+
+bool dKyeff_Execute(dKyeff_c* dKyeff_c_ptr) {
+    return dKyeff_c_ptr->execute();
+}
+
+bool dKyeff_IsDelete(dKyeff_c* dKyeff_c_ptr) {
+    return true;
+}
+
+bool dKyeff_Delete(dKyeff_c* dKyeff_c_ptr) {
+    dKyw_wether_delete();
+    return true;
+}
+/*
+const f32 lbl_80453E58 = 0.0f;
+const f32 lbl_80453E5C = 1.0f;
+const f64 lbl_80453E60 = 4.503601774854144E15; //int to float conversion thing
+const f32 lbl_80453E68 = 0.7f;
+const f32 lbl_80453E6C = 15.0f;
+*/
+
+#ifdef NONMATCHING  // matching but gameinfoplay struct is messed up
+u32 dKyeff_Create(kankyo_class* kankyo_class_ptr) {
+    int strcmp_result;
+    OSTime Time;
+    OSCalendarTime CalendarTime;
+
+    dKyw_wether_init();
+    strcmp_result = strcmp(dComIfGp_getStartStageName(), "Name");
+    if (strcmp_result == 0) {
+        Time = OSGetTime();
+        OSTicksToCalendarTime(
+            Time,
+            &CalendarTime);  // CONCAT44(iVar1,(int)((ulonglong)OVar2 >> 0x20)),&CalendarTime);
+        lbl_8042CA54.field_0xe48 = 1.0f;
+        lbl_8042CA54.field_0xe4c = 0.0f;
+        lbl_8042CA54.field_0xe50 = 0.0f;
+        lbl_8042CA54.field_0xe58 = 0.7f;
+        lbl_8042CA54.field_0x1244 = CalendarTime.hours * 15.0f;
+    }
+    return 4;
+}
+#else
+asm u32 dKyeff_Create(kankyo_class* kankyo_class_ptr) {
+    nofralloc
+#include "d/d_ky/d_kyeff/asm/func_801ADE00.s"
+}
+#endif

src/d/d_ky/d_kyeff2.cpp

@@ -1 +1,30 @@
-// ok
+#include "d/d_ky/d_kyeff2/d_kyeff2.h"
+#include "global.h"
+
+bool dKyeff2_Draw(dKyeff2_c* p_dKyeff2_c) {
+    dKyw_wether_draw2();
+    return true;
+}
+
+bool dKyeff2_c::execute(void) {
+    dKyw_wether_move_draw2();
+    return true;
+}
+
+bool dKyeff2_Execute(dKyeff2_c* p_dKyeff2_c) {
+    return p_dKyeff2_c->execute();
+}
+
+bool dKyeff2_IsDelete(dKyeff2_c* p_dKyeff2_c) {
+    return true;
+}
+
+bool dKyeff2_Delete(dKyeff2_c* p_dKyeff2_c) {
+    dKyw_wether_delete2();
+    return true;
+}
+
+int dKyeff2_Create(kankyo_class* p_kankyo_class) {
+    dKyw_wether_init2();
+    return 4;
+}