Make reviewed fixes; standardize on " + "

9 files changed, 17 insertions, 17 deletions

diff --git a/audio/engine.asm b/audio/engine.asm
index 482b1d1db..0b6d14fa4 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -2422,7 +2422,7 @@ _PlayCry::
 	add hl, bc
 	ld a, [wCryLength]
 	ld [hli], a
-	ld a, [wCryLength+1]
+	ld a, [wCryLength + 1]
 	ld [hl], a
 .start
 	call StartChannel
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index 738048998..cf6e3ce8c 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -1155,7 +1155,7 @@ Text_BreedingIsNotPossible::
 UnknownText_0x1bd0d8::
 	text "The compatibility"
 	line "is @"
-	deciram wBreedingCompatibility , 1, 3
+	deciram wBreedingCompatibility, 1, 3
 	text "."
 	cont "Should they breed?"
 	done
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index edb8023c2..2d5e85cef 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -5989,7 +5989,7 @@ LoadEnemyMon:
 ; Used for Ho-Oh, Lugia and Snorlax encounters
 	ld a, [wBattleType]
 	cp BATTLETYPE_FORCEITEM
-	ld a, [wBaseItems]
+	ld a, [wBaseItem1]
 	jr z, .UpdateItem
 
 ; Failing that, it's all up to chance
@@ -6007,9 +6007,9 @@ LoadEnemyMon:
 ; From there, an 8% chance for Item2
 	call BattleRandom
 	cp 8 percent ; 8% of 25% = 2% Item2
-	ld a, [wBaseItems]
+	ld a, [wBaseItem1]
 	jr nc, .UpdateItem
-	ld a, [wBaseItems+1]
+	ld a, [wBaseItem2]
 
 .UpdateItem:
 	ld [wEnemyMonItem], a
diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm
index 488f55462..7a971e21f 100644
--- a/engine/battle/trainer_huds.asm
+++ b/engine/battle/trainer_huds.asm
@@ -157,21 +157,21 @@ DrawEnemyHUDBorder:
 .tiles_end
 
 PlaceHUDBorderTiles:
-	ld a, [wTrainerHUDTiles+0]
+	ld a, [wTrainerHUDTiles + 0]
 	ld [hl], a
 	ld bc, SCREEN_WIDTH
 	add hl, bc
-	ld a, [wTrainerHUDTiles+1]
+	ld a, [wTrainerHUDTiles + 1]
 	ld [hl], a
 	ld b, 8
 .loop
 	add hl, de
-	ld a, [wTrainerHUDTiles+3]
+	ld a, [wTrainerHUDTiles + 3]
 	ld [hl], a
 	dec b
 	jr nz, .loop
 	add hl, de
-	ld a, [wTrainerHUDTiles+2]
+	ld a, [wTrainerHUDTiles + 2]
 	ld [hl], a
 	ret
 
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index 97828ab58..76154a1aa 100644
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -377,7 +377,7 @@ ParseCredits:
 	push de
 	ld a, [wCreditsPos]
 	ld e, a
-	ld a, [wCreditsPos+1]
+	ld a, [wCreditsPos + 1]
 	ld d, a
 	ld hl, CreditsScript
 	add hl, de
@@ -386,7 +386,7 @@ ParseCredits:
 	ld a, e
 	ld [wCreditsPos], a
 	ld a, d
-	ld [wCreditsPos+1], a
+	ld [wCreditsPos + 1], a
 	ld a, [hl]
 	pop de
 	pop hl
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index e961e092b..063265e4d 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -983,7 +983,7 @@ PlayerEventScriptPointers:
 	dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT
 	dba HatchEggScript           ; PLAYEREVENT_HATCH
 	dba ChangeDirectionScript    ; PLAYEREVENT_JOYCHANGEFACING
-	dba Invalid_0x96c2d          ; 10
+	dba Invalid_0x96c2d          ; (NUM_PLAYER_EVENTS)
 
 Invalid_0x96c2d:
 	end
diff --git a/home/joypad.asm b/home/joypad.asm
index 87fc60d7e..392be760b 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -213,7 +213,7 @@ GetJoypad::
 	ld a, l
 	ld [wAutoInputAddress], a
 	ld a, h
-	ld [wAutoInputAddress+1], a
+	ld [wAutoInputAddress + 1], a
 	jr .finishauto
 
 .stopauto
@@ -235,7 +235,7 @@ StartAutoInput::
 	ld a, l
 	ld [wAutoInputAddress], a
 	ld a, h
-	ld [wAutoInputAddress+1], a
+	ld [wAutoInputAddress + 1], a
 ; Start reading the stream immediately.
 	xor a
 	ld [wAutoInputLength], a
@@ -254,7 +254,7 @@ StopAutoInput::
 	xor a
 	ld [wAutoInputBank], a
 	ld [wAutoInputAddress], a
-	ld [wAutoInputAddress+1], a
+	ld [wAutoInputAddress + 1], a
 	ld [wAutoInputLength], a
 ; Back to normal input.
 	ld [wInputType], a
diff --git a/home/predef.asm b/home/predef.asm
index e829bdc00..bfb5e4690 100644
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -39,7 +39,7 @@ Predef::
 	ld a, h
 	ld [wPredefTemp], a
 	ld a, l
-	ld [wPredefTemp+1], a
+	ld [wPredefTemp + 1], a
 
 	pop hl
 	ld a, h
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index a77a7a209..d9b9d7af7 100644
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -3367,7 +3367,7 @@ Function119987:
 	ret
 
 Function1199b4:
-	ld a, [w3_d081+1]
+	ld a, [w3_d081 + 1]
 	and a
 	jr nz, .asm_1199c7
 	ld a, [w3_d081]