summaryrefslogtreecommitdiff
path: root/include/JSystem
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-04-24 04:02:50 -0700
committerGitHub <noreply@github.com>2022-04-24 13:02:50 +0200
commit589cc12296ae7253c62655859a5eef92ee42dbaf (patch)
treedd8556994b43ed23dff2aed6bb4c019e5c0d7ec9 /include/JSystem
parenta1099217d65362f16dd90284670a7dd37702a3ca (diff)
some MSL_C work (#192)
* wip * bunch of MSL_C files thanks to pikmin2 decomp for their work * format / asm * progress * fix * fix remove-asm to work with C files * init / start
Diffstat (limited to 'include/JSystem')
-rw-r--r--include/JSystem/J2DGraph/J2DMatBlock.h25
-rw-r--r--include/JSystem/J2DGraph/J2DMaterial.h1
-rw-r--r--include/JSystem/J2DGraph/J2DScreen.h4
-rw-r--r--include/JSystem/JKernel/JKRArchive.h2
-rw-r--r--include/JSystem/JKernel/JKRFileLoader.h2
-rw-r--r--include/JSystem/JSupport/JSUMemoryStream.h4
6 files changed, 12 insertions, 26 deletions
diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h
index 5b80a90f18..f2e20854d8 100644
--- a/include/JSystem/J2DGraph/J2DMatBlock.h
+++ b/include/JSystem/J2DGraph/J2DMatBlock.h
@@ -422,21 +422,18 @@ struct J2DBlendInfo {
mType = other.mType;
mSrcFactor = other.mSrcFactor;
mDstFactor = other.mDstFactor;
- //mOp = other.mOp;
+ // mOp = other.mOp;
}
/* 0x0 */ u8 mType;
/* 0x1 */ u8 mSrcFactor;
/* 0x2 */ u8 mDstFactor;
-
};
extern J2DBlendInfo j2dDefaultBlendInfo;
struct J2DBlend {
- J2DBlend() {
- mBlendInfo = j2dDefaultBlendInfo;
- }
+ J2DBlend() { mBlendInfo = j2dDefaultBlendInfo; }
/* 0x0 */ J2DBlendInfo mBlendInfo;
/* 0x3 */ u8 mOp;
@@ -444,9 +441,7 @@ struct J2DBlend {
class J2DPEBlock {
public:
- J2DPEBlock() {
- initialize();
- }
+ J2DPEBlock() { initialize(); }
/* 802F17FC */ void initialize();
/* 802F1840 */ void setGX();
@@ -475,10 +470,8 @@ public:
class J2DIndBlockFull : public J2DIndBlock {
public:
- J2DIndBlockFull() {
- initialize();
- }
-
+ J2DIndBlockFull() { initialize(); }
+
/* 802F1664 */ virtual void initialize();
/* 802F1730 */ virtual void setGX();
/* 802F1B94 */ virtual void getType();
@@ -515,9 +508,7 @@ private:
/* 0x24 */ J2DTexMtx* mTexMtx[8];
public:
- J2DTexGenBlock() {
- initialize();
- }
+ J2DTexGenBlock() { initialize(); }
/* 802EB510 */ void initialize();
/* 802EB570 */ void setGX();
@@ -547,9 +538,7 @@ private:
/* 0x12 */ u8 mCullMode;
public:
- J2DColorBlock() {
- initialize();
- }
+ J2DColorBlock() { initialize(); }
/* 802EB394 */ void initialize();
/* 802EB424 */ void setGX();
diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/include/JSystem/J2DGraph/J2DMaterial.h
index fbf30353d0..ebea34bec8 100644
--- a/include/JSystem/J2DGraph/J2DMaterial.h
+++ b/include/JSystem/J2DGraph/J2DMaterial.h
@@ -42,7 +42,6 @@ public:
J2DTevBlock* getTevBlock() { return mTevBlock; }
J2DIndBlock* getIndBlock() { return mIndBlock; }
-
private:
/* 0x04 */ int field_0x4;
/* 0x08 */ int field_0x8;
diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h
index 3ba1f4499c..a878d07f57 100644
--- a/include/JSystem/J2DGraph/J2DScreen.h
+++ b/include/JSystem/J2DGraph/J2DScreen.h
@@ -50,9 +50,9 @@ public:
/* 802F9A74 */ virtual void setAnimationVF(J2DAnmVisibilityFull*);
/* 802F9A78 */ virtual void setAnimationVC(J2DAnmVtxColor*);
/* 802F99E8 */ virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
- J2DPane*, u32);
+ J2DPane*, u32);
/* 802F8B98 */ virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
- J2DPane*, u32, JKRArchive*);
+ J2DPane*, u32, JKRArchive*);
/* 802F8498 */ J2DScreen();
/* 802F85A8 */ void clean();
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index edd694ea7e..47a8c1bc25 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -219,7 +219,7 @@ inline JKRCompression JKRConvertAttrToCompressionType(u32 attr) {
}
inline void* JKRGetResource(u32 node, const char* path, JKRArchive* archive) {
- return JKRArchive::getGlbResource(node,path,archive);
+ return JKRArchive::getGlbResource(node, path, archive);
}
inline void* JKRGetTypeResource(u32 tag, const char* name, JKRArchive* arc) {
diff --git a/include/JSystem/JKernel/JKRFileLoader.h b/include/JSystem/JKernel/JKRFileLoader.h
index 42752bc241..b0e3250c03 100644
--- a/include/JSystem/JKernel/JKRFileLoader.h
+++ b/include/JSystem/JKernel/JKRFileLoader.h
@@ -55,7 +55,7 @@ public:
};
inline bool JKRDetachResource(void* resource, JKRFileLoader* fileLoader) {
- return JKRFileLoader::detachResource(resource,fileLoader);
+ return JKRFileLoader::detachResource(resource, fileLoader);
}
inline void* JKRGetNameResource(const char* name, JKRFileLoader* loader) {
diff --git a/include/JSystem/JSupport/JSUMemoryStream.h b/include/JSystem/JSupport/JSUMemoryStream.h
index ca69f91472..aa8c84480f 100644
--- a/include/JSystem/JSupport/JSUMemoryStream.h
+++ b/include/JSystem/JSupport/JSUMemoryStream.h
@@ -6,9 +6,7 @@
class JSUMemoryInputStream : JSURandomInputStream {
public:
- JSUMemoryInputStream(const void* res, u32 size) {
- setBuffer(res, size);
- }
+ JSUMemoryInputStream(const void* res, u32 size) { setBuffer(res, size); }
/* 802552B8 */ ~JSUMemoryInputStream() {}
/* 802DC520 */ void setBuffer(void const*, s32);