mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 21:33:07 -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
include/d/actor/d_a_npc_cb1.h
+1 -1
View File
@@ -37,7 +37,7 @@ public:
virtual f32 getBaseAnimeFrame() { return 0.0f; }
s16 XyCheckCB(int i_itemBtn) {
if(dComIfGp_getSelectItem(i_itemBtn) == dItem_WIND_WAKER_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1880)) {
if(dComIfGp_getSelectItem(i_itemBtn) == dItemNo_WIND_WAKER_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1880)) {
return true;
}
include/d/actor/d_a_obj_barrel2.h
+1 -1
View File
@@ -76,7 +76,7 @@ namespace daObjBarrel2 {
fpc_ProcID get_item_id() { return mItemId; }
static fpc_ProcID make_coming(cXyz* pos, int roomNo, Type_e type, int droppedItem, bool hasFlag, s16 angleY, daObjBuoyflag::Texture_e tex) {
csXyz angle(0, angleY, 0);
return fopAcM_create(PROC_Obj_Barrel2, make_prm(type, droppedItem, !hasFlag, true, tex), pos, roomNo, &angle);
return fopAcM_create(fpcNm_Obj_Barrel2_e, make_prm(type, droppedItem, !hasFlag, true, tex), pos, roomNo, &angle);
}
static u32 make_prm(Type_e type, int droppedItem, bool hasFlag, bool _unused, daObjBuoyflag::Texture_e tex) {
int itemNo = (droppedItem & 0x3F);
include/d/actor/d_a_obj_barrier.h
+4 -4
View File
@@ -55,10 +55,10 @@ public:
class daObjBarrier_c : public fopAc_ac_c {
public:
enum PROC_e {
PROC_BREAK_START_WAIT,
PROC_BREAK_ORDER,
PROC_BREAK_END_WAIT,
enum Proc_e {
PROC_BREAK_START_WAIT_e,
PROC_BREAK_ORDER_e,
PROC_BREAK_END_WAIT_e,
};
enum Param_e {
PRM_DAMAGE_W = 0x01,
include/d/actor/d_a_obj_buoyflag.h
+3 -4
View File
@@ -3,7 +3,6 @@
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_procname.h"
#include "f_op/f_op_actor_mng.h"
namespace daObjBuoyflag {
@@ -53,7 +52,7 @@ namespace daObjBuoyflag {
public:
static fpc_ProcID make_norm(fpc_ProcID parentPId, cXyz* pos, int roomNo, csXyz* angle) {
u32 params = prm_make(Type_UNK0_e, Texture_00_e, false);
return fopAcM_createChild(PROC_Obj_Buoyflag, parentPId, params, pos, roomNo, angle);
return fopAcM_createChild(fpcNm_Obj_Buoyflag_e, parentPId, params, pos, roomNo, angle);
}
static u32 prm_make(Type_e type, Texture_e texture, bool arg2) {
s32 b = arg2 ? 1 : 0;
@@ -68,11 +67,11 @@ namespace daObjBuoyflag {
void jump_to_sea(float, float, short) {}
static fpc_ProcID make_barrel2_mine(fpc_ProcID parent, cXyz* pos, int room, csXyz* angle, Texture_e texture, bool arg5) {
u32 params = prm_make(Type_UNK2_e, texture, arg5);
return fopAcM_createChild(PROC_Obj_Buoyflag, parent, params, pos, room, angle);
return fopAcM_createChild(fpcNm_Obj_Buoyflag_e, parent, params, pos, room, angle);
}
static fpc_ProcID make_barrel2_norm(fpc_ProcID parent, cXyz* pos, int room, csXyz* angle, Texture_e texture) {
u32 params = prm_make(Type_UNK1_e, texture, false);
return fopAcM_createChild(PROC_Obj_Buoyflag, parent, params, pos, room, angle);
return fopAcM_createChild(fpcNm_Obj_Buoyflag_e, parent, params, pos, room, angle);
}
void attr_type() const; // weak but not inlined?
void prm_get_noCull() const {}
include/d/actor/d_a_obj_eff.h
+6 -7
View File
@@ -5,7 +5,6 @@
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_particle.h"
#include "d/d_procname.h"
namespace daObjEff {
class Act_c : public fopAc_ac_c {
@@ -31,16 +30,16 @@ namespace daObjEff {
int prm_get_type() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); }
static void make_barrel_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_BARREL_SMOKE_e, pos); }
static void make_stool_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_STOOL_SMOKE_e, pos); }
static void make_skull_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_SKULL_SMOKE_e, pos); }
static void make_barrel_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_BARREL_SMOKE_e, pos); }
static void make_stool_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_STOOL_SMOKE_e, pos); }
static void make_skull_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_SKULL_SMOKE_e, pos); }
static void make_land_smoke(cXyz* i_pos, f32 i_scale) {
cXyz scale(i_scale, i_scale, i_scale);
scale *= (5.0f / 3.0f);
fopAcM_create(PROC_Obj_Eff, Type_LAND_SMOKE_e, i_pos, -1, NULL, &scale);
fopAcM_create(fpcNm_Obj_Eff_e, Type_LAND_SMOKE_e, i_pos, -1, NULL, &scale);
}
static void make_pinecone_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_PINECONE_SMOKE_e, pos); }
static void make_woodBox_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_WOODBOX_SMOKE_e, pos); }
static void make_pinecone_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_PINECONE_SMOKE_e, pos); }
static void make_woodBox_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_WOODBOX_SMOKE_e, pos); }
static BOOL solidHeapCB(fopAc_ac_c*);
bool create_heap_barrel_smoke();
include/d/actor/d_a_player.h
+5 -5
View File
@@ -595,15 +595,15 @@ public:
BOOL checkGrabWear() const { return field_0x2b0 < 0.0f; }
BOOL checkNormalSwordEquip() const {
return dComIfGs_getSelectEquip(0) == dItem_SWORD_e || checkSwordMiniGame();
return dComIfGs_getSelectEquip(0) == dItemNo_SWORD_e || checkSwordMiniGame();
}
BOOL checkMasterSwordEquip() const {
return dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_1_e ||
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e ||
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e;
return dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_1_e ||
dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_2_e ||
dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e;
}
BOOL checkFinalMasterSwordEquip() const {
return dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e;
return dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e;
}
void setFace(daPy_FACE face) { mFace = face; }
include/d/actor/d_a_player_main.h
+4 -4
View File
@@ -1869,11 +1869,11 @@ public:
void getBombWaterPillarBtk() {} // mpGwp00BtkData?
BOOL checkSwordEquip() const {
return dComIfGs_getSelectEquip(0) != dItem_NONE_e || checkSwordMiniGame();
return dComIfGs_getSelectEquip(0) != dItemNo_NONE_e || checkSwordMiniGame();
}
BOOL checkShieldEquip() const { return dComIfGs_getSelectEquip(1) != dItem_NONE_e; }
BOOL checkMirrorShieldEquip() const { return dComIfGs_getSelectEquip(1) == dItem_MIRROR_SHIELD_e; }
BOOL checkPowerGloveEquip() const { return dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e; }
BOOL checkShieldEquip() const { return dComIfGs_getSelectEquip(1) != dItemNo_NONE_e; }
BOOL checkMirrorShieldEquip() const { return dComIfGs_getSelectEquip(1) == dItemNo_MIRROR_SHIELD_e; }
BOOL checkPowerGloveEquip() const { return dComIfGs_getSelectEquip(2) == dItemNo_POWER_BRACELETS_e; }
int getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; }
int getStartMode() { return (fopAcM_GetParam(this) >> 0x0C) & 0xF; }