Use compound assignment operators

13 files changed, 21 insertions, 21 deletions

diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
index 8ed1b293..ce518e0a 100644
--- a/constants/deco_constants.asm
+++ b/constants/deco_constants.asm
@@ -70,7 +70,7 @@ __deco_value__ = 0
 deco: MACRO
 	const DECO_\1
 DECOFLAG_\1 EQU __deco_value__
-__deco_value__ = __deco_value__ + 1
+__deco_value__ += 1
 ENDM
 
 ; decorations:
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index d618b96f..75b21799 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -202,7 +202,7 @@ __tmhm_value__ = 1
 
 add_tmnum: MACRO
 \1_TMNUM EQU __tmhm_value__
-__tmhm_value__ = __tmhm_value__ + 1
+__tmhm_value__ += 1
 ENDM
 
 add_tm: MACRO
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index d5ae2fd2..1400e44b 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -12,7 +12,7 @@ map_const: MACRO
 ;\3: height: in blocks
 GROUP_\1 EQU const_value
 MAP_\1 EQU __map_value__
-__map_value__ = __map_value__ + 1
+__map_value__ += 1
 \1_WIDTH EQU \2
 \1_HEIGHT EQU \3
 ENDM
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index 063fe06b..902c7735 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -2,7 +2,7 @@ __trainer_class__ = 0
 
 trainerclass: MACRO
 \1 EQU __trainer_class__
-__trainer_class__ = __trainer_class__ + 1
+__trainer_class__ += 1
 	const_def 1
 ENDM
 
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 358bde06..2f330968 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -9,7 +9,7 @@ rept _NARG
 	if DEF(\1_TMNUM)
 n = (\1_TMNUM - 1) / 8
 i = (\1_TMNUM - 1) % 8
-_tm{d:n} = _tm{d:n} | (1 << i)
+_tm{d:n} |= 1 << i
 	else
 		fail "\1 is not a TM or HM move"
 	endc
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index de5b60c7..6552e041 100644
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -9,7 +9,7 @@ rept _NARG - 1
 	shift
 endr
 	db 0
-list_index = list_index + 1
+list_index += 1
 ENDM
 
 RoamMaps:
diff --git a/macros/asserts.asm b/macros/asserts.asm
index f1c5cfdc..e04ed0dc 100644
--- a/macros/asserts.asm
+++ b/macros/asserts.asm
@@ -29,7 +29,7 @@ ENDM
 li: MACRO
 	assert !STRIN(\1, "@"), STRCAT("String terminator \"@\" in list entry: ", \1)
 	db \1, "@"
-list_index = list_index + 1
+list_index += 1
 ENDM
 
 assert_list_length: MACRO
diff --git a/macros/code.asm b/macros/code.asm
index 89e7c6e9..6e76febb 100644
--- a/macros/code.asm
+++ b/macros/code.asm
@@ -38,7 +38,7 @@ maskbits: MACRO
 x = 1
 rept 8
 if x + 1 < (\1)
-x = x << 1 | 1
+x = (x << 1) | 1
 endc
 endr
 if _NARG == 2
diff --git a/macros/const.asm b/macros/const.asm
index 11d96d17..fc54a645 100644
--- a/macros/const.asm
+++ b/macros/const.asm
@@ -15,19 +15,19 @@ ENDM
 
 const: MACRO
 \1 EQU const_value
-const_value = const_value + const_inc
+const_value += const_inc
 ENDM
 
 shift_const: MACRO
 \1 EQU (1 << const_value)
-const_value = const_value + const_inc
+const_value += const_inc
 ENDM
 
 const_skip: MACRO
 if _NARG >= 1
-const_value = const_value + const_inc * (\1)
+const_value += const_inc * (\1)
 else
-const_value = const_value + const_inc
+const_value += const_inc
 endc
 ENDM
 
diff --git a/macros/data.asm b/macros/data.asm
index e9b818c8..2e998145 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -109,6 +109,6 @@ sine_table: MACRO
 x = 0
 rept \1
 	dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
-x = x + DIV(32768, \1) ; a circle has 65536 "degrees"
+x += DIV(32768, \1) ; a circle has 65536 "degrees"
 endr
 ENDM
diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm
index 61c18fa8..2c4c267b 100644
--- a/macros/scripts/gfx_anims.asm
+++ b/macros/scripts/gfx_anims.asm
@@ -5,7 +5,7 @@ frame: MACRO
 x = \2
 if _NARG > 2
 rept _NARG - 2
-x = x | (1 << (\3 + 1))
+x |= 1 << (\3 + 1)
 	shift
 endr
 endc
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index a394405d..0621277b 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -17,7 +17,7 @@ scene_script: MACRO
 ;\1: script pointer
 	dw \1
 	dw 0 ; filler
-{_NUM_SCENE_SCRIPTS} = {_NUM_SCENE_SCRIPTS} + 1
+{_NUM_SCENE_SCRIPTS} += 1
 ENDM
 
 def_callbacks: MACRO
@@ -30,7 +30,7 @@ callback: MACRO
 ;\1: type: a MAPCALLBACK_* constant
 ;\2: script pointer
 	dbw \1, \2
-{_NUM_CALLBACKS} = {_NUM_CALLBACKS} + 1
+{_NUM_CALLBACKS} += 1
 ENDM
 
 def_warp_events: MACRO
@@ -46,7 +46,7 @@ warp_event: MACRO
 ;\4: warp destination: starts at 1
 	db \2, \1, \4
 	map_id \3
-{_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1
+{_NUM_WARP_EVENTS} += 1
 ENDM
 
 def_coord_events: MACRO
@@ -64,7 +64,7 @@ coord_event: MACRO
 	db 0 ; filler
 	dw \4
 	dw 0 ; filler
-{_NUM_COORD_EVENTS} = {_NUM_COORD_EVENTS} + 1
+{_NUM_COORD_EVENTS} += 1
 ENDM
 
 def_bg_events: MACRO
@@ -80,7 +80,7 @@ bg_event: MACRO
 ;\4: script pointer
 	db \2, \1, \3
 	dw \4
-{_NUM_BG_EVENTS} = {_NUM_BG_EVENTS} + 1
+{_NUM_BG_EVENTS} += 1
 ENDM
 
 def_object_events: MACRO
@@ -114,7 +114,7 @@ object_event: MACRO
 	dw \<12>, \<13>
 ; the dummy PlayerObjectTemplate object_event has no def_object_events
 if DEF(_NUM_OBJECT_EVENTS)
-{_NUM_OBJECT_EVENTS} = {_NUM_OBJECT_EVENTS} + 1
+{_NUM_OBJECT_EVENTS} += 1
 endc
 ENDM
 
diff --git a/sram.asm b/sram.asm
index b0f291a6..4ec53892 100644
--- a/sram.asm
+++ b/sram.asm
@@ -144,7 +144,7 @@ sBackupPlayerData2:: ds wPlayerData2End - wPlayerData2
 box_n = 0
 boxes: MACRO
 rept \1
-box_n = box_n + 1
+box_n += 1
 sBox{d:box_n}:: box sBox{d:box_n}
 endr
 ENDM