mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 06:16:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_meter - 99% matching (#907)

Browse Source 
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
This commit is contained in:
123456789758
2025-12-27 16:23:15 -05:00
committed by GitHub
parent 24708b315d
commit d0852db127
14 changed files with 6350 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc_ji1.h
+1 -1
View File
@@ -275,7 +275,7 @@ public:
/* 0xD84 */ u8 field_0xD84;
/* 0xD85 */ bool mHide;
static s8 game_life_point;
static u8 game_life_point;
}; // Size: 0xD88
class daNpc_Ji1_HIO_c : public JORReflexible {
include/d/d_camera.h
+1
View File
@@ -579,6 +579,7 @@ public:
STATIC_ASSERT(sizeof(dCamera_c) == 0x800);
bool dCam_isManual(camera_class* i_this);
s16 dCam_getAngleY(camera_class*);
s16 dCam_getAngleX(camera_class*);
s16 dCam_getControledAngleY(camera_class*);
include/d/d_com_inf_game.h
+24 -4
View File
@@ -374,6 +374,7 @@ public:
s16 getItemMaxMagicCount() { return mItemMaxMagicCount; }
void setItemMaxMagicCount(s16 magic) { mItemMaxMagicCount += magic; }
s16 getItemBombNumCount() { return mItemBombNumCount; }
void setItemBombNumCount(s16 num) { mItemBombNumCount += num; }
u16 getItemNowLife() { return mItemNowLife; }
@@ -534,6 +535,7 @@ public:
JKRArchive* getActionIconArchive() { return mpActionIconArchive; }
void setScopeResArchive(JKRArchive * pArc) { mpScopeResArchive = pArc; }
void setCameraResArchive(JKRArchive * pArc) { mpCameraResArchive = pArc; }
JKRArchive* getSwimResArchive() { return mpSwimResArchive; }
void setSwimResArchive(JKRArchive * pArc) { mpSwimResArchive = pArc; }
void setWindResArchive(JKRArchive * pArc) { mpWindResArchive = pArc; }
void setFontArchive(JKRArchive * pArc) { mpFont0Archive = pArc; }
@@ -835,8 +837,9 @@ extern GXColor g_saftyWhiteColor;
* === SAVE ===
*/
void dComIfGs_gameStart();
void dComIfGs_setGameStartStage();
void dComIfGs_gameStart();
void dComIfGs_copyPlayerRecollectionData();
u8 dComIfGs_checkGetItem(u8);
inline void dComIfGs_init() {
@@ -1894,6 +1897,10 @@ inline u8 dComIfGs_getKeyNum() {
return g_dComIfG_gameInfo.save.getMemory().getBit().getKeyNum();
}
inline void dComIfGs_setKeyNum(u8 i_keyNum) {
g_dComIfG_gameInfo.save.getMemory().getBit().setKeyNum(i_keyNum);
}
inline dSv_player_status_a_c* dComIfGs_getpPlayerStatusA() {
return g_dComIfG_gameInfo.save.getPlayer().getpPlayerStatusA();
}
@@ -2478,7 +2485,7 @@ inline void dComIfGp_clearItemTimeCount() {
g_dComIfG_gameInfo.play.clearItemTimeCount();
}
inline u32 dComIfGp_getItemTimeMax() {
inline s32 dComIfGp_getItemTimeMax() {
return g_dComIfG_gameInfo.play.getItemTimeMax();
}
@@ -2526,6 +2533,10 @@ inline void dComIfGp_setItemMaxMagicCount(s16 magic) {
g_dComIfG_gameInfo.play.setItemMaxMagicCount(magic);
}
inline s16 dComIfGp_getItemBombNumCount() {
return g_dComIfG_gameInfo.play.getItemBombNumCount();
}
inline void dComIfGp_setItemBombNumCount(s16 num) {
g_dComIfG_gameInfo.play.setItemBombNumCount(num);
}
@@ -2789,8 +2800,8 @@ inline void dComIfGp_setRStatusForce(u8 status) {
}
// B Button
inline void dComIfGp_getAStatusForce(u8 status) {
g_dComIfG_gameInfo.play.setAStatus(status);
inline u8 dComIfGp_getAStatusForce() {
return g_dComIfG_gameInfo.play.getAStatusForce();
}
// B Button
@@ -3116,6 +3127,13 @@ inline BOOL dComIfGp_event_runCheck() {
return g_dComIfG_gameInfo.play.getEvent().runCheck();
}
inline u16 dComIfGp_event_checkHind(u16 i_hindFlag) {
if (!dComIfGp_event_runCheck()) {
return false;
}
return g_dComIfG_gameInfo.play.getEvent().checkHind(i_hindFlag);
}
/**
* Returns the button (X Y or Z) that was used to start this event.
* @return The dTalkXYButton_e of the button the player used to initiate this event.
@@ -3543,6 +3561,7 @@ inline void dComIfGd_entryZSortXluListMaskOff(J3DPacket* i_packet, cXyz& param_1
g_dComIfG_gameInfo.drawlist.entryZSortXluListMaskOff(i_packet, param_1);
}
inline void dComIfGd_set2DOpaTop(dDlst_base_c* pBase) { g_dComIfG_gameInfo.drawlist.set2DOpaTop(pBase); }
inline void dComIfGd_set2DOpa(dDlst_base_c* pBase) { g_dComIfG_gameInfo.drawlist.set2DOpa(pBase); }
inline void dComIfGd_set2DXlu(dDlst_base_c* pBase) { g_dComIfG_gameInfo.drawlist.set2DXlu(pBase); }
@@ -3621,6 +3640,7 @@ inline void dComIfGp_setActionIconArchive(JKRArchive * pArc) { g_dComIfG_gameInf
inline JKRArchive* dComIfGp_getActionIconArchive() { return g_dComIfG_gameInfo.play.getActionIconArchive(); }
inline void dComIfGp_setScopeResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setScopeResArchive(pArc); }
inline void dComIfGp_setCameraResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setCameraResArchive(pArc); }
inline JKRArchive* dComIfGp_getSwimResArchive() { return g_dComIfG_gameInfo.play.getSwimResArchive(); }
inline void dComIfGp_setSwimResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setSwimResArchive(pArc); }
inline void dComIfGp_setWindResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setWindResArchive(pArc); }
inline void dComIfGp_setFontArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFontArchive(pArc); }
include/d/d_event.h
+3 -3
View File
@@ -133,9 +133,9 @@ public:
BOOL runCheck() { return mMode != dEvtMode_NONE_e; }
u8 getMode() const { return mMode; }
void onHindFlag(u16) {}
void offHindFlag(u16) {}
void checkHind(u16) {}
void onHindFlag(u16 flag) { mHindFlag |= flag; }
void offHindFlag(u16 flag) { mHindFlag &= ~flag; }
u16 checkHind(u16 flag) { return flag & mHindFlag; }
BOOL chkPhoto() { return mbInPhoto; }
include/d/d_meter.h
+282 -30
View File
@@ -19,7 +19,8 @@ public:
void genMessage(JORMContext* ctx);
/* 0x004 */ u8 field_0x4[0x006 - 0x004];
/* 0x004 */ s8 mNo;
/* 0x005 */ u8 field_0x5[0x006 - 0x005];
/* 0x006 */ short field_0x6;
/* 0x008 */ u8 field_0x8[0x00C - 0x008];
/* 0x00C */ f32 field_0xc;
@@ -60,15 +61,9 @@ public:
/* 0x066 */ short field_0x66;
/* 0x068 */ short field_0x68;
/* 0x06A */ short field_0x6a;
/* 0x06C */ short field_0x6c;
/* 0x06E */ short field_0x6e;
/* 0x070 */ short field_0x70;
/* 0x072 */ short field_0x72;
/* 0x074 */ short field_0x74;
/* 0x076 */ short field_0x76;
/* 0x078 */ short field_0x78;
/* 0x07A */ short field_0x7a;
/* 0x07C */ short field_0x7c;
/* 0x06C */ short field_0x6c[3];
/* 0x072 */ short field_0x72[3];
/* 0x078 */ short field_0x78[3];
/* 0x07E */ short field_0x7e;
/* 0x080 */ u8 field_0x80[0x088 - 0x080];
/* 0x088 */ short field_0x88;
@@ -191,7 +186,8 @@ public:
void genMessage(JORMContext* ctx);
/* 0x04 */ u8 field_0x4[0x08 - 0x04];
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x5[0x08 - 0x05];
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
@@ -293,7 +289,7 @@ public:
void genMessage(JORMContext* ctx);
/* 0x04 */ u8 field_0x4[0x05 - 0x04];
/* 0x04 */ s8 mNo;
/* 0x05 */ GXColor field_0x5;
/* 0x09 */ GXColor field_0x9;
/* 0x0D */ u8 field_0xd;
@@ -388,7 +384,7 @@ public:
void genMessage(JORMContext* ctx);
/* 0x04 */ u8 field_0x4[0x05 - 0x04];
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ u8 field_0x7;
@@ -507,7 +503,7 @@ public:
void genMessage(JORMContext* ctx);
/* 0x04 */ u8 field_0x4;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ u8 field_0x7;
@@ -549,38 +545,219 @@ class dMeter_info_c {
public:
~dMeter_info_c() {}
/* 0x00 */ u8 field_0x0[2];
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
};
u8 dMenu_flag();
void dMenu_flagSet(u8);
enum dMeterStatus_e {
dMtrStts_UNK1_e = 0x00000001,
dMtrStts_UNK2_e = 0x00000002,
dMtrStts_UNK4_e = 0x00000004,
dMtrStts_UNK8_e = 0x00000008,
dMtrStts_UNK10_e = 0x00000010,
dMtrStts_UNK20_e = 0x00000020,
dMtrStts_UNK40_e = 0x00000040,
dMtrStts_UNK80_e = 0x00000080,
dMtrStts_UNK100_e = 0x00000100,
dMtrStts_UNK200_e = 0x00000200,
dMtrStts_UNK400_e = 0x00000400,
dMtrStts_UNK800_e = 0x00000800,
dMtrStts_UNK1000_e = 0x00001000,
dMtrStts_UNK2000_e = 0x00002000,
dMtrStts_UNK4000_e = 0x00004000,
dMtrStts_UNK8000_e = 0x00008000,
dMtrStts_UNK10000_e = 0x00010000,
dMtrStts_UNK20000_e = 0x00020000,
dMtrStts_UNK40000_e = 0x00040000,
dMtrStts_UNK80000_e = 0x00080000,
dMtrStts_UNK100000_e = 0x00100000,
dMtrStts_UNK200000_e = 0x00200000,
dMtrStts_UNK400000_e = 0x00400000,
dMtrStts_UNK800000_e = 0x00800000,
};
class sub_meter_class : public msg_class {
public:
/* 0x00FC */ JKRHeap* heap;
/* 0x0100 */ fopMsgM_pane_class field_0x0100[24];
/* 0x00FC */ JKRExpHeap* heap;
/* 0x0100 */ fopMsgM_pane_class field_0x0100[3];
/* 0x01A8 */ fopMsgM_pane_class field_0x01a8;
/* 0x01E0 */ fopMsgM_pane_class field_0x01e0;
/* 0x0218 */ fopMsgM_pane_class field_0x0218;
/* 0x0250 */ fopMsgM_pane_class field_0x0250;
/* 0x0288 */ fopMsgM_pane_class field_0x0288;
/* 0x02C0 */ fopMsgM_pane_class field_0x02c0;
/* 0x02F8 */ fopMsgM_pane_class field_0x02f8;
/* 0x0330 */ fopMsgM_pane_class field_0x0330;
/* 0x0368 */ fopMsgM_pane_class field_0x0368;
/* 0x03A0 */ fopMsgM_pane_class field_0x03a0;
/* 0x03D8 */ fopMsgM_pane_class field_0x03d8;
/* 0x0410 */ fopMsgM_pane_class field_0x0410;
/* 0x0448 */ fopMsgM_pane_class field_0x0448[4];
/* 0x0528 */ fopMsgM_pane_class field_0x0528;
/* 0x0560 */ fopMsgM_pane_class field_0x0560;
/* 0x0598 */ fopMsgM_pane_class field_0x0598;
/* 0x05D0 */ fopMsgM_pane_class field_0x05d0;
/* 0x0608 */ fopMsgM_pane_class field_0x0608;
/* 0x0640 */ fopMsgM_pane_class mHeart[20];
/* 0x0AA0 */ fopMsgM_pane_class mHeartShadow[20];
/* 0x0F00 */ fopMsgM_pane_class field_0x0f00;
/* 0x0F38 */ fopMsgM_pane_class field_0x0f38[0x20];
/* 0x1638 */ fopMsgM_pane_class field_0x1638[0x20];
/* 0x1D38 */ fopMsgM_pane_class field_0x1d38[0x20];
/* 0x2438 */ fopMsgM_pane_class field_0x2438[0x20];
/* 0x2B38 */ fopMsgM_pane_class field_0x2b38[0x0D];
/* 0x2E48 */ fopMsgM_pane_class field_0x2e48[4];
/* 0x2EF0 */ u32 field_0x2ef0[12];
/* 0x0F38 */ fopMsgM_pane_class field_0x0f38[8];
/* 0x10F8 */ fopMsgM_pane_class field_0x10f8;
/* 0x1130 */ fopMsgM_pane_class field_0x1130;
/* 0x1168 */ fopMsgM_pane_class field_0x1168;
/* 0x11A0 */ fopMsgM_pane_class field_0x11a0;
/* 0x11D8 */ fopMsgM_pane_class field_0x11d8;
/* 0x1210 */ fopMsgM_pane_class field_0x1210;
/* 0x1248 */ fopMsgM_pane_class field_0x1248;
/* 0x1280 */ fopMsgM_pane_class field_0x1280;
/* 0x12B8 */ fopMsgM_pane_class field_0x12b8;
/* 0x12F0 */ fopMsgM_pane_class field_0x12f0;
/* 0x1328 */ fopMsgM_pane_class field_0x1328;
/* 0x1360 */ fopMsgM_pane_class field_0x1360;
/* 0x1398 */ fopMsgM_pane_class field_0x1398;
/* 0x13D0 */ fopMsgM_pane_class field_0x13d0;
/* 0x1408 */ fopMsgM_pane_class field_0x1408;
/* 0x1440 */ fopMsgM_pane_class field_0x1440;
/* 0x1478 */ fopMsgM_pane_class field_0x1478[3];
/* 0x1520 */ fopMsgM_pane_class field_0x1520;
/* 0x1558 */ fopMsgM_pane_class field_0x1558;
/* 0x1590 */ fopMsgM_pane_class field_0x1590[4];
/* 0x1670 */ fopMsgM_pane_class field_0x1670;
/* 0x16A8 */ fopMsgM_pane_class field_0x16a8;
/* 0x16E0 */ fopMsgM_pane_class field_0x16e0;
/* 0x1718 */ fopMsgM_pane_class field_0x1718[4];
/* 0x17F8 */ fopMsgM_pane_class field_0x17f8;
/* 0x1830 */ fopMsgM_pane_class field_0x1830;
/* 0x1868 */ fopMsgM_pane_class field_0x1868[3];
/* 0x1910 */ fopMsgM_pane_class field_0x1910;
/* 0x1948 */ fopMsgM_pane_class field_0x1948;
/* 0x1980 */ fopMsgM_pane_class field_0x1980;
/* 0x19B8 */ fopMsgM_pane_class field_0x19b8;
/* 0x19F0 */ fopMsgM_pane_class field_0x19f0[4];
/* 0x1AD0 */ fopMsgM_pane_class field_0x1ad0[2];
/* 0x1B40 */ fopMsgM_pane_class field_0x1b40[4];
/* 0x1C20 */ fopMsgM_pane_class field_0x1c20[2];
/* 0x1C90 */ fopMsgM_pane_class field_0x1c90;
/* 0x1CC8 */ fopMsgM_pane_class field_0x1cc8;
/* 0x1D00 */ fopMsgM_pane_class field_0x1d00;
/* 0x1D38 */ fopMsgM_pane_class field_0x1d38;
/* 0x1D70 */ fopMsgM_pane_class field_0x1d70;
/* 0x1DA8 */ fopMsgM_pane_class field_0x1da8[2];
/* 0x1E18 */ fopMsgM_pane_class field_0x1e18[2];
/* 0x1E88 */ fopMsgM_pane_class field_0x1e88;
/* 0x1EC0 */ fopMsgM_pane_class field_0x1ec0;
/* 0x1EF8 */ fopMsgM_pane_class field_0x1ef8;
/* 0x1F30 */ fopMsgM_pane_class field_0x1f30[3];
/* 0x1FD8 */ fopMsgM_pane_class field_0x1fd8[3];
/* 0x2080 */ fopMsgM_pane_class field_0x2080[3];
/* 0x2128 */ fopMsgM_pane_class field_0x2128[3];
/* 0x21D0 */ fopMsgM_pane_class field_0x21d0;
/* 0x2208 */ fopMsgM_pane_class field_0x2208;
/* 0x2240 */ fopMsgM_pane_class field_0x2240;
/* 0x2278 */ fopMsgM_pane_class field_0x2278;
/* 0x22B0 */ fopMsgM_pane_class field_0x22b0;
/* 0x22E8 */ fopMsgM_pane_class field_0x22e8;
/* 0x2320 */ fopMsgM_pane_class field_0x2320[3];
/* 0x23C8 */ fopMsgM_pane_class field_0x23c8[3];
/* 0x2470 */ fopMsgM_pane_class field_0x2470[3];
/* 0x2518 */ fopMsgM_pane_class field_0x2518;
/* 0x2550 */ fopMsgM_pane_class field_0x2550[2];
/* 0x25C0 */ fopMsgM_pane_class field_0x25c0[2];
/* 0x2630 */ fopMsgM_pane_class field_0x2630[2];
/* 0x26A0 */ fopMsgM_pane_class field_0x26a0;
/* 0x26D8 */ fopMsgM_pane_class field_0x26d8;
/* 0x2710 */ fopMsgM_pane_class field_0x2710;
/* 0x2748 */ fopMsgM_pane_class field_0x2748;
/* 0x2780 */ fopMsgM_pane_class field_0x2780;
/* 0x27B8 */ fopMsgM_pane_class field_0x27b8;
/* 0x27F0 */ fopMsgM_pane_class field_0x27f0;
/* 0x2828 */ fopMsgM_pane_class field_0x2828;
/* 0x2860 */ fopMsgM_pane_class field_0x2860;
/* 0x2898 */ fopMsgM_pane_class field_0x2898;
/* 0x28D0 */ fopMsgM_pane_class field_0x28d0;
/* 0x2908 */ fopMsgM_pane_class field_0x2908;
/* 0x2940 */ fopMsgM_pane_class field_0x2940[2];
/* 0x29B0 */ fopMsgM_pane_class field_0x29b0[2];
/* 0x2A20 */ fopMsgM_pane_class field_0x2a20;
/* 0x2A58 */ fopMsgM_pane_class field_0x2a58;
/* 0x2A90 */ fopMsgM_pane_class field_0x2a90[9];
/* 0x2C88 */ fopMsgM_pane_class field_0x2c88;
/* 0x2CC0 */ fopMsgM_pane_class field_0x2cc0;
/* 0x2CF8 */ fopMsgM_pane_class field_0x2cf8;
/* 0x2D30 */ fopMsgM_pane_class field_0x2d30;
/* 0x2D68 */ fopMsgM_pane_class field_0x2d68;
/* 0x2DA0 */ fopMsgM_pane_class field_0x2da0;
/* 0x2DD8 */ fopMsgM_pane_class field_0x2dd8;
/* 0x2E10 */ fopMsgM_pane_class field_0x2e10[4];
/* 0x2EF0 */ JUtility::TColor field_0x2ef0;
/* 0x2EF4 */ JUtility::TColor field_0x2ef4;
/* 0x2EF8 */ JUtility::TColor field_0x2ef8;
/* 0x2EFC */ JUtility::TColor field_0x2efc;
/* 0x2F00 */ JUtility::TColor field_0x2f00;
/* 0x2F04 */ JUtility::TColor field_0x2f04;
/* 0x2F08 */ JUtility::TColor field_0x2f08;
/* 0x2F0C */ JUtility::TColor field_0x2f0c;
/* 0x2F10 */ JUtility::TColor field_0x2f10;
/* 0x2F14 */ JUtility::TColor field_0x2f14;
/* 0x2F18 */ JUtility::TColor field_0x2f18;
/* 0x2F1C */ JUtility::TColor field_0x2f1c;
/* 0x2F20 */ JPABaseEmitter* mpRupyParticle;
/* 0x2F24 */ u32 field_0x2f20[4];
/* 0x2F24 */ JPABaseEmitter* field_0x2f24[2];
/* 0x2F2C */ JPABaseEmitter* field_0x2f2c[2];
/* 0x2F34 */ ResTIMG* arrowTex[2];
/* 0x2F3C */ ResTIMG* actionTex[3];
/* 0x2F48 */ ResTIMG* xyIconTex[3];
/* 0x2F54 */ ResTIMG* field_0x2f54[3];
/* 0x2F60 */ ResTIMG* moveIconTex[3];
/* 0x2F6C */ u8 field_0x2f6c[0x3024 - 0x2F6C];
/* 0x2F60 */ ResTIMG* moveIconTex[2];
/* 0x2F68 */ f32 field_0x2f68;
/* 0x2F6C */ f32 field_0x2f6c;
/* 0x2F70 */ f32 field_0x2f70;
/* 0x2F74 */ f32 field_0x2f74[9];
/* 0x2F98 */ f32 field_0x2f98[9];
/* 0x2FBC */ f32 field_0x2fbc;
/* 0x2FC0 */ f32 field_0x2fc0;
/* 0x2FC4 */ s16 field_0x2fc4;
/* 0x2FC6 */ u8 field_0x2fc6[0x2FD8 - 0x2FC6];
/* 0x2FD8 */ s16 field_0x2fd8;
/* 0x2FDA */ s16 field_0x2fda;
/* 0x2FDC */ u8 field_0x2fdc[0x2FE4 - 0x2FDC];
/* 0x2FE4 */ s16 field_0x2fe4;
/* 0x2FE6 */ u8 field_0x2fe6[0x2FE8 - 0x2FE6];
/* 0x2FE8 */ s16 field_0x2fe8;
/* 0x2FEA */ u8 field_0x2fea[0x2FEC - 0x2FEA];
/* 0x2FEC */ s16 field_0x2fec;
/* 0x2FEE */ u8 field_0x2fee[0x2FF0 - 0x2FEE];
/* 0x2FF0 */ s16 field_0x2ff0;
/* 0x2FF2 */ u8 field_0x2ff2[0x2FFC - 0x2FF2];
/* 0x2FFC */ int mAdjustRupy;
/* 0x3000 */ int field_0x3000;
/* 0x3004 */ u32 mStatusFlags;
/* 0x3008 */ u16 mRupyCount;
/* 0x300A */ s16 mAdjustHp;
/* 0x300C */ s16 field_0x300c;
/* 0x300E */ s16 field_0x300e;
/* 0x3010 */ s16 field_0x3010;
/* 0x3012 */ s16 field_0x3012;
/* 0x3014 */ s16 field_0x3014;
/* 0x3016 */ u16 field_0x3016;
/* 0x3018 */ u8 field_0x3018;
/* 0x3019 */ u8 field_0x3019;
/* 0x301A */ u8 field_0x301a;
/* 0x301B */ u8 field_0x301b;
/* 0x301C */ u8 field_0x301c;
/* 0x301D */ u8 field_0x301d;
/* 0x301E */ u8 mMaxHP;
/* 0x301F */ u8 mCurrHP;
/* 0x3020 */ u8 field_0x3020;
/* 0x3021 */ u8 field_0x3021[3];
/* 0x3024 */ u8 field_0x3024;
/* 0x3025 */ u8 field_0x3025;
/* 0x3025 */ s8 field_0x3025;
/* 0x3026 */ u8 field_0x3026;
/* 0x3027 */ u8 field_0x3027;
/* 0x3028 */ u8 field_0x3028;
/* 0x3029 */ u8 field_0x3029;
/* 0x302A */ u8 field_0x302a;
/* 0x302B */ u8 field_0x302b[0x302C - 0x302B];
};
extern dMeter_map_HIO_c g_meter_mapHIO;
@@ -589,8 +766,83 @@ extern dMeter_menuHIO_c g_menuHIO;
extern dMeter_msg_HIO_c g_msgHIO;
extern dMeter_message_HIO_c g_messageHIO;
u8 dMenu_flag();
void dMenu_flagSet(u8);
void dMeter_mtrShow();
void dMeter_mtrHide();
void dMenu_setPushMenuButton(u8);
void dMeter_weponChange(sub_meter_class* i_Meter);
void dMeter_weponAnime(sub_meter_class* i_Meter);
void dMeter_weponTrans(sub_meter_class* i_Meter);
void dMeter_weponAlpha(sub_meter_class* i_Meter);
void dMeter_actionForce(sub_meter_class* i_Meter);
void dMeter_actionChange(sub_meter_class* i_Meter);
void dMeter_actionTrans(sub_meter_class* i_Meter);
void dMeter_actionAlpha(sub_meter_class* i_Meter);
void dMeter_numberSet(J2DPane* param_1, u8 param_2);
void dMeter_xyBowLightAnime(sub_meter_class* i_Meter, int param_2);
void dMeter_xyItemCountUp(sub_meter_class* i_Meter);
void dMeter_xyItemChange(sub_meter_class* i_Meter, int param_2);
void dMeter_xyAlpha(sub_meter_class* i_Meter);
void dMeter_xyTrans(sub_meter_class* i_Meter);
void dMeter_rAlpha(sub_meter_class* i_Meter);
void dMeter_rTrans(sub_meter_class* i_Meter);
void dMeter_zakoEnemyMove(sub_meter_class* i_Meter);
void dMeter_bossEnemyMove(sub_meter_class* i_Meter, fopAc_ac_c* param_2);
void dMeter_zakoEnemyHide(sub_meter_class* i_Meter);
void dMeter_bossEnemyHide(sub_meter_class* i_Meter);
void dMeter_bossAnime(sub_meter_class* i_Meter);
void dMeter_bossEyeAnime(sub_meter_class* i_Meter);
void dMeter_magicGaugeMove(sub_meter_class* i_Meter);
void dMeter_flyGaugeMove(sub_meter_class* i_Meter, u8 param_2, s16 param_3, s16 param_4);
void dMeter_magicChange(sub_meter_class* i_Meter, f32 param_2);
void dMeter_magicLength(sub_meter_class* i_Meter, f32 param_2);
void dMeter_magicTransNowInit(sub_meter_class* i_Meter);
void dMeter_magicInitTrans(sub_meter_class* i_Meter);
void dMeter_magicTransScale(sub_meter_class* i_Meter, f32 param_2, f32 param_3, f32 param_4);
void dMeter_magicColor(sub_meter_class* i_Meter);
void dMeter_magicAlpha(sub_meter_class* i_Meter);
void dMeter_menuLRMove(sub_meter_class* i_Meter);
void dMeter_menuPlusMove(sub_meter_class* i_Meter);
void dMeter_walletChange(sub_meter_class* i_Meter);
void dMeter_compassDirOpen(sub_meter_class* i_Meter);
void dMeter_compassWindOpen(sub_meter_class* i_Meter);
void dMeter_compassWindClose(sub_meter_class* i_Meter);
void dMeter_compassDirClose(sub_meter_class* i_Meter);
void dMeter_compassAnimeMove(sub_meter_class* i_Meter);
void dMeter_compassValueInit(sub_meter_class* i_Meter);
void dMeter_clockShow(sub_meter_class* i_Meter);
void dMeter_clockHide(sub_meter_class* i_Meter);
void dMeter_clockInit(sub_meter_class* i_Meter);
void dMeter_clockMove(sub_meter_class* i_Meter);
void dMeter_clockStarLight(fopMsgM_pane_class* param_1, s16* param_2);
void dMeter_starLightFrame(s16* param_1);
void dMeter_clockMultiInit(sub_meter_class* i_Meter);
void dMeter_clockMultiMove(sub_meter_class* i_Meter);
void dMeter_swimOpenProc(sub_meter_class* i_Meter);
void dMeter_swimMoveProc(sub_meter_class* i_Meter);
void dMeter_swimMainRotate(sub_meter_class* i_Meter);
void dMeter_swimMainBlink(sub_meter_class* i_Meter);
void dMeter_swimMainDown(sub_meter_class* i_Meter);
void dMeter_swimTekariScroll(sub_meter_class* i_Meter);
void dMeter_swimLightMove(sub_meter_class* i_Meter);
void dMeter_swimLightBirth(sub_meter_class* i_Meter);
void dMeter_swimLightAnime(sub_meter_class* i_Meter, s16 param_2);
void dMeter_arrowErase(fopMsgM_pane_class* param_1);
void dMeter_screenDataTimeSet(sub_meter_class* i_Meter);
#endif /* D_METER_H */
include/d/d_metronome.h
+1
View File
@@ -45,6 +45,7 @@ public:
void _draw();
BOOL _open();
BOOL _close();
void draw() { return _draw(); };
public:
/* 0x004 */ J2DScreen* scrn;
include/d/d_stage.h
+1 -1
View File
@@ -1028,7 +1028,7 @@ inline u32 dStage_stagInfo_GetSTType(stage_stag_info_class* i_stagInfo) {
return (i_stagInfo->mStageTypeAndSchbit >> 16) & 7;
}
inline u8 dStage_stagInfo_GetUpButton(stage_stag_info_class* i_stagInfo) {
inline s8 dStage_stagInfo_GetUpButton(stage_stag_info_class* i_stagInfo) {
return i_stagInfo->mParticleSceneNo & 3;
}
include/f_op/f_op_msg_mng.h
+5
View File
@@ -349,6 +349,9 @@ void fopMsgM_setInitAlpha(fopMsgM_pane_class*);
void fopMsgM_setNowAlpha(fopMsgM_pane_class*, f32);
void fopMsgM_setNowAlphaZero(fopMsgM_pane_class*);
void fopMsgM_setAlpha(fopMsgM_pane_class*);
void fopMsgM_paneScaleX(fopMsgM_pane_class* i_this, f32 s);
void fopMsgM_paneScaleY(fopMsgM_pane_class* i_this, f32 s);
void fopMsgM_paneScale(fopMsgM_pane_class* i_this, f32 sx, f32 sy);
void fopMsgM_paneScaleXY(fopMsgM_pane_class*, f32);
void fopMsgM_cposMove(fopMsgM_pane_class*);
void fopMsgM_paneTrans(fopMsgM_pane_class*, f32, f32);
@@ -376,6 +379,8 @@ bool fopMsgM_nextMsgFlagCheck();
void fopMsgM_blendInit(fopMsgM_pane_class* i_this, const char* data);
void fopMsgM_blendInit(J2DPicture* pic, const char* data);
u8 fopMsgM_itemNumIdx(u8 i);
u8 fopMsgM_itemNum(u8 itemNo);
u32 fopMsgM_getColorTable(u16 param_1);
void fopMsgM_blendDraw(fopMsgM_pane_class* i_this, const char* data);
void fopMsgM_blendDraw(J2DPicture* pic, const char* data);
include/m_Do/m_Do_audio.h
+3 -1
View File
@@ -433,7 +433,9 @@ inline void mDoAud_talkOut() {
}
inline void mDoAud_checkSePlaying(u32 param_0) {}
inline void mDoAud_heartGaugeOn() {}
inline void mDoAud_heartGaugeOn() {
mDoAud_zelAudio_c::getInterface()->heartGaugeOn();
}
inline void mDoAud_resetRecover() {}
#endif /* M_DO_AUDIO_H */
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h
+1
View File
@@ -17,6 +17,7 @@ extern "C" {
#endif
int abs(int);
long labs(long);
double acos(double);
float acosf(float);
double asin(double);
src/d/actor/d_a_bpw.cpp
+1 -1
View File
@@ -3794,7 +3794,7 @@ void torituki_execute(bpw_class* i_this) {
actor->scale.z = fVar1;
actor->scale.y = fVar1;
if (!(actor->scale.x < 0.3f)) {
anm_init(i_this, 0x29, 15.0f, 2, 1.0f, -1);
anm_init(i_this, BPW_BCK_TORITUKI1, 15.0f, 2, 1.0f, -1);
i_this->mSomeCountdownTimers[8] = 0x96;
actor->scale.setall(0.4f);
i_this->mActionState++;
src/d/d_com_static.cpp
+1 -1
View File
@@ -484,7 +484,7 @@ BOOL daStandItem_c::daiItemNodeCallBack(J3DNode* node, int calcTiming) {
return TRUE;
}
s8 daNpc_Ji1_c::game_life_point;
u8 daNpc_Ji1_c::game_life_point;
bool daNpc_kam_c::m_hyoi_kamome;
src/d/d_meter.cpp
+6007 -462
View File
File diff suppressed because it is too large Load Diff
src/d/d_msg.cpp
+19 -19
View File
@@ -1590,7 +1590,7 @@ void dMsg_numberInput(sub_msg_class* i_Msg) {
if (((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (fopMsgM_checkMessageSend())) {
dMsg_setCancelMode(i_Msg);
} else {
dMeter_Info.field_0x0[0] = 3;
dMeter_Info.field_0x0 = 3;
}
}
@@ -1960,7 +1960,7 @@ s32 dMsg_stopProc(sub_msg_class* i_Msg) {
if ((bVar1 != 5) && (bVar1 != 0xe)) {
dMsg_arrowInit(i_Msg);
}
dMeter_Info.field_0x0[0] = 2;
dMeter_Info.field_0x0 = 2;
if (dComIfGp_getDoStatusForce() == dActStts_CANCEL_e) {
mDoAud_seStart(JA_SE_TALK_SEL_CANCEL);
} else {
@@ -1973,7 +1973,7 @@ s32 dMsg_stopProc(sub_msg_class* i_Msg) {
if ((bVar1 != 5) && (bVar1 != 0xe)) {
dMsg_arrowMove(i_Msg);
}
dMeter_Info.field_0x0[0] = 1;
dMeter_Info.field_0x0 = 1;
}
} else {
if (((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) && (!dComIfGp_checkMesgBgm())) {
@@ -1984,7 +1984,7 @@ s32 dMsg_stopProc(sub_msg_class* i_Msg) {
if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
dMsg_arrowInit(i_Msg);
}
dMeter_Info.field_0x0[0] = 2;
dMeter_Info.field_0x0 = 2;
if (dComIfGp_getDoStatusForce() == dActStts_CANCEL_e) {
mDoAud_seStart(JA_SE_TALK_SEL_CANCEL);
} else {
@@ -2005,7 +2005,7 @@ s32 dMsg_stopProc(sub_msg_class* i_Msg) {
if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
dMsg_arrowMove(i_Msg);
}
dMeter_Info.field_0x0[0] = 1;
dMeter_Info.field_0x0 = 1;
}
}
return TRUE;
@@ -2039,7 +2039,7 @@ s32 dMsg_selectProc(sub_msg_class* i_Msg) {
if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
dMsg_arrowMove(i_Msg);
}
dMeter_Info.field_0x0[0] = 1;
dMeter_Info.field_0x0 = 1;
} else {
if (i_Msg->mStatus == fopMsgStts_SELECT_YOKO_e) {
i_Msg->m026C[0].mUserArea = 2;
@@ -2179,9 +2179,9 @@ end:
s32 dMsg_inputProc(sub_msg_class* i_Msg) {
if (i_Msg->mMesgEntry.mTextboxType == 0xe) {
if (fopMsgM_tactMsgFlagCheck()) {
dMsg_tactInput(i_Msg);
} else {
dMsg_tactInput2(i_Msg);
} else {
dMsg_tactInput(i_Msg);
}
} else {
dMsg_numberInput(i_Msg);
@@ -2394,7 +2394,7 @@ s32 dMsg_continueProc(sub_msg_class* i_Msg) {
mDoAud_messageSePlay(i_Msg->mMesgEntry.mInitialSound, NULL, dComIfGp_getReverb(dComIfGp_roomControl_getStayNo()));
}
dMsg_setString(i_Msg);
dMeter_Info.field_0x0[0] = 2;
dMeter_Info.field_0x0 = 2;
if (dComIfGp_getDoStatusForce() == dActStts_CANCEL_e) {
mDoAud_seStart(JA_SE_TALK_SEL_CANCEL);
} else {
@@ -2464,7 +2464,7 @@ s32 dMsg_continueProc(sub_msg_class* i_Msg) {
if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
dMsg_arrowMove(i_Msg);
}
dMeter_Info.field_0x0[0] = 1;
dMeter_Info.field_0x0 = 1;
}
return TRUE;
}
@@ -2499,7 +2499,7 @@ s32 dMsg_closewaitProc(sub_msg_class* i_Msg) {
fopMsgM_setNowAlphaZero(&i_Msg->m050C);
}
i_Msg->m1100 = 0;
dMeter_Info.field_0x0[0] = 0;
dMeter_Info.field_0x0 = 0;
i_Msg->m116A++;
dComIfGp_setMesgSendButton(i_Msg->m116A);
} else {
@@ -2507,7 +2507,7 @@ s32 dMsg_closewaitProc(sub_msg_class* i_Msg) {
if ((bVar1 != 5) && (bVar1 != 0xe)) {
dMsg_dotMove(i_Msg);
}
dMeter_Info.field_0x0[0] = 4;
dMeter_Info.field_0x0 = 4;
}
} else {
i_Msg->mMsgDataProc.field_0x298 = 0;
@@ -2517,7 +2517,7 @@ s32 dMsg_closewaitProc(sub_msg_class* i_Msg) {
fopMsgM_setNowAlphaZero(&i_Msg->m050C);
}
i_Msg->m1100 = 0;
dMeter_Info.field_0x0[0] = 0;
dMeter_Info.field_0x0 = 0;
i_Msg->m116A++;
dComIfGp_setMesgSendButton(i_Msg->m116A);
}
@@ -2538,7 +2538,7 @@ s32 dMsg_finishProc(sub_msg_class* i_Msg) {
fopMsgM_setNowAlphaZero(&i_Msg->m050C);
}
i_Msg->m1100 = 0;
dMeter_Info.field_0x0[0] = 0;
dMeter_Info.field_0x0 = 0;
i_Msg->m116A++;
dComIfGp_setMesgSendButton(i_Msg->m116A);
if (i_Msg->mMsgNo == 0x1072) {
@@ -2548,7 +2548,7 @@ s32 dMsg_finishProc(sub_msg_class* i_Msg) {
if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
dMsg_dotMove(i_Msg);
}
dMeter_Info.field_0x0[0] = 4;
dMeter_Info.field_0x0 = 4;
}
return TRUE;
}
@@ -2563,7 +2563,7 @@ s32 dMsg_openTalkProc(sub_msg_class* i_Msg) {
mDoAud_messageSePlay(i_Msg->mMesgEntry.mInitialSound, NULL, dComIfGp_getReverb(dComIfGp_roomControl_getStayNo()));
}
dMsg_setString(i_Msg);
dMeter_Info.field_0x0[0] = 2;
dMeter_Info.field_0x0 = 2;
} else {
dMsg_frame_openTalk(i_Msg);
}
@@ -2599,7 +2599,7 @@ s32 dMsg_openItemProc(sub_msg_class* i_Msg) {
local_28.set(x, y, 0.0f);
i_Msg->m10B4[0] = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_02E1, &local_28);
}
dMeter_Info.field_0x0[0] = 2;
dMeter_Info.field_0x0 = 2;
} else {
dMsg_frame_openItem(i_Msg);
}
@@ -2688,7 +2688,7 @@ s32 dMsg_initProc(sub_msg_class* i_Msg) {
const char* pcVar3;
char acStack_28[24];
if ((dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4) != 0) || (fopMsgM_demoMsgFlagCheck())) {
if ((dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4)) || (fopMsgM_demoMsgFlagCheck())) {
pcVar3 = i_Msg->mpMesgStr;
if (((u8)pcVar3[0] == 0x1A) && ((u8)pcVar3[2] == 0x02)) {
dComIfGp_setMesgCameraTagInfo((s32)(u16)((((u8)pcVar3[3] << 8) & ~0xFFFF00FF) | (((u8)pcVar3[4]) & ~0xFF00)));
@@ -2744,7 +2744,7 @@ s32 dMsg_outnowProc(sub_msg_class* i_Msg) {
u32 iVar3;
if (i_Msg->mMesgCameraTagInfo != dComIfGp_getMesgCameraTagInfo()) {
if ((dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4) != 0) || (fopMsgM_demoMsgFlagCheck())) {
if ((dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4)) || (fopMsgM_demoMsgFlagCheck())) {
dMsg_mesgOutPos(i_Msg);
i_Msg->m10D8 = (int)i_Msg->m049C.mPosCenter.x;
i_Msg->m10DC = (int)i_Msg->m049C.mPosCenter.y;