Merge pull request #279 from robojumper/d_lyt_mini_game

d_lyt_mini_game

Author: robojumper

config/SOUE01/splits.txt

@@ -1618,9 +1618,11 @@ d/lyt/d_lyt_enemy_icon.cpp:
 
 d/lyt/d_lyt_mini_game.cpp:
 	.text       start:0x8028BCE0 end:0x802969E0 align:16
-	.rodata     start:0x804EE790 end:0x804EEB68
+	.rodata     start:0x804EE7D8 end:0x804EEB68
 	.data       start:0x80538E58 end:0x80539B68
+	.sdata      start:0x80573B88 end:0x80573BB0
 	.sbss       start:0x80575970 end:0x80575990
+	.sdata2     start:0x8057C700 end:0x8057C760
 
 d/lyt/d_lyt_meter_suiryu_score.cpp:
 	.text       start:0x802969E0 end:0x8029C2C8 align:16

config/SOUE01/symbols.txt

@@ -53,6 +53,7 @@ class dAcItem_c : public dAcItemBase_c {
         return checkFlag(flag);
     }
     static void setFlag(s32 id);
+    static bool checkTreasureTempCollect(u16 itemId);
 
     void setItemPosition(const mVec3_c &);
     void getItemFromBWheelItem();

include/d/a/d_a_item.h

@@ -202,6 +202,20 @@ class dFlow_c : dFlowBase_c {
 };
 
 class dMessage_c : public dBase_c {
+public:
+    enum Minigame_e {
+        MG_THRILL_DIGGER = 0,
+        MG_BAMBOO_CUTTING,
+        MG_INSECT_CAPTURE,
+        MG_ROLLERCOASTER,
+        MG_PUMPKIN_ARCHERY,
+        MG_FUN_FUN_ISLAND,
+        MG_TRIAL_TIME_ATTACK,
+        MG_BOSS_RUSH,
+
+        MG_NONE,
+    };
+
 public:
     dMessage_c();
     virtual ~dMessage_c() {
@@ -276,23 +290,23 @@ class dMessage_c : public dBase_c {
     }
 
     void setMiniGameVariant(s32 v) {
-        mMiniGameVariant = v;
+        mMinigameVariant = v;
     }
 
     s32 getMiniGameVariant() const {
-        return mMiniGameVariant;
+        return mMinigameVariant;
     }
 
     void setField_0x344(s32 v) {
         field_0x344 = v;
     }
 
-    u8 getField_0x340() const {
-        return field_0x340;
+    bool hasSetMinigameResult() const {
+        return mHasSetMinigameResult;
     }
 
-    void setField_0x340(u8 v) {
-        field_0x340 = v;
+    void setHasSetMinigameResult(bool v) {
+        mHasSetMinigameResult = v;
     }
 
     static bool isValidTextLabel(const char *name);
@@ -376,8 +390,8 @@ class dMessage_c : public dBase_c {
 
     /* 0x334 */ u32 mMinigameResultPoints;
     /* 0x338 */ u32 mMinigameTime;
-    /* 0x33C */ s32 mMiniGameVariant;
-    /* 0x340 */ u8 field_0x340;
+    /* 0x33C */ s32 mMinigameVariant;
+    /* 0x340 */ bool mHasSetMinigameResult;
     /* 0x344 */ s32 field_0x344;
 };
 

include/d/d_message.h

@@ -11,6 +11,7 @@
 #include "f/f_profile_name.h"
 #include "m/m2d.h"
 #include "m/m_angle.h"
+#include "m/m_fader_base.h"
 #include "m/m_vec.h"
 #include "s/s_FPhase.h"
 #include "s/s_State.hpp"
@@ -210,6 +211,14 @@ class dScGame_c : public dScene_c {
         return mFader.isSettled();
     }
 
+    bool isFadingOut() const {
+        return mFader.isStatus(mFaderBase_c::FADING_OUT);
+    }
+
+    bool isFadingIn() const {
+        return mFader.isStatus(mFaderBase_c::FADING_IN);
+    }
+
     f32 targetingScreenFn_801BBEC0() const {
         return mScreen1.fn_801BBEC0();
     }

include/d/d_sc_game.h

@@ -11,6 +11,7 @@
 #include "egg/gfx/eggScreen.h"
 #include "m/m_allocator.h"
 #include "m/m_dvd.h"
+#include "m/m_fader_base.h"
 #include "nw4r/g3d/g3d_camera.h"
 #include "s/s_FPhase.h"
 #include "s/s_State.hpp"
@@ -176,6 +177,10 @@ class dStageMgr_c : public dBase_c {
         return mFader.isSettled();
     }
 
+    bool isFadingOut() const {
+        return mFader.isStatus(mFaderBase_c::FADING_OUT);
+    }
+
     bool isInLastBoss() const {
         return mIsInLastBoss;
     }

include/d/d_stage_mgr.h

@@ -5,6 +5,7 @@
 #include "m/m2d.h"
 #include "nw4r/lyt/lyt_pane.h"
 #include "nw4r/lyt/lyt_picture.h"
+#include "nw4r/lyt/lyt_types.h"
 
 class dTextBox_c;
 class dWindow_c;
@@ -260,6 +261,11 @@ struct AnmGroupBase_c {
         return (mFlags & ANMGROUP_FLAG_ENABLE) != 0;
     }
 
+    // Not sure
+    inline u8 isEnabled_() const {
+        return (mFlags & ANMGROUP_FLAG_ENABLE);
+    }
+
     inline bool isStop() const {
         return mpFrameCtrl->isStop();
     }