mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-06 19:52:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_fishing mostly done (#375)

Browse Source 
* d_menu_fishing mostly done

* format the cpp
This commit is contained in:
Trueffel
2023-07-19 11:47:20 +02:00
committed by GitHub
parent 51fb5ce572
commit e1069cecc5
17 changed files with 406 additions and 1626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+9
View File
@@ -512,6 +512,7 @@ public:
void setMesgCancelButton(u8 button) { mMesgCancelButton = button; }
void setMesgBgm(u8 param_0) { mMesgBgm = param_0; }
int getMessageCountNumber() { return mMessageCountNum; }
void setMessageCountNumber(u32 number) { mMessageCountNum = number; }
void setWindowNum(u8 num) { mWindowNum = num; }
int getWindowNum() { return mWindowNum; }
@@ -1702,6 +1703,10 @@ inline u16 dComIfGs_getFishNum(u8 param_0) {
return g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().getFishCount(param_0);
}
inline u8 dComIfGs_getFishSize(u8 param_0) {
return g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().getMaxSize(param_0);
}
void dComIfGp_setSelectItem(int index);
s32 dComIfGp_offHeapLockFlag(int flag);
void dComIfGp_createSubExpHeap2D();
@@ -2517,6 +2522,10 @@ inline void dComIfGp_setMesgBgmOn() {
g_dComIfG_gameInfo.play.setMesgBgm(1);
}
inline void dComIfGp_setMessageCountNumber(u32 number) {
g_dComIfG_gameInfo.play.setMessageCountNumber(number);
}
inline s32 dComIfGp_checkStatus(u16 flags) {
return g_dComIfG_gameInfo.play.checkStatus(flags);
}
include/d/menu/d_menu_fishing.h
+6 -6
View File
@@ -19,15 +19,15 @@ public:
/* 801C514C */ void _draw();
/* 801C5204 */ bool isSync();
/* 801C522C */ void init();
/* 801C52E4 */ void _open();
/* 801C5470 */ void _close();
/* 801C52E4 */ int _open();
/* 801C5470 */ int _close();
/* 801C556C */ void wait_init();
/* 801C55A8 */ void wait_move();
/* 801C55D8 */ void screenSetBase();
/* 801C5D3C */ void screenSetDoIcon();
/* 801C5EB8 */ void setAButtonString(u16);
/* 801C5F68 */ void setBButtonString(u16);
/* 801C6018 */ int getFigure(int);
/* 801C6018 */ u8 getFigure(int);
/* 801C605C */ void setFishParam(int, u16, u8);
/* 801C6210 */ void setHIO(bool);
@@ -38,10 +38,10 @@ public:
private:
/* 0x004 */ JKRExpHeap* mpHeap;
/* 0x008 */ JKRArchive* field_0x8;
/* 0x008 */ JKRArchive* mpArchive;
/* 0x00C */ STControl* mpStick;
/* 0x010 */ CSTControl* mpCStick;
/* 0x014 */ mDoDvdThd_mountArchive_c* field_0x14;
/* 0x014 */ mDoDvdThd_mountArchive_c* mpMount;
/* 0x018 */ J2DScreen* mpScreen;
/* 0x01C */ J2DScreen* mpIconScreen;
/* 0x020 */ J2DTextBox* mpAButtonString[5];
@@ -66,7 +66,7 @@ private:
/* 0x1EC */ J2DTextBox* field_0x1ec;
/* 0x1F0 */ J2DPicture* mpBlackTex;
/* 0x1F4 */ dMsgString_c* mpString;
/* 0x1F8 */ u16 field_0x1f8;
/* 0x1F8 */ s16 field_0x1f8;
/* 0x1FA */ u8 mStatus;
/* 0x1FB */ u8 field_0x1fb;
};
include/d/meter/d_meter_HIO.h
+3 -6
View File
@@ -184,13 +184,10 @@ public:
/* 0x1B8 */ f32 mFishInfoScale[6];
/* 0x1D0 */ f32 mFishInfoPosX[6];
/* 0x1E8 */ f32 mFishInfoPosY[6];
/* 0x200 */ f32 mMaxSizeScale;
/* 0x204 */ f32 mCaughtNumScale;
/* 0x208 */ f32 mMaxSizePosX;
/* 0x20C */ f32 mCaughtNumPosX;
/* 0x200 */ f32 mScale[2]; // 0: MaxSizeScale, 1: CaughtNumScale
/* 0x208 */ f32 mPosX[2]; // 0: MaxSizePosX, 1: CaughtNumPosX
/* 0x210 */ f32 mCaughtNumPosX_4x3;
/* 0x214 */ f32 mMaxSizePosY;
/* 0x218 */ f32 mCaughtNumPosY;
/* 0x214 */ f32 mPosY[2]; // 0: MaxSizePosY, 1: CaughtNumPosY
/* 0x21C */ s16 mOpenFrames;
/* 0x21E */ s16 mCloseFrames;
/* 0x220 */ s16 mFishNum[6];
include/d/save/d_save.h
+3 -1
View File
@@ -678,7 +678,9 @@ class dSv_fishing_info_c {
public:
void init();
void addFishCount(u8 i_fishIndex);
u16 getFishCount(u8 i_fishIndex) { return mFishCount[i_fishIndex]; }
u16 getFishCount(u8 i_fishIndex) const { return mFishCount[i_fishIndex]; }
u8 getMaxSize(s32 i_sizeIndex) { return mMaxSize[i_sizeIndex]; }
void setMaxSize(s32 i_sizeIndex, u8 i_size) { mMaxSize[i_sizeIndex] = i_size; }
private:
/* 0x00 */ u16 mFishCount[16];