Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-11-23 05:20:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

typedef enforcement

Browse Source
This commit is contained in:
EpochFlame 2023-11-09 17:46:25 -05:00
parent 22896be442
commit 8037af9657
79 changed files with 530 additions and 531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/recommended_todo.md
View File

@ -44,7 +44,7 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DBloSaver.cpp">J2D/J2DBloSaver.cpp</a> | 7037 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIDummyObject.cpp">JAudio//JAI/JAIDummyObject.cpp</a> | 7337 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelData.cpp">J3D/J3DModelData.cpp</a> | 7514 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JKernel/JKRSolidHeap.cpp">JKernel/JKRSolidHeap.cpp</a> | 7680 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-math.cpp">JStudio/jstudio-math.cpp</a> | 8174 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASBasicWaveBank.cpp">JAudio//JAS/JASBasicWaveBank.cpp</a> | 8518 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/control.cpp">JMessage/control.cpp</a> | 8833 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JKernel/JKRThread.cpp">JKernel/JKRThread.cpp</a> | 9057 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/control.cpp">JMessage/control.cpp</a> | 8833 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JKernel/JKRThread.cpp">JKernel/JKRThread.cpp</a> | 9063 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAL/JALCalc.cpp">JAudio//JAL/JALCalc.cpp</a> | 9063 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASDriverIF.cpp">JAudio//JAS/JASDriverIF.cpp</a> | 9486 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResourceLoader.cpp">JParticle/JPAResourceLoader.cpp</a> | 9881 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAU/JAUDataMgr.cpp">JAudio//JAU/JAUDataMgr.cpp</a> | 9896 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-control.cpp">JStudio/jstudio-control.cpp</a> | 10238 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DTevs.cpp">J2D/J2DTevs.cpp</a> | 10255 |
@ -78,14 +78,14 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASChannel.cpp">JAudio//JAS/JASChannel.cpp</a> | 39720 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterialFactory.cpp">J2D/J2DMaterialFactory.cpp</a> | 39925 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTException.cpp">JUtility/JUTException.cpp</a> | 40644 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAramStream.cpp">JAudio//JAS/JASAramStream.cpp</a> | 41304 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShapeMtx.cpp">J3D/J3DShapeMtx.cpp</a> | 47592 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/processor.cpp">JMessage/processor.cpp</a> | 48602 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPrint.cpp">J2D/J2DPrint.cpp</a> | 53420 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 59427 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPrint.cpp">J2D/J2DPrint.cpp</a> | 53420 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 59409 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTevs.cpp">J3D/J3DTevs.cpp</a> | 59735 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 61961 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DAnimation.cpp">J3D/J3DAnimation.cpp</a> | 65982 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 68545 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 68852 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 69327 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 72302 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoader.cpp">J3D/J3DModelLoader.cpp</a> | 72829 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DGD.cpp">J3D/J3DGD.cpp</a> | 80995 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 81380 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DGD.cpp">J3D/J3DGD.cpp</a> | 80986 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 81380 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 89036 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 89345 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 92909 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 99629 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 92753 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 99629 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 101180 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 105610 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 109565 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 111143 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMatBlock.cpp">J2D/J2DMatBlock.cpp</a> | 116654 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-object.cpp">JStudio/jstudio-object.cpp</a> | 144254 |

2
include/ARAM.h
View File

@ -12,7 +12,7 @@ struct Node : CNode {
virtual ~Node() { } // _08
inline u32 dvdToAram(char const*, bool);
void* aramToMainRam(unsigned char*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, JKRDvdRipper::EAllocDirection, int, u32*);
void* aramToMainRam(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, JKRDvdRipper::EAllocDirection, int, u32*);
inline void dump();
JKRAramBlock* mStatus; // _18

2
include/BaseParm.h
View File

@ -42,7 +42,7 @@ struct Parm : public BaseParm {
};
struct ParmString : public BaseParm {
ParmString(Parameters*, char*, int, unsigned long, char*);
ParmString(Parameters*, char*, int, u32, char*);
inline virtual int size() { return -1; }
virtual void write(Stream&);
virtual void read(Stream&);

2
include/Game/Entities/ItemBridge.h
View File

@ -160,7 +160,7 @@ struct Mgr : public TNodeItemMgr {
virtual u32 generatorGetID() { return 'brdg'; } // _58 (weak)
virtual BaseItem* generatorBirth(Vector3f&, Vector3f&, GenItemParm*); // _5C
virtual void generatorWrite(Stream&, GenItemParm*); // _60
virtual void generatorRead(Stream&, GenItemParm*, unsigned long); // _64
virtual void generatorRead(Stream&, GenItemParm*, u32); // _64
virtual u32 generatorLocalVersion() { return '0001'; } // _68 (weak)
virtual GenItemParm* generatorNewItemParm(); // _70
virtual BaseItem* birth(); // _BC

2
include/Game/Entities/ItemCave.h
View File

@ -141,7 +141,7 @@ struct Mgr : public TNodeItemMgr {
virtual u32 generatorGetID() { return 'cave'; } // _58 (weak)
virtual BaseItem* generatorBirth(Vector3f&, Vector3f&, GenItemParm*); // _5C
virtual void generatorWrite(Stream&, GenItemParm*); // _60
virtual void generatorRead(Stream&, GenItemParm*, unsigned long); // _64
virtual void generatorRead(Stream&, GenItemParm*, u32); // _64
virtual u32 generatorLocalVersion() { return '0002'; } // _68 (weak)
virtual GenItemParm* generatorNewItemParm(); // _70
virtual BaseItem* doNew() { return new Item; } // _A0 (weak)

2
include/Game/Entities/ItemDengekiGate.h
View File

@ -12,7 +12,7 @@ struct Mgr : public NodeItemMgr<ItemGate> {
virtual u32 generatorGetID(); // _58 (weak)
virtual BaseItem* generatorBirth(Vector3f&, Vector3f&, GenItemParm*); // _5C
virtual void generatorWrite(Stream&, GenItemParm*); // _60
virtual void generatorRead(Stream&, GenItemParm*, unsigned long); // _64
virtual void generatorRead(Stream&, GenItemParm*, u32); // _64
virtual u32 generatorLocalVersion(); // _68 (weak)
virtual GenItemParm* generatorNewItemParm(); // _70
virtual ~Mgr(); // _B4 (weak)

2
include/Game/Entities/ItemGate.h
View File

@ -169,7 +169,7 @@ struct ItemGateMgr : public BaseItemMgr {
virtual u32 generatorGetID(); // _58 (weak)
virtual BaseItem* generatorBirth(Vector3f&, Vector3f&, GenItemParm*); // _5C
virtual void generatorWrite(Stream&, GenItemParm*); // _60
virtual void generatorRead(Stream&, GenItemParm*, unsigned long); // _64
virtual void generatorRead(Stream&, GenItemParm*, u32); // _64
virtual u32 generatorLocalVersion(); // _68 (weak)
virtual GenItemParm* generatorNewItemParm(); // _70
virtual char* getCaveName(int); // _74

10
include/Game/MemoryCard/Mgr.h
View File

@ -89,10 +89,10 @@ struct Mgr : public MemoryCardMgr {
bool getPlayerInfo(s8, PlayerInfoHeader*, bool*);
int getIndexPlayerInfo(s8, PlayerInfoHeader*, bool*);
bool commandLoadPlayer(s8);
bool loadPlayerForNoCard(signed char);
bool loadPlayerProc(s8, unsigned char*);
bool loadPlayerForNoCard(s8);
bool loadPlayerProc(s8, u8*);
bool commandDeletePlayer(s8);
bool savePlayerProc(s8, unsigned char*, bool);
bool savePlayerProc(s8, u8*, bool);
bool commandCheckSerialNo();
bool commandCopyPlayer(s8, s8);
void writePlayer(Stream&);
@ -108,9 +108,9 @@ struct Mgr : public MemoryCardMgr {
bool writeInvalidPlayerInfoAll();
bool writeInvalidPlayerInfo(int, s8);
bool checkPlayerNoPlayerInfo(int, s8, PlayerInfoHeader*);
bool getIndexInvalidPlayerInfo(int*, s8*, s8, unsigned long, bool);
bool getIndexInvalidPlayerInfo(int*, s8*, s8, u32, bool);
bool modifyPlayerInfo(s8, bool*);
bool verifyCardSerialNo(unsigned long long*, MemoryCardMgr::ECardSlot);
bool verifyCardSerialNo(u64*, MemoryCardMgr::ECardSlot);
bool resetError();
inline void setFlag(u32 flag) { mFlags.typeView |= flag; }

2
include/Game/gameGenerator.h
View File

@ -272,7 +272,7 @@ struct GenPellet : public GenObject {
virtual void doWrite(Stream&); // _08
virtual void ramSaveParameters(Stream&); // _0C
virtual void ramLoadParameters(Stream&); // _10
virtual void doEvent(unsigned long); // _14
virtual void doEvent(u32); // _14
virtual void doRead(Stream&); // _18
virtual J3DModelData* getShape(); // _28
virtual void updateUseList(Generator*, int); // _2C

2
include/Game/itemMgr.h
View File

@ -61,7 +61,7 @@ struct BaseItemMgr : public GenericObjectMgr, virtual public _BaseItemMgrParent2
void loadAnimMgr(JKRFileLoader*, char*);
void loadArchive(char*);
void loadBmd(char*, int, unsigned long);
void loadBmd(char*, int, u32);
void loadCollision(JKRFileLoader*, char*);
PlatAttacher* loadPlatAttacher(JKRFileLoader*, char*);
Platform* loadPlatform(JKRFileLoader*, char*);

24
include/JSystem/J2D/J2DIndBlock.h
View File

@ -76,18 +76,18 @@ struct J2DIndTexOrder {
};
struct J2DIndBlock {
virtual void initialize() { } // _08 (weak)
virtual void setGX() { } // _0C (weak)
virtual u32 getType() = 0; // _10
virtual void setIndTexStageNum(u8 texStageNum) { } // _14 (weak)
virtual u8 getIndTexStageNum() const { return 0; } // _18 (weak)
virtual void setIndTexOrder(unsigned long index, J2DIndTexOrder order) { } // _1C (weak)
virtual J2DIndTexOrder* getIndTexOrder(unsigned long index) { return nullptr; } // _20 (weak)
virtual void setIndTexMtx(unsigned long index, J2DIndTexMtx texMtx) { } // _24 (weak)
virtual J2DIndTexMtx* getIndTexMtx(unsigned long index) { return nullptr; } // _28 (weak)
virtual void setIndTexCoordScale(unsigned long index, J2DIndTexCoordScale scale) { } // _2C (weak)
virtual J2DIndTexCoordScale* getIndTexCoordScale(unsigned long index) { return nullptr; } // _30 (weak)
virtual ~J2DIndBlock() { } // _34 (weak)
virtual void initialize() { } // _08 (weak)
virtual void setGX() { } // _0C (weak)
virtual u32 getType() = 0; // _10
virtual void setIndTexStageNum(u8 texStageNum) { } // _14 (weak)
virtual u8 getIndTexStageNum() const { return 0; } // _18 (weak)
virtual void setIndTexOrder(u32 index, J2DIndTexOrder order) { } // _1C (weak)
virtual J2DIndTexOrder* getIndTexOrder(u32 index) { return nullptr; } // _20 (weak)
virtual void setIndTexMtx(u32 index, J2DIndTexMtx texMtx) { } // _24 (weak)
virtual J2DIndTexMtx* getIndTexMtx(u32 index) { return nullptr; } // _28 (weak)
virtual void setIndTexCoordScale(u32 index, J2DIndTexCoordScale scale) { } // _2C (weak)
virtual J2DIndTexCoordScale* getIndTexCoordScale(u32 index) { return nullptr; } // _30 (weak)
virtual ~J2DIndBlock() { } // _34 (weak)
// _00 VTBL
};

2
include/JSystem/J2D/J2DPane.h
View File

@ -1035,7 +1035,7 @@ struct J2DWindowEx : public J2DWindow {
virtual ~J2DWindowEx(); // _08
virtual void setCullBack(bool shouldCullBack); // _1C (weak)
virtual void setCullBack(GXCullMode cullMode); // _20
virtual void setAlpha(unsigned char); // _24
virtual void setAlpha(u8); // _24
virtual void drawSelf(f32, f32, f32 (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource); // _4C
virtual bool isUsed(const ResFONT* resource) { return J2DPane::isUsed(resource); } // _50 (weak)

2
include/JSystem/J3D/J3DAnmLoader.h
View File

@ -23,7 +23,7 @@ struct J3DAnmLoaderDataBase {
enum J3DMtxCalcFlag { MTXCalc_0 };
J3DMtxCalcAnmBase* J3DNewMtxCalcAnm(u32, J3DAnmTransform*);
J3DMtxCalc* J3DUNewMtxCalcAnm(unsigned long, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DMtxCalcFlag);
J3DMtxCalc* J3DUNewMtxCalcAnm(u32, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DMtxCalcFlag);
struct J3DAnmLoader {
virtual J3DAnmBase* load(const void*) = 0; // _08

4
include/JSystem/J3D/J3DAnmTevRegKey.h
View File

@ -46,8 +46,8 @@ struct J3DAnmTevRegKey : public J3DAnmBase {
return J3DAnmKind_TevRegKey;
}
void getTevColorReg(unsigned short, GXColorS10*) const;
void getTevKonstReg(unsigned short, GXColor*) const;
void getTevColorReg(u16, GXColorS10*) const;
void getTevKonstReg(u16, GXColor*) const;
void searchUpdateMaterialID(struct J3DModelData*);
u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }

2
include/JSystem/J3D/J3DAnmTextureSRTKey.h
View File

@ -41,7 +41,7 @@ struct J3DAnmTextureSRTKey : public J3DAnmBase {
return J3DAnmKind_TextureSRTKey;
}
void calcTransform(f32, unsigned short, struct J3DTextureSRTInfo*) const;
void calcTransform(f32, u16, struct J3DTextureSRTInfo*) const;
void searchUpdateMaterialID(struct J3DModelData*);
void getTransform(u16 param_0, J3DTextureSRTInfo* pSRTInfo) const { calcTransform(getFrame(), param_0, pSRTInfo); }

36
include/JSystem/J3D/J3DInd.h
View File

@ -139,23 +139,23 @@ struct J3DIndBlock {
struct J3DIndBlockFull : public J3DIndBlock {
inline J3DIndBlockFull() { initialize(); }
virtual void reset(J3DIndBlock*); // _08
virtual void diff(unsigned long); // _0C
virtual void load(); // _10
virtual u32 countDLSize(); // _14
virtual JBlockType getType(); // _18 (weak)
virtual void setIndTexStageNum(unsigned char); // _1C (weak)
virtual u8 getIndTexStageNum() const; // _20 (weak)
virtual void setIndTexOrder(unsigned long, J3DIndTexOrder); // _24 (weak)
virtual void setIndTexOrder(unsigned long, const J3DIndTexOrder*); // _28 (weak)
virtual J3DIndTexOrder* getIndTexOrder(unsigned long); // _2C (weak)
virtual void setIndTexMtx(unsigned long, const J3DIndTexMtx*); // _30 (weak)
virtual void setIndTexMtx(unsigned long, J3DIndTexMtx); // _34 (weak)
virtual J3DIndTexMtx* getIndTexMtx(unsigned long); // _38 (weak)
virtual void setIndTexCoordScale(unsigned long, const J3DIndTexCoordScale*); // _3C (weak)
virtual void setIndTexCoordScale(unsigned long, J3DIndTexCoordScale); // _40 (weak)
virtual J3DIndTexCoordScale* getIndTexCoordScale(unsigned long); // _44 (weak)
virtual ~J3DIndBlockFull(); // _48 (weak)
virtual void reset(J3DIndBlock*); // _08
virtual void diff(u32); // _0C
virtual void load(); // _10
virtual u32 countDLSize(); // _14
virtual JBlockType getType(); // _18 (weak)
virtual void setIndTexStageNum(u8); // _1C (weak)
virtual u8 getIndTexStageNum() const; // _20 (weak)
virtual void setIndTexOrder(u32, J3DIndTexOrder); // _24 (weak)
virtual void setIndTexOrder(u32, const J3DIndTexOrder*); // _28 (weak)
virtual J3DIndTexOrder* getIndTexOrder(u32); // _2C (weak)
virtual void setIndTexMtx(u32, const J3DIndTexMtx*); // _30 (weak)
virtual void setIndTexMtx(u32, J3DIndTexMtx); // _34 (weak)
virtual J3DIndTexMtx* getIndTexMtx(u32); // _38 (weak)
virtual void setIndTexCoordScale(u32, const J3DIndTexCoordScale*); // _3C (weak)
virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale); // _40 (weak)
virtual J3DIndTexCoordScale* getIndTexCoordScale(u32); // _44 (weak)
virtual ~J3DIndBlockFull(); // _48 (weak)
void initialize();
@ -168,7 +168,7 @@ struct J3DIndBlockFull : public J3DIndBlock {
struct J3DIndBlockNull : public J3DIndBlock {
virtual void reset(J3DIndBlock*) { } // _08 (weak)
virtual void diff(unsigned long) { } // _0C (weak)
virtual void diff(u32) { } // _0C (weak)
virtual void load() { } // _10 (weak)
virtual JBlockType getType() { return JBT_IndNull; } // _18 (weak)
virtual ~J3DIndBlockNull() { } // _48 (weak)

4
include/JSystem/J3D/J3DMaterialFactory.h
View File

@ -142,7 +142,7 @@ struct J3DMaterialFactory {
J3DMaterial* create(J3DMaterial*, MaterialType, int, u32) const;
J3DMaterial* createNormalMaterial(J3DMaterial*, int, u32) const;
J3DLockedMaterial* createLockedMaterial(J3DMaterial*, int, u32) const;
J3DPatchedMaterial* createPatchedMaterial(J3DMaterial*, int, unsigned long) const;
J3DPatchedMaterial* createPatchedMaterial(J3DMaterial*, int, u32) const;
J3DAlphaComp newAlphaComp(int) const;
J3DGXColor newAmbColor(int, int) const;
J3DBlend newBlend(int) const;
@ -230,7 +230,7 @@ struct J3DMaterialInitData_v21 {
struct J3DMaterialFactory_v21 {
J3DMaterialFactory_v21(const J3DMaterialBlock_v21&);
int countUniqueMaterials();
void create(J3DMaterial*, int, unsigned long) const;
void create(J3DMaterial*, int, u32) const;
void newMatColor(int, int) const;
void newColorChanNum(int) const;
void newColorChan(int, int) const;

16
include/JSystem/J3D/J3DModelLoader.h
View File

@ -83,9 +83,9 @@ struct J3DModelLoader_v21 : public J3DModelLoader {
* @reifiedAddress{8006FA44}
* @reifiedFile{JSystem/J3D/J3DModelLoader.cpp}
*/
virtual ~J3DModelLoader_v21() {}; // _28 (weak)
virtual void readMaterial_v21(const J3DMaterialBlock_v21*, unsigned long); // _30
virtual void readMaterialTable_v21(const J3DMaterialBlock_v21*, unsigned long); // _38
virtual ~J3DModelLoader_v21() {}; // _28 (weak)
virtual void readMaterial_v21(const J3DMaterialBlock_v21*, u32); // _30
virtual void readMaterialTable_v21(const J3DMaterialBlock_v21*, u32); // _38
};
struct J3DModelLoader_v26 : public J3DModelLoader {
@ -95,11 +95,11 @@ struct J3DModelLoader_v26 : public J3DModelLoader {
* @reifiedAddress{8006F9E8}
* @reifiedFile{JSystem/J3D/J3DModelLoader.cpp}
*/
virtual ~J3DModelLoader_v26() {}; // _28 (weak)
virtual void readMaterial(const J3DMaterialBlock*, unsigned long); // _2C
virtual void readMaterialTable(const J3DMaterialBlock*, unsigned long); // _34
virtual size_t calcSizeMaterial(const J3DMaterialBlock*, unsigned long); // _3C
virtual size_t calcSizeMaterialTable(const J3DMaterialBlock*, unsigned long); // _40
virtual ~J3DModelLoader_v26() {}; // _28 (weak)
virtual void readMaterial(const J3DMaterialBlock*, u32); // _2C
virtual void readMaterialTable(const J3DMaterialBlock*, u32); // _34
virtual size_t calcSizeMaterial(const J3DMaterialBlock*, u32); // _3C
virtual size_t calcSizeMaterialTable(const J3DMaterialBlock*, u32); // _40
};
#endif

14
include/JSystem/J3D/J3DMtxCalc.h
View File

@ -95,13 +95,13 @@ struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
};
struct J3DMtxCalcBlendAnmBase : public J3DMtxCalcAnmBase {
virtual ~J3DMtxCalcBlendAnmBase(); // _08 (weak)
virtual void setAnmTransform(J3DAnmTransform*); // _0C (weak)
virtual J3DAnmTransform* getAnmTransform(); // _10 (weak)
virtual void setAnmTransform(unsigned char, J3DAnmTransform*); // _14 (weak)
virtual J3DAnmTransform* getAnmTransform(unsigned char); // _18 (weak)
virtual void setWeight(unsigned char, f32); // _1C (weak)
virtual void getWeight(unsigned char) const; // _20 (weak)
virtual ~J3DMtxCalcBlendAnmBase(); // _08 (weak)
virtual void setAnmTransform(J3DAnmTransform*); // _0C (weak)
virtual J3DAnmTransform* getAnmTransform(); // _10 (weak)
virtual void setAnmTransform(u8, J3DAnmTransform*); // _14 (weak)
virtual J3DAnmTransform* getAnmTransform(u8); // _18 (weak)
virtual void setWeight(u8, f32); // _1C (weak)
virtual void getWeight(u8) const; // _20 (weak)
// _00 = VTBL
// _04 = J3DAnmTransform*

44
include/JSystem/J3D/J3DPE.h
View File

@ -63,21 +63,21 @@ struct J3DPEBlock {
virtual void setZMode(const J3DZMode*) { } // _4C (weak)
virtual void setZMode(J3DZMode) { } // _50 (weak)
virtual J3DZMode* getZMode() { } // _54 (weak)
virtual void setZCompLoc(const unsigned char*) { } // _58 (weak)
virtual void setZCompLoc(unsigned char) { } // _5C (weak)
virtual void setZCompLoc(const u8*) { } // _58 (weak)
virtual void setZCompLoc(u8) { } // _5C (weak)
virtual u8 getZCompLoc() const { } // _60 (weak)
virtual void setDither(const unsigned char*) { } // _64 (weak)
virtual void setDither(unsigned char) { } // _68 (weak)
virtual void setDither(const u8*) { } // _64 (weak)
virtual void setDither(u8) { } // _68 (weak)
virtual u8 getDither() const { } // _6C (weak)
virtual u32 getFogOffset() const { } // _70 (weak)
virtual void setFogOffset(unsigned long) { } // _74 (weak)
virtual void setFogOffset(u32) { } // _74 (weak)
virtual ~J3DPEBlock() { } // _78 (weak)
};
struct J3DPEBlockFogOff : public J3DPEBlock {
virtual void reset(J3DPEBlock*); // _08
virtual void load(); // _0C
virtual void diff(unsigned long); // _14 (weak)
virtual void diff(u32); // _14 (weak)
virtual void diffBlend(); // _1C
virtual u32 countDLSize(); // _20
virtual JBlockType getType(); // _24 (weak)
@ -90,11 +90,11 @@ struct J3DPEBlockFogOff : public J3DPEBlock {
virtual void setZMode(const J3DZMode*); // _4C (weak)
virtual void setZMode(J3DZMode); // _50 (weak)
virtual J3DZMode* getZMode(); // _54 (weak)
virtual void setZCompLoc(const unsigned char*); // _58 (weak)
virtual void setZCompLoc(unsigned char); // _5C (weak)
virtual void setZCompLoc(const u8*); // _58 (weak)
virtual void setZCompLoc(u8); // _5C (weak)
virtual u8 getZCompLoc() const; // _60 (weak)
virtual void setDither(const unsigned char*); // _64 (weak)
virtual void setDither(unsigned char); // _68 (weak)
virtual void setDither(const u8*); // _64 (weak)
virtual void setDither(u8); // _68 (weak)
virtual u8 getDither() const; // _6C (weak)
virtual ~J3DPEBlockFogOff() { } // _78 (weak)
@ -108,13 +108,13 @@ struct J3DPEBlockFogOff : public J3DPEBlock {
};
struct J3DPEBlockFull : public J3DPEBlock {
virtual void reset(J3DPEBlock*); // _08
virtual void load(); // _0C
virtual void patch(); // _10
virtual void diff(unsigned long); // _14
virtual void diffFog(); // _18
virtual void diffBlend(); // _1C
virtual u32 countDLSize(); // _20
virtual void reset(J3DPEBlock*); // _08
virtual void load(); // _0C
virtual void patch(); // _10
virtual void diff(u32); // _14
virtual void diffFog(); // _18
virtual void diffBlend(); // _1C
virtual u32 countDLSize(); // _20
/**
* @reifiedAddress{800816D0}
* @reifiedFile{JSystem/J3D/J3DMatBlock.cpp}
@ -135,14 +135,14 @@ struct J3DPEBlockFull : public J3DPEBlock {
virtual void setZMode(const J3DZMode*); // _4C (weak)
virtual void setZMode(J3DZMode); // _50 (weak)
virtual J3DZMode* getZMode(); // _54 (weak)
virtual void setZCompLoc(const unsigned char*); // _58 (weak)
virtual void setZCompLoc(unsigned char); // _5C (weak)
virtual void setZCompLoc(const u8*); // _58 (weak)
virtual void setZCompLoc(u8); // _5C (weak)
virtual u8 getZCompLoc() const; // _60 (weak)
/**
* @reifiedAddress{80081910}
* @reifiedFile{JSystem/J3D/J3DMatBlock.cpp}
*/
virtual void setDither(const unsigned char* dither) // _64 (weak)
virtual void setDither(const u8* dither) // _64 (weak)
{
mDither = *dither;
}
@ -150,7 +150,7 @@ struct J3DPEBlockFull : public J3DPEBlock {
* @reifiedAddress{80081908}
* @reifiedFile{JSystem/J3D/J3DMatBlock.cpp}
*/
virtual void setDither(unsigned char dither) // _68 (weak)
virtual void setDither(u8 dither) // _68 (weak)
{
mDither = dither;
}
@ -174,7 +174,7 @@ struct J3DPEBlockFull : public J3DPEBlock {
* @reifiedAddress{8008192C}
* @reifiedFile{JSystem/J3D/J3DMatBlock.cpp}
*/
virtual void setFogOffset(unsigned long fogOffset) // _74 (weak)
virtual void setFogOffset(u32 fogOffset) // _74 (weak)
{
mFogOffset = fogOffset;
}

20
include/JSystem/J3D/J3DShape.h
View File

@ -219,17 +219,17 @@ struct J3DShapeMtxConcatView : public J3DShapeMtx {
{
}
virtual ~J3DShapeMtxConcatView() { } // _08 (weak)
virtual int getType() const { return 'SMCV'; } // _0C (weak)
virtual void load() const; // _18
virtual void loadNrmMtx(int, unsigned short) const; // _20 (weak)
virtual void loadNrmMtx(int, unsigned short, f32 (*)[4]) const; // _24
virtual ~J3DShapeMtxConcatView() { } // _08 (weak)
virtual int getType() const { return 'SMCV'; } // _0C (weak)
virtual void load() const; // _18
virtual void loadNrmMtx(int, u16) const; // _20 (weak)
virtual void loadNrmMtx(int, u16, f32 (*)[4]) const; // _24
void loadMtxConcatView_PNGP(int, unsigned short) const;
void loadMtxConcatView_PCPU(int, unsigned short) const;
void loadMtxConcatView_NCPU(int, unsigned short) const;
void loadMtxConcatView_PNCPU(int, unsigned short) const;
void loadMtxConcatView_PNGP_LOD(int, unsigned short) const;
void loadMtxConcatView_PNGP(int, u16) const;
void loadMtxConcatView_PCPU(int, u16) const;
void loadMtxConcatView_NCPU(int, u16) const;
void loadMtxConcatView_PNCPU(int, u16) const;
void loadMtxConcatView_PNGP_LOD(int, u16) const;
static LoadMtxConcatViewFunction sMtxLoadPipeline[4];
static LoadMtxConcatViewFunction sMtxLoadLODPipeline[4];

6
include/JSystem/J3D/J3DTexMtx.h
View File

@ -13,9 +13,9 @@ struct J3DTexMtx {
void calcTexMtx(const f32 (*)[4]);
void calcPostTexMtx(const f32 (*)[4]);
void load(unsigned long) const;
void loadTexMtx(unsigned long) const;
void loadPostTexMtx(unsigned long) const;
void load(u32) const;
void loadTexMtx(u32) const;
void loadPostTexMtx(u32) const;
u8 _00; // _00
s8 mFlags; // _01

2
include/JSystem/J3D/J3DTransform.h
View File

@ -18,7 +18,7 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo&, f32 (*)[4]);
void J3DScaleNrmMtx(f32 (*)[4], const Vec&);
void J3DScaleNrmMtx33(f32 (*)[3], const Vec&);
void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]);
void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], unsigned long);
void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], u32);
// clang-format off
/**

6
include/JSystem/JAudio/JAD/JADDataMgr.h
View File

@ -62,7 +62,7 @@ struct DataLoadMgrNode : virtual public DataMgrBase {
}
// void load(JADUtility::DataLoadMgrNode::ObjStatus, bool);
// bool initInstanceExt();
// void loadDvd(unsigned long*);
// void loadDvd(u32*);
/** @fabricated */
inline void setPath(char const* path)
@ -125,14 +125,14 @@ struct PrmDataMgrNode : public DataMgrNode {
};
struct DataLoadMgrVirNode {
DataLoadMgrVirNode(unsigned long);
DataLoadMgrVirNode(u32);
~DataLoadMgrVirNode();
void init();
const char* getPath();
};
struct DataMgrVirNode {
DataMgrVirNode(unsigned long);
DataMgrVirNode(u32);
~DataMgrVirNode();
void init();
const char* getPath();

18
include/JSystem/JAudio/JAI/JAIAnimeSound.h
View File

@ -27,7 +27,7 @@ struct JAIAnimeSoundData {
struct JAIAnimeFrameSoundData;
struct JAIAnimeSound : public JAInter::Object {
JAIAnimeSound(Vec*, JKRHeap*, unsigned char);
JAIAnimeSound(Vec*, JKRHeap*, u8);
// virtual ~JAIAnimeSound() { } // _08 (weak)
virtual void handleStop(u8, u32); // _34
@ -35,21 +35,21 @@ struct JAIAnimeSound : public JAInter::Object {
virtual void startAnimSound(u32, JAISound**, JAInter::Actor*, u8); // _40
virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32); // _44
void initActorAnimSound(JAIAnimeSoundData*, unsigned long, f32, f32);
void initActorAnimSound(JAIAnimeSoundData*, u32, f32, f32);
int checkLoopStartCount(f32);
void checkLoopEndCount(f32);
void setAnimSoundActor(JAInter::Actor*, f32, f32, unsigned char);
void setAnimSoundActor(JAInter::Actor*, f32, f32, u8);
// Unused/inlined:
void initActorAnimSound(JAIAnimeSoundData*, JAInter::Actor, unsigned long, f32, f32);
void initActorAnimSound(JAIAnimeSoundData*, JAInter::Actor, u32, f32, f32);
void setLoopStartFrame(f32);
void setLoopEndFrame(f32);
void setLoopFrame(f32, f32);
void setAnimSound(f32, f32, unsigned char);
void setAnimSound(JAIBasic*, f32, f32, unsigned char);
void setAnimObjectSound(f32, f32, unsigned char);
void setAnimSoundVec(Vec*, f32, f32, unsigned long, unsigned char);
void setAnimSoundVec(JAIBasic*, Vec*, f32, f32, unsigned long, unsigned char);
void setAnimSound(f32, f32, u8);
void setAnimSound(JAIBasic*, f32, f32, u8);
void setAnimObjectSound(f32, f32, u8);
void setAnimSoundVec(Vec*, f32, f32, u32, u8);
void setAnimSoundVec(JAIBasic*, Vec*, f32, f32, u32, u8);
// _00 VTBL
u8* _40; // _40

30
include/JSystem/JAudio/JAI/JAIBasic.h
View File

@ -77,30 +77,30 @@ struct JAIBasic {
}
template <typename T>
void startSoundActorReturnHandleT(T**, unsigned long, JAInter::Actor*, unsigned long, unsigned char);
void startSoundActorReturnHandleT(T**, u32, JAInter::Actor*, u32, u8);
// unused/inlined:
void bootDSP();
void getPlayingSoundHandle(JAISound**, unsigned long);
void getPlayingSoundHandle(JAISound**, u32);
void stopPlayingObjectSe(void*);
void stopPlayingIDObjectSe(unsigned long, void*);
void stopPlayingCategorySe(unsigned char);
void stopPlayingCategoryObjectSe(unsigned char, void*);
void stopPlayingIDObjectSe(u32, void*);
void stopPlayingCategorySe(u8);
void stopPlayingCategoryObjectSe(u8, void*);
void stopAllSe(void*);
void stopAllSe(unsigned char, void*);
void stopAllSe(u8, void*);
void stopAllSeq(void*);
void stopActorSoundOneBuffer(void*, JSULink<JAISound>*);
void stopIDSoundOneBuffer(unsigned long, JSULink<JAISound>*);
void stopIDActorSoundOneBuffer(unsigned long, void*, JSULink<JAISound>*);
void stopIDSoundOneBuffer(u32, JSULink<JAISound>*);
void stopIDActorSoundOneBuffer(u32, void*, JSULink<JAISound>*);
void stopAllSound(void*);
void getPlayingSoundLinkHeadPointer(unsigned long);
void stopAllSound(unsigned long);
void stopAllSound(unsigned long, void*);
void getPlayingSoundLinkHeadPointer(u32);
void stopAllSound(u32);
void stopAllSound(u32, void*);
void deleteObject(void*);
void setPauseFlagAll(unsigned char);
void changeSoundScene(unsigned long);
void setSeCancelSwitch(unsigned char, unsigned char);
void setSeCategoryVolume(unsigned char, unsigned char);
void setPauseFlagAll(u8);
void changeSoundScene(u32);
void setSeCancelSwitch(u8, u8);
void setSeCategoryVolume(u8, u8);
void allocStreamBuffer(void*, long);
void deallocStreamBuffer();
void resumeAudio();

14
include/JSystem/JAudio/JAI/JAISe.h
View File

@ -46,13 +46,13 @@ struct JAISe : public JAISound {
void setSeInterDolby(u8, f32, u32, u8);
// unused/inlined:
void setSeInterRandomPara(f32*, unsigned long, f32, f32);
void setSeInterPitch(unsigned char, f32, unsigned long, f32);
void setSeInterFxmix(unsigned char, f32, unsigned long, unsigned char);
void setSeInterFir(unsigned char, unsigned char, unsigned long, unsigned char);
void setSePortData(unsigned char, unsigned short);
void getSePortData(unsigned char);
void getSeParametermeterF32(unsigned char, unsigned char);
void setSeInterRandomPara(f32*, u32, f32, f32);
void setSeInterPitch(u8, f32, u32, f32);
void setSeInterFxmix(u8, f32, u32, u8);
void setSeInterFir(u8, u8, u32, u8);
void setSePortData(u8, u16);
void getSePortData(u8);
void getSeParametermeterF32(u8, u8);
void getSeInfoPointer();
// _00 = VTABLE

46
include/JSystem/JAudio/JAI/JAISequence.h
View File

@ -48,31 +48,31 @@ struct JAISequence : public JAISound {
f32 getSeqInterVolume(u8);
// unused/inlined:
void setSeqInterFxmix(unsigned char, f32, unsigned long);
void setSeqInterDolby(unsigned char, f32, unsigned long);
void setSeqTempoProportion(f32, unsigned long);
void setSeqPortData(unsigned char, unsigned short, unsigned long);
void setSeqInterFxmix(u8, f32, u32);
void setSeqInterDolby(u8, f32, u32);
void setSeqTempoProportion(f32, u32);
void setSeqPortData(u8, u16, u32);
void setWaveReadMode(long, long);
void setTrackVolume(unsigned char, f32, unsigned long);
void setTrackVolumeMulti(unsigned char, unsigned long, f32, unsigned long);
void setTrackMuteSwitch(unsigned char, unsigned char);
void setTrackMuteSwitchMulti(unsigned long, unsigned char);
void setTrackPan(unsigned char, f32, unsigned long);
void setTrackPanMulti(unsigned char, unsigned long, f32, unsigned long);
void setTrackPitch(unsigned char, f32, unsigned long);
void setTrackPitchMulti(unsigned char, unsigned long, f32, unsigned long);
void setTrackFxmixMulti(unsigned char, unsigned long, f32, unsigned long);
void setTrackDolby(unsigned char, f32, unsigned long);
void setTrackDolbyMulti(unsigned char, unsigned long, f32, unsigned long);
void getSeqInterPan(unsigned char);
void getSeqInterPitch(unsigned char);
void getSeqInterFxmix(unsigned char);
void getSeqInterDolby(unsigned char);
void setTrackVolume(u8, f32, u32);
void setTrackVolumeMulti(u8, u32, f32, u32);
void setTrackMuteSwitch(u8, u8);
void setTrackMuteSwitchMulti(u32, u8);
void setTrackPan(u8, f32, u32);
void setTrackPanMulti(u8, u32, f32, u32);
void setTrackPitch(u8, f32, u32);
void setTrackPitchMulti(u8, u32, f32, u32);
void setTrackFxmixMulti(u8, u32, f32, u32);
void setTrackDolby(u8, f32, u32);
void setTrackDolbyMulti(u8, u32, f32, u32);
void getSeqInterPan(u8);
void getSeqInterPitch(u8);
void getSeqInterFxmix(u8);
void getSeqInterDolby(u8);
void getSeqTempoProportion();
void getSeqPortData(unsigned char);
void getTrackParameterU7(unsigned char, char);
void getTrackParameterF32(unsigned char, char);
void getTrackPortData(unsigned char, unsigned char);
void getSeqPortData(u8);
void getTrackParameterU7(u8, char);
void getTrackParameterF32(u8, char);
void getTrackPortData(u8, u8);
JAInter::SeqParameter mSeqParameter; // _48
};

34
include/JSystem/JAudio/JAI/JAIStream.h
View File

@ -49,23 +49,23 @@ struct JAIStream : public JAISound {
void setChannelPan(u8, f32, u32);
// unused/inlined:
void setStreamMode(unsigned long);
void setStreamInterVolume(unsigned char, f32, unsigned long);
void setStreamInterPan(unsigned char, f32, unsigned long);
void setStreamInterPitch(unsigned char, f32, unsigned long);
void setStreamInterFxmix(unsigned char, f32, unsigned long);
void setStreamInterDolby(unsigned char, f32, unsigned long);
void setChannelFxmix(unsigned char, f32, unsigned long);
void setChannelDolby(unsigned char, f32, unsigned long);
void getChannelVolume(unsigned char);
void getChannelPan(unsigned char);
void getChannelFxmix(unsigned char);
void getChannelDolby(unsigned char);
void getStreamInterVolume(unsigned char);
void getStreamInterPan(unsigned char);
void getStreamInterPitch(unsigned char);
void getStreamInterFxmix(unsigned char);
void getStreamInterDolby(unsigned char);
void setStreamMode(u32);
void setStreamInterVolume(u8, f32, u32);
void setStreamInterPan(u8, f32, u32);
void setStreamInterPitch(u8, f32, u32);
void setStreamInterFxmix(u8, f32, u32);
void setStreamInterDolby(u8, f32, u32);
void setChannelFxmix(u8, f32, u32);
void setChannelDolby(u8, f32, u32);
void getChannelVolume(u8);
void getChannelPan(u8);
void getChannelFxmix(u8);
void getChannelDolby(u8);
void getStreamInterVolume(u8);
void getStreamInterPan(u8);
void getStreamInterPitch(u8);
void getStreamInterFxmix(u8);
void getStreamInterDolby(u8);
// _00-_10 = JSULink
// _10 = VTABLE

36
include/JSystem/JAudio/JAI/JAInter.h
View File

@ -47,25 +47,23 @@ void checkPlayingSeq();
void checkStartedSeq();
void checkReadSeq();
void checkSeqWave();
void checkPlayingSeqTrack(unsigned long);
void checkPlayingSeqTrack(u32);
void stopSeq(JAISequence*);
void checkDvdLoadArc(unsigned long, unsigned long);
void checkCustomDvdLoadArc(unsigned long, unsigned long);
void storeSeqBuffer(JAISequence**, JAInter::Actor*, unsigned long, unsigned long, unsigned char, JAInter::SoundInfo*);
void releaseSeqBuffer(JAISequence*, unsigned long);
SeqUpdateData* getPlayTrackInfo(unsigned long);
void checkDvdLoadArc(u32, u32);
void checkCustomDvdLoadArc(u32, u32);
void storeSeqBuffer(JAISequence**, JAInter::Actor*, u32, u32, u8, JAInter::SoundInfo*);
void releaseSeqBuffer(JAISequence*, u32);
SeqUpdateData* getPlayTrackInfo(u32);
// unused/inlined:
void checkPlayingSeqUpdateMultiplication(unsigned long, unsigned char, unsigned long, JAInter::MoveParaSet*, unsigned long*, unsigned char,
f32*);
void checkPlayingSeqUpdateAddition(unsigned long, unsigned char, unsigned long, JAInter::MoveParaSet*, unsigned long*, unsigned char, f32*,
f32);
void checkPlayingSeqUpdateTrack(unsigned long, unsigned long, JAInter::MoveParaSet*, unsigned long*, unsigned char, f32*);
void checkCustomDvdPreloadArc(unsigned long, unsigned long);
void stopPlayingSeq(unsigned long);
void checkPlayingSoundTrack(unsigned long);
void loadArcSeqData(unsigned long, bool);
void loadCustomArcSeqData(unsigned short, bool);
void checkPlayingSeqUpdateMultiplication(u32, u8, u32, JAInter::MoveParaSet*, u32*, u8, f32*);
void checkPlayingSeqUpdateAddition(u32, u8, u32, JAInter::MoveParaSet*, u32*, u8, f32*, f32);
void checkPlayingSeqUpdateTrack(u32, u32, JAInter::MoveParaSet*, u32*, u8, f32*);
void checkCustomDvdPreloadArc(u32, u32);
void stopPlayingSeq(u32);
void checkPlayingSoundTrack(u32);
void loadArcSeqData(u32, bool);
void loadCustomArcSeqData(u16, bool);
extern SeqUpdateData* seqTrackInfo;
extern JAISequence** FixSeqBufPointer;
@ -321,9 +319,9 @@ void outerInit(SeqUpdateData*, JASTrack*, u32, u16, u8);
void setSePortParameter(JASPortArgs*);
// unused/inlined:
void setSeqPortargsPS16(JAInter::SeqUpdateData*, unsigned long, unsigned char, short*);
JASTrack* trackToSeqp(JASTrack*, unsigned char, unsigned long);
void setPortParameter(JASPortArgs*, JASTrack*, unsigned long, unsigned long);
void setSeqPortargsPS16(JAInter::SeqUpdateData*, u32, u8, short*);
JASTrack* trackToSeqp(JASTrack*, u8, u32);
void setPortParameter(JASPortArgs*, JASTrack*, u32, u32);
void JAIouterP(void*);
void JAIouterSW(void*);
void setAudioFrameParameter(JASPortArgs*);

22
include/JSystem/JAudio/JAI/JAInter/HeapMgr.h
View File

@ -5,26 +5,26 @@
namespace JAInter {
namespace HeapMgr {
void init(unsigned char, unsigned long, unsigned char, unsigned long);
void init(u8, u32, u8, u32);
HeapBlock* getAutoHeapPointer();
void checkOnMemory(unsigned long, unsigned char*);
void releaseAutoHeapPointer(unsigned char);
void checkOnMemory(u32, u8*);
void releaseAutoHeapPointer(u8);
void checkUsefulAutoHeapPosition();
void* getFreeAutoHeapPointer(unsigned char, unsigned long);
void* getFreeAutoHeapPointer(u8, u32);
u32 checkUsefulStayHeapPosition();
void* getFreeStayHeapPointer(unsigned long, unsigned long);
void setAutoHeapLoadedFlag(unsigned char, unsigned char);
void setStayHeapLoadedFlag(unsigned char, unsigned char);
void* getFreeStayHeapPointer(u32, u32);
void setAutoHeapLoadedFlag(u8, u8);
void setStayHeapLoadedFlag(u8, u8);
// unused/inlined:
HeapBlock* getStayHeapPointer();
u32 getAutoHeapCount();
u32 getStayHeapCount();
void changeAutoHeapPointerToPosition(unsigned char*);
void changeAutoHeapPointerToPosition(u8*);
void clearAutoHeap(JAInter::HeapBlock*);
void clearAutoHeap(unsigned long);
void clearStayHeap(unsigned long);
void getAutoHeapPointer(unsigned long);
void clearAutoHeap(u32);
void clearStayHeap(u32);
void getAutoHeapPointer(u32);
extern HeapBlock* sAutoHeap;
extern HeapBlock* sStayHeap;

2
include/JSystem/JAudio/JAI/JAInter/MoveParaSet.h
View File

@ -16,7 +16,7 @@ struct MoveParaSet {
_0C = 0;
}
int set(f32, unsigned long);
int set(f32, u32);
BOOL move();
/** @fabricated */

2
include/JSystem/JAudio/JAI/JAInter/Object.h
View File

@ -11,7 +11,7 @@ struct JKRHeap;
namespace JAInter {
struct ObjectBase : public JKRDisposer {
ObjectBase(Vec*, JKRHeap*, unsigned char); // unused/inlined
ObjectBase(Vec*, JKRHeap*, u8); // unused/inlined
virtual ~ObjectBase(); // _08
virtual JAISound* startSound(u32, u32); // _0C

2
include/JSystem/JAudio/JAS/JASAudioThread.h
View File

@ -13,7 +13,7 @@ enum JASAudioMessage {
* @size = 0x88
*/
struct JASAudioThread : public JKRThread {
JASAudioThread(int, int, unsigned long); // unused/inlined
JASAudioThread(int, int, u32); // unused/inlined
virtual ~JASAudioThread() { } // _08 (weak)
virtual void* run(); // _0C

18
include/JSystem/JAudio/JAS/JASCalc.h
View File

@ -5,9 +5,9 @@
#include "types.h"
namespace JASCalc {
void imixcopy(const short*, const short*, short*, unsigned long);
void bcopy(const void*, void*, unsigned long);
void bzero(void*, unsigned long);
void imixcopy(const short*, const short*, short*, u32);
void bcopy(const void*, void*, u32);
void bzero(void*, u32);
f32 clamp_0_1(f32);
@ -40,12 +40,12 @@ inline f32 clamp01(f32 value)
}
// unused/inlined:
void mixcopy(const short*, const short*, short*, unsigned long);
void bcopyfast(const void*, void*, unsigned long);
void bzerofast(void*, unsigned long);
void hannWindow(short*, unsigned long);
void hammWindow(short*, unsigned long);
void fft(f32*, f32*, unsigned long, long);
void mixcopy(const short*, const short*, short*, u32);
void bcopyfast(const void*, void*, u32);
void bzerofast(void*, u32);
void hannWindow(short*, u32);
void hammWindow(short*, u32);
void fft(f32*, f32*, u32, long);
} // namespace JASCalc
#endif

18
include/JSystem/JAudio/JAS/JASChannel.h
View File

@ -27,24 +27,24 @@ struct JASChannel : JSULink<JASChannel>,
virtual ~JASChannel(); // _14 (weak)
void setOscInit(int, const JASOscillator::Data*);
void setMixConfig(int, unsigned short);
void directReleaseOsc(unsigned short);
void setMixConfig(int, u16);
void directReleaseOsc(u16);
void copyOsc(int, JASOscillator::Data*);
void overwriteOsc(int, JASOscillator::Data*);
void setKeySweepTarget(unsigned char, unsigned long);
void setKeySweepTarget(u8, u32);
void setPauseFlag(bool);
void setPanPower(f32, f32, f32);
BOOL play();
BOOL playForce();
void release(unsigned short);
void updateEffectorParam(JASDsp::TChannel*, unsigned short*, const EffectOscParam&);
static long dspUpdateCallback(unsigned long, JASDsp::TChannel*, void*);
void release(u16);
void updateEffectorParam(JASDsp::TChannel*, u16*, const EffectOscParam&);
static long dspUpdateCallback(u32, JASDsp::TChannel*, void*);
void initialUpdateDSPChannel(JASDsp::TChannel*);
long updateDSPChannel(JASDsp::TChannel*);
f32 calcEffect(const PanVector*, const PanVector*, unsigned char);
f32 calcPan(const PanVector*, const PanVector*, unsigned char);
f32 calcEffect(const PanVector*, const PanVector*, u8);
f32 calcPan(const PanVector*, const PanVector*, u8);
void updateAutoMixer(JASDsp::TChannel*, f32, f32, f32, f32);
void updateMixer(f32, f32, f32, f32, unsigned short*);
void updateMixer(f32, f32, f32, f32, u16*);
void sweepProc();
void free();

16
include/JSystem/JAudio/JAS/JASDriver.h
View File

@ -28,7 +28,7 @@ u16 getChannelLevel();
u16 getAutoLevel();
f32 getAutoLevel_f32();
f32 getDSPLevel_f32();
void setOutputMode(unsigned long);
void setOutputMode(u32);
u32 getOutputMode();
bool rejectCallback(long (*)(void*), void*);
bool registerDspSyncCallback(long (*)(void*), void*);
@ -42,17 +42,17 @@ void startDMA();
void stopDMA();
void updateDac();
void updateDSP();
void readDspBuffer(short*, unsigned long);
void readDspBuffer(short*, u32);
void finishDSPFrame();
void registerMixCallback(short* (*)(long), JASMixMode);
f32 getDacRate();
int getSubFrames();
int getDacSize();
int getFrameSamples();
void mixMonoTrack(short*, unsigned long, short* (*)(long));
void mixMonoTrackWide(short*, unsigned long, short* (*)(long));
void mixExtraTrack(short*, unsigned long, short* (*)(long));
void mixInterleaveTrack(short*, unsigned long, short* (*)(long));
void mixMonoTrack(short*, u32, short* (*)(long));
void mixMonoTrackWide(short*, u32, short* (*)(long));
void mixExtraTrack(short*, u32, short* (*)(long));
void mixInterleaveTrack(short*, u32, short* (*)(long));
// unused/inlined:
void setChannelLevel(f32);
@ -62,8 +62,8 @@ bool registerUpdateDacCallback(long (*)(void*), void*);
void setOutputRate(JASOutputRate);
void setSubFrames(u32);
void setNumDSPBuffer(u8);
void registerDacCallback(void (*)(short*, unsigned long));
void registDSPBufCallback(void (*)(short*, unsigned long));
void registerDacCallback(void (*)(short*, u32));
void registDSPBufCallback(void (*)(short*, u32));
extern u16 MAX_MIXERLEVEL;
extern u16 MAX_AUTOMIXERLEVEL;

8
include/JSystem/JAudio/JAS/JASDsp.h
View File

@ -166,15 +166,15 @@ extern const u16 DSPRES_FILTER[640];
} // namespace JASDsp
struct JASDSPChannel {
typedef long (*Callback)(unsigned long, JASDsp::TChannel*, void*);
typedef long (*Callback)(u32, JASDsp::TChannel*, void*);
JASDSPChannel();
void free();
void start();
void drop();
static void initAll();
static JASDSPChannel* alloc(unsigned char, Callback, void*);
static JASDSPChannel* allocForce(unsigned char, Callback, void*);
void setPriority(unsigned char);
static JASDSPChannel* alloc(u8, Callback, void*);
static JASDSPChannel* allocForce(u8, Callback, void*);
void setPriority(u8);
static JASDSPChannel* getLowestChannel(int);
void updateProc();
static void updateAll();

6
include/JSystem/JAudio/JAS/JASGenericMemPool.h
View File

@ -9,9 +9,9 @@
struct JASGenericMemPool {
JASGenericMemPool(); // unused/inlined
void newMemPool(unsigned long, int);
void* alloc(unsigned long);
void free(void*, unsigned long);
void newMemPool(u32, int);
void* alloc(u32);
void free(void*, u32);
// unused/inlined:
~JASGenericMemPool();

12
include/JSystem/JAudio/JAS/JASHeap.h
View File

@ -11,17 +11,17 @@ struct JASHeap {
JASHeap(JASDisposer*);
~JASHeap() { }
bool alloc(JASHeap*, unsigned long);
bool allocTail(JASHeap*, unsigned long);
bool alloc(JASHeap*, u32);
bool allocTail(JASHeap*, u32);
bool free();
void insertChild(JASHeap*, JASHeap*, void*, unsigned long, bool);
void insertChild(JASHeap*, JASHeap*, void*, u32, bool);
void getTailHeap();
int getTailOffset();
int getCurOffset();
// unused/inlined:
void adjustSize();
void initRootHeap(void*, unsigned long);
void initRootHeap(void*, u32);
void* allocAll(JASHeap*);
void freeTail();
void freeAll();
@ -41,8 +41,8 @@ struct JASHeap {
struct JASSolidHeap : public JASHeap {
// unused/inlined:
JASSolidHeap();
JASSolidHeap(unsigned char*, unsigned long);
void init(unsigned char*, unsigned long);
JASSolidHeap(u8*, u32);
void init(u8*, u32);
void* alloc(u32);
void freeLast();
void freeAll();

4
include/JSystem/JAudio/JAS/JASKernel.h
View File

@ -10,11 +10,11 @@
struct JASCmdHeap;
namespace JASKernel {
void setupRootHeap(JKRSolidHeap*, unsigned long);
void setupRootHeap(JKRSolidHeap*, u32);
JKRExpHeap* getSystemHeap();
JASCmdHeap* getCommandHeap();
JASHeap* getAramHeap();
void setupAramHeap(unsigned long, unsigned long);
void setupAramHeap(u32, u32);
void probeFinish(long);
void probeStart(long, char*);

116
include/JSystem/JAudio/JAS/JASSeqParser.h
View File

@ -5,66 +5,66 @@
struct JASSeqParser {
int parseSeq(struct JASTrack*);
void cmdOpenTrack(JASTrack*, unsigned long*);
void cmdOpenTrackBros(JASTrack*, unsigned long*);
void cmdCall(JASTrack*, unsigned long*);
void cmdRet(JASTrack*, unsigned long*);
void cmdJmp(JASTrack*, unsigned long*);
void cmdLoopS(JASTrack*, unsigned long*);
void cmdLoopE(JASTrack*, unsigned long*);
void cmdReadPort(JASTrack*, unsigned long*);
void cmdWritePort(JASTrack*, unsigned long*);
void cmdParentWritePort(JASTrack*, unsigned long*);
void cmdChildWritePort(JASTrack*, unsigned long*);
void cmdCheckPortImport(JASTrack*, unsigned long*);
void cmdCheckPortExport(JASTrack*, unsigned long*);
void cmdWait(JASTrack*, unsigned long*);
void cmdSetLastNote(JASTrack*, unsigned long*);
void cmdTimeRelate(JASTrack*, unsigned long*);
void cmdSimpleOsc(JASTrack*, unsigned long*);
void cmdSimpleEnv(JASTrack*, unsigned long*);
void cmdSimpleADSR(JASTrack*, unsigned long*);
void cmdTranspose(JASTrack*, unsigned long*);
void cmdCloseTrack(JASTrack*, unsigned long*);
void cmdOutSwitch(JASTrack*, unsigned long*);
void cmdUpdateSync(JASTrack*, unsigned long*);
void cmdBusConnect(JASTrack*, unsigned long*);
void cmdPauseStatus(JASTrack*, unsigned long*);
void cmdVolumeMode(JASTrack*, unsigned long*);
void cmdSetInterrupt(JASTrack*, unsigned long*);
void cmdDisInterrupt(JASTrack*, unsigned long*);
void cmdClrI(JASTrack*, unsigned long*);
void cmdSetI(JASTrack*, unsigned long*);
void cmdRetI(JASTrack*, unsigned long*);
void cmdIntTimer(JASTrack*, unsigned long*);
void cmdSyncCPU(JASTrack*, unsigned long*);
u32 cmdFlushAll(JASTrack*, unsigned long*);
u32 cmdFlushRelease(JASTrack*, unsigned long*);
void cmdTimeBase(JASTrack*, unsigned long*);
void cmdTempo(JASTrack*, unsigned long*);
u32 cmdFinish(JASTrack*, unsigned long*);
u32 cmdNop(JASTrack*, unsigned long*);
void cmdPanPowSet(JASTrack*, unsigned long*);
void cmdFIRSet(JASTrack*, unsigned long*);
void cmdEXTSet(JASTrack*, unsigned long*);
void cmdPanSwSet(JASTrack*, unsigned long*);
void cmdOscRoute(JASTrack*, unsigned long*);
void cmdVibDepth(JASTrack*, unsigned long*);
void cmdVibDepthMidi(JASTrack*, unsigned long*);
void cmdVibPitch(JASTrack*, unsigned long*);
void cmdIIRSet(JASTrack*, unsigned long*);
void cmdIIRCutOff(JASTrack*, unsigned long*);
void cmdOscFull(JASTrack*, unsigned long*);
void cmdCheckWave(JASTrack*, unsigned long*);
void cmdPrintf(JASTrack*, unsigned long*);
void cmdSetParam(JASTrack*, unsigned char);
void cmdWait(JASTrack*, unsigned char);
void cmdNoteOff(JASTrack*, unsigned char);
void cmdNoteOn(JASTrack*, unsigned char);
void cmdOpenTrack(JASTrack*, u32*);
void cmdOpenTrackBros(JASTrack*, u32*);
void cmdCall(JASTrack*, u32*);
void cmdRet(JASTrack*, u32*);
void cmdJmp(JASTrack*, u32*);
void cmdLoopS(JASTrack*, u32*);
void cmdLoopE(JASTrack*, u32*);
void cmdReadPort(JASTrack*, u32*);
void cmdWritePort(JASTrack*, u32*);
void cmdParentWritePort(JASTrack*, u32*);
void cmdChildWritePort(JASTrack*, u32*);
void cmdCheckPortImport(JASTrack*, u32*);
void cmdCheckPortExport(JASTrack*, u32*);
void cmdWait(JASTrack*, u32*);
void cmdSetLastNote(JASTrack*, u32*);
void cmdTimeRelate(JASTrack*, u32*);
void cmdSimpleOsc(JASTrack*, u32*);
void cmdSimpleEnv(JASTrack*, u32*);
void cmdSimpleADSR(JASTrack*, u32*);
void cmdTranspose(JASTrack*, u32*);
void cmdCloseTrack(JASTrack*, u32*);
void cmdOutSwitch(JASTrack*, u32*);
void cmdUpdateSync(JASTrack*, u32*);
void cmdBusConnect(JASTrack*, u32*);
void cmdPauseStatus(JASTrack*, u32*);
void cmdVolumeMode(JASTrack*, u32*);
void cmdSetInterrupt(JASTrack*, u32*);
void cmdDisInterrupt(JASTrack*, u32*);
void cmdClrI(JASTrack*, u32*);
void cmdSetI(JASTrack*, u32*);
void cmdRetI(JASTrack*, u32*);
void cmdIntTimer(JASTrack*, u32*);
void cmdSyncCPU(JASTrack*, u32*);
u32 cmdFlushAll(JASTrack*, u32*);
u32 cmdFlushRelease(JASTrack*, u32*);
void cmdTimeBase(JASTrack*, u32*);
void cmdTempo(JASTrack*, u32*);
u32 cmdFinish(JASTrack*, u32*);
u32 cmdNop(JASTrack*, u32*);
void cmdPanPowSet(JASTrack*, u32*);
void cmdFIRSet(JASTrack*, u32*);
void cmdEXTSet(JASTrack*, u32*);
void cmdPanSwSet(JASTrack*, u32*);
void cmdOscRoute(JASTrack*, u32*);
void cmdVibDepth(JASTrack*, u32*);
void cmdVibDepthMidi(JASTrack*, u32*);
void cmdVibPitch(JASTrack*, u32*);
void cmdIIRSet(JASTrack*, u32*);
void cmdIIRCutOff(JASTrack*, u32*);
void cmdOscFull(JASTrack*, u32*);
void cmdCheckWave(JASTrack*, u32*);
void cmdPrintf(JASTrack*, u32*);
void cmdSetParam(JASTrack*, u8);
void cmdWait(JASTrack*, u8);
void cmdNoteOff(JASTrack*, u8);
void cmdNoteOn(JASTrack*, u8);
void conditionCheck(JASTrack*, unsigned char);
void conditionCheck(JASTrack*, u8);
void Cmd_Process(JASTrack*, unsigned char, unsigned short);
void Cmd_Process(JASTrack*, u8, u16);
void RegCmd_Process(JASTrack*, int, int);
};

2
include/JSystem/JAudio/JAS/JASThread.h
View File

@ -18,7 +18,7 @@ struct JASTaskThread : public JKRThread {
int sendCmdMsg(void (*)(void*), void*);
// unused/inlined:
JASCmdHeap::Header* allocCallStack(void (*)(void*), const void*, unsigned long);
JASCmdHeap::Header* allocCallStack(void (*)(void*), const void*, u32);
void* allocCallStack(void (*)(void*), void*);
void pause(bool);

2
include/JSystem/JAudio/JAS/JASTrack.h
View File

@ -210,7 +210,7 @@ struct JASTrack : JSUList<JASChannel> {
void muteTrack(bool);
static long rootCallback(void*);
static void channelUpdateCallback(unsigned long, JASChannel*, JASDsp::TChannel*, void*);
static void channelUpdateCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
static void newMemPool(int);
static void registerSeqCallback(SeqCallback);

6
include/JSystem/JAudio/JAS/JASWave.h
View File

@ -28,7 +28,7 @@ struct JASWaveArc : public JASDisposer {
// unused/inlined:
~JASWaveArc() { }
bool loadSetup(unsigned long);
bool loadSetup(u32);
bool eraseSetup();
bool sendLoadCmd();
void execLoad();
@ -133,8 +133,8 @@ struct JASBasicWaveBank : public JASWaveBank {
virtual void onLoadDone(); // _0C
virtual void onEraseDone(); // _10
void setWaveCount(unsigned long);
void setWaveInfo(int, unsigned long, const JASWaveInfo&);
void setWaveCount(u32);
void setWaveInfo(int, u32, const JASWaveInfo&);
u32 getWaveID(int) const;
JASBasicWaveBank* mBank; // _5C

4
include/JSystem/JKernel/JKRArchive.h
View File

@ -264,8 +264,8 @@ struct JKRDvdArchive : public JKRArchive {
virtual void* fetchResource(void* resourceBuffer, u32 bufferSize, SDIFileEntry* entry, u32* resSize); // _3C
bool open(long);
static u32 fetchResource_subroutine(long, u32, u32, unsigned char*, u32, int, int);
static u32 fetchResource_subroutine(long, u32, u32, JKRHeap*, int, int, unsigned char**);
static u32 fetchResource_subroutine(long, u32, u32, u8*, u32, int, int);
static u32 fetchResource_subroutine(long, u32, u32, JKRHeap*, int, int, u8**);
// Unused/inlined:
unknown fixedInit(long, EMountDirection);

2
include/JSystem/JKernel/JKRDvdRipper.h
View File

@ -29,7 +29,7 @@ struct JKRDvdRipper {
static void* loadToMainRAM(const char*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
static void* loadToMainRAM(long, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
static void* loadToMainRAM(JKRDvdFile*, unsigned char*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
static void* loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
static void* loadToMainRAMAsync(const char*, u8*, JKRExpandSwitch, u32, JKRHeap*, u32*);
static void* loadToMainRAMAsync(long, u8*, JKRExpandSwitch, u32, JKRHeap*, u32*);

6
include/JSystem/JKernel/JKRFileCache.h
View File

@ -21,7 +21,7 @@ struct JKRFileCache : public JKRFileLoader {
virtual ~JKRFileCache(); // _08
virtual bool becomeCurrent(const char*); // _10
virtual void* getResource(const char*); // _14
virtual void* getResource(unsigned long, const char*); // _18
virtual void* getResource(u32, const char*); // _18
virtual size_t readResource(void* resourceBuffer, u32 bufferSize, const char* path); // _1C
virtual size_t readResource(void* resourceBuffer, u32 bufferSize, u32 type, const char* name); // _20
virtual void removeResourceAll(); // _24
@ -31,14 +31,14 @@ struct JKRFileCache : public JKRFileLoader {
virtual u32 countFile(const char*) const; // _34
virtual JKRFileFinder* getFirstFile(const char*) const; // _38
virtual void* getFsResource(const char*); // _3C (weak)
virtual void* getNameResource(unsigned long, const char*); // _40 (weak)
virtual void* getNameResource(u32, const char*); // _40 (weak)
virtual long readFsResource(void* resourceBuffer, u32 bufferSize, const char* path); // _44 (weak)
virtual long readNameResource(void* resourceBuffer, u32 bufferSize, u32 type, const char* name); // _48 (weak)
// +4 bytes vtable padding
CCacheBlock* findCacheBlock(const void*) const;
CCacheBlock* findCacheBlock(unsigned long) const;
CCacheBlock* findCacheBlock(u32) const;
bool findFile(char*, const char*) const;
char* getDvdPathName(const char*) const;
void convStrLower(char*) const;

4
include/JSystem/JKernel/JKRThread.h
View File

@ -156,14 +156,14 @@ struct JKRTask : public JKRThread {
void* _08;
};
JKRTask(int msgCount, int threadPriority, u32 stackSize); // unused/inlined
JKRTask(int msgCount, int threadPriority, size_t stackSize); // unused/inlined
virtual ~JKRTask(); // _08
virtual void* run(); // _0C
bool request(RequestCallback, void*, void*);
static JKRTask* create(int, int, unsigned long, JKRHeap*);
static JKRTask* create(int, int, size_t, JKRHeap*);
// unused/inlined:
Message* searchBlank();

2
include/JSystem/JParticle/JPABlock.h
View File

@ -48,7 +48,7 @@ struct JPADynamicsBlockData {
*/
struct JPADynamicsBlock {
JPADynamicsBlock(const unsigned char*);
JPADynamicsBlock(const u8*);
void init();
void create(JPAEmitterWorkData*);

6
include/JSystem/JStage/TActor.h
View File

@ -17,16 +17,16 @@ struct TActor : public TObject {
virtual void JSGGetRotation(Vec*) const; // _4C
virtual void JSGSetRotation(const Vec&); // _50
virtual int JSGGetShape() const; // _54
virtual void JSGSetShape(unsigned long); // _58
virtual void JSGSetShape(u32); // _58
virtual int JSGGetAnimation() const; // _5C
virtual void JSGSetAnimation(unsigned long); // _60
virtual void JSGSetAnimation(u32); // _60
virtual f32 JSGGetAnimationFrame() const; // _64
virtual void JSGSetAnimationFrame(f32); // _68
virtual f32 JSGGetAnimationFrameMax() const; // _6C
virtual f32 JSGGetAnimationTransition() const; // _70
virtual void JSGSetAnimationTransition(f32); // _74
virtual int JSGGetTextureAnimation() const; // _78
virtual void JSGSetTextureAnimation(unsigned long); // _7C
virtual void JSGSetTextureAnimation(u32); // _7C
virtual f32 JSGGetTextureAnimationFrame() const; // _80
virtual void JSGSetTextureAnimationFrame(f32); // _84
virtual f32 JSGGetTextureAnimationFrameMax() const; // _88

6
include/JSystem/JStage/TSystem.h
View File

@ -9,10 +9,10 @@ struct TSystem : public TObject {
virtual ~TSystem() = 0; // _08
virtual int JSGFGetType() const; // _0C
virtual int JSGFindObject(TObject**, const char*, TEObject) const; // _3C
virtual int JSGCreateObject(const char*, TEObject, unsigned long); // _40
virtual int JSGCreateObject(const char*, TEObject, u32); // _40
virtual void JSGDestroyObject(TObject*); // _44
virtual int JSGGetSystemData(unsigned long); // _48
virtual void JSGSetSystemData(unsigned long, unsigned long); // _4C
virtual int JSGGetSystemData(u32); // _48
virtual void JSGSetSystemData(u32, u32); // _4C
};
} // namespace JStage

66
include/JSystem/JStudio/TAdaptor.h
View File

@ -72,19 +72,19 @@ struct TAdaptor_actor : public TAdaptor {
// ~TAdaptor_actor();
virtual ~TAdaptor_actor() = 0; // _08
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _20
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _24
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _28
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _2C
virtual void adaptor_do_RELATION(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _30
virtual void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _34
virtual void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _38
virtual void adaptor_do_SHAPE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _3C
virtual void adaptor_do_ANIMATION(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _40
virtual void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _44
virtual void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _48
virtual void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _4C
virtual ~TAdaptor_actor() = 0; // _08
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32) = 0; // _20
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; // _24
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; // _28
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, u32) = 0; // _2C
virtual void adaptor_do_RELATION(JStudio::data::TEOperationData, const void*, u32) = 0; // _30
virtual void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; // _34
virtual void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; // _38
virtual void adaptor_do_SHAPE(JStudio::data::TEOperationData, const void*, u32) = 0; // _3C
virtual void adaptor_do_ANIMATION(JStudio::data::TEOperationData, const void*, u32) = 0; // _40
virtual void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, u32) = 0; // _44
virtual void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData, const void*, u32) = 0; // _48
virtual void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, u32) = 0; // _4C
JStudio::TVariableValue _0C[14]; // _0C
@ -119,14 +119,14 @@ struct TAdaptor_camera : public TAdaptor {
// ~TAdaptor_camera();
virtual ~TAdaptor_camera() = 0; // _08
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _20
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _24
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _28
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _2C
virtual void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _30
virtual void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _34
virtual void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _38
virtual ~TAdaptor_camera() = 0; // _08
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32) = 0; // _20
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; // _24
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; // _28
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, u32) = 0; // _2C
virtual void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, const void*, u32) = 0; // _30
virtual void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; // _34
virtual void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; // _38
JStudio::TVariableValue _0C[0xC]; // _0C
@ -158,9 +158,9 @@ struct TAdaptor_light : public TAdaptor {
}
// ~TAdaptor_light();
virtual ~TAdaptor_light() = 0; // _08
virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _20
virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _24
virtual ~TAdaptor_light() = 0; // _08
virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; // _20
virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, const void*, u32) = 0; // _24
static const u32 sauVariableValue_3_COLOR_RGB[3];
static const u32 sauVariableValue_4_COLOR_RGBA[4];
@ -189,15 +189,15 @@ struct TAdaptor_particle : public TAdaptor {
// ~TAdaptor_particle();
virtual ~TAdaptor_particle() = 0; // _08
virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _20
virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _24
virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _28
virtual void adaptor_do_END(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _2C
virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _30
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _34
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _38
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long) = 0; // _3C
virtual ~TAdaptor_particle() = 0; // _08
virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, const void*, u32) = 0; // _20
virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, const void*, u32) = 0; // _24
virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, const void*, u32) = 0; // _28
virtual void adaptor_do_END(JStudio::data::TEOperationData, const void*, u32) = 0; // _2C
virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, const void*, u32) = 0; // _30
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32) = 0; // _34
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; // _38
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; // _3C
JStudio::TVariableValue _0C[18];

50
include/JSystem/JStudio/TObject.h
View File

@ -17,7 +17,7 @@ struct TParse_TBlock_object;
} // namespace stb
struct TObject : stb::TObject {
TObject(data::TE32Block, void const*, unsigned long, TAdaptor*); // unused/inlined
TObject(data::TE32Block, void const*, u32, TAdaptor*); // unused/inlined
TObject(const JStudio::stb::data::TParse_TBlock_object& data, JStudio::TAdaptor* adaptor) // unused/inlined
: stb::TObject(data)
, mAdaptor(adaptor)
@ -43,59 +43,59 @@ struct TObject : stb::TObject {
struct TObject_actor : public TObject {
TObject_actor(const JStudio::stb::data::TParse_TBlock_object&, JStudio::TAdaptor_actor*);
TObject_actor(void const*, unsigned long, JStudio::TAdaptor_actor*); // unused/inlined
TObject_actor(void const*, u32, JStudio::TAdaptor_actor*); // unused/inlined
virtual ~TObject_actor(); // _08 (weak)
virtual void do_paragraph(unsigned long, const void*, unsigned long); // _14
virtual ~TObject_actor(); // _08 (weak)
virtual void do_paragraph(u32, const void*, u32); // _14
};
struct TObject_ambientLight : public TObject {
TObject_ambientLight(const JStudio::stb::data::TParse_TBlock_object&, JStudio::TAdaptor_ambientLight*);
TObject_ambientLight(void const*, unsigned long, JStudio::TAdaptor_ambientLight*); // unused/inlined
TObject_ambientLight(void const*, u32, JStudio::TAdaptor_ambientLight*); // unused/inlined
virtual ~TObject_ambientLight(); // _08 (weak)
virtual void do_paragraph(unsigned long, const void*, unsigned long); // _14
virtual ~TObject_ambientLight(); // _08 (weak)
virtual void do_paragraph(u32, const void*, u32); // _14
};
struct TObject_camera : public TObject {
TObject_camera(const JStudio::stb::data::TParse_TBlock_object&, JStudio::TAdaptor_camera*);
TObject_camera(void const*, unsigned long, JStudio::TAdaptor_camera*); // unused/inlined
TObject_camera(void const*, u32, JStudio::TAdaptor_camera*); // unused/inlined
virtual ~TObject_camera(); // _08 (weak)
virtual void do_paragraph(unsigned long, const void*, unsigned long); // _14
virtual ~TObject_camera(); // _08 (weak)
virtual void do_paragraph(u32, const void*, u32); // _14
};
struct TObject_fog : public TObject {
TObject_fog(const JStudio::stb::data::TParse_TBlock_object&, JStudio::TAdaptor_fog*);
TObject_fog(void const*, unsigned long, JStudio::TAdaptor_fog*); // unused/inlined
TObject_fog(void const*, u32, JStudio::TAdaptor_fog*); // unused/inlined
virtual ~TObject_fog(); // _08 (weak)
virtual void do_paragraph(unsigned long, const void*, unsigned long); // _14
virtual ~TObject_fog(); // _08 (weak)
virtual void do_paragraph(u32, const void*, u32); // _14
};
struct TObject_light : public TObject {
TObject_light(const JStudio::stb::data::TParse_TBlock_object&, JStudio::TAdaptor_light*);
TObject_light(void const*, unsigned long, JStudio::TAdaptor_light*); // unused/inlined
TObject_light(void const*, u32, JStudio::TAdaptor_light*); // unused/inlined
virtual ~TObject_light(); // _08 (weak)
virtual void do_paragraph(unsigned long, const void*, unsigned long); // _14
virtual ~TObject_light(); // _08 (weak)
virtual void do_paragraph(u32, const void*, u32); // _14
};
struct TObject_message : public TObject {
TObject_message(const JStudio::stb::data::TParse_TBlock_object&, JStudio::TAdaptor_message*);
TObject_message(void const*, unsigned long, JStudio::TAdaptor_message*); // unused/inlined
TObject_message(void const*, u32, JStudio::TAdaptor_message*); // unused/inlined
virtual ~TObject_message(); // _08 (weak)
virtual void do_paragraph(unsigned long, const void*, unsigned long); // _14
virtual ~TObject_message(); // _08 (weak)
virtual void do_paragraph(u32, const void*, u32); // _14
};
// TODO: The vtable is only 20 bytes long. Why is there so much blank space afterwards???
struct TObject_particle : public TObject {
TObject_particle(const JStudio::stb::data::TParse_TBlock_object&, JStudio::TAdaptor_particle*);
TObject_particle(void const*, unsigned long, JStudio::TAdaptor_particle*); // unused/inlined
TObject_particle(void const*, u32, JStudio::TAdaptor_particle*); // unused/inlined
virtual ~TObject_particle(); // _08 (weak)
virtual void do_paragraph(unsigned long, const void*, unsigned long); // _14
virtual ~TObject_particle(); // _08 (weak)
virtual void do_paragraph(u32, const void*, u32); // _14
// virtual void _20() = 0; // _20
// virtual void _24() = 0; // _24
@ -117,10 +117,10 @@ struct TObject_particle : public TObject {
struct TObject_sound : public TObject {
TObject_sound(const JStudio::stb::data::TParse_TBlock_object&, JStudio::TAdaptor_sound*);
TObject_sound(void const*, unsigned long, JStudio::TAdaptor_sound*); // unused/inlined
TObject_sound(void const*, u32, JStudio::TAdaptor_sound*); // unused/inlined
virtual ~TObject_sound(); // _08 (weak)
virtual void do_paragraph(unsigned long, const void*, unsigned long); // _14
virtual ~TObject_sound(); // _08 (weak)
virtual void do_paragraph(u32, const void*, u32); // _14
};
} // namespace JStudio

8
include/JSystem/JStudio/TParse.h
View File

@ -8,11 +8,11 @@
namespace JStudio {
struct TParse : public stb::TParse {
TParse(JStudio::TControl*);
virtual ~TParse(); // _08
virtual bool parseHeader(const stb::data::TParse_THeader&, unsigned long); // _14
virtual void parseBlock_block(const stb::data::TParse_TBlock&, unsigned long); // _18
virtual ~TParse(); // _08
virtual bool parseHeader(const stb::data::TParse_THeader&, u32); // _14
virtual void parseBlock_block(const stb::data::TParse_TBlock&, u32); // _18
void parseBlock_block_fvb_(const JStudio::stb::data::TParse_TBlock&, unsigned long);
void parseBlock_block_fvb_(const JStudio::stb::data::TParse_TBlock&, u32);
fvb::TParse mFvbParse; // _08
};

8
include/JSystem/JStudio/fvb/TParse.h
View File

@ -95,10 +95,10 @@ struct TFactory {
struct TParse {
TParse(TControl*);
virtual ~TParse(); // _00
virtual void parseHeader_next(const void**, unsigned long*,
unsigned long); // _04
virtual void parseBlock_next(const void**, unsigned long*,
unsigned long); // _08
virtual void parseHeader_next(const void**, u32*,
u32); // _04
virtual void parseBlock_next(const void**, u32*,
u32); // _08
};
} // namespace fvb
} // namespace JStudio

4
include/JSystem/JStudio_JMessage.h
View File

@ -25,8 +25,8 @@ struct TCreateObject : public TCreateObject_base {
};
struct TAdaptor_message : public JStudio::TAdaptor_message {
virtual ~TAdaptor_message(); // _08
virtual void adaptor_do_MESSAGE(JStudio::data::TEOperationData, const void*, unsigned long); // _20
virtual ~TAdaptor_message(); // _08
virtual void adaptor_do_MESSAGE(JStudio::data::TEOperationData, const void*, u32); // _20
TAdaptor_message(JMessage::TControl*);
JMessage::TControl* mControl; // _10

24
include/JSystem/JStudio_JParticle.h
View File

@ -29,18 +29,18 @@ struct TAdaptor_particle : JStudio::TAdaptor_particle {
TAdaptor_particle(JPAEmitterManager*, const JStage::TSystem*);
virtual ~TAdaptor_particle(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, unsigned long); // _18
virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, const void*, unsigned long); // _20
virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, const void*, unsigned long); // _24
virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, const void*, unsigned long); // _28
virtual void adaptor_do_END(JStudio::data::TEOperationData, const void*, unsigned long); // _2C
virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, const void*, unsigned long); // _30
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, unsigned long); // _34
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, unsigned long); // _38
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long); // _3C
virtual ~TAdaptor_particle(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, u32); // _18
virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, const void*, u32); // _20
virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, const void*, u32); // _24
virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, const void*, u32); // _28
virtual void adaptor_do_END(JStudio::data::TEOperationData, const void*, u32); // _2C
virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, const void*, u32); // _30
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32); // _34
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32); // _38
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32); // _3C
void beginParticle_fadeIn_(u32);
void endParticle_fadeOut_(u32);

108
include/JSystem/JStudio_JStage.h
View File

@ -50,7 +50,7 @@ struct TAdaptor_object_ {
static void adaptor_data_(JStage::TObject*, const void*, u32, const void*, u32);
static JStage::TObject* adaptor_findJSGObject_(const JStage::TSystem*, const char*);
static u32 adaptor_findJSGObjectNode_(const JStage::TObject*, const char*);
static void adaptor_ENABLE_(JStage::TObject*, JStudio::data::TEOperationData, const void*, unsigned long);
static void adaptor_ENABLE_(JStage::TObject*, JStudio::data::TEOperationData, const void*, u32);
};
struct TAdaptor_actor : public JStudio::TAdaptor_actor {
@ -84,24 +84,24 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor {
TAdaptor_actor(const JStage::TSystem*, JStage::TActor*);
// vtable size is 0x50, despite all the padding.
virtual ~TAdaptor_actor(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, unsigned long); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, unsigned long, const void*, unsigned long); // _1C
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, unsigned long); // _20
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, unsigned long); // _24
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long); // _28
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, unsigned long); // _2C
virtual void adaptor_do_RELATION(JStudio::data::TEOperationData, const void*, unsigned long); // _30
virtual void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, const void*, unsigned long); // _34
virtual void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long); // _38
virtual void adaptor_do_SHAPE(JStudio::data::TEOperationData, const void*, unsigned long); // _3C
virtual void adaptor_do_ANIMATION(JStudio::data::TEOperationData, const void*, unsigned long); // _40
virtual void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, unsigned long); // _44
virtual void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData, const void*, unsigned long); // _48
virtual void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, unsigned long); // _4C
virtual ~TAdaptor_actor(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, u32); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, u32, const void*, u32); // _1C
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32); // _20
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32); // _24
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32); // _28
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, u32); // _2C
virtual void adaptor_do_RELATION(JStudio::data::TEOperationData, const void*, u32); // _30
virtual void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, const void*, u32); // _34
virtual void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, const void*, u32); // _38
virtual void adaptor_do_SHAPE(JStudio::data::TEOperationData, const void*, u32); // _3C
virtual void adaptor_do_ANIMATION(JStudio::data::TEOperationData, const void*, u32); // _40
virtual void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, u32); // _44
virtual void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData, const void*, u32); // _48
virtual void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, u32); // _4C
// virtual void _50() = 0; // _50
// virtual void _54() = 0; // _54
// virtual void _58() = 0; // _58
@ -123,8 +123,8 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor {
// virtual void _98() = 0; // _98
// virtual void _9C() = 0; // _9C
void setJSG_ID_(IDFunction, JStudio::data::TEOperationData, const void*, unsigned long);
// void setJSG_ID_(JStage::TActor, void(const void*, void*, unsigned long), JStudio::data::TEOperationData, const void*, unsigned long);
void setJSG_ID_(IDFunction, JStudio::data::TEOperationData, const void*, u32);
// void setJSG_ID_(JStage::TActor, void(const void*, void*, u32), JStudio::data::TEOperationData, const void*, u32);
void setJSG_SRT_(const JStudio::TControl*);
void getJSG_SRT_(const JStudio::TControl*);
@ -146,12 +146,12 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor {
struct TAdaptor_ambientLight : public JStudio::TAdaptor_ambientLight {
TAdaptor_ambientLight(const JStage::TSystem* system, JStage::TAmbientLight* object);
virtual ~TAdaptor_ambientLight(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, unsigned long); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, unsigned long, const void*, unsigned long); // _1C
virtual ~TAdaptor_ambientLight(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, u32); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, u32, const void*, u32); // _1C
const JStage::TSystem* mSystem; // _5C
JStage::TAmbientLight* mLight; // _60
@ -163,19 +163,19 @@ struct TAdaptor_camera : public JStudio::TAdaptor_camera {
TAdaptor_camera(const JStage::TSystem*, JStage::TCamera*);
// vtable size is 0x3C, despite all the padding.
virtual ~TAdaptor_camera(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, unsigned long); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, unsigned long, const void*, unsigned long); // _1C
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, unsigned long); // _20
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, unsigned long); // _24
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long); // _28
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, unsigned long); // _2C
virtual void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, const void*, unsigned long); // _30
virtual void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, const void*, unsigned long); // _34
virtual void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long); // _38
virtual ~TAdaptor_camera(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, u32); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, u32, const void*, u32); // _1C
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32); // _20
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32); // _24
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32); // _28
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, u32); // _2C
virtual void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, const void*, u32); // _30
virtual void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32); // _34
virtual void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32); // _38
// virtual void _3C() = 0; // _3C
// virtual void _40() = 0; // _40
// virtual void _44() = 0; // _44
@ -216,12 +216,12 @@ struct TAdaptor_fog : public JStudio::TAdaptor_fog {
TAdaptor_fog(const JStage::TSystem*, JStage::TFog*);
// vtable size is 0x20, despite all the padding.
virtual ~TAdaptor_fog(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, unsigned long); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, unsigned long, const void*, unsigned long); // _1C
virtual ~TAdaptor_fog(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, u32); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, u32, const void*, u32); // _1C
// virtual void _20() = 0; // _20
// virtual void _24() = 0; // _24
// virtual void _28() = 0; // _28
@ -245,14 +245,14 @@ struct TAdaptor_light : public JStudio::TAdaptor_light {
TAdaptor_light(const JStage::TSystem*, JStage::TLight*);
virtual ~TAdaptor_light(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, unsigned long); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, unsigned long, const void*, unsigned long); // _1C
virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, const void*, unsigned long); // _20
virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, const void*, unsigned long); // _24
virtual ~TAdaptor_light(); // _08
virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C
virtual void adaptor_do_begin(const JStudio::TObject*); // _10
virtual void adaptor_do_end(const JStudio::TObject*); // _14
virtual void adaptor_do_update(const JStudio::TObject*, u32); // _18
virtual void adaptor_do_data(const JStudio::TObject*, const void*, u32, const void*, u32); // _1C
virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, const void*, u32); // _20
virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, const void*, u32); // _24
JStudio::TVariableValue* _0C;
};

4
include/JSystem/JUtility/JUTVideo.h
View File

@ -20,8 +20,8 @@ struct JUTVideo {
static JUTVideo* createManager(const GXRenderModeObj*);
static void destroyManager();
static JUTVideo* getManager() { return sManager; }
static void preRetraceProc(unsigned long);
static void postRetraceProc(unsigned long);
static void preRetraceProc(u32);
static void postRetraceProc(u32);
static void drawDoneCallback();
inline static u32 getVideoInterval() { return sVideoInterval; }

2
include/MemoryCardMgr.h
View File

@ -66,7 +66,7 @@ struct MemoryCardMgr {
virtual void doInit() { } // _10 (weak)
virtual bool doCardProc(void*, MemoryCardMgrCommand*) { return true; } // _14 (weak)
virtual u32 getHeaderSize() { return 0x2000; } // _18 (weak)
virtual void doMakeHeader(unsigned char*); // _1C
virtual void doMakeHeader(u8*); // _1C
virtual void doSetCardStat(CARDStat*); // _20
virtual bool doCheckCardStat(CARDStat*); // _24
virtual bool isErrorOccured(); // _28

4
include/P2JME/TReference.h
View File

@ -6,8 +6,8 @@
namespace P2JME {
struct TReference : public JMessage::TReference {
virtual ~TReference() { } // _08
virtual char* do_word(unsigned long) const; // _0C
virtual ~TReference() { } // _08
virtual char* do_word(u32) const; // _0C
};
} // namespace P2JME

6
include/PSM/BossSeq.h
View File

@ -27,9 +27,9 @@ struct MiddleBossSeq : public PSSystem::JumpBgmSeq {
struct BigBossSeq : public MiddleBossSeq {
BigBossSeq(const char*, const JAInter::SoundInfo&, PSSystem::DirectorMgrBase*);
virtual ~BigBossSeq(); // _08 (weak)
virtual void onJump(unsigned short); // _60
virtual void jumpCheck(unsigned short); // _64
virtual ~BigBossSeq(); // _08 (weak)
virtual void onJump(u16); // _60
virtual void jumpCheck(u16); // _64
// _10 = VTBL
// _00-_144 = MiddleBossSeq

2
include/PSM/Director.h
View File

@ -258,7 +258,7 @@ struct ActorDirector_Scaled : public TrackOnDirector_Scaled {
* @size{0x6C}
*/
struct ActorDirector_Enemy : public ActorDirector_Scaled {
ActorDirector_Enemy(const char*, int, long, long, unsigned long);
ActorDirector_Enemy(const char*, int, long, long, u32);
virtual ~ActorDirector_Enemy() { } // _08 (weak)
virtual void underDirection(); // _18

20
include/PSM/EnemyBoss.h
View File

@ -16,16 +16,16 @@ struct EnemyBoss : public EnemyBase {
virtual void exec(); // _20
virtual void onCalcOn(); // _28
virtual bool judgeNearWithPlayer(const Vec&, const Vec&, f32,
f32); // _34
virtual void onPlayingSe(unsigned long, JAISound*); // _38
virtual void setKilled(); // _C8
virtual void jumpRequest(u16) = 0; // _D4
virtual void postPikiAttack(bool) = 0; // _D8
virtual void updateDisappearing(); // _DC
virtual void onDeathMotionTop(); // _E0
virtual void onAppear(); // _E4 (weak)
virtual void onAppear1st(); // _E8 (weak)
virtual void onDisappear(); // _EC (weak)
f32); // _34
virtual void onPlayingSe(u32, JAISound*); // _38
virtual void setKilled(); // _C8
virtual void jumpRequest(u16) = 0; // _D4
virtual void postPikiAttack(bool) = 0; // _D8
virtual void updateDisappearing(); // _DC
virtual void onDeathMotionTop(); // _E0
virtual void onAppear(); // _E4 (weak)
virtual void onAppear1st(); // _E8 (weak)
virtual void onDisappear(); // _EC (weak)
void calcDistance();
void setAppearFlag(bool);

12
include/PSM/Scene.h
View File

@ -90,12 +90,12 @@ struct Scene_Global : public SceneBase {
struct Scene_Objects : public SceneBase {
Scene_Objects(u8, PSGame::SceneInfo*);
virtual ~Scene_Objects(); // _0C
virtual void exec(); // _18
virtual void startMainSeq(); // _1C
virtual f32 getCamDistVol(unsigned char); // _28
virtual bool getSeSceneGate(ObjBase*, unsigned long); // _38
virtual void onStartMainSeq(); // _54
virtual ~Scene_Objects(); // _0C
virtual void exec(); // _18
virtual void startMainSeq(); // _1C
virtual f32 getCamDistVol(u8); // _28
virtual bool getSeSceneGate(ObjBase*, u32); // _38
virtual void onStartMainSeq(); // _54
void adaptObjMgr();
void detachObjMgr();

2
include/PSSystem/ClusterSe.h
View File

@ -46,7 +46,7 @@ struct Factory {
*/
struct Mgr {
void constructParts(PSSystem::ClusterSe::Factory& factory);
void play(unsigned char, JAInter::Object*);
void play(u8, JAInter::Object*);
u8 _00[0x4]; // _00 - unknown
Part* mPart; // _04

2
include/PSSystem/EnvSeBase.h
View File

@ -25,7 +25,7 @@ struct MoveParamSet {
};
struct EnvSeBase : public JSULink<EnvSeBase> {
EnvSeBase(unsigned long, f32);
EnvSeBase(u32, f32);
virtual void exec(); // _08
virtual JAISound* play(); // _0C

2
include/PSSystem/Seq.h
View File

@ -63,7 +63,7 @@ struct SeqBase : JSULink<SeqBase> {
* @size 0x18
*/
struct SeqHeap {
SeqHeap(unsigned long, PSSystem::SeqBase*); // unused/inlined
SeqHeap(u32, PSSystem::SeqBase*); // unused/inlined
virtual ~SeqHeap(); // _08
virtual void loadSeqAsync(TaskChecker*); // _0C

2
include/PSSystem/SeqSound.h
View File

@ -30,7 +30,7 @@ struct SeqSound : public JAISequence, public SeqSoundBase {
// vtable 1 (JAISequence) (no changes) - _08-_D0
// vtable 2 (SeqSoundBase + self) - _DC-_E0 (thunk)
virtual void stopInner(unsigned long); // _E4 (weak)
virtual void stopInner(u32); // _E4 (weak)
// _00 - _6A0: JAISequence
// _6A0 - _6A8: SeqSoundBase

2
include/PlatAttacher.h
View File

@ -15,7 +15,7 @@ struct PlatAttacher {
Platform* getPlatform(int);
// Unused/inlined:
void alloc(int, unsigned short*);
void alloc(int, u16*);
void write(Stream&);
void draw(Graphics&, int);

2
include/Radar.h
View File

@ -64,7 +64,7 @@ struct Radar {
static void entry(Game::TPositionObject*, Radar::cRadarType, u32);
static bool exit(Game::TPositionObject*);
void attach(Game::TPositionObject*, Radar::cRadarType, unsigned long);
void attach(Game::TPositionObject*, Radar::cRadarType, u32);
void bornFuefuki();
int calcNearestTreasure(Vector3f&, f32, Vector3f&, f32&);
void clear();

3
include/System.h
View File

@ -7,6 +7,7 @@
#include "JSystem/JKernel/JKRHeap.h"
#include "node.h"
#include "BitFlag.h"
#include "types.h"
struct Graphics;
struct OSContext;
@ -15,7 +16,7 @@ struct HeapStatus;
void Pikmin2DefaultMemoryErrorRoutine(void*, u32, s32);
void kando_panic_f(bool, const char*, s32, const char*, ...);
extern void preUserCallback(unsigned short, OSContext*, unsigned long, unsigned long);
extern void preUserCallback(u16, OSContext*, u32, u32);
// const char* cMapFileName = "/pikmin2UP.map";

2
include/og/newScreen/ogUtil.h
View File

@ -10,7 +10,7 @@ bool checkMovieActive();
void drawObjName(Graphics&, char*);
void getLanguageDir(char*&);
void makeLanguageResName(char*, char const*);
u64 caveIDtoMsgID(unsigned long);
u64 caveIDtoMsgID(u32);
} // namespace newScreen
} // namespace og

2
src/JSystem/J2D/J2DOrthoGraph.cpp
View File

@ -121,7 +121,7 @@ void J2DFillBox(JGeometry::TBox2<f32> const& param_0, JUtility::TColor param_1)
* Address: 80035B0C
* Size: 00006C
*/
void J2DFillBox(float x0, float y0, float x1, float y1, JUtility::TColor c1, JUtility::TColor c2, JUtility::TColor c3, JUtility::TColor c4)
void J2DFillBox(f32 x0, f32 y0, f32 x1, f32 y1, JUtility::TColor c1, JUtility::TColor c2, JUtility::TColor c3, JUtility::TColor c4)
{
J2DFillBox(JGeometry::TBox2<f32>(x0, y0, x0 + x1, y0 + y1), c1, c2, c3, c4);
}

56
src/JSystem/J2D/J2DPicture.cpp
View File

@ -729,7 +729,7 @@ J2DPicture::J2DPicture(const ResTIMG* img)
* Size: 000030
* append__10J2DPictureFPC7ResTIMGf
*/
bool J2DPicture::append(const ResTIMG* resource, float p2) { return insert(resource, mTextureCount, p2); }
bool J2DPicture::append(const ResTIMG* resource, f32 p2) { return insert(resource, mTextureCount, p2); }
/*
* --INFO--
@ -737,7 +737,7 @@ bool J2DPicture::append(const ResTIMG* resource, float p2) { return insert(resou
* Size: 000034
* insert__10J2DPictureFPC7ResTIMGUcf
*/
bool J2DPicture::insert(const ResTIMG* resource, u8 textureCount, float p3) { return insert(resource, nullptr, textureCount, p3); }
bool J2DPicture::insert(const ResTIMG* resource, u8 textureCount, f32 p3) { return insert(resource, nullptr, textureCount, p3); }
/*
* --INFO--
@ -772,7 +772,7 @@ J2DPicture::J2DPicture(const char* p1)
* Size: 000030
* append__10J2DPictureFPCcf
*/
bool J2DPicture::append(const char* p1, float p2) { return insert(p1, mTextureCount, p2); }
bool J2DPicture::append(const char* p1, f32 p2) { return insert(p1, mTextureCount, p2); }
/*
* --INFO--
@ -780,7 +780,7 @@ bool J2DPicture::append(const char* p1, float p2) { return insert(p1, mTextureCo
* Size: 000034
* insert__10J2DPictureFPCcUcf
*/
bool J2DPicture::insert(const char* p1, u8 p2, float p3) { return insert(p1, nullptr, p2, p3); }
bool J2DPicture::insert(const char* p1, u8 p2, f32 p3) { return insert(p1, nullptr, p2, p3); }
/*
* --INFO--
@ -815,7 +815,7 @@ J2DPicture::J2DPicture(JUTTexture* texture)
* Size: 000030
* append__10J2DPictureFP10JUTTexturef
*/
bool J2DPicture::append(JUTTexture* texture, float p2) { return insert(texture, mTextureCount, p2); }
bool J2DPicture::append(JUTTexture* texture, f32 p2) { return insert(texture, mTextureCount, p2); }
/*
* --INFO--
@ -848,7 +848,7 @@ J2DPicture::J2DPicture(u64 id, const JGeometry::TBox2f& bounds)
* Size: 00009C
* setBlendRatio__10J2DPictureFffffffff
*/
void J2DPicture::setBlendRatio(float p1, float p2, float p3, float p4, float p5, float p6, float p7, float p8)
void J2DPicture::setBlendRatio(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6, f32 p7, f32 p8)
{
setBlendColorRatio(p1, p2, p3, p4, p5, p6, p7, p8);
setBlendAlphaRatio(p1, p2, p3, p4, p5, p6, p7, p8);
@ -1449,7 +1449,7 @@ lbl_8003B03C:
* Address: 8003B05C
* Size: 00032C
*/
bool J2DPicture::insert(const ResTIMG*, JUTPalette*, u8, float)
bool J2DPicture::insert(const ResTIMG*, JUTPalette*, u8, f32)
{
/*
stwu r1, -0x60(r1)
@ -1700,7 +1700,7 @@ lbl_8003B36C:
* Size: 000078
* insert__10J2DPictureFPCcP10JUTPaletteUcf
*/
bool J2DPicture::insert(const char* p1, JUTPalette* palette, u8 p3, float p4)
bool J2DPicture::insert(const char* p1, JUTPalette* palette, u8 p3, f32 p4)
{
return insert((ResTIMG*)J2DScreen::getNameResource(p1), palette, p3, p4);
}
@ -1710,7 +1710,7 @@ bool J2DPicture::insert(const char* p1, JUTPalette* palette, u8 p3, float p4)
* Address: 8003B400
* Size: 0001D8
*/
bool J2DPicture::insert(JUTTexture*, u8, float)
bool J2DPicture::insert(JUTTexture*, u8, f32)
{
/*
stwu r1, -0x50(r1)
@ -2141,7 +2141,7 @@ lbl_8003B9C0:
* Size: 000030
* append__10J2DPictureFPC7ResTIMGP10JUTPalettef
*/
bool J2DPicture::append(const ResTIMG* img, JUTPalette* palette, float p3) { return insert(img, palette, mTextureCount, p3); }
bool J2DPicture::append(const ResTIMG* img, JUTPalette* palette, f32 p3) { return insert(img, palette, mTextureCount, p3); }
/*
* --INFO--
@ -2159,7 +2159,7 @@ ResTIMG* J2DPicture::changeTexture(const char* name, u8 index, JUTPalette* palet
* Address: 8003BA6C
* Size: 000068
*/
void J2DPicture::drawSelf(float p1, float p2)
void J2DPicture::drawSelf(f32 p1, f32 p2)
{
Mtx mtx;
PSMTXIdentity(mtx);
@ -2172,7 +2172,7 @@ void J2DPicture::drawSelf(float p1, float p2)
* Size: 00006C
* drawSelf__10J2DPictureFffPA3_A4_f
*/
void J2DPicture::drawSelf(float p1, float p2, float (*mtx)[3][4])
void J2DPicture::drawSelf(f32 p1, f32 p2, f32 (*mtx)[3][4])
{
if (mTextures[0] != nullptr && mTextureCount != 0) {
drawFullSet(mGlobalBounds.i.x + p1, mGlobalBounds.i.y + p2, mBounds.getWidth(), mBounds.getHeight(), mtx);
@ -2184,7 +2184,7 @@ void J2DPicture::drawSelf(float p1, float p2, float (*mtx)[3][4])
* Address: 8003BB40
* Size: 000074
*/
void J2DPicture::drawFullSet(float p1, float p2, float width, float height, float (*mtx)[3][4])
void J2DPicture::drawFullSet(f32 p1, f32 p2, f32 width, f32 height, f32 (*mtx)[3][4])
{
if (mTextures[0] != nullptr && mTextureCount != 0) {
drawTexCoord(mBounds.i.x, mBounds.i.y, width, height, mTexCoords[0].x, mTexCoords[0].y, mTexCoords[1].x, mTexCoords[1].y,
@ -2197,7 +2197,7 @@ void J2DPicture::drawFullSet(float p1, float p2, float width, float height, floa
* Address: 8003BBB4
* Size: 0002F4
*/
void J2DPicture::draw(float, float, float, float, bool, bool, bool)
void J2DPicture::draw(f32, f32, f32, f32, bool, bool, bool)
{
/*
stwu r1, -0xb0(r1)
@ -2425,7 +2425,7 @@ void J2DPicture::load(_GXTexMapID texMapID, u8 textureIndex)
* Address: 8003BF28
* Size: 0003FC
*/
void J2DPicture::drawOut(const JGeometry::TBox2<float>&, const JGeometry::TBox2<float>&)
void J2DPicture::drawOut(const JGeometry::TBox2<f32>&, const JGeometry::TBox2<f32>&)
{
/*
.loc_0x0:
@ -2698,7 +2698,7 @@ void J2DPicture::drawOut(const JGeometry::TBox2<float>&, const JGeometry::TBox2<
* Address: 8003C324
* Size: 00023C
*/
void J2DPicture::drawTexCoord(float, float, float, float, short, short, short, short, short, short, short, short, float (*)[3][4])
void J2DPicture::drawTexCoord(f32, f32, f32, f32, short, short, short, short, short, short, short, short, f32 (*)[3][4])
{
/*
.loc_0x0:
@ -3202,7 +3202,7 @@ lbl_8003C9CC:
* Address: 8003CA00
* Size: 000030
*/
void J2DPicture::setBlendColorRatio(float p1, float p2, float p3, float p4, float p5, float p6, float p7, float p8)
void J2DPicture::setBlendColorRatio(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6, f32 p7, f32 p8)
{
_124[0] = p1;
_124[1] = p2;
@ -3216,7 +3216,7 @@ void J2DPicture::setBlendColorRatio(float p1, float p2, float p3, float p4, floa
* Address: 8003CA30
* Size: 000030
*/
void J2DPicture::setBlendAlphaRatio(float p1, float p2, float p3, float p4, float p5, float p6, float p7, float p8)
void J2DPicture::setBlendAlphaRatio(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6, f32 p7, f32 p8)
{
_134[0] = p1;
_134[1] = p2;
@ -3906,7 +3906,7 @@ lbl_8003D31C:
* Size: 000030
* append__10J2DPictureFPCcP10JUTPalettef
*/
bool J2DPicture::append(const char* p1, JUTPalette* palette, float p3) { return insert(p1, palette, mTextureCount, p3); }
bool J2DPicture::append(const char* p1, JUTPalette* palette, f32 p3) { return insert(p1, palette, mTextureCount, p3); }
/*
* --INFO--
@ -3914,7 +3914,7 @@ bool J2DPicture::append(const char* p1, JUTPalette* palette, float p3) { return
* Size: 000030
* prepend__10J2DPictureFP10JUTTexturef
*/
bool J2DPicture::prepend(JUTTexture* texture, float p2) { return insert(texture, 0, p2); }
bool J2DPicture::prepend(JUTTexture* texture, f32 p2) { return insert(texture, 0, p2); }
/*
* --INFO--
@ -3922,7 +3922,7 @@ bool J2DPicture::prepend(JUTTexture* texture, float p2) { return insert(texture,
* Size: 000030
* prepend__10J2DPictureFPCcP10JUTPalettef
*/
bool J2DPicture::prepend(const char* p1, JUTPalette* palette, float p3) { return insert(p1, palette, 0, p3); }
bool J2DPicture::prepend(const char* p1, JUTPalette* palette, f32 p3) { return insert(p1, palette, 0, p3); }
/*
* --INFO--
@ -3930,7 +3930,7 @@ bool J2DPicture::prepend(const char* p1, JUTPalette* palette, float p3) { return
* Size: 000030
* prepend__10J2DPictureFPCcf
*/
bool J2DPicture::prepend(const char* p1, float p2) { return insert(p1, 0, p2); }
bool J2DPicture::prepend(const char* p1, f32 p2) { return insert(p1, 0, p2); }
/*
* --INFO--
@ -3938,7 +3938,7 @@ bool J2DPicture::prepend(const char* p1, float p2) { return insert(p1, 0, p2); }
* Size: 000030
* prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef
*/
bool J2DPicture::prepend(const ResTIMG* img, JUTPalette* palette, float p3) { return insert(img, palette, 0, p3); }
bool J2DPicture::prepend(const ResTIMG* img, JUTPalette* palette, f32 p3) { return insert(img, palette, 0, p3); }
/*
* --INFO--
@ -3946,7 +3946,7 @@ bool J2DPicture::prepend(const ResTIMG* img, JUTPalette* palette, float p3) { re
* Size: 000030
* prepend__10J2DPictureFPC7ResTIMGf
*/
bool J2DPicture::prepend(const ResTIMG* img, float p2) { return insert(img, 0, p2); }
bool J2DPicture::prepend(const ResTIMG* img, f32 p2) { return insert(img, 0, p2); }
/*
* --INFO--
@ -3962,7 +3962,7 @@ int J2DPicture::remove() { return remove(mTextureCount - 1); }
* Size: 000098
* draw__10J2DPictureFffUcbbb
*/
void J2DPicture::draw(float p1, float p2, u8 textureIndex, bool p4, bool p5, bool p6)
void J2DPicture::draw(f32 p1, f32 p2, u8 textureIndex, bool p4, bool p5, bool p6)
{
if (textureIndex < mTextureCount && mTextures[textureIndex] != nullptr) {
// ResTIMG* img = mTextures[textureIndex]->_20;
@ -3978,7 +3978,7 @@ void J2DPicture::draw(float p1, float p2, u8 textureIndex, bool p4, bool p5, boo
* Size: 000040
* draw__10J2DPictureFffbbb
*/
void J2DPicture::draw(float p1, float p2, bool p3, bool p4, bool p5) { draw(p1, p2, 0, p3, p4, p5); }
void J2DPicture::draw(f32 p1, f32 p2, bool p3, bool p4, bool p5) { draw(p1, p2, 0, p3, p4, p5); }
/*
* --INFO--
@ -3986,7 +3986,7 @@ void J2DPicture::draw(float p1, float p2, bool p3, bool p4, bool p5) { draw(p1,
* Size: 000064
* drawOut__10J2DPictureFffffffff
*/
void J2DPicture::drawOut(float p1, float p2, float p3, float p4, float p5, float p6, float p7, float p8)
void J2DPicture::drawOut(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6, f32 p7, f32 p8)
{
drawOut(JGeometry::TBox2f(p1, p2, p1 + p3, p2 + p4), JGeometry::TBox2f(p5, p6, p5 + p7, p6 + p8));
}
@ -3998,7 +3998,7 @@ void J2DPicture::drawOut(float p1, float p2, float p3, float p4, float p5, float
* drawOut__10J2DPictureFffffff
* TODO: Check if this is correct. The mangled name of it is a substring of another one, and thus isn't checkable by vanilla genasm.sh
*/
void J2DPicture::drawOut(float p1, float p2, float p3, float p4, float p5, float p6)
void J2DPicture::drawOut(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6)
{
if (mTextures[0] == nullptr) {
return;

2
src/JSystem/J3D/J3DGD.cpp
View File

@ -2102,7 +2102,7 @@ void J3DGDLoadTlut(void*, u32, _GXTlutSize)
* Address: 80075F38
* Size: 0002D8
*/
void J3DGDSetIndTexMtx(_GXIndTexMtxID, f32 (*)[3], signed char)
void J3DGDSetIndTexMtx(_GXIndTexMtxID, f32 (*)[3], s8)
{
/*
stwu r1, -0x60(r1)

4
src/JSystem/JKernel/JKRThread.cpp
View File

@ -311,7 +311,7 @@ lbl_80025BA8:
* Size: 000154
* __ct__7JKRTaskFiiUl
*/
JKRTask::JKRTask(int msgCount, int threadPriority, u32 stackSize)
JKRTask::JKRTask(int msgCount, int threadPriority, size_t stackSize)
: JKRThread(stackSize, msgCount, threadPriority)
, _7C(this)
, _94(nullptr)
@ -333,7 +333,7 @@ JKRTask::~JKRTask() { sTaskList.remove(&_7C); }
* Address: 80025CD8
* Size: 0002A4
*/
JKRTask* JKRTask::create(int msgCount, int threadPriority, u32 stackSize, JKRHeap* heap)
JKRTask* JKRTask::create(int msgCount, int threadPriority, size_t stackSize, JKRHeap* heap)
{
if (heap == nullptr) {
heap = JKRHeap::sCurrentHeap;

2
src/JSystem/JUtility/JUTGamePad.cpp
View File

@ -1319,7 +1319,7 @@ void JUTGamePad::CStick::clear()
* Size: 0002B8
* update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
*/
u32 JUTGamePad::CStick::update(signed char, signed char, JUTGamePad::EStickMode, JUTGamePad::EWhichStick, u32)
u32 JUTGamePad::CStick::update(s8, s8, JUTGamePad::EStickMode, JUTGamePad::EWhichStick, u32)
{
/*
.loc_0x0: