mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-10 12:22:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

J2D structs + print / fix GX + MSL string headers (#157)

Browse Source 
* J2D structs + print / fix GX + MSL string headers

* remove msl_c/string.h
This commit is contained in:
TakaRikka
2021-10-24 14:35:00 -07:00
committed by GitHub
parent bf5416a23d
commit 6d4520da66
71 changed files with 2069 additions and 2054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J2DGraph/J2DAnmLoader.cpp
+5 -84
View File
@@ -4,6 +4,7 @@
//
#include "JSystem/J2DGraph/J2DAnmLoader.h"
#include "JSystem/J2DGraph/J2DAnimation.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -11,15 +12,6 @@
// Types:
//
struct _GXColor {};
struct ResNTAB {};
struct JUTNameTab {
/* 802DE9A0 */ JUTNameTab();
/* 802DEA1C */ void setResource(ResNTAB const*);
};
struct J3DAnmVtxColorKeyData {};
struct J3DAnmVtxColorFullData {};
@@ -42,79 +34,6 @@ struct J3DAnmColorFullData {};
struct J2DScreen {};
struct J2DAnmVtxColorKey {};
struct J2DAnmVtxColorFull {};
struct J2DAnmVtxColor {
/* 8030363C */ void getColor(u8, u16, _GXColor*) const;
/* 8030A358 */ ~J2DAnmVtxColor();
};
struct J2DAnmVisibilityFull {
/* 8030A3B4 */ ~J2DAnmVisibilityFull();
};
struct J2DAnmTransformKey {};
struct J2DAnmTransformFull {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
struct J2DAnmLoaderDataBase {
/* 80308A6C */ void load(void const*);
};
struct J2DAnmLoader {
/* 8030A410 */ ~J2DAnmLoader();
};
struct J2DAnmBase {
/* 800569B0 */ void searchUpdateMaterialID(J2DScreen*);
};
struct J2DAnmColorKey {};
struct J2DAnmKeyLoader_v15 {
/* 80309290 */ J2DAnmKeyLoader_v15();
/* 803092AC */ ~J2DAnmKeyLoader_v15();
/* 80309308 */ void load(void const*);
/* 80309414 */ void setResource(J2DAnmBase*, void const*);
/* 80309570 */ void readAnmTransform(J3DAnmTransformKeyData const*);
/* 80309598 */ void setAnmTransform(J2DAnmTransformKey*, J3DAnmTransformKeyData const*);
/* 80309634 */ void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
/* 8030965C */ void setAnmTextureSRT(J2DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
/* 80309848 */ void readAnmColor(J3DAnmColorKeyData const*);
/* 80309870 */ void setAnmColor(J2DAnmColorKey*, J3DAnmColorKeyData const*);
/* 8030995C */ void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
/* 80309984 */ void setAnmVtxColor(J2DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
/* 80309FDC */ void readAnmTevReg(J3DAnmTevRegKeyData const*);
/* 8030A004 */ void setAnmTevReg(J2DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
};
struct J2DAnmColorFull {};
struct J2DAnmFullLoader_v15 {
/* 80309A80 */ void load(void const*);
/* 80309B8C */ void setResource(J2DAnmBase*, void const*);
/* 80309CE8 */ J2DAnmFullLoader_v15();
/* 80309D04 */ ~J2DAnmFullLoader_v15();
/* 80309D60 */ void readAnmTransform(J3DAnmTransformFullData const*);
/* 80309D88 */ void setAnmTransform(J2DAnmTransformFull*, J3DAnmTransformFullData const*);
/* 80309E1C */ void readAnmColor(J3DAnmColorFullData const*);
/* 80309E44 */ void setAnmColor(J2DAnmColorFull*, J3DAnmColorFullData const*);
/* 80309F10 */ void readAnmTexPattern(J3DAnmTexPatternFullData const*);
/* 80309F38 */ void setAnmTexPattern(J2DAnmTexPattern*, J3DAnmTexPatternFullData const*);
/* 8030A190 */ void readAnmVisibility(J3DAnmVisibilityFullData const*);
/* 8030A1B8 */ void setAnmVisibility(J2DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
/* 8030A234 */ void readAnmVtxColor(J3DAnmVtxColorFullData const*);
/* 8030A25C */ void setAnmVtxColor(J2DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
};
//
// Forward References:
//
@@ -288,7 +207,8 @@ asm J2DAnmKeyLoader_v15::~J2DAnmKeyLoader_v15() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DAnmKeyLoader_v15::load(void const* param_0) {
extern "C" asm void load__19J2DAnmKeyLoader_v15FPCv() {
// asm void J2DAnmKeyLoader_v15::load(void const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/load__19J2DAnmKeyLoader_v15FPCv.s"
}
@@ -401,7 +321,8 @@ asm void J2DAnmKeyLoader_v15::setAnmVtxColor(J2DAnmVtxColorKey* param_0,
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DAnmFullLoader_v15::load(void const* param_0) {
extern "C" asm void load__20J2DAnmFullLoader_v15FPCv() {
// asm void J2DAnmFullLoader_v15::load(void const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/load__20J2DAnmFullLoader_v15FPCv.s"
}