Rename lib_18680.s to modelasm.s

src/include/lib/lib_18680.h

@@ -1,22 +0,0 @@
-#ifndef _IN_LIB_LIB_18680_H
-#define _IN_LIB_LIB_18680_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-bool func00018680(void);
-u32 func00019634(void);
-u32 func000198dc(void);
-u32 func00019be0(void);
-u32 func00019d1c(void);
-u32 func00019ddc(void);
-u32 func00019f2c(void);
-u32 func00019f98(void);
-u32 func0001a024(void);
-u32 func0001a0ac(void);
-u32 func0001a110(void);
-u32 func0001a1c0(void);
-u32 func0001a25c(void);
-u32 func0001a2dc(void);
-
-#endif

src/include/lib/model.h

@@ -4,52 +4,53 @@
 #include "data.h"
 #include "types.h"
 
+bool model00018680(void);
 void modelSetDistanceScale(f32 value);
 void modelSetVtxAllocatorFunc(struct gfxvtx *(*fn)(s32 numvertices));
-s32 func0001a524(struct modelnode *node, s32 arg1);
-Mtxf *func0001a5cc(struct model *model, struct modelnode *node, s32 arg2);
-Mtxf *func0001a60c(struct model *model);
-struct modelnode *func0001a634(struct model *model, s32 mtxindex);
-struct modelnode *func0001a740(struct modelnode *node);
-struct modelnode *func0001a784(struct modelnode *node);
-struct modelnode *func0001a7cc(struct modelnode *node);
-struct modelnode *func0001a85c(struct modelnode *node);
+s32 model0001a524(struct modelnode *node, s32 arg1);
+Mtxf *model0001a5cc(struct model *model, struct modelnode *node, s32 arg2);
+Mtxf *model0001a60c(struct model *model);
+struct modelnode *model0001a634(struct model *model, s32 mtxindex);
+struct modelnode *model0001a740(struct modelnode *node);
+struct modelnode *model0001a784(struct modelnode *node);
+struct modelnode *model0001a7cc(struct modelnode *node);
+struct modelnode *model0001a85c(struct modelnode *node);
 struct modelnode *modelGetPart(struct modelfiledata *arg0, s32 partnum);
 union modelrodata *modelGetPartRodata(struct modelfiledata *modelfiledata, s32 partnum);
-f32 func0001a9e8(struct model *model);
+f32 model0001a9e8(struct model *model);
 void *modelGetNodeRwData(struct model *model, struct modelnode *node);
 void modelNodeGetPosition(struct model *model, struct modelnode *node, struct coord *pos);
 void modelNodeSetPosition(struct model *model, struct modelnode *node, struct coord *pos);
 void modelGetRootPosition(struct model *model, struct coord *pos);
 void modelSetRootPosition(struct model *model, struct coord *pos);
 void modelNodeGetModelRelativePosition(struct model *model, struct modelnode *node, struct coord *pos);
-f32 func0001ae44(struct model *model);
-void func0001ae90(struct model *model, f32 angle);
+f32 model0001ae44(struct model *model);
+void model0001ae90(struct model *model, f32 angle);
 void modelSetScale(struct model *model, f32 scale);
 void modelSetAnimScale(struct model *model, f32 scale);
-f32 func0001af80(struct model *model);
-void func0001af98(struct coord *arg0, struct coord *arg1, f32 frac);
-f32 func0001afe8(f32 arg0, f32 angle, f32 frac);
-void func0001b07c(struct coord *arg0, struct coord *arg1, f32 mult);
-void func0001b0e8(struct model *model, struct modelnode *node);
-void func0001b3bc(struct model *model);
-void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
-u32 func0001b80c(void);
-u32 func0001bc14(void);
-void func0001bfa8(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
-void func0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
-void func0001c664(struct model *model, struct modelnode *node);
-void func0001c784(struct model *model, struct modelnode *node);
-void func0001c7d0(struct model *model, struct modelnode *node);
+f32 model0001af80(struct model *model);
+void model0001af98(struct coord *arg0, struct coord *arg1, f32 frac);
+f32 model0001afe8(f32 arg0, f32 angle, f32 frac);
+void model0001b07c(struct coord *arg0, struct coord *arg1, f32 mult);
+void model0001b0e8(struct model *model, struct modelnode *node);
+void model0001b3bc(struct model *model);
+void model0001b400(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
+u32 model0001b80c(void);
+u32 model0001bc14(void);
+void model0001bfa8(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
+void model0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
+void model0001c664(struct model *model, struct modelnode *node);
+void model0001c784(struct model *model, struct modelnode *node);
+void model0001c7d0(struct model *model, struct modelnode *node);
 void modelAttachHead(struct model *model, struct modelnode *node);
-void func0001c868(struct modelnode *node, bool visible);
+void model0001c868(struct modelnode *node, bool visible);
 void modelRenderNodeReorder(struct model *model, struct modelnode *node);
-void func0001c950(struct model *model, struct modelnode *node);
-void func0001cb0c(struct model *model, struct modelnode *node);
-void func0001cc20(struct model *model);
-void func0001cd18(struct objticksp476 *arg0, struct model *model);
-void func0001ce64(struct objticksp476 *arg0, struct model *model);
-void func0001cebc(struct objticksp476 *arg0, struct model *model);
+void model0001c950(struct model *model, struct modelnode *node);
+void model0001cb0c(struct model *model, struct modelnode *node);
+void model0001cc20(struct model *model);
+void model0001cd18(struct objticksp476 *arg0, struct model *model);
+void model0001ce64(struct objticksp476 *arg0, struct model *model);
+void model0001cebc(struct objticksp476 *arg0, struct model *model);
 s16 modelGetAnimNum(struct model *model);
 bool modelIsFlipped(struct model *model);
 f32 modelGetCurAnimFrame(struct model *model);
@@ -59,7 +60,7 @@ f32 modelGetAnimSpeed(struct model *model);
 f32 modelGetAbsAnimSpeed(struct model *model);
 s32 modelConstrainOrWrapAnimFrame(s32 frame, s16 animnum, f32 endframe);
 void modelCopyAnimForMerge(struct model *model, f32 merge);
-void func0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge);
+void model0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge);
 bool modelIsAnimMerging(struct model *model);
 void modelSetAnimationWithMerge(struct model *model, s16 animnum, u32 flip, f32 startframe, f32 speed, f32 timemerge, bool domerge);
 void modelSetAnimation(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge);
@@ -71,26 +72,26 @@ void modelSetAnimSpeed(struct model *model, f32 speed, f32 startframe);
 void modelSetAnimSpeedAuto(struct model *model, f32 arg1, f32 startframe);
 void modelSetAnimPlaySpeed(struct model *model, f32 speed, f32 frame);
 void modelSetAnim70(struct model *model, void *callback);
-void func0001e018(struct model *model, f32 startframe);
-void func0001e14c(struct model *model, f32 arg1, f32 arg2);
-void func0001e29c(bool value);
-bool func0001e2a8(void);
-void func0001e2b4(struct model *model, f32 frame, f32 arg2, f32 frame2, f32 arg4);
-void func0001ee18(struct model *model, s32 lvupdate240, bool arg2);
-void func0001f314(struct model *model, s32 lvupdate240, bool arg2);
-void func0001f7e0(struct modelrenderdata *renderdata);
-void func0001f890(struct modelrenderdata *renderdata, bool arg1);
-void func00020248(struct modelrenderdata *renderdata, bool arg1);
-void func00020bdc(struct modelrenderdata *renderdata);
+void model0001e018(struct model *model, f32 startframe);
+void model0001e14c(struct model *model, f32 arg1, f32 arg2);
+void model0001e29c(bool value);
+bool model0001e2a8(void);
+void model0001e2b4(struct model *model, f32 frame, f32 arg2, f32 frame2, f32 arg4);
+void model0001ee18(struct model *model, s32 lvupdate240, bool arg2);
+void model0001f314(struct model *model, s32 lvupdate240, bool arg2);
+void model0001f7e0(struct modelrenderdata *renderdata);
+void model0001f890(struct modelrenderdata *renderdata, bool arg1);
+void model00020248(struct modelrenderdata *renderdata, bool arg1);
+void model00020bdc(struct modelrenderdata *renderdata);
 void modelApplyCullMode(struct modelrenderdata *renderdata);
 void modelRenderNodeGundl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node);
 void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node);
 void modelRenderNodeType16(struct modelrenderdata *renderdata, struct modelnode *node);
-void func000216cc(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2);
+void model000216cc(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2);
 void modelRenderNodeGunfire(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node);
 void modelRender(struct modelrenderdata *renderdata, struct model *model);
-bool func000220fc(union modelrodata *rodata, Mtxf *mtx, struct coord *arg2, struct coord *arg3);
-s32 func000225d4(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode);
+bool model000220fc(union modelrodata *rodata, Mtxf *mtx, struct coord *arg2, struct coord *arg3);
+s32 model000225d4(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode);
 void modelPromoteNodeOffsetsToPointers(struct modelnode *node, u32 vma, u32 fileramaddr);
 void modelPromoteOffsetsToPointers(struct modelfiledata *filedata, u32 arg1, u32 arg2);
 s32 modelCalculateRwDataIndexes(struct modelnode *node);
@@ -98,7 +99,7 @@ void modelCalculateRwDataLen(struct modelfiledata *filedata);
 void modelInitRwData(struct model *model, struct modelnode *node);
 void modelInit(struct model *model, struct modelfiledata *filedata, union modelrwdata **rwdatas, bool resetanim);
 void animInit(struct anim *anim);
-u32 func00023108(void);
+u32 model00023108(void);
 void modelIterateDisplayLists(struct modelfiledata *filedata, struct modelnode **nodeptr, Gfx **gdlptr);
 void modelNodeReplaceGdl(u32 arg0, struct modelnode *node, Gfx *find, Gfx *replacement);