d_timer / d_bright_check done (#2034)

* d_bright_check mostly fixed

* d_timer done

* remove asm

src/d/d_bright_check.cpp

@@ -1,400 +1,138 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_bright_check
-//
+/**
+ * d_bright_check.cpp
+ *
+ */
 
 #include "d/d_bright_check.h"
-#include "dol2asm.h"
-#include "d/msg/d_msg_string.h"
-#include "m_Do/m_Do_controller_pad.h"
-#include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
+#include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JKernel/JKRArchive.h"
+#include "d/msg/d_msg_string.h"
+#include "m_Do/m_Do_controller_pad.h"
 
-//
-// Types:
-//
-
-struct dDlst_BrightCheck_c 
-#ifdef NONMATCHING
-: public dDlst_base_c 
-#endif
-{
-    #ifdef NONMATCHING
-    /* 801935D0 */ virtual void draw();
-    /* 80193648 */ virtual ~dDlst_BrightCheck_c() {};
-    #else
-    /* 801935D0 */ void draw();
-    /* 80193648 */ ~dDlst_BrightCheck_c();
-    void* vtable;
-    #endif
-    J2DScreen* mScreen;
-};
-
-struct dBrightCheck_c {
-    /* 80192F10 */ dBrightCheck_c(JKRArchive*);
-    #ifdef NONMATCHING
-    /* 80192F98 */ virtual ~dBrightCheck_c();
-    #else
-    void * vtable;
-    /* 80192F98 */ ~dBrightCheck_c();
-    #endif
-    /* 80193030 */ void screenSet();
-    /* 801934D0 */ void _move();
-    /* 80193508 */ void modeWait();
-    /* 8019350C */ void modeMove();
-    /* 80193594 */ void _draw();
-    
-    /* 0x04 */ JKRArchive* mArchive;
-    /* 0x08 */ dDlst_BrightCheck_c mDlstBrightCheck;
-    /* 0x10 */ u8 field_0x10[4];
-    /* 0x14 */ dMsgString_c* mMsgString;
-    /* 0x18 */ u8 field_0x18;
-    /* 0x19 */ u8 field_0x19;
-};
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__14dBrightCheck_cFP10JKRArchive();
-extern "C" void __dt__14dBrightCheck_cFv();
-extern "C" void screenSet__14dBrightCheck_cFv();
-extern "C" void _move__14dBrightCheck_cFv();
-extern "C" void modeWait__14dBrightCheck_cFv();
-extern "C" void modeMove__14dBrightCheck_cFv();
-extern "C" void _draw__14dBrightCheck_cFv();
-extern "C" void draw__19dDlst_BrightCheck_cFv();
-extern "C" void __sinit_d_bright_check_cpp();
-extern "C" void __dt__19dDlst_BrightCheck_cFv();
-extern "C" extern char const* const d_d_bright_check__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" void mDoExt_getMesgFont__Fv();
-extern "C" void mDoExt_getRubyFont__Fv();
-extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
-extern "C" void __ct__12dMsgString_cFv();
-extern "C" void __dt__12dMsgString_cFv();
-extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void __ct__9J2DScreenFv();
-extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
-extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
-extern "C" void setString__10J2DTextBoxFsPCce();
-extern "C" void __ptmf_scall();
-extern "C" void _savegpr_22();
-extern "C" void _restgpr_22();
-extern "C" extern void* __vt__12dDlst_base_c[3];
-extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
-extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
 /* 803BB5B0-803BB5BC 0186D0 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
+static u8 cNullVec__6Z2Calc[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-typedef void (dBrightCheck_c::*BrightCheckFunc)();
-
-#ifdef NONMATCHING
-SECTION_DATA static BrightCheckFunc brightChackProc[2] = {
-    &dBrightCheck_c::modeWait, &dBrightCheck_c::modeMove, 
-};
-#else
-/* 803BB5BC-803BB5C8 -00001 000C+00 0/1 0/0 0/0 .data            @3797 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3797[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)modeWait__14dBrightCheck_cFv,
-};
-#pragma pop
-
-/* 803BB5C8-803BB5D4 -00001 000C+00 0/1 0/0 0/0 .data            @3798 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3798[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)modeMove__14dBrightCheck_cFv,
-};
-#pragma pop
-
 /* 803BB5D4-803BB5EC 0186F4 0018+00 1/2 0/0 0/0 .data            brightChackProc */
-SECTION_DATA static u8 brightChackProc[24] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+typedef void (dBrightCheck_c::*procFunc)();
+static procFunc brightChackProc[] = {
+    &dBrightCheck_c::modeWait,
+    &dBrightCheck_c::modeMove,
 };
 
-/* 803BB5EC-803BB5FC 01870C 0010+00 3/3 0/0 0/0 .data            __vt__19dDlst_BrightCheck_c */
-SECTION_DATA extern void* __vt__19dDlst_BrightCheck_c[4] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)draw__19dDlst_BrightCheck_cFv,
-    (void*)__dt__19dDlst_BrightCheck_cFv,
-};
-
-/* 803BB5FC-803BB618 01871C 000C+10 2/2 0/0 0/0 .data            __vt__14dBrightCheck_c */
-SECTION_DATA extern void* __vt__14dBrightCheck_c[3 + 4 /* padding */] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__14dBrightCheck_cFv,
-    /* padding */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-};
-
-#endif
-
 /* 80192F10-80192F98 18D850 0088+00 0/0 1/1 0/0 .text __ct__14dBrightCheck_cFP10JKRArchive */
-// Matches without vtables
-#ifdef NONMATCHING
-dBrightCheck_c::dBrightCheck_c(JKRArchive* param_0) {
-    mArchive = param_0;
-    mMsgString = new dMsgString_c();
+dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) {
+    mArchive = i_archive;
+    mBrightCheck.mMsgString = new dMsgString_c();
+    JUT_ASSERT(mBrightCheck.mMsgString != 0);
+
     screenSet();
-    field_0x19 = 0;
-    field_0x18 = 1;
+    mCompleteCheck = false;
+    mMode = MODE_MOVE_e;
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm dBrightCheck_c::dBrightCheck_c(JKRArchive* param_0) {
-    nofralloc
-#include "asm/d/d_bright_check/__ct__14dBrightCheck_cFP10JKRArchive.s"
-}
-#pragma pop
-#endif
 
 /* 80192F98-80193030 18D8D8 0098+00 1/0 0/0 0/0 .text            __dt__14dBrightCheck_cFv */
-#ifdef NONMATCHING
 dBrightCheck_c::~dBrightCheck_c() {
-    delete mDlstBrightCheck.mScreen; 
-    delete mMsgString;
+    delete mBrightCheck.Scr;
+    delete mBrightCheck.mMsgString;
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm dBrightCheck_c::~dBrightCheck_c() {
-    nofralloc
-#include "asm/d/d_bright_check/__dt__14dBrightCheck_cFv.s"
-}
-#pragma pop
-#endif
-
-/* ############################################################################################## */
-/* 80394910-80394938 020F70 0028+00 1/1 0/0 0/0 .rodata          tv_btnA$3744 */
-SECTION_RODATA static u64 const tv_btnA[5] = {
-    'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at',
-};
-COMPILER_STRIP_GATE(0x80394910, &tv_btnA);
-
-/* 80394938-80394960 020F98 0028+00 0/1 0/0 0/0 .rodata          ftv_btnA$3745 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u64 const ftv_btnA[5] = {
-    'font_a1', 'font_at2', 'font_at3' , 'font_at4', 'font_at',
-};
-COMPILER_STRIP_GATE(0x80394938, &ftv_btnA);
-#pragma pop
-
-/* 80394960-803949B0 020FC0 0050+00 0/1 0/0 0/0 .rodata          txTV$3751 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u64 const txTV[10] = {
-    'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101', 'menu_t01', 'menu_t71',
-    'menu_t3', 'menu_t81', 'menu_t4',
-};
-COMPILER_STRIP_GATE(0x80394960, &txTV);
-#pragma pop
-
-/* 803949B0-803949D8 021010 0028+00 0/1 0/0 0/0 .rodata          txTVhide$3752 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u64 const txTVhide[5] = {
-    'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n',
-};
-COMPILER_STRIP_GATE(0x803949B0, &txTVhide);
-#pragma pop
-
-/* 803949D8-803949D8 021038 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_803949D8 = "zelda_option_check.blo";
-SECTION_DEAD static char const* const stringBase_803949EF = "";
-#pragma pop
-
-/* 80453A00-80453A04 002000 0004+00 2/2 0/0 0/0 .sdata2          @3792 */
-SECTION_SDATA2 static u8 lit_3792[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
 
 /* 80193030-801934D0 18D970 04A0+00 1/1 0/0 0/0 .text            screenSet__14dBrightCheck_cFv */
-// matches with literals
-#ifdef NONMATCHING
 void dBrightCheck_c::screenSet() {
-    mDlstBrightCheck.mScreen = new J2DScreen();
-    mDlstBrightCheck.mScreen->setPriority("zelda_option_check.blo", 0x1100000, mArchive);
-    mDlstBrightCheck.mScreen->search('g_abtn_n')->hide();
-    J2DTextBox* textBox = (J2DTextBox*)mDlstBrightCheck.mScreen->search('f_t00');
-    mDlstBrightCheck.mScreen->search('f_t00')->show();
-    mDlstBrightCheck.mScreen->search('t_t00')->hide();
-    textBox->setFont(mDoExt_getRubyFont());
-    textBox->setString(0x40, "");
-    mMsgString->getString(0x55c, textBox, NULL, NULL, NULL, 0);
+    static u64 const tv_btnA[] = {
+        'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at',
+    };
 
-    J2DTextBox* texts[5];
+    static u64 const ftv_btnA[] = {
+        'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at',
+    };
+
+    static u64 const txTV[] = {
+        'menu_t61', 'menu_t2',  'menu_t91', 'menu_t1',  'menut101',
+        'menu_t01', 'menu_t71', 'menu_t3',  'menu_t81', 'menu_t4',
+    };
+
+    static u64 const txTVhide[] = {
+        'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n',
+    };
+
+    mBrightCheck.Scr = new J2DScreen();
+    JUT_ASSERT(mBrightCheck.Scr != 0);
+    mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive);
+
+    mBrightCheck.Scr->search('g_abtn_n')->hide();
+    J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('f_t00');
+    mBrightCheck.Scr->search('f_t00')->show();
+    mBrightCheck.Scr->search('t_t00')->hide();
+
+    settings_text->setFont(mDoExt_getRubyFont());
+    settings_text->setString(0x40, "");
+    mBrightCheck.mMsgString->getString(0x55C, settings_text, NULL, NULL, NULL, 0);  // "TV Settings"
+
+    J2DTextBox* btna_text[5];
     for (int i = 0; i < 5; i++) {
-        texts[i] = (J2DTextBox*)mDlstBrightCheck.mScreen->search(ftv_btnA[i]);
-        mDlstBrightCheck.mScreen->search(tv_btnA[i])->hide();
-        texts[i]->setFont(mDoExt_getMesgFont());
-        texts[i]->setString(0x40, "");
-        mMsgString->getString(0x564, texts[i], NULL, NULL, NULL, 0);
+        btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(ftv_btnA[i]);
+        mBrightCheck.Scr->search(tv_btnA[i])->hide();
+        btna_text[i]->setFont(mDoExt_getMesgFont());
+        btna_text[i]->setString(0x40, "");
+        mBrightCheck.mMsgString->getString(0x564, btna_text[i], NULL, NULL, NULL, 0);  // "Complete"
     }
 
     for (int i = 0; i < 5; i++) {
-        mDlstBrightCheck.mScreen->search(txTVhide[i])->hide();
+        mBrightCheck.Scr->search(txTVhide[i])->hide();
     }
 
     for (int i = 0; i < 10; i++) {
-        textBox = (J2DTextBox*)mDlstBrightCheck.mScreen->search(txTV[i]);
-        textBox->setFont(mDoExt_getMesgFont());
-        textBox->setCharSpace(0.0f);
+        J2DTextBox* check_text = (J2DTextBox*)mBrightCheck.Scr->search(txTV[i]);
+        check_text->setFont(mDoExt_getMesgFont());
+        check_text->setCharSpace(0.0f);
 
         if (i < 2) {
-            textBox->setString(0x100, "");
-            mMsgString->getString(0x558, textBox, NULL, NULL, NULL, 0);
+            check_text->setString(0x100, "");
+            mBrightCheck.mMsgString->getString(0x558, check_text, NULL, NULL, NULL, 0);
         } else if (i < 4) {
-            textBox->setString(0x100, "");
-            mMsgString->getString(0x557, textBox, NULL, NULL, NULL, 0);
+            check_text->setString(0x100, "");
+            mBrightCheck.mMsgString->getString(0x557, check_text, NULL, NULL, NULL, 0);
         } else if (i < 6) {
-            textBox->setString(0x100, "");
-            mMsgString->getString(0x559, textBox, NULL, NULL, NULL, 0);
+            check_text->setString(0x100, "");
+            mBrightCheck.mMsgString->getString(0x559, check_text, NULL, NULL, NULL, 0);
         } else if (i < 8) {
-            textBox->setString(0x100, "");
-            mMsgString->getString(0x55a, textBox, NULL, NULL, NULL, 0);
+            check_text->setString(0x100, "");
+            mBrightCheck.mMsgString->getString(0x55A, check_text, NULL, NULL, NULL, 0);
         } else {
-            textBox->setString(0x100, "");
-            mMsgString->getString(0x55b, textBox, NULL, NULL, NULL, 0);
+            check_text->setString(0x100, "");
+            mBrightCheck.mMsgString->getString(0x55B, check_text, NULL, NULL, NULL, 0);
         }
     }
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dBrightCheck_c::screenSet() {
-    nofralloc
-#include "asm/d/d_bright_check/screenSet__14dBrightCheck_cFv.s"
-}
-#pragma pop
-#endif
 
 /* 801934D0-80193508 18DE10 0038+00 0/0 1/1 0/0 .text            _move__14dBrightCheck_cFv */
 void dBrightCheck_c::_move() {
-    (this->*(((BrightCheckFunc*)brightChackProc)[field_0x18]))();
+    (this->*brightChackProc[mMode])();
 }
 
 /* 80193508-8019350C 18DE48 0004+00 1/0 0/0 0/0 .text            modeWait__14dBrightCheck_cFv */
-void dBrightCheck_c::modeWait() {
-    /* empty function */
-}
-
-/* ############################################################################################## */
-/* 80453A04-80453A08 002004 0004+00 1/1 0/0 0/0 .sdata2          @3821 */
-SECTION_SDATA2 static f32 lit_3821 = 1.0f;
-
-/* 80453A08-80453A10 002008 0004+04 1/1 0/0 0/0 .sdata2          @3822 */
-SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = {
-    -1.0f,
-    /* padding */
-    0.0f,
-};
+void dBrightCheck_c::modeWait() {}
 
 /* 8019350C-80193594 18DE4C 0088+00 1/0 0/0 0/0 .text            modeMove__14dBrightCheck_cFv */
 void dBrightCheck_c::modeMove() {
     if (mDoCPd_c::getTrigA(PAD_1) || mDoCPd_c::getTrigStart(PAD_1)) {
-        mDoAud_seStart(1, 0, 0, 0);
-        field_0x19 = 1;
-        field_0x18 = 0;
+        mDoAud_seStart(Z2SE_ENTER_GAME, NULL, 0, 0);
+        mCompleteCheck = true;
+        mMode = MODE_WAIT_e;
     }
 }
 
 /* 80193594-801935D0 18DED4 003C+00 0/0 1/1 0/0 .text            _draw__14dBrightCheck_cFv */
-// Matches with mDlstBrightCheck inheritance
-#ifdef NONMATCHING
 void dBrightCheck_c::_draw() {
-    dComIfGd_set2DOpa(&mDlstBrightCheck);
+    dComIfGd_set2DOpa(&mBrightCheck);
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dBrightCheck_c::_draw() {
-    nofralloc
-#include "asm/d/d_bright_check/_draw__14dBrightCheck_cFv.s"
-}
-#pragma pop
-#endif
 
 /* 801935D0-80193608 18DF10 0038+00 1/0 0/0 0/0 .text            draw__19dDlst_BrightCheck_cFv */
-// Matches with literals
-#ifdef NONMATCHING
 void dDlst_BrightCheck_c::draw() {
-    J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
-    mScreen->draw(0.0f, 0.0f, grafContext);
+    J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
+    Scr->draw(0.0f, 0.0f, graf_ctx);
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dDlst_BrightCheck_c::draw() {
-    nofralloc
-#include "asm/d/d_bright_check/draw__19dDlst_BrightCheck_cFv.s"
-}
-#pragma pop
-#endif
-
-/* 80193608-80193648 18DF48 0040+00 0/0 1/0 0/0 .text            __sinit_d_bright_check_cpp */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void __sinit_d_bright_check_cpp() {
-    nofralloc
-#include "asm/d/d_bright_check/__sinit_d_bright_check_cpp.s"
-}
-#pragma pop
-
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x80193608, __sinit_d_bright_check_cpp);
-#pragma pop
-
-/* 80193648-80193690 18DF88 0048+00 1/0 0/0 0/0 .text            __dt__19dDlst_BrightCheck_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm dDlst_BrightCheck_c::~dDlst_BrightCheck_c() {
-    nofralloc
-#include "asm/d/d_bright_check/__dt__19dDlst_BrightCheck_cFv.s"
-}
-#pragma pop
-
-/* 803949D8-803949D8 021038 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */

src/d/meter/d_meter_HIO.cpp

@@ -474,80 +474,80 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() {
 /* 801FEFF0-801FF31C 1F9930 032C+00 1/1 0/0 0/0 .text            __ct__24dMeter_drawMiniGameHIO_cFv
  */
 dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() {
-    field_0x8 = 1.0f;
-    field_0x14 = 0.0f;
-    field_0x20 = 0.0f;
-    field_0x2c = 1.0f;
+    field_0x8[0] = 1.0f;
+    field_0x14[0] = 0.0f;
+    field_0x20[0] = 0.0f;
+    field_0x2c[0] = 1.0f;
 
-    mGoatTimerSizeX = 1.2f;
-    mGoatTimerSizeY = 0.9f;
-    mGoatTimerPosX = 207.0f;
-    mGoatTimerPosY = -43.0f;
-    mGoatTimerAlpha = 0.5f;
-    mGoatTimerSizeX_4x3 = 1.2f;
-    mGoatTimerSizeY_4x3 = 0.9f;
-    mGoatTimerPosX_4x3 = 207.0f;
-    mGoatTimerPosY_4x3 = -43.0f;
+    mTimerSizeX[0] = 1.2f;
+    mTimerSizeY[0] = 0.9f;
+    mTimerPosX[0] = 207.0f;
+    mTimerPosY[0] = -43.0f;
+    mTimerAlpha[0] = 0.5f;
+    mTimerSizeX_4x3 = 1.2f;
+    mTimerSizeY_4x3 = 0.9f;
+    mTimerPosX_4x3 = 207.0f;
+    mTimerPosY_4x3 = -43.0f;
 
-    mGoatCounterSizeX = 1.1f;
-    mGoatCounterSizeY = 0.9f;
-    mGoatCounterPosX = 17.0f;
-    mGoatCounterPosY = 317.0f;
-    mGoatCounterAlpha = 0.7f;
+    mCounterSizeX[0] = 1.1f;
+    mCounterSizeY[0] = 0.9f;
+    mCounterPosX[0] = 17.0f;
+    mCounterPosY[0] = 317.0f;
+    mCounterAlpha[0] = 0.7f;
 
-    mGoatIconSizeX = 0.75f;
-    mGoatIconSizeY = 0.75f;
-    mGoatIconPosX = -275.0f;
-    mGoatIconPosX_4x3 = -275.0f;
-    mGoatIconPosY = 76.0f;
-    mGoatIconAlpha = 0.9f;
+    mIconSizeX[0] = 0.75f;
+    mIconSizeY[0] = 0.75f;
+    mIconPosX[0] = -275.0f;
+    mIconPosX_4x3 = -275.0f;
+    mIconPosY[0] = 76.0f;
+    mIconAlpha[0] = 0.9f;
 
-    mRiverRideTargetCounterSizeY = 1.0f;
-    mRiverRideTargetCounterPosX = -22.0f;
+    field_0x8[1] = 1.0f;
+    field_0x14[1] = -22.0f;
     mRiverRideIconPosX_4x3 = -30.0f;
-    mRiverRideTargetCounterPosY = 0.0f;
-    mRiverRideTargetCounterAlpha = 1.0f;
+    field_0x20[1] = 0.0f;
+    field_0x2c[1] = 1.0f;
 
-    field_0x3c = 1.4f;
-    field_0x48 = 1.0f;
-    field_0x54 = 198.0f;
-    field_0x60 = 160.0f;
-    field_0x6c = 0.5f;
+    mTimerSizeX[1] = 1.4f;
+    mTimerSizeY[1] = 1.0f;
+    mTimerPosX[1] = 198.0f;
+    mTimerPosY[1] = 160.0f;
+    mTimerAlpha[1] = 0.5f;
 
-    mRiverRideCounterSizeX = 1.1f;
-    mRiverRideCounterSizeY = 0.95f;
-    mRiverRideCounterPosX = 28.0f;
-    mRiverRideCounterPosY = -18.0f;
-    mRiverRideCounterAlpha = 0.7f;
+    mCounterSizeX[1] = 1.1f;
+    mCounterSizeY[1] = 0.95f;
+    mCounterPosX[1] = 28.0f;
+    mCounterPosY[1] = -18.0f;
+    mCounterAlpha[1] = 0.7f;
 
-    mRiverRideTargetIconSizeX = 0.9f;
-    mRiverRideTargetIconSizeY = 0.9f;
-    mRiverRideTargetIconPosX = 23.0f;
-    mRiverRideTargetIconPosY = -16.0f;
-    mRiverRideTargetIconAlpha = 0.9f;
+    mIconSizeX[1] = 0.9f;
+    mIconSizeY[1] = 0.9f;
+    mIconPosX[1] = 23.0f;
+    mIconPosY[1] = -16.0f;
+    mIconAlpha[1] = 0.9f;
 
-    field_0x10 = 1.0f;
-    field_0x1c = 0.0f;
-    field_0x28 = 0.0f;
-    field_0x34 = 1.0f;
-    field_0x40 = 1.4f;
-    field_0x4c = 1.0f;
-    field_0x58 = 198.0f;
-    field_0x64 = -30.0f;
-    field_0x70 = 0.5f;
+    field_0x8[2] = 1.0f;
+    field_0x14[2] = 0.0f;
+    field_0x20[2] = 0.0f;
+    field_0x2c[2] = 1.0f;
+    mTimerSizeX[2] = 1.4f;
+    mTimerSizeY[2] = 1.0f;
+    mTimerPosX[2] = 198.0f;
+    mTimerPosY[2] = -30.0f;
+    mTimerAlpha[2] = 0.5f;
 
-    mRiderGameCounterSizeX = 1.1f;
-    mRiderGameCounterSizeY = 0.95f;
-    mRiderGameCounterPosX = 267.0f;
-    mRiderGameCounterPosY = 288.0f;
-    mRiderGameCounterAlpha = 0.7f;
+    mCounterSizeX[2] = 1.1f;
+    mCounterSizeY[2] = 0.95f;
+    mCounterPosX[2] = 267.0f;
+    mCounterPosY[2] = 288.0f;
+    mCounterAlpha[2] = 0.7f;
 
-    mRiderGameIconSizeX = 0.75f;
-    mRiderGameIconSizeY = 0.75f;
-    mRiderGameIconPosX = -29.0f;
+    mIconSizeX[2] = 0.75f;
+    mIconSizeY[2] = 0.75f;
+    mIconPosX[2] = -29.0f;
     mRiderGameIconPosX_4x3 = -26.0f;
-    mRiderGameIconPosY = 50.0f;
-    mRiderGameIconAlpha = 0.9f;
+    mIconPosY[2] = 50.0f;
+    mIconAlpha[2] = 0.9f;
 
     mReadyGo = 60;
     field_0x15a = 10;

src/f_op/f_op_msg_mng.cpp

@@ -102,31 +102,30 @@ static fopMsg_prm_class* createAppend(fopAc_ac_c* i_actor, cXyz* i_pos, u32* i_m
 
 /* 8001FB50-8001FC4C 01A490 00FC+00 1/1 0/0 0/0 .text            createTimerAppend__FiUlUcUcffffUi
  */
-static fopMsg_prm_timer* createTimerAppend(int param_0, u32 param_1, u8 param_2, u8 param_3,
+static fopMsg_prm_timer* createTimerAppend(int i_mode, u32 i_limitMs, u8 i_type, u8 param_3,
                                            f32 param_4, f32 param_5, f32 param_6, f32 param_7,
                                            unsigned int param_8) {
-    fopMsg_prm_timer* timer = (fopMsg_prm_timer*)cMl::memalignB(-4, 0x38);
+    fopMsg_prm_timer* appen = (fopMsg_prm_timer*)cMl::memalignB(-4, sizeof(fopMsg_prm_timer));
 
-    if (timer == NULL) {
-        timer = NULL;
+    if (appen == NULL) {
+        appen = NULL;
     } else {
-        timer->field_0x0 = 0;
-        timer->field_0x10 = 0;
-        timer->field_0x14 = 0;
-        cXyz pos(FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902));
-        timer->field_0x4 = pos;
-        timer->field_0x18 = param_8;
-        timer->field_0x1c = param_0;
-        timer->field_0x20 = param_1;
-        timer->field_0x24 = param_2;
-        timer->field_0x25 = param_3;
-        timer->field_0x28 = param_4;
-        timer->field_0x2c = param_5;
-        timer->field_0x30 = param_6;
-        timer->field_0x34 = param_7;
+        appen->mpActor = 0;
+        appen->mMsgID = 0;
+        appen->field_0x14 = 0;
+        appen->mPos = cXyz(FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902));
+        appen->field_0x18 = param_8;
+        appen->timer_mode = i_mode;
+        appen->limit_ms = i_limitMs;
+        appen->type = i_type;
+        appen->field_0x25 = param_3;
+        appen->field_0x28 = param_4;
+        appen->field_0x2c = param_5;
+        appen->field_0x30 = param_6;
+        appen->field_0x34 = param_7;
     }
 
-    return timer;
+    return appen;
 }
 
 /* 8001FC4C-8001FCC0 01A58C 0074+00 0/0 1/1 0/0 .text
@@ -143,16 +142,16 @@ s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3
 }
 
 /* 8001FCC0-8001FD34 01A600 0074+00 0/0 2/2 0/0 .text fop_Timer_create__FsUcUlUcUcffffPFPv_i */
-s32 fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5,
-                     f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc) {
-    fopMsg_prm_timer* timer_prm = createTimerAppend(param_1, param_2, param_3, param_4, param_5,
+s32 fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, f32 param_5,
+                     f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc i_createFunc) {
+    fopMsg_prm_timer* timer_prm = createTimerAppend(i_mode, i_limitMs, i_type, param_4, param_5,
                                                     param_6, param_7, param_8, -1);
 
     if (timer_prm == NULL) {
         return -1;
     }
 
-    return fpcSCtRq_Request(fpcLy_CurrentLayer(), param_0, (stdCreateFunc)createFunc, NULL,
+    return fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, (stdCreateFunc)i_createFunc, NULL,
                             timer_prm);
 }