Cool menu

Author: kiwi515

base/symbols_resort.txt

@@ -3649,7 +3649,13 @@ spInstance__17RPSysSystemWinMgr=0x806f4cd0
 updatePauseClosed__17RPSysSystemWinMgrFv=0x80234d58
 sActiveScreen__13RPGrpRenderer=0x807cef2c
 
-setStaticVar__Q33Sp23Cmn9StaticMemFiib=0x80269f08
+setVariable__Q33Sp23Cmn9StaticMemFUlUlb=0x80269f08
+setSceneGroup__Q33Sp23Cmn9StaticMemFUl=0x8026a334
+setSceneSeq__Q33Sp23Cmn9StaticMemFUl=0x8026a32c
+spInstance__Q33Sp23Cmn7GameMgr=0x806f4cd8
+writeDebugPlayerData__Q33Sp23Cmn7GameMgrFv=0x8023568c
+setPlayerNum__Q33Sp23Cmn7GameMgrFi=0x80235684
+setControllerNum__Q33Sp23Cmn7GameMgrFi=0x8023562c
 
 setTimer__Q43Sp23Bsk3Lyt4MainFUlUl=0x80533a78
 setType__Q33Sp23Bsk4BallFQ43Sp23Bsk4Ball5EType=0x804ffa44

include/Sports2/Cmn/Sp2CmnGameMgr.h

@@ -0,0 +1,25 @@
+#ifndef SPORTS2_CMN_GAME_MGR_H
+#define SPORTS2_CMN_GAME_MGR_H
+#include <Pack/RPSystem.h>
+#include <Sports2/Sp2Types.h>
+
+namespace Sp2 {
+namespace Cmn {
+
+class GameMgr {
+    RP_SINGLETON_DECL(GameMgr);
+
+public:
+    void setPlayerNum(int num);
+    void setControllerNum(int num);
+
+    void writeDebugPlayerData();
+
+private:
+    ;
+};
+
+} // namespace Cmn
+} // namespace Sp2
+
+#endif

include/Sports2/Cmn/Sp2CmnStaticMem.h

@@ -10,12 +10,18 @@ class StaticMem {
     RP_SINGLETON_DECL(StaticMem);
 
 public:
-    int getStaticVar(int var, bool absolute);
-    void setStaticVar(int var, int value, bool absolute);
+    u32 getVariable(u32 index, bool local = false);
+    void setVariable(u32 index, u32 value, bool local = false);
 
-    u32 getSequence() const {
-        return mSequence;
+    u32 getSceneSeq() const {
+        return mSequenceNo;
     }
+    void setSceneSeq(u32 seq);
+
+    u32 getSceneGroup() const {
+        return mGroupNo;
+    }
+    void setSceneGroup(u32 group);
 
     RPSysScene::ETime getIslandTime() const {
         return mIslandTime;
@@ -25,8 +31,9 @@ class StaticMem {
     }
 
 private:
-    char _04[0x14];
-    u32 mSequence; // at 0x18
+    char _04[0x14 - 0x4];
+    u32 mGroupNo;    // at 0x14
+    u32 mSequenceNo; // at 0x18
     char _1C[0x380 - 0x1C];
     RPSysScene::ETime mIslandTime; // at 0x380
 };

include/Sports2/Sp2Cmn.h

@@ -3,6 +3,7 @@
 
 #include <Sports2/Cmn/Sp2CmnConst.h>
 #include <Sports2/Cmn/Sp2CmnController.h>
+#include <Sports2/Cmn/Sp2CmnGameMgr.h>
 #include <Sports2/Cmn/Sp2CmnModel.h>
 #include <Sports2/Cmn/Sp2CmnSeqModel.h>
 #include <Sports2/Cmn/Sp2CmnStaticMem.h>

lib/libkiwi/core/kiwiSceneCreator.cpp

@@ -54,7 +54,7 @@ const SceneCreator::Info SceneCreator::scPackScenes[] = {
     {nullptr, "Fld(Frisbee)",                 "FldScene/",             kiwi::ESceneID_Sp2FldScene,             true,  kiwi::EGroupID_Fld,   kiwi::EPackID_SportsPack, kiwi::ECreateType_Standard, kiwi::EExitType_Standard, true},
     {nullptr, "Bsk(Basket)",                  "BskScene/",             kiwi::ESceneID_Sp2BskScene,             true,  kiwi::EGroupID_Bsk,   kiwi::EPackID_SportsPack, kiwi::ECreateType_Standard, kiwi::EExitType_Standard, true},
     {nullptr, "Bwl(Bowling)",                 "BwlScene/",             kiwi::ESceneID_Sp2BwlScene,             true,  kiwi::EGroupID_Bwl,   kiwi::EPackID_SportsPack, kiwi::ECreateType_Standard, kiwi::EExitType_Standard, true},
-    {nullptr, "Can(Kata)",                    "CanScene/",             kiwi::ESceneID_Sp2CanScene,             true,  kiwi::EGroupID_Can,   kiwi::EPackID_SportsPack, kiwi::ECreateType_Standard, kiwi::EExitType_Standard, true},
+    {nullptr, "Can(Canoe)",                   "CanScene/",             kiwi::ESceneID_Sp2CanScene,             true,  kiwi::EGroupID_Can,   kiwi::EPackID_SportsPack, kiwi::ECreateType_Standard, kiwi::EExitType_Standard, true},
     {nullptr, "Png(PingPong)",                "PngScene/",             kiwi::ESceneID_Sp2PngScene,             true,  kiwi::EGroupID_Png,   kiwi::EPackID_SportsPack, kiwi::ECreateType_Standard, kiwi::EExitType_Standard, true},
     {nullptr, "Wkb(Wakeboard)",               "JskScene/",             kiwi::ESceneID_Sp2WkbScene,             true,  kiwi::EGroupID_Wkb,   kiwi::EPackID_SportsPack, kiwi::ECreateType_Standard, kiwi::EExitType_Standard, true},
     {nullptr, "Pln(Plane)",                   "PlnScene/",             kiwi::ESceneID_Sp2PlnScene,             true,  kiwi::EGroupID_Pln,   kiwi::EPackID_SportsPack, kiwi::ECreateType_Standard, kiwi::EExitType_Standard, true},

lib/libkiwi/debug/kiwiDebugMenu.cpp

@@ -8,16 +8,6 @@ namespace kiwi {
  *
  ******************************************************************************/
 
-/**
- * @brief Opens a new menu page
- *
- * @param rPage Menu page
- */
-void DebugMenu::OpenPage(DebugPage& rPage) {
-    rPage.SetParent(*this);
-    mPageStack.Push(&rPage);
-}
-
 /**
  * @brief Updates the menu state
  * @return Result of actions
@@ -29,12 +19,12 @@ EDebugMenuResult DebugMenu::Calculate() {
 
     EDebugMenuResult result = mPageStack.Top().Calculate();
 
-    if (result == EDebugMenuResult_Close) {
-        // Can't close the root page
+    if (result == EDebugMenuResult_Back) {
         if (mPageStack.Size() > 1) {
             mPageStack.Pop();
         } else {
-            result = EDebugMenuResult_Invalid;
+            // Can't close the root page
+            result = EDebugMenuResult_Exit;
         }
     }
 
@@ -58,30 +48,18 @@ void DebugMenu::UserDraw() {
  *
  ******************************************************************************/
 
-/**
- * @brief Appends a new option to the page
- *
- * @param rOption Debug option
- * @return Success
- */
-bool DebugPage::AddOption(DebugOptionBase& rOption) {
-    if (mOptions.Size() >= mMaxOptions) {
-        K_LOG_EX("Can't add option: %s\n", rOption.GetName().CStr());
-        return false;
-    }
-
-    rOption.SetParent(*this);
-    mOptions.PushBack(&rOption);
-
-    return true;
-}
-
 /**
  * @brief Updates the menu state
  * @return Result of actions
  */
 EDebugMenuResult DebugPage::Calculate() {
+    EDebugMenuResult result = EDebugMenuResult_None;
+
     for (int i = 0; i < EPlayer_Max; i++) {
+        if (mOptions.Size() == 0) {
+            break;
+        }
+
         const WiiCtrl& rCtrl = CtrlMgr::GetInstance().GetWiiCtrl(i);
         if (!rCtrl.IsConnected()) {
             continue;
@@ -105,6 +83,7 @@ EDebugMenuResult DebugPage::Calculate() {
         // Change option with Left/Right
         if (rCtrl.IsTrig(EButton_Right)) {
             return pOption->Increment();
+
         } else if (rCtrl.IsTrig(EButton_Left)) {
             return pOption->Decrement();
         }
@@ -116,30 +95,38 @@ EDebugMenuResult DebugPage::Calculate() {
 
         // Close page with B
         if (rCtrl.IsTrig(EButton_B)) {
-            return EDebugMenuResult_Close;
+            return EDebugMenuResult_Back;
         }
     }
-
-    return EDebugMenuResult_None;
 }
 
 /**
  * @brief User-level render pass
  */
 void DebugPage::UserDraw() {
-    f32 x = 0.15f;
-    f32 y = 0.20f;
+    static const f32 ox = 0.15f;
+    static const f32 oy = 0.20f;
 
     static const f32 cursor = 0.015f;
     static const f32 option = 0.25f;
+
     static const f32 row = 0.05f;
+    static const f32 column = 0.30f;
+
+    f32 x = ox;
+    f32 y = oy;
 
     for (u32 i = 0; i < mOptions.Size(); i++) {
+        // Options marked as disabled are displayed in darker colors
+        Color fill = mOptions[i]->IsEnabled() ? Color::WHITE : Color::GREY;
+
         Text(mOptions[i]->GetName())
+            .SetTextColor(fill)
             .SetStrokeType(ETextStroke_Outline)
             .SetPosition(x, y);
 
         Text(mOptions[i]->GetValueText())
+            .SetTextColor(fill)
             .SetStrokeType(ETextStroke_Outline)
             .SetPosition(x + option, y);
 
@@ -151,6 +138,12 @@ void DebugPage::UserDraw() {
         }
 
         y += row;
+
+        // Half of them are in the other column
+        if (i > 0 && (i % (DEFAULT_MAX_OPTIONS / 2)) == 0) {
+            x += column;
+            y = oy;
+        }
     }
 }
 

lib/libkiwi/debug/kiwiDebugMenu.h

@@ -22,7 +22,8 @@ enum EDebugMenuResult {
     EDebugMenuResult_Cursor,  //!< Cursor changed
     EDebugMenuResult_Change,  //!< State changed
     EDebugMenuResult_Select,  //!< Button selected
-    EDebugMenuResult_Close,   //!< Request to close page/menu
+    EDebugMenuResult_Back,    //!< Request to close page
+    EDebugMenuResult_Exit,    //!< Request to exit menu
 };
 
 /**
@@ -49,7 +50,9 @@ class DebugMenu : public IRPGrpDrawObject {
      *
      * @param rPage Menu page
      */
-    void OpenPage(DebugPage& rPage);
+    void OpenPage(DebugPage& rPage) {
+        mPageStack.Push(&rPage);
+    }
 
     /**
      * @brief Updates the menu state
@@ -73,43 +76,27 @@ class DebugMenu : public IRPGrpDrawObject {
 class DebugPage {
 public:
     //! Default options limit
-    static const u32 DEFAULT_MAX_OPTIONS = 16;
+    static const u32 DEFAULT_MAX_OPTIONS = 20;
 
 public:
     /**
      * @brief Constructor
      *
+     * @param rMenu Parent menu
      * @param maxOptions Maximum number of options on the page
      */
-    DebugPage(u32 maxOptions = DEFAULT_MAX_OPTIONS)
-        : mCursor(0), mMaxOptions(maxOptions) {}
+    DebugPage(DebugMenu& rMenu, u32 maxOptions = DEFAULT_MAX_OPTIONS)
+        : mrMenu(rMenu), mCursor(0), mMaxOptions(maxOptions) {}
 
     /**
      * @brief Gets the page's parent menu
      */
-    DebugMenu& GetParent() const {
-        K_ASSERT(mpParent != nullptr);
-        return *mpParent;
-    }
-    /**
-     * @brief Sets the page's parent menu
-     *
-     * @param rMenu Parent menu
-     */
-    void SetParent(DebugMenu& rMenu) {
-        mpParent = &rMenu;
+    DebugMenu& GetMenu() const {
+        return mrMenu;
     }
 
     /**
-     * @brief Appends a new option to the page
-     *
-     * @param rOption Debug option
-     * @return Success
-     */
-    bool AddOption(DebugOptionBase& rOption);
-
-    /**
-     * @brief Updates the menu state
+     * @brief Updates the page state
      * @return Result of actions
      */
     virtual EDebugMenuResult Calculate();
@@ -121,7 +108,7 @@ class DebugPage {
 
 protected:
     //! Parent menu
-    DebugMenu* mpParent;
+    DebugMenu& mrMenu;
 
     //! Cursor position
     u32 mCursor;

lib/libkiwi/debug/kiwiDebugOption.cpp

@@ -27,14 +27,15 @@ void DebugOptionBase::SetEnabled(bool enable) {
 /**
  * @brief Constructor
  *
+ * @param rPage Parent page
  * @param rName Option name
  * @param min Minimum value (inclusive)
  * @param max Maximum value (inclusive)
  * @param initial Initial value (optional)
  */
-DebugIntOption::DebugIntOption(const String& rName, int min, int max,
-                               Optional<int> initial)
-    : DebugOptionBase(rName), mMin(min), mMax(max) {
+DebugIntOption::DebugIntOption(DebugPage& rPage, const String& rName, int min,
+                               int max, Optional<int> initial)
+    : DebugOptionBase(rPage, rName), mMin(min), mMax(max) {
 
     K_ASSERT(max >= min);
 
@@ -51,6 +52,10 @@ EDebugMenuResult DebugIntOption::Increment() {
         return EDebugMenuResult_Invalid;
     }
 
+    if (mMin == mMax) {
+        return EDebugMenuResult_Invalid;
+    }
+
     // Value wraps around
     SetValue(mValue == mMax ? mMin : mValue + 1);
     return EDebugMenuResult_Change;
@@ -65,6 +70,10 @@ EDebugMenuResult DebugIntOption::Decrement() {
         return EDebugMenuResult_Invalid;
     }
 
+    if (mMin == mMax) {
+        return EDebugMenuResult_Invalid;
+    }
+
     // Value wraps around
     SetValue(mValue == mMin ? mMax : mValue - 1);
     return EDebugMenuResult_Change;
@@ -172,7 +181,7 @@ void DebugBoolOption::UpdateString() {
  * @param ppValues Enum value strings
  */
 void DebugEnumOption::SetEnumValues(const char** ppValues) {
-    K_ASSERT(ppValues != nullptr);
+    K_ASSERT_PTR(ppValues);
 
     mppValues = ppValues;
     UpdateString();
@@ -182,7 +191,7 @@ void DebugEnumOption::SetEnumValues(const char** ppValues) {
  * @brief Updates the option value string
  */
 void DebugEnumOption::UpdateString() {
-    K_ASSERT(mppValues != nullptr);
+    K_ASSERT_PTR(mppValues);
 
     if (IsEnabled()) {
         mValueText = mppValues[GetValue()];
@@ -225,10 +234,10 @@ EDebugMenuResult DebugProcOption::Select() {
  * @param pArg Callback user argument
  */
 EDebugMenuResult DebugOpenPageOption::OpenPageProc(void* pArg) {
-    K_ASSERT(pArg != nullptr);
+    K_ASSERT_PTR(pArg);
 
     DebugOpenPageOption* p = static_cast<DebugOpenPageOption*>(pArg);
-    p->GetParent().GetParent().OpenPage(*p->mpPage);
+    p->GetPage().GetMenu().OpenPage(*p->mpOpenPage);
 
     return EDebugMenuResult_Select;
 }