summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2023-06-06 08:57:45 +1000
committerGitHub <noreply@github.com>2023-06-06 08:57:45 +1000
commitf92a61db27ed8ee213072df11169777c6794bc1b (patch)
tree3a0caf8d8f8456f74f78b7ceebfb4bb01c9098c2 /src/code
parent8cabbb1a2bd282e0a757385aa8d23d710aaafb13 (diff)
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
Diffstat (limited to 'src/code')
-rw-r--r--src/code/sys_cmpdma.c4
-rw-r--r--src/code/z_draw.c6
-rw-r--r--src/code/z_eventmgr.c2
-rw-r--r--src/code/z_fbdemo_circle.c2
-rw-r--r--src/code/z_parameter.c10
-rw-r--r--src/code/z_player_lib.c8
-rw-r--r--src/code/z_room.c8
7 files changed, 20 insertions, 20 deletions
diff --git a/src/code/sys_cmpdma.c b/src/code/sys_cmpdma.c
index b2a17d547..715892b49 100644
--- a/src/code/sys_cmpdma.c
+++ b/src/code/sys_cmpdma.c
@@ -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;
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index ace56a965..e6a814e2a 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -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
diff --git a/src/code/z_eventmgr.c b/src/code/z_eventmgr.c
index e3defb402..121957396 100644
--- a/src/code/z_eventmgr.c
+++ b/src/code/z_eventmgr.c
@@ -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 {
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index addfe6b67..185373e06 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/src/code/z_fbdemo_circle.c
@@ -2,7 +2,7 @@
typedef enum {
/* 0 */ TRANS_CIRCLE_DIR_IN,
- /* 1 */ TRANS_CIRCLE_DIR_OUT,
+ /* 1 */ TRANS_CIRCLE_DIR_OUT
} TransitionCircleDirection;
Gfx sTransCircleSetupDL[] = {
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index f8f28f4b8..e63c9d8e5 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -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];
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 44b1fd986..2c0a79d21 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -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
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 9bc6e12ee..78eb5f98e 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -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