From 383ed1ee51792febb09a5a4aa5e837fea82e3858 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 23 Feb 2024 00:59:14 -0500 Subject: [PATCH] Use dCcG_At_Spl enum in Src structs --- include/d/d_cc_d.h | 2 ++ src/d/actor/d_a_am.cpp | 2 +- src/d/actor/d_a_am2.cpp | 2 +- src/d/actor/d_a_bita.cpp | 2 +- src/d/actor/d_a_bomb2.cpp | 2 +- src/d/actor/d_a_bomb3.inc | 2 +- src/d/actor/d_a_obj_barrier.cpp | 2 +- src/d/actor/d_a_player_main_data.inc | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 09431ed71..a8add3133 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -54,6 +54,8 @@ enum CcG_Tg_HitMark { enum dCcG_At_Spl { /* 0x0 */ dCcG_At_Spl_UNK0 = 0, /* 0x1 */ dCcG_At_Spl_UNK1 = 1, + /* 0x6 */ dCcG_At_Spl_UNK6 = 6, + /* 0x9 */ dCcG_At_Spl_UNK9 = 9, /* 0xB */ dCcG_At_Spl_UNKB = 0xB, }; diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index d929d2720..c46df343c 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1311,7 +1311,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, - /* SrcGObjAt Spl */ 0x06, + /* SrcGObjAt Spl */ dCcG_At_Spl_UNK6, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index d671a4f63..89876a1f9 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1441,7 +1441,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_VS_UNK4 | CO_SPRM_VS_UNK8, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, - /* SrcGObjAt Spl */ 0x06, + /* SrcGObjAt Spl */ dCcG_At_Spl_UNK6, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index e87b49498..924d3b404 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -246,7 +246,7 @@ static s32 daBita_Create(fopAc_ac_c* i_ac) { /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ dCcD_SE_UNK6, /* SrcGObjAt HitMark */ 0, - /* SrcGObjAt Spl */ 0x01, + /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 28750a408..1603d69e1 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -314,7 +314,7 @@ namespace daBomb2 { /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, - /* SrcGObjAt Spl */ 0x01, + /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index 359b11ff0..9c36e607a 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -1371,7 +1371,7 @@ static dCcD_SrcSph l_sph_src = { /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, - /* SrcGObjAt Spl */ 1, + /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 0b8f09d0c..d2eac1966 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -28,7 +28,7 @@ static const dCcD_SrcCyl l_cyl_at_src = { /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, - /* SrcGObjAt Spl */ 0x09, + /* SrcGObjAt Spl */ dCcG_At_Spl_UNK9, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ G_AT_SPRM_NO_CON_HIT | G_AT_SPRM_NO_HIT_MARK, /* SrcGObjTg Se */ 0, diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc index adf4fd33e..fafc722d3 100644 --- a/src/d/actor/d_a_player_main_data.inc +++ b/src/d/actor/d_a_player_main_data.inc @@ -114,7 +114,7 @@ static dCcD_SrcCyl l_at_cyl_src = { /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ G_AT_MARK_BIG_HIT, - /* SrcGObjAt Spl */ 0x01, + /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0,