From 18cdfab6c29102b904799fe6a2276e2fa1c65a43 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 14 Mar 2026 19:04:46 -0400 Subject: [PATCH] hio_prm_c cleanup --- src/d/actor/d_a_npc_hi1.cpp | 26 +++++++------- src/d/actor/d_a_npc_km1.cpp | 26 +++++++------- src/d/actor/d_a_npc_ls1.cpp | 40 +++++++++++----------- src/d/actor/d_a_npc_zl1.cpp | 68 ++++++++++++++++++------------------- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index 23f5693e6..d7579039b 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -49,20 +49,20 @@ static int l_check_wrk; /* 000000EC-00000150 .text __ct__15daNpc_Hi1_HIO_cFv */ daNpc_Hi1_HIO_c::daNpc_Hi1_HIO_c() { static hio_prm_c a_prm_tbl = { - 0x0000, - 0x1FFE, - 0xF600, - 0xE002, - 0x0000, - 0x0744, - 0xF9DA, - 0xF8BC, - 0x0258, - 0x0000, - 270.0f, - 0.0f + /* mMaxHeadX */ 0x0000, + /* mMaxHeadY */ 0x1FFE, + /* mMinHeadX */ 0xF600, + /* mMinHeadY */ 0xE002, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x0744, + /* mMinBackboneX */ 0xF9DA, + /* mMinBackboneY */ 0xF8BC, + /* mMaxTurnStep */ 0x0258, + /* field_12 */ 0x0000, + /* mAttentionYOffset */ 270.0f, + /* field_18 */ 0.0f, }; - memcpy(&mPrmTbl,&a_prm_tbl,0x1c); + memcpy(&mPrmTbl, &a_prm_tbl, sizeof(hio_prm_c)); mNo = -1; field_0x8 = -1; } diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index 3115994f8..2d9d13f16 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -48,20 +48,20 @@ static daNpc_Km1_HIO_c l_HIO; /* 000000EC-00000144 .text __ct__15daNpc_Km1_HIO_cFv */ daNpc_Km1_HIO_c::daNpc_Km1_HIO_c() { static hio_prm_c a_prm_tbl = { - 0x1FFE, - 0x38E0, - 0xE002, - 0xC720, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0800, - 0x0800, - 150.0f, - 0.0f + /* field_0 */ 0x1FFE, + /* field_2 */ 0x38E0, + /* field_4 */ 0xE002, + /* field_6 */ 0xC720, + /* field_8 */ 0x0000, + /* field_A */ 0x0000, + /* field_C */ 0x0000, + /* field_E */ 0x0000, + /* field_10 */ 0x0800, + /* field_12 */ 0x0800, + /* mAttentionArrowYOffset */ 150.0f, + /* field_18 */ 0.0f, }; - memcpy(&mPrmTbl,&a_prm_tbl,sizeof(hio_prm_c)); + memcpy(&mPrmTbl, &a_prm_tbl, sizeof(hio_prm_c)); mNo = -1; field_0x8 = -1; } diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index c5c623cb7..8a63e195d 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -26,27 +26,27 @@ static int l_check_wrk; /* 000000EC-00000150 .text __ct__15daNpc_Ls1_HIO_cFv */ daNpc_Ls1_HIO_c::daNpc_Ls1_HIO_c() { static hio_prm_c a_prm_tbl = { - 0x2EE0, - 0x4650, - 0xFC18, - 0xB9B0, - 0x0BB8, - 0x1B58, - 0x0000, - 0xE4A8, - 0x1000, - 0x0960, - 110.0f, - 0, - 700.0f, - 200.0f, - 2.0f, - 9.0f, - 50.0f, - 0x1A2C, - 9.0f + /* mMaxHeadX */ 0x2EE0, + /* mMaxHeadY */ 0x4650, + /* mMinHeadX */ 0xFC18, + /* mMinHeadY */ 0xB9B0, + /* mMaxBackBoneX */ 0x0BB8, + /* mMaxBackBoneY */ 0x1B58, + /* mMinBackBoneX */ 0x0000, + /* mMinBackBoneY */ 0xE4A8, + /* mMaxTurnStep */ 0x1000, + /* m12 */ 0x0960, + /* mAttPosOffsetY */ 110.0f, + /* m18 */ 0, + /* m1C */ 700.0f, + /* m29 */ 200.0f, + /* m24 */ 2.0f, + /* m28 */ 9.0f, + /* m2C */ 50.0f, + /* m30 */ 0x1A2C, + /* mPlayerEyePosOffsetY */ 9.0f, }; - memcpy(&mPrm, &a_prm_tbl, 0x38); + memcpy(&mPrm, &a_prm_tbl, sizeof(hio_prm_c)); m04 = -1; m08 = -1; } diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index 379854b14..18ef4776c 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -88,41 +88,41 @@ static char l_BTKName[30]; /* 000000EC-00000150 .text __ct__15daNpc_Zl1_HIO_cFv */ daNpc_Zl1_HIO_c::daNpc_Zl1_HIO_c() { static hio_prm_c a_prm_tbl = { - 0x18E2, - 0x2328, - 0xE71E, - 0xDCD8, - 0x0BB8, - 0x03E8, - 0xF8E4, - 0xFC18, - 0x1000, - 0x0800, - 140.0f, - 0, - 0, - 0, - 0, - 200.0f, - 200.0f, - 0x0028, - 0x0014, - 0x0000, - 0x003C, - 130.0f, - 0.04f, - 10.0f, - 0.0f, - 1.0f, - 1.0f, - 200.0f, - 0.25f, - 25.0f, - 10.0f, - 0x0180, - 0x1388 + /* mMaxHeadX */ 0x18E2, + /* mMaxHeadY */ 0x2328, + /* mMinHeadX */ 0xE71E, + /* mMinHeadY */ 0xDCD8, + /* mMaxBackboneX */ 0x0BB8, + /* mMaxBackboneY */ 0x03E8, + /* mMinBackboneX */ 0xF8E4, + /* mMinBackboneY */ 0xFC18, + /* mMaxTurnStep */ 0x1000, + /* field_18 */ 0x0800, + /* field_1C */ 140.0f, + /* field_20 */ 0, + /* field_21 */ 0, + /* field_22 */ 0, + /* field_23 */ 0, + /* field_24 */ 200.0f, + /* field_28 */ 200.0f, + /* field_2C */ 0x0028, + /* field_2E */ 0x0014, + /* field_30 */ 0x0000, + /* field_32 */ 0x003C, + /* field_34 */ 130.0f, + /* field_38 */ 0.04f, + /* field_3C */ 10.0f, + /* field_40 */ 0.0f, + /* field_44 */ 1.0f, + /* field_48 */ 1.0f, + /* field_4C */ 200.0f, + /* field_50 */ 0.25f, + /* field_54 */ 25.0f, + /* field_58 */ 10.0f, + /* field_5C */ 0x0180, + /* field_5E */ 0x1388, }; - memcpy(&mPrmTbl,&a_prm_tbl,0x58); + memcpy(&mPrmTbl, &a_prm_tbl, sizeof(hio_prm_c)); mNo = -1; field_0x8 = -1; }