Merge branch 'main' of https://github.com/TheSylphIsIn/pokeplatinum

pret · Jan 22, 2025 · e0bc765 · e0bc765
2 parents ab7a07a + 8685ae4
commit e0bc765
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           style: 'file' # Use repository .clang-format file
           tidy-checks: '-*' # Disable clang-tidy checks
-          version: '18'
+          version: '19'
           files-changed-only: false # Github returns error code 406 if more than 300 files are changed in a PR
           ignore: '.github|lib|subprojects|tools'
           file-annotations: false

diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c
@@ -1700,7 +1700,7 @@ int ov17_02243174(int param0)
     v0 = param0 / 50;
 
     if (v0 >= (NELEMS(Unk_ov17_022536FC))) {
-        v0 = (NELEMS(Unk_ov17_022536FC))-1;
+        v0 = NELEMS(Unk_ov17_022536FC) - 1;
     }
 
     v1 = Unk_ov17_022536FC[v0];

diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c
@@ -1255,7 +1255,7 @@ void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 *param0, int param1, int param2)
         GF_ASSERT(param1 < (13 - 1));
     } else {
         v0 = Unk_ov94_022460AC;
-        GF_ASSERT(param1 < ((NELEMS(Unk_ov94_022460AC))-1));
+        GF_ASSERT(param1 < (NELEMS(Unk_ov94_022460AC) - 1));
     }
 
     param0->unk_03 = v0[param1].unk_04;

diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c
@@ -1496,7 +1496,7 @@ void ov104_0223B0C8(u8 param0, u8 param1, u8 param2, u8 param3, u16 param4, u16
         }
 
         if (v7 == (NELEMS(Unk_ov104_02240714))) {
-            v9 = Unk_ov104_0224032C[(NELEMS(Unk_ov104_0224032C))-1].unk_00;
+            v9 = Unk_ov104_0224032C[NELEMS(Unk_ov104_0224032C) - 1].unk_00;
         }
 
         for (v7 = 0; v7 < (NELEMS(Unk_ov104_0224032C)); v7++) {
@@ -1506,11 +1506,11 @@ void ov104_0223B0C8(u8 param0, u8 param1, u8 param2, u8 param3, u16 param4, u16
         }
 
         if (v7 == (NELEMS(Unk_ov104_0224032C))) {
-            v7 = ((NELEMS(Unk_ov104_0224032C))-1);
+            v7 = (NELEMS(Unk_ov104_0224032C) - 1);
         }
 
         if (param6 == 2) {
-            v0 = &Unk_ov104_0224032C[((NELEMS(Unk_ov104_0224032C))-1)];
+            v0 = &Unk_ov104_0224032C[(NELEMS(Unk_ov104_0224032C) - 1)];
         } else {
             v0 = &Unk_ov104_0224032C[v7];
         }

diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
@@ -812,9 +812,9 @@ static void ov105_022424CC(UnkStruct_ov105_02241FF4 *param0)
     ov105_0224628C(&param0->unk_50[5], Options_Frame(param0->unk_138));
 
     if (ov104_0223AED4(param0->unk_09) == 0) {
-        param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1A, ((NELEMS(Unk_ov105_02246340))-1), 2, param0->unk_334, Unk_ov105_02246340, Unk_ov105_022462D0);
+        param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1A, (NELEMS(Unk_ov105_02246340) - 1), 2, param0->unk_334, Unk_ov105_02246340, Unk_ov105_022462D0);
     } else {
-        param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1A, ((NELEMS(Unk_ov105_022462FC))-1), 2, param0->unk_334, Unk_ov105_022462FC, Unk_ov105_022462CC);
+        param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1A, (NELEMS(Unk_ov105_022462FC) - 1), 2, param0->unk_334, Unk_ov105_022462FC, Unk_ov105_022462CC);
     }
 
     ov105_02244F0C(param0, &param0->unk_50[0], 0, 0, 0);
@@ -1625,9 +1625,9 @@ static BOOL ov105_02243A3C(UnkStruct_ov105_02241FF4 *param0)
         Window_ScheduleCopyToVRAM(&param0->unk_50[7]);
 
         if (ov104_0223AED4(param0->unk_09) == 0) {
-            param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1B, ((NELEMS(Unk_ov105_02246350))-2), 2, 0, Unk_ov105_02246350, Unk_ov105_022462D4);
+            param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1B, (NELEMS(Unk_ov105_02246350) - 2), 2, 0, Unk_ov105_02246350, Unk_ov105_022462D4);
         } else {
-            param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1B, ((NELEMS(Unk_ov105_0224637C))-2), 2, 0, Unk_ov105_0224637C, Unk_ov105_022462E4);
+            param0->unk_30C = ov105_02245FB8(&param0->unk_144, param0->unk_1B, (NELEMS(Unk_ov105_0224637C) - 2), 2, 0, Unk_ov105_0224637C, Unk_ov105_022462E4);
         }
 
         v3 = ov105_022461A0(param0->unk_30C);

diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
@@ -3484,7 +3484,7 @@ static void ov115_0226414C(UnkStruct_ov115_02263DF8 *param0, u32 param1)
     param1 -= ((20 * 0xffff) / 360);
     v0 = (param1 * 90) / CalcAngleRotationIdx_Wraparound(90 - ((20 * 0xffff) / 360));
     v0 = (v0 * (FX32_CONST(180))) / 90;
-    v0 = (FX32_CONST(180))-v0;
+    v0 = FX32_CONST(180) - v0;
 
     Easy3DAnim_SetFrame(&param0->unk_198[1], v0);
 }
@@ -3799,7 +3799,7 @@ static void ov115_02264848(UnkStruct_ov115_022647A0 *param0)
         v0 = ov115_02262888(param0->unk_F8);
 
         if (v0 == 0) {
-            v2 = ((FX32_CONST(-50))-FX32_CONST(1));
+            v2 = (FX32_CONST(-50) - FX32_CONST(1));
         } else {
             v2 = (FX32_CONST(-300));
         }
@@ -4138,7 +4138,7 @@ static void ov115_02264E48(UnkStruct_ov115_02264FA0 *param0, UnkStruct_ov115_022
 
         Easy3DModel_LoadFrom(&param0->unk_168[v4], param2, v3, param5);
         Easy3DObject_Init(&param0->unk_00[v4], &param0->unk_168[v4]);
-        Easy3DObject_SetPosition(&param0->unk_00[v4], 0, ((FX32_CONST(-90))-FX32_CONST(8)), 0);
+        Easy3DObject_SetPosition(&param0->unk_00[v4], 0, (FX32_CONST(-90) - FX32_CONST(8)), 0);
         Easy3DObject_SetScale(&param0->unk_00[v4], (FX32_CONST(1.50f)), (FX32_CONST(1.50f)), (FX32_CONST(1.50f)));
 
         if (v4 == 1) {