summaryrefslogtreecommitdiff
path: root/include/JSystem
diff options
context:
space:
mode:
authorPheenoh <pheenoh@gmail.com>2023-03-17 21:05:06 -0600
committerGitHub <noreply@github.com>2023-03-17 21:05:06 -0600
commit3cdef97cb8648cf5a5f2151938c5fa8d66056751 (patch)
treee96e03eb21c61f9aa4cd2868724b55b4872a190b /include/JSystem
parenta01d65b0b99400f62d93eee28475872b641cfd50 (diff)
d_file_select, JASResArcLoader, d_a_obj_stone, d_a_obj_stone_mark (#309)
* setup TU * JASResArcLoader OK * d_a_obj_stoneMark work * some funcs in d_a_obj_stoneMark * many changes * quat, d_a_obj_stone, d_a_alink, fix python script, tidy makefile * d_file_select functions + pr cleanup
Diffstat (limited to 'include/JSystem')
-rw-r--r--include/JSystem/J2DGraph/J2DAnimation.h4
-rw-r--r--include/JSystem/J2DGraph/J2DPane.h3
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DModel.h10
-rw-r--r--include/JSystem/JAudio2/JASResArcLoader.h40
-rw-r--r--include/JSystem/JKernel/JKRArchive.h1
-rw-r--r--include/JSystem/JKernel/JKRHeap.h4
-rw-r--r--include/JSystem/JUtility/JUTException.h4
-rw-r--r--include/JSystem/JUtility/JUTNameTab.h2
8 files changed, 62 insertions, 6 deletions
diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 5974961dac..1cb44c0f04 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -124,7 +124,11 @@ public:
mTranslateValues = pTranslateValues;
mKind = KIND_TRANSFORM;
}
+ #ifdef __dt__15J2DAnmTransformFv_DEFINED
+ /* 80184370 */ virtual ~J2DAnmTransform();
+ #else
/* 80184370 */ virtual ~J2DAnmTransform() {}
+ #endif
/* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const;
/* 0x10 */ f32* mScaleValues;
diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
index fe6649981b..7d4832d8eb 100644
--- a/include/JSystem/J2DGraph/J2DPane.h
+++ b/include/JSystem/J2DGraph/J2DPane.h
@@ -94,8 +94,7 @@ public:
/* vt 0x70 */ virtual void setAnimation(J2DAnmTevRegKey* anm) {}
/* vt 0x74 */ virtual void setAnimation(J2DAnmVisibilityFull* anm) {}
/* vt 0x78 */ virtual void setAnimation(J2DAnmVtxColor* anm) {}
- /* vt 0x7C */ virtual const J2DAnmTransform*
- animationTransform(const J2DAnmTransform* transform);
+ /* vt 0x7C */ virtual const J2DAnmTransform* animationTransform(const J2DAnmTransform* transform);
/* vt 0x80 */ virtual void setVisibileAnimation(J2DAnmVisibilityFull* visibility);
/* vt 0x84 */ virtual void setAnimationVF(J2DAnmVisibilityFull* visibility);
/* vt 0x88 */ virtual void setVtxColorAnimation(J2DAnmVtxColor* vtx_color);
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index 3c20380ef5..80176968f8 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -11,8 +11,14 @@
#include "dolphin/types.h"
enum J3DMdlFlag {
- /* 0x4 */ J3DMdlFlag_SkinPosCpu = 0x4,
- /* 0x8 */ J3DMdlFlag_SkinNrmCpu = 0x8,
+ /* 0x00001 */ J3DMdlFlag_Unk00001 = 0x1,
+ /* 0x00002 */ J3DMdlFlag_Unk00002 = 0x2,
+ /* 0x00004 */ J3DMdlFlag_SkinPosCpu = 0x4,
+ /* 0x00008 */ J3DMdlFlag_SkinNrmCpu = 0x8,
+ /* 0x00010 */ J3DMdlFlag_Unk00010 = 0x10,
+ /* 0x20000 */ J3DMdlFlag_Unk20000 = 0x20000,
+ /* 0x40000 */ J3DMdlFlag_Unk40000 = 0x40000,
+ /* 0x80000 */ J3DMdlFlag_Unk80000 = 0x80000,
};
struct J3DUnkCalc1 {
diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/include/JSystem/JAudio2/JASResArcLoader.h
index 32050268a6..8e32fb6b06 100644
--- a/include/JSystem/JAudio2/JASResArcLoader.h
+++ b/include/JSystem/JAudio2/JASResArcLoader.h
@@ -1,6 +1,44 @@
#ifndef JASRESARCLOADER_H
#define JASRESARCLOADER_H
-#include "dolphin/types.h"
+#include "JSystem/JKernel/JKRArchive.h"
+
+namespace JASResArcLoader {
+ /* 80290BD0 */ size_t getResSize(JKRArchive const*, u16);
+ /* 80290C04 */ size_t getResMaxSize(JKRArchive const*);
+ /* 80290C7C */ static void loadResourceCallback(void*);
+ /* 80290D18 */ int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
+};
+
+
+
+// from pikmin2
+typedef void (*LoadCallback)(u32, u32);
+
+enum ResArcMessage {
+ RESARCMSG_Error = -1,
+ RESARCMSG_Success = 0,
+};
+
+struct CallbackArgs {
+ inline CallbackArgs(u16 id, u8* buf, u32 size, JKRArchive* archive)
+ : mArchive(archive)
+ , mID(id)
+ , mBuffer(buf)
+ , mBufferSize(size)
+ , mCallback(0)
+ , mCallbackArg(0)
+ , mQueue(0)
+ {
+ }
+
+ JKRArchive* mArchive; // _00
+ u16 mID; // _04
+ u8* mBuffer; // _08
+ u32 mBufferSize; // _0C
+ LoadCallback mCallback; // _10
+ u32 mCallbackArg; // _14, arg to pass to mCallback along with readResource result
+ OSMessageQueue* mQueue; // _18
+};
#endif /* JASRESARCLOADER_H */
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index b339fb71ef..2583da20b8 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -84,6 +84,7 @@ public:
// was needed for open__14JKRAramArchiveFl
u8 getCompressFlag() const { return (getFlags() & 0x04); }
bool isYAZ0Compressed() const { return (getFlags() & 0x80) != 0; }
+ u32 getSize() const { return data_size; }
};
enum EMountMode {
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index 927ee8d6e8..4d8f196f90 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -236,4 +236,8 @@ inline s32 JKRResizeMemBlock(JKRHeap* heap, void* ptr, u32 size) {
return JKRHeap::resize(ptr, size, heap);
}
+inline JKRHeap* JKRGetRootHeap() {
+ return JKRHeap::getRootHeap();
+}
+
#endif /* JKRHEAP_H */
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index 447e1483aa..e03079cd50 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -98,6 +98,10 @@ public:
mGamePadPort = JUTGamePad::Port_Unknown;
}
+ static void setMapFile(const char* map) {
+ appendMapFile(map);
+ }
+
private:
static OSMessageQueue sMessageQueue;
static const char* sCpuExpName[17];
diff --git a/include/JSystem/JUtility/JUTNameTab.h b/include/JSystem/JUtility/JUTNameTab.h
index e539c6f08c..d6c17bdddb 100644
--- a/include/JSystem/JUtility/JUTNameTab.h
+++ b/include/JSystem/JUtility/JUTNameTab.h
@@ -20,7 +20,7 @@ class JUTNameTab {
public:
JUTNameTab();
JUTNameTab(const ResNTAB* pNameTable);
- virtual ~JUTNameTab() {}
+ virtual ~JUTNameTab() {};
void setResource(const ResNTAB* pNameTable);
s32 getIndex(char const*) const;