diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-05-26 00:11:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-26 00:11:58 -0400 |
| commit | 102042628fa139f4e509251bdd9095493f031e28 (patch) | |
| tree | a5b37fcd76d8c0105f2e9b379b7e2daa7eae2266 /src/d/actor/d_a_dr2.cpp | |
| parent | 79277cb2b2672104b87172d8ff620f923f450658 (diff) | |
Process profiles and enums cleanup (#1031)
* Fix some profile comments
* Add missing static for local visibility data
* Move proc name and draw priority enums to f_pc
* Add _e suffix to daObjBarrier_c proc enum
* Change proc name enum format to match TP
* Change draw prio enum format to match TP
* Change ItemNo enum format, finish fixing item names
* Revert static for cb1 hio
* Clean up formatting of profile comments
* Fix comment alignment
Diffstat (limited to 'src/d/actor/d_a_dr2.cpp')
| -rw-r--r-- | src/d/actor/d_a_dr2.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index c3a12c21..3f211ffe 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_dr2.h" #include "d/res/res_dr2.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_w.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" @@ -187,7 +185,7 @@ static BOOL daDr2_Draw(dr2_class* i_this) { /* 000006D4-00000720 .text s_a_d_sub__FPvPv */ void* s_a_d_sub(void* ac1, void* ac2) { UNUSED(ac2); - if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == PROC_BTD) { + if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_BTD_e) { return ac1; } return NULL; @@ -804,7 +802,7 @@ static cPhs_State daDr2_Create(fopAc_ac_c* a_this) { params->base.parameters = 0x511; params->room_no = a_this->current.roomNo; - i_this->unk_3FC = fopAcM_Create(PROC_KUI, NULL, params); + i_this->unk_3FC = fopAcM_Create(fpcNm_KUI_e, NULL, params); i_this->unk_4A8.x = a_this->home.pos.x; i_this->unk_4A8.y = a_this->home.pos.y + REG0_F(7) - 50.0f; i_this->unk_4A8.z = a_this->home.pos.z; @@ -821,18 +819,18 @@ static actor_method_class l_daDr2_Method = { }; actor_process_profile_definition g_profile_DR2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DR2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DR2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(dr2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DR2, + /* Draw Prio */ fpcDwPi_DR2_e, /* Actor SubMtd */ &l_daDr2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; |
