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

Various cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-02-23 19:59:54 -05:00
parent 730b74e2e3
commit c4ad9f7241
84 changed files with 406 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1687,7 +1687,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_pfall"),
ActorRel(NonMatching, "d_a_obj_plant"),
ActorRel(NonMatching, "d_a_obj_rflw"),
ActorRel(Matching, "d_a_obj_rforce"),
ActorRel(Matching, "d_a_obj_rforce"),
ActorRel(NonMatching, "d_a_obj_smplbg"),
ActorRel(NonMatching, "d_a_obj_tapestry"),
ActorRel(NonMatching, "d_a_obj_tntrap"),
include/JSystem/J3DGraphBase/J3DMatBlock.h
+3 -3
View File
@@ -42,7 +42,7 @@ struct J3DGXColor {
class J3DTexGenBlock {
public:
virtual void reset(J3DTexGenBlock*) {}
virtual void calc(f32 const (*)[4]) = 0;
virtual void calc(const Mtx) = 0;
virtual void load() = 0;
virtual void patch() = 0;
virtual void diff(u32) = 0;
@@ -71,7 +71,7 @@ public:
void initialize();
virtual void reset(J3DTexGenBlock*);
virtual void calc(f32 const (*)[4]);
virtual void calc(const Mtx);
virtual void load() {}
virtual void patch();
virtual void diff(u32);
@@ -137,7 +137,7 @@ private:
class J3DTexGenBlockNull : public J3DTexGenBlock {
public:
virtual void calc(f32 const (*)[4]) {}
virtual void calc(const Mtx) {}
virtual void load() {}
virtual void patch() {}
virtual void diff(u32) {}
include/JSystem/J3DGraphBase/J3DShapeMtx.h
+4 -28
View File
@@ -1,31 +1,7 @@
#ifndef J3DSHAPEMTX_H
#define J3DSHAPEMTX_H
#include "dolphin/mtx/mtxvec.h"
class J3DTexMtx;
class J3DTexGenBlock;
class J3DTexMtxObj {
public:
Mtx& getMtx(u16 idx) { return mpTexMtx[idx]; }
private:
/* 0x00 */ Mtx* mpTexMtx;
};
class J3DDifferedTexMtx {
public:
static void loadExecute(f32 const (*)[4]);
static inline void load(Mtx m) {
if (sTexGenBlock != NULL)
loadExecute(m);
}
static J3DTexGenBlock* sTexGenBlock;
static J3DTexMtxObj* sTexMtxObj;
};
#include "dolphin/mtx/mtx.h"
class J3DShapeMtx {
public:
@@ -43,7 +19,7 @@ public:
virtual u32 getUseMtxNum() const { return 1; }
virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
virtual void load() const;
virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
virtual void calcNBTScale(Vec const&, Mtx33*, Mtx33*);
static MtxLoadIndx sMtxLoadPipeline[4];
static u32 sCurrentPipeline;
@@ -103,7 +79,7 @@ public:
virtual u32 getType() const { return 'SMCV'; }
virtual void load() const;
virtual void loadNrmMtx(int, u16) const {}
virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
virtual void loadNrmMtx(int, u16, Mtx) const;
void loadMtxConcatView_PNGP(int, u16) const;
void loadMtxConcatView_PCPU(int, u16) const;
@@ -178,7 +154,7 @@ public:
virtual u16 getUseMtxIndex(u16 i) const { return mUseMtxIndexTable[i]; }
virtual void load() const;
virtual void loadNrmMtx(int, u16) const {}
virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
virtual void loadNrmMtx(int, u16, Mtx) const;
private:
/* 0x8 */ u16 mUseMtxNum;
include/JSystem/J3DGraphBase/J3DTexture.h
+1 -4
View File
@@ -62,10 +62,6 @@ public:
J3DGDLoadTexMtxImm((Mtx&)mMtx, GX_TEXMTX0 + texMtxID * 3, (GXTexMtxType)mTexMtxInfo.mProjection);
};
void calc();
void calcTexMtx(f32 const (*)[4]);
void calcPostTexMtx(f32 const (*)[4]);
void loadTexMtx(u32) const;
void loadPostTexMtx(u32) const;
J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; }
Mtx& getMtx() { return mMtx; }
@@ -73,6 +69,7 @@ public:
Mtx& getViewMtx() { return mViewMtx; }
void setViewMtx(const Mtx viewMtx) { MTXCopy(viewMtx, mViewMtx); }
// TODO
void getTextureSRT() {}
private:
include/JSystem/J3DGraphBase/J3DTransform.h
+5 -5
View File
@@ -31,13 +31,13 @@ void J3DCalcYBBoardMtx(Mtx);
void J3DPSCalcInverseTranspose(f32 (*param_0)[4], f32 (*param_1)[3]);
void J3DGetTranslateRotateMtx(J3DTransformInfo const&, Mtx);
void J3DGetTranslateRotateMtx(s16, s16, s16, f32, f32, f32, Mtx);
void J3DGetTextureMtx(const J3DTextureSRTInfo&, Vec, f32(*)[4]);
void J3DGetTextureMtxOld(const J3DTextureSRTInfo&, Vec, f32(*)[4]);
void J3DGetTextureMtxMaya(const J3DTextureSRTInfo&, f32(*)[4]);
void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo&, f32(*)[4]);
void J3DGetTextureMtx(const J3DTextureSRTInfo&, Vec, Mtx);
void J3DGetTextureMtxOld(const J3DTextureSRTInfo&, Vec, Mtx);
void J3DGetTextureMtxMaya(const J3DTextureSRTInfo&, Mtx);
void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo&, Mtx);
void J3DScaleNrmMtx(Mtx, const Vec&);
void J3DScaleNrmMtx33(Mtx33, const Vec&);
void J3DMtxProjConcat(f32(*)[4], f32(*)[4], f32(*)[4]);
void J3DMtxProjConcat(Mtx, Mtx, Mtx);
void J3DPSMtx33Copy(Mtx3P src, Mtx3P dst);
void J3DPSMtx33CopyFrom34(MtxP src, Mtx3P dst);
include/JSystem/JAudio/JAIBasic.h
+2 -1
View File
@@ -4,6 +4,7 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JAudio/JAIBankWave.h"
#include "JSystem/JAudio/JAISound.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/mtx/vec.h"
class JKRSolidHeap;
@@ -33,7 +34,7 @@ public:
void initHeap();
void initArchive();
void initResourcePath();
void setCameraInfo(Vec*, Vec*, f32(*)[4], u32);
void setCameraInfo(Vec*, Vec*, MtxP, u32);
void initAudioThread(JKRSolidHeap*, u32, u8);
void initCamera();
BOOL initReadFile();
include/JSystem/JParticle/JPAMath.h
+7 -6
View File
@@ -2,14 +2,15 @@
#define JPAMATH_H
#include "JSystem/JGeometry.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
void JPAGetYZRotateMtx(s16, s16, f32(*)[4]);
void JPAGetXYZRotateMtx(s16, s16, s16, f32(*)[4]);
void JPAGetDirMtx(const JGeometry::TVec3<f32>&, f32(*)[4]);
void JPASetSVecfromMtx(f32(*)[4], JGeometry::TVec3<f32>&);
void JPASetRMtxTVecfromMtx(f32(*)[4], f32(*)[4], JGeometry::TVec3<f32>&);
void JPASetRMtxSTVecfromMtx(f32(*)[4], f32(*)[4], JGeometry::TVec3<f32>&, JGeometry::TVec3<f32>&);
void JPAGetYZRotateMtx(s16, s16, Mtx);
void JPAGetXYZRotateMtx(s16, s16, s16, Mtx);
void JPAGetDirMtx(const JGeometry::TVec3<f32>&, Mtx);
void JPASetSVecfromMtx(Mtx, JGeometry::TVec3<f32>&);
void JPASetRMtxTVecfromMtx(Mtx, Mtx, JGeometry::TVec3<f32>&);
void JPASetRMtxSTVecfromMtx(Mtx, Mtx, JGeometry::TVec3<f32>&, JGeometry::TVec3<f32>&);
f32 JPAGetKeyFrameValue(f32, u16, const f32*);
void JPAGetUnitVec(s16, s16, JGeometry::TVec3<f32>&);
include/JSystem/JStudio/JStudio_JStage/control.h
-14
View File
@@ -211,20 +211,6 @@ struct TAdaptor_light : public JStudio::TAdaptor_light {
/* 0x118 */ int _118;
}; // Size: 0x11C
void
transform_toGlobalFromLocal(f32 (*)[4],
JStudio::TControl::TTransform_translation_rotation_scaling const&,
JStage::TObject const*, u32);
void transform_toGlobalFromLocal(f32 (*)[4],
JStudio::TControl::TTransform_position const&,
JStage::TObject const*, u32);
void
transform_toLocalFromGlobal(f32 (*)[4],
JStudio::TControl::TTransform_translation_rotation_scaling const&,
JStage::TObject const*, u32);
void transform_toLocalFromGlobal(f32 (*)[4],
JStudio::TControl::TTransform_position const&,
JStage::TObject const*, u32);
}; // namespace JStudio_JStage
#endif /* JSTUDIO_JSTAGE_CONTROL_H */
include/SSystem/SComponent/c_bg_w.h
+2 -2
View File
@@ -158,7 +158,7 @@ public:
void MakeNodeTreeGrpRp(int);
void MakeNodeTree();
bool ChkMemoryError();
bool Set(cBgD_t*, u32, f32(*)[3][4]);
bool Set(cBgD_t*, u32, Mtx*);
bool RwgLineCheck(u16, cBgS_LinChk*);
bool LineCheckRp(cBgS_LinChk*, int);
bool LineCheckGrpRp(cBgS_LinChk*, int, int);
@@ -231,7 +231,7 @@ public:
return LineCheckGrpRp(chk, m_rootGrpIdx, 1);
}
void GetOldInvMtx(float(*)[4]) const {}
void GetOldInvMtx(Mtx) const {}
bool ChkFlush() { return mIgnorePlaneType & 8; }
void ChkGroundRegist() {}
void ChkRoofRegist() {}
include/d/actor/d_a_bk.h
+1 -1
View File
@@ -292,6 +292,6 @@ public:
/* 0x106 */ s16 m106;
/* 0x108 */ s16 m108;
/* 0x10A */ s16 m10A;
};
}; // Size: 0x10C
#endif /* D_A_BK_H */
include/d/actor/d_a_demo_item.h
+2 -2
View File
@@ -39,8 +39,8 @@ public:
};
namespace daDitem_prm {
inline u32 getNo(daDitem_c* item) { return (fopAcM_GetParam(item) >> 0x00) & 0xFF; }
inline u32 getFlag(daDitem_c* item) { return (fopAcM_GetParam(item) >> 0x10) & 0xFF; }
inline u32 getNo(daDitem_c* i_this) { return (fopAcM_GetParam(i_this) >> 0x00) & 0xFF; }
inline u32 getFlag(daDitem_c* i_this) { return (fopAcM_GetParam(i_this) >> 0x10) & 0xFF; }
};
#endif /* D_A_DEMO_ITEM_H */
include/d/actor/d_a_dr.h
-1
View File
@@ -35,7 +35,6 @@ public:
public:
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 m05[0x08 - 0x05];
/* 0x08 */ f32 mScale;
/* 0x0C */ bool m0C;
/* 0x0D */ u8 m0D[0x0E - 0x0D];
include/d/actor/d_a_fan.h
+1
View File
@@ -3,6 +3,7 @@
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"
class daFan_c : public dBgS_MoveBgActor {
include/d/actor/d_a_fm.h
+1 -1
View File
@@ -106,7 +106,7 @@ public:
void holeExecute();
void setHoleScale(float, float, float);
bool _execute();
void MtxToRot(float(*)[4], csXyz*);
void MtxToRot(Mtx, csXyz*);
void debugDraw();
void holeDraw();
void bodyDraw();
include/d/actor/d_a_item.h
+6 -6
View File
@@ -136,12 +136,12 @@ public:
STATIC_ASSERT(sizeof(daItem_c) == 0x6C0);
namespace daItem_prm {
inline u32 getType(daItem_c* item) { return (fopAcM_GetParam(item) & 0x03000000) >> 0x18; }
inline u32 getAction(daItem_c* item) { return (fopAcM_GetParam(item) & 0xFC000000) >> 0x1A; }
inline u32 getItemNo(daItem_c* item) { return (fopAcM_GetParam(item) & 0x000000FF) >> 0x00; }
inline u32 getItemBitNo(daItem_c* item) { return (fopAcM_GetParam(item) & 0x0000FF00) >> 0x08; }
inline u32 getSwitchNo(daItem_c* item) { return (item->home.angle.z & 0x00FF) >> 0; }
inline u32 getSwitchNo2(daItem_c* item) { return (fopAcM_GetParam(item) & 0x00FF0000) >> 0x10; }
inline u32 getType(daItem_c* i_this) { return (fopAcM_GetParam(i_this) & 0x03000000) >> 0x18; }
inline u32 getAction(daItem_c* i_this) { return (fopAcM_GetParam(i_this) & 0xFC000000) >> 0x1A; }
inline u32 getItemNo(daItem_c* i_this) { return (fopAcM_GetParam(i_this) & 0x000000FF) >> 0x00; }
inline u32 getItemBitNo(daItem_c* i_this) { return (fopAcM_GetParam(i_this) & 0x0000FF00) >> 0x08; }
inline u32 getSwitchNo(daItem_c* i_this) { return (i_this->home.angle.z & 0x00FF) >> 0; }
inline u32 getSwitchNo2(daItem_c* i_this) { return (fopAcM_GetParam(i_this) & 0x00FF0000) >> 0x10; }
};
#endif /* D_A_ITEM_H */
include/d/actor/d_a_npc_md.h
-2
View File
@@ -96,7 +96,6 @@ public:
public:
/* 0x004 */ s8 mNo;
/* 0x005 */ u8 m005[0x008 - 0x005];
/* 0x008 */ daNpc_Md_HIO2_c m008;
/* 0x034 */ daNpc_Md_HIO3_c m034;
/* 0x05C */ daNpc_Md_HIO4_c m05C;
@@ -179,7 +178,6 @@ public:
/* 0x1C6 */ u8 m1C6;
/* 0x1C7 */ u8 m1C7;
/* 0x1C8 */ u8 m1C8;
/* 0x1C9 */ u8 field_1C9[0x1CC - 0x1C9];
};
class daNpc_Md_followEcallBack_c : public dPa_levelEcallBack {
include/d/actor/d_a_npc_nz.h
+1 -1
View File
@@ -120,7 +120,7 @@ public:
public:
/* 0x00 - vtable */
/* 0x04 */ s8 field_0x04;
/* 0x04 */ s8 mNo;
/* 0x06 */ s16 field_0x06;
/* 0x08 */ s16 field_0x08;
/* 0x0A */ s16 field_0x0A;
include/d/actor/d_a_npc_os.h
+1 -1
View File
@@ -259,7 +259,7 @@ public:
public:
/* 0x00 - vtable*/
/* 0x04 */ s8 field_0x04;
/* 0x04 */ s8 mNo;
/* 0x08 */ daNpc_Os_HIO2_c mOs2;
/* 0x34 */ dNpc_HIO_c mNpc;
include/d/actor/d_a_obj_bscurtain.h
+1 -1
View File
@@ -28,7 +28,7 @@ public:
virtual ~daObj_Bscurtain_HIO_c() {}
public:
/* 0x04 */ s8 field_0x04;
/* 0x04 */ s8 mNo;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ u16 field_0x0c;
};
include/d/actor/d_a_obj_hole.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
daObj_Hole_HIO_c();
virtual ~daObj_Hole_HIO_c() {}
/* 0x04 */ s8 m04;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 m05;
/* 0x08 */ f32 m08;
/* 0x0C */ s16 m0C;
include/d/actor/d_a_obj_pbco.h
+5 -2
View File
@@ -23,11 +23,14 @@ public:
/* 0x29C */ dBgW* mpBgW;
/* 0x2A0 */ Mtx mMtx;
}; // Size: 0x2A0
class daObj_Pbco_HIO_c {
public:
daObj_Pbco_HIO_c();
virtual ~daObj_Pbco_HIO_c() {}
/* 0x04 */ s8 field_0x04;
}; // Size: 0x04
public:
/* 0x04 */ s8 mNo;
}; // Size: 0x08
#endif /* D_A_OBJ_PBCO_H */
include/d/actor/d_a_obj_roten.h
+1 -1
View File
@@ -39,7 +39,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 field_0x04;
/* 0x04 */ s8 mNo;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ s16 field_0x0C;
}; // Size: 0x0E
include/d/actor/d_a_obj_toripost.h
+1 -1
View File
@@ -122,7 +122,7 @@ public:
daObjTpost_HIO_c();
virtual ~daObjTpost_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x04 */ s8 mNo;
/* 0x05 */ bool debug_draw;
/* 0x06 */ s8 field_0x06;
/* 0x07 */ u8 field_0x07;
include/d/actor/d_a_player_main.h
+1 -1
View File
@@ -2204,7 +2204,7 @@ public:
struct TexAnmTableEntry {
/* 0x00 */ u16 mBtpIdx;
/* 0x04 */ u16 mBtkIdx;
/* 0x02 */ u16 mBtkIdx;
}; // Size: 0x04
static const TexAnmTableEntry mTexAnmIndexTable[];
include/d/actor/d_a_scene_change.h
+2 -2
View File
@@ -12,10 +12,10 @@ class daSceneChgHIO_c {
public:
daSceneChgHIO_c();
virtual ~daSceneChgHIO_c() {
m0004 = -1;
mNo = -1;
}
/* 0x04 */ s8 m0004;
/* 0x04 */ s8 mNo;
/* 0x05 */ s8 m0005;
/* 0x08 */ f32 m0008;
};
include/d/actor/d_a_shutter.h
+2 -2
View File
@@ -57,8 +57,8 @@ public:
};
namespace daShutter_prm {
inline u8 getSwitchNo(daShutter_c* item) { return (fopAcM_GetParam(item) >> 0) & 0xFF; }
inline u8 getType(daShutter_c* item) { return (fopAcM_GetParam(item) >> 8) & 0x0F; }
inline u8 getSwitchNo(daShutter_c* i_this) { return (fopAcM_GetParam(i_this) >> 0) & 0xFF; }
inline u8 getType(daShutter_c* i_this) { return (fopAcM_GetParam(i_this) >> 8) & 0x0F; }
}
#endif /* D_A_SHUTTER_H */
include/d/actor/d_a_shutter2.h
+2 -1
View File
@@ -2,6 +2,7 @@
#define D_A_SHUTTER2_H
#include "d/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
class daShutter2_c : public dBgS_MoveBgActor {
public:
@@ -48,7 +49,7 @@ public:
};
namespace daShutter2_prm {
inline u8 getSwitchNo(daShutter2_c* item) { return (fopAcM_GetParam(item) >> 0) & 0xFF; }
inline u8 getSwitchNo(daShutter2_c* i_this) { return (fopAcM_GetParam(i_this) >> 0) & 0xFF; }
}
#endif /* D_A_SHUTTER2_H */
include/d/actor/d_a_steam_tag.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
};
namespace daSteamTag_prm {
inline u8 getSchBit(daSteamTag_c* item) { return (fopAcM_GetParam(item) >> 2) & 0xFF; }
inline u8 getSchBit(daSteamTag_c* i_this) { return (fopAcM_GetParam(i_this) >> 2) & 0xFF; }
};
#endif /* D_A_STEAM_TAG_H */
include/d/actor/d_a_switem.h
+3 -3
View File
@@ -24,9 +24,9 @@ public:
};
namespace daSwItem_prm {
inline u32 getAtType(daSwItem_c* item) { return (fopAcM_GetParam(item) >> 0x00) & 0xFF; }
inline u32 getItemTbl(daSwItem_c* item) { return (fopAcM_GetParam(item) >> 0x08) & 0x3F; }
inline u32 getItemBitNo(daSwItem_c* item) { return (fopAcM_GetParam(item) >> 0x0E) & 0x7F; }
inline u32 getAtType(daSwItem_c* i_this) { return (fopAcM_GetParam(i_this) >> 0x00) & 0xFF; }
inline u32 getItemTbl(daSwItem_c* i_this) { return (fopAcM_GetParam(i_this) >> 0x08) & 0x3F; }
inline u32 getItemBitNo(daSwItem_c* i_this) { return (fopAcM_GetParam(i_this) >> 0x0E) & 0x7F; }
}
#endif /* D_A_SWITEM_H */
include/d/actor/d_a_tag_ghostship.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
daTag_Gship_HIO_c();
virtual ~daTag_Gship_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x05;
/* 0x08 */ u32 field_0x08;
/* 0x0C */ u32 field_0x0C;
include/d/actor/d_a_tbox.h
+10 -2
View File
@@ -20,6 +20,14 @@ public:
s16 closedColId;
s16 openColId;
};
enum {
daTboxFlg_UNK_01 = 0x01,
daTboxFlg_UNK_02 = 0x02,
daTboxFlg_UNK_04 = 0x04,
daTboxFlg_UNK_08 = 0x08,
daTboxFlg_UNK_10 = 0x10,
daTboxFlg_UNK_20 = 0x20,
};
typedef BOOL (daTbox_c::*ActionFunc)();
@@ -116,7 +124,7 @@ public:
/* 0x5C0 */ dBgS_AcchCir mAcchCir;
/* 0x600 */ dCcD_Stts mColStatus;
/* 0x63C */ dCcD_Cyl mColCyl;
/* 0x76C */ u8 mOpenedSwitch;
/* 0x76C */ u8 mTboxNo;
};
class daTbox_HIO_c : public JORReflexible {
@@ -127,7 +135,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mHioId;
/* 0x04 */ s8 mNo;
/* 0x06 */ s16 m06;
/* 0x08 */ s16 m08;
/* 0x0A */ s16 m0A;
include/d/d_bg_s_movebg_actor.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define D_BG_S_MOVEBG_ACTOR_H
#include "SSystem/SComponent/c_bg_s_poly_info.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_actor.h"
class dBgW;
typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo&, bool, cXyz*, csXyz*, csXyz*);
include/d/d_cc_d.h
+6 -3
View File
@@ -102,11 +102,14 @@ enum dCcG_At_Spl {
/* 0x1 */ dCcG_At_Spl_UNK1 = 1,
/* 0x3 */ dCcG_At_Spl_UNK3 = 3,
/* 0x6 */ dCcG_At_Spl_UNK6 = 6,
/* 0x8 */ dCcG_At_Spl_UNK8 = 8,
/* 0x9 */ dCcG_At_Spl_UNK9 = 9,
/* 0xB */ dCcG_At_Spl_UNKB = 0xB,
};
enum dCcG_Tg_Spl {};
enum dCcG_Tg_Spl {
/* 0x0 */ dCcG_Tg_Spl_UNK0 = 0,
};
struct dCcD_SrcGAtTgCoCommonBase {
/* 0x0 */ u32 mSPrm;
@@ -170,8 +173,8 @@ public:
void Ct();
void Move();
void ClrAt() { mAtSpl = 0; }
void ClrTg() { mTgSpl = 0; }
void ClrAt() { mAtSpl = dCcG_At_Spl_UNK0; }
void ClrTg() { mTgSpl = dCcG_Tg_Spl_UNK0; }
void SetAtApid(fpc_ProcID id) { mAtApid = id; }
void SetTgApid(fpc_ProcID id) { mTgApid = id; }
u8 GetRoomId() { return mRoomId; }
include/d/d_drawlist.h
+3 -3
View File
@@ -324,7 +324,7 @@ class dKy_tevstr_c;
class dDlst_shadowReal_c {
public:
void reset();
void imageDraw(f32 (*)[4]);
void imageDraw(Mtx);
void draw();
u32 set(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
u32 set2(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
@@ -340,7 +340,7 @@ public:
bool isUse() { return mState != 0; }
bool checkKey(u32 i_key) { return mKey == i_key; }
enum { MODEL_MAX = 0x1A };
static const int MODEL_MAX = 0x1A;
private:
/* 0x0000 */ u8 mState;
@@ -351,7 +351,7 @@ private:
/* 0x0008 */ Mtx mViewMtx;
/* 0x0038 */ Mtx44 mRenderProjMtx;
/* 0x0078 */ Mtx mReceiverProjMtx;
/* 0x00A8 */ void* mpTexData;
/* 0x00A8 */ u8* mpTexData;
/* 0x00AC */ dDlst_shadowRealPoly_c mShadowRealPoly;
/* 0x24B4 */ GXTexObj mTexObj;
/* 0x24D4 */ J3DDrawBuffer* mpDrawBuffer;
include/d/d_event_manager.h
-1
View File
@@ -3,7 +3,6 @@
#include "SSystem/SComponent/c_xyz.h"
#include "d/d_event_data.h"
#include "string.h"
class fopAc_ac_c;
include/d/d_lib.h
+1 -1
View File
@@ -103,7 +103,7 @@ void dLib_setAnm(const char*, mDoExt_McaMorf*, s8*, s8*, s8*, const dLib_anm_idx
void dLib_bcks_setAnm(const char* arcName, mDoExt_McaMorf* morf, s8* pBckIdx, s8* pPrmIdx,
s8* param_5, const int* bcksTbl, const dLib_anm_prm_c* anmPrmTbl, bool param_8);
void dLib_scaleAnime(f32* o_value, f32* p_targets, int targetNum, int* p_targetIdx, f32 scale, f32 maxStep, f32 minStep);
void dLib_getPosFromMtx(f32(*)[4], cXyz*);
void dLib_getPosFromMtx(MtxP, cXyz*);
bool dLib_pathInfo(dPath**, u8);
void dLib_pathMove(cXyz*, s8*, dPath*, f32, int (*)(cXyz*, cXyz*, cXyz*, void*), void*);
void dLib_setNextStageBySclsNum(u8 i_sclsnum, s8 room_no);
include/d/d_s_name.h
+1 -1
View File
@@ -23,7 +23,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 field_0x4;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ u8 field_0x7;
include/global.h
-3
View File
@@ -16,9 +16,6 @@
#define ASSERT(...)
#define LOGF(FMT, ...)
#define FLOAT_LABEL(x) (*(f32*)&x)
#define DOUBLE_LABEL(x) (*(f64*)&x)
#define _SDA_BASE_(dummy) 0
#define _SDA2_BASE_(dummy) 0
src/JAZelAudio/JAIZelBasic.cpp
+1 -1
View File
@@ -1721,7 +1721,7 @@ void JAIZelBasic::demoBgmStop(u32) {
/* 802AC758-802AC788 .text isDemo__11JAIZelBasicFv */
BOOL JAIZelBasic::isDemo() {
dDemo_manager_c* demo = dComIfGp_demo_get();
if (demo && demo->getMode()) {
if (demo && demo->getMode() != 0) {
return true;
}
return false;
src/JSystem/J3DGraphAnimator/J3DModel.cpp
+1 -1
View File
@@ -592,7 +592,7 @@ void calcViewBaseMtx(MtxP viewMtx, const Vec& scale, const Mtx& baseMtx, MtxP ds
MTXConcat(viewMtx, mtx, dstMtx);
}
extern void J3DPSMtxArrayConcat(f32(*)[4], f32(*)[4], f32(*)[4], u32);
extern void J3DPSMtxArrayConcat(Mtx, Mtx, Mtx, u32);
/* 802EEBDC-802EEE30 .text calcDrawMtx__8J3DModelFv */
void J3DModel::calcDrawMtx() {
src/JSystem/J3DGraphBase/J3DTransform.cpp
+15 -5
View File
@@ -14,9 +14,11 @@ f32 PSMulUnit01[2] = { 0.0f, -1.0f };
/* 802DA0A8-802DA0B0 .text __MTGQR7__FUl */
void __MTGQR7(register u32 v) {
asm {
#ifdef __MWERKS__
asm {
mtspr GQR7, v
}
#endif
}
/* 802DA0B0-802DA0E8 .text J3DGQRSetup7__FUlUlUlUl */
@@ -241,7 +243,8 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) {
void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
register f32 mtx_xy, mtx_z_, scl_xy, scl_z_;
asm {
#ifdef __MWERKS__
asm {
/* Row 0 */
psq_l scl_xy, 0(scl), 0, 0
psq_l mtx_xy, 0(mtx), 0, 0
@@ -272,6 +275,7 @@ void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
fmuls f4, mtx_z_, scl_z_
stfs f4, 40(mtx)
}
#endif
}
/* 802DAB68-802DABBC .text J3DScaleNrmMtx33__FPA3_fRC3Vec */
@@ -281,7 +285,8 @@ void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scl) {
register f32 mtx2_xy, mtx2_z_;
register f32 scl__xy, scl__z_;
asm {
#ifdef __MWERKS__
asm {
psq_l mtx0_xy, 0(mtx), 0, 0
psq_l scl__xy, 0(scl), 0, 0
lfs mtx0_z_, 8(mtx)
@@ -303,6 +308,7 @@ void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scl) {
psq_st mtx2_xy, 24(mtx), 0, 0
stfs mtx2_z_, 32(mtx)
}
#endif
}
/* 802DABBC-802DACE0 .text J3DMtxProjConcat__FPA4_fPA4_fPA4_f */
@@ -318,7 +324,8 @@ void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
register f32 x3_y3;
register f32 z3;
asm {
#ifdef __MWERKS__
asm {
psq_l x1_y1, 0(src), 0, 0
psq_l z1_x2, 8(src), 0, 0
psq_l y2_z2, 16(src), 0, 0
@@ -330,11 +337,13 @@ void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
psq_st x3_y3, 24(dst), 0, 0
stfs z3, 32(dst)
}
#endif
}
/* 802DAD0C-802DAD40 .text J3DPSMtx33CopyFrom34__FPA4_fPA3_f */
void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) {
asm {
#ifdef __MWERKS__
asm {
psq_l f0, 0(src), 0, 0
psq_st f0, 0(dst), 0, 0
lfs f1, 8(src)
@@ -348,6 +357,7 @@ void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) {
lfs f5, 40(src)
stfs f5, 32(dst)
}
#endif
}
/* 802DAD40-802DAE1C .text J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl */
src/JSystem/JKernel/JKRFileCache.cpp
+2 -1
View File
@@ -389,7 +389,8 @@ char* JKRFileCache::getDvdPathName(const char* path) const {
/* 802B7E60-802B7EA8 .text convStrLower__12JKRFileCacheCFPc */
void JKRFileCache::convStrLower(char* buffer) const {
while (*buffer) {
*buffer++ = tolower(*buffer);
*buffer = tolower(*buffer);
buffer++;
}
}
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c
+2
View File
@@ -3,6 +3,8 @@
#include "misc_io.h"
#include "string.h"
#include "wchar_io.h"
#include "FILE_POS.h"
#include "buffer_io.h"
size_t fwrite(const void* buffer, size_t size, size_t count, FILE* stream) {
size_t retval;
src/d/actor/d_a_bita.cpp
+1 -1
View File
@@ -194,7 +194,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_ac) {
if (i_this->mpBgW == NULL)
return FALSE;
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Bita", ita_dzb[type]);
if (i_this->mpBgW->Set(dzb, dBgW::MOVE_BG_e, &i_this->mMtx) == 1)
if (i_this->mpBgW->Set(dzb, dBgW::MOVE_BG_e, &i_this->mMtx) == true)
return FALSE;
i_this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);
src/d/actor/d_a_fm.cpp
+1 -1
View File
@@ -497,7 +497,7 @@ bool daFm_c::_execute() {
}
/* 00008564-000085A4 .text MtxToRot__6daFm_cFPA4_fP5csXyz */
void daFm_c::MtxToRot(float(*)[4], csXyz*) {
void daFm_c::MtxToRot(Mtx, csXyz*) {
/* Nonmatching */
}
src/d/actor/d_a_lbridge.cpp
+5 -1
View File
@@ -55,7 +55,11 @@ BOOL daLbridge_c::CreateHeap() {
mpBgW = new dBgW();
if (mpBgW != NULL) {
return mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, GBRG00_DZB_HHASHI1), cBgW::MOVE_BG_e, &mMtx) == true ? FALSE : TRUE;
if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, GBRG00_DZB_HHASHI1), cBgW::MOVE_BG_e, &mMtx) == true) {
return FALSE;
} else {
return TRUE;
}
}
return FALSE;
src/d/actor/d_a_msw.cpp
+2 -1
View File
@@ -237,7 +237,8 @@ BOOL daMsw_CreateInit(fopAc_ac_c* i_this) {
cBgD_t* pBgd = static_cast<cBgD_t*>(dComIfG_getObjectRes("Msw", MSW_DZB_MSWING));
if ((BOOL)pActor->mpBgW->Set(pBgd, cBgW::MOVE_BG_e, &pActor->mMtx) == TRUE) {
BOOL error = pActor->mpBgW->Set(pBgd, cBgW::MOVE_BG_e, &pActor->mMtx);
if (error == TRUE) {
return FALSE;
}
src/d/actor/d_a_npc_bs1.cpp
+27 -16
View File
@@ -1942,6 +1942,17 @@ BOOL daNpc_Bs1_c::privateCut() {
"GETTICKET",
};
enum {
ACT_TALKMSG,
ACT_CONTINUE_TALK,
ACT_JNTLOCK,
ACT_WAIT,
ACT_SETANM,
ACT_PRAISE,
ACT_MANTAN,
ACT_GETTICKET,
};
int staffId = dComIfGp_evmng_getMyStaffId(mEventCut.getActorName());
if (staffId == -1) {
return FALSE;
@@ -1952,47 +1963,47 @@ BOOL daNpc_Bs1_c::privateCut() {
} else {
if (dComIfGp_evmng_getIsAddvance(staffId)) {
switch (actIdx) {
case 0:
case ACT_TALKMSG:
evn_talk_init(staffId);
break;
case 1:
case ACT_CONTINUE_TALK:
evn_continue_talk_init(staffId);
break;
case 2:
case ACT_JNTLOCK:
evn_jnt_lock_init(staffId);
break;
case 3:
case ACT_WAIT:
evn_wait_init(staffId);
break;
case 4:
case ACT_SETANM:
evn_set_anm_init(staffId);
break;
case 5:
case ACT_PRAISE:
evn_praise_init();
break;
case 6:
case ACT_MANTAN:
evn_mantan_init();
break;
case 7:
case ACT_GETTICKET:
dComIfGs_setReserveItemEmpty();
break;
}
}
BOOL r3;
BOOL end;
switch (actIdx) {
case 0x0:
case 0x1:
r3 = evn_talk();
case ACT_TALKMSG:
case ACT_CONTINUE_TALK:
end = evn_talk();
break;
case 0x3:
r3 = evn_wait();
case ACT_WAIT:
end = evn_wait();
break;
default:
r3 = TRUE;
end = TRUE;
break;
}
if (r3) {
if (end) {
dComIfGp_evmng_cutEnd(staffId);
}
}
src/d/actor/d_a_npc_nz.cpp
+1 -1
View File
@@ -185,7 +185,7 @@ BOOL daNpc_Nz_c::_createHeap() {
/* 00000F98-00001010 .text __ct__14daNpc_Nz_HIO_cFv */
daNpc_Nz_HIO_c::daNpc_Nz_HIO_c() {
field_0x04 = -1;
mNo = -1;
field_0x06 = 0x1F40;
field_0x08 = 0x1F40;
field_0x0A = 0;
src/d/actor/d_a_npc_os.cpp
+6 -6
View File
@@ -121,7 +121,7 @@ daNpc_Os_HIO_c::daNpc_Os_HIO_c() {
field_0xA8 = 0.75f;
field_0xAC = 18.0f;
field_0xB0 = 8.0f;
field_0x04 = -1;
mNo = -1;
}
/* 00000300-00000354 .text searchFromName__FPcUlUl */
@@ -165,8 +165,8 @@ s32 daNpc_Os_c::create() {
setBaseMtx();
fopAcM_SetMtx(this, mpMorf->mpModel->getBaseTRMtx());
if(l_HIO.field_0x04 < 0) {
l_HIO.field_0x04 = mDoHIO_createChild("お供石像", &l_HIO); // "Companion Statue" (otomo sekizou)
if(l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("お供石像", &l_HIO); // "Companion Statue" (otomo sekizou)
l_HIO.field_0x5C = this;
l_hio_counter = 1;
}
@@ -2349,9 +2349,9 @@ daNpc_Os_c::~daNpc_Os_c() {
l_hio_counter -= 1;
}
if(l_hio_counter <= 0 && l_HIO.field_0x04 >= 0) {
mDoHIO_deleteChild(l_HIO.field_0x04);
l_HIO.field_0x04 = -1;
if(l_hio_counter <= 0 && l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
}
m_playerRoom[subtype] = false;
src/d/actor/d_a_obj_bscurtain.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ daObj_Bscurtain_HIO_c l_HIO;
/* 000000EC-00000118 .text __ct__21daObj_Bscurtain_HIO_cFv */
daObj_Bscurtain_HIO_c::daObj_Bscurtain_HIO_c() {
field_0x04 = -1;
mNo = -1;
field_0x08 = 0.0f;
field_0x0c = 0;
}
src/d/actor/d_a_obj_ferris.cpp
+2 -2
View File
@@ -111,7 +111,7 @@ bool daObjFerris::Act_c::create_heap() {
if (bgw_data_gondola != NULL) {
for (i = 0; i < 5; i++) {
mpBgW[i] = new dBgW();
if (mpBgW[i] != NULL && mpBgW[i]->Set(bgw_data_gondola, dBgW::MOVE_BG_e, &mMtx[i]) == 1)
if (mpBgW[i] != NULL && mpBgW[i]->Set(bgw_data_gondola, dBgW::MOVE_BG_e, &mMtx[i]) == true)
return false;
}
}
@@ -120,7 +120,7 @@ bool daObjFerris::Act_c::create_heap() {
JUT_ASSERT(0x1b0, bgw_data_wheelbase != NULL);
if (bgw_data_wheelbase != NULL) {
mpBgW[5] = new dBgW();
if (mpBgW[5] != NULL && mpBgW[5]->Set(bgw_data_wheelbase, dBgW::MOVE_BG_e, &mMtx[5]) == 1)
if (mpBgW[5] != NULL && mpBgW[5]->Set(bgw_data_wheelbase, dBgW::MOVE_BG_e, &mMtx[5]) == true)
return false;
}
src/d/actor/d_a_obj_hole.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_actor) {
/* 0000010C-00000148 .text __ct__16daObj_Hole_HIO_cFv */
daObj_Hole_HIO_c::daObj_Hole_HIO_c() {
m04 = -1;
mNo = -1;
m05 = 0;
m08 = 65.0f;
m0C = 0;
src/d/actor/d_a_obj_pbco.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ const char daObj_Pbco_c::M_arcname[] = "Pbco";
/* 000000EC-00000104 .text __ct__16daObj_Pbco_HIO_cFv */
daObj_Pbco_HIO_c::daObj_Pbco_HIO_c() {
field_0x04 = -1;
mNo = -1;
}
/* 00000104-0000018C .text set_mtx__12daObj_Pbco_cFv */
src/d/actor/d_a_obj_roten.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ daObj_Roten_HIO_c l_HIO;
/* 000000EC-00000118 .text __ct__17daObj_Roten_HIO_cFv */
daObj_Roten_HIO_c::daObj_Roten_HIO_c() {
field_0x04 = -1;
mNo = -1;
field_0x08 = 0.0f;
field_0x0C = 0;
}
src/d/actor/d_a_obj_toripost.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ BOOL daObjTpost_c::_createHeap() {
/* 0000022C-00000280 .text __ct__16daObjTpost_HIO_cFv */
daObjTpost_HIO_c::daObjTpost_HIO_c() {
field_0x04 = -1;
mNo = -1;
debug_draw = false;
field_0x06 = 0;
field_0x07 = 0;
src/d/actor/d_a_obj_zouK.cpp
+2 -2
View File
@@ -97,7 +97,7 @@ bool daObjZouk::Act_c::create_heap() {
if (bgw_data_before != NULL) {
mBgBefore = new dBgW();
if (mBgBefore != NULL) {
if (mBgBefore->Set(bgw_data_before, dBgW::MOVE_BG_e, &mBgMtx) == 1)
if (mBgBefore->Set(bgw_data_before, dBgW::MOVE_BG_e, &mBgMtx) == true)
return false;
}
}
@@ -107,7 +107,7 @@ bool daObjZouk::Act_c::create_heap() {
if (bgw_data_after != NULL) {
mBgAfter = new dBgW();
if (mBgAfter != NULL) {
if (mBgAfter->Set(bgw_data_after, dBgW::MOVE_BG_e, &mBgMtx) == 1)
if (mBgAfter->Set(bgw_data_after, dBgW::MOVE_BG_e, &mBgMtx) == true)
return false;
}
}
src/d/actor/d_a_pedestal.cpp
+5 -1
View File
@@ -47,7 +47,11 @@ BOOL daPds_c::CreateHeap() {
mpBgW = new dBgW();
if (mpBgW != NULL) {
return mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, HDAI1_DZB_HDAI), cBgW::MOVE_BG_e, &mMtx) == true ? FALSE : TRUE;
if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, HDAI1_DZB_HDAI), cBgW::MOVE_BG_e, &mMtx) == true) {
return FALSE;
} else {
return TRUE;
}
}
return FALSE;
src/d/actor/d_a_player_main.cpp
+1 -1
View File
@@ -3220,7 +3220,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_
/* 80120BBC-80120BE0 .text checkSuccessGuard__9daPy_lk_cFi */
BOOL daPy_lk_c::checkSuccessGuard(int atSpl) {
if (!mCyl.ChkTgShieldHit() || atSpl >= 8) {
if (!mCyl.ChkTgShieldHit() || atSpl >= dCcG_At_Spl_UNK8) {
return FALSE;
}
return TRUE;
src/d/actor/d_a_scene_change.cpp
+1 -2
View File
@@ -7,14 +7,13 @@
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_mtx.h"
#include "m_Do/m_Do_hostIO.h"
#include "d/d_procname.h"
static daSceneChgHIO_c l_HIO;
/* 000000EC-00000118 .text __ct__15daSceneChgHIO_cFv */
daSceneChgHIO_c::daSceneChgHIO_c() {
m0004 = 0xFF;
mNo = -1;
m0005 = 0;
m0008 = 100.0f;
}
src/d/actor/d_a_shutter.cpp
+31 -16
View File
@@ -44,7 +44,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000128-000002B8 .text CreateHeap__11daShutter_cFv */
BOOL daShutter_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname[mType], m_bdlidx[mType]);
JUT_ASSERT(0x121, modelData != 0);
JUT_ASSERT(0x121, modelData != NULL);
for (int i = 0; i < (int)ARRAY_SIZE(mMtx); i++) {
mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (!mpModel[i]) {
@@ -142,32 +142,43 @@ bool daShutter_c::_execute() {
/* 00000788-00000B14 .text shutter_move__11daShutter_cFv */
void daShutter_c::shutter_move() {
static char* action_table[] = {"WAIT", "WAIT02", "OPEN", "CLOSE"};
static char* action_table[] = {
"WAIT",
"WAIT02",
"OPEN",
"CLOSE",
};
enum {
ACT_WAIT,
ACT_WAIT02,
ACT_OPEN,
ACT_CLOSE,
};
int actionIndex = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), FALSE, 0);
float maxVel = m_max_speed[mType];;
float maxVel = m_max_speed[mType];
float minVel = m_min_speed[mType];
float fVar4;
float fVar5;
switch (actionIndex) {
case 0: //WAIT
case ACT_WAIT:
{
mTimer = 0xf;
field_0x33A = 0;
dComIfGp_evmng_cutEnd(mStaffId);
return;
break;
}
case 1: //WAIT02
case ACT_WAIT02:
{
if (!cLib_calcTimer(&mTimer)) {
field_0x339 = 0;
dComIfGp_evmng_cutEnd(mStaffId);
}
return;
break;
}
case 2: //OPEN
case ACT_OPEN:
{
field_0x33A++;
if (field_0x339 == 0) {
@@ -183,15 +194,15 @@ void daShutter_c::shutter_move() {
dComIfGp_getVibration().StartShock(4, -0x21, cXyz(0.0f, 1.0f, 0.0f));
}
if (fVar4 != 0.0f){
return;
break;
}
if (fVar5 != 0.0f) {
return;
break;
}
dComIfGp_evmng_cutEnd(mStaffId);
return;
break;
}
case 3: //CLOSE
case ACT_CLOSE:
{
if (field_0x339 == 0) {
field_0x339 = 1;
@@ -199,16 +210,20 @@ void daShutter_c::shutter_move() {
fVar4 = cLib_addCalc(&mcXyz[0].x, -m_width[mType] / 2.0f, 0.1f, maxVel, minVel);
fVar5 = cLib_addCalc(&mcXyz[1].x, m_width[mType] / 2.0f, 0.1f, maxVel, minVel);
if (fVar4 != 0.0f) {
return;
break;
}
if (fVar5 != 0.0f) {
return;
break;
}
dComIfGp_evmng_cutEnd(mStaffId);
return;
break;
}
default:
{
dComIfGp_evmng_cutEnd(mStaffId);
break;
}
}
dComIfGp_evmng_cutEnd(mStaffId);
}
/* 00000B14-00000CF0 .text demo__11daShutter_cFv */
src/d/actor/d_a_shutter2.cpp
+24 -9
View File
@@ -6,7 +6,6 @@
#include "d/actor/d_a_shutter2.h"
#include "d/d_procname.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/res/res_htobi3.h"
const float daShutter2_c::m_max_speed[1] = {3.0f};
@@ -73,10 +72,14 @@ int daShutter2_c::Create() {
s32 daShutter2_c::_create() {
fopAcM_SetupActor(this, daShutter2_c);
mType = 0;
if ((dComIfG_resLoad(&mPhs, m_arcname[mType]) == cPhs_COMPLEATE_e) &&
(MoveBGCreate(m_arcname[mType], m_dzbidx[mType], NULL, m_heapsize[mType]) == cPhs_ERROR_e)) {
return cPhs_ERROR_e;
int phase_state = dComIfG_resLoad(&mPhs, m_arcname[mType]);
if (phase_state == cPhs_COMPLEATE_e) {
phase_state = MoveBGCreate(m_arcname[mType], m_dzbidx[mType], NULL, m_heapsize[mType]);
if (phase_state == cPhs_ERROR_e) {
phase_state = cPhs_ERROR_e;
}
}
return phase_state;
}
/* 0000041C-000004AC .text set_mtx__12daShutter2_cFv */
@@ -103,25 +106,36 @@ BOOL daShutter2_c::Execute(Mtx** pMtx) {
void daShutter2_c::shutter_move() {
float fVar3;
static char* action_table[4] = {"WAIT", "OPEN", "CLOSE", "OPEN_INIT"};
static char* action_table[4] = {
"WAIT",
"OPEN",
"CLOSE",
"OPEN_INIT",
};
enum {
ACT_WAIT,
ACT_OPEN,
ACT_CLOSE,
ACT_OPEN_INIT,
};
int actionIndex = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), FALSE, 0);
float maxVel = m_max_speed[mType];
float minVel = m_min_speed[mType];
switch (actionIndex) {
case 0: //WAIT
case ACT_WAIT:
{
dComIfGp_evmng_cutEnd(mStaffId);
break;
}
case 3: //OPEN_INIT
case ACT_OPEN_INIT:
{
fopAcM_seStart(this, JA_SE_OBJ_WDUN_R04_STR_OP, 0);
dComIfGp_evmng_cutEnd(mStaffId);
break;
}
case 1: //OPEN
case ACT_OPEN:
{
fVar3 = cLib_addCalc(&current.pos.y, home.pos.y + 350.0f, 0.1f, maxVel, minVel);
if (fVar3 == 0.0f){
@@ -130,7 +144,7 @@ void daShutter2_c::shutter_move() {
break;
}
case 2: //CLOSE
case ACT_CLOSE:
{
fVar3 = cLib_addCalc(&current.pos.y, home.pos.y, 0.1f, maxVel, minVel);
if (fVar3 == 0.0f){
@@ -140,6 +154,7 @@ void daShutter2_c::shutter_move() {
}
default:
dComIfGp_evmng_cutEnd(mStaffId);
break;
}
return;
}
src/d/actor/d_a_tag_ghostship.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ static daTag_Gship_HIO_c l_HIO;
/* 000000EC-0000010C .text __ct__17daTag_Gship_HIO_cFv */
daTag_Gship_HIO_c::daTag_Gship_HIO_c() {
field_0x04 = -1;
mNo = -1;
field_0x05 = 0;
}
src/d/actor/d_a_tbox.cpp
+51 -50
View File
@@ -20,11 +20,6 @@
#include "m_Do/m_Do_mtx.h"
#define DEMO_PROC_WAIT 0
#define DEMO_PROC_OPEN 1
#define DEMO_PROC_APPEAR 2
#define DEMO_PROC_OPEN_SHORT 3
#define FUNC_TYPE_NORMAL 0
#define FUNC_TYPE_SWITCH 1
#define FUNC_TYPE_ENEMIES 2
@@ -78,7 +73,7 @@ static daTbox_c::modelInfo l_modelInfo[] = {
/* 000000EC-00000124 .text __ct__12daTbox_HIO_cFv */
daTbox_HIO_c::daTbox_HIO_c() {
mHioId = -1;
mNo = -1;
m06 = 0x82;
m08 = 0xB4;
m0A = 0x30;
@@ -242,7 +237,7 @@ s32 daTbox_c::bgCheckSet() {
return cPhs_ERROR_e;
}
if (mpBgWClosed->Set(bgd, cBgW::MOVE_BG_e, &mMtx) == 1) {
if (mpBgWClosed->Set(bgd, cBgW::MOVE_BG_e, &mMtx) == true) {
return cPhs_ERROR_e;
}
@@ -254,7 +249,7 @@ s32 daTbox_c::bgCheckSet() {
return cPhs_ERROR_e;
}
if (mpBgWOpen->Set(bgd, cBgW::MOVE_BG_e, &mMtx) == 1) {
if (mpBgWOpen->Set(bgd, cBgW::MOVE_BG_e, &mMtx) == true) {
return cPhs_ERROR_e;
}
@@ -267,7 +262,7 @@ s32 daTbox_c::bgCheckSet() {
return cPhs_ERROR_e;
}
if (mpBgWVines->Set(bgd, cBgW::MOVE_BG_e, &mMtx) == 1) {
if (mpBgWVines->Set(bgd, cBgW::MOVE_BG_e, &mMtx) == true) {
return cPhs_ERROR_e;
}
}
@@ -290,7 +285,7 @@ void daTbox_c::searchRoomNo() {
mRoomNo = home.angle.x & 0x3F;
}
if (flagCheck(0x02)) {
if (flagCheck(daTboxFlg_UNK_02)) {
clrDzb();
}
else if (mRoomNo != -1 && mpBgWCurrent == NULL) {
@@ -376,12 +371,12 @@ void daTbox_c::setDzb() {
/* 00000ECC-00000F8C .text surfaceProc__8daTbox_cFv */
void daTbox_c::surfaceProc() {
if (mpBgWCurrent != NULL && flagCheck(0x20)) {
if (mpBgWCurrent != NULL && flagCheck(daTboxFlg_UNK_20)) {
if (m03EC < -1.0f) {
m03EC += 1.0f;
}
else {
flagOff(0x20);
flagOff(daTboxFlg_UNK_20);
m03EC = 0.0f;
}
@@ -496,29 +491,29 @@ void daTbox_c::CreateInit() {
frameCtrl->setFrame(frameCtrl->getEnd());
}
else {
flagOn(0x04);
flagOn(daTboxFlg_UNK_04);
switch (funcType) {
case FUNC_TYPE_ENEMIES:
setAction(&daTbox_c::actionGenocide);
mGenocideDelayTimer = 0x41;
flagOn(0x03);
flagOn(daTboxFlg_UNK_01 | daTboxFlg_UNK_02);
mAppearTimer = 0x78;
break;
case FUNC_TYPE_SWITCH:
case FUNC_TYPE_EXTRA_SAVE_INFO_SPAWN:
setAction(&daTbox_c::actionSwOnWait);
flagOn(0x03);
flagOn(daTboxFlg_UNK_01 | daTboxFlg_UNK_02);
mAppearTimer = 0x78;
break;
case FUNC_TYPE_TACT:
setAction(&daTbox_c::actionSwOnWait);
flagOn(0x03);
flagOn(daTboxFlg_UNK_01 | daTboxFlg_UNK_02);
mAppearTimer = l_HIO.m08;
break;
case FUNC_TYPE_SWITCH_TRANSPARENT:
setAction(&daTbox_c::actionSwOnWait);
flagOn(0x02);
flagOn(daTboxFlg_UNK_02);
mAppearTimer = 0x5A;
mpAppearRegAnm->setFrame(30.0f);
@@ -536,8 +531,8 @@ void daTbox_c::CreateInit() {
lightReady();
mAllColRatio = 1.0f;
if (l_HIO.mHioId < 0) {
l_HIO.mHioId = mDoHIO_createChild("宝箱", &l_HIO); // "Treasure Chest"
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("宝箱", &l_HIO); // "Treasure Chest"
}
shape_angle.z = 0;
@@ -561,7 +556,7 @@ void daTbox_c::CreateInit() {
gravity = -2.5f;
}
mOpenedSwitch = getTboxNo();
mTboxNo = getTboxNo();
}
/* 00001560-00001624 .text boxCheck__8daTbox_cFv */
@@ -656,7 +651,7 @@ void daTbox_c::demoProcOpen() {
mFlashRegAnm.setPlaySpeed(1.0f);
mAllColRatio = 0.4f;
flagOn(0x08);
flagOn(daTboxFlg_UNK_08);
}
darkProc();
@@ -696,12 +691,12 @@ void daTbox_c::demoInitAppear() {
/* 00001B38-00001CF4 .text demoProcAppear_Tact__8daTbox_cFv */
void daTbox_c::demoProcAppear_Tact() {
if (mAppearTimer == l_HIO.m08 - l_HIO.m06) {
flagOff(1);
flagOff(daTboxFlg_UNK_01);
mInvisibleScrollVal = 2.0f;
mpAppearRegAnm->setFrame(mpAppearRegAnm->getEndFrame());
mpAppearRegAnm->play();
flagOff(4);
flagOff(daTboxFlg_UNK_04);
}
mTactPlatformBrk.play();
@@ -755,7 +750,7 @@ void daTbox_c::demoProcAppear() {
if (mpAppearRegAnm->play()) {
dComIfGp_evmng_cutEnd(mStaffId);
flagOff(4);
flagOff(daTboxFlg_UNK_04);
}
}
@@ -765,7 +760,13 @@ s32 daTbox_c::demoProc() {
"WAIT",
"OPEN",
"APPEAR",
"OPEN_SHORT"
"OPEN_SHORT",
};
enum {
ACT_WAIT,
ACT_OPEN,
ACT_APPEAR,
ACT_OPEN_SHORT,
};
s32 actionIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), FALSE, 0);
@@ -775,36 +776,36 @@ s32 daTbox_c::demoProc() {
mHasOpenAnmFinished = false;
switch (actionIdx) {
case DEMO_PROC_OPEN:
case ACT_OPEN:
OpenInit();
lightReady();
mPLight.mPower = 0.0f;
mEfLight.mPower = 0.0f;
break;
case DEMO_PROC_APPEAR:
flagOn(0x20);
case ACT_APPEAR:
flagOn(daTboxFlg_UNK_20);
m03EC = -130.0f;
setDzb();
if (getFuncType() == FUNC_TYPE_TACT) {
flagOff(0x02);
flagOff(daTboxFlg_UNK_02);
demoInitAppear_Tact();
}
else {
flagOff(0x03);
flagOff(daTboxFlg_UNK_01 | daTboxFlg_UNK_02);
demoInitAppear();
}
break;
case DEMO_PROC_OPEN_SHORT:
case ACT_OPEN_SHORT:
OpenInit_com();
break;
}
}
switch (actionIdx) {
case DEMO_PROC_APPEAR:
case ACT_APPEAR:
if (getFuncType() == FUNC_TYPE_TACT) {
demoProcAppear_Tact();
}
@@ -814,7 +815,7 @@ s32 daTbox_c::demoProc() {
surfaceProc();
break;
case DEMO_PROC_OPEN:
case ACT_OPEN:
if (mHasOpenAnmFinished) {
dComIfGp_evmng_cutEnd(mStaffId);
}
@@ -826,7 +827,7 @@ s32 daTbox_c::demoProc() {
}
}
break;
case DEMO_PROC_OPEN_SHORT:
case ACT_OPEN_SHORT:
if (mHasOpenAnmFinished) {
dComIfGp_evmng_cutEnd(mStaffId);
}
@@ -843,11 +844,11 @@ s32 daTbox_c::demoProc() {
break;
}
if (flagCheck(0x10)) {
if (flagCheck(daTboxFlg_UNK_10)) {
demoProcOpen();
}
if (flagCheck(0x08)) {
if (flagCheck(daTboxFlg_UNK_08)) {
dKy_set_allcol_ratio(mAllColRatio);
}
@@ -889,7 +890,7 @@ void daTbox_c::OpenInit() {
mIsFlashPlaying = TRUE;
mOpenTimer = 0;
flagOn(0x10);
flagOn(daTboxFlg_UNK_10);
dComIfGp_particle_set(0x01F1, &current.pos, &current.angle);
dComIfGp_particle_set(0x01F2, &current.pos, &current.angle);
@@ -930,7 +931,7 @@ BOOL daTbox_c::actionDemo() {
dKy_set_allcol_ratio(1.0f);
flagOff(0x18);
flagOff(daTboxFlg_UNK_08 | daTboxFlg_UNK_10);
dComIfGp_event_setItemPartner(NULL);
if (mSmokeEmitter != NULL) {
@@ -977,7 +978,7 @@ BOOL daTbox_c::actionOpenWait() {
mDoAud_subBgmStart(JA_BGM_OPEN_BOX);
mAllColRatio = 0.4f;
flagOn(0x08);
flagOn(daTboxFlg_UNK_08);
dKy_set_allcol_ratio(mAllColRatio);
lightReady();
@@ -1064,21 +1065,21 @@ BOOL daTbox_c::actionGenocide() {
/* 00002C10-00002FB0 .text draw__8daTbox_cFv */
BOOL daTbox_c::draw() {
u8 openFlag;
u8 tboxNo;
if (mRoomNo != -1 && !checkRoomDisp(mRoomNo)) {
return TRUE;
}
if (flagCheck(0x01) || (checkEnv() && flagCheck(0x04))) {
openFlag = mOpenedSwitch;
if (flagCheck(daTboxFlg_UNK_01) || (checkEnv() && flagCheck(daTboxFlg_UNK_04))) {
tboxNo = mTboxNo;
}
else {
openFlag = 0xFF;
tboxNo = 0xFF;
}
if (!checkOpen()) {
dMap_drawPoint(5, current.pos.x, current.pos.y, current.pos.z, mRoomNo, -0x8000, openFlag, gbaName, 0);
dMap_drawPoint(5, current.pos.x, current.pos.y, current.pos.z, mRoomNo, -0x8000, tboxNo, gbaName, 0);
}
tevStr.mRoomNo = mRoomNo;
@@ -1092,7 +1093,7 @@ BOOL daTbox_c::draw() {
mDoExt_modelUpdateDL(mpTactPlatformMdl);
}
if (flagCheck(0x01)) {
if (flagCheck(daTboxFlg_UNK_01)) {
return TRUE;
}
@@ -1108,7 +1109,7 @@ BOOL daTbox_c::draw() {
mpAppearRegAnm->entry(chestMdlData);
}
if (checkEnv() && flagCheck(0x04)) {
if (checkEnv() && flagCheck(daTboxFlg_UNK_04)) {
float scrollOffset = mInvisibleScrollVal - -2.0f;
s8 offsetAsU8 = scrollOffset;
@@ -1127,7 +1128,7 @@ BOOL daTbox_c::draw() {
}
}
if (flagCheck(0x04)) {
if (flagCheck(daTboxFlg_UNK_04)) {
dComIfGd_setListInvisisble();
mDoExt_modelUpdateDL(mpChestMdl);
dComIfGd_setList();
@@ -1226,9 +1227,9 @@ static s32 daTbox_Delete(daTbox_c* i_tbox) {
i_tbox->mSmokeCB.end();
dComIfG_resDelete(i_tbox->getPhase(), "Dalways");
if (l_HIO.mHioId >= 0) {
mDoHIO_deleteChild(l_HIO.mHioId);
l_HIO.mHioId = -1;
if (l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
}
return TRUE;
src/d/actor/d_a_tori_flag.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* 000000EC-00000118 .text __ct__17daTori_Flag_HIO_cFv */
daTori_Flag_HIO_c::daTori_Flag_HIO_c() {
mNo = -0x1;
mNo = -1;
someFloat = 0.0f;
someShort = 0;
return;
@@ -82,7 +82,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
BOOL daTori_Flag_c::CreateHeap() {
BOOL ret;
J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(M_arcname, TRFLAG_BDL_ETHATA);
JUT_ASSERT(0x120, modelData != 0);
JUT_ASSERT(0x120, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (mpModel == NULL) {
ret = FALSE;
src/d/actor/d_a_ygcwp.cpp
+2 -2
View File
@@ -33,7 +33,7 @@ static void dummy() {
OSReport("fg_warp1");
}
static const char* M_act_table[] = {
static char* M_act_table[] = {
"warp_start",
"warp_appear",
"warp_make",
@@ -144,7 +144,7 @@ bool daYgcwp_c::_execute() {
daPy_py_c* player = daPy_getPlayerActorClass();
mStaffId = dComIfGp_evmng_getMyStaffId(M_arcname);
if (mStaffId != -1) {
int actIdx = dComIfGp_evmng_getMyActIdx(mStaffId, (char**)M_act_table, ARRAY_SIZE(M_act_table), FALSE, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(mStaffId, M_act_table, ARRAY_SIZE(M_act_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(mStaffId)) {
switch (actIdx) {
case EVENT_WARP_START:
src/d/d_attention.cpp
+1 -1
View File
@@ -516,7 +516,7 @@ void dAttDraw_c::setAnm(int, int, int) {
}
/* 8009F6B4-8009F834 .text draw__10dAttDraw_cFR4cXyzPA4_f */
void dAttDraw_c::draw(cXyz&, f32(*)[4]) {
void dAttDraw_c::draw(cXyz&, Mtx) {
/* Nonmatching */
}
src/d/d_bg_w_deform.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
/* 800A9928-800A9A48 .text Set__10dBgWDeformFP6cBgD_tP8J3DModelUl */
bool dBgWDeform::Set(cBgD_t* bgd, J3DModel* pmodel, u32 flag) {
JUT_ASSERT(32, pmodel->getModelData()->isDeformablePositionFormat() == true);
if (cBgW::Set(bgd, 0x33, NULL)) {
if (cBgW::Set(bgd, MOVE_BG_e | NO_CALC_VTX_e | NO_VTX_TBL_e | GLOBAL_e, NULL)) {
return true;
}
SetFlag(flag);
src/d/d_bg_w_hf.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ bool dBgWHf::Set(cBgD_t* bgd, u16* r5, f32 f1, int r6, int r7, u32 flag) {
m_gridz = r7;
mC8 = r5;
mC4 = f1;
if (cBgW::Set(bgd, 0x33, NULL)) {
if (cBgW::Set(bgd, MOVE_BG_e | NO_CALC_VTX_e | NO_VTX_TBL_e | GLOBAL_e, NULL)) {
return true;
}
SetFlag(flag);
src/d/d_bg_w_sv.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
/* 800AABFC-800AAC84 .text Set__6dBgWSvFP6cBgD_tUl */
bool dBgWSv::Set(cBgD_t* bgd, u32 flag) {
if (cBgW::Set(bgd, 0x63, NULL)) {
if (cBgW::Set(bgd, MOVE_BG_e | NO_CALC_VTX_e | GLOBAL_e | UNK40_e, NULL)) {
return true;
}
mSvFlag = flag;
src/d/d_cc_d.cpp
+5 -5
View File
@@ -29,8 +29,8 @@ void dCcD_GAtTgCoCommonBase::SetEffCounterTimer() {
/* 800AB334-800AB384 .text __ct__10dCcD_GSttsFv */
dCcD_GStts::dCcD_GStts() {
mAtSpl = 0;
mTgSpl = 0;
mAtSpl = dCcG_At_Spl_UNK0;
mTgSpl = dCcG_Tg_Spl_UNK0;
mRoomId = 0;
mActorPerfTblId = -1;
mAtApid = fpcM_ERROR_PROCESS_ID_e;
@@ -42,8 +42,8 @@ dCcD_GStts::dCcD_GStts() {
/* 800AB384-800AB3BC .text Ct__10dCcD_GSttsFv */
void dCcD_GStts::Ct() {
mAtSpl = 0;
mTgSpl = 0;
mAtSpl = dCcG_At_Spl_UNK0;
mTgSpl = dCcG_Tg_Spl_UNK0;
mRoomId = 0;
mActorPerfTblId = -1;
mAtApid = fpcM_ERROR_PROCESS_ID_e;
@@ -170,7 +170,7 @@ cCcD_GObjInf* dCcD_GObjInf::GetAtHitGObj() {
/* 800AB938-800AB958 .text ChkAtNoGuard__12dCcD_GObjInfFv */
u8 dCcD_GObjInf::ChkAtNoGuard() {
return GetAtSpl() >= 8;
return GetAtSpl() >= dCcG_At_Spl_UNK8;
}
/* 800AB958-800AB9B0 .text ClrTgHit__12dCcD_GObjInfFv */
src/d/d_cc_s.cpp
+1 -1
View File
@@ -372,7 +372,7 @@ void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg,
tgObjInf->SetTgHitPos(*i_hitPos);
tgObjInf->SetTgRVec(*atObjInf->GetAtVecP());
if (tgGStts != NULL && atGStts->GetAtSpl() == 0) {
if (tgGStts != NULL && atGStts->GetAtSpl() == dCcG_At_Spl_UNK0) {
tgGStts->SetAtSpl(atObjInf->GetAtSpl());
}
src/d/d_cc_uty.cpp
+1 -1
View File
@@ -171,7 +171,7 @@ fopAc_ac_c* at_power_check(CcAtInfo* atInfo) {
atInfo->mbDead = false;
if (fopAcM_GetName(atInfo->mpActor) == PROC_PLAYER) {
dCcD_GObjInf* gObjInf = dCcD_GetGObjInf(atInfo->mpObj);
if (gObjInf->GetAtSpl() == 1) {
if (gObjInf->GetAtSpl() == dCcG_At_Spl_UNK1) {
atInfo->mbDead = true;
}
} else if (atInfo->mDamage >= 2) {
src/d/d_demo.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
//
#include "d/d_demo.h"
#include "f_op/f_op_camera_mng.h"
#include "f_op/f_op_camera.h"
#include "d/d_com_inf_game.h"
#include "d/d_mesg.h"
#include "m_Do/m_Do_printf.h"
src/d/d_event_data.cpp
+106 -53
View File
@@ -213,11 +213,16 @@ void dEvDtStaff_c::specialProcLight() {
"CHANGE",
"ADD_TIME",
};
enum {
ACT_WAIT,
ACT_CHANGE,
ACT_ADD_TIME,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 1: // CHANGE
case ACT_CHANGE:
{
f32 * pHour = dComIfGp_evmng_getMyFloatP(staffIdx, "Hour");
if (pHour != NULL) {
@@ -234,7 +239,7 @@ void dEvDtStaff_c::specialProcLight() {
}
}
break;
case 2: // ADD_TIME
case ACT_ADD_TIME:
{
f32 * pHour = dComIfGp_evmng_getMyFloatP(staffIdx, "Hour");
if (pHour != NULL) {
@@ -270,6 +275,17 @@ void dEvDtStaff_c::specialProcMessage() {
"TELOP_ON",
"TELOP_OFF",
};
enum {
ACT_WAIT,
ACT_CREATE_MSG,
ACT_PUSHBUTTON,
ACT_FINISH,
ACT_CONTINUE,
ACT_END,
ACT_DELETE,
ACT_TELOP_ON,
ACT_TELOP_OFF,
};
static fpc_ProcID l_msgId;
static msg_class* l_msg;
static int l_msgNo;
@@ -277,10 +293,11 @@ void dEvDtStaff_c::specialProcMessage() {
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 1: { // CREATE_MSG
case ACT_CREATE_MSG:
{
l_msgId = fpcM_ERROR_PROCESS_ID_e;
l_msg = NULL;
u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
@@ -289,12 +306,13 @@ void dEvDtStaff_c::specialProcMessage() {
mWipeDirection = 0;
break;
}
case 3: // FINISH
case 5: // END
case ACT_FINISH:
case ACT_END:
JUT_ASSERT(0x1D8, l_msg);
l_msg->mStatus = fopMsgStts_MSG_ENDS_e;
break;
case 4: { // CONTINUE
case ACT_CONTINUE:
{
JUT_ASSERT(0x1DC, l_msg);
l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e;
u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
@@ -303,25 +321,26 @@ void dEvDtStaff_c::specialProcMessage() {
fopMsgM_messageSet(l_msgNo);
break;
}
case 7: { // TELOP_ON
case ACT_TELOP_ON:
{
u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "tlpNo");
JUT_ASSERT(0x1E5, idata);
dComIfGp_setStageNameOn(*idata);
specialProc_WaitStart(staffIdx);
break;
}
case 8: // TELOP_OFF
case ACT_TELOP_OFF:
dComIfGp_setStageNameOff();
break;
}
}
switch (actIdx) {
case 0: // WAIT
case 7: // TELOP_ON
case ACT_WAIT:
case ACT_TELOP_ON:
specialProc_WaitProc(staffIdx);
break;
case 1: // CREATE_MSG
case ACT_CREATE_MSG:
switch (mWipeDirection) {
case 0:
l_msgId = fopMsgM_messageSet(l_msgNo);
@@ -340,14 +359,14 @@ void dEvDtStaff_c::specialProcMessage() {
break;
}
break;
case 2: // PUSHBUTTON
case ACT_PUSHBUTTON:
JUT_ASSERT(0x209, l_msg);
if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) {
dComIfGp_evmng_cutEnd(staffIdx);
}
break;
case 3: // FINISH
case 6: // DELETE
case ACT_FINISH:
case ACT_DELETE:
if (!l_msg) {
dComIfGp_evmng_cutEnd(staffIdx);
} else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) {
@@ -357,10 +376,10 @@ void dEvDtStaff_c::specialProcMessage() {
dComIfGp_evmng_cutEnd(staffIdx);
}
break;
case 4: // CONTINUE
case ACT_CONTINUE:
dComIfGp_evmng_cutEnd(staffIdx);
break;
case 5: // END
case ACT_END:
switch (l_msg->mStatus) {
case fopMsgStts_BOX_CLOSING_e:
case fopMsgStts_BOX_CLOSED_e:
@@ -368,7 +387,7 @@ void dEvDtStaff_c::specialProcMessage() {
break;
}
break;
case 8: // TELOP_OFF
case ACT_TELOP_OFF:
if (dComIfGp_checkStageName() == 0) {
dComIfGp_evmng_cutEnd(staffIdx);
}
@@ -397,29 +416,39 @@ void dEvDtStaff_c::specialProcSound() {
"LANDING_DEMO",
"BGMSTOP",
};
enum {
ACT_WAIT,
ACT_STRM_PLAY,
ACT_STRM_DEMO_MJ_SISTER,
ACT_STRM_DEMO_GO_MAJU,
ACT_NOMSG_WAIT,
ACT_RIDDLE,
ACT_LANDING_DEMO,
ACT_BGMSTOP,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 1: // STRM_PLAY
case ACT_STRM_PLAY:
mDoAud_bgmStreamPlay();
break;
case 2: // STRM_DEMO_MJ_SISTER
case ACT_STRM_DEMO_MJ_SISTER:
mDoAud_bgmStreamPrepare(JA_STRM_DEMO_MJ_SISTER);
break;
case 3: // STRM_DEMO_GO_MAJU
case ACT_STRM_DEMO_GO_MAJU:
mDoAud_bgmStreamPrepare(JA_STRM_DEMO_GO_MAJU);
break;
case 4: // NOMSG_WAIT
case ACT_NOMSG_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 5: // RIDDLE
case ACT_RIDDLE:
mDoAud_seStart(JA_SE_READ_RIDDLE_1);
break;
case 6: // LANDING_DEMO
case ACT_LANDING_DEMO:
{
s32* pPrepare = (s32*)dComIfGp_evmng_getMyIntegerP(staffIdx, "PREPARE");
if (pPrepare != NULL) {
@@ -440,7 +469,7 @@ void dEvDtStaff_c::specialProcSound() {
mDoAud_endLandingDemo();
}
break;
case 7: // BGMSTOP
case ACT_BGMSTOP:
{
u32* pTimer = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
if (pTimer != NULL)
@@ -451,10 +480,10 @@ void dEvDtStaff_c::specialProcSound() {
}
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitProc(staffIdx);
break;
case 4: // NOMSG_WAIT
case ACT_NOMSG_WAIT:
if (mTimer <= dComIfGp_demo_get()->getFrameNoMsg())
dComIfGp_evmng_cutEnd(staffIdx);
break;
@@ -476,13 +505,17 @@ void dEvDtStaff_c::specialProcCreate() {
"WAIT",
"CREATE",
};
enum {
ACT_WAIT,
ACT_CREATE,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
break;
case 1: // CREATE
case ACT_CREATE:
{
const char * name = dComIfGp_evmng_getMyStringP(staffIdx, "MAKECAST");
JUT_ASSERT(0x2e3, name);
@@ -554,17 +587,28 @@ void dEvDtStaff_c::specialProcDirector() {
"PLAYER_DRAW",
"PLAYER_NODRAW",
};
enum {
ACT_WAIT,
ACT_NEXT,
ACT_FADE,
ACT_BGM_START,
ACT_VIBRATION,
ACT_SE_START,
ACT_WIPE,
ACT_PLAYER_DRAW,
ACT_PLAYER_NODRAW,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 1: // NEXT
case ACT_NEXT:
dEvDt_Next_Stage(staffIdx, 0);
break;
case 2: // FADE
case ACT_FADE:
{
f32* rate = dComIfGp_evmng_getMyFloatP(staffIdx, "Rate");
u32* color = dComIfGp_evmng_getMyIntegerP(staffIdx, "Color");
@@ -585,7 +629,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 3: // BGM_START
case ACT_BGM_START:
{
u32* pBGM = dComIfGp_evmng_getMyIntegerP(staffIdx, "BGM_ID");
u32 bgm;
@@ -604,7 +648,7 @@ void dEvDtStaff_c::specialProcDirector() {
mDoAud_bgmStart(bgm_table[bgm]);
}
break;
case 4: // VIBRATION
case ACT_VIBRATION:
{
specialProc_WaitStart(staffIdx);
if (mTimer == 0)
@@ -622,7 +666,7 @@ void dEvDtStaff_c::specialProcDirector() {
dComIfGp_getVibration().StartQuake(pattern, 0, *type, xyz);
}
break;
case 5: // SE_START
case ACT_SE_START:
{
s32* pSE = (s32*)dComIfGp_evmng_getMyIntegerP(staffIdx, "SENUM");
if (pSE != NULL) {
@@ -636,7 +680,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 6: // WIPE
case ACT_WIPE:
{
f32* rate = dComIfGp_evmng_getMyFloatP(staffIdx, "Rate");
JUT_ASSERT(0x384, rate);
@@ -655,22 +699,22 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 7: // PLAYER_DRAW
case ACT_PLAYER_DRAW:
player->offPlayerNoDraw();
break;
case 8: // PLAYER_NODRAW
case ACT_PLAYER_NODRAW:
player->onPlayerNoDraw();
break;
}
}
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitProc(staffIdx);
break;
case 1: // NEXT
case ACT_NEXT:
break;
case 2: // FADE
case ACT_FADE:
{
if (!mDoGph_gInf_c::isFade()) {
dComIfGp_evmng_cutEnd(staffIdx);
@@ -682,7 +726,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 4: // VIBRATION
case ACT_VIBRATION:
{
if (mTimer > 0) {
mTimer--;
@@ -693,7 +737,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 6: // WIPE
case ACT_WIPE:
{
if (mWipeDirection) {
if (dDlst_list_c::getWipeRate() == 0.0f)
@@ -723,15 +767,20 @@ void dEvDtStaff_c::specialProcPackage() {
"PLAY",
"PLAY2",
};
enum {
ACT_WAIT,
ACT_PLAY,
ACT_PLAY2,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 1: // PLAY
case 2: // PLAY2
case ACT_PLAY:
case ACT_PLAY2:
{
const char* filename = dComIfGp_evmng_getMyStringP(staffIdx, "FileName");
cXyz* pOffsetPos = dComIfGp_evmng_getMyXyzP(staffIdx, "OffsetPos");
@@ -761,10 +810,10 @@ void dEvDtStaff_c::specialProcPackage() {
}
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitProc(staffIdx);
break;
case 1: // PLAY
case ACT_PLAY:
{
if (mWipeDirection == 0) {
if (dComIfGp_demo_mode() == 2) {
@@ -800,24 +849,28 @@ void dEvDtStaff_c::specialProcTimekeeper() {
"COUNTDOWN",
"WAIT",
};
enum {
ACT_COUNTDOWN,
ACT_WAIT,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // COUNTDOWN
case ACT_COUNTDOWN:
{
u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
JUT_ASSERT(0x482, idata);
mTimer = *idata;
}
break;
case 1: // WAIT
case ACT_WAIT:
break;
}
}
switch (actIdx) {
case 0: // COUNTDOWN
case ACT_COUNTDOWN:
{
if (mTimer > 0)
mTimer--;
@@ -825,7 +878,7 @@ void dEvDtStaff_c::specialProcTimekeeper() {
dComIfGp_evmng_cutEnd(staffIdx);
}
break;
case 1: // WAIT
case ACT_WAIT:
dComIfGp_evmng_cutEnd(staffIdx);
break;
case -1:
src/d/d_npc.cpp
+2 -2
View File
@@ -937,8 +937,8 @@ bool dNpc_chkAttn(fopAc_ac_c* i_this, cXyz destPos, f32 param_3, f32 param_4, f3
return ret;
}
static void dummyfunc(int i_pathInf) {
JUT_ASSERT(0, i_pathInf != 0);
static void dummyfunc(dStage_dPath_c* i_pathInf) {
JUT_ASSERT(0, i_pathInf != NULL);
}
dCcD_SrcCyl dNpc_cyl_src = {
src/d/d_ovlp_fade2.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ dOvlpFd2_c::dOvlpFd2_c() {
/* 80223D84-80223E18 .text execFirstSnap__10dOvlpFd2_cFv */
void dOvlpFd2_c::execFirstSnap() {
if (mHasSnap) {
if (!cLib_calcTimer(&mTimer)) {
if (cLib_calcTimer(&mTimer) == 0) {
mProc = &dOvlpFd2_c::execFadeOut;
fopOvlpM_Done(this);
mTimer = -12;
src/d/d_s_menu.cpp
+2 -2
View File
@@ -92,7 +92,7 @@ static BOOL dScnMenu_Execute(menu_of_scene_class* i_this) {
if (CPad_CHECK_TRIG_UP(0) || CPad_CHECK_TRIG_DOWN(0)) {
i_this->field_0x1e1 = 20;
} else {
if (!cLib_calcTimer(&i_this->field_0x1e1))
if (cLib_calcTimer(&i_this->field_0x1e1) == 0)
i_this->field_0x1e1 = 4;
else
trig = FALSE;
@@ -114,7 +114,7 @@ static BOOL dScnMenu_Execute(menu_of_scene_class* i_this) {
if (CPad_CHECK_TRIG_B(0) || CPad_CHECK_TRIG_A(0)) {
i_this->field_0x1e2 = 20;
} else {
if (!cLib_calcTimer(&i_this->field_0x1e2))
if (cLib_calcTimer(&i_this->field_0x1e2) == 0)
i_this->field_0x1e2 = 4;
else
trig = FALSE;
src/d/d_s_name.cpp
+2 -2
View File
@@ -140,7 +140,7 @@ s32 dScnName_c::create() {
dNm_c = NULL;
}
dFs_c->_create();
g_snHIO.field_0x4 = mDoHIO_root.m_subroot.createChild("名前登録シーン", &g_snHIO);
g_snHIO.mNo = mDoHIO_root.m_subroot.createChild("名前登録シーン", &g_snHIO);
dComIfGp_setWindowNum(1);
dComIfGp_setWindow(0, 0.0f, 0.0f, mDoMch_render_c::getFbWidth(), mDoMch_render_c::getEfbHeight(), 0.0f, 1.0f, 0, 2);
g_dComIfG_gameInfo.play.mCameraInfo[0].mpCamera = (camera_class*)&field_0x1d4;
@@ -378,7 +378,7 @@ dScnName_c::~dScnName_c() {
delete btnIcon.scr;
mArchive->unmountFixed();
delete cloth.cloth_c;
mDoHIO_root.m_subroot.deleteChild(g_snHIO.field_0x4);
mDoHIO_root.m_subroot.deleteChild(g_snHIO.mNo);
JKRSetCurrentHeap(oldHeap);
heap->destroy();
dComIfG_deleteStageRes("Stage");
src/d/d_s_room.cpp
-1
View File
@@ -13,7 +13,6 @@
#include "d/d_map.h"
#include "d/d_procname.h"
#include "d/d_stage.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_salvage.h"
#include "d/actor/d_a_npc_md.h"
#include "m_Do/m_Do_dvd_thread.h"
src/dolphin/gba/GBAGetProcessStatus.c
+2 -2
View File
@@ -12,7 +12,7 @@ s32 GBAGetProcessStatus(s32 chan, u8* percentp) {
bootInfo = &__GBA[chan].bootInfo;
if (gba->callback != NULL || bootInfo->callback != NULL) {
ret = 2;
ret = GBA_BUSY;
if (bootInfo->callback != NULL) {
percent = (bootInfo->curOffset * 100) / bootInfo->realLength;
@@ -32,7 +32,7 @@ s32 GBAGetProcessStatus(s32 chan, u8* percentp) {
}
}
} else {
ret = 0;
ret = GBA_READY;
}
return ret;
src/dolphin/gba/GBAJoyBoot.c
+1 -1
View File
@@ -72,7 +72,7 @@ s32 GBAJoyBootAsync(s32 chan, s32 paletteColor, s32 paletteSpeed, u8* programp,
}
ret = GBAGetProcessStatus(chan, &percent);
if (ret != 0) {
if (ret != GBA_READY) {
return ret;
}
src/dolphin/gba/GBAWrite.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include "dolphin/gba/GBAPriv.h"
#include "string.h"
static void WriteProc(s32 chan) {
GBAControl* gba;
@@ -34,4 +35,4 @@ s32 GBAWrite(s32 chan, u8* src, u8* status) {
return ret;
}
return __GBASync(chan);
}
}
src/dolphin/gba/GBAXfer.c
+4 -3
View File
@@ -1,6 +1,7 @@
#include "dolphin/gba/GBAPriv.h"
#include "dolphin/si/SIBios.h"
static void __GBAHandler(s32 chan, u32 error, OSContext* context) {
void __GBAHandler(s32 chan, u32 error, OSContext* context) {
GBAControl* gba;
GBATransferCallback proc;
GBACallback callback;
@@ -12,9 +13,9 @@ static void __GBAHandler(s32 chan, u32 error, OSContext* context) {
}
if ((error & 0xf)) {
gba->ret = 1;
gba->ret = GBA_NOT_READY;
} else {
gba->ret = 0;
gba->ret = GBA_READY;
}
if (gba->proc != NULL) {