Rename tex.c to texselect.c, surface.c to tex.c

src/include/game/surface.h

@@ -1,50 +0,0 @@
-#ifndef IN_GAME_SURFACE_H
-#define IN_GAME_SURFACE_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void surfaceReset(void);
-
-void surface0f173a08(void);
-bool surface0f173a44(u32 value);
-bool surface0f173a70(s32 index, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 arg10);
-bool surface0f173b8c(s32 index, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
-s32 texGetWidthAtLod(struct texloadthing *arg0, s32 lod);
-s32 texGetHeightAtLod(struct texloadthing *arg0, s32 lod);
-s32 tex0f173d60(struct texloadthing *arg0, s32 lod);
-s32 tex0f173e10(struct texloadthing *arg0, s32 lod);
-void tex0f173e50(struct texloadthing *arg0, s32 *arg1, s32 *arg2);
-s32 surface0f173f18(s32 arg0);
-u32 surface0f173f48(u32 arg0);
-u32 surface0f173f78(void);
-u32 surface0f1742e4(void);
-u32 surface0f1743a0(void);
-u32 surface0f1747a4(void);
-u32 surface0f174b54(void);
-u32 surface0f174f30(void);
-u32 surface0f1751e4(void);
-u32 surface0f175308(void);
-u32 surface0f175490(void);
-u32 surface0f1755dc(void);
-u32 surface0f17563c(void);
-s32 surface0f1756c0(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
-void surface0f175ef4(s32 arg0, s32 arg1, s32 arg2);
-
-extern const char var7f1b7ba0[];
-extern const char var7f1b7ba8[];
-extern const char var7f1b7bb0[];
-extern const char var7f1b7bb8[];
-extern const char var7f1b7bc0[];
-extern const char var7f1b7bc8[];
-extern const char var7f1b7bd8[];
-extern const char var7f1b7be0[];
-extern const char var7f1b7be8[];
-extern const char var7f1b7bec[];
-extern const char var7f1b7bf4[];
-extern const char var7f1b7c00[];
-extern const char var7f1b7c04[];
-extern const char var7f1b7c10[];
-extern const char var7f1b7c18[];
-
-#endif

src/include/game/tex.h

@@ -6,6 +6,12 @@
 
 void texInit(void);
 
+void surfaceReset(void);
+
+void texSetBitstring(u8 *arg0);
+s32 texReadBits(s32 arg0);
+void texReset(void);
+
 s32 texGetMask(s32 value);
 s32 tex0f0b33f8(s32 width, s32 height, s32 lod);
 s32 tex0f0b3468(s32 width, s32 height, s32 lod);
@@ -15,4 +21,29 @@ void texSetRenderMode(Gfx **gdlptr, s32 arg1, s32 numcycles, s32 arg3);
 void texLoadFromConfig(struct textureconfig *config);
 void texSelect(Gfx **gdl, struct textureconfig *tconfig, u32 arg2, s32 arg3, u32 arg4, bool arg5, struct texturething *arg6);
 
+void tex0f173a08(void);
+bool tex0f173a44(u32 value);
+bool tex0f173a70(s32 index, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 arg10);
+bool tex0f173b8c(s32 index, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
+s32 texGetWidthAtLod(struct texloadthing *arg0, s32 lod);
+s32 texGetHeightAtLod(struct texloadthing *arg0, s32 lod);
+s32 tex0f173d60(struct texloadthing *arg0, s32 lod);
+s32 tex0f173e10(struct texloadthing *arg0, s32 lod);
+void tex0f173e50(struct texloadthing *arg0, s32 *arg1, s32 *arg2);
+s32 tex0f173f18(s32 arg0);
+u32 tex0f173f48(u32 arg0);
+u32 tex0f173f78(void);
+u32 tex0f1742e4(void);
+u32 tex0f1743a0(void);
+u32 tex0f1747a4(void);
+u32 tex0f174b54(void);
+u32 tex0f174f30(void);
+u32 tex0f1751e4(void);
+u32 tex0f175308(void);
+u32 tex0f175490(void);
+u32 tex0f1755dc(void);
+u32 tex0f17563c(void);
+s32 tex0f1756c0(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
+void tex0f175ef4(s32 arg0, s32 arg1, s32 arg2);
+
 #endif

src/include/game/texdecompress.h

@@ -35,8 +35,5 @@ void texLoadFromDisplayList(Gfx *gdl, struct texturething *arg1, s32 arg2);
 void texLoad(u32 *texturenum, struct texturething *arg1, s32 arg2);
 void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct texturething *arg2, s32 arg3);
 void texLoadFromTextureNum(u32 arg0, struct texturething *arg1);
-void texSetBitstring(u8 *arg0);
-s32 texReadBits(s32 arg0);
-void texReset(void);
 
 #endif