summaryrefslogtreecommitdiff
path: root/src/constants
diff options
context:
space:
mode:
Diffstat (limited to 'src/constants')
-rw-r--r--src/constants/card_constants.asm2
-rw-r--r--src/constants/card_data_constants.asm2
-rw-r--r--src/constants/charmaps.asm2
-rw-r--r--src/constants/deck_constants.asm6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/constants/card_constants.asm b/src/constants/card_constants.asm
index df6da6b..a079f72 100644
--- a/src/constants/card_constants.asm
+++ b/src/constants/card_constants.asm
@@ -227,4 +227,4 @@
const POKEMON_FLUTE ; $e2
const GAMBLER ; $e3
const RECYCLE ; $e4
-NUM_CARDS EQU const_value + -1
+NUM_CARDS EQU const_value - 1
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index 0731218..cfb855b 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -116,7 +116,7 @@ TYPE_ENERGY EQU const_value
const TYPE_ENERGY_UNUSED ; $0f
const TYPE_TRAINER ; $10
const TYPE_TRAINER_UNUSED ; $11
-NUM_CARD_TYPES EQU const_value + -1
+NUM_CARD_TYPES EQU const_value - 1
TYPE_PKMN EQU %111
TYPE_ENERGY_F EQU 3
diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm
index 4803d29..44b8e0b 100644
--- a/src/constants/charmaps.asm
+++ b/src/constants/charmaps.asm
@@ -317,7 +317,7 @@ FW_SPACE EQU $70
txsymbol: MACRO
const SYM_\1
- charmap "\1>", const_value + -1
+ charmap "\1>", const_value - 1
ENDM
; TX_SYMBOL
diff --git a/src/constants/deck_constants.asm b/src/constants/deck_constants.asm
index 8c8e8c9..02c8ac9 100644
--- a/src/constants/deck_constants.asm
+++ b/src/constants/deck_constants.asm
@@ -1,6 +1,6 @@
deck_const: MACRO
if const_value >= 2
-\1_ID EQU const_value + -2
+\1_ID EQU const_value - 2
endc
const \1
ENDM
@@ -65,6 +65,6 @@ ENDM
deck_const FLAMETHROWER_DECK ; $34
deck_const RESHUFFLE_DECK ; $35
deck_const IMAKUNI_DECK ; $36
-DECKS_END EQU const_value + -1
-DECK_IDS_END EQU DECKS_END -2
+DECKS_END EQU const_value - 1
+DECK_IDS_END EQU DECKS_END - 2