diff options
| author | Trueffel <106771418+Trueffeloot@users.noreply.github.com> | 2024-03-31 09:09:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-31 10:09:48 +0300 |
| commit | 4cbf3e121bd5e477cd06ecb1d3a940199ec3d3db (patch) | |
| tree | e4da7b540b279282992348d361ee939c0fb39ead /include | |
| parent | a42689be4737f4885ee698cf3ec8b7de6b40170d (diff) | |
Some documentation on d_menu_fishing (#2115)
* d_menu_fishing documentation pass
* some changes on d_menu_ring and d_menu_skill
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/menu/d_menu_fishing.h | 41 | ||||
| -rw-r--r-- | include/d/menu/d_menu_skill.h | 4 | ||||
| -rw-r--r-- | include/d/save/d_save.h | 6 |
3 files changed, 33 insertions, 18 deletions
diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h index 884ed5d60e..6aa89af26d 100644 --- a/include/d/menu/d_menu_fishing.h +++ b/include/d/menu/d_menu_fishing.h @@ -1,6 +1,7 @@ #ifndef D_MENU_D_MENU_FISHING_H #define D_MENU_D_MENU_FISHING_H +#include "d/com/d_com_inf_game.h" #include "d/d_drawlist.h" class CPaneMgr; @@ -12,6 +13,14 @@ class mDoDvdThd_mountArchive_c; class dMenu_Fishing_c : public dDlst_base_c { public: + + enum dMenu_Fishing_Status { + CLOSED = 0, + READY_OPEN = 1, + READY_MOVE = 2, + READY_CLOSE = 3, + }; + /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*); /* 801C504C */ void _create(); /* 801C50B4 */ void _move(); @@ -43,27 +52,27 @@ private: /* 0x014 */ mDoDvdThd_mountArchive_c* mpMount; /* 0x018 */ J2DScreen* mpScreen; /* 0x01C */ J2DScreen* mpIconScreen; - /* 0x020 */ J2DTextBox* mpAButtonString[5]; - /* 0x034 */ J2DTextBox* mpBButtonString[5]; + /* 0x020 */ J2DTextBox* mpAButtonString[5]; // Displays string based on stringID on A button Always empty + /* 0x034 */ J2DTextBox* mpBButtonString[5]; // Displays string based on stringID on B button. Only "Back" here /* 0x048 */ CPaneMgr* mpParent; - /* 0x04C */ CPaneMgr* mpFishParent[6]; + /* 0x04C */ CPaneMgr* mpFishParent[MAX_FINDABLE_FISHES]; // Displays fishes based on index and if collected once /* 0x064 */ CPaneMgr* mpFishParts[6][6]; - /* 0x0F4 */ CPaneMgr* mpFishInfoParent[2]; - /* 0x0FC */ CPaneMgr* mpButtonAB[2]; - /* 0x104 */ CPaneMgr* mpButtonText[2]; - /* 0x10C */ J2DTextBox* field_0x10c[2][6]; - /* 0x13C */ J2DTextBox* field_0x13c[2][6]; - /* 0x16C */ J2DTextBox* field_0x16c[2][6]; - /* 0x19C */ J2DTextBox* field_0x19c[2][6]; - /* 0x1CC */ J2DTextBox* field_0x1cc[6]; - /* 0x1E4 */ J2DTextBox* field_0x1e4; - /* 0x1E8 */ J2DTextBox* field_0x1e8; - /* 0x1EC */ J2DTextBox* field_0x1ec; + /* 0x0F4 */ CPaneMgr* mpFishInfoParent[2]; // 0: Blue info box ; 1: Red info box + /* 0x0FC */ CPaneMgr* mpButtonAB[2]; // Controls the position and scale of the buttons. 0: A ; 1: B + /* 0x104 */ CPaneMgr* mpButtonText[2]; // Controls the position and scale of the button texts. 0: A ; 1: B + /* 0x10C */ J2DTextBox* field_0x10c[2][6]; // Displays the actual inches into the blue box of every fish + /* 0x13C */ J2DTextBox* field_0x13c[2][6]; // Displays the actual number of caught fishes into the red box of every fish + /* 0x16C */ J2DTextBox* field_0x16c[2][6]; // Displays string "inches" next to the blue box of every fish + /* 0x19C */ J2DTextBox* field_0x19c[2][6]; // Displays string "fish" next to the red box of every fish + /* 0x1CC */ J2DTextBox* mpFishNameString[MAX_FINDABLE_FISHES]; // Displays name of every caught fish + /* 0x1E4 */ J2DTextBox* mpInfoLargestString; // Displays "Largest" next to the blue box + /* 0x1E8 */ J2DTextBox* mpInfoNumCaughtString; // Displays "No. Caught" next to the red box + /* 0x1EC */ J2DTextBox* field_0x1ec; // unused /* 0x1F0 */ J2DPicture* mpBlackTex; /* 0x1F4 */ dMsgString_c* mpString; - /* 0x1F8 */ s16 field_0x1f8; + /* 0x1F8 */ s16 mFishListScreenFrames; /* 0x1FA */ u8 mStatus; - /* 0x1FB */ u8 field_0x1fb; + /* 0x1FB */ u8 mProcess; }; #endif /* D_MENU_D_MENU_FISHING_H */ diff --git a/include/d/menu/d_menu_skill.h b/include/d/menu/d_menu_skill.h index 7d596a4bc4..4b3d7760bb 100644 --- a/include/d/menu/d_menu_skill.h +++ b/include/d/menu/d_menu_skill.h @@ -93,8 +93,8 @@ private: /* 0x206 */ u8 mIndex; /* 0x207 */ u8 mSkillNum; /* 0x208 */ u8 mRemainder; - /* 0x209 */ u8 field_0x209; - /* 0x20A */ u8 field_0x20a; + /* 0x209 */ u8 field_0x209; // Initialized but never used + /* 0x20A */ u8 field_0x20a; // Initialized but never used /* 0x20B */ u8 mTotalSkillNum; }; // Size: 0x20C diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index df8e54c8fd..bb52c2437b 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -33,6 +33,12 @@ #define WALLET_MAX 300 #define BIG_WALLET_MAX 600 #define GIANT_WALLET_MAX 1000 +#define MAX_FINDABLE_FISHES 6 + +enum ButtonIndexes { + /* 0 */ A_BUTTON, + /* 1 */ B_BUTTON, +}; enum Wallets { /* 0x0 */ WALLET, |
