diff --git a/configure.py b/configure.py index 9b139f2aa..a736a6bcf 100644 --- a/configure.py +++ b/configure.py @@ -346,7 +346,7 @@ config.libs = [ Object(Matching, "d/d_chain.cpp"), Object(NonMatching, "d/d_cloth_packet.cpp"), Object(NonMatching, "d/d_a_obj.cpp"), - Object(NonMatching, "d/d_a_obj_tribox_static.cpp"), + Object(Matching, "d/d_a_obj_tribox_static.cpp"), Object(Matching, "d/d_a_ship_static.cpp"), Object(Matching, "d/d_a_boko_static.cpp"), Object(Matching, "d/d_a_bomb_static.cpp"), diff --git a/include/d/actor/d_a_obj_tribox.h b/include/d/actor/d_a_obj_tribox.h index 28e5c8b43..b51ebaa51 100644 --- a/include/d/actor/d_a_obj_tribox.h +++ b/include/d/actor/d_a_obj_tribox.h @@ -78,7 +78,16 @@ namespace daObjTribox { void execute_correct(); BOOL _execute(); BOOL _draw(); - + + static void reset(); + + static cXyz M_sound_pos; + static int M_correct_cnt; + static bool M_correct_flag; + static int M_b_cont_cnt; + static int M_c_cont_cnt; + static u8 M_sink_start; + public: /* Place member variables here */ }; diff --git a/src/d/d_a_obj_tribox_static.cpp b/src/d/d_a_obj_tribox_static.cpp index 8299e9da5..cf3be139f 100644 --- a/src/d/d_a_obj_tribox_static.cpp +++ b/src/d/d_a_obj_tribox_static.cpp @@ -3,11 +3,21 @@ // Translation Unit: d_a_obj_tribox_static.cpp // -#include "d/actor/d_a_obj_tribox_static.h" -#include "dolphin/types.h" +#include "d/actor/d_a_obj_tribox.h" + +cXyz daObjTribox::Act_c::M_sound_pos; +int daObjTribox::Act_c::M_correct_cnt; +bool daObjTribox::Act_c::M_correct_flag; +int daObjTribox::Act_c::M_b_cont_cnt; +int daObjTribox::Act_c::M_c_cont_cnt; +u8 daObjTribox::Act_c::M_sink_start; /* 80067D1C-80067D5C .text reset__Q211daObjTribox5Act_cFv */ void daObjTribox::Act_c::reset() { - /* Nonmatching */ + M_correct_cnt = 0; + M_correct_flag = false; + M_b_cont_cnt = 0; + M_c_cont_cnt = 0; + M_sink_start = 0; + M_sound_pos = cXyz::Zero; } -