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_salvage.cpp
+12 -14
View File
@@ -15,8 +15,6 @@
#include "d/d_kankyo.h"
#include "d/d_kankyo_rain.h"
#include "d/d_item.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -187,7 +185,7 @@ void daSalvage_c::checkOrder() {
uVar2 = 0;
m301 = false;
} else {
m304 = fopAcM_create(PROC_SBOX, 0, pPos, getSRoomNo(), &current.angle, NULL, 0xff, salvage_createCB);
m304 = fopAcM_create(fpcNm_SBOX_e, 0, pPos, getSRoomNo(), &current.angle, NULL, 0xff, salvage_createCB);
m301 = true;
if (uVar7 == 0) {
uVar2 = 2;
@@ -196,7 +194,7 @@ void daSalvage_c::checkOrder() {
u8 itemNo = getItemNo(getSalvageId());
u32 params = (uVar2 << 8) | itemNo;
m2EC = fopAcM_create(PROC_SALVAGE_TBOX, params, pPos, getSRoomNo(), &current.angle, &scale, 0xff, salvage_createCB);
m2EC = fopAcM_create(fpcNm_SALVAGE_TBOX_e, params, pPos, getSRoomNo(), &current.angle, &scale, 0xff, salvage_createCB);
m2E9 = 0;
if (m2EC == fpcM_ERROR_PROCESS_ID_e || (m304 == fpcM_ERROR_PROCESS_ID_e && m301)) {
dComIfGp_event_reset();
@@ -292,7 +290,7 @@ bool daSalvage_c::proc_wait() {
}
if (roomNo != 0xff && switchIndex != 0xff && !dComIfGs_isSwitch(switchIndex, roomNo) && !dComIfGs_isOceanSvBit(roomNo, uVar2)) {
daDaiocta_c* bigOcto = (daDaiocta_c*)fopAcM_SearchByName(PROC_DAIOCTA);
daDaiocta_c* bigOcto = (daDaiocta_c*)fopAcM_SearchByName(fpcNm_DAIOCTA_e);
if (bigOcto != NULL && switchIndex == bigOcto->getSw()) {
cXyz sp40 = getPos(i);
@@ -468,7 +466,7 @@ BOOL daSalvage_c::checkArea(cXyz crane_pos, int salvage_id) {
void daSalvage_c::createEnemy() {
daPy_py_c* player = daPy_getPlayerActorClass();
fopAcM_create(PROC_OQ, 2, &player->current.pos);
fopAcM_create(fpcNm_OQ_e, 2, &player->current.pos);
}
/* 00001860-000019FC .text onSalvageForOship__11daSalvage_cFP9daOship_c */
@@ -606,7 +604,7 @@ BOOL daSalvage_c::getDistance(int salvageId, float* outDist) {
/* 00001E48-00001FA8 .text send_agb__11daSalvage_cFv */
void daSalvage_c::send_agb() {
u8 bVar5 = 0;
fopAcM_setGbaName(this, dItem_GRAPPLING_HOOK_e, 0x40, 0x3f);
fopAcM_setGbaName(this, dItemNo_GRAPPLING_HOOK_e, 0x40, 0x3f);
for (s32 i = 0; i < 160; i++) {
if (getKind(i) != 5 && getKind(i) && checkRegist(i) && checkUsed(i) && getRoomNo(i) == dComIfGp_roomControl_getStayNo()) {
cXyz sp14 = getPos(i);
@@ -756,18 +754,18 @@ static actor_method_class daSalvageMethodTable = {
};
actor_process_profile_definition g_profile_Salvage = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Salvage,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Salvage_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daSalvage_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Salvage,
/* Draw Prio */ fpcDwPi_Salvage_e,
/* Actor SubMtd */ &daSalvageMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_4_e,
/* Cull Type */ fopAc_CULLBOX_4_e,
};