Skip to content

Commit

Permalink
Fix FALSE and TRUE macros in btlcmd.inc, update comments in scrcmd.inc
Browse files Browse the repository at this point in the history
  • Loading branch information
lhearachel committed Jul 16, 2024
1 parent c925fef commit 3caaa4d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions asm/macros/btlcmd.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1235,4 +1235,4 @@
.long 222
.endm

.endif ; ASM_BATTLE_SCRIPT_INC
.endif // ASM_BATTLE_SCRIPT_INC
14 changes: 7 additions & 7 deletions asm/macros/scrcmd.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3caaa4d

Please sign in to comment.