Warnings Fixes (#45)

* fox_option and fox_title warnings

* Couple small warnings

* Fix all remaining warnings

* Run make format

* make tools on its own

* Fix warnings introduced in last master version

* Better use of the drawGfx union
This commit is contained in:
Ryan Myers
2023-12-08 15:58:37 -06:00
committed by GitHub
parent 8dbe02a3b4
commit 392305e919
10 changed files with 34 additions and 24 deletions
+1
View File
@@ -174,6 +174,7 @@ void func_80042FD0(Object_408 *);
void func_80042FDC(Object*);
void func_80042FE8(Object*);
void func_800444BC(UnkStruct_D_80178280 *);
void func_800515C4(void);
// sf_496E0
void func_8004F8AC(Object*);
+1 -1
View File
@@ -185,7 +185,7 @@ void TextureRect_32bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32
void Graphics_FillRectangle(Gfx **gfxPtr, s32 ulx, s32 uly, s32 lrx, s32 lry, u8 r, u8 g, u8 b, u8 a);
void Math_Vec3fFromAngles(Vec3f *step, f32 xRot, f32 yRot, f32 stepsize);
f32 Math_RadToDeg(f32 rAngle);
s32* func_8009F7B4(Gfx **gfxPtr, u8 width, u8 height);
u16* func_8009F7B4(Gfx **gfxPtr, u8 width, u8 height);
void Graphics_DisplayHUDNumber(s32 xPos, s32 yPos, s32 number);
void Graphics_DisplaySmallNumber(s32 xPos, s32 yPos, s32 number);
void Graphics_DisplayLargeText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char *text);
+9 -2
View File
@@ -316,9 +316,16 @@ typedef struct {
} Object; // size = 0x1C
typedef struct {
/* 0x00 */ void (*draw)(); // argument must have object type. Can be dlist.
union {
/* 0x00 */ void* drawVoid; // Have the first option be a void type to silence warnings about the wrong type in the initialization of this object.
/* 0x00 */ void (*draw)(Object*); // argument must have object type.
/* 0x00 */ Gfx* drawGfx; //Can be dlist.
};
/* 0x00 */ u8 drawType;
/* 0x08 */ void (*action)(); // argument must have object type.
union {
/* 0x08 */ void* actionVoid; // Have the first option be a void type to silence warnings about the wrong type in the initialization of this object.
/* 0x08 */ void (*action)(Object*); // argument must have object type. But it can be one of many different types of objects.
};
/* 0x0C */ f32* unk_0C; // some sort of script?
/* 0x10 */ f32 unk_10; // z coordinate of something
/* 0x14 */ s16 unk_14; // can be -1, 0, 1
+1 -1
View File
@@ -629,7 +629,7 @@ extern u8 D_80281400[0xC00];
extern FrameBuffer gZBuffer; // z buffer
extern u8 D_802A7800;
extern u8 D_802D7800;
extern s32 D_80387800;
extern u16 D_80387800;
extern u16 D_8038F080[];
extern u16 D_8038F300[];
extern FrameBuffer gFrameBuffers[3]; // 8038F800