mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 05:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Process profiles and enums cleanup (#1031)

Browse Source 
* 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
This commit is contained in:
LagoLunatic
2026-05-26 00:11:58 -04:00
committed by GitHub
parent 79277cb2b2
commit 102042628f
540 changed files with 9562 additions and 10530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_btd.cpp
+11 -13
View File
@@ -16,8 +16,6 @@
#include "d/res/res_btd.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_graphic.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_camera.h"
#include "JSystem/JUtility/JUTReport.h"
@@ -1790,7 +1788,7 @@ static void move(btd_class* i_this) {
/* 00005BCC-00005C24 .text k_a_d_sub__FPvPv */
static void* k_a_d_sub(void* i_this, void* param_2) {
UNUSED(param_2);
if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_KUI)) && (fopAcM_GetParam(i_this) == 0x511)) {
if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_KUI_e)) && (fopAcM_GetParam(i_this) == 0x511)) {
return i_this;
}
return NULL;
@@ -1799,7 +1797,7 @@ static void* k_a_d_sub(void* i_this, void* param_2) {
/* 00005C24-00005C70 .text dr2_a_d_sub__FPvPv */
static void* dr2_a_d_sub(void* i_this, void* param_2) {
UNUSED(param_2);
if ((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_DR2)) {
if ((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_DR2_e)) {
return i_this;
} else {
return NULL;
@@ -1809,7 +1807,7 @@ static void* dr2_a_d_sub(void* i_this, void* param_2) {
/* 00005C70-00005CC8 .text wepon_s_sub__FPvPv */
static void* wepon_s_sub(void* i_this, void* param_2) {
UNUSED(param_2);
if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_HIMO2)) || (fopAcM_GetName(i_this) == PROC_BOOMERANG)) {
if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_HIMO2_e)) || (fopAcM_GetName(i_this) == fpcNm_BOOMERANG_e)) {
return i_this;
}
return NULL;
@@ -2982,7 +2980,7 @@ static cPhs_State daBtd_Create(fopAc_ac_c* a_this) {
i_this->floor = dComIfGp_getMagma()->newFloor(local_48, actor->scale, fopAcM_GetRoomNo(actor), -0xFA);
JUT_ASSERT(DEMO_SELECT(6003, 6096), i_this->floor != NULL);
}
fopAcM_create(PROC_Ykgr, 0x10FF00, &actor->current.pos);
fopAcM_create(fpcNm_Ykgr_e, 0x10FF00, &actor->current.pos);
dKy_custom_timeset(l_HIO.m30);
return cPhs_COMPLEATE_e;
}
@@ -2996,18 +2994,18 @@ static actor_method_class l_daBtd_Method = {
};
actor_process_profile_definition g_profile_BTD = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BTD,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BTD_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(btd_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BTD,
/* Draw Prio */ fpcDwPi_BTD_e,
/* Actor SubMtd */ &l_daBtd_Method,
/* Status */ fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};