Rename animdata to model and other related symbols

src/include/game/chr/chr.h

@@ -11,7 +11,7 @@ u32 func0f01f264(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3, bo
 void func0f01f378(void);
 s32 chrsGetNumFree(void);
 s16 getLowestUnusedChrId(void);
-struct prop *func0f020b14(struct prop *prop, struct animdata *animdata, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
+struct prop *func0f020b14(struct prop *prop, struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
 void func0f020d44(struct prop *prop, bool arg1);
 u32 func0f021258(void);
 void func0f02133c(struct chrdata *chr);
@@ -75,7 +75,7 @@ f32 chrGetMaxDamage(struct chrdata *chr);
 void chrAddHealth(struct chrdata *chr, f32 health);
 f32 chrGetArmor(struct chrdata *chr);
 void chrInit(struct prop *prop, u8 *ailist);
-struct prop *func0f020cc8(struct animdata *animdata, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
+struct prop *func0f020cc8(struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
 void propClearReferences(s32 propnum);
 void func0f022084(struct chrdata *chr, s16 *room);
 void func0f0220ac(struct chrdata *chr);

src/include/game/data/data_0083d0.h

@@ -32,10 +32,10 @@ extern u32 var800624e8;
 extern u32 var800624ec;
 extern u32 var800624f0;
 extern u32 var800624f4;
-extern struct animdata *g_TitleModel;
-extern struct animdata *g_TitleModel2;
-extern struct animdata *var80062508;
-extern struct animdata *var8006250c;
+extern struct model *g_TitleModel;
+extern struct model *g_TitleModel2;
+extern struct model *var80062508;
+extern struct model *var8006250c;
 extern u32 var80062530;
 extern u32 var80062538;
 extern u32 var80062560;

src/include/game/game_02cde0.h

@@ -7,7 +7,7 @@ u32 bodyGetRace(s32 bodynum);
 bool bodyLoad(u32 bodynum);
 u32 func0f02ce8c(void);
 u32 func0f02d338(void);
-struct animdata *func0f02d36c(u32 bodynum, u32 arg1, u32 arg2);
+struct model *func0f02d36c(u32 bodynum, u32 arg1, u32 arg2);
 u32 func0f02d3f8(void);
 u32 bodyGetHead(u32 bodynum);
 u32 func0f02d4fc(void);

src/include/game/game_0b28d0.h

@@ -6,9 +6,9 @@
 u32 func0f0b28d0(void);
 void func0f0b2904(void);
 u32 func0f0b2b64(void);
-struct animdata *func0f0b30ac(void *modelfiledata);
-void modelFree(struct animdata *animdata);
-struct animdata *func0f0b3280(void *modelfiledata);
+struct model *func0f0b30ac(void *modelfiledata);
+void modelFree(struct model *model);
+struct model *func0f0b3280(void *modelfiledata);
 u32 func0f0b32a0(void);
 struct anim *func0f0b32e4(void);
 u32 func0f0b3338(void);

src/include/game/propobj.h

@@ -49,7 +49,7 @@ u32 func0f0679ac(void);
 u32 func0f067bc4(void);
 u32 func0f067d88(void);
 u32 func0f067dc4(void);
-void func0f068018(struct animdata *animdata, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4);
+void func0f068018(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4);
 u32 func0f06803c(void);
 struct defaultobj *objFindByPadNum(s32 padnum);
 u32 func0f068218(void);

src/include/lib/lib_1a500.h

@@ -14,20 +14,20 @@ u32 func0001a740(void);
 u32 func0001a784(void);
 u32 func0001a7cc(void);
 u32 func0001a85c(void);
-void *func0001a91c(struct animdata08 *arg0, s32 arg1);
+void *func0001a91c(struct model08 *arg0, s32 arg1);
 struct modelthing *func0001a9bc(void *modelfiledata, s32 arg1);
 u32 func0001a9e8(void);
-struct animdata10 *func0001aa1c(struct animdata *animdata, void *arg1);
+struct model10 *func0001aa1c(struct model *model, void *arg1);
 u32 func0001ab0c(void);
 u32 func0001abc4(void);
-void func0001ad0c(struct animdata *animdata, struct coord *coord);
-void func0001ad34(struct animdata *animdata, struct coord *coord);
+void func0001ad0c(struct model *model, struct coord *coord);
+void func0001ad34(struct model *model, struct coord *coord);
 u32 func0001ad5c(void);
-f32 func0001ae44(struct animdata *animdata);
-void func0001ae90(struct animdata *animdata, f32 arg1);
-void func0001af58(struct animdata *animdata, f32 arg1);
-void func0001af64(struct animdata *animdata, f32 arg1);
-f32 func0001af80(struct animdata *animdata);
+f32 func0001ae44(struct model *model);
+void func0001ae90(struct model *model, f32 arg1);
+void func0001af58(struct model *model, f32 arg1);
+void func0001af64(struct model *model, f32 arg1);
+f32 func0001af80(struct model *model);
 u32 func0001af98(void);
 f32 func0001afe8(f32 arg0, f32 distance, f32 arg2);
 u32 func0001b07c(void);
@@ -50,27 +50,27 @@ u32 func0001cc20(void);
 u32 func0001cd18(void);
 u32 func0001ce64(void);
 u32 func0001cebc(void);
-u32 animGetId(struct animdata *animdata);
-bool animIsFlipped(struct animdata *animdata);
-f32 animGetFrame(struct animdata *animdata);
-f32 func0001d1a0(struct animdata *animdata);
-s32 func0001d218(struct animdata *animdata);
-f32 func0001d260(struct animdata *animdata);
-f32 func0001d288(struct animdata *animdata);
+u32 modelGetAnimNum(struct model *model);
+bool modelIsFlipped(struct model *model);
+f32 modelGetCurAnimFrame(struct model *model);
+f32 func0001d1a0(struct model *model);
+s32 func0001d218(struct model *model);
+f32 func0001d260(struct model *model);
+f32 func0001d288(struct model *model);
 u32 func0001d320(void);
 u32 func0001d4fc(void);
 u32 func0001d62c(void);
-u32 func0001db94(struct animdata *animdata);
-void func0001dbfc(struct animdata *animdata, s32 arg1, u32 arg2, f32 arg3, f32 arg4, f32 arg5);
-void func0001dccc(struct animdata *animdata, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
+u32 func0001db94(struct model *model);
+void func0001dbfc(struct model *model, s32 arg1, u32 arg2, f32 arg3, f32 arg4, f32 arg5);
+void func0001dccc(struct model *model, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
 u32 func0001dd90(void);
-void func0001ddec(struct animdata *animdata, f32 arg1, f32 arg2);
-void func0001de1c(struct animdata *animdata, f32 arg1);
+void func0001ddec(struct model *model, f32 arg1, f32 arg2);
+void func0001de1c(struct model *model, f32 arg1);
 u32 func0001de98(void);
-void func0001deb0(struct animdata *animdata, f32 speed, f32 startframe);
-void func0001df04(struct animdata *animdata, f32 arg1, f32 arg2);
-void func0001dfac(struct animdata *animdata, f32 arg1, f32 arg2);
-void func0001e000(struct animdata *animdata, void *callback);
+void func0001deb0(struct model *model, f32 speed, f32 startframe);
+void func0001df04(struct model *model, f32 arg1, f32 arg2);
+void func0001dfac(struct model *model, f32 arg1, f32 arg2);
+void func0001e000(struct model *model, void *callback);
 u32 func0001e018(void);
 u32 func0001e14c(void);
 u32 func0001e29c(void);

src/include/lib/lib_233c0.h

@@ -6,7 +6,7 @@
 u32 func000233c0(void);
 u32 func00023640(void);
 void func0002373c(void);
-s32 animGetNumFrames(s16 anim_id);
+s32 modelGetNumAnimFrames(s16 anim_id);
 u32 func00023794(void);
 u32 func000237dc(void);
 u32 func000237e8(void);

src/include/types.h

@@ -125,26 +125,26 @@ struct anim {
 	/*0x88*/ u32 animscale;
 };
 
-struct animdata08_00 {
+struct model08_00 {
 	u16 unk00;
 };
 
-struct animdata08 {
-	struct animdata08_00 *unk00;
+struct model08 {
+	struct model08_00 *unk00;
 };
 
-struct animdata10 {
+struct model10 {
 	u32 unk00;
 	f32 ground;
 };
 
-struct animdata {
+struct model {
 	/*0x00*/ u8 unk00;
 	/*0x01*/ u8 unk01;
 	/*0x04*/ struct chrdata *chr;
-	/*0x08*/ struct animdata08 *unk08;
+	/*0x08*/ struct model08 *unk08;
 	/*0x0c*/ u32 unk0c;
-	/*0x10*/ struct animdata10 *unk10;
+	/*0x10*/ struct model10 *unk10;
 	/*0x14*/ f32 unk14;
 	/*0x18*/ u32 unk18;
 	/*0x1c*/ u32 unk1c;
@@ -584,7 +584,7 @@ struct chrdata {
 	/*0x014*/ u32 hidden;
 	/*0x018*/ u32 chrflags;
 	/*0x01c*/ struct prop *prop;
-	/*0x020*/ struct animdata *animdata;
+	/*0x020*/ struct model *model;
 	/*0x024*/ f32 chrwidth;
 	/*0x028*/ f32 chrheight;
 
@@ -864,7 +864,7 @@ struct defaultobj {
 	/*0x0c*/ u32 flags2;
 	/*0x10*/ u32 flags3;
 	/*0x14*/ struct prop *prop;
-	/*0x18*/ struct animdata *animdata;
+	/*0x18*/ struct model *model;
 	/*0x1c*/ f32 realrot[9];
 	/*0x40*/ u32 hidden;
 	/*0x44*/ struct geo *geo;
@@ -1911,7 +1911,7 @@ struct player {
 	/*0x0428*/ struct coord standlook[2];
 	/*0x0440*/ struct coord standup[2];
 	/*0x0458*/ s32 standcnt;
-	/*0x045c*/ struct animdata animdata;
+	/*0x045c*/ struct model model;
 	/*0x0480*/ struct eyespy *eyespy;
 	/*0x0484*/ u32 unk0484;
 	/*0x0488*/ u32 unk0488;