Update CONTRIBUTING.md to reflect clang-format-18 as required

pret · Oct 17, 2024 · cd13953 · cd13953
1 parent 7b8dacb
commit cd13953
Show file tree

Hide file tree

Showing 76 changed files with 3,140 additions and 3,140 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ This repository includes an opinionated `clang-format` specification to ensure t
 
 ### Requirements
 
-- `clang-format@17` or newer
+- `clang-format@18` or newer
 
 ### Usage
 

diff --git a/include/constants/items.h b/include/constants/items.h
@@ -389,7 +389,7 @@
 #define FIRST_MULCH_IDX  ITEM_GROWTH_MULCH
 #define LAST_MULCH_IDX   ITEM_GOOEY_MULCH
 #define NUM_MULCHES      (LAST_MULCH_IDX - FIRST_MULCH_IDX + 1)
-#define MULCH_IDX(mulch) ((mulch)-FIRST_MULCH_IDX + 1)
+#define MULCH_IDX(mulch) ((mulch) - FIRST_MULCH_IDX + 1)
 #define MULCH_NONE       0
 
 // Unused
@@ -506,7 +506,7 @@
 #define FIRST_BERRY_IDX  ITEM_CHERI_BERRY
 #define LAST_BERRY_IDX   ITEM_ROWAP_BERRY
 #define NUM_BERRIES      (LAST_BERRY_IDX - FIRST_BERRY_IDX + 1)
-#define BERRY_IDX(berry) ((berry)-FIRST_BERRY_IDX + 1)
+#define BERRY_IDX(berry) ((berry) - FIRST_BERRY_IDX + 1)
 #define BERRY_NONE       0
 
 // Battle Held items

diff --git a/include/constants/std_script.h b/include/constants/std_script.h
@@ -79,11 +79,11 @@
 #define std_apricorn_tree  2800
 
 #define _std_npc_trainer     3000
-#define std_trainer(trainer) ((trainer)-FIRST_TRAINER_INDEX + _std_npc_trainer)
+#define std_trainer(trainer) ((trainer) - FIRST_TRAINER_INDEX + _std_npc_trainer)
 #define std_trainer_approach std_trainer(LAST_TRAINER_INDEX)
 
 #define _std_npc_trainer_2     5000
-#define std_trainer_2(trainer) ((trainer)-FIRST_TRAINER_INDEX + _std_npc_trainer_2)
+#define std_trainer_2(trainer) ((trainer) - FIRST_TRAINER_INDEX + _std_npc_trainer_2)
 
 #define _std_item_ball                     7000
 #define std_itemball_r29_potion            7000