Skip to content

Commit 9fd5672

Browse files
MegaMechgithub-actions[bot]
authored andcommitted
clang format
1 parent 61d1e88 commit 9fd5672

File tree

4 files changed

+47
-41
lines changed

4 files changed

+47
-41
lines changed

include/common_structs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ typedef struct {
384384
s32 nCharacter; // Networked character choice
385385
s32 nStartingRank;
386386
u32 nHasAuthority;
387-
} Player; // size = 0xDD8
387+
} Player; // size = 0xDD8
388388

389389
typedef struct {
390390
// Something related to time trial ghost data?

include/defines.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,7 @@ enum KART_AI_BEHAVIOURS {
337337
BEHAVIOUR_MAX_SPEED
338338
};
339339

340-
enum DIRECTION {
341-
NORTH,
342-
EAST,
343-
SOUTH,
344-
WEST
345-
};
340+
enum DIRECTION { NORTH, EAST, SOUTH, WEST };
346341

347342
/**
348343
* @brief Balloon status

src/code_80091750.c

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8191,12 +8191,12 @@ void func_800A638C(struct_8018D9E0_entry* arg0) {
81918191
}
81928192
}
81938193

8194-
void func_800A66A8(struct_8018D9E0_entry *arg0, Unk_D_800E70A0 *arg1) {
8195-
Mtx *mtx;
8194+
void func_800A66A8(struct_8018D9E0_entry* arg0, Unk_D_800E70A0* arg1) {
8195+
Mtx* mtx;
81968196
f32 tmp;
81978197
static float x2, y2, z2;
81988198
static float x1, y1, z1;
8199-
8199+
82008200
mtx = &gGfxPool->mtxEffect[gMatrixEffectCount];
82018201
if (arg0->unk24 > 1.5) {
82028202
arg0->unk24 *= 0.95;
@@ -8212,7 +8212,15 @@ void func_800A66A8(struct_8018D9E0_entry *arg0, Unk_D_800E70A0 *arg1) {
82128212
y2 += y1;
82138213
z2 += z1;
82148214

8215-
if(x2); if(y2); if(z2);
8215+
if (x2) {
8216+
;
8217+
}
8218+
if (y2) {
8219+
;
8220+
}
8221+
if (z2) {
8222+
;
8223+
}
82168224

82178225
guScale(mtx, 1.2f, 1.2f, 1.2f);
82188226
guRotate(mtx + 1, y2, 0.0f, 1.0f, 0.0f);
@@ -8223,7 +8231,8 @@ void func_800A66A8(struct_8018D9E0_entry *arg0, Unk_D_800E70A0 *arg1) {
82238231
guMtxCatL(mtx, mtx + 1, mtx);
82248232
guTranslate(mtx + 1, arg1->column, arg1->row, 0.0f);
82258233
guMtxCatL(mtx, mtx + 1, mtx);
8226-
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxEffect[gMatrixEffectCount++]), (G_MTX_NOPUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
8234+
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxEffect[gMatrixEffectCount++]),
8235+
(G_MTX_NOPUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
82278236
gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
82288237
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
82298238
gDPNoOp(gDisplayListHead++);
Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
#pragma once
22

3-
namespace SF64 {
4-
enum class ResourceType {
5-
// SF64
6-
AnimData = 0x414E494D, // ANIM
7-
ColPoly = 0x43504C59, // CPLY
8-
EnvSettings = 0x454E5653, // ENVS
9-
Limb = 0x4C494D42, // LIMB
10-
Message = 0x4D534720, // MSG
11-
MessageTable = 0x4D534754, // MSGT
12-
Skeleton = 0x534B454C, // SKEL
13-
Script = 0x53435250, // SCRP
14-
ScriptCmd = 0x53434D44, // SCMD
15-
Hitbox = 0x48544258, // HTBX
16-
ObjectInit = 0x4F42494E, // OBIN
17-
Vec3f = 0x56433346, // VC3F
18-
Vec3s = 0x56433353, // VC3S
19-
GenericArray = 0x47415252, // GARR
20-
};
3+
namespace SF64;
4+
{
5+
enum class ResourceType {
6+
// SF64
7+
AnimData = 0x414E494D, // ANIM
8+
ColPoly = 0x43504C59, // CPLY
9+
EnvSettings = 0x454E5653, // ENVS
10+
Limb = 0x4C494D42, // LIMB
11+
Message = 0x4D534720, // MSG
12+
MessageTable = 0x4D534754, // MSGT
13+
Skeleton = 0x534B454C, // SKEL
14+
Script = 0x53435250, // SCRP
15+
ScriptCmd = 0x53434D44, // SCMD
16+
Hitbox = 0x48544258, // HTBX
17+
ObjectInit = 0x4F42494E, // OBIN
18+
Vec3f = 0x56433346, // VC3F
19+
Vec3s = 0x56433353, // VC3S
20+
GenericArray = 0x47415252, // GARR
21+
};
2122
} // namespace SF64
2223

23-
namespace MK64 {
24-
enum class ResourceType {
25-
MK_Array = 0x4F415252, // OARR
26-
CourseVertex = 0x43565458, // CVTX
27-
TrackSection = 0x5343544E, // SCTN
28-
Waypoints = 0x57505453, // WPTS
29-
Metadata = 0x4D444154, // MDAT
30-
SpawnData = 0x53444154, // SDAT
31-
UnkSpawnData = 0x55534454, // USDT
32-
KartAI = 0x44424856, // DBHV
33-
};
24+
namespace MK64;
25+
{
26+
enum class ResourceType {
27+
MK_Array = 0x4F415252, // OARR
28+
CourseVertex = 0x43565458, // CVTX
29+
TrackSection = 0x5343544E, // SCTN
30+
Waypoints = 0x57505453, // WPTS
31+
Metadata = 0x4D444154, // MDAT
32+
SpawnData = 0x53444154, // SDAT
33+
UnkSpawnData = 0x55534454, // USDT
34+
KartAI = 0x44424856, // DBHV
35+
};
3436
}

0 commit comments

Comments
 (0)