fox_aq decomped, some type cleanup (#112)

* stuff

* stuff

* temps

* matched

* so complete

* merge and clean

* format

* graphics macros

* aq

* more stuff

* oh god the clam

* limbdraw

* headers?

* format, name changes

* enums

* merge and format

5 files changed, 47 insertions, 53 deletions

diff --git a/include/assets.h b/include/assets.h
index 63ea7ed1..96486184 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -187,10 +187,10 @@ extern Gfx D_3014BF0[];
 extern Gfx D_3015120[];
 extern Gfx D_30155E0[];
 extern Gfx D_3015740[];
-extern AnimationHeader D_3015AF4;
-extern AnimationHeader D_3015C28;
+extern Animation D_3015AF4;
+extern Animation D_3015C28;
 extern Gfx D_3015D80[];
-extern AnimationHeader D_30163C4;
+extern Animation D_30163C4;
 extern Limb* D_3016610[];
 extern Gfx D_3016660[];
 extern Gfx D_30160A0[];
@@ -206,13 +206,13 @@ extern Gfx D_3018800[];
 extern Gfx D_30194E0[];
 extern Gfx D_301B080[];
 extern Gfx D_301B6E0[];
-extern AnimationHeader D_301C3A8;
+extern Animation D_301C3A8;
 extern Limb* D_301C614[];
-extern AnimationHeader D_301CFEC;
+extern Animation D_301CFEC;
 extern Limb* D_301D258[];
-extern AnimationHeader D_301D888;
+extern Animation D_301D888;
 extern Limb* D_301DB94[];
-extern AnimationHeader D_301E19C;
+extern Animation D_301E19C;
 extern Limb* D_301E3E8[];
 extern Gfx D_301E570[];
 extern Gfx D_301F140[];
@@ -251,18 +251,18 @@ extern Triangle D_302F044[];
 extern Vec3f D_302F098[];
 
 // ast_918430, ast_922730
-extern AnimationHeader D_4000080;
+extern Animation D_4000080;
 extern Limb* D_400014C[];
-extern AnimationHeader D_40001A4;
+extern Animation D_40001A4;
 extern Limb* D_4000270[];
 extern Gfx D_40018A0[];
 extern Gfx D_4003BD0[];
-extern AnimationHeader D_40057AC;
+extern Animation D_40057AC;
 extern Limb* D_40058B8[];
 extern Gfx D_40068F0[];
 extern Gfx D_4007870[];
 extern Gfx D_4007AF0[];
-extern AnimationHeader D_400A30C;
+extern Animation D_400A30C;
 extern Limb* D_400A398[];
 extern Gfx D_400B390[];
 
@@ -353,7 +353,7 @@ extern Gfx D_6006140[];
 extern Gfx D_6006310[];
 extern u16* D_600631C[];
 extern u8 D_6006320[];
-extern AnimationHeader D_600636C;
+extern Animation D_600636C;
 extern f32 D_60064AC[];
 extern f32 D_60064C8[];
 extern f32 D_60064FC[];
@@ -394,8 +394,8 @@ extern Gfx D_6006A80[];
 extern Gfx D_6006BE0[];
 extern f32 D_6006BF0[];
 extern f32 D_6006C44[];
-extern AnimationHeader D_6006D64;
-extern Limb *D_6006E50[];
+extern Animation D_6006D64;
+extern Limb* D_6006E50[];
 extern EnvSettings D_6006E70;
 extern u8 D_6006E80[];
 extern u16 D_6006EA0[];
@@ -427,7 +427,7 @@ extern u16* D_6009B34[];
 extern u16 D_6009BB8[];
 extern f32 D_6009CC4[];
 extern f32 D_6009CFC[];
-extern AnimationHeader D_6009D30;
+extern Animation D_6009D30;
 extern Gfx D_6009E30[];
 extern Vtx D_6009ED0[];
 extern Gfx D_6009F90[];
@@ -439,7 +439,7 @@ extern u16 D_600AB68[];
 extern u8 D_600AD30[];
 extern Gfx D_600AF40[];
 extern Gfx D_600B0E0[];
-extern AnimationHeader D_600B1B4;
+extern Animation D_600B1B4;
 extern Gfx D_600B4B0[];
 extern Gfx D_600B8B0[];
 extern u8 D_600B9B0[];
@@ -447,9 +447,9 @@ extern Gfx D_600BAF0[];
 extern u16 D_600BEA0[];
 extern Gfx D_600BF80[];
 extern Gfx D_600C130[];
-extern AnimationHeader D_600C15C;
-extern AnimationHeader D_600C200;
-extern Limb *D_600C2AC[];
+extern Animation D_600C15C;
+extern Animation D_600C200;
+extern Limb* D_600C2AC[];
 extern u16 D_600C6A0[];
 extern Gfx D_600C740[];
 extern Vtx D_600C780[];
@@ -457,7 +457,7 @@ extern Gfx D_600CAA0[];
 extern u16 D_600CBD8[];
 extern u8 D_600CC10[];
 extern Gfx D_600D190[];
-extern AnimationHeader D_600D3DC;
+extern Animation D_600D3DC;
 extern u16 D_600D5C0[];
 extern Gfx D_600D730[];
 extern u16 D_600D990[];
@@ -470,10 +470,10 @@ extern Gfx D_600DDF0[];
 extern Gfx D_600E050[];
 extern Gfx D_600E0C0[];
 extern u8 D_600E210[];
-extern AnimationHeader D_600E2C4;
+extern Animation D_600E2C4;
 extern u8 D_600E360[];
-extern Limb *D_600E470[];
-extern AnimationHeader D_600E5EC;
+extern Limb* D_600E470[];
+extern Animation D_600E5EC;
 extern Gfx D_600E820[];
 extern u8 D_600E980[];
 extern EnvSettings D_600EA90;
@@ -497,7 +497,7 @@ extern CollisionPoly D_600F60C[];
 extern Gfx D_600F670[];
 extern Gfx D_600F6C0[];
 extern Gfx D_600F6C0[];
-extern AnimationHeader D_600F744;
+extern Animation D_600F744;
 extern Gfx D_600F8A0[];
 extern u8 D_600F940[];
 extern Gfx D_600F9B0[];
@@ -544,14 +544,14 @@ extern Gfx D_60120F0[];
 extern u8 D_6012310[];
 extern u8 D_60123F0[];
 extern Gfx D_6012C00_Gfx[];
-extern AnimationHeader D_6012C00_Anim;
+extern Animation D_6012C00_Anim;
 extern u8 D_60131A0[];
 extern Gfx D_60132B0[];
 extern u8 D_6013470[];
 extern Gfx D_6013480[];
 extern Gfx D_60137B0[];
-extern AnimationHeader D_6013820;
-extern AnimationHeader D_601388C;
+extern Animation D_6013820;
+extern Animation D_601388C;
 extern Limb* D_601390C[];
 extern Gfx D_6013960[];
 extern u8 D_60139E0[];
@@ -561,7 +561,7 @@ extern u8 D_6014360[];
 extern Gfx D_60143E0[];
 extern Gfx D_6014500[];
 extern u16 D_6014510[];
-extern AnimationHeader D_6014658;
+extern Animation D_6014658;
 extern Gfx D_6014670[];
 extern u16 D_60147C0[];
 extern u8 D_60147E0[];
@@ -595,7 +595,7 @@ extern u8 D_6017640[];
 extern u8 D_6018280[];
 extern Gfx D_6018450[];
 extern Gfx D_60188D0[];
-extern AnimationHeader D_6018994;
+extern Animation D_6018994;
 extern Limb* D_6018BA0[];
 extern Gfx D_6018BF0[];
 extern Gfx D_6018C00[]; // possible collision
@@ -656,7 +656,7 @@ extern Gfx D_601DE60[];
 extern Gfx D_601DE80[];
 extern Gfx D_601E150[];
 extern u16 D_601E1E8[];
-extern AnimationHeader D_601E8C4;
+extern Animation D_601E8C4;
 extern Limb* D_601E9D0[];
 extern Gfx D_601EAA0[];
 extern Gfx D_601F1D0[];
@@ -664,7 +664,7 @@ extern EnvSettings D_601F1F0;
 extern Gfx D_601F500[];
 extern Gfx D_601F5A0[];
 extern Gfx D_601F6B0[];
-extern AnimationHeader D_601F874;
+extern Animation D_601F874;
 extern Limb* D_601F920[];
 extern Gfx D_601FCB0[];
 extern u8 D_601FF40[];
@@ -678,7 +678,7 @@ extern Gfx D_6020E60[];
 extern u16 D_6020F60[];
 extern u16 D_6020FB0[];
 extern u16 D_6021ED0[];
-extern AnimationHeader D_602201C;
+extern Animation D_602201C;
 extern Limb* D_60220E8[];
 extern Gfx D_6022110[];
 extern u16 D_6022340[];
@@ -711,7 +711,7 @@ extern u16 D_6026C90[];
 extern u8 D_6026D70[];
 extern Gfx D_60270E0[];
 extern Gfx D_6027180[];
-extern AnimationHeader D_6027320;
+extern Animation D_6027320;
 extern u16 D_6027340[];
 extern Limb* D_602742C[];
 extern Gfx D_6027900[];
@@ -724,7 +724,7 @@ extern u16* D_60289FC[];
 extern u16 D_6028A60[];
 extern u16 D_6029170[];
 extern u8 D_6029220[];
-extern AnimationHeader D_6029528;
+extern Animation D_6029528;
 extern Limb* D_6029674[];
 extern Gfx D_6029890[];
 extern EnvSettings D_602A120;
@@ -979,7 +979,7 @@ extern Gfx D_7007350[];
 extern Gfx D_700AB70[];
 extern Gfx D_700BB10[];
 extern Gfx D_700BE00[];
-extern AnimationHeader D_700CAF4;
+extern Animation D_700CAF4;
 extern Limb* D_700CB60[];
 extern u16 D_700E9A0[];
 extern u8 D_70118E0[];
diff --git a/include/functions.h b/include/functions.h
index 9eb96984..62562fa7 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -429,10 +429,10 @@ void func_8007E45C(Effect*);
 void func_8007E5CC(Effect*);
 void func_8007E648(Effect*);
 void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5);
-void func_8007EE68(s32 objId, Vec3f* pos, Vec3f* rot, Vec3f* arg3, Vec3f* arg4, f32 scale2);
-void func_8007F04C(s32 objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 unkX, f32 unkY, f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2);
-void func_8007F11C(s32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4);
-void func_8007F20C(s32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4);
+void func_8007EE68(ObjectId objId, Vec3f* pos, Vec3f* rot, Vec3f* arg3, Vec3f* arg4, f32 scale2);
+void func_8007F04C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 unkX, f32 unkY, f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2);
+void func_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4);
+void func_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4);
 void func_8007F438(Effect*);
 void func_8007F6B0(Effect*);
 void func_8007F958(Effect*);
@@ -452,6 +452,7 @@ void func_80081A8C(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4);
 void func_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4);
 void func_80081C5C(Effect*);
 void func_80082F78(Effect*);
+void func_8008377C(f32, f32, f32, f32, f32);
 void func_800837EC(Effect*);
 void func_80083B8C(Effect*);
 void func_80083C70(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, s32 arg8);
diff --git a/include/gfx.h b/include/gfx.h
index 2aa8983e..75766d5c 100644
--- a/include/gfx.h
+++ b/include/gfx.h
@@ -52,7 +52,7 @@ typedef struct {
     /* 0x02 */ s16 limbCount;
     /* 0x04 */ u16* frameData;
     /* 0x08 */ JointKey* jointKey;
-} AnimationHeader; // size = 0xC
+} Animation; // size = 0xC
 
 typedef struct Limb {
     /* 0x000 */ Gfx* dList;
@@ -62,14 +62,6 @@ typedef struct Limb {
     /* 0x01C */ struct Limb* child;
 } Limb; // size = 0x20
 
-typedef Limb* SkelAnime;
-
-typedef struct {
-    /* 0x00 */ AnimationHeader* unk_0;
-    /* 0x04 */ AnimationHeader* unk_4;
-    /* 0x08 */ SkelAnime* skelanime;
-} Animation; // size = 0x0C
-
 void Lights_SetOneLight(Gfx** dList, s32 dirX, s32 dirY, s32 dirZ, s32 colR, s32 colG, s32 colB, s32 ambR, s32 ambG, s32 ambB);
 void Lights_SetTwoLights(Gfx** dList, s32 dir1x, s32 dir1y, s32 dir1z, s32 dir2x, s32 dir2y, s32 dir2z, s32 col1r, s32 col1g,
                    s32 col1b, s32 col2r, s32 col2g, s32 col2b, s32 ambR, s32 ambG, s32 ambB);  
@@ -79,13 +71,13 @@ s32 Graphics_Printf(const char *fmt, ...);
 void Texture_Scroll(void *texture, s32 width, s32 height, u8 mode);
 void Texture_Mottle(void *dst, void *src, u8 mode);    
 s32 Animation_GetLimbIndex(Limb* limb, Limb** skeleton);
-void Animation_DrawLimb(s32 mode, Limb * limb, Limb* *skeleton, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data);
+void Animation_DrawLimb(s32 mode, Limb* limb, Limb* *skeleton, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data);
 void Animation_DrawSkeleton(s32 mode, Limb** skeletonSegment, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data, Matrix* transform);
-s16 Animation_GetFrameData(AnimationHeader *animationSegmemt, s32 frame, Vec3f *frameTable);
-s16 Animation_GetFrameCount(AnimationHeader *animationSegment);
+s16 Animation_GetFrameData(Animation *animationSegmemt, s32 frame, Vec3f *frameTable);
+s16 Animation_GetFrameCount(Animation *animationSegment);
 void Animation_FindBoundingBox(Gfx* dList, s32 len, Vec3f *min, Vec3f *max, s32 *vtxFound, s32 *vtxCount, Vtx* *vtxList);
 void Animation_GetDListBoundingBox(Gfx *dList, s32 len, Vec3f *min, Vec3f *max);
-void Animation_GetSkeletonBoundingBox(Limb **skeletonSegment, AnimationHeader *animationSegment, s32 frame, Vec3f *min, Vec3f* max);
+void Animation_GetSkeletonBoundingBox(Limb** skeletonSegment, Animation *animationSegment, s32 frame, Vec3f *min, Vec3f* max);
 void TextureRect_4bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
 void TextureRect_4bCI_Flip(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
 void TextureRect_4bCI_MirX(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
diff --git a/include/i5.h b/include/i5.h
index 73f1eb32..1bece2d7 100644
--- a/include/i5.h
+++ b/include/i5.h
@@ -45,7 +45,7 @@ void func_i5_801A5E2C(Actor *);
 void func_i5_801A6134(Actor *);
 void func_i5_801A65E0(Object_80 *);
 void func_i5_801A7D98(Actor *);
-void func_i5_801ACFBC();
+void func_i5_801ACFBC(void);
 void func_i5_801AD080(void);
 void func_i5_801B5110(f32, f32, f32);
 void func_i5_801B58AC(Gfx **, f32);
diff --git a/include/macros.h b/include/macros.h
index edea8627..1df9889c 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -7,6 +7,7 @@
 #define RAND_FLOAT(max) (Rand_ZeroOne()*(max))
 #define RAND_INT(max) ((s32)(Rand_ZeroOne()*(max)))
 #define RAND_FLOAT_CENTERED(width) ((Rand_ZeroOne()-0.5f)*(width))
+#define RAND_RANGE(min, max) (((max) - (min)) * (Rand_ZeroOne() - (min) / ((min) - (max))))
 
 #define RAND_FLOAT_SEEDED(max) (Rand_ZeroOneSeeded()*(max))
 #define RAND_INT_SEEDED(max) ((s32)(Rand_ZeroOneSeeded()*(max)))