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

k_wmark / k_wpillar OK, fop actor enums / debug building (#1946)

Browse Source 
* d_k_wmark / d_k_wpillar OK

* make debug buildable / add assert functionality

* add more fop actor enums

* remove asm
This commit is contained in:
TakaRikka
2023-09-28 12:01:42 -07:00
committed by GitHub
parent 673e69386a
commit 89ed2b8a26
206 changed files with 1612 additions and 2472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+5
View File
@@ -3511,6 +3511,11 @@ inline void dComIfGd_setListBG() {
g_dComIfG_gameInfo.drawlist.setXluListBG();
}
inline void dComIfGd_setListIndScreen() {
g_dComIfG_gameInfo.drawlist.setOpaListP0();
g_dComIfG_gameInfo.drawlist.setXluListP0();
}
inline J3DDrawBuffer* dComIfGd_getOpaListBG() {
return g_dComIfG_gameInfo.drawlist.getOpaListBG();
}
include/d/d_drawlist.h
+2
View File
@@ -331,6 +331,8 @@ public:
void setOpaList3Dlast() { setOpaDrawList(mDrawBuffers[DB_LIST_3D_LAST]); }
void setXluList3Dlast() { setXluDrawList(mDrawBuffers[DB_LIST_3D_LAST]); }
void setXluList2DScreen() { setXluDrawList(mDrawBuffers[DB_LIST_2D_SCREEN]); }
void setXluListP0() { setXluDrawList(mDrawBuffers[DB_LIST_P0]); }
void setOpaListP0() { setOpaDrawList(mDrawBuffers[DB_LIST_P0]); }
void peekZdata() { mPeekZ.peekData(); }
void entryZSortListZxlu(J3DPacket* i_packet, cXyz& param_1) {
include/d/d_k_wmark.h
+24 -1
View File
@@ -1,6 +1,29 @@
#ifndef D_D_K_WMARK_H
#define D_D_K_WMARK_H
#include "dolphin/types.h"
#include "f_op/f_op_kankyo_mng.h"
#include "d/kankyo/d_kankyo.h"
class dkWmark_c : public kankyo_class {
public:
/* 80261640 */ ~dkWmark_c();
/* 802616C4 */ BOOL setMatrix();
inline int create();
inline int execute();
inline int draw();
static int m_nowID;
/* 0x0F8 */ JKRSolidHeap* mpHeap;
/* 0x0FC */ J3DModel* mpModel;
/* 0x100 */ dKy_tevstr_c mTevstr;
/* 0x488 */ u8 field_0x488;
/* 0x48A */ s16 field_0x48a;
/* 0x48C */ s16 field_0x48c;
/* 0x48E */ s16 mColorType;
/* 0x490 */ f32 mAlphaFactor;
/* 0x494 */ int field_0x494;
};
#endif /* D_D_K_WMARK_H */
include/d/d_k_wpillar.h
+17 -1
View File
@@ -1,6 +1,22 @@
#ifndef D_D_K_WPILLAR_H
#define D_D_K_WPILLAR_H
#include "dolphin/types.h"
#include "f_op/f_op_kankyo_mng.h"
#include "d/kankyo/d_kankyo.h"
class dkWpillar_c : public kankyo_class {
public:
/* 80261B54 */ int create();
/* 80261F24 */ ~dkWpillar_c();
/* 80262014 */ int execute();
/* 802620C8 */ int draw();
/* 0x0F8 */ J3DModel* mpModel;
/* 0x0FC */ mDoExt_bckAnm mBck;
/* 0x118 */ mDoExt_btkAnm mBtk;
/* 0x130 */ mDoExt_brkAnm mBrk;
/* 0x148 */ JKRSolidHeap* mpHeap;
/* 0x14C */ dKy_tevstr_c mTevstr;
};
#endif /* D_D_K_WPILLAR_H */
include/d/event/d_event.h
+4 -4
View File
@@ -7,7 +7,7 @@
struct dStage_MapEvent_dt_c;
class fopAc_ac_c;
#if DEBUG
#ifdef DEBUG
class dEvDb_bit_c {
public:
/* 0x00 */ char* mFlagName;
@@ -36,9 +36,9 @@ public:
/* 0x04 */ dEvDb_reg_c* mRegTable;
/* 0x08 */ int mBitNum;
/* 0x0C */ int mRegNum;
/* 0x10 */ field_0x10;
/* 0x14 */ field_0x14;
}
/* 0x10 */ int field_0x10;
/* 0x14 */ int field_0x14;
};
#endif
class dEvt_order_c {
include/d/kankyo/d_kankyo.h
+1 -1
View File
@@ -359,7 +359,7 @@ public:
/* 0x0EC0 */ dKankyo_cloud_Packet* mpCloudPacket;
/* 0x0EC4 */ u8 mVrkumoStatus;
/* 0x0EC8 */ int mVrkumoCount;
/* 0x0ECC */ f32 field_0xecc;
/* 0x0ECC */ f32 mVrkumoStrength;
/* 0x0ED0 */ dKankyo_vrkumo_Packet* mpVrkumoPacket;
/* 0x0ED4 */ EF_THUNDER mThunderEff;
/* 0x0F18 */ u8 field_0xf18[4];