mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-12 04:19:04 -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_npc_hr.cpp
+10 -12
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_npc_hr.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/res/res_hr.h"
#include "d/d_snap.h"
#include "d/d_kankyo_wether.h"
@@ -249,7 +247,7 @@ static s16 daNpc_hr_XyCheckCB(void* i_this, int i_itemBtn) {
/* 00000838-0000085C .text XyCheckCB__10daNpc_Hr_cFi */
s16 daNpc_Hr_c::XyCheckCB(int i_itemBtn) {
return dComIfGp_getSelectItem(i_itemBtn) == dItem_WIND_WAKER_e ? TRUE : FALSE;
return dComIfGp_getSelectItem(i_itemBtn) == dItemNo_WIND_WAKER_e ? TRUE : FALSE;
}
/* 0000085C-000008AC .text daNpc_hr_XyEventCB__FPvi */
@@ -463,7 +461,7 @@ BOOL daNpc_Hr_c::demoProcTact0() {
if (dComIfGp_checkMesgCancelButton()) {
setFlag(HR_FLAG_00000200);
} else {
execItemGet(TACT_SONG1);
execItemGet(dItemNo_WINDS_REQUIEM_e);
}
dComIfGp_evmng_cutEnd(mStaffIdx);
clrFlag(HR_FLAG_00000002);
@@ -2088,7 +2086,7 @@ cPhs_State daNpc_Hr_c::_create() {
if (state == cPhs_COMPLEATE_e) {
fopAcM_ct_Demo(this, daNpc_Hr_c);
switch(fopAcM_GetName(this)) {
case PROC_NPC_HR:
case fpcNm_NPC_HR_e:
switch (getShapeType()) {
case 1:
mType = 1;
@@ -2256,18 +2254,18 @@ static actor_method_class l_daNpc_Hr_Method = {
};
actor_process_profile_definition g_profile_NPC_HR = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_NPC_HR,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_HR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpc_Hr_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_NPC_HR,
/* Draw Prio */ fpcDwPi_NPC_HR_e,
/* Actor SubMtd */ &l_daNpc_Hr_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_12_e,
/* Cull Type */ fopAc_CULLBOX_12_e,
};