mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-17 21:03:35 -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_andsw0.cpp
+11 -13
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_andsw0.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/actor/d_a_bk.h"
#include "d/actor/d_a_bb.h"
@@ -145,7 +143,7 @@ static s32 check_count;
/* 000003C4-0000044C .text bk_s_sub1__FPvPv */
static void* bk_s_sub1(void* i_this, void*) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 7) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 7) {
s32 count = check_count; //regswaps without this
if(count < 2) {
ac[check_count] = i_this;
@@ -160,7 +158,7 @@ static void* bk_s_sub1(void* i_this, void*) {
/* 0000044C-000004D4 .text bk_s_sub2__FPvPv */
static void* bk_s_sub2(void* i_this, void*) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 4) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 4) {
s32 count = check_count; //regswaps without this
if(count == 2) {
ac[check_count] = i_this;
@@ -175,7 +173,7 @@ static void* bk_s_sub2(void* i_this, void*) {
/* 000004D4-0000055C .text bk_s_sub3__FPvPv */
static void* bk_s_sub3(void* i_this, void*) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 5) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 5) {
s32 count = check_count; //regswaps without this
if(count < 5) {
ac[check_count] = i_this;
@@ -190,7 +188,7 @@ static void* bk_s_sub3(void* i_this, void*) {
/* 0000055C-000005D4 .text bb_s_sub__FPvPv */
static void* bb_s_sub(void* search, void*) {
if(fopAcM_IsActor(search) && fopAcM_GetName(search) == PROC_BB) {
if(fopAcM_IsActor(search) && fopAcM_GetName(search) == fpcNm_BB_e) {
s32 count = check_count; //regswaps without this
if(count < 7) {
ac[check_count] = search;
@@ -349,18 +347,18 @@ static actor_method_class l_daAndsw0_Method = {
};
actor_process_profile_definition g_profile_ANDSW0 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ANDSW0,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ANDSW0_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(andsw0_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ANDSW0,
/* Draw Prio */ fpcDwPi_ANDSW0_e,
/* Actor SubMtd */ &l_daAndsw0_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};