From 63fb32f7ab6232566bb16a7917289d3bb02e383c Mon Sep 17 00:00:00 2001 From: Briggs Baltzell Date: Tue, 3 Feb 2026 23:06:49 -0600 Subject: [PATCH] Define `ARR_SIZE` constant and replace hardcoded array sizes in `d_menu_cloth`. --- include/d/d_menu_cloth.h | 12 +++++++----- src/d/d_menu_cloth.cpp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/d/d_menu_cloth.h b/include/d/d_menu_cloth.h index 5f6681eb7..1b8f1833b 100644 --- a/include/d/d_menu_cloth.h +++ b/include/d/d_menu_cloth.h @@ -40,14 +40,16 @@ public: void cloth_move_simple(); void cloth_move(); + static const int ARR_SIZE = 441; + /* 0x0004 */ u16 field_0x4; /* 0x0006 */ u8 field_0x6[0x44 - 0x06]; /* 0x0044 */ JKRArchive* mpArc; - /* 0x0048 */ cXyz field_0x48[2][441]; - /* 0x29A0 */ cXyz field_0x29a0[2][441]; - /* 0x52F8 */ cXyz field_0x52f8[441]; - /* 0x67A4 */ cXyz field_0x67a4[441]; - /* 0x7C50 */ cXyz field_0x7c50[441]; + /* 0x0048 */ cXyz field_0x48[2][ARR_SIZE]; + /* 0x29A0 */ cXyz field_0x29a0[2][ARR_SIZE]; + /* 0x52F8 */ cXyz field_0x52f8[ARR_SIZE]; + /* 0x67A4 */ cXyz field_0x67a4[ARR_SIZE]; + /* 0x7C50 */ cXyz field_0x7c50[ARR_SIZE]; /* 0x90FC */ GXTexObj mTexObj; /* 0x911C */ u8 field_0x911c[0x913C - 0x911C]; /* 0x913C */ u8 mCurArr; diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp index 6a7755ab1..a388696c0 100644 --- a/src/d/d_menu_cloth.cpp +++ b/src/d/d_menu_cloth.cpp @@ -188,7 +188,7 @@ void dMCloth_c::setBackNrm() { cXyz* pNrm = getNrm(); cXyz* pBackNrm = getBackNrm(); - for (int i = 0; i < 441; i++) { + for (int i = 0; i < ARR_SIZE; i++) { pBackNrm->set(-pNrm->x, -pNrm->y, -pNrm->z); pNrm++; pBackNrm++;