From 3caaa4d677dadc5c0cf44b3a3cc93e78f3c4f48e Mon Sep 17 00:00:00 2001
From: Rachel <lhearachel@proton.me>
Date: Mon, 15 Jul 2024 17:50:48 -0700
Subject: [PATCH] Fix FALSE and TRUE macros in btlcmd.inc, update comments in
 scrcmd.inc

---
 .clang-format-ignore  |  4 ++++
 asm/macros/btlcmd.inc |  6 +++---
 asm/macros/scrcmd.inc | 14 +++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.clang-format-ignore b/.clang-format-ignore
index 7ca5b76af5..068564d9b1 100644
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -21,3 +21,7 @@ src/overlay062/ov62_0223DFA8.c
 src/overlay062/ov62_0223CAEC.c
 src/overlay062/ov62_02231690.c
 src/overlay062/ov62_02237D24.c
+
+# Do not format any .s or .inc file
+*.s
+*.inc
diff --git a/asm/macros/btlcmd.inc b/asm/macros/btlcmd.inc
index f25c69d500..58a87eeca1 100644
--- a/asm/macros/btlcmd.inc
+++ b/asm/macros/btlcmd.inc
@@ -18,8 +18,8 @@
     .include "consts/moves.inc"
     .include "consts/pokemon.inc"
 
-    .equ FALSE 0
-    .equ TRUE 1
+    .equ FALSE, 0
+    .equ TRUE, 1
 
     .macro PlayEncounterAnimation
     .long 0
@@ -1235,4 +1235,4 @@
     .long 222
     .endm
 
-    .endif ; ASM_BATTLE_SCRIPT_INC
+    .endif // ASM_BATTLE_SCRIPT_INC
diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc
index 43c7eedb26..ade51c912d 100644
--- a/asm/macros/scrcmd.inc
+++ b/asm/macros/scrcmd.inc
@@ -102,9 +102,9 @@
 
     .macro CompareVar varID, valueOrVarID
     .if \valueOrVarID < 0x4000
-        .short 17 ; CompareVarToValue
+        .short 17 /* CompareVarToValue */
     .else
-        .short 18 ; CompareVarToVar
+        .short 18 /* CompareVarToVar */
     .endif
     .short \varID
     .short \valueOrVarID
@@ -223,9 +223,9 @@
 
     .macro SetVar destVarID, valueOrVarID
     .if \valueOrVarID < 0x4000
-        .short 40 ; SetVarFromValue
+        .short 40 /* SetVarFromValue */
     .else
-        .short 41 ; SetVarFromVar
+        .short 41 /* SetVarFromVar */
     .endif
     .short \destVarID
     .short \valueOrVarID
@@ -2695,8 +2695,8 @@
     .macro ScrCmd_1F8
     .short 504
     .endm
-    
-    ; this is a dummy function that doesn't do anything
+
+    /* this is a dummy function that doesn't do anything */
     .macro Dummy1 dummy
     .short 505
     .short \dummy
@@ -3735,7 +3735,7 @@
     .short \arg1
     .endm
 
-    ; this is unused, but the underlying function is called from LockAll
+    /* this is unused, but the underlying function is called from LockAll */
     .macro LockLastTalked
     .short 692
     .endm