mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-11 11:02:37 -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_kankyo.cpp
+23 -26
View File
@@ -12,10 +12,10 @@
/* 8001F284-8001F2C0 019BC4 003C+00 1/0 0/0 0/0 .text fopKy_Draw__FPv */
static int fopKy_Draw(void* i_this) {
int ret;
kankyo_class* _this = (kankyo_class*)i_this;
kankyo_class* a_this = (kankyo_class*)i_this;
if (!dComIfGp_isPauseFlag()) {
ret = fpcLf_DrawMethod(_this->sub_method, i_this);
ret = fpcLf_DrawMethod(a_this->sub_method, i_this);
}
return ret;
@@ -24,10 +24,10 @@ static int fopKy_Draw(void* i_this) {
/* 8001F2C0-8001F314 019C00 0054+00 1/0 0/0 0/0 .text fopKy_Execute__FPv */
static int fopKy_Execute(void* i_this) {
int ret;
kankyo_class* _this = (kankyo_class*)i_this;
kankyo_class* a_this = (kankyo_class*)i_this;
if (dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(i_this) == PROC_ENVSE)) {
ret = fpcMtd_Execute(&_this->sub_method->mBase, i_this);
ret = fpcMtd_Execute(&a_this->sub_method->base, i_this);
}
return ret;
@@ -36,11 +36,11 @@ static int fopKy_Execute(void* i_this) {
/* 8001F314-8001F368 019C54 0054+00 1/0 0/0 0/0 .text fopKy_IsDelete__FPv */
static int fopKy_IsDelete(void* i_this) {
int ret;
kankyo_class* _this = (kankyo_class*)i_this;
kankyo_class* a_this = (kankyo_class*)i_this;
ret = fpcMtd_IsDelete(&_this->sub_method->mBase, _this);
ret = fpcMtd_IsDelete(&a_this->sub_method->base, a_this);
if (ret == 1) {
fopDwTg_DrawQTo(&_this->draw_tag);
fopDwTg_DrawQTo(&a_this->draw_tag);
}
return ret;
@@ -48,52 +48,49 @@ static int fopKy_IsDelete(void* i_this) {
/* 8001F368-8001F3B4 019CA8 004C+00 1/0 0/0 0/0 .text fopKy_Delete__FPv */
static int fopKy_Delete(void* i_this) {
kankyo_class* _this = (kankyo_class*)i_this;
kankyo_class* a_this = (kankyo_class*)i_this;
int ret = fpcMtd_Delete(&_this->sub_method->mBase, _this);
fopDwTg_DrawQTo(&_this->draw_tag);
int ret = fpcMtd_Delete(&a_this->sub_method->base, a_this);
fopDwTg_DrawQTo(&a_this->draw_tag);
return ret;
}
/* ############################################################################################## */
/* 80450CE8-80450CF0 0001E8 0004+04 1/1 0/0 0/0 .sbss fopKy_KANKYO_TYPE */
static int fopKy_KANKYO_TYPE;
/* 8001F3B4-8001F488 019CF4 00D4+00 1/0 0/0 0/0 .text fopKy_Create__FPv */
static int fopKy_Create(void* i_this) {
kankyo_class* _this = (kankyo_class*)i_this;
kankyo_class* a_this = (kankyo_class*)i_this;
if (fpcM_IsFirstCreating(i_this)) {
kankyo_process_profile_definition* profile =
(kankyo_process_profile_definition*)fpcM_GetProfile(i_this);
kankyo_process_profile_definition* profile = (kankyo_process_profile_definition*)fpcM_GetProfile(i_this);
_this->mBsType = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE);
_this->sub_method = profile->sub_method;
a_this->type = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE);
a_this->sub_method = profile->sub_method;
fopDwTg_Init(&_this->draw_tag, _this);
fopKyM_prm_class* append = (fopKyM_prm_class*)fopKyM_GetAppend(_this);
fopDwTg_Init(&a_this->draw_tag, a_this);
fopKyM_prm_class* append = fopKyM_GetAppend(a_this);
if (append != NULL) {
_this->mPos = append->mPos;
_this->mScale = append->mScale;
_this->mParam = append->mParam;
a_this->pos = append->pos;
a_this->scale = append->scale;
a_this->parameters = append->parameters;
}
}
int ret = fpcMtd_Create(&_this->sub_method->mBase, _this);
int ret = fpcMtd_Create(&a_this->sub_method->base, a_this);
if (ret == cPhs_COMPLEATE_e) {
s32 priority = fpcLf_GetPriority(_this);
fopDwTg_ToDrawQ(&_this->draw_tag, priority);
s32 priority = fpcLf_GetPriority(a_this);
fopDwTg_ToDrawQ(&a_this->draw_tag, priority);
}
return ret;
}
/* ############################################################################################## */
/* 803A3940-803A3958 -00001 0014+04 0/0 7/0 0/0 .data g_fopKy_Method */
leafdraw_method_class g_fopKy_Method = {
(process_method_func)fopKy_Create, (process_method_func)fopKy_Delete,
(process_method_func)fopKy_Execute, (process_method_func)fopKy_IsDelete,
(process_method_func)fopKy_Draw,
};
};