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

d_a_dmidna OK / f_op + misc cleanup (#276)

Browse Source 
* some f_op / d_insect cleanup

* rename some vars according to tww

* d_a_dmidna OK

* remove asm
This commit is contained in:
TakaRikka
2023-02-10 09:07:47 -08:00
committed by GitHub
parent 68f5b6d05a
commit 67a2c83b9b
73 changed files with 5635 additions and 20433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_camera.h
+6 -4
View File
@@ -16,7 +16,7 @@ struct dCamMapToolData {
/* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
/* 0x00 */ stage_camera2_data_class field_0x0;
/* 0x18 */ stage_arrow_class field_0x18;
/* 0x18 */ stage_arrow_data_class field_0x18;
/* 0x2C */ u32 field_0x2c;
/* 0x30 */ s32 field_0x30;
/* 0x34 */ fopAc_ac_c* field_0x34;
@@ -332,6 +332,7 @@ public:
/* 801829AC */ void Bank();
bool Active() { return field_0x24 == 0; }
f32 TrimHeight() { return mTrimHeight; }
static u8 engine_tbl[240];
@@ -405,6 +406,7 @@ public:
/* 0x1A0 */ int mCurMode;
/* 0x1A4 */ int mNextMode;
/* 0x1A8 */ int field_0x1a8;
/* 0x1AC */ int field_0x1ac;
/* 0x1B0 */ cSAngle field_0x1b0;
/* 0x1B4 */ f32 field_0x1b4;
/* 0x1B8 */ u8 field_0x1b8[4];
@@ -452,7 +454,7 @@ public:
class {
public:
/* 0x00 */ u8 field_0x0[8];
/* 0x08 */ cSAngle field_0x8;
/* 0x08 */ cSGlobe field_0x8;
/* 0x10 */ u8 field_0x10[4];
}
/* 0x614 */ field_0x614[4];
@@ -520,8 +522,8 @@ public:
/* 0x940 */ u8 field_0x940[0x970 - 0x940];
/* 0x970 */ dCamSetup_c mCamSetup;
/* 0xAEC */ dCamParam_c mCamParam;
/* 0xB0C */
};
/* 0xB0C */ u8 field_0xb0c[0xd58 - 0xb0c];
}; // Size: 0xD58
dCamera_c* dCam_getBody();
dCamera_c* dCam_getCamera();
include/d/d_insect.h
+10 -9
View File
@@ -1,29 +1,30 @@
#ifndef D_D_INSECT_H
#define D_D_INSECT_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class dInsect_c : public fopAc_ac_c {
public:
/* 80110648 */ virtual void Insect_Release();
/* 8015E010 */ dInsect_c();
/* 8015E078 */ virtual void Insect_GetDemoMain();
/* 8015E26C */ virtual void CalcZBuffer(f32);
/* 8015E010 */ dInsect_c();
/* 8015E078 */ void Insect_GetDemoMain();
/* 8015E26C */ void CalcZBuffer(f32);
/* 80110648 */ virtual void Insect_Release() { field_0x56C = 1; }
private:
/* 0x56C */ u8 field_0x56C;
/* 0x56D */ u8 field_0x56D;
/* 0x56E */ u8 field_0x56E[10];
/* 0x578 */ u32 field_0x578;
/* 0x57C */ f32 field_0x57C;
/* 0x580 */ u8 field_0x580;
/* 0x580 */ u8 m_itemNo;
/* 0x581 */ u8 field_0x581;
/* 0x582 */ s16 field_0x582;
/* 0x582 */ s16 m_saveBitNo;
/* 0x584 */ u8 field_0x584;
/* 0x585 */ u8 field_0x585;
/* 0x586 */ u8 field_0x586[2];
/* 0x588 */ u32 field_0x588;
/* 0x58C */ int field_0x58C;
/* 0x588 */ u32 m_itemId;
/* 0x58C */ int m_mode;
};
include/d/d_jnt_col.h
+6 -5
View File
@@ -8,16 +8,17 @@
class dJntColData_c {
public:
u8 field_0x0;
s8 mType;
u8 field_0x2[0xC - 0x2];
/* 0x0 */ u8 field_0x0;
/* 0x1 */ s8 mType;
/* 0x2 */ s16 mJntNum;
/* 0x4 */ u8 field_0x4[0xC - 0x4];
};
class dJntCol_c {
public:
/* 80035C8C */ dJntCol_c();
/* 80035CA0 */ int init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
/* 80035CC8 */ void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*);
/* 80035CC8 */ static void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*);
/* 80035DC8 */ void searchNearPos(cM3dGLin const*, cXyz const*, cXyz*, int) const;
/* 80036AEC */ void getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
/* 80036C44 */ int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
@@ -30,7 +31,7 @@ public:
s8 getType(int i) { return mData[i].mType; }
/* 0x00 */ dJntColData_c* mData;
/* 0x00 */ const dJntColData_c* mData;
/* 0x04 */ J3DModel* mModel;
/* 0x08 */ int field_0x8;
/* 0x0C */ int field_0xc;
include/d/d_kyeff.h
+2 -2
View File
@@ -1,9 +1,9 @@
#ifndef D_D_KYEFF_H
#define D_D_KYEFF_H
#include "dolphin/types.h"
#include "f_op/f_op_kankyo.h"
class dKyeff_c {
class dKyeff_c : public kankyo_class {
public:
int execute();
};
include/d/d_kyeff2.h
+3 -4
View File
@@ -1,12 +1,11 @@
#ifndef D_D_KYEFF2_H
#define D_D_KYEFF2_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_kankyo.h"
class dKyeff2_c {
class dKyeff2_c : public kankyo_class {
public:
bool execute();
int execute();
};
#endif /* D_D_KYEFF2_H */
include/f_op/f_op_kankyo.h
+7
View File
@@ -15,4 +15,11 @@ public:
/* 0xF4 */ u32 mParam;
};
struct kankyo_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition base;
/* 0x24 */ leafdraw_method_class* mSubMtd;
}; // Size: 0x28
extern leafdraw_method_class g_fopKy_Method;
#endif /* F_OP_F_OP_KANKYO_H */
include/f_op/f_op_overlap_mng.h
+20 -15
View File
@@ -2,28 +2,33 @@
#define F_F_OP_OVERLAP_MNG_H_
#include "SSystem/SComponent/c_request.h"
#include "dolphin/types.h"
#include "f_pc/f_pc_leaf.h"
class overlap_task_class {
class overlap_task_class : public leafdraw_class {
public:
/* 0x00 */ u8 field_0x00[0xC0];
/* 0xC0 */ leafdraw_method_class* field_0xc0;
/* 0xC4 */ u8 field_0xc4;
};
/* 0xC4 */ u8 field_0xc4; // used as both u8 and request_base_class* ??
/* 0xC8 */ int field_0xc8;
int fopOvlpM_SceneIsStop(void);
int fopOvlpM_SceneIsStart(void);
void fopOvlpM_Management(void);
int fopOvlpM_IsOutReq(overlap_task_class* pTaskClass);
void fopOvlpM_Done(overlap_task_class* pTaskClass);
}; // Size: 0xD8?
struct overlap_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition base;
/* 0x24 */ leafdraw_method_class* mSubMtd;
}; // Size: 0x28
int fopOvlpM_SceneIsStop();
int fopOvlpM_SceneIsStart();
void fopOvlpM_Management();
int fopOvlpM_IsOutReq(overlap_task_class* i_this);
void fopOvlpM_Done(overlap_task_class* i_this);
void fopOvlpM_ToldAboutID(unsigned int param_1);
int fopOvlpM_IsPeek(void);
int fopOvlpM_IsDone(void);
int fopOvlpM_IsDoingReq(void);
int fopOvlpM_ClearOfReq(void);
int fopOvlpM_IsPeek();
int fopOvlpM_IsDone();
int fopOvlpM_IsDoingReq();
int fopOvlpM_ClearOfReq();
request_base_class* fopOvlpM_Request(s16 param_1, u16 param_2);
int fopOvlpM_Cancel(void);
int fopOvlpM_Cancel();
void fopOvlpM_Init();
#endif
include/f_pc/f_pc_manager.h
+4
View File
@@ -12,6 +12,10 @@
#include "f_pc/f_pc_leaf.h"
#include "f_pc/f_pc_layer_iter.h"
enum {
fpcM_ERROR_PROCESS_ID_e = -1,
};
typedef int (*FastCreateReqFunc)(void*);
typedef void (*fpcM_ManagementFunc)(void);
typedef int (*fpcM_DrawIteraterFunc)(void*, void*);
include/m_Do/m_Do_ext.h
+4 -4
View File
@@ -12,8 +12,8 @@
class mDoExt_baseAnm {
public:
mDoExt_baseAnm() {}
/* 8000D320 */ int initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_start,
s16 param_4);
/* 8000D320 */ int initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF,
s16 i_endF);
/* 8000D428 */ int play();
void setPlaySpeed(f32 speed) { mFrameCtrl.setRate(speed); }
@@ -141,7 +141,7 @@ public:
void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
J3DAnmTransform* getBckAnm() { return mAnm; }
void removeJoint (J3DModelData* i_modelData, u16 i_idx) {
void removeJoint(J3DModelData* i_modelData, u16 i_idx) {
J3DJoint* mpJnt = i_modelData->getJointNodePointer(i_idx);
mpJnt->setMtxCalc(0);
}
@@ -259,7 +259,7 @@ public:
f32 getFrame() { return mFrameCtrl.getFrame(); }
u8 getPlayMode() { return mFrameCtrl.getAttribute(); }
bool isLoop() { return mFrameCtrl.checkState(2); }
f32 getEndFrame() { return mFrameCtrl.getEnd(); }
f32 getEndFrame() { return mFrameCtrl.getEnd(); }
bool isStop() {
bool stopped = true;
include/m_Do/m_Do_main.h
+5 -5
View File
@@ -66,10 +66,10 @@ struct mDoMain {
static s8 developmentMode;
};
extern bool sOSReportDisabled;
extern bool data_80450B99;
extern bool data_80450B9A;
extern bool data_80450B9B;
extern bool sOSReportForceEnable;
extern bool __OSReport_disable;
extern bool __OSReport_Error_disable;
extern bool __OSReport_Warning_disable;
extern bool __OSReport_System_disable;
extern bool __OSReport_enable;
#endif /* M_DO_M_DO_MAIN_H */
include/rel/d/a/d_a_dmidna/d_a_dmidna.h
+15 -1
View File
@@ -1,6 +1,20 @@
#ifndef D_A_DMIDNA_H
#define D_A_DMIDNA_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
class daDmidna_c : public fopAc_ac_c {
public:
/* 8045CED8 */ int createHeap();
/* 8045CFE4 */ int create();
/* 8045D0B4 */ ~daDmidna_c();
/* 8045D144 */ void setMatrix();
/* 8045D1A0 */ int execute();
/* 8045D204 */ int draw();
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ u8 unk_0x570[4];
/* 0x574 */ mDoExt_McaMorfSO* mpModelMorf;
};
#endif /* D_A_DMIDNA_H */