mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-12 05:28:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch to Aurora headers for GX/VI

Browse Source 
Replace GXSetArray() with GXSETARRAY() taking in size everywhere

Fix a ton of structs/enums being referred to with underscore name.
This commit is contained in:
PJB3005
2026-03-02 01:21:54 +01:00
parent 860e29b265
commit 3a0b45c508
74 changed files with 176 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc.h
+1 -1
View File
@@ -657,7 +657,7 @@ public:
int loadRes(s8 const*, char const**);
void deleteRes(s8 const*, char const**);
int execute();
int draw(BOOL, BOOL, f32, _GXColorS10*, f32, BOOL, BOOL, BOOL);
int draw(BOOL, BOOL, f32, GXColorS10*, f32, BOOL, BOOL, BOOL);
void setEnvTevColor();
void setRoomNo();
int checkEndAnm(f32);
include/d/actor/d_a_npc4.h
+1 -1
View File
@@ -304,7 +304,7 @@ public:
initialize();
}
BOOL execute();
int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
int draw(BOOL, BOOL, f32, GXColorS10*, BOOL);
static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*,
dCcD_GObjInf*);
static void* srchAttnActor1(void*, void*);
include/d/actor/d_a_npc_chat.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
int Delete();
int Execute();
int Draw();
int draw(int, int, f32, _GXColorS10*, int);
int draw(int, int, f32, GXColorS10*, int);
int ctrlJoint(J3DJoint*, J3DModel*);
static int createHeapCallBack(fopAc_ac_c*);
static int ctrlJointCallBack(J3DJoint*, int);
include/d/actor/d_a_npc_zrz.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
int Delete();
int Execute();
int Draw();
int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
int draw(BOOL, BOOL, f32, GXColorS10*, BOOL);
int ctrlJoint(J3DJoint*, J3DModel*);
static int createHeapCallBack(fopAc_ac_c*);
static int ctrlJointCallBack(J3DJoint*, int);
include/d/actor/d_a_obj_kamakiri.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
mpBrkAnm->entry(model->getModelData());
mpMorfSO->entryDL();
if (field_0x9c0 == 0) {
_GXTexObj* texObj = dDlst_shadowControl_c::getSimpleTex();
GXTexObj* texObj = dDlst_shadowControl_c::getSimpleTex();
dComIfGd_setSimpleShadow(&current.pos, mObjAcch.GetGroundH(), 15.0f, mObjAcch.m_gnd, 0, -0.6f, texObj);
}
}
include/d/d_com_inf_game.h
+5 -5
View File
@@ -1237,10 +1237,10 @@ int dComIfG_TimerDeleteRequest(int i_mode);
int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*);
int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 i_angle,
f32 param_5, _GXTexObj* i_tex);
f32 param_5, GXTexObj* i_tex);
int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4,
f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8,
dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12);
dKy_tevstr_c* param_9, s16 param_10, f32 param_11, GXTexObj* param_12);
inline dSv_info_c* dComIfGs_getSaveInfo() {
return &g_dComIfG_gameInfo.info;
@@ -3192,8 +3192,8 @@ inline JPABaseEmitter* dComIfGp_particle_setPolyColor(u16 param_1, cBgS_PolyInfo
param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10);
}
inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* i_pos, u8 param_2, _GXColor& param_3,
_GXColor& param_4, int param_5, float param_6) {
inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* i_pos, u8 param_2, GXColor& param_3,
GXColor& param_4, int param_5, float param_6) {
g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0, i_pos, 0, param_2, param_3, param_4,
param_5, param_6);
}
@@ -4437,7 +4437,7 @@ inline int dComIfGd_setRealShadow(u32 param_0, s8 param_1, J3DModel* param_2, cX
}
inline int dComIfGd_setSimpleShadow(cXyz* pos, f32 param_1, f32 param_2, cXyz* param_3, s16 angle,
f32 param_5, _GXTexObj* tex) {
f32 param_5, GXTexObj* tex) {
return g_dComIfG_gameInfo.drawlist.setSimpleShadow(pos, param_1, param_2, param_3, angle,
param_5, tex);
}
include/d/d_drawlist.h
+6 -6
View File
@@ -95,7 +95,7 @@ public:
class dDlst_effectLine_c : public dDlst_base_c {
public:
virtual void draw();
void update(cXyz&, _GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
void update(cXyz&, GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
f32 getRndValue(f32 param_0, f32 param_1) { return mRnd.getValue(param_0, param_1); }
f32 getRndFX(f32 param_0) { return mRnd.getFX(param_0); }
@@ -199,11 +199,11 @@ public:
class dDlst_shadowSimple_c {
public:
void draw();
void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
void set(cXyz*, f32, f32, cXyz*, s16, f32, GXTexObj*);
dDlst_shadowSimple_c();
/* 0x00 */ u8 mAlpha;
/* 0x04 */ _GXTexObj* mpTexObj;
/* 0x04 */ GXTexObj* mpTexObj;
/* 0x08 */ Mtx mVolumeMtx;
/* 0x38 */ Mtx mMtx;
}; // Size: 0x68
@@ -289,7 +289,7 @@ public:
void draw(f32 (*)[4]);
int setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
bool addReal(u32, J3DModel*);
int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, GXTexObj*);
static void setSimpleTex(ResTIMG const*);
static GXTexObj* getSimpleTex() { return &mSimpleTexObj; }
@@ -305,7 +305,7 @@ private:
/* 0x0000C */ dDlst_shadowSimple_c mSimple[128];
/* 0x0340C */ int mNextID;
/* 0x03410 */ dDlst_shadowReal_c mReal[8];
/* 0x15EB0 */ _GXTexObj field_0x15eb0[2];
/* 0x15EB0 */ GXTexObj field_0x15eb0[2];
/* 0x15EF0 */ void* field_0x15ef0[2];
};
@@ -442,7 +442,7 @@ public:
}
int setSimpleShadow(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, s16 param_4,
f32 param_5, _GXTexObj* param_6) {
f32 param_5, GXTexObj* param_6) {
return mShadowControl.setSimple(param_0, param_1, param_2, param_3, param_4, param_5,
param_6);
}
include/d/d_kankyo_rain.h
+3 -4
View File
@@ -4,17 +4,16 @@
#include <dolphin/mtx.h>
struct cXyz;
struct _GXColor;
void dKyr_drawSun(Mtx param_0, cXyz* param_1, _GXColor& param_2, u8** param_3);
void dKyr_drawLenzflare(Mtx param_0, cXyz* param_1, _GXColor& param_2, u8** param_3);
void dKyr_drawSun(Mtx param_0, cXyz* param_1, GXColor& param_2, u8** param_3);
void dKyr_drawLenzflare(Mtx param_0, cXyz* param_1, GXColor& param_2, u8** param_3);
void dKyr_drawSibuki(Mtx param_0, u8** param_1);
void dKyr_drawRain(Mtx param_0, u8** param_1);
void dKyr_drawSnow(Mtx param_0, u8** param_1);
void dKyr_drawStar(Mtx param_0, u8** param_1);
void drawCloudShadow(Mtx param_0, u8** param_1);
void dKyr_drawHousi(Mtx param_0, u8** param_1);
void drawVrkumo(Mtx param_0, _GXColor& param_1, u8** param_2);
void drawVrkumo(Mtx param_0, GXColor& param_1, u8** param_2);
void dKyr_odour_draw(Mtx param_0, u8** param_1);
void dKyr_mud_draw(Mtx param_0, u8** param_1);
void dKyr_evil_draw(Mtx param_0, u8** param_1);
include/d/d_map_path.h
+1 -1
View File
@@ -9,7 +9,7 @@ struct dMpath_RGB5A3_s {
};
namespace dMpath_ColorCnv_n {
void convertRGB5A3_To_GXColor(_GXColor&, const dMpath_RGB5A3_s&);
void convertRGB5A3_To_GXColor(GXColor&, const dMpath_RGB5A3_s&);
}
struct dMpath_RGB5A3_palDt_s {
include/d/d_particle.h
+7 -7
View File
@@ -37,7 +37,7 @@ public:
dPa_simpleEcallBack();
JPABaseEmitter* create(JPAEmitterManager*, u16, u8);
JPABaseEmitter* createEmitter(JPAEmitterManager*);
u32 set(cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&,
u32 set(cXyz const*, dKy_tevstr_c const*, u8, GXColor const&, GXColor const&,
int, f32);
virtual ~dPa_simpleEcallBack() {}
@@ -361,20 +361,20 @@ public:
void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*,
cXyz const*, s8);
JPABaseEmitter* set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8,
dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*,
dPa_levelEcallBack*, s8, GXColor const*, GXColor const*, cXyz const*,
f32);
u32 set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
_GXColor const*, cXyz const*, f32);
static s32 getPolyColor(cBgS_PolyInfo&, int, _GXColor*, _GXColor*, u8*, f32*);
cXyz const*, u8, dPa_levelEcallBack*, s8, GXColor const*,
GXColor const*, cXyz const*, f32);
static s32 getPolyColor(cBgS_PolyInfo&, int, GXColor*, GXColor*, u8*, f32*);
u32 setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8,
cXyz const*);
JPABaseEmitter* setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*,
cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*);
bool newSimple(u16, u8, u32*);
u32 setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&,
_GXColor const&, int, f32);
u32 setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, GXColor const&,
GXColor const&, int, f32);
dPa_simpleEcallBack* getSimple(u16);
u32 setStopContinue(u32);
u32 setSimpleFoot(u32, u32*, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,