mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-04 10:48:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
TakaRikka
2022-06-01 04:23:39 -07:00
parent 3f22fa4483
commit 32cea78625
121 changed files with 1936 additions and 4957 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DAnimation.h
+5 -5
View File
@@ -11,13 +11,13 @@
class J2DScreen;
enum J2DAnmKind {
KIND_TRANSFORM = 0,
KIND_COLOR = 1,
KIND_TRANSFORM = 0,
KIND_COLOR = 1,
KIND_TEX_PATTERN = 2,
KIND_TEXTURE_SRT = 4,
KIND_TEV_REG = 5,
KIND_VISIBILITY = 6,
KIND_VTX_COLOR = 7
KIND_TEV_REG = 5,
KIND_VISIBILITY = 6,
KIND_VTX_COLOR = 7
};
class J2DAnmBase {
include/JSystem/J3DGraphAnimator/J3DModelData.h
+12 -4
View File
@@ -43,10 +43,18 @@ public:
bool checkFlag(u32 flag) const { return !!(mFlags & flag); }
bool checkBumpFlag() const { return mbHasBumpArray; }
bool checkBBoardFlag() const { return mbHasBillboard == 1; }
int removeTexNoAnimator(J3DAnmTexPattern* anm) { return mMaterialTable.removeTexNoAnimator(anm); }
int removeTexMtxAnimator(J3DAnmTextureSRTKey* anm) { return mMaterialTable.removeTexMtxAnimator(anm); }
int removeTevRegAnimator(J3DAnmTevRegKey* anm) { return mMaterialTable.removeTevRegAnimator(anm); }
int removeMatColorAnimator(J3DAnmColor* anm) { return mMaterialTable.removeMatColorAnimator(anm); }
int removeTexNoAnimator(J3DAnmTexPattern* anm) {
return mMaterialTable.removeTexNoAnimator(anm);
}
int removeTexMtxAnimator(J3DAnmTextureSRTKey* anm) {
return mMaterialTable.removeTexMtxAnimator(anm);
}
int removeTevRegAnimator(J3DAnmTevRegKey* anm) {
return mMaterialTable.removeTevRegAnimator(anm);
}
int removeMatColorAnimator(J3DAnmColor* anm) {
return mMaterialTable.removeMatColorAnimator(anm);
}
private:
/* 0x04 */ void* mpRawData;
include/JSystem/J3DGraphBase/J3DShape.h
+8 -8
View File
@@ -31,8 +31,8 @@ public:
u32 getMtxIdxRegB() const { return mMtxIdxRegB; }
inline void load() const {
J3DFifoWriteCPCmd(0x30, getMtxIdxRegA()); // CP_MATINDEX_A
J3DFifoWriteCPCmd(0x40, getMtxIdxRegB()); // CP_MATINDEX_B
J3DFifoWriteCPCmd(0x30, getMtxIdxRegA()); // CP_MATINDEX_A
J3DFifoWriteCPCmd(0x40, getMtxIdxRegB()); // CP_MATINDEX_B
J3DFifoWriteXFCmd(0x1018, 2);
GFX_FIFO(u32) = getMtxIdxRegA();
GFX_FIFO(u32) = getMtxIdxRegB();
@@ -44,12 +44,12 @@ class J3DVertexData;
class J3DDrawMtxData;
enum J3DShpFlag {
J3DShpFlag_Visible = 0x0001,
J3DShpFlag_SkinPosCpu = 0x0004,
J3DShpFlag_SkinNrmCpu = 0x0008,
J3DShpFlag_Hidden = 0x0010,
J3DShpFlag_EnableLod = 0x0100,
J3DShpFlag_NoMtx = 0x0200,
J3DShpFlag_Visible = 0x0001,
J3DShpFlag_SkinPosCpu = 0x0004,
J3DShpFlag_SkinNrmCpu = 0x0008,
J3DShpFlag_Hidden = 0x0010,
J3DShpFlag_EnableLod = 0x0100,
J3DShpFlag_NoMtx = 0x0200,
};
class J3DShape {
include/JSystem/JAudio2/JASDvdThread.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef JASDVDTHREAD_H
#define JASDVDTHREAD_H
#include "dolphin/types.h"
#include "JSystem/JAudio2/JASTaskThread.h"
#include "dolphin/types.h"
class JASDvd {
public:
include/JSystem/JAudio2/JASTaskThread.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef JASTASKTHREAD_H
#define JASTASKTHREAD_H
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRThread.h"
#include "dolphin/types.h"
class JASTaskThread : public JKRThread {
public:
include/JSystem/JKernel/JKRAssertHeap.h
+16 -16
View File
@@ -10,23 +10,23 @@ protected:
virtual ~JKRAssertHeap();
public:
/* vt[04] */ virtual u32 getHeapType(void); /* override */
/* vt[05] */ virtual bool check(void); /* override */
/* vt[06] */ virtual bool dump_sort(void); /* override */
/* vt[07] */ virtual bool dump(void); /* override */
/* vt[08] */ virtual void do_destroy(void); /* override */
/* vt[09] */ virtual void* do_alloc(u32, int); /* override */
/* vt[10] */ virtual void do_free(void*); /* override */
/* vt[11] */ virtual void do_freeAll(void); /* override */
/* vt[12] */ virtual void do_freeTail(void); /* override */
/* vt[13] */ virtual void do_fillFreeArea(void); /* override */
/* vt[14] */ virtual s32 do_resize(void*, u32); /* override */
/* vt[15] */ virtual s32 do_getSize(void*); /* override */
/* vt[16] */ virtual s32 do_getFreeSize(void); /* override */
/* vt[17] */ virtual void* do_getMaxFreeBlock(void); /* override */
/* vt[18] */ virtual s32 do_getTotalFreeSize(void); /* override */
/* vt[04] */ virtual u32 getHeapType(void); /* override */
/* vt[05] */ virtual bool check(void); /* override */
/* vt[06] */ virtual bool dump_sort(void); /* override */
/* vt[07] */ virtual bool dump(void); /* override */
/* vt[08] */ virtual void do_destroy(void); /* override */
/* vt[09] */ virtual void* do_alloc(u32, int); /* override */
/* vt[10] */ virtual void do_free(void*); /* override */
/* vt[11] */ virtual void do_freeAll(void); /* override */
/* vt[12] */ virtual void do_freeTail(void); /* override */
/* vt[13] */ virtual void do_fillFreeArea(void); /* override */
/* vt[14] */ virtual s32 do_resize(void*, u32); /* override */
/* vt[15] */ virtual s32 do_getSize(void*); /* override */
/* vt[16] */ virtual s32 do_getFreeSize(void); /* override */
/* vt[17] */ virtual void* do_getMaxFreeBlock(void); /* override */
/* vt[18] */ virtual s32 do_getTotalFreeSize(void); /* override */
/* vt[19] */ virtual s32 do_changeGroupID(u8 param_1); /* override */
/* vt[20] */ virtual u8 do_getCurrentGroupId(void); /* override */
/* vt[20] */ virtual u8 do_getCurrentGroupId(void); /* override */
public:
static JKRAssertHeap* create(JKRHeap*);
include/JSystem/JKernel/JKRDvdAramRipper.h
+2 -1
View File
@@ -37,7 +37,8 @@ class JKRDvdAramRipper {
public:
static JKRAramBlock* loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32*);
static JKRAramBlock* loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32, u32*);
static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32, u32, u32*);
static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32,
u32, u32*);
static JKRADCommand* callCommand_Async(JKRADCommand*);
static bool syncAram(JKRADCommand*, int);
include/JSystem/JKernel/JKRExpHeap.h
+1 -1
View File
@@ -73,7 +73,7 @@ public:
/* vt[16] */ virtual s32 do_getFreeSize(); /* override */
/* vt[17] */ virtual void* do_getMaxFreeBlock(); /* override */
/* vt[18] */ virtual s32 do_getTotalFreeSize(); /* override */
/* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID); /* override */
/* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID); /* override */
/* vt[20] */ virtual u8 do_getCurrentGroupId(); /* override */
/* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
include/JSystem/JParticle/JPADynamicsBlock.h
+4 -4
View File
@@ -43,10 +43,10 @@ struct JPADynamicsBlockData {
typedef void (*JPADynamicsCalcVolumeFunc)(JPAEmitterWorkData*);
enum {
JPADynFlag_FixedDensity = 0x01,
JPADynFlag_FixedInterval = 0x02,
JPADynFlag_InheritScale = 0x04,
JPADynFlag_FollowEmtr = 0x08,
JPADynFlag_FixedDensity = 0x01,
JPADynFlag_FixedInterval = 0x02,
JPADynFlag_InheritScale = 0x04,
JPADynFlag_FollowEmtr = 0x08,
JPADynFlag_FollowEmtrChld = 0x10,
};
include/JSystem/JParticle/JPAParticle.h
+9 -10
View File
@@ -34,12 +34,13 @@ public:
JPARandom() { mSeed = 0; }
void set_seed(u32 seed) { mSeed = seed; }
u32 get_rndm_u() {
return mSeed = mSeed * 0x19660du + 0x3c6ef35fu;
}
u32 get_rndm_u() { return mSeed = mSeed * 0x19660du + 0x3c6ef35fu; }
f32 get_rndm_f() {
union { u32 u; f32 f; } a;
union {
u32 u;
f32 f;
} a;
a.u = ((get_rndm_u() >> 9) | 0x3f800000);
return a.f - 1.0f;
}
@@ -54,9 +55,7 @@ public:
return f - 1.0f;
}
s16 get_rndm_ss() {
return ((s16)get_rndm_u()) >> 16;
}
s16 get_rndm_ss() { return ((s16)get_rndm_u()) >> 16; }
public:
u32 mSeed;
@@ -203,9 +202,9 @@ public:
};
enum {
JPAEmtrStts_StopEmit = 0x01,
JPAEmtrStts_StopCalc = 0x02,
JPAEmtrStts_FirstEmit = 0x10,
JPAEmtrStts_StopEmit = 0x01,
JPAEmtrStts_StopCalc = 0x02,
JPAEmtrStts_FirstEmit = 0x10,
JPAEmtrStts_RateStepEmit = 0x20,
};
include/JSystem/JUtility/JUTGamePad.h
+2 -2
View File
@@ -111,7 +111,7 @@ public:
u8 getAnalogR() const { return mButton.mAnalogR; }
s8 getErrorStatus() const { return mErrorStatus; }
s16 getPortNum() const { return mPortNum; }
JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; }
@@ -215,7 +215,7 @@ public:
static void setEnabled(u32 pad_mask);
void stopMotorHard(int portNo) { stopMotor(portNo, true); }
static bool isEnabled(u32 mask) { return mEnabled & mask; }
static bool isEnabledPort(int port) { return isEnabled(sChannelMask[port]); }
include/Z2AudioLib/Z2WolfHowlMgr.h
+1 -1
View File
@@ -8,7 +8,7 @@
* Z2WolfHowlData
* mLineNum: Number of lines/points within the song
* mSongData: u16 array which corresponds to each line/point
*
*
* The high byte of each u16 line corresponds to bar type (low, middle, high)
* The low byte of each u16 line corresponds to length of note
*/
include/d/a/d_a_alink.h
+1 -1
View File
@@ -2485,7 +2485,7 @@ private:
/* 0x02118 */ daPy_anmHeap_c mAnmHeap5;
/* 0x0212C */ daPy_anmHeap_c mAnmHeap6;
/* 0x02140 */ daPy_anmHeap_c mAnmHeap7;
/* 0x02154 */ mDoExt_bckAnm field_0x2154; // issue here?
/* 0x02154 */ mDoExt_bckAnm field_0x2154;
/* 0x02170 */ u8 field_0x2170[0x18];
/* 0x02188 */ dEyeHL_c mEyeHL1;
/* 0x0219C */ dEyeHL_c mEyeHL2;
include/d/a/d_a_npc.h
+3 -7
View File
@@ -18,9 +18,7 @@ public:
/* 801458C0 */ int play(u16, int*, f32*);
/* 80145A24 */ s32 checkEndSequence();
bool checkEntryNewMotion() {
return mStepNo == 0 && field_0x14 == -1;
}
bool checkEntryNewMotion() { return mStepNo == 0 && field_0x14 == -1; }
private:
/* 0x00 */ sequenceStepData_c* mpSeqData;
@@ -318,9 +316,7 @@ public:
/* 8014CCE8 */ virtual void changeBtk(int*, int*);
/* 8014A628 */ virtual void setMotionAnm(int, f32, int);
bool checkHide() {
return !field_0xe25 && (!dComIfGs_wolfeye_effect_check() && field_0xa89);
}
bool checkHide() { return !field_0xe25 && (!dComIfGs_wolfeye_effect_check() && field_0xa89); }
static u8 const mCcDObjData[48];
static u8 mCcDCyl[68];
@@ -448,7 +444,7 @@ public:
/* 80152614 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80152654 */ void srchAttnActor1(void*, void*);
/* 801526E8 */ void srchActor(void*, void*);
/* 801528C8 */ void initialize();
/* 80152B2C */ void getTrnsfrmKeyAnmP(char*, int);
/* 80152B68 */ void getTexPtrnAnmP(char*, int);
include/d/a/d_a_player.h
+1 -4
View File
@@ -48,10 +48,7 @@ class daPy_anmHeap_c {
public:
enum daAlinkHEAP_TYPE {};
/* 80140DCC */ void __defctor();
daPy_anmHeap_c() {
__defctor();
}
/* 80140DCC */ void __defctor(); // supposed to be the ctor?
daPy_anmHeap_c(u32);
~daPy_anmHeap_c();
include/d/d_procname.h
+791 -792
View File
File diff suppressed because it is too large Load Diff
include/d/kankyo/d_kankyo.h
+1 -1
View File
@@ -6,11 +6,11 @@
#include "JSystem/JParticle/JPAParticle.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "Z2AudioLib/Z2EnvSeMgr.h"
#include "d/kankyo/d_kankyo_wether.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
#include "Z2AudioLib/Z2EnvSeMgr.h"
class cBgS_PolyInfo;
include/dolphin/card/card.h
+17 -18
View File
@@ -3,23 +3,23 @@
#include "dolphin/types.h"
#define CARD_ERROR_UNLOCKED 1
#define CARD_ERROR_READY 0
#define CARD_ERROR_BUSY -1
#define CARD_ERROR_WRONGDEVICE -2
#define CARD_ERROR_NOCARD -3
#define CARD_ERROR_NOFILE -4
#define CARD_ERROR_IOERROR -5
#define CARD_ERROR_BROKEN -6
#define CARD_ERROR_EXIST -7
#define CARD_ERROR_NOENT -8
#define CARD_ERROR_INSSPACE -9
#define CARD_ERROR_NOPERM -10
#define CARD_ERROR_LIMIT -11
#define CARD_ERROR_NAMETOOLONG -12
#define CARD_ERROR_ENCODING -13
#define CARD_ERROR_CANCELED -14
#define CARD_ERROR_FATAL_ERROR -128
#define CARD_ERROR_UNLOCKED 1
#define CARD_ERROR_READY 0
#define CARD_ERROR_BUSY -1
#define CARD_ERROR_WRONGDEVICE -2
#define CARD_ERROR_NOCARD -3
#define CARD_ERROR_NOFILE -4
#define CARD_ERROR_IOERROR -5
#define CARD_ERROR_BROKEN -6
#define CARD_ERROR_EXIST -7
#define CARD_ERROR_NOENT -8
#define CARD_ERROR_INSSPACE -9
#define CARD_ERROR_NOPERM -10
#define CARD_ERROR_LIMIT -11
#define CARD_ERROR_NAMETOOLONG -12
#define CARD_ERROR_ENCODING -13
#define CARD_ERROR_CANCELED -14
#define CARD_ERROR_FATAL_ERROR -128
struct CARDFileInfo {
/* 0x00 */ s32 channel;
@@ -70,5 +70,4 @@ s32 CARDSetStatus(s32 channel, s32 fileNo, CARDStat* stat);
s32 CARDGetSerialNo(s32 channel, u32* serial1, u32* serial2);
};
#endif /* CARD_H */
include/m_Do/m_Do_DVDError.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef M_DO_M_DO_DVDERROR_H
#define M_DO_M_DO_DVDERROR_H
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRThread.h"
#include "dolphin/types.h"
void mDoDvdErr_ThdCleanup();
static void mDoDvdErr_Watch(void*);
include/m_Do/m_Do_ext.h
+3 -3
View File
@@ -6,8 +6,8 @@
#include "JSystem/JKernel/JKRAssertHeap.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "m_Do/m_Do_audio.h"
#include "global.h"
#include "m_Do/m_Do_audio.h"
class mDoExt_baseAnm {
public:
@@ -193,8 +193,8 @@ public:
class mDoExt_McaMorfCallBack2_c {};
class mDoExt_morf_c {
// : public J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya>
// inheritance causing issues, fix later
// : public J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya>
// inheritance causing issues, fix later
public:
/* 8000F950 */ mDoExt_morf_c();
/* 8000FB7C */ void setMorf(f32);