Unhardcode some things (#589)

* fix malloc sizes of HuMemDirectMalloc calls

* unhardcode some things

include/REL/m407dll.h

@@ -3,8 +3,6 @@
 
 #include "game/object.h"
 
-#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
-
 typedef void (*VoidFuncs)(void);
 typedef void (*ObjFuncs)(omObjData *);
 

include/REL/w03Dll.h

@@ -8,8 +8,6 @@
 #include "game/window.h"
 #include "game/object.h"
 
-#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
-
 enum {
     MAPOBJ_MAX = 12
 };

include/game/chrman.h

@@ -44,6 +44,8 @@ s32 CharModelEffectNpcInit(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
 s32 CharModelEffectNpcInitSilent(s16 arg0, s16 arg1, s16 arg2);
 void CharModelStepTypeSet(s16 character, s32 arg1);
 
-#define GW_CHARACTER_MAX 8
+#define CHARNO_MAX  8
+#define CHAR_NPC_MAX 7
+#define CHAR_EFFECT_AND_PARTICLE_MAX 8
 
 #endif

include/types.h

@@ -1,6 +1,8 @@
 #ifndef _TYPES_H_
 #define _TYPES_H_
 
+#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
+
 #include "dolphin/types.h"
 
 #endif

src/REL/mstory4Dll/main.c

@@ -577,7 +577,7 @@ void fn_1_13A0(void)
 		s32 i;
 		for(i=1; i<4; i++) {
 			GWPlayerCfg[i].character = GWPlayerCfg[i-1].character+1;
-			if(GWPlayerCfg[i].character > GW_CHARACTER_MAX) {
+			if(GWPlayerCfg[i].character > CHARNO_MAX ) {
 				GWPlayerCfg[i].character = 0;
 			}				
 		}

src/game/board/com.c

@@ -47,7 +47,7 @@ static s8 itemUse = -1;
 #define BOARD_ITEM_ITEM_BAG 13
 #define BOARD_ITEMS_END BOARD_ITEM_ITEM_BAG
 
-static s8 comItemPreferTbl[GW_CHARACTER_MAX][SHOP_ITEMS_END] = {
+static s8 comItemPreferTbl[CHARNO_MAX ][SHOP_ITEMS_END] = {
     {   //Mario
         BOARD_ITEM_MAGIC_LAMP,
         BOARD_ITEM_BOOS_CRYSTAL_BALL,

src/game/chrman.c

@@ -83,12 +83,13 @@ static void OrbitEffect(HsfanimStruct01 *arg0);
 static void UpdateNpcEffect(void);
 static s32 PlayStepFX(s16 arg0, s16 arg1, u8 arg2);
 
-static UnkCharInstanceStruct charInstance[8];
+static UnkCharInstanceStruct charInstance[CHARNO_MAX ];
-static s16 effectMdl[8];
+static s16 effectMdl[CHAR_EFFECT_AND_PARTICLE_MAX];
-static EffectParamData *particleData[8];
+static EffectParamData *particleData[CHAR_EFFECT_AND_PARTICLE_MAX];
 static Process *itemHookProcess[32];
-static u16 lbl_801975B0[8];
+//holds normal characters 0-7, then more characters 8-14
-static u8 lbl_801975C0[0x90]; // Unused?
+static u16 lbl_801975B0[CHARNO_MAX  + CHAR_NPC_MAX];
+static u8 lbl_801975CE[0x82]; // Unused?
 
 static s32 skipAnimUpdate;
 static void *effectAMemP;
@@ -110,7 +111,7 @@ static EffectData effectDataTbl[8] = {
     { DATA_MAKE_NUM(DATADIR_EFFECT, 0x07), 0x000C, 0x0000, 0x00000002 },
 };
 
-static s32 charDirTbl[8][3] = {
+static s32 charDirTbl[CHARNO_MAX ][3] = {
     { DATADIR_MARIOMDL0, DATADIR_MARIOMDL1, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00) },
     { DATADIR_LUIGIMDL0, DATADIR_LUIGIMDL1, DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x00) },
     { DATADIR_PEACHMDL0, DATADIR_PEACHMDL1, DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x00) },
@@ -150,10 +151,10 @@ void CharManInit(void)
     s16 i;
     s16 j;
 
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < CHARNO_MAX ; i++) {
         temp_r29 = &charInstance[i];
         temp_r29->unkC0 = NULL;
-        for (j = 0; j < 32; j++) {
+        for (j = 0; j < ARRAY_COUNT(temp_r29->unk0C); j++) {
             temp_r29->unk0C[j] = -1;
         }
         temp_r29->unk00 = -1;
@@ -162,11 +163,11 @@ void CharManInit(void)
     if (!effectAMemP) {
         effectAMemP = (void *)HuAR_DVDtoARAM(0x120000);
     }
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < CHAR_EFFECT_AND_PARTICLE_MAX; i++) {
         effectMdl[i] = -1;
         particleData[i] = NULL;
     }
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < ARRAY_COUNT(itemHookProcess); i++) {
         itemHookProcess[i] = NULL;
     }
 }
@@ -180,7 +181,7 @@ void CharARAMOpen(s16 character)
 {
     UnkCharInstanceStruct *temp_r31;
 
-    if (character >= 8 || character < 0 || character == 0xFF) {
+    if (character >= CHARNO_MAX  || character < 0 || character == 0xFF) {
         return;
     }
     temp_r31 = &charInstance[character];
@@ -708,12 +709,12 @@ static void InitEffect(void)
     s16 j;
 
     var_r27 = 0;
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < CHAR_EFFECT_AND_PARTICLE_MAX; i++) {
         if (effectMdl[i] == -1) {
             temp_r26 = HuDataSelHeapReadNum(effectDataTbl[i].unk00, MEMORY_DEFAULT_NUM, HEAP_DATA);
             temp_r25 = HuSprAnimRead(temp_r26);
             effectMdl[i] = Hu3DParticleCreate(temp_r25, effectDataTbl[i].unk04);
-            if (i == 7) {
+            if (i == CHAR_EFFECT_AND_PARTICLE_MAX - 1) {
                 Hu3DParticleAnimModeSet(effectMdl[i], 0);
             }
             Hu3DParticleHookSet(effectMdl[i], UpdateEffect);
@@ -1035,12 +1036,12 @@ s16 CharModelMotionCreate(s16 character, s32 data_num)
         return -1;
     }
     temp_r26 = data_num & 0xFFFF0000;
-    for (var_r28 = 0; var_r28 < 8; var_r28++) {
+    for (var_r28 = 0; var_r28 < CHARNO_MAX ; var_r28++) {
         if (temp_r26 == charDirTbl[var_r28][2]) {
             break;
         }
     }
-    if (var_r28 != 8 || temp_r26 == 0) {
+    if (var_r28 != CHARNO_MAX  || temp_r26 == 0) {
         data_num &= 0xFFFF;
         var_r27 = HuAR_ARAMtoMRAMFileRead(data_num | charDirTbl[character][2], MEMORY_DEFAULT_NUM, 2);
         if (!var_r27) {
@@ -1063,12 +1064,12 @@ void CharModelMotionIndexSet(s16 character, s16 arg1, s32 arg2)
     s16 i;
 
     temp_r30 = &charInstance[character];
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < ARRAY_COUNT(temp_r30->unk0C); i++) {
         if (temp_r30->unk0C[i] == arg1) {
             break;
         }
     }
-    if (i != 32) {
+    if (i != ARRAY_COUNT(temp_r30->unk0C)) {
         temp_r30->unk4C[i] = arg2;
     }
 }
@@ -1079,7 +1080,7 @@ void CharModelMotionKill(s16 character, u32 motion)
     s16 i;
 
     temp_r30 = &charInstance[character];
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < ARRAY_COUNT(temp_r30->unk0C); i++) {
         if (temp_r30->unk0C[i] == motion) {
             break;
         }
@@ -1093,7 +1094,7 @@ void CharModelMotionDataClose(s16 character)
     s16 i;
 
     if (character == -1) {
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < CHARNO_MAX ; i++) {
             CharModelMotionDataClose(i);
         }
     }
@@ -1107,7 +1108,7 @@ void CharModelDataClose(s16 arg0)
     s16 i;
 
     if (arg0 == -1) {
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < CHARNO_MAX ; i++) {
             CharModelDataClose(i);
             // Required to match.
             (void)i;
@@ -1127,17 +1128,17 @@ void CharModelKill(s16 character)
     s16 i;
 
     if (character == -1) {
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < CHARNO_MAX ; i++) {
             CharModelKill(i);
         }
-        for (i = 0; i < 15; i++) {
+        for (i = 0; i < ARRAY_COUNT(lbl_801975B0); i++) {
             lbl_801975B0[i] = 0;
         }
         return;
     }
     CharModelMotionDataClose(character);
     temp_r29 = &charInstance[character];
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < ARRAY_COUNT(temp_r29->unk0C); i++) {
         if (temp_r29->unk0C[i] != -1) {
             Hu3DMotionKill(temp_r29->unk0C[i]);
         }
@@ -1147,13 +1148,13 @@ void CharModelKill(s16 character)
         Hu3DModelKill(temp_r29->unk00);
     }
     temp_r29->unk00 = -1;
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < CHARNO_MAX ; i++) {
         if (charInstance[i].unk00 != -1) {
             break;
         }
     }
-    if (i == 8) {
+    if (i == CHARNO_MAX ) {
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < CHAR_EFFECT_AND_PARTICLE_MAX; i++) {
             if (effectMdl[i] != -1) {
                 Hu3DModelKill(effectMdl[i]);
             }
@@ -1163,7 +1164,7 @@ void CharModelKill(s16 character)
     if (temp_r29->unkC4) {
         HuMemDirectFree(temp_r29->unkC4->user_data);
         HuPrcKill(temp_r29->unkC4);
-        for (i = 0; i < 32; i++) {
+        for (i = 0; i < ARRAY_COUNT(itemHookProcess); i++) {
             if (itemHookProcess[i]) {
                 HuPrcKill(itemHookProcess[i]);
             }
@@ -1319,7 +1320,7 @@ void CharModelLayerSetAll(s16 arg0)
 {
     s16 i;
 
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < CHAR_EFFECT_AND_PARTICLE_MAX; i++) {
         if (effectMdl[i] != -1) {
             Hu3DModelLayerSet(effectMdl[i], arg0);
         }
@@ -1330,12 +1331,12 @@ static inline Process *CharModelItemHookCreateInlineFunc(void)
 {
     s16 i;
 
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < ARRAY_COUNT(itemHookProcess); i++) {
         if (!itemHookProcess[i]) {
             break;
         }
     }
-    if (i == 32) {
+    if (i == ARRAY_COUNT(itemHookProcess)) {
         return NULL;
     }
     else {
@@ -1423,7 +1424,7 @@ static void UpdateItemHook(void)
     }
     PSMTXIdentity(temp_r30->unk_F0);
     temp_r25 = HuPrcCurrentGet();
-    for (var_r28 = 0; var_r28 < 32; var_r28++) {
+    for (var_r28 = 0; var_r28 < ARRAY_COUNT(itemHookProcess); var_r28++) {
         if (itemHookProcess[var_r28] == temp_r25) {
             HuPrcKill(temp_r25);
             itemHookProcess[var_r28] = NULL;
@@ -1445,7 +1446,7 @@ void CharModelEffectCreate(s16 arg0, Vec *arg1)
     ParticleData *var_r27;
     ModelData *var_r26;
 
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < CHAR_EFFECT_AND_PARTICLE_MAX; i++) {
         temp_r28 = CreateEffect(effectMdl[3], arg0, arg1->x, arg1->y, arg1->z, 20.0f, &modelParticleParam);
         if (temp_r28 == -1) {
             break;
@@ -1462,7 +1463,7 @@ void CharModelEffectCreate(s16 arg0, Vec *arg1)
         var_r31->unk24 = 0.1f * (frandmod(20) - 10);
         var_r31->unk40.a = 0xFF - frandmod(3) * 16;
     }
-    for (i = 0; i < 8; i++) {
+    for (i = 0; i < CHAR_EFFECT_AND_PARTICLE_MAX; i++) {
         temp_r28 = CreateEffect(effectMdl[3], arg0, arg1->x, arg1->y, arg1->z, 10.0f, &modelParticleParam);
         if (temp_r28 == -1) {
             break;
@@ -1566,12 +1567,12 @@ void fn_8004EC74(s16 character)
 
     temp_r30 = &charInstance[character];
     temp_r31 = &Hu3DData[temp_r30->unk00];
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < ARRAY_COUNT(temp_r30->unk0C); i++) {
         if (temp_r30->unk0C[i] == temp_r31->unk_08) {
             break;
         }
     }
-    if (i != 32) {
+    if (i != ARRAY_COUNT(temp_r30->unk0C)) {
         Hu3DModelObjMtxGet(temp_r30->unk00, "test11_tex_we-itemhook-r", sp24);
         sp18.x = sp24[0][3];
         sp18.y = sp24[1][3];
@@ -1698,12 +1699,12 @@ void CharModelVoiceEnableSet(s16 character, s16 motion, s32 flag)
     if (temp_r31->unk00 == -1) {
         return;
     }
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < ARRAY_COUNT(temp_r31->unk0C); i++) {
         if (temp_r31->unk0C[i] == motion) {
             break;
         }
     }
-    if (i != 32) {
+    if (i != ARRAY_COUNT(temp_r31->unk0C)) {
         if (flag == 0) {
             temp_r31->unk8C[i] |= 1;
         }
@@ -1730,7 +1731,7 @@ void CharModelEffectEnableSet(s16 character, s32 arg1)
 {
     UnkCharInstanceStruct *temp_r31 = &charInstance[character];
 
-    if (character >= 8) {
+    if (character >= CHARNO_MAX ) {
         if (arg1 == 0) {
             lbl_801975B0[character] |= 0x10;
         }
@@ -1932,14 +1933,14 @@ static void UpdateNpcEffect(void)
                 if (lbl_801975B0[temp_r28] & 0x10) {
                     break;
                 }
-                for (i = 0; i < 8; i++) {
+                for (i = 0; i < CHAR_EFFECT_AND_PARTICLE_MAX; i++) {
                     effectStarParam.unk0C.x = 10.0 * sind(45.0f * i) * temp_r30->scale.x;
                     effectStarParam.unk0C.y = 0.0f;
                     effectStarParam.unk0C.z = 10.0 * cosd(45.0f * i) * temp_r30->scale.x;
                     CreateEffectStar(
                         temp_r25, temp_r30->pos.x, temp_r30->pos.y + 10.0f * temp_r30->scale.x, temp_r30->pos.z, 40.0f, &effectStarParam);
                 }
-                for (i = 0; i < 8; i++) {
+                for (i = 0; i < CHAR_EFFECT_AND_PARTICLE_MAX; i++) {
                     effectDustParam.unk0C.x = 4.0 * sind(45.0f * i + 22.5) * temp_r30->scale.x;
                     effectDustParam.unk0C.y = 0.0f;
                     effectDustParam.unk0C.z = 4.0 * cosd(45.0f * i + 22.5) * temp_r30->scale.x;