mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-09 02:15:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor status consolidation & process profile definition editing (#3117)

Browse Source 
* Consolidate fopAcM_STATUS into fopAc_Status_e

* Add _e suffix to fopAcStts enums

* Prepare for profile enumeration
* Correct typo in scene_process_profile_definition
* Manually handle g_profile_Obj_DamCps (inline preprocessing)
* Correct g_profile_TAG_LV5SOUP procname to enum
* Create d_priority.h

* Update process profile definitions
* Moved inline comments to the left
* Add missing fopAcStts enums
* Add d_priority.h include in f_pc_leaf.h
* Manually update d_a_obj_damCps profile

* Replace fopAcStts enums replacing and anticipatory profile size correction
* Changed profile size from literal to sizeof() in anticipation of PR #3116
* Provided putative names to staff-related status enums
* Replaced appropriate literals with fopAcStts enums

* Fix borked merge

* Rename item number enums and move to d_item_data.h

* Rename process profile name & draw priority enums

* Move process profile name & draw priority enums to appropriate files
* Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h
* Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h

* ACTUALLY (whoops) stage merge

* Correct item mistranslation

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Huitzi
2026-03-09 21:33:31 -04:00
committed by GitHub
parent 30e839c28b
commit 0b0fdd1f60
873 changed files with 19721 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_ovlp_fade.cpp
+94 -94
View File
@@ -37,9 +37,9 @@ static int dOvlpFd_FadeOut(overlap1_class* i_this) {
if (i_this->field_0xcc == 0) {
mDoAud_setFadeInStart(0);
if (fpcM_GetProfName(i_this) == PROC_OVERLAP11) {
if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e) {
i_this->field_0xcc = 10;
} else if (fpcM_GetProfName(i_this) != PROC_OVERLAP6) {
} else if (fpcM_GetProfName(i_this) != fpcNm_OVERLAP6_e) {
dOvlpFd_startFadeIn(var_r31);
i_this->field_0xcc = var_r31;
} else {
@@ -48,7 +48,7 @@ static int dOvlpFd_FadeOut(overlap1_class* i_this) {
}
}
if (fpcM_GetProfName(i_this) == PROC_OVERLAP11 && i_this->field_0xcc == 7) {
if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e && i_this->field_0xcc == 7) {
dOvlpFd_startFadeIn(7);
}
@@ -76,7 +76,7 @@ static int dOvlpFd_FadeIn(overlap1_class* i_this) {
int var_r30 = 30;
if (i_this->field_0xd0 == 0) {
if (fpcM_GetProfName(i_this) == PROC_OVERLAP0 || fpcM_GetProfName(i_this) == PROC_OVERLAP7)
if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP0_e || fpcM_GetProfName(i_this) == fpcNm_OVERLAP7_e)
{
if (dComIfGp_isEnableNextStage() == 1) {
var_r30 = dComIfGp_getNextStageWipeSpeed();
@@ -87,8 +87,8 @@ static int dOvlpFd_FadeIn(overlap1_class* i_this) {
}
i_this->field_0xd0 = var_r30;
} else if (fpcM_GetProfName(i_this) == PROC_OVERLAP10 ||
fpcM_GetProfName(i_this) == PROC_OVERLAP11)
} else if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP10_e ||
fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e)
{
i_this->field_0xd0 = 1;
} else {
@@ -133,113 +133,113 @@ static leafdraw_method_class l_dOvlpFd_Method = {
};
overlap_process_profile_definition g_profile_OVERLAP0 = {
fpcLy_ROOT_e,
0,
fpcPi_CURRENT_e,
PROC_OVERLAP0,
&g_fpcLf_Method.base,
sizeof(overlap1_class),
0,
0,
&g_fopOvlp_Method,
773,
&l_dOvlpFd_Method,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 0,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OVERLAP0_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(overlap1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopOvlp_Method,
/* Draw Prio */ fpcDwPi_OVERLAP0_e,
/* Fade SubMtd */ &l_dOvlpFd_Method,
};
overlap_process_profile_definition g_profile_OVERLAP1 = {
fpcLy_ROOT_e,
0,
fpcPi_CURRENT_e,
PROC_OVERLAP1,
&g_fpcLf_Method.base,
sizeof(overlap1_class),
0,
0,
&g_fopOvlp_Method,
774,
&l_dOvlpFd_Method,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 0,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OVERLAP1_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(overlap1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopOvlp_Method,
/* Draw Prio */ fpcDwPi_OVERLAP1_e,
/* Fade SubMtd */ &l_dOvlpFd_Method,
};
overlap_process_profile_definition g_profile_OVERLAP6 = {
fpcLy_ROOT_e,
0,
fpcPi_CURRENT_e,
PROC_OVERLAP6,
&g_fpcLf_Method.base,
sizeof(overlap1_class),
0,
0,
&g_fopOvlp_Method,
777,
&l_dOvlpFd_Method,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 0,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OVERLAP6_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(overlap1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopOvlp_Method,
/* Draw Prio */ fpcDwPi_OVERLAP6_e,
/* Fade SubMtd */ &l_dOvlpFd_Method,
};
overlap_process_profile_definition g_profile_OVERLAP7 = {
fpcLy_ROOT_e,
0,
fpcPi_CURRENT_e,
PROC_OVERLAP7,
&g_fpcLf_Method.base,
sizeof(overlap1_class),
0,
0,
&g_fopOvlp_Method,
778,
&l_dOvlpFd_Method,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 0,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OVERLAP7_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(overlap1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopOvlp_Method,
/* Draw Prio */ fpcDwPi_OVERLAP7_e,
/* Fade SubMtd */ &l_dOvlpFd_Method,
};
overlap_process_profile_definition g_profile_OVERLAP8 = {
fpcLy_ROOT_e,
0,
fpcPi_CURRENT_e,
PROC_OVERLAP8,
&g_fpcLf_Method.base,
sizeof(overlap1_class),
0,
0,
&g_fopOvlp_Method,
779,
&l_dOvlpFd_Method,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 0,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OVERLAP8_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(overlap1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopOvlp_Method,
/* Draw Prio */ fpcDwPi_OVERLAP8_e,
/* Fade SubMtd */ &l_dOvlpFd_Method,
};
overlap_process_profile_definition g_profile_OVERLAP9 = {
fpcLy_ROOT_e,
0,
fpcPi_CURRENT_e,
PROC_OVERLAP9,
&g_fpcLf_Method.base,
sizeof(overlap1_class),
0,
0,
&g_fopOvlp_Method,
780,
&l_dOvlpFd_Method,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 0,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OVERLAP9_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(overlap1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopOvlp_Method,
/* Draw Prio */ fpcDwPi_OVERLAP9_e,
/* Fade SubMtd */ &l_dOvlpFd_Method,
};
overlap_process_profile_definition g_profile_OVERLAP10 = {
fpcLy_ROOT_e,
0,
fpcPi_CURRENT_e,
PROC_OVERLAP10,
&g_fpcLf_Method.base,
sizeof(overlap1_class),
0,
0,
&g_fopOvlp_Method,
781,
&l_dOvlpFd_Method,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 0,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OVERLAP10_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(overlap1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopOvlp_Method,
/* Draw Prio */ fpcDwPi_OVERLAP10_e,
/* Fade SubMtd */ &l_dOvlpFd_Method,
};
overlap_process_profile_definition g_profile_OVERLAP11 = {
fpcLy_ROOT_e,
0,
fpcPi_CURRENT_e,
PROC_OVERLAP11,
&g_fpcLf_Method.base,
sizeof(overlap1_class),
0,
0,
&g_fopOvlp_Method,
782,
&l_dOvlpFd_Method,
/* Layer ID */ fpcLy_ROOT_e,
/* List ID */ 0,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OVERLAP11_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(overlap1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopOvlp_Method,
/* Draw Prio */ fpcDwPi_OVERLAP11_e,
/* Fade SubMtd */ &l_dOvlpFd_Method,
};