d_meter2 wip / d_s_play / d_file_sel_info (#179)

* d_meter2 wip

* d_s_play

* d_file_sel_info

* format

* tag_lv5soup / tag_setBall / fix dKyeff

* d_cc_uty
This commit is contained in:
TakaRikka
2022-02-06 06:23:54 -08:00
committed by GitHub
parent 612f26c132
commit 3a79e96e8b
133 changed files with 2652 additions and 4502 deletions
+5 -1
View File
@@ -55,6 +55,8 @@ struct actor_place {
};
struct actor_attention_types {
void setFlag(u32 flags) { mFlags |= flags; }
/* 0x00 */ u32 mDistance1;
/* 0x04 */ u32 mDistance2;
/* 0x08 */ u32 mDistance3;
@@ -106,7 +108,9 @@ public:
/* 0x534 */ f32 mMaxFallSpeed;
/* 0x538 */ cXyz mEyePos;
/* 0x544 */ actor_attention_types mAttentionInfo;
/* 0x560 */ u8 field_0x560[0x8]; // not 100% sure on this
/* 0x560 */ u8 field_0x560[0x2];
/* 0x562 */ s16 field_0x562;
/* 0x564 */ u8 field_0x564[0x4];
fopAc_ac_c();
~fopAc_ac_c();
+7 -3
View File
@@ -102,6 +102,10 @@ inline u32 fopAcM_GetParam(const void* pActor) {
return fpcM_GetParam(pActor);
}
inline u8 fopAcM_GetParamBit(void* ac, u8 shift, u8 bit) {
return (fopAcM_GetParam(ac) >> shift) & ((1 << bit) - 1);
}
inline void fopAcM_SetParam(void* p_actor, u32 param) {
fpcM_SetParam(p_actor, param);
}
@@ -354,9 +358,9 @@ void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void);
void fopAcM_riverStream__FP4cXyzPsPff(void);
void fopAcM_carryOffRevise__FP10fopAc_ac_c(void);
void fopAcM_searchFromName4Event__FPCcs(void);
void fopAcM_GetName__FPv(void); // mostly inlined
void fopAcM_GetID__FPCv(void); // mostly inlined
void fopAcM_GetParam__FPCv(void); // mostly inlined
void fopAcM_GetName__FPv(void); // mostly inlined
void fopAcM_GetID__FPCv(void); // mostly inlined
static void fopAcM_GetParam__FPCv(void const*); // mostly inlined
}
#endif
+3
View File
@@ -2,5 +2,8 @@
#define F_OP_F_OP_MSG_H
#include "dolphin/types.h"
#include "f_pc/f_pc_leaf.h"
extern leafdraw_method_class g_fopMsg_Method;
#endif /* F_OP_F_OP_MSG_H */
+3
View File
@@ -7,6 +7,9 @@
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*);
#endif
+13 -5
View File
@@ -1,19 +1,27 @@
#ifndef F_F_OP_SCENE_H_
#define F_F_OP_SCENE_H_
#include "SSystem/SComponent/c_phase.h"
#include "dolphin/types.h"
#include "f_op/f_op_scene_tag.h"
#include "f_pc/f_pc_base.h"
#include "f_pc/f_pc_node.h"
#include "m_Do/m_Do_dvd_thread.h"
struct request_of_phase_process_class;
class mDoDvdThd_command_c;
class scene_class {
public:
/* 0x000 */ u8 field_0x00;
/* 0x004 */ u32 field_0x04;
/* 0x008 */ u8 field_0x08[0x24];
/* 0x02C */ int* field_0x2C;
/* 0x030 */ u8 field_0x30[0x17C];
/* 0x000 */ base_process_class field_0x0;
/* 0x0B8 */ u8 field_0xb8[0xF4];
/* 0x1AC */ process_method_class* mpProcessMtd;
/* 0x1B0 */ scene_tag_class* field_0x1b0;
/* 0x1B4 */ u8 field_0x1b4[0x10];
/* 0x1C4 */ request_of_phase_process_class field_0x1c4;
/* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand;
/* 0x1D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0;
/* 0x1D4 */ u8 field_0x1d4;
};
#endif
+5
View File
@@ -1,6 +1,7 @@
#ifndef F_F_OP_SCENE_MNG_H_
#define F_F_OP_SCENE_MNG_H_
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_scene_pause.h"
void* fopScnM_SearchByID(unsigned int id);
@@ -11,4 +12,8 @@ u32 fopScnM_ReRequest(s16, u32);
void fopScnM_Management(void);
void fopScnM_Init(void);
inline u32 fopScnM_GetID(void* proc) {
return fpcM_GetID(proc);
}
#endif