summaryrefslogtreecommitdiff
path: root/include/JSystem/J2DGraph
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2024-01-24 04:00:46 -0800
committerGitHub <noreply@github.com>2024-01-24 14:00:46 +0200
commitba44ade90c3f04f5c163278fcadc4361c263acbb (patch)
tree3b7948dc4dcf260ff61230da15ddea595635cbc8 /include/JSystem/J2DGraph
parentb2310b84b65e62d9f1a82a5b9e52766b325b765f (diff)
more various JSystem work (#2046)
* most of J3DAnmLoader done * J3D / JKernel / JUTConsole work * remove asm * fix build * dol 50%
Diffstat (limited to 'include/JSystem/J2DGraph')
-rw-r--r--include/JSystem/J2DGraph/J2DAnimation.h2
-rw-r--r--include/JSystem/J2DGraph/J2DAnmLoader.h13
-rw-r--r--include/JSystem/J2DGraph/J2DPicture.h9
3 files changed, 10 insertions, 14 deletions
diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 1e3f84653b..b2ab398cee 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -56,7 +56,7 @@ public:
/* 8030A358 */ virtual ~J2DAnmVtxColor() {}
/* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const;
u16 getAnmTableNum(u8 param_0) const { return mAnmTableNum[param_0]; }
- J3DAnmVtxColorIndexDataItem* getAnmVtxColorIndexData(u8 param_0, u16 param_1) const { return mVtxColorIndexData[param_0]->field_0x0 + param_1; }
+ J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 param_0, u16 param_1) const { return &mVtxColorIndexData[param_0][param_1]; }
u16* getVtxColorIndexPointer(u8 param_0) const { return mVtxColorIndexPointer[param_0]; }
/* 0x10 */ u16 mAnmTableNum[2];
diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h
index c135b48320..73d000fcca 100644
--- a/include/JSystem/J2DGraph/J2DAnmLoader.h
+++ b/include/JSystem/J2DGraph/J2DAnmLoader.h
@@ -16,18 +16,6 @@ public:
void* mpResource;
};
-struct J3DAnmTransformKeyData {
- /* 0x00 */ u8 _0[0x8];
- /* 0x08 */ u8 _8;
- /* 0x09 */ u8 _9;
- /* 0x0A */ s16 mFrameMax;
- /* 0x0C */ u16 _C;
- /* 0x0E */ u8 _E[0x14 - 0xE];
- /* 0x14 */ s32 mTableOffset;
- /* 0x18 */ s32 mScaleOffset;
- /* 0x1C */ s32 mRotationOffset;
- /* 0x20 */ s32 mTranslateOffset;
-};
struct J3DAnmTextureSRTKeyData;
struct J3DAnmColorKeyData;
struct J3DAnmVtxColorKeyData;
@@ -37,6 +25,7 @@ struct J3DAnmColorFullData;
struct J3DAnmTexPatternFullData;
struct J3DAnmVisibilityFullData;
struct J3DAnmVtxColorFullData;
+struct J3DAnmTransformKeyData;
class J2DAnmKeyLoader_v15 : public J2DAnmLoader {
public:
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index b3ff43f6ee..40570ca8d4 100644
--- a/include/JSystem/J2DGraph/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture.h
@@ -12,10 +12,17 @@ struct ResTIMG;
struct ResTLUT;
enum J2DMirror {
- /* 0x0 */ MIRROR0, // temp, figure out later
+ /* 0 */ MIRROR0, // temp, figure out later
+ /* 1 */ J2DMirror_Y = (1 << 0),
+ /* 2 */ J2DMirror_X = (1 << 1),
};
enum J2DBinding {
+ /* 1 */ J2DBind_Bottom = (1 << 0),
+ /* 2 */ J2DBind_Top = (1 << 1),
+ /* 4 */ J2DBind_Right = (1 << 2),
+ /* 8 */ J2DBind_Left = (1 << 3),
+
/* 0xF */ BIND15 = 15, // temp, figure out later
};