Skip to content

Commit

Permalink
Fine i'll use spaces :p
Browse files Browse the repository at this point in the history
  • Loading branch information
CelestialAmber committed Oct 6, 2024
1 parent 146ffa0 commit 152ad2e
Show file tree
Hide file tree
Showing 155 changed files with 5,173 additions and 5,142 deletions.
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"[cpp]": {
"files.encoding": "utf8"
},
"editor.insertSpaces": false,
"editor.tabSize": 4,
"files.exclude": {
"**/CVS": false,
Expand Down
2 changes: 1 addition & 1 deletion config/jp/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19830,7 +19830,7 @@ __dt__Q22cf14CBattleManagerFv = .text:0x800D8EF0; // type:function size:0x298 sc
getInstance__Q22cf14CBattleManagerFv = .text:0x800D9188; // type:function size:0x8 scope:global align:4
func_800D9190__Q22cf14CBattleManagerFv = .text:0x800D9190; // type:function size:0x40 scope:global align:4
func_800D91D0__Q22cf14CBattleManagerFv = .text:0x800D91D0; // type:function size:0x48 scope:global align:4
func_800D9218 = .text:0x800D9218; // type:function size:0x13C scope:global align:4
func_800D9218__Q22cf14CBattleManagerFv = .text:0x800D9218; // type:function size:0x13C scope:global align:4
func_800D9354 = .text:0x800D9354; // type:function size:0x2E8 scope:global align:4
FactoryEvent2__Q22cf14CBattleManagerFv = .text:0x800D963C; // type:function size:0x33C scope:global align:4
func_800D9978 = .text:0x800D9978; // type:function size:0x328 scope:global align:4
Expand Down
8 changes: 4 additions & 4 deletions libs/CriWare/include/criware/cri_adxf.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ extern "C" {
#endif

//States
#define ADXF_STAT_STOP 1
#define ADXF_STAT_READING 2
#define ADXF_STAT_READEND 3
#define ADXF_STAT_ERROR 4
#define ADXF_STAT_STOP 1
#define ADXF_STAT_READING 2
#define ADXF_STAT_READEND 3
#define ADXF_STAT_ERROR 4

s32 ADXF_LoadPartitionNw(s32 ptid, const char* filename, void* ptinfo, void* nfile);
s32 ADXF_GetPtStat(s32 ptid);
Expand Down
18 changes: 9 additions & 9 deletions libs/monolib/include/monolib/CArcItem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

class CArcItem : IWorkEvent {
public:
CArcItem(int param);
virtual ~CArcItem();
virtual bool OnFileEvent();
CArcItem(int param);
virtual ~CArcItem();
virtual bool OnFileEvent();

int unk4;
u8 unk8[0x24 - 0x8];
void* unk24;
char* unk28;
int unk2C;
u8 unk30;
int unk4;
u8 unk8[0x24 - 0x8];
void* unk24;
char* unk28;
int unk2C;
u8 unk30;
};
34 changes: 17 additions & 17 deletions libs/monolib/include/monolib/CAttrTransform.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
#include "monolib/Math.hpp"

namespace ml{
struct CAttrTransform{
CVec3 vec1; //0x0
CVec3 mRotation; //0xC
CMat34 mMtx1; //0x18
CMat34 mMtx2; //0x48
CMat34 mMtx3; //0x78
CQuat unkA8;
CVec3 unkB8;
CVec3 unkC4;
CQuat unkD0;
u32 mFlags; //0xE0
struct CAttrTransform{
CVec3 vec1; //0x0
CVec3 mRotation; //0xC
CMat34 mMtx1; //0x18
CMat34 mMtx2; //0x48
CMat34 mMtx3; //0x78
CQuat unkA8;
CVec3 unkB8;
CVec3 unkC4;
CQuat unkD0;
u32 mFlags; //0xE0

CAttrTransform(){
clear();
}
CAttrTransform(){
clear();
}

void clear();
void update();
};
void clear();
void update();
};
}
34 changes: 17 additions & 17 deletions libs/monolib/include/monolib/CChildListNode.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
template <typename T>
class TChildListHeader : public CDoubleListHeader {
private:
char unk8[0x10 - 0x8];
char unk8[0x10 - 0x8];

public:
TChildListHeader() { Reset(); }
virtual ~TChildListHeader() {}
void Reset() { mHead = NULL; }
TChildListHeader() { Reset(); }
virtual ~TChildListHeader() {}
void Reset() { mHead = NULL; }

T* Front() const { return static_cast<T*>(Head()); }
T* Back() const {
return Head() != NULL ? static_cast<T*>(mHead->GetPrev()) : NULL;
}
T* Front() const { return static_cast<T*>(Head()); }
T* Back() const {
return Head() != NULL ? static_cast<T*>(mHead->GetPrev()) : NULL;
}
};

class CChildListNode : public CDoubleListNode {
public:
CChildListNode();
virtual ~CChildListNode() {}
virtual void Reset();
CChildListNode();
virtual ~CChildListNode() {}
virtual void Reset();

CChildListNode* GetParent() const { return parent; }
void SetParent(CChildListNode* newParent) { parent = newParent; }
CChildListNode* GetParent() const { return parent; }
void SetParent(CChildListNode* newParent) { parent = newParent; }

private:
CChildListNode* parent; //0x14
char unk18[0x24 - 0x18];
TChildListHeader<CChildListNode> children; //0x24
CChildListNode* parent; //0x14
char unk18[0x24 - 0x18];
TChildListHeader<CChildListNode> children; //0x24
};
4 changes: 2 additions & 2 deletions libs/monolib/include/monolib/CDesktop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

class CDesktop : public CProc {
public:
CDesktop(const char* name, CWorkThread* workThread);
CDesktop(const char* name, CWorkThread* workThread);

static CDesktop* getInstance();
static CDesktop* getInstance();
};

extern UNKTYPE* func_80455AA0();
36 changes: 18 additions & 18 deletions libs/monolib/include/monolib/CDoubleListNode.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@

class CDoubleListNode {
public:
CDoubleListNode* mNext; //0x0
CDoubleListNode* mPrev; //0x4
u8 unk8;
int unkC;
CDoubleListNode* mNext; //0x0
CDoubleListNode* mPrev; //0x4
u8 unk8;
int unkC;

public:
CDoubleListNode();
virtual ~CDoubleListNode() {}
virtual void Reset();
CDoubleListNode();
virtual ~CDoubleListNode() {}
virtual void Reset();

CDoubleListNode* GetNext() const { return mNext; }
CDoubleListNode* GetPrev() const { return mPrev; }
void SetNext(CDoubleListNode* newNext) { mNext = newNext; }
void SetPrev(CDoubleListNode* newPrev) { mPrev = newPrev; }
CDoubleListNode* GetNext() const { return mNext; }
CDoubleListNode* GetPrev() const { return mPrev; }
void SetNext(CDoubleListNode* newNext) { mNext = newNext; }
void SetPrev(CDoubleListNode* newPrev) { mPrev = newPrev; }
};

class CDoubleListHeader {
protected:
CDoubleListNode* mHead; //0x0
CDoubleListNode* mTail; //0x4
CDoubleListNode* mHead; //0x0
CDoubleListNode* mTail; //0x4

public:
CDoubleListNode* Head() const { return mHead; }
CDoubleListNode* Tail() const { return mTail; }
CDoubleListNode* Head() const { return mHead; }
CDoubleListNode* Tail() const { return mTail; }

CDoubleListNode* InsertTop(CDoubleListNode* node);
CDoubleListNode* InsertEnd(CDoubleListNode* node);
CDoubleListNode* Remove(CDoubleListNode* node);
CDoubleListNode* InsertTop(CDoubleListNode* node);
CDoubleListNode* InsertEnd(CDoubleListNode* node);
CDoubleListNode* Remove(CDoubleListNode* node);
};
4 changes: 2 additions & 2 deletions libs/monolib/include/monolib/CFileHandle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
#include "types.h"

struct CFileHandle {
int unk0;
void* data;
int unk0;
void* data;
};
26 changes: 13 additions & 13 deletions libs/monolib/include/monolib/CGXCache.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
//size: 0x4
class IStateCache {
public:
virtual ~IStateCache();
virtual ~IStateCache();
};

//size: 0x51c
class CGXCache : public IStateCache {
public:
CGXCache();
virtual ~CGXCache();
void func_8044B294(u32 r4);
u32 func_8044B5B4();
bool func_8044BE38();
void func_8044BFC0();
CGXCache();
virtual ~CGXCache();
void func_8044B294(u32 r4);
u32 func_8044B5B4();
bool func_8044BE38();
void func_8044BFC0();

//0x0: vtable
//0x0-0x4: IStateCache
CMsgParam<32> unk4;
u8 unk4A0[0x50C - 0x4A0];
u32 unk50C;
u8 unk510[0xC];
//0x0: vtable
//0x0-0x4: IStateCache
CMsgParam<32> unk4;
u8 unk4A0[0x50C - 0x4A0];
u32 unk50C;
u8 unk510[0xC];
};
22 changes: 11 additions & 11 deletions libs/monolib/include/monolib/CLight.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ using namespace ml;

class CLight{
public:
CLight();
virtual ~CLight(){}
CLight();
virtual ~CLight(){}

CVec3 unk4;
CVec3 unk10;
CVec3 unk1C;
float unk28;
u32 unk2C;
u32 unk30;
u32 unk34;
float unk38;
float unk3C;
CVec3 unk4;
CVec3 unk10;
CVec3 unk1C;
float unk28;
u32 unk2C;
u32 unk30;
u32 unk34;
float unk38;
float unk3C;
};
56 changes: 28 additions & 28 deletions libs/monolib/include/monolib/CMsgParam.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,40 @@

//size: 0x24
struct CMsgParamEntry{
u32 unk0;
u8 unk4[0x20];
u32 unk0;
u8 unk4[0x20];
};

template <int N>
class CMsgParam{
public:
CMsgParam(u32 r4){
mSize = N;
mArrayPtr = mEntries;
field4 = 0;
field3 = 0;
field6 = 0;
field7 = r4;
}
virtual ~CMsgParam(){
}
CMsgParam(u32 r4){
mSize = N;
mArrayPtr = mEntries;
field4 = 0;
field3 = 0;
field6 = 0;
field7 = r4;
}
virtual ~CMsgParam(){
}

inline int someInline() const {
for(int i = 0; i < field4; i++){
if(mArrayPtr[(field3 + i) % mSize].unk0 == 2){
return i;
}
}
inline int someInline() const {
for(int i = 0; i < field4; i++){
if(mArrayPtr[(field3 + i) % mSize].unk0 == 2){
return i;
}
}

return -1;
}
return -1;
}

//0x0: vtable
CMsgParamEntry mEntries[N]; //0x4
CMsgParamEntry* mArrayPtr;
u32 field3;
u32 field4;
u32 mSize;
u32 field6;
u32 field7;
//0x0: vtable
CMsgParamEntry mEntries[N]; //0x4
CMsgParamEntry* mArrayPtr;
u32 field3;
u32 field4;
u32 mSize;
u32 field6;
u32 field7;
};
24 changes: 12 additions & 12 deletions libs/monolib/include/monolib/CNBanner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@

class CNBanner : IWorkEvent {
public:
CNBanner();
virtual ~CNBanner();
void init();
virtual bool OnFileEvent(CEventFile* pEventFile);
void func_804F52F8(const char* str);
void func_804F5304(const char* str);
void func_804F5310(const char* str);
void func_804F531C(const char** filenames, int* someArray);
CNBanner();
virtual ~CNBanner();
void init();
virtual bool OnFileEvent(CEventFile* pEventFile);
void func_804F52F8(const char* str);
void func_804F5304(const char* str);
void func_804F5310(const char* str);
void func_804F531C(const char** filenames, int* someArray);

//0x0: vtable
u8 unk4[0xC - 0x4];
u32 unkC;
u8 unk10[0x325 - 0x10];
//0x0: vtable
u8 unk4[0xC - 0x4];
u32 unkC;
u8 unk10[0x325 - 0x10];
};
Loading

0 comments on commit 152ad2e

Please sign in to comment.