mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 04:30:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

move remaining old progress (#186)

Browse Source 
* move remaining old progress

* remove asm
This commit is contained in:
TakaRikka
2022-03-26 10:17:17 -07:00
committed by GitHub
parent d596658f89
commit 215421ba51
76 changed files with 387 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_lib.h
+1 -1
View File
@@ -1,10 +1,10 @@
#ifndef C_LIB_H_
#define C_LIB_H_
#include "MSL_C/math.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
#include "MSL_C/math.h"
inline bool cLib_IsZero(f32 f) {
return fabsf(f) < 8e-11f;
include/SSystem/SComponent/c_m3d.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef C_M3D_H_
#define C_M3D_H_
#include "dolphin/types.h"
#include "MSL_C/math.h"
#include "dolphin/types.h"
class cM3dGAab;
class cM3dGCps;
include/SSystem/SComponent/c_xyz.h
+1 -1
View File
@@ -1,9 +1,9 @@
#ifndef C_XYZ_H
#define C_XYZ_H
#include "MSL_C/math.h"
#include "dolphin/mtx/vec.h"
#include "global.h"
#include "MSL_C/math.h"
struct cXyz : Vec {
static const cXyz Zero;
include/d/meter/d_meter_HIO.h
+1 -1
View File
@@ -3,8 +3,8 @@
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JUtility/TColor.h"
#include "SSystem/SComponent/c_xyz.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
include/d/msg/d_msg_object.h
+7 -1
View File
@@ -123,7 +123,7 @@ public:
/* 802381FC */ void setStatus(u16);
/* 8023822C */ static u16 getStatus();
/* 80238258 */ void getScrnDrawPtr();
/* 8023826C */ void setTalkActor(fopAc_ac_c*);
/* 8023826C */ static void setTalkActor(fopAc_ac_c*);
/* 8023829C */ void onMsgSendControl();
/* 802382C8 */ void offMsgSendControl();
/* 802382F4 */ static int isMsgSendControl();
@@ -273,4 +273,10 @@ inline void dMsgObject_changeFlowGroup(long flow) {
dMsgObject_c::changeFlowGroup(flow);
}
inline void dMsgObject_setTalkActor(fopAc_ac_c* actor) {
if (dMsgObject_getMsgObjectClass() != NULL) {
dMsgObject_c::setTalkActor(actor);
}
}
#endif /* D_MSG_D_MSG_OBJECT_H */
include/d/s/d_s_play.h
+2
View File
@@ -57,6 +57,7 @@ private:
/* 0x14 */ dScnPly_env_debugHIO_c mDebug;
};
extern s8 struct_80451124;
extern s8 data_80451125; // sPauseTimer
class dScnPly_c : public scene_class {
@@ -65,6 +66,7 @@ public:
/* 80259AC4 */ bool resetGame();
/* 80259BFC */ void offReset();
static bool isPause() { return struct_80451124 == 0; }
static void setPauseTimer(s8 time) { data_80451125 = time; }
};
include/f_ap/f_ap_game.h
+12 -2
View File
@@ -14,8 +14,8 @@ public:
/* 0x04 */ s8 field_0x04;
/* 0x05 */ u8 field_0x03[3];
/* 0x08 */ JUtility::TColor mColor;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x0C */ f32 mLROnValue;
/* 0x10 */ f32 mLROffValue;
/* 0x14 */ bool mUsingHostIO;
/* 0x15 */ bool mDisplayMeter;
/* 0x16 */ u8 mDisplayPrint;
@@ -44,11 +44,21 @@ extern fapGm_HIO_c g_HIO;
inline bool fapGmHIO_isMenu() {
return g_HIO.mDisplayPrint & 2;
}
inline bool fapGmHIO_isPrint() {
return g_HIO.mDisplayPrint & 1;
}
inline bool fapGmHIO_getMeter() {
return g_HIO.mDisplayMeter;
}
inline f32 fapGmHIO_getLROnValue() {
return g_HIO.mLROnValue;
}
inline f32 fapGmHIO_getLROffValue() {
return g_HIO.mLROffValue;
}
#endif /* F_AP_F_AP_GAME_H */
include/f_op/f_op_kankyo_mng.h
+13 -5
View File
@@ -3,13 +3,21 @@
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#include "f_pc/f_pc_manager.h"
typedef int (*fopKyMCreateFunc)(void*);
struct fopKyM_prm_class {
/* 0x00 */ cXyz field_0x0;
/* 0x0C */ cXyz field_0xc;
/* 0x18 */ int field_0x18;
}; // Size: 0x1C
void* fopKyM_CreateAppend(void);
f32* createAppend(int param_1, cXyz* param_2, cXyz* param_3);
typedef int (*fopKyM_CreateFunc)(void*);
static fopKyM_prm_class* fopKyM_CreateAppend(void);
static fopKyM_prm_class* createAppend(int param_1, cXyz* param_2, cXyz* param_3);
void fopKyM_Delete(void* param_1);
void fopKyM_Create(s16 param_1, fopKyMCreateFunc param_2, void* param_3);
void fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, fopKyMCreateFunc);
static int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2, void* param_3);
base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3,
fopKyM_CreateFunc);
#endif
include/f_op/f_op_msg_mng.h
+25 -1
View File
@@ -5,13 +5,37 @@
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
struct fopMsg_prm_class {
/* 0x00 */ fopAc_ac_c* field_0x0;
/* 0x04 */ cXyz field_0x4;
/* 0x10 */ u32 field_0x10;
/* 0x14 */ u32 field_0x14;
/* 0x18 */ int field_0x18;
}; // Size: 0x1C
struct fopMsg_prm_timer {
/* 0x00 */ int field_0x0;
/* 0x04 */ cXyz field_0x4;
/* 0x10 */ int field_0x10;
/* 0x14 */ int field_0x14;
/* 0x18 */ u32 field_0x18;
/* 0x1C */ int field_0x1c;
/* 0x20 */ u32 field_0x20;
/* 0x24 */ u8 field_0x24;
/* 0x25 */ u8 field_0x25;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
}; // Size: 0x38
typedef int (*fopMsgCreateFunc)(void*);
JKRExpHeap* fopMsgM_createExpHeap(u32, JKRHeap*);
u32 fopMsgM_Create(s16, fopMsgCreateFunc, void*);
void fopMsgM_setMessageID(unsigned int);
void fopMsgM_destroyExpHeap(JKRExpHeap*);
void fopMsgM_setStageLayer(void*);
s32 fopMsgM_setStageLayer(void*);
void fopMsgM_messageSetDemo(u32 param_0);
msg_class* fopMsgM_SearchByID(unsigned int param_0);
include/f_op/f_op_overlap.h
+1 -1
View File
@@ -3,6 +3,6 @@
#include "dolphin/types.h"
static void fopOvlp_Draw(void* param_1);
static s32 fopOvlp_Draw(void* param_1);
#endif
include/f_op/f_op_overlap_mng.h
+3 -1
View File
@@ -3,10 +3,12 @@
#include "SSystem/SComponent/c_request.h"
#include "dolphin/types.h"
#include "f_pc/f_pc_leaf.h"
class overlap_task_class {
public:
/* 0x00 */ u8 field_0x00[0xC4];
/* 0x00 */ u8 field_0x00[0xC0];
/* 0xC0 */ leafdraw_method_class* field_0xc0;
/* 0xC4 */ u8 field_0xc4;
};
include/f_op/f_op_scene.h
+3 -1
View File
@@ -14,7 +14,9 @@ class mDoDvdThd_command_c;
class scene_class {
public:
/* 0x000 */ base_process_class field_0x0;
/* 0x0B8 */ u8 field_0xb8[0xF4];
/* 0x0B8 */ u8 field_0xb8[0x10];
/* 0x0C8 */ u32 field_0xc8;
/* 0x0CC */ u8 field_0xcc[0xE0];
/* 0x1AC */ process_method_class* mpProcessMtd;
/* 0x1B0 */ scene_tag_class* field_0x1b0;
/* 0x1B4 */ u8 field_0x1b4[0x10];
include/f_op/f_op_scene_mng.h
+11 -1
View File
@@ -4,7 +4,7 @@
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_scene_pause.h"
void* fopScnM_SearchByID(unsigned int id);
scene_class* fopScnM_SearchByID(unsigned int id);
int fopScnM_ChangeReq(scene_class*, s16, s16, u16);
unsigned int fopScnM_DeleteReq(scene_class*);
int fopScnM_CreateReq(s16, s16, u16, u32);
@@ -12,8 +12,18 @@ u32 fopScnM_ReRequest(s16, u32);
void fopScnM_Management(void);
void fopScnM_Init(void);
inline u32 fpcM_LayerID(const void* pProc) {
return fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)pProc)->mSubType) != FALSE ?
((scene_class*)pProc)->field_0xc8 :
0xFFFFFFFF;
}
inline u32 fopScnM_GetID(void* proc) {
return fpcM_GetID(proc);
}
inline int fopScnM_LayerID(void* proc) {
return fpcM_LayerID(proc);
}
#endif
include/f_pc/f_pc_manager.h
+10
View File
@@ -7,6 +7,7 @@
#include "f_pc/f_pc_base.h"
#include "f_pc/f_pc_create_iter.h"
#include "f_pc/f_pc_node_req.h"
#include "f_pc/f_pc_stdcreate_req.h"
typedef int (*FastCreateReqFunc)(void*);
typedef void (*fpcM_ManagementFunc)(void);
@@ -26,6 +27,15 @@ inline void fpcM_SetParam(void* p_actor, u32 param) {
((base_process_class*)p_actor)->mParameters = param;
}
inline int fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) {
return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL,
process);
}
inline s32 fpcM_ChangeLayerID(void* proc, int layerID) {
return fpcPi_Change(&((base_process_class*)proc)->mPi, layerID, 0xFFFD, 0xFFFD);
}
void fpcM_Draw(void* pProc);
s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc);
void fpcM_Execute(void* pProc);
include/f_pc/f_pc_profile.h
+9 -9
View File
@@ -8,15 +8,15 @@
struct nodedraw_method_class;
typedef struct process_profile_definition {
s32 mLayerID;
u16 mListID;
u16 mListPrio;
s16 mProcName;
s16 unkA; // probably padding
struct process_method_class* mpPcMtd;
s32 mSize;
s32 mSizeOther;
s32 mParameters;
/* 0x00 */ s32 mLayerID;
/* 0x04 */ u16 mListID;
/* 0x06 */ u16 mListPrio;
/* 0x08 */ s16 mProcName;
/* 0x0A */ s16 unkA; // probably padding
/* 0x0C */ struct process_method_class* mpPcMtd;
/* 0x10 */ s32 mSize;
/* 0x14 */ s32 mSizeOther;
/* 0x18 */ s32 mParameters;
} process_profile_definition;
#define LAYER_DEFAULT (-2)
include/m_Do/m_Do_controller_pad.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
static void create();
static void read();
static void convert(interface_of_controller_pad*, JUTGamePad*);
void LRlockCheck(interface_of_controller_pad*);
static void LRlockCheck(interface_of_controller_pad*);
void recalibrate();
static interface_of_controller_pad& getCpadInfo(u32 pad) { return m_cpadInfo[pad]; }