address variaty of compiler warnings and code documentation
This commit is contained in:
@@ -25,7 +25,7 @@ void modelRender_setPrimAndEnvColors(s32 env[4], s32 prim[4]);
|
||||
void modelRender_setEnvColor(s32 r, s32 g, s32 b, s32 a);
|
||||
void modelRender_setAlpha(s32 a);
|
||||
void func_8033A444(struct58s *arg0);
|
||||
void func_8033A450(s32 arg0);
|
||||
void func_8033A450(struct5Bs *arg0);
|
||||
void func_8033A45C(s32 arg0, s32 arg1);
|
||||
void func_8033A470(s32 arg0, s32 arg1);
|
||||
void modelRender_setTextureList(BKTextureList *textureList);
|
||||
|
@@ -2,24 +2,18 @@
|
||||
#define __TIMED_FUNC_H__
|
||||
#include <ultra64.h>
|
||||
|
||||
typedef void (* TFQM0)(void);
|
||||
typedef void (* TFQM1)(s32);
|
||||
typedef void (* TFQM2)(s32, s32);
|
||||
typedef void (* TFQM3)(s32, s32, s32);
|
||||
typedef void (* TFQM4)(s32, s32, s32, s32);
|
||||
typedef void (* TFQM5)(s32, s32, s32, s32, s32);
|
||||
typedef void (* TFQM6)(void *);
|
||||
#include "generic.h"
|
||||
|
||||
#define reinterpret_cast(type, var) (*((type *)&var))
|
||||
|
||||
|
||||
void timedFunc_set_0(f32 time, TFQM0 funcPtr);
|
||||
void timedFunc_set_1(f32 time, TFQM1 funcPtr, s32 arg0);
|
||||
void timedFunc_set_2(f32 time, TFQM2 funcPtr, s32 arg0, s32 arg1);
|
||||
void timedFunc_set_3(f32 time, TFQM3 funcPtr, s32 arg0, s32 arg1, s32 arg2);
|
||||
void timedFunc_set_4(f32 time, TFQM4 funcPtr, s32 arg0, s32 arg1, s32 arg2, s32 arg3);
|
||||
void timedFunc_set_5(f32 time, TFQM5 funcPtr, s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
|
||||
void timedFunc_set_6(f32 time, TFQM6 funcPtr, void* argPtr );
|
||||
void timedFunc_set_0(f32 time, GenMethod_0 funcPtr);
|
||||
void timedFunc_set_1(f32 time, GenMethod_1 funcPtr, s32 arg0);
|
||||
void timedFunc_set_2(f32 time, GenMethod_2 funcPtr, s32 arg0, s32 arg1);
|
||||
void timedFunc_set_3(f32 time, GenMethod_3 funcPtr, s32 arg0, s32 arg1, s32 arg2);
|
||||
void timedFunc_set_4(f32 time, GenMethod_4 funcPtr, s32 arg0, s32 arg1, s32 arg2, s32 arg3);
|
||||
void timedFunc_set_5(f32 time, GenMethod_5 funcPtr, s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
|
||||
void timedFunc_set_6(f32 time, GenMethod_6 funcPtr, void* argPtr );
|
||||
void timedJiggySpawn(f32 time, s32 jiggyId, f32 *position);
|
||||
|
||||
#endif
|
||||
|
@@ -226,7 +226,7 @@ void particleEmitter_setSprite(ParticleEmitter *, enum asset_e);
|
||||
void particleEmitter_setPosition(ParticleEmitter *, f32[3]);
|
||||
ParticleEmitter *partEmitList_pushNew(u32);
|
||||
void func_802BB3DC(s32, f32, f32);
|
||||
void func_802C3F04(GenMethod_4, s32, s32, s32, s32);
|
||||
void __spawnQueue_add_4(GenMethod_4, s32, s32, s32, s32);
|
||||
Actor *func_802C4140(enum actor_e actor_id, s32 x, s32 y, s32 z);
|
||||
void func_8030DA44(u8);
|
||||
|
||||
@@ -451,7 +451,7 @@ void func_8030EC20(enum sfx_e uid, f32 arg1, f32 arg2, u32 arg3, u32 arg4);
|
||||
u8 func_8030ED2C(enum sfx_e uid, s32 arg1);
|
||||
|
||||
void func_80320044(s32, s32, s32);
|
||||
Actor *func_80325300(ActorMarker *marker, f32 rotation[3]);
|
||||
Actor *marker_getActorAndRotation(ActorMarker *marker, f32 rotation[3]);
|
||||
Actor *func_80325934(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
|
||||
Actor *func_80325E78(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
|
||||
|
||||
@@ -520,7 +520,7 @@ void player_setYPosition(f32);
|
||||
|
||||
NodeProp *func_80304C38(enum actor_e arg0, Actor *arg1);
|
||||
NodeProp *func_80304CAC(s32 arg0, f32 position[3]);
|
||||
Actor *func_80326D68(f32 position[3], enum actor_e actor_id, s32 arg2, f32 *min_distance_ptr);
|
||||
Actor *actorArray_findClosestActorFromActorId(f32 position[3], enum actor_e actor_id, s32 arg2, f32 *min_distance_ptr);
|
||||
Actor *subaddie_getLinkedActor(Actor *);
|
||||
|
||||
/* used in RBB */
|
||||
@@ -544,7 +544,7 @@ void func_802C8F70(f32);
|
||||
void func_802F9DB8(s32, f32, f32, f32);
|
||||
void func_802F9F80(s32, f32, f32, f32);
|
||||
void func_802FA060(s32, s32, s32, f32);
|
||||
Actor *func_80326EEC(enum actor_e);
|
||||
Actor *actorArray_findActorFromActorId(enum actor_e);
|
||||
f32 func_8038A6B8(ActorMarker *);
|
||||
void *defrag_asset(void *);
|
||||
void func_80255FE4(f32 [3], f32 [3], f32 [3], f32);
|
||||
@@ -579,8 +579,8 @@ void func_802596AC(f32 a0[3], f32 a1[3], f32 a2[3], f32 a3[3]);
|
||||
|
||||
void func_8024E55C(s32, s32 [6]);
|
||||
|
||||
void __spawnqueue_add_1(GenMethod_1, s32);
|
||||
#define SPAWNQUEUE_ADD_1(method, arg0) __spawnqueue_add_1((GenMethod_1) (method), reinterpret_cast(s32, (arg0)))
|
||||
void __spawnQueue_add_1(GenMethod_1, s32);
|
||||
#define SPAWNQUEUE_ADD_1(method, arg0) __spawnQueue_add_1((GenMethod_1) (method), reinterpret_cast(s32, (arg0)))
|
||||
|
||||
void func_802FAD64(enum item_e);
|
||||
void nodeprop_getPosition(NodeProp *, f32[3]);
|
||||
|
@@ -7,5 +7,6 @@ typedef void (* GenMethod_2)(s32, s32);
|
||||
typedef void (* GenMethod_3)(s32, s32, s32);
|
||||
typedef void (* GenMethod_4)(s32, s32, s32, s32);
|
||||
typedef void (* GenMethod_5)(s32, s32, s32, s32, s32);
|
||||
typedef void (* GenMethod_6)(void *);
|
||||
|
||||
#endif
|
||||
|
@@ -195,5 +195,5 @@ typedef struct{
|
||||
|
||||
BKVertexList *func_8033A148(BKModelBin *arg0);
|
||||
Vtx *vtxList_getVertices(BKVertexList *vtxList);
|
||||
void func_80333D48(BKVertexList *arg0, f32 position[3], f32 rotation[3], f32 scale, s32 arg4, BKVertexList *arg5);
|
||||
void func_80333D48(BKVertexList *arg0, f32 position[3], f32 rotation[3], f32 scale, f32 arg4[3], BKVertexList *arg5);
|
||||
#endif
|
||||
|
@@ -635,7 +635,7 @@ typedef struct {
|
||||
typedef struct struct_63_s{
|
||||
s16 unk0;
|
||||
// u8 pad2[2];
|
||||
void (*unk4)(s32, struct actor_marker_s *);
|
||||
void (*unk4)(vector(struct2s) **, struct actorMarker_s *);
|
||||
} Struct63s;
|
||||
|
||||
typedef struct struct_64_s{
|
||||
@@ -645,8 +645,8 @@ typedef struct struct_64_s{
|
||||
|
||||
typedef struct struct_65_s{
|
||||
f32 unk0[3];
|
||||
struct actor_marker_s *unkC;
|
||||
s32 (*unk10)(f32[3], f32, struct actor_marker_s *);
|
||||
struct actorMarker_s *unkC;
|
||||
s32 (*unk10)(f32[3], f32, struct actorMarker_s *);
|
||||
s16 unk14[3];
|
||||
s16 unk1A[3];
|
||||
u8 unk20;
|
||||
@@ -665,7 +665,7 @@ typedef void (*Struct68DrawMethod)(void *, struct struct_68_s *, f32[3], f32[3]
|
||||
typedef struct struct_68_s{
|
||||
u8 unk0;
|
||||
// u8 pad1[0x3];
|
||||
struct actor_marker_s *unk4;
|
||||
struct actorMarker_s *unk4;
|
||||
Struct68DrawMethod unk8;
|
||||
BKModelBin *unkC;
|
||||
u8 pad10[0x4];
|
||||
@@ -688,10 +688,10 @@ typedef struct {
|
||||
} Struct6Bs;
|
||||
|
||||
typedef struct{
|
||||
s32 (* unk0)(struct actor_marker_s *, f32[3], f32[3], f32[3], s32);
|
||||
s32 (* unk4)(struct actor_marker_s *, f32[3], f32[3], f32, f32[3], s32, u32);
|
||||
s32 (* unk8)(struct actor_marker_s *, f32[3], f32, f32[3], s32);
|
||||
s32 (* unkC)(struct actor_marker_s *, f32[3], f32, f32[3], s32);
|
||||
s32 (* unk0)(struct actorMarker_s *, f32[3], f32[3], f32[3], s32);
|
||||
s32 (* unk4)(struct actorMarker_s *, f32[3], f32[3], f32, f32[3], s32, u32);
|
||||
s32 (* unk8)(struct actorMarker_s *, f32[3], f32, f32[3], s32);
|
||||
s32 (* unkC)(struct actorMarker_s *, f32[3], f32, f32[3], s32);
|
||||
} Struct6Cs;
|
||||
|
||||
typedef struct struct_6D_s{
|
||||
@@ -830,7 +830,7 @@ typedef struct {
|
||||
f32 unk0;
|
||||
u8 unk4;
|
||||
u8 pad5[0x3];
|
||||
void (* unk8)(struct actor_marker_s *);
|
||||
void (* unk8)(struct actorMarker_s *);
|
||||
s32 unkC;
|
||||
}Struct7Fs;
|
||||
|
||||
@@ -856,18 +856,18 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
enum actor_e actor_id;
|
||||
struct actor_marker_s *marker;
|
||||
struct actorMarker_s *marker;
|
||||
f32 position[3];
|
||||
void (*unk14)(struct actor_s *, struct actor_marker_s *);
|
||||
struct actor_marker_s *unk18;
|
||||
void (*unk14)(struct actor_s *, struct actorMarker_s *);
|
||||
struct actorMarker_s *unk18;
|
||||
}Struct81s;
|
||||
|
||||
typedef struct {
|
||||
enum actor_e actor_id;
|
||||
struct actor_marker_s *marker;
|
||||
struct actorMarker_s *marker;
|
||||
f32 position[3];
|
||||
void (*unk14)(struct actor_s *, struct actor_marker_s *);
|
||||
struct actor_marker_s *unk18;
|
||||
void (*unk14)(struct actor_s *, struct actorMarker_s *);
|
||||
struct actorMarker_s *unk18;
|
||||
}Struct82s;
|
||||
|
||||
typedef struct {
|
||||
|
Reference in New Issue
Block a user