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

some cleanup of f_pc/f_op files (#2254)

Browse Source 
* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work
This commit is contained in:
TakaRikka
2024-11-29 08:24:26 -08:00
committed by GitHub
parent 6482fe7535
commit 073992df8d
903 changed files with 6835 additions and 6587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_op/f_op_msg.cpp
+36 -37
View File
@@ -11,81 +11,80 @@
/* 8001F488-8001F4B0 019DC8 0028+00 1/0 0/0 0/0 .text fopMsg_Draw__FPv */
static int fopMsg_Draw(void* i_this) {
msg_class* _this = static_cast<msg_class*>(i_this);
return fpcLf_DrawMethod(_this->sub_method, i_this);
msg_class* a_this = (msg_class*)i_this;
return fpcLf_DrawMethod(a_this->sub_method, i_this);
}
/* 8001F4B0-8001F4E8 019DF0 0038+00 1/0 0/0 0/0 .text fopMsg_Execute__FPv */
static int fopMsg_Execute(void* i_this) {
msg_class* _this = static_cast<msg_class*>(i_this);
msg_class* a_this = (msg_class*)i_this;
int stat = 1;
int ret = 1;
if (dScnPly_c::isPause()) {
stat = fpcMtd_Execute(&_this->sub_method->mBase, i_this);
ret = fpcMtd_Execute(&a_this->sub_method->base, i_this);
}
return stat;
return ret;
}
/* 8001F4E8-8001F53C 019E28 0054+00 1/0 0/0 0/0 .text fopMsg_IsDelete__FPv */
static int fopMsg_IsDelete(void* i_this) {
msg_class* _this = static_cast<msg_class*>(i_this);
msg_class* a_this = (msg_class*)i_this;
int stat = fpcMtd_IsDelete(&_this->sub_method->mBase, i_this);
if (stat == 1) {
fopDwTg_DrawQTo(&_this->draw_tag);
int ret = fpcMtd_IsDelete(&a_this->sub_method->base, i_this);
if (ret == 1) {
fopDwTg_DrawQTo(&a_this->draw_tag);
}
return stat;
return ret;
}
/* 8001F53C-8001F588 019E7C 004C+00 1/0 0/0 0/0 .text fopMsg_Delete__FPv */
static int fopMsg_Delete(void* i_this) {
msg_class* _this = static_cast<msg_class*>(i_this);
msg_class* a_this = (msg_class*)i_this;
int stat = fpcMtd_Delete(&_this->sub_method->mBase, i_this);
fopDwTg_DrawQTo(&_this->draw_tag);
int ret = fpcMtd_Delete(&a_this->sub_method->base, i_this);
fopDwTg_DrawQTo(&a_this->draw_tag);
return stat;
return ret;
}
/* ############################################################################################## */
/* 80450CF0-80450CF8 0001F0 0004+04 1/1 0/0 0/0 .sbss fopMsg_MSG_TYPE */
static int fopMsg_MSG_TYPE;
/* 8001F588-8001F660 019EC8 00D8+00 1/0 0/0 0/0 .text fopMsg_Create__FPv */
int fopMsg_Create(void* i_this) {
msg_class* _this = (msg_class*)i_this;
msg_class* a_this = (msg_class*)i_this;
if (fpcM_IsFirstCreating(_this)) {
msg_process_profile_definition* profile =
(msg_process_profile_definition*)fpcM_GetProfile(i_this);
_this->mMsgType = fpcBs_MakeOfType(&fopMsg_MSG_TYPE);
_this->sub_method = profile->sub_method;
fopDwTg_Init(&_this->draw_tag, _this);
fopMsg_prm_class* prm = fopMsgM_GetAppend(_this);
if (prm != NULL) {
_this->mpActor = prm->mpActor;
_this->mPos = prm->mPos;
_this->mMsgID = prm->mMsgID;
_this->field_0xf0 = prm->field_0x14;
_this->field_0xf4 = prm->field_0x18;
if (fpcM_IsFirstCreating(a_this)) {
msg_process_profile_definition* profile = (msg_process_profile_definition*)fpcM_GetProfile(i_this);
a_this->type = fpcBs_MakeOfType(&fopMsg_MSG_TYPE);
a_this->sub_method = profile->sub_method;
fopDwTg_Init(&a_this->draw_tag, a_this);
fopMsg_prm_class* append = fopMsgM_GetAppend(a_this);
if (append != NULL) {
a_this->talk_actor = append->talk_actor;
a_this->pos = append->pos;
a_this->msg_idx = append->msg_idx;
a_this->field_0xf0 = append->field_0x14;
a_this->field_0xf4 = append->field_0x18;
}
}
int status = fpcMtd_Create(&_this->sub_method->mBase, _this);
if (status == cPhs_COMPLEATE_e) {
s32 priority = fpcLf_GetPriority(_this);
fopDwTg_ToDrawQ(&_this->draw_tag, priority);
int ret = fpcMtd_Create(&a_this->sub_method->base, a_this);
if (ret == cPhs_COMPLEATE_e) {
s32 priority = fpcLf_GetPriority(a_this);
fopDwTg_ToDrawQ(&a_this->draw_tag, priority);
}
return status;
return ret;
}
/* ############################################################################################## */
/* 803A3958-803A3970 -00001 0014+04 0/0 5/0 0/0 .data g_fopMsg_Method */
leafdraw_method_class g_fopMsg_Method = {
(process_method_func)fopMsg_Create, (process_method_func)fopMsg_Delete,
(process_method_func)fopMsg_Execute, (process_method_func)fopMsg_IsDelete,
(process_method_func)fopMsg_Draw,
};
};