mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-01 17:29:58 -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_cb1.cpp
+10 -12
View File
@@ -10,8 +10,6 @@
#include "d/d_camera.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_wether.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
@@ -268,7 +266,7 @@ cPhs_State daNpc_Cb1_c::create() {
#if VERSION == VERSION_DEMO
if(dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_WT))
#else
if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e))
if(dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e))
#endif
{
if(!isTypeKazeBoss()) {
@@ -290,7 +288,7 @@ cPhs_State daNpc_Cb1_c::create() {
return cPhs_ERROR_e;
}
}
else if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e)) {
else if(dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_2_e)) {
if(!isTypeWaterFall()) {
return cPhs_ERROR_e;
}
@@ -298,7 +296,7 @@ cPhs_State daNpc_Cb1_c::create() {
else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) {
return cPhs_ERROR_e;
}
else if(dComIfGs_checkGetItem(dItem_PEARL_FARORE_e)) {
else if(dComIfGs_checkGetItem(dItemNo_PEARL_FARORE_e)) {
if(!isTypeForest()) {
return cPhs_ERROR_e;
}
@@ -3444,18 +3442,18 @@ static actor_method_class l_daNpc_Cb1_Method = {
};
actor_process_profile_definition g_profile_NPC_CB1 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_NPC_CB1,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_CB1_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpc_Cb1_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_NPC_CB1,
/* Draw Prio */ fpcDwPi_NPC_CB1_e,
/* Actor SubMtd */ &l_daNpc_Cb1_Method,
/* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK2000000_e,
/* Group */ fopAc_NPC_e,
/* CullType */ fopAc_CULLBOX_12_e,
/* Cull Type */ fopAc_CULLBOX_12_e,
};