diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-05-26 00:11:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-26 00:11:58 -0400 |
| commit | 102042628fa139f4e509251bdd9095493f031e28 (patch) | |
| tree | a5b37fcd76d8c0105f2e9b379b7e2daa7eae2266 /src/d/d_grass.cpp | |
| parent | 79277cb2b2672104b87172d8ff620f923f450658 (diff) | |
Process profiles and enums cleanup (#1031)
* 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
Diffstat (limited to 'src/d/d_grass.cpp')
| -rw-r--r-- | src/d/d_grass.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp index 37f2ec9a..3cf4f831 100644 --- a/src/d/d_grass.cpp +++ b/src/d/d_grass.cpp @@ -11,7 +11,6 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" @@ -22,7 +21,7 @@ const u32 l_K_kusa_00TEX__width = 64; const u32 l_K_kusa_00TEX__height = 128; -Vec l_Vmori_pos[] = { +static Vec l_Vmori_pos[] = { {0.0f, -0.0f, 0.0f}, {-20.232309f, 2.398434f, -12.457211f}, {-22.421972f, 96.708992f, -32.329994f}, @@ -52,7 +51,7 @@ Vec l_Vmori_pos[] = { {11.278254f, 12.157036f, 6.079209f}, }; -GXColor l_Vmori_color[] = { +static GXColor l_Vmori_color[] = { {0xFF, 0xFF, 0xFF, 0xFF}, {0x41, 0x41, 0x41, 0xFF}, {0xDD, 0xCF, 0x71, 0xFF}, @@ -60,7 +59,7 @@ GXColor l_Vmori_color[] = { {0xAE, 0xA4, 0x57, 0xFF}, }; -cXy l_Vmori_texCoord[] = { +static cXy l_Vmori_texCoord[] = { {0.006063f, 0.998037f}, {0.659757f, 0.0f}, {0.974817f, 1.0f}, @@ -81,7 +80,7 @@ l_Vmori_matDL(l_K_kusa_00TEX); const u32 l_Txa_ob_kusa_aTEX__width = 64; const u32 l_Txa_ob_kusa_aTEX__height = 64; -Vec l_pos[] = { +static Vec l_pos[] = { {0.0f, -0.0f, 0.0f}, {-20.232309f, 7.048814f, -12.457211f}, {-22.421972f, 96.708992f, -32.329994f}, @@ -111,7 +110,7 @@ Vec l_pos[] = { {11.278254f, 12.157036f, 6.079209f}, }; -GXColor l_color[] = { +static GXColor l_color[] = { {0x87, 0x87, 0x87, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0x6E, 0x6E, 0x6E, 0xFF}, @@ -122,7 +121,7 @@ GXColor l_color[] = { {0xCC, 0xCC, 0xCC, 0xFF}, }; -cXy l_texCoord[] = { +static cXy l_texCoord[] = { {0.375f, 0.625f}, {1.0f, 0.0f}, {1.0f, 1.0f}, @@ -263,7 +262,7 @@ void dGrass_data_c::hitCheck(int roomNo) { dCcMassS_HitInf hitInf; fopAc_ac_c* actor; u32 ret = dComIfG_Ccsp()->ChkMass(&mPos, &actor, &hitInf); - bool checkAt = (ret & 1) && (actor != NULL && fopAcM_GetName(actor) != PROC_TSUBO && fopAcM_GetName(actor) != PROC_STONE); + bool checkAt = (ret & 1) && (actor != NULL && fopAcM_GetName(actor) != fpcNm_TSUBO_e && fopAcM_GetName(actor) != fpcNm_STONE_e); if ((ret & 2) == 0 && !checkAt) { if (mAnimIdx >= 8) { |
