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