Unhardcode some things (#589)
* fix malloc sizes of HuMemDirectMalloc calls * unhardcode some things
This commit is contained in:
parent
086800b79a
commit
ce57301435
7 changed files with 48 additions and 47 deletions
|
|
@ -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 *);
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue