Misc Cleanup 3 (#1268)

* begin more cleanup

* more enums

* typo

* ==

* fix go.h

* fix RaceDogInfo struct

* PR Review

* PR Suggestions

* missed one

* missed even more

* fix params

* fix number
This commit is contained in:
engineer124
2023-06-06 08:57:45 +10:00
committed by GitHub
parent 8cabbb1a2b
commit f92a61db27
254 changed files with 765 additions and 767 deletions
+2 -2
View File
@@ -2,7 +2,7 @@
#include "system_malloc.h"
typedef struct {
union {
/* 0x0 */ union {
u32 dmaWord[2];
u32 dataStart;
u32 dataSize;
@@ -11,7 +11,7 @@ typedef struct {
u32 end;
} offset;
};
} CmpDmaBuffer;
} CmpDmaBuffer; // size = 0x8
CmpDmaBuffer sDmaBuffer;
+3 -3
View File
@@ -115,9 +115,9 @@ void GetItem_DrawWallet(PlayState* play, s16 drawId);
void GetItem_DrawRemains(PlayState* play, s16 drawId);
typedef struct {
/* 0x00 */ void (*drawFunc)(PlayState*, s16);
/* 0x04 */ void* drawResources[8]; // Either display lists (Gfx*) or matrices (Mtx*)
} DrawItemTableEntry; // size = 0x24
/* 0x0 */ void (*drawFunc)(PlayState*, s16);
/* 0x4 */ void* drawResources[8]; // Either display lists (Gfx*) or matrices (Mtx*)
} DrawItemTableEntry; // size = 0x24
static DrawItemTableEntry sDrawItemTable[] = {
// GID_BOTTLE, OBJECT_GI_BOTTLE
+1 -1
View File
@@ -36,7 +36,7 @@ ActorCutscene sGlobalCutsceneList[] = {
typedef enum {
/* 0 */ CS_START_0,
/* 1 */ CS_START_1,
/* 2 */ CS_START_2,
/* 2 */ CS_START_2
} ActorCutsceneStartMethod;
typedef struct {
+1 -1
View File
@@ -2,7 +2,7 @@
typedef enum {
/* 0 */ TRANS_CIRCLE_DIR_IN,
/* 1 */ TRANS_CIRCLE_DIR_OUT,
/* 1 */ TRANS_CIRCLE_DIR_OUT
} TransitionCircleDirection;
Gfx sTransCircleSetupDL[] = {
+5 -5
View File
@@ -23,11 +23,11 @@ typedef enum {
#define DO_ACTION_TEX_SIZE ((DO_ACTION_TEX_WIDTH * DO_ACTION_TEX_HEIGHT) / 2) // (sizeof(gCheckDoActionENGTex))
typedef struct {
/* 0x00 */ u8 scene;
/* 0x01 */ u8 flags1;
/* 0x02 */ u8 flags2;
/* 0x03 */ u8 flags3;
} RestrictionFlags;
/* 0x0 */ u8 scene;
/* 0x1 */ u8 flags1;
/* 0x2 */ u8 flags2;
/* 0x3 */ u8 flags3;
} RestrictionFlags; // size = 0x4
Input sPostmanTimerInput[MAXCONTROLLERS];
+4 -4
View File
@@ -270,7 +270,7 @@ void func_80122C20(PlayState* play, struct_80122D44_arg1* arg1) {
typedef struct {
/* 0x0 */ Color_RGB8 color;
/* 0x4 */ Gfx* dList;
} struct_801BFDD0; // size = 0x08
} struct_801BFDD0; // size = 0x8
struct_801BFDD0 D_801BFDD0[] = {
{ { 180, 200, 255 }, gLinkGoronCurledDL },
@@ -1643,9 +1643,9 @@ TexturePtr sPlayerMouthTextures[PLAYER_MOUTH_MAX] = {
};
typedef struct PlayerFaceIndices {
/* 0x00 */ u8 eyeIndex;
/* 0x01 */ u8 mouthIndex;
} PlayerFaceIndices; // size = 0x02
/* 0x0 */ u8 eyeIndex;
/* 0x1 */ u8 mouthIndex;
} PlayerFaceIndices; // size = 0x2
PlayerFaceIndices sPlayerFaces[] = {
{ PLAYER_EYES_OPEN, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_0
+4 -4
View File
@@ -53,10 +53,10 @@ typedef enum {
} RoomCullableDebugMode;
typedef struct RoomShapeCullableEntryLinked {
/* 0x00 */ RoomShapeCullableEntry* entry;
/* 0x04 */ f32 boundsNearZ;
/* 0x08 */ struct RoomShapeCullableEntryLinked* prev;
/* 0x0C */ struct RoomShapeCullableEntryLinked* next;
/* 0x0 */ RoomShapeCullableEntry* entry;
/* 0x4 */ f32 boundsNearZ;
/* 0x8 */ struct RoomShapeCullableEntryLinked* prev;
/* 0xC */ struct RoomShapeCullableEntryLinked* next;
} RoomShapeCullableEntryLinked; // size = 0x10
#define ROOM_SHAPE_CULLABLE_MAX_ENTRIES 128