More style cleaning up

19 files changed, 490 insertions, 465 deletions

diff --git a/src/constants/gfx_constants.asm b/src/constants/gfx_constants.asm
index 1cf3770..4cc72f5 100644
--- a/src/constants/gfx_constants.asm
+++ b/src/constants/gfx_constants.asm
@@ -33,3 +33,4 @@ SPRITE_ANIM_BUFFER_CAPACITY EQU 16 ; sprites
 	const SPRITE_ANIM_PROPERTY_14
 	const SPRITE_ANIM_MOVEMENT_COUNTER
 	const SPRITE_ANIM_PROPERTY_16
+SPRITE_ANIM_LENGTH EQU const_value
\ No newline at end of file
diff --git a/src/constants/text_constants.asm b/src/constants/text_constants.asm
index 674037e..062f5e4 100644
--- a/src/constants/text_constants.asm
+++ b/src/constants/text_constants.asm
@@ -6,15 +6,15 @@ TX_RAM1 EQU $09
 TX_RAM2 EQU $0B
 TX_RAM3 EQU $0C
 
-text EQUS "db TX_START,"
-line EQUS "db TX_LINE,"
+text EQUS "db TX_START, "
+line EQUS "db TX_LINE, "
 done EQUS "db TX_END"
 
-TX_FIRE      EQUS "$05,$01"
-TX_GRASS     EQUS "$05,$02"
-TX_LIGHTNING EQUS "$05,$03"
-TX_WATER     EQUS "$05,$04"
-TX_FIGHTING  EQUS "$05,$05"
-TX_PSYCHIC   EQUS "$05,$06"
-TX_COLORLESS EQUS "$05,$07"
-TX_LVL       EQUS "$05,$11"
+TX_FIRE      EQUS "$05, $01"
+TX_GRASS     EQUS "$05, $02"
+TX_LIGHTNING EQUS "$05, $03"
+TX_WATER     EQUS "$05, $04"
+TX_FIGHTING  EQUS "$05, $05"
+TX_PSYCHIC   EQUS "$05, $06"
+TX_COLORLESS EQUS "$05, $07"
+TX_LVL       EQUS "$05, $11"
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 985418b..5be8768 100644
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -286,7 +286,7 @@ HandleTurn: ; 4225 (1:4225)
 	call GetTurnDuelistVariable
 	ld [wcc0d], a
 	ld a, [wcc06]
-	cp a, $02
+	cp $02
 	jr c, .asm_4237
 	call $70f6
 
@@ -322,9 +322,9 @@ Func_4268:
 Func_426d:
 	call $4f9d
 	ld a, [wcc0d]
-	cp a, DUELIST_TYPE_PLAYER
+	cp DUELIST_TYPE_PLAYER
 	jr z, PrintDuelMenu
-	cp a, DUELIST_TYPE_LINK_OPP
+	cp DUELIST_TYPE_LINK_OPP
 	jp z, $6911
 	; DUELIST_TYPE_AI_OPP
 	xor a
@@ -352,7 +352,7 @@ PrintDuelMenu:
 Func_42ac:
 	call DoFrame
 	ldh a, [hButtonsHeld]
-	and a, $02
+	and $02
 	jr z, .asm_42cc
 	ldh a, [hButtonsPressed]
 	bit D_UP_F, a
@@ -368,7 +368,7 @@ Func_42ac:
 
 .asm_42cc
 	ldh a, [hButtonsPressed]
-	and a, START
+	and START
 	jp nz, $4370
 	ldh a, [hButtonsPressed]
 	bit SELECT_F, a
@@ -450,8 +450,8 @@ DuelMenu_Done: ; 439a (1:439a)
 DuelMenu_Retreat: ; 43ab (1:43ab)
 	ld a, DUELVARS_ARENA_CARD_STATUS
 	call GetTurnDuelistVariable
-	and a,PASSIVE_STATUS_MASK
-	cp a, $01
+	and PASSIVE_STATUS_MASK
+	cp $01
 	ldh [$ffa0], a
 	jr nz, Func_43f1
 	ld a, [wcc0c]
@@ -700,10 +700,10 @@ Func_478b: ; 478b (1:478b)
 .asm_47d4
 	call DoFrame
 	ldh a, [hButtonsPressed2]
-	and a, D_RIGHT | D_LEFT
+	and D_RIGHT | D_LEFT
 	jr nz, .asm_47ce
 	ldh a, [hButtonsPressed]
-	and a, A_BUTTON | B_BUTTON
+	and A_BUTTON | B_BUTTON
 	jr z, .asm_47d4
 	ret
 
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index a97a835..b1fe932 100644
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -1627,7 +1627,7 @@ IncreaseOWScriptPointer: ; cc7a (3:4c7a)
 	add c
 	ld [wOWScriptPointer], a
 	ld a, [wOWScriptPointer+1]
-	adc a, 00
+	adc 0
 	ld [wOWScriptPointer+1], a
 	ret
 
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index 09c7dbb..967a0ee 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -226,7 +226,7 @@ DetermineBoosterCardType: ; 1e2fa (7:62fa)
 	inc hl
 	inc c
 	ld a, c
-	cp a, NUM_BOOSTER_CARD_TYPES
+	cp NUM_BOOSTER_CARD_TYPES
 	jr c, .loop_through_card_types
 	ld a, BOOSTER_CARD_TYPE_ENERGY
 .found_card_type
@@ -279,7 +279,7 @@ UpdateBoosterCardTypesChanceByte: ; 1e350 (7:6350)
 	ld b, $00
 	ld hl, wBoosterDataTypeChances
 	add hl, bc
-	ld a,[wBoosterAveragedTypeChances]
+	ld a, [wBoosterAveragedTypeChances]
 	ld c, a
 	ld a, [hl]
 	sub c
@@ -322,7 +322,7 @@ AddBoosterEnergyToDrawnEnergies: ; 1e380 (7:6380)
 GenerateEndingEnergy: ; 1e387 (7:6387)
 	ld a, COLORLESS - FIRE
 	call Random
-	add a, $01
+	add $01
 	jr AddBoosterEnergyToDrawnEnergies
 
 ; generates a booster with 10 random energies
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 4d9c632..beabbfc 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -6127,10 +6127,10 @@ GetCardPointer: ; 2f7c (0:2f7c)
 	ld bc, CardPointers
 	add hl, bc
 	ld a, h
-	cp a, (CardPointers + 2 + (2 * NUM_CARDS)) / $100
+	cp HIGH(CardPointers + 2 + (2 * NUM_CARDS))
 	jr nz, .nz
 	ld a, l
-	cp a, (CardPointers + 2 + (2 * NUM_CARDS)) % $100
+	cp LOW(CardPointers + 2 + (2 * NUM_CARDS))
 .nz
 	ccf
 	jr c, .out_of_bounds
@@ -6138,7 +6138,7 @@ GetCardPointer: ; 2f7c (0:2f7c)
 	call BankpushHome2
 	ld a, [hli]
 	ld h, [hl]
-	ld l,a
+	ld l, a
 	call BankpopHome
 	or a
 .out_of_bounds
@@ -6244,7 +6244,7 @@ CheckMatchingCommand: ; 2ffe (0:2ffe)
 	call BankswitchHome
 ; store the bank number of command functions ($b) in wce22
 	ld a, $b
-	ld [wce22],a
+	ld [wce22], a
 .check_command_loop
 	ld a, [hli]
 	or a
@@ -8042,7 +8042,8 @@ Func_3db7: ; 3db7 (0:3db7)
 	pop bc
 	ret
 
-; read property (byte) c from a sprite in wSpriteAnimBuffer identified by wWhichSprite
+; return hl pointing to the property (byte) c of a sprite in wSpriteAnimBuffer.
+; the sprite is identified by its index in wWhichSprite.
 GetSpriteAnimBufferProperty: ; 3dbf (0:3dbf)
 	ld a, [wWhichSprite]
 	cp SPRITE_ANIM_BUFFER_CAPACITY
@@ -8051,13 +8052,13 @@ GetSpriteAnimBufferProperty: ; 3dbf (0:3dbf)
 	ld a, SPRITE_ANIM_BUFFER_CAPACITY - 1 ; default to last sprite
 .got_sprite
 	push bc
-	swap a
+	swap a ; a *= SPRITE_ANIM_LENGTH
 	push af
 	and $f
 	ld b, a
 	pop af
 	and $f0
-	or c
+	or c ; add the property offset
 	ld c, a
 	ld hl, wSpriteAnimBuffer
 	add hl, bc
diff --git a/src/gfx.asm b/src/gfx.asm
index 71c6934..85d954f 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -1,6 +1,7 @@
 INCLUDE "macros.asm"
 
 SECTION "Gfx 1", ROMX
+
 Fonts:: ; 74000 (1d:4000)
 INCBIN "gfx/fonts.t3.1bpp"
 
@@ -8,10 +9,11 @@ VWF:: ; 76668 (1d:6668)
 INCBIN "gfx/vwf.1bpp"
 
 DuelGraphics:: ; 76968 (1d:6968)
-INCBIN "gfx/duel/duel1.t5.2bpp",$0,$1698
+INCBIN "gfx/duel/duel1.t5.2bpp", $0, $1698
 
 SECTION "Gfx 2", ROMX
-INCBIN "gfx/duel/duel1.t5.2bpp",$1698,$318
+
+INCBIN "gfx/duel/duel1.t5.2bpp", $1698, $318
 INCBIN "gfx/duel/duel2.2bpp"
 
 rept $2b68
@@ -22,6 +24,7 @@ SECTION "Empty Bank 1F", ROMX
 	emptybank
 
 SECTION "Gfx 3", ROMX
+
 	INCROM $84000, $87828
 
 IshiharaTilesetGfx: ; 87828 (21:7828)
@@ -51,6 +54,7 @@ Unnamed2Gfx: ; 87fe2 (21:7fe2)
 	INCROM $87ff4, $88000
 
 SECTION "Gfx 4", ROMX
+
 OverworldMapTiles: ; 88000 (22:4000)
 	dw $c1
 	INCBIN "gfx/overworld_map.t15.2bpp"
@@ -94,6 +98,7 @@ Unnamed3Gfx: ; 8bfd2 (22:7fd2)
 	INCROM $8bfe4, $8C000
 
 SECTION "Gfx 5", ROMX
+
 LightningClubTilesetGfx: ; 8c000 (23:4000)
 	dw $83
 	INCBIN "gfx/tilesets/lightningclub.t13.2bpp"
@@ -128,24 +133,24 @@ HallOfHonorTilesetGfx: ; 8f20e (23:720e)
 
 MedalGfx: ; 8f9a0 (23:79a0)
 	dw $48
-	INCBIN "gfx/medals.2bpp",$0,$c0
-	INCBIN "gfx/medals.2bpp",$240,$30
-	INCBIN "gfx/medals.2bpp",$340,$10
-	INCBIN "gfx/medals.2bpp",$c0,$c0
-	INCBIN "gfx/medals.2bpp",$300,$30
-	INCBIN "gfx/medals.2bpp",$350,$10
-	INCBIN "gfx/medals.2bpp",$180,$c0
-	INCBIN "gfx/medals.2bpp",$3c0,$30
-	INCBIN "gfx/medals.2bpp",$410,$10
-	INCBIN "gfx/medals.2bpp",$2d0,$30
-	INCBIN "gfx/medals.2bpp",$2a0,$30
-	INCBIN "gfx/medals.2bpp",$270,$30
-	INCBIN "gfx/medals.2bpp",$390,$30
-	INCBIN "gfx/medals.2bpp",$360,$30
-	INCBIN "gfx/medals.2bpp",$330,$10
-	INCBIN "gfx/medals.2bpp",$450,$30
-	INCBIN "gfx/medals.2bpp",$420,$30
-	INCBIN "gfx/medals.2bpp",$3f0,$20
+	INCBIN "gfx/medals.2bpp", $0, $c0
+	INCBIN "gfx/medals.2bpp", $240, $30
+	INCBIN "gfx/medals.2bpp", $340, $10
+	INCBIN "gfx/medals.2bpp", $c0, $c0
+	INCBIN "gfx/medals.2bpp", $300, $30
+	INCBIN "gfx/medals.2bpp", $350, $10
+	INCBIN "gfx/medals.2bpp", $180, $c0
+	INCBIN "gfx/medals.2bpp", $3c0, $30
+	INCBIN "gfx/medals.2bpp", $410, $10
+	INCBIN "gfx/medals.2bpp", $2d0, $30
+	INCBIN "gfx/medals.2bpp", $2a0, $30
+	INCBIN "gfx/medals.2bpp", $270, $30
+	INCBIN "gfx/medals.2bpp", $390, $30
+	INCBIN "gfx/medals.2bpp", $360, $30
+	INCBIN "gfx/medals.2bpp", $330, $10
+	INCBIN "gfx/medals.2bpp", $450, $30
+	INCBIN "gfx/medals.2bpp", $420, $30
+	INCBIN "gfx/medals.2bpp", $3f0, $20
 
 NintendoGfx: ; 8fe22 (23:7e22)
 	dw $18
@@ -158,6 +163,7 @@ PoisonGfx: ; 8ffa4 (23:7fa4)
 	INCROM $8ffe6, $90000
 
 SECTION "Gfx 6", ROMX
+
 CardPop1Gfx: ; 90000 (24:4000)
 	dw $bd
 	INCBIN "gfx/cardpop/cardpop1.t3.2bpp"
@@ -219,6 +225,7 @@ rept $4
 endr
 
 SECTION "Gfx 7", ROMX
+
 Laboratory1Gfx: ; 94000 (25:4000)
 	dw $60
 	INCBIN "gfx/booster_packs/laboratory1.2bpp"
@@ -270,6 +277,7 @@ RonaldOWGfx: ; 97ea6 (25:7ea6)
 	INCROM $97fe8, $98000
 
 SECTION "Gfx 8", ROMX
+
 Titlescreen3Gfx: ; 98000 (26:4000)
 	dw $f4
 	INCBIN "gfx/titlescreen/titlescreen3.t12.2bpp"
@@ -303,6 +311,7 @@ Unnamed7Gfx: ; 9bfee (26:7fee)
 	INCBIN "gfx/unnamed/7.2bpp"
 
 SECTION "Gfx 9", ROMX
+
 SamGfx: ; 9c000 (27:4000)
 	dw $24
 	INCBIN "gfx/duelists/sam.2bpp"
@@ -428,6 +437,7 @@ rept $4
 endr
 
 SECTION "Gfx 10", ROMX
+
 DanielGfx: ; a0000 (28:4000)
 	dw $24
 	INCBIN "gfx/duelists/daniel.2bpp"
@@ -603,6 +613,7 @@ Unnamed11Gfx: ; a3fb4 (28:7fb4)
 	INCROM $a3ff6, $a4000
 
 SECTION "Gfx 11", ROMX
+
 OWSprite30: ; a4000 (29:4000)
 	dw $14
 	INCBIN "gfx/overworld_sprites/30.2bpp"
@@ -802,6 +813,7 @@ Duel45Gfx: ; a7fb0 (29:7fb0)
 	INCROM $a7fe2, $a8000
 
 SECTION "Gfx 12", ROMX
+
 Duel46Gfx: ; a8000 (2a:4000)
 	dw $08
 	INCBIN "gfx/duel/46.2bpp"
@@ -877,16 +889,16 @@ FightingGfx: ; a8e12 (2a:4e12)
 	INCROM $a8e54, $ac000
 
 SECTION "Gfx 13", ROMX
-INCBIN "baserom.gbc",$AC000,$4000
+INCBIN "baserom.gbc", $ac000, $4000
 
 SECTION "Gfx 14", ROMX
-INCBIN "baserom.gbc",$B0000,$4000
+INCBIN "baserom.gbc", $b0000, $4000
 
 SECTION "Gfx 15", ROMX
-INCBIN "baserom.gbc",$B4000,$4000
+INCBIN "baserom.gbc", $b4000, $4000
 
 SECTION "Gfx 16", ROMX
-INCBIN "baserom.gbc",$B8000,$4000
+INCBIN "baserom.gbc", $b8000, $4000
 
 SECTION "Empty Bank 2F", ROMX
 	emptybank
@@ -895,6 +907,7 @@ SECTION "Empty Bank 30", ROMX
 	emptybank
 
 SECTION "Card Gfx 1", ROMX
+
 CardGraphics:: ; c4000 (31:4000)
 
 GrassEnergyCardGfx:: ; c4000 (31:4000)
@@ -982,6 +995,7 @@ NidorinaCardGfx:: ; c7ca0 (31:7ca0)
 	INCBIN "gfx/cards/nidorina.pal"
 
 SECTION "Card Gfx 2", ROMX
+
 NidoqueenCardGfx:: ; c8000 (32:4000)
 	INCBIN "gfx/cards/nidoqueen.8x6.2bpp"
 	INCBIN "gfx/cards/nidoqueen.pal"
@@ -1067,6 +1081,7 @@ KoffingCardGfx:: ; cbca0 (32:7ca0)
 	INCBIN "gfx/cards/koffing.pal"
 
 SECTION "Card Gfx 3", ROMX
+
 WeezingCardGfx:: ; cc000 (33:4000)
 	INCBIN "gfx/cards/weezing.8x6.2bpp"
 	INCBIN "gfx/cards/weezing.pal"
@@ -1152,6 +1167,7 @@ Moltres1CardGfx:: ; cfca0 (33:7ca0)
 	INCBIN "gfx/cards/moltres1.pal"
 
 SECTION "Card Gfx 4", ROMX
+
 Moltres2CardGfx:: ; d0000 (34:4000)
 	INCBIN "gfx/cards/moltres2.8x6.2bpp"
 	INCBIN "gfx/cards/moltres2.pal"
@@ -1237,6 +1253,7 @@ SeakingCardGfx:: ; d3ca0 (34:7ca0)
 	INCBIN "gfx/cards/seaking.pal"
 
 SECTION "Card Gfx 5", ROMX
+
 StaryuCardGfx:: ; d4000 (35:4000)
 	INCBIN "gfx/cards/staryu.8x6.2bpp"
 	INCBIN "gfx/cards/staryu.pal"
@@ -1322,6 +1339,7 @@ Magnemite1CardGfx:: ; d7ca0 (35:7ca0)
 	INCBIN "gfx/cards/magnemite1.pal"
 
 SECTION "Card Gfx 6", ROMX
+
 Magnemite2CardGfx:: ; d8000 (36:4000)
 	INCBIN "gfx/cards/magnemite2.8x6.2bpp"
 	INCBIN "gfx/cards/magnemite2.pal"
@@ -1407,6 +1425,7 @@ MachokeCardGfx:: ; dbca0 (36:7ca0)
 	INCBIN "gfx/cards/machoke.pal"
 
 SECTION "Card Gfx 7", ROMX
+
 MachampCardGfx:: ; dc000 (37:4000)
 	INCBIN "gfx/cards/machamp.8x6.2bpp"
 	INCBIN "gfx/cards/machamp.pal"
@@ -1492,6 +1511,7 @@ SlowbroCardGfx:: ; dfca0 (37:7ca0)
 	INCBIN "gfx/cards/slowbro.pal"
 
 SECTION "Card Gfx 8", ROMX
+
 Gastly1CardGfx:: ; e0000 (38:4000)
 	INCBIN "gfx/cards/gastly1.8x6.2bpp"
 	INCBIN "gfx/cards/gastly1.pal"
@@ -1577,6 +1597,7 @@ RaticateCardGfx:: ; e3ca0 (38:7ca0)
 	INCBIN "gfx/cards/raticate.pal"
 
 SECTION "Card Gfx 9", ROMX
+
 SpearowCardGfx:: ; e4000 (39:4000)
 	INCBIN "gfx/cards/spearow.8x6.2bpp"
 	INCBIN "gfx/cards/spearow.pal"
@@ -1662,6 +1683,7 @@ PorygonCardGfx:: ; e7ca0 (39:7ca0)
 	INCBIN "gfx/cards/porygon.pal"
 
 SECTION "Card Gfx 10", ROMX
+
 SnorlaxCardGfx:: ; e8000 (3a:4000)
 	INCBIN "gfx/cards/snorlax.8x6.2bpp"
 	INCBIN "gfx/cards/snorlax.pal"
@@ -1747,6 +1769,7 @@ SwitchCardGfx:: ; ebca0 (3a:7ca0)
 	INCBIN "gfx/cards/switch.pal"
 
 SECTION "Card Gfx 11", ROMX
+
 PokemonCenterCardGfx:: ; ec000 (3b:4000)
 	INCBIN "gfx/cards/pokemoncenter.8x6.2bpp"
 	INCBIN "gfx/cards/pokemoncenter.pal"
diff --git a/src/text/text1.asm b/src/text/text1.asm
index 3c82b18..64ef19b 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -147,27 +147,27 @@ UnableDueToParalysisText: ; 364a1 (d:64a1)
 	done
 
 Received10DamageDueToPoisonText: ; 364be (d:64be)
-	text TX_RAM2," received"
+	text TX_RAM2, " received"
 	line "10 damage due to Poison."
 	done
 
 Received20DamageDueToPoisonText: ; 364e3 (d:64e3)
-	text TX_RAM2," received"
+	text TX_RAM2, " received"
 	line "20 damage due to Double Poison."
 	done
 
 IsStillAsleepText: ; 3650f (d:650f)
-	text TX_RAM2," is"
+	text TX_RAM2, " is"
 	line "still Asleep."
 	done
 
 IsCuredOfSleepText: ; 36523 (d:6523)
-	text TX_RAM2," is"
+	text TX_RAM2, " is"
 	line "cured of Sleep."
 	done
 
 IsCuredOfParalysisText: ; 36539 (d:6539)
-	text TX_RAM2," is"
+	text TX_RAM2, " is"
 	line "cured of Paralysis."
 	done
 
@@ -204,7 +204,7 @@ Text0032: ; 365b6 (d:65b6)
 	done
 
 Text0033: ; 365be (d:65be)
-	text "Used ",TX_RAM2,"."
+	text "Used ", TX_RAM2, "."
 	done
 
 Text0034: ; 365c7 (d:65c7)
@@ -212,38 +212,38 @@ Text0034: ; 365c7 (d:65c7)
 	done
 
 PokemonsAttackText: ; 365d8 (d:65d8)
-	text TX_RAM2,"'s"
+	text TX_RAM2, "'s"
 	line ""
-	text TX_RAM2,"!"
+	text TX_RAM2, "!"
 	done
 
 Text0036: ; 365e1 (d:65e1)
-	text TX_RAM2," received"
-	line TX_RAM3," damage due to Resistance!"
+	text TX_RAM2, " received"
+	line TX_RAM3, " damage due to Resistance!"
 	done
 
 Text0037: ; 36609 (d:6609)
-	text TX_RAM2," received"
-	line TX_RAM3," damage due to Weakness!"
+	text TX_RAM2, " received"
+	line TX_RAM3, " damage due to Weakness!"
 	done
 
 Text0038: ; 3662f (d:662f)
-	text TX_RAM2," received"
-	line TX_RAM3," damage due to Weakness!"
+	text TX_RAM2, " received"
+	line TX_RAM3, " damage due to Weakness!"
 	done
 
 Text0039: ; 36655 (d:6655)
-	text TX_RAM2," did not"
+	text TX_RAM2, " did not"
 	line "receive damage due to Resistance."
 	done
 
 Text003a: ; 36682 (d:6682)
-	text TX_RAM2," took"
-	line TX_RAM3," damage."
+	text TX_RAM2, " took"
+	line TX_RAM3, " damage."
 	done
 
 Text003b: ; 36694 (d:6694)
-	text TX_RAM2," did not"
+	text TX_RAM2, " did not"
 	line "receive damage!"
 	done
 
@@ -278,16 +278,16 @@ DiscardDescription: ; 36757 (d:6757)
 	done
 
 Text0042: ; 367cc (d:67cc)
-	text TX_RAM1," will draw ",TX_RAM3," Prize(s)."
+	text TX_RAM1, " will draw ", TX_RAM3, " Prize(s)."
 	done
 
 Text0043: ; 367e5 (d:67e5)
-	text TX_RAM1," drew ",TX_RAM3," Prize(s)."
+	text TX_RAM1, " drew ", TX_RAM3, " Prize(s)."
 	done
 
 Text0044: ; 367f9 (d:67f9)
-	text TX_RAM1," placed"
-	line "a ",TX_RAM2,"."
+	text TX_RAM1, " placed"
+	line "a ", TX_RAM2, "."
 	done
 
 Text0045: ; 36808 (d:6808)
@@ -387,18 +387,18 @@ Text0059: ; 369dc (d:69dc)
 	done
 
 Text005a: ; 36a19 (d:6a19)
-	text TX_RAM2,""
+	text TX_RAM2, ""
 	line "Retreated to the Bench."
 	done
 
 Text005b: ; 36a34 (d:6a34)
-	text TX_RAM2,"'s"
+	text TX_RAM2, "'s"
 	line "Retreat was unsuccessful."
 	done
 
 Text005c: ; 36a53 (d:6a53)
-	text TX_RAM2," will use the"
-	line "Pok`mon Power ",TX_RAM2,"."
+	text TX_RAM2, " will use the"
+	line "Pok`mon Power ", TX_RAM2, "."
 	done
 
 Text005d: ; 36a74 (d:6a74)
@@ -407,31 +407,31 @@ Text005d: ; 36a74 (d:6a74)
 	done
 
 Text005e: ; 36a9a (d:6a9a)
-	text TX_RAM1,"'s Turn."
+	text TX_RAM1, "'s Turn."
 	done
 
 Text005f: ; 36aa5 (d:6aa5)
-	text "Attached ",TX_RAM2,""
-	line "to ",TX_RAM2,"."
+	text "Attached ", TX_RAM2, ""
+	line "to ", TX_RAM2, "."
 	done
 
 Text0060: ; 36ab7 (d:6ab7)
-	text TX_RAM2," evolved"
-	line "into ",TX_RAM2,"."
+	text TX_RAM2, " evolved"
+	line "into ", TX_RAM2, "."
 	done
 
 Text0061: ; 36aca (d:6aca)
-	text "Placed ",TX_RAM2,""
+	text "Placed ", TX_RAM2, ""
 	line "on the Bench."
 	done
 
 Text0062: ; 36ae2 (d:6ae2)
-	text TX_RAM2,""
+	text TX_RAM2, ""
 	line "was placed in the Arena."
 	done
 
 Text0063: ; 36afe (d:6afe)
-	text TX_RAM1," shuffles the Deck."
+	text TX_RAM1, " shuffles the Deck."
 	done
 
 Text0064: ; 36b14 (d:6b14)
@@ -449,12 +449,12 @@ Text0066: ; 36b7a (d:6b7a)
 	done
 
 Text0067: ; 36b9a (d:6b9a)
-	text TX_RAM1,""
+	text TX_RAM1, ""
 	line "drew 7 cards."
 	done
 
 Text0068: ; 36bab (d:6bab)
-	text TX_RAM1,"'s deck has ",TX_RAM3," cards."
+	text TX_RAM1, "'s deck has ", TX_RAM3, " cards."
 	done
 
 Text0069: ; 36bc2 (d:6bc2)
@@ -464,7 +464,7 @@ Text0069: ; 36bc2 (d:6bc2)
 
 Text006a: ; 36bf1 (d:6bf1)
 	text "There are no Basic Pok`mon"
-	line "in ",TX_RAM1,"'s hand."
+	line "in ", TX_RAM1, "'s hand."
 	done
 
 Text006b: ; 36c1a (d:6c1a)
@@ -493,7 +493,7 @@ Text006f: ; 36ce1 (d:6ce1)
 	done
 
 Text0070: ; 36cfd (d:6cfd)
-	text "You drew ",TX_RAM2,"."
+	text "You drew ", TX_RAM2, "."
 	done
 
 Text0071: ; 36d0a (d:6d0a)
@@ -506,13 +506,13 @@ Text0072: ; 36d28 (d:6d28)
 
 Text0073: ; 36d3f (d:6d3f)
 	text "Please place"
-	line TX_RAM3," Prizes."
+	line TX_RAM3, " Prizes."
 	done
 
 Text0074: ; 36d57 (d:6d57)
 	text "If heads,"
 	line ""
-	text TX_RAM2," plays first."
+	text TX_RAM2, " plays first."
 	done
 
 Text0075: ; 36d72 (d:6d72)
@@ -525,17 +525,17 @@ DecisionText: ; 36da4 (d:6da4)
 	done
 
 DuelWasDrawText: ; 36db1 (d:6db1)
-	text "The Duel with ",TX_RAM1,""
+	text "The Duel with ", TX_RAM1, ""
 	line "was a Draw!"
 	done
 
 WonDuelText: ; 36dce (d:6dce)
-	text "You won the Duel with ",TX_RAM1,"!"
+	text "You won the Duel with ", TX_RAM1, "!"
 	done
 
 LostDuelText: ; 36de8 (d:6de8)
 	text "You lost the Duel"
-	line "with ",TX_RAM1,"..."
+	line "with ", TX_RAM1, "..."
 	done
 
 StartSuddenDeathMatchText: ; 36e05 (d:6e05)
@@ -562,22 +562,22 @@ Text007e: ; 36e63 (d:6e63)
 	done
 
 Text007f: ; 36e6a (d:6e6a)
-	text TX_RAM1," took"
+	text TX_RAM1, " took"
 	line "all the Prizes!"
 	done
 
 Text0080: ; 36e82 (d:6e82)
 	text "There are no Pok`mon"
-	line "in ",TX_RAM1,"'s Play Area!"
+	line "in ", TX_RAM1, "'s Play Area!"
 	done
 
 WasKnockedOutText: ; 36eaa (d:6eaa)
-	text TX_RAM2," was"
+	text TX_RAM2, " was"
 	line "Knocked Out!"
 	done
 
 Text0082: ; 36ebe (d:6ebe)
-	text TX_RAM2," have"
+	text TX_RAM2, " have"
 	line "Pok`mon Power."
 	done
 
@@ -606,7 +606,7 @@ Text0087: ; 36f43 (d:6f43)
 	done
 
 DuelistIsThinkingText: ; 36f4a (d:6f4a)
-	text TX_RAM1," is thinking."
+	text TX_RAM1, " is thinking."
 	done
 
 Text0089: ; 36f5a (d:6f5a)
@@ -724,19 +724,19 @@ Text009d: ; 371f7 (d:71f7)
 	done
 
 Text009e: ; 3720c (d:720c)
-	text TX_GRASS," Pok`mon"
+	text TX_GRASS, " Pok`mon"
 	line ""
-	text TX_FIRE," Pok`mon"
+	text TX_FIRE, " Pok`mon"
 	line ""
-	text TX_WATER," Pok`mon"
+	text TX_WATER, " Pok`mon"
 	line ""
-	text TX_LIGHTNING," Pok`mon"
+	text TX_LIGHTNING, " Pok`mon"
 	line ""
-	text TX_FIGHTING," Pok`mon"
+	text TX_FIGHTING, " Pok`mon"
 	line ""
-	text TX_PSYCHIC," Pok`mon"
+	text TX_PSYCHIC, " Pok`mon"
 	line ""
-	text TX_COLORLESS," Pok`mon"
+	text TX_COLORLESS, " Pok`mon"
 	line "Trainer Card"
 	line "Energy Card"
 	done
@@ -780,15 +780,15 @@ Text00a6: ; 3737b (d:737b)
 	done
 
 Text00a7: ; 37392 (d:7392)
-	text TX_RAM1,"'s Hand"
+	text TX_RAM1, "'s Hand"
 	done
 
 Text00a8: ; 3739c (d:739c)
-	text TX_RAM1,"'s Play Area"
+	text TX_RAM1, "'s Play Area"
 	done
 
 Text00a9: ; 373ab (d:73ab)
-	text TX_RAM1,"'s Deck"
+	text TX_RAM1, "'s Deck"
 	done
 
 Text00aa: ; 373b5 (d:73b5)
@@ -892,7 +892,7 @@ Text00be: ; 37715 (d:7715)
 	done
 
 Text00bf: ; 37758 (d:7758)
-	text TX_RAM3," Energy cards"
+	text TX_RAM3, " Energy cards"
 	line "are required to Retreat."
 	done
 
@@ -1108,7 +1108,7 @@ Text00ec: ; 37e73 (d:7e73)
 	done
 
 Text00ed: ; 37e92 (d:7e92)
-	text "If Tails, ",TX_RAM3," damage"
+	text "If Tails, ", TX_RAM3, " damage"
 	line "to yourself, too."
 	done
 
@@ -1138,10 +1138,10 @@ Text00f2: ; 37f9a (d:7f9a)
 
 Text00f3: ; 37fa8 (d:7fa8)
 	text "Damage check!"
-	line "If Heads, +",TX_RAM3," damage!!"
+	line "If Heads, +", TX_RAM3, " damage!!"
 	done
 
 Text00f4: ; 37fcd (d:7fcd)
 	text "Damage check!"
-	line "If Heads, x ",TX_RAM3," damage!!"
+	line "If Heads, x ", TX_RAM3, " damage!!"
 	done
diff --git a/src/text/text10.asm b/src/text/text10.asm
index 0a56ec6..15154c0 100644
--- a/src/text/text10.asm
+++ b/src/text/text10.asm
@@ -777,7 +777,7 @@ EmberName: ; 59e0e (16:5e0e)
 	done
 
 EmberDescription: ; 59e15 (16:5e15)
-	text "Discard 1 ",TX_FIRE," Energy card attached to"
+	text "Discard 1 ", TX_FIRE, " Energy card attached to"
 	line "Charmander in order to use this"
 	line "attack."
 	done
@@ -802,7 +802,7 @@ FlamethrowerName: ; 59ee6 (16:5ee6)
 	done
 
 CharmeleonsFlamethrowerDescription: ; 59ef4 (16:5ef4)
-	text "Discard 1 ",TX_FIRE," Energy card attached to"
+	text "Discard 1 ", TX_FIRE, " Energy card attached to"
 	line "Charmeleon in order to use this"
 	line "attack."
 	done
@@ -829,7 +829,7 @@ EnergyBurnDescription: ; 59fb8 (16:5fb8)
 	text "As often as you like during your"
 	line "turn (before your attack), you may"
 	line "turn all Energy attached to"
-	line "Charizard into ",TX_FIRE," Energy for the"
+	line "Charizard into ", TX_FIRE, " Energy for the"
 	line "rest of the turn. This power can't"
 	line "be used if Charizard is Asleep,"
 	line "Confused, or Paralyzed."
@@ -884,7 +884,7 @@ FireBlastName: ; 5a231 (16:6231)
 	done
 
 FireBlastDescription: ; 5a23d (16:623d)
-	text "Discard 1 ",TX_FIRE," Energy card attached"
+	text "Discard 1 ", TX_FIRE, " Energy card attached"
 	line "to Ninetales in order to use this"
 	line "attack."
 	done
@@ -968,7 +968,7 @@ FlamesOfRageName: ; 5a5d8 (16:65d8)
 	done
 
 FlamesOfRageDescription: ; 5a5e8 (16:65e8)
-	text "Discard 2 ",TX_FIRE," Energy cards attached"
+	text "Discard 2 ", TX_FIRE, " Energy cards attached"
 	line "to Arcanine in order to use this"
 	line "attack. This attack does 40 damage"
 	line "plus 10 more damage for each damage"
@@ -986,7 +986,7 @@ Arcanine1Description: ; 5a694 (16:6694)
 	done
 
 ArcaninesFlamethrowerDescription: ; 5a6ed (16:66ed)
-	text "Discard 1 ",TX_FIRE," Energy card attached to"
+	text "Discard 1 ", TX_FIRE, " Energy card attached to"
 	line "Arcanine in order to use this"
 	line "attack."
 	done
@@ -1068,7 +1068,7 @@ FirePunchName: ; 5a9b3 (16:69b3)
 	done
 
 FirePunchDescription: ; 5a9bf (16:69bf)
-	text "Discard 1 ",TX_FIRE," Energy card attached to"
+	text "Discard 1 ", TX_FIRE, " Energy card attached to"
 	line "Magmar in order to use this attack."
 	done
 
@@ -1128,7 +1128,7 @@ Flareon1Description: ; 5abe1 (16:6be1)
 	done
 
 FlareonsFlamethrowerDescription: ; 5ac46 (16:6c46)
-	text "Discard 1 ",TX_FIRE," Energy card attached to"
+	text "Discard 1 ", TX_FIRE, " Energy card attached to"
 	line "Flareon in order to use this attack."
 	done
 
@@ -1147,7 +1147,7 @@ WildfireName: ; 5acf6 (16:6cf6)
 	done
 
 WildfireDescription: ; 5ad00 (16:6d00)
-	text "You may discard any number of ",TX_FIRE,""
+	text "You may discard any number of ", TX_FIRE, ""
 	line "Energy cards attached to Moltres"
 	line "when you use this attack. If you do,"
 	line "discard that many cards from the top"
@@ -1172,7 +1172,7 @@ FiregiverDescription: ; 5ae1e (16:6e1e)
 	text "When you put Moltres into play"
 	line "during your turn (not during"
 	line "set-up), put from 1 to 4 (chosen at"
-	line "random) ",TX_FIRE," Energy cards from your"
+	line "random) ", TX_FIRE, " Energy cards from your"
 	line "deck into your hand. Shuffle your"
 	line "deck afterward."
 	done
@@ -1244,8 +1244,8 @@ RainDanceName: ; 5b159 (16:7159)
 RainDanceDescription: ; 5b165 (16:7165)
 	text "As often as you like during your"
 	line "turn (before your attack), you may"
-	line "attach 1 ",TX_WATER," Energy card to 1 of"
-	line "your ",TX_WATER," Pok`mon. (This doesn't use"
+	line "attach 1 ", TX_WATER, " Energy card to 1 of"
+	line "your ", TX_WATER, " Pok`mon. (This doesn't use"
 	line "up your 1 Energy card attachment"
 	line "for the turn.)"
 	done
@@ -1262,7 +1262,7 @@ HydroPumpName: ; 5b267 (16:7267)
 
 HydroPumpDescription: ; 5b273 (16:7273)
 	text "Does 40 damage plus 10 more damage"
-	line "for each ",TX_WATER," Energy attached to"
+	line "for each ", TX_WATER, " Energy attached to"
 	line "Blastoise but not used to pay for"
 	line "this attack's Energy cost. You can't"
 	line "add more than 20 damage in this way."
@@ -1335,7 +1335,7 @@ WaterGunName: ; 5b53c (16:753c)
 
 PoliwagsWaterGunDescription: ; 5b547 (16:7547)
 	text "Does 10 damage plus 10 more damage"
-	line "for each ",TX_WATER," Energy attached to"
+	line "for each ", TX_WATER, " Energy attached to"
 	line "Poliwag but not used to pay for"
 	line "this attack's Energy cost. You can't"
 	line "add more than 20 damage in this way."
@@ -1382,7 +1382,7 @@ PoliwrathName: ; 5b74f (16:774f)
 
 PoliwrathsWaterGunDescription: ; 5b75a (16:775a)
 	text "Does 30 damage plus 10 more damage"
-	line "for each ",TX_WATER," Energy attached to"
+	line "for each ", TX_WATER, " Energy attached to"
 	line "Poliwrath but not used to pay for"
 	line "this attack's Energy cost. You"
 	line "can't add more than 20 damage in"
diff --git a/src/text/text11.asm b/src/text/text11.asm
index e590276..649bf27 100644
--- a/src/text/text11.asm
+++ b/src/text/text11.asm
@@ -10,7 +10,7 @@ SeadraName: ; 5c05d (17:405d)
 
 SeadrasWaterGunDescription: ; 5c065 (17:4065)
 	text "Does 20 damage plus 10 more damage"
-	line "for each ",TX_WATER," Energy attached to"
+	line "for each ", TX_WATER, " Energy attached to"
 	line "Seadra but not used to pay for this"
 	line "attack's Energy cost. You can't add"
 	line "more than 20 damage in this way."
@@ -88,7 +88,7 @@ RecoverName: ; 5c352 (17:4352)
 	done
 
 StarmiesRecoverDescription: ; 5c35b (17:435b)
-	text "Discard 1 ",TX_WATER," Energy card attached to"
+	text "Discard 1 ", TX_WATER, " Energy card attached to"
 	line "Starmie in order to use this attack."
 	line "Remove all damage counters from"
 	line "Starmie."
@@ -159,7 +159,7 @@ LaprasName: ; 5c58f (17:458f)
 
 LaprasWaterGunDescription: ; 5c597 (17:4597)
 	text "Does 10 damage plus 10 more damage"
-	line "for each ",TX_WATER," Energy attached to"
+	line "for each ", TX_WATER, " Energy attached to"
 	line "Lapras but not used to pay for this"
 	line "attack's Energy cost. You can't add"
 	line "more than 20 damage in this way."
@@ -201,7 +201,7 @@ Vaporeon1Description: ; 5c717 (17:4717)
 
 VaporeonsWaterGunDescription: ; 5c77b (17:477b)
 	text "Does 30 damage plus 10 more damage"
-	line "for each ",TX_WATER," Energy attached to"
+	line "for each ", TX_WATER, " Energy attached to"
 	line "Vaporeon but not used to pay for"
 	line "this attack's Energy cost. You can't"
 	line "add more than 20 damage in this way."
@@ -234,7 +234,7 @@ ClairvoyanceDescription: ; 5c8b5 (17:48b5)
 
 OmanytesWaterGunDescription: ; 5c932 (17:4932)
 	text "Does 10 damage plus 10 more damage"
-	line "for each ",TX_WATER," Energy attached to"
+	line "for each ", TX_WATER, " Energy attached to"
 	line "Omanyte but not used to pay for this"
 	line "attack's Energy cost. You can't add"
 	line "more than 20 damage in this way."
@@ -256,7 +256,7 @@ OmastarName: ; 5ca3e (17:4a3e)
 
 OmastarsWaterGunDescription: ; 5ca47 (17:4a47)
 	text "Does 20 damage plus 10 more damage"
-	line "for each ",TX_WATER," Energy attached to"
+	line "for each ", TX_WATER, " Energy attached to"
 	line "Omastar but not used to pay for this"
 	line "attack's Energy cost. You can't add"
 	line "more than 20 damage in this way."
@@ -1145,7 +1145,7 @@ CallforFriendName: ; 5f33e (17:733e)
 	done
 
 CallforFriendDescription: ; 5f34f (17:734f)
-	text "Search your deck for a ",TX_FIGHTING," Basic"
+	text "Search your deck for a ", TX_FIGHTING, " Basic"
 	line "Pok`mon card and put it onto your"
 	line "Bench. Shuffle your deck afterward."
 	line "(You can't use this attack if your"
@@ -1405,7 +1405,7 @@ KadabraName: ; 5fed3 (17:7ed3)
 	done
 
 KadabrasRecoverDescription: ; 5fedc (17:7edc)
-	text "Discard 1 ",TX_PSYCHIC," Energy card attached to"
+	text "Discard 1 ", TX_PSYCHIC, " Energy card attached to"
 	line "Kadabra in order to use this attack."
 	line "Remove all damage counters from"
 	line "Kadabra."
diff --git a/src/text/text12.asm b/src/text/text12.asm
index e381cac..4bc570e 100644
--- a/src/text/text12.asm
+++ b/src/text/text12.asm
@@ -51,7 +51,7 @@ ScavengeName: ; 602b5 (18:42b5)
 	done
 
 ScavengeDescription: ; 602bf (18:42bf)
-	text "Discard 1 ",TX_PSYCHIC," Energy card attached"
+	text "Discard 1 ", TX_PSYCHIC, " Energy card attached"
 	line "to Slowpoke in order to use this"
 	line "attack. Put a Trainer card from your"
 	line "discard pile into your hand."
@@ -103,7 +103,7 @@ DestinyBondName: ; 6050e (18:450e)
 	done
 
 DestinyBondDescription: ; 6051c (18:451c)
-	text "Discard 1 ",TX_PSYCHIC," Energy card attached to"
+	text "Discard 1 ", TX_PSYCHIC, " Energy card attached to"
 	line "Gastly in order to use this attack."
 	line "If a Pok`mon Knocks Out Gastly"
 	line "during your opponent's next turn,"
@@ -334,7 +334,7 @@ PsychicDescription: ; 60ee9 (18:4ee9)
 	done
 
 BarrierDescription: ; 60f45 (18:4f45)
-	text "Discard 1 ",TX_PSYCHIC," Energy card attached to"
+	text "Discard 1 ", TX_PSYCHIC, " Energy card attached to"
 	line "Mewtwo in order to use this attack."
 	line "During your opponent's next turn,"
 	line "prevent all effects of attacks,"
@@ -889,7 +889,7 @@ RetreatAidName: ; 62796 (18:6796)
 
 RetreatAidDescription: ; 627a3 (18:67a3)
 	text "As long as Dodrio is Benched, pay"
-	line TX_COLORLESS," less to retreat your Active"
+	line TX_COLORLESS, " less to retreat your Active"
 	line "Pok`mon."
 	done
 
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 4754a23..f567507 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -19,7 +19,7 @@ Text00f8: ; 380ac (e:40ac)
 	done
 
 Text00f9: ; 380db (e:40db)
-	text TX_RAM2,"'s Sleep check."
+	text TX_RAM2, "'s Sleep check."
 	done
 
 Text00fa: ; 380ed (e:40ed)
@@ -72,12 +72,12 @@ UnableToUseAttackDueToAmnesiaText: ; 382af (e:42af)
 	done
 
 KnockedOutDueToDestinyBondText: ; 382e9 (e:42e9)
-	text TX_RAM2," was Knocked Out"
+	text TX_RAM2, " was Knocked Out"
 	line "due to the effects of Destiny Bond."
 	done
 
 ReceivesDamageDueToStrikesBackText: ; 38320 (e:4320)
-	text TX_RAM2," receives ",TX_RAM3," damage"
+	text TX_RAM2, " receives ", TX_RAM3, " damage"
 	line "due to the effects of Strikes Back."
 	done
 
@@ -117,8 +117,8 @@ NoDamageOrEffectDueToTransparencyText: ; 384d8 (e:44d8)
 	done
 
 Text010d: ; 3851f (e:451f)
-	text TX_RAM2,""
-	line "metamorphs to ",TX_RAM2,"."
+	text TX_RAM2, ""
+	line "metamorphs to ", TX_RAM2, "."
 	done
 
 SelectMonOnBenchToSwitchWithActiveText: ; 38533 (e:4533)
@@ -132,7 +132,7 @@ Text010f: ; 38575 (e:4575)
 	done
 
 Text0110: ; 3859e (e:459e)
-	text TX_RAM1," is selecting a Pok`mon"
+	text TX_RAM1, " is selecting a Pok`mon"
 	line "to place in the Arena."
 	done
 
@@ -154,19 +154,19 @@ Text0113: ; 38647 (e:4647)
 Text0114: ; 3868d (e:468d)
 	text "Changed the Weakness of"
 	line ""
-	text TX_RAM2," to ",TX_RAM2,"."
+	text TX_RAM2, " to ", TX_RAM2, "."
 	done
 
 Text0115: ; 386af (e:46af)
 	text "Changed the Resistance of"
 	line ""
-	text TX_RAM2," to ",TX_RAM2,"."
+	text TX_RAM2, " to ", TX_RAM2, "."
 	done
 
 Text0116: ; 386d3 (e:46d3)
 	text "Changed the color of"
 	line ""
-	text TX_RAM2," to ",TX_RAM2,"."
+	text TX_RAM2, " to ", TX_RAM2, "."
 	done
 
 Text0117: ; 386f2 (e:46f2)
@@ -174,7 +174,7 @@ Text0117: ; 386f2 (e:46f2)
 	done
 
 Text0118: ; 3870e (e:470e)
-	text "Draw ",TX_RAM3," card(s) from the Deck."
+	text "Draw ", TX_RAM3, " card(s) from the Deck."
 	done
 
 Text0119: ; 3872d (e:472d)
@@ -407,7 +407,7 @@ Text013a: ; 391dc (e:51dc)
 	done
 
 Text013b: ; 39215 (e:5215)
-	text "There is no ",TX_RAM2,""
+	text "There is no ", TX_RAM2, ""
 	line "in the Deck."
 	done
 
@@ -451,7 +451,7 @@ Text0144: ; 3930a (e:530a)
 
 Text0145: ; 39318 (e:5318)
 	text "Peek was used to look at the"
-	line TX_RAM2," in your Hand."
+	line TX_RAM2, " in your Hand."
 	done
 
 Text0146: ; 39346 (e:5346)
@@ -459,12 +459,12 @@ Text0146: ; 39346 (e:5346)
 	done
 
 Text0147: ; 3935d (e:535d)
-	text TX_RAM2," and all attached"
+	text TX_RAM2, " and all attached"
 	line "cards were returned to the Hand."
 	done
 
 Text0148: ; 39392 (e:5392)
-	text TX_RAM2," was chosen"
+	text TX_RAM2, " was chosen"
 	line "for the effect of Amnesia."
 	done
 
@@ -474,27 +474,27 @@ Text0149: ; 393bb (e:53bb)
 	done
 
 WasUnsuccessfulText: ; 393e6 (e:53e6)
-	text TX_RAM2,"'s"
-	line TX_RAM2," was unsuccessful."
+	text TX_RAM2, "'s"
+	line TX_RAM2, " was unsuccessful."
 	done
 
 Text014b: ; 393ff (e:53ff)
 	text "There was no effect"
-	line "from ",TX_RAM2,"."
+	line "from ", TX_RAM2, "."
 	done
 
 Text014c: ; 3941c (e:541c)
-	text "The Energy card from ",TX_RAM1,"'s"
+	text "The Energy card from ", TX_RAM1, "'s"
 	line "Play Area was moved."
 	done
 
 Text014d: ; 3944b (e:544b)
-	text TX_RAM1," drew"
-	line TX_RAM3," Fire Energy from the Hand."
+	text TX_RAM1, " drew"
+	line TX_RAM3, " Fire Energy from the Hand."
 	done
 
 Text014e: ; 39470 (e:5470)
-	text "The Pok`mon cards in ",TX_RAM1,"'s"
+	text "The Pok`mon cards in ", TX_RAM1, "'s"
 	line "Hand and Deck were shuffled"
 	done
 
@@ -549,7 +549,7 @@ Text0158: ; 3968b (e:568b)
 	done
 
 Text0159: ; 396b4 (e:56b4)
-	text "You can draw up to ",TX_RAM3," cards."
+	text "You can draw up to ", TX_RAM3, " cards."
 	line "A to Draw, B to End."
 	done
 
@@ -608,7 +608,7 @@ Text0164: ; 3985b (e:585b)
 	done
 
 Text0165: ; 3986b (e:586b)
-	text TX_RAM2," was chosen."
+	text TX_RAM2, " was chosen."
 	done
 
 Text0166: ; 3987a (e:587a)
@@ -637,27 +637,27 @@ Text016a: ; 39952 (e:5952)
 	done
 
 Text016b: ; 39987 (e:5987)
-	text TX_RAM2," and all attached"
+	text TX_RAM2, " and all attached"
 	line "cards were returned to the Deck."
 	done
 
 Text016c: ; 399bc (e:59bc)
-	text TX_RAM2," was returned"
+	text TX_RAM2, " was returned"
 	line "from the Arena to the Hand."
 	done
 
 Text016d: ; 399e8 (e:59e8)
-	text TX_RAM2," was returned"
+	text TX_RAM2, " was returned"
 	line "from the Bench to the Hand."
 	done
 
 Text016e: ; 39a14 (e:5a14)
-	text TX_RAM2," was returned"
+	text TX_RAM2, " was returned"
 	line "to the Deck."
 	done
 
 Text016f: ; 39a31 (e:5a31)
-	text TX_RAM2," was placed"
+	text TX_RAM2, " was placed"
 	line "in the Hand."
 	done
 
@@ -680,12 +680,12 @@ Text0173: ; 39a9c (e:5a9c)
 	done
 
 Text0174: ; 39ab9 (e:5ab9)
-	text "Discarded ",TX_RAM3," cards"
-	line "from ",TX_RAM1,"'s Deck."
+	text "Discarded ", TX_RAM3, " cards"
+	line "from ", TX_RAM1, "'s Deck."
 	done
 
 Text0175: ; 39adb (e:5adb)
-	text "Discarded ",TX_RAM2,""
+	text "Discarded ", TX_RAM2, ""
 	line "from the Hand."
 	done
 
@@ -694,23 +694,23 @@ Text0176: ; 39af7 (e:5af7)
 	done
 
 Text0177: ; 39b03 (e:5b03)
-	text TX_RAM2,""
+	text TX_RAM2, ""
 	line "came to the Bench!"
 	done
 
 Text0178: ; 39b19 (e:5b19)
-	text TX_RAM1," has"
+	text TX_RAM1, " has"
 	line "no cards in Hand!"
 	done
 
 Text0179: ; 39b32 (e:5b32)
-	text TX_RAM2," healed"
-	line TX_RAM3," damage!"
+	text TX_RAM2, " healed"
+	line TX_RAM3, " damage!"
 	done
 
 Text017a: ; 39b46 (e:5b46)
-	text TX_RAM2," devolved"
-	line "to ",TX_RAM2,"!"
+	text TX_RAM2, " devolved"
+	line "to ", TX_RAM2, "!"
 	done
 
 Text017b: ; 39b58 (e:5b58)
@@ -718,7 +718,7 @@ Text017b: ; 39b58 (e:5b58)
 	done
 
 Text017c: ; 39b73 (e:5b73)
-	text "You can select ",TX_RAM3," more cards. Quit?"
+	text "You can select ", TX_RAM3, " more cards. Quit?"
 	done
 
 Text017d: ; 39b97 (e:5b97)
@@ -757,7 +757,7 @@ Text0183: ; 39c5a (e:5c5a)
 
 Text0184: ; 39c86 (e:5c86)
 	text "Exchanged the cards"
-	line "in ",TX_RAM1,"'s Hand."
+	line "in ", TX_RAM1, "'s Hand."
 	done
 
 Text0185: ; 39ca8 (e:5ca8)
@@ -780,8 +780,8 @@ Text0188: ; 39cea (e:5cea)
 	done
 
 Text0189: ; 39d1b (e:5d1b)
-	text "Begin a ",TX_RAM3,"-Prize Duel"
-	line "with ",TX_RAM1,"."
+	text "Begin a ", TX_RAM3, "-Prize Duel"
+	line "with ", TX_RAM1, "."
 	done
 
 Text018a: ; 39d39 (e:5d39)
@@ -805,32 +805,32 @@ Text018d: ; 39dcc (e:5dcc)
 	done
 
 Text018e: ; 39e02 (e:5e02)
-	text "Received ",TX_RAM2,""
+	text "Received ", TX_RAM2, ""
 	line "through Card Pop!"
 	done
 
 ReceivedCardText: ; 39e20 (e:5e20)
-	text TX_RAM1," received"
-	line "a ",TX_RAM2,"!"
+	text TX_RAM1, " received"
+	line "a ", TX_RAM2, "!"
 	done
 
 ReceivedPromotionalCardText: ; 39e31 (e:5e31)
-	text TX_RAM1," received a Promotional"
-	line "card ",TX_RAM2,"!"
+	text TX_RAM1, " received a Promotional"
+	line "card ", TX_RAM2, "!"
 	done
 
 ReceivedLegendaryCardText: ; 39e53 (e:5e53)
-	text TX_RAM1," received the Legendary"
-	line "card ",TX_RAM2,"!"
+	text TX_RAM1, " received the Legendary"
+	line "card ", TX_RAM2, "!"
 	done
 
 ReceivedPromotionalFlyingPikachuText: ; 39e75 (e:5e75)
-	text TX_RAM1," received a Promotinal"
+	text TX_RAM1, " received a Promotinal"
 	line "card Flyin' Pikachu!"
 	done
 
 ReceivedPromotionalSurfingPikachuText: ; 39ea3 (e:5ea3)
-	text TX_RAM1," received a Promotional"
+	text TX_RAM1, " received a Promotional"
 	line "card Surfin' Pikachu!"
 	done
 
@@ -853,11 +853,11 @@ Text0197: ; 39f2f (e:5f2f)
 	done
 
 Text0198: ; 39f4d (e:5f4d)
-	text "Sent to ",TX_RAM1,"."
+	text "Sent to ", TX_RAM1, "."
 	done
 
 Text0199: ; 39f59 (e:5f59)
-	text "Received from ",TX_RAM1,"."
+	text "Received from ", TX_RAM1, "."
 	done
 
 Text019a: ; 39f6b (e:5f6b)
@@ -1101,7 +1101,7 @@ Text01c4: ; 3ab08 (e:6b08)
 	line "Energy to use Waterfall."
 	line "You need to attach a Psychic Energy"
 	line "card to Seaking."
-	line TX_COLORLESS," means any Energy card."
+	line TX_COLORLESS, " means any Energy card."
 	line "Now you can use Waterfall."
 	line "Keep the Water Energy card for"
 	line "other Pok`mon."
@@ -1220,7 +1220,7 @@ Text01d4: ; 3b1f4 (e:71f4)
 	line ""
 	line "Pick up the last Prize."
 	line ""
-	text TX_RAM1," is the winner!"
+	text TX_RAM1, " is the winner!"
 	done
 
 Text01d5: ; 3b242 (e:7242)
@@ -1259,7 +1259,7 @@ Text01da: ; 3b3bb (e:73bb)
 	done
 
 Text01db: ; 3b3fe (e:73fe)
-	text TX_RAM1,"'s turn ",TX_RAM3
+	text TX_RAM1, "'s turn ", TX_RAM3
 	done
 
 Text01dc: ; 3b40a (e:740a)
@@ -1553,7 +1553,7 @@ Text0221: ; 3b8f2 (e:78f2)
 	line $03,$39,$70,$03,$3a,$70,$03,$3b,$70,$03,$3c,$70,$03,$3d,$70,$03,$3e,$70,$03,$3f,$70,$03,$40,$70,$03,$41,""
 	line $03,$42,$70,$03,$43,$70,$03,$44,$70,$03,$45,$70,$03,$46,$70,$03,$47,$70,$03,$48,$70,$03,$49,$70,$6e,""
 	line $6f,$70,$03,$5d,$70,$6a,$70,$6b,$70,$77,$70,$60,$70,$61,$70,$62,$70,$63,""
-	line $64,$70,$65,$70,$66,$70,$67,$70,$68,$70,$69,$70,$05,$13,$70,TX_LVL,$70,$70,""
+	line $64,$70,$65,$70,$66,$70,$67,$70,$68,$70,$69,$70,$05,$13,$70, TX_LVL, $70,$70,""
 	line $70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70
 	done
 
@@ -1595,7 +1595,7 @@ Text0229: ; 3ba51 (e:7a51)
 	done
 
 ChosenAsDuelingDeckText: ; 3ba55 (e:7a55)
-	text TX_RAM2," was"
+	text TX_RAM2, " was"
 	line "chosen as the dueling deck!"
 	done
 
@@ -1715,7 +1715,7 @@ Text0246: ; 3bc85 (e:7c85)
 	done
 
 Text0247: ; 3bc9e (e:7c9e)
-	text TX_RAM1,"'s Play Area"
+	text TX_RAM1, "'s Play Area"
 	done
 
 Text0248: ; 3bcad (e:7cad)
@@ -1747,11 +1747,11 @@ Text024e: ; 3bd20 (e:7d20)
 	done
 
 Text024f: ; 3bd26 (e:7d26)
-	text TX_RAM1,"'s Hand"
+	text TX_RAM1, "'s Hand"
 	done
 
 Text0250: ; 3bd30 (e:7d30)
-	text TX_RAM1,"'s Discard Pile"
+	text TX_RAM1, "'s Discard Pile"
 	done
 
 Text0251: ; 3bd42 (e:7d42)
@@ -1830,7 +1830,7 @@ Text0262: ; 3be7d (e:7e7d)
 Text0263: ; 3be82 (e:7e82)
 	text "Saved the configuration for"
 	line ""
-	text TX_RAM2,"! "
+	text TX_RAM2, "! "
 	done
 
 Text0264: ; 3bea4 (e:7ea4)
@@ -1849,7 +1849,7 @@ Text0266: ; 3bee7 (e:7ee7)
 Text0267: ; 3bf06 (e:7f06)
 	text "Deleted the configuration for"
 	line ""
-	text TX_RAM2,"."
+	text TX_RAM2, "."
 	done
 
 Text0268: ; 3bf29 (e:7f29)
@@ -1863,7 +1863,7 @@ Text0269: ; 3bf46 (e:7f46)
 Text026a: ; 3bf63 (e:7f63)
 	text "Dismantled"
 	line ""
-	text TX_RAM2,"."
+	text TX_RAM2, "."
 	done
 
 Text026b: ; 3bf73 (e:7f73)
diff --git a/src/text/text3.asm b/src/text/text3.asm
index e1f4b96..1c810c0 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -108,7 +108,7 @@ Text0282: ; 3c357 (f:4357)
 
 Text0283: ; 3c36a (f:436a)
 	text "Received these cards"
-	line "from  ",TX_RAM2,"!"
+	line "from  ", TX_RAM2, "!"
 	done
 
 Text0284: ; 3c389 (f:4389)
@@ -126,7 +126,7 @@ Text0286: ; 3c3d3 (f:43d3)
 
 Text0287: ; 3c3eb (f:43eb)
 	text "Received a deck configuration"
-	line "from  ",TX_RAM2,"!"
+	line "from  ", TX_RAM2, "!"
 	done
 
 Text0288: ; 3c413 (f:4413)
@@ -808,10 +808,10 @@ Text0315: ; 3dcb2 (f:5cb2)
 	line "your Pok`mon, making them able"
 	line "to Attack."
 	line "There are 7 types of Energy Cards"
-	line "[",TX_GRASS," Grass] [",TX_FIRE," Fire]"
-	line "[",TX_WATER," Water] [",TX_LIGHTNING," Lightning]"
-	line "[",TX_PSYCHIC," Psychic] [",TX_FIGHTING," Fighting]"
-	line "and [",TX_COLORLESS," Double Colorless]"
+	line "[", TX_GRASS, " Grass] [", TX_FIRE, " Fire]"
+	line "[", TX_WATER, " Water] [", TX_LIGHTNING, " Lightning]"
+	line "[", TX_PSYCHIC, " Psychic] [", TX_FIGHTING, " Fighting]"
+	line "and [", TX_COLORLESS, " Double Colorless]"
 	line "You may only play 1 Energy Card"
 	line "from your Hand per turn."
 	done
@@ -1065,7 +1065,7 @@ Text033e: ; 3e834 (f:6834)
 	done
 
 Text033f: ; 3e85f (f:685f)
-	text "Name ",TX_RAM1
+	text "Name ", TX_RAM1
 	done
 
 Text0340: ; 3e867 (f:6867)
@@ -1077,7 +1077,7 @@ Text0341: ; 3e87b (f:687b)
 	done
 
 Text0342: ; 3e892 (f:6892)
-	text TX_RAM1,"'s diary"
+	text TX_RAM1, "'s diary"
 	done
 
 Text0343: ; 3e89d (f:689d)
@@ -1089,7 +1089,7 @@ Text0344: ; 3e8b1 (f:68b1)
 	done
 
 Text0345: ; 3e8d2 (f:68d2)
-	text TX_RAM1,""
+	text TX_RAM1, ""
 	line "wrote in the diary."
 	done
 
@@ -1123,8 +1123,8 @@ Text034b: ; 3e9a0 (f:69a0)
 	done
 
 Text034c: ; 3e9b2 (f:69b2)
-	text "Duel           [",TX_RAM2,"]"
-	line "SELECT         [",TX_RAM2,"]"
+	text "Duel           [", TX_RAM2, "]"
+	line "SELECT         [", TX_RAM2, "]"
 	line "Receive many cards"
 	line "To Pok`mon Dome 1"
 	line "To Pok`mon Dome 2"
@@ -1155,12 +1155,12 @@ Text0351: ; 3ea3a (f:6a3a)
 	done
 
 TurnedPCOnText: ; 3ea69 (f:6a69)
-	text TX_RAM1,""
+	text TX_RAM1, ""
 	line "turned the PC on!"
 	done
 
 TurnedPCOffText: ; 3ea7e (f:6a7e)
-	text TX_RAM1,""
+	text TX_RAM1, ""
 	line "turned the PC off!"
 	done
 
@@ -1189,7 +1189,7 @@ Text0358: ; 3eb16 (f:6b16)
 	done
 
 Text0359: ; 3eb32 (f:6b32)
-	text "   Mail ",TX_RAM1," "
+	text "   Mail ", TX_RAM1, " "
 	done
 
 Text035a: ; 3eb3e (f:6b3e)
@@ -1287,7 +1287,7 @@ Text036f: ; 3ec74 (f:6c74)
 	done
 
 Text0370: ; 3ecb9 (f:6cb9)
-	text "  ",TX_RAM1,"  ",TX_RAM2,""
+	text "  ", TX_RAM1, "  ", TX_RAM2, ""
 	line "      Master Medals Won ",$07,$0c,$06,""
 	line "      Album           ",$07,$6d,$06,""
 	line "      Play time         ",$07,$03,$5e,$06
@@ -1343,10 +1343,10 @@ Text0378: ; 3ef66 (f:6f66)
 	done
 
 Text0379: ; 3efc3 (f:6fc3)
-	text TX_RAM1," is crazy about Pok`mon"
+	text TX_RAM1, " is crazy about Pok`mon"
 	line "and Pok`mon card collecting!"
 	line "One day,"
-	line TX_RAM1," heard a rumor:"
+	line TX_RAM1, " heard a rumor:"
 	line " \"The Legendary Pok`mon Cards..."
 	line "  the extremely rare and powerful "
 	line "  cards held by Pok`mon Trading "
@@ -1355,7 +1355,7 @@ Text0379: ; 3efc3 (f:6fc3)
 	line "  for one to inherit the legend!\""
 	line "Dreaming of inheriting the"
 	line "Legendary Pok`mon Cards,"
-	line TX_RAM1," visits the Pok`mon"
+	line TX_RAM1, " visits the Pok`mon"
 	line "card researcher, Dr. Mason..."
 	done
 
@@ -1440,26 +1440,26 @@ Text0384: ; 3f2c0 (f:72c0)
 	done
 
 Text0385: ; 3f2c6 (f:72c6)
-	text "WIN      ",TX_RAM3," Prizes Duel"
-	line "LOSE     with ",TX_RAM2,"(",TX_RAM3,")"
+	text "WIN      ", TX_RAM3, " Prizes Duel"
+	line "LOSE     with ", TX_RAM2, "(", TX_RAM3, ")"
 	done
 
 Text0386: ; 3f2f1 (f:72f1)
-	text "         Use ",TX_RAM3,"'s Deck"
+	text "         Use ", TX_RAM3, "'s Deck"
 	done
 
 ReceivedBoosterPackText: ; 3f308 (f:7308)
-	text TX_RAM1," received a Booster"
-	line "Pack: ",TX_RAM2,"."
+	text TX_RAM1, " received a Booster"
+	line "Pack: ", TX_RAM2, "."
 	done
 
 AndAnotherBoosterPackText: ; 3f327 (f:7327)
 	text "...And another Booster Pack:"
-	line TX_RAM2,"."
+	line TX_RAM2, "."
 	done
 
 CheckedCardsInBoosterPackText: ; 3f348 (f:7348)
-	text TX_RAM1," checked the cards"
+	text TX_RAM1, " checked the cards"
 	line "in the Booster Pack!!"
 	done
 
@@ -1469,8 +1469,8 @@ Text038a: ; 3f373 (f:7373)
 	done
 
 WonTheMedalText: ; 3f39b (f:739b)
-	text TX_RAM1,""
-	line "Won the ",TX_RAM2," Medal!"
+	text TX_RAM1, ""
+	line "Won the ", TX_RAM2, " Medal!"
 	done
 
 Text038c: ; 3f3af (f:73af)
@@ -1515,11 +1515,11 @@ Text0394: ; 3f4d6 (f:74d6)
 	done
 
 Text0395: ; 3f4f3 (f:74f3)
-	text TX_RAM2,"  ",TX_RAM2
+	text TX_RAM2, "  ", TX_RAM2
 	done
 
 Text0396: ; 3f4f9 (f:74f9)
-	text TX_RAM2," Deck"
+	text TX_RAM2, " Deck"
 	done
 
 Text0397: ; 3f501 (f:7501)
@@ -1846,51 +1846,51 @@ Text03e7: ; 3f823 (f:7823)
 	done
 
 Text03e8: ; 3f82a (f:782a)
-	text TX_LVL,"60 MEWTWO "
+	text TX_LVL, "60 MEWTWO "
 	done
 
 Text03e9: ; 3f838 (f:7838)
-	text TX_LVL,"8 MEW "
+	text TX_LVL, "8 MEW "
 	done
 
 Text03ea: ; 3f842 (f:7842)
-	text TX_LVL,"34 ARCANINE"
+	text TX_LVL, "34 ARCANINE"
 	done
 
 Text03eb: ; 3f851 (f:7851)
-	text TX_LVL,"16 PIKACHU"
+	text TX_LVL, "16 PIKACHU"
 	done
 
 Text03ec: ; 3f85f (f:785f)
-	text TX_LVL,"13 SURFING PIKACHU"
+	text TX_LVL, "13 SURFING PIKACHU"
 	done
 
 Text03ed: ; 3f875 (f:7875)
-	text TX_LVL,"20 ELECTABUZZ"
+	text TX_LVL, "20 ELECTABUZZ"
 	done
 
 Text03ee: ; 3f886 (f:7886)
-	text TX_LVL,"9 SLOWPOKE"
+	text TX_LVL, "9 SLOWPOKE"
 	done
 
 Text03ef: ; 3f894 (f:7894)
-	text TX_LVL,"12 JIGGLYPUFF"
+	text TX_LVL, "12 JIGGLYPUFF"
 	done
 
 Text03f0: ; 3f8a5 (f:78a5)
-	text TX_LVL,"68 ZAPDOS"
+	text TX_LVL, "68 ZAPDOS"
 	done
 
 Text03f1: ; 3f8b2 (f:78b2)
-	text TX_LVL,"37 MOLTRES"
+	text TX_LVL, "37 MOLTRES"
 	done
 
 Text03f2: ; 3f8c0 (f:78c0)
-	text TX_LVL,"37 ARTICUNO"
+	text TX_LVL, "37 ARTICUNO"
 	done
 
 Text03f3: ; 3f8cf (f:78cf)
-	text TX_LVL,"41 DRAGONITE"
+	text TX_LVL, "41 DRAGONITE"
 	done
 
 Text03f4: ; 3f8df (f:78df)
@@ -1898,7 +1898,7 @@ Text03f4: ; 3f8df (f:78df)
 	done
 
 Text03f5: ; 3f8f7 (f:78f7)
-	text TX_LVL,"12 FLYING PIKACHU"
+	text TX_LVL, "12 FLYING PIKACHU"
 	done
 
 Text03f6: ; 3f90c (f:790c)
@@ -1935,7 +1935,7 @@ Text03fd: ; 3f9d0 (f:79d0)
 	done
 
 Text03fe: ; 3f9f2 (f:79f2)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1, "."
 	line "How can I help you?"
 	done
 
@@ -1958,7 +1958,7 @@ Text0400: ; 3fa32 (f:7a32)
 	done
 
 Text0401: ; 3faaa (f:7aaa)
-	text TX_RAM1,","
+	text TX_RAM1, ","
 	line "It's me, Doctor Mason."
 	line "Are you getting the hang of"
 	line "the Pok`mon Trading Card Game?"
@@ -1995,7 +1995,7 @@ Text0402: ; 3fd72 (f:7d72)
 	done
 
 Text0403: ; 3fe10 (f:7e10)
-	text TX_RAM1,","
+	text TX_RAM1, ","
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
 	line "about Mitch's deck - he's "
@@ -2010,7 +2010,7 @@ Text0403: ; 3fe10 (f:7e10)
 	done
 
 Text0404: ; 3ff4d (f:7f4d)
-	text TX_RAM1,", I know you can do it!"
+	text TX_RAM1, ", I know you can do it!"
 	line "Go win the Fighting Medal!"
 	line "Mason Laboratory"
 	line "      Doctor Mason ;)"
diff --git a/src/text/text4.asm b/src/text/text4.asm
index c7e1f27..6aa3493 100644
--- a/src/text/text4.asm
+++ b/src/text/text4.asm
@@ -1,5 +1,5 @@
 Text0405: ; 40000 (10:4000)
-	text TX_RAM1,","
+	text TX_RAM1, ","
 	line "It's me, Doctor Mason."
 	line "I have some information about"
 	line "Gene's deck - he's the Master "
@@ -14,14 +14,14 @@ Text0405: ; 40000 (10:4000)
 	done
 
 Text0406: ; 4014a (10:414a)
-	text TX_RAM1,"! Go defeat Gene,"
+	text TX_RAM1, "! Go defeat Gene,"
 	line "the Master of the Rock Club!"
 	line "Mason Laboratory"
 	line "      Doctor Mason  ;)"
 	done
 
 Text0407: ; 401a3 (10:41a3)
-	text TX_RAM1,","
+	text TX_RAM1, ","
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
 	line "about Amy's deck - she's the "
@@ -41,14 +41,14 @@ Text0407: ; 401a3 (10:41a3)
 	done
 
 Text0408: ; 4033e (10:433e)
-	text TX_RAM1,"!"
+	text TX_RAM1, "!"
 	line "Keep at it, and don't give up!"
 	line "Mason Laboratory"
 	line "      Doctor Mason  ;)"
 	done
 
 Text0409: ; 40389 (10:4389)
-	text "How's it going, ",TX_RAM1,"?"
+	text "How's it going, ", TX_RAM1, "?"
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
 	line "about Isaac's deck - he's"
@@ -120,7 +120,7 @@ Text040d: ; 40819 (10:4819)
 	done
 
 Text040e: ; 409c6 (10:49c6)
-	text "Fight to the end, ",TX_START,TX_RAM1,","
+	text "Fight to the end, ", TX_START,  TX_RAM1, ","
 	line "and don't give up!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
@@ -128,7 +128,7 @@ Text040e: ; 409c6 (10:49c6)
 
 Text040f: ; 40a15 (10:4a15)
 	text "It's me, Dr. Mason."
-	line "How are you doing, ",TX_RAM1,"?"
+	line "How are you doing, ", TX_RAM1, "?"
 	line "I have some information for you"
 	line "about Rick's deck - he's "
 	line "the Master of the Science Club."
@@ -148,7 +148,7 @@ Text040f: ; 40a15 (10:4a15)
 Text0410: ; 40bea (10:4bea)
 	text "Win all 8 Master Medals, "
 	line ""
-	text TX_RAM1,"!"
+	text TX_RAM1, "!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
 	done
@@ -226,7 +226,7 @@ Text0414: ; 40fca (10:4fca)
 	done
 
 Text0415: ; 4123d (10:523d)
-	text TX_RAM1,","
+	text TX_RAM1, ","
 	line "It's me, Dr. Mason."
 	line "You're finally going to be dueling"
 	line "a Grand Master..."
@@ -247,7 +247,7 @@ Text0415: ; 4123d (10:523d)
 	done
 
 Text0416: ; 413f1 (10:53f1)
-	text TX_RAM1,","
+	text TX_RAM1, ","
 	line "It's me, Dr. Mason!"
 	line "Grand Master Steve uses"
 	line "the Legendary ZAPDOS."
@@ -264,7 +264,7 @@ Text0416: ; 413f1 (10:53f1)
 	line "using your Fighting Pok`mon."
 	line "Defeat the Grand Masters,"
 	line ""
-	text TX_RAM1,"!!!"
+	text TX_RAM1, "!!!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
 	line "p.s."
@@ -284,7 +284,7 @@ Text0417: ; 415cf (10:55cf)
 	line "His deck should be mostly"
 	line "Water Pok`mon, so it will be"
 	line "weak against Lightning Pok`mon!"
-	line "Go get 'em, ",TX_RAM1,"!"
+	line "Go get 'em, ", TX_RAM1, "!"
 	line "You're almost there!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
@@ -305,7 +305,7 @@ Text0418: ; 4174c (10:574c)
 	line "of striking early. This is the "
 	line "final test in inheriting "
 	line "the Legendary Pok`mon Cards!"
-	line "Go, ",TX_RAM1,"!"
+	line "Go, ", TX_RAM1, "!"
 	line "Be a part of the legend!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
@@ -386,12 +386,12 @@ Text0423: ; 41cf7 (10:5cf7)
 	done
 
 Text0424: ; 41d2a (10:5d2a)
-	text TX_RAM1," traded a Lapras"
+	text TX_RAM1, " traded a Lapras"
 	line "for an Arcanine!"
 	done
 
 Text0425: ; 41d4e (10:5d4e)
-	text "Thanks, ",TX_RAM1,"!"
+	text "Thanks, ", TX_RAM1, "!"
 	line "I'll take good care"
 	line "of this Lapras."
 	done
@@ -642,14 +642,14 @@ Text044d: ; 4294b (10:694b)
 	done
 
 Text044e: ; 4296d (10:696d)
-	text "Was it ",TX_RAM1,"?"
+	text "Was it ", TX_RAM1, "?"
 	line "I will be your next opponent."
 	line "I, Amy, the Master of the "
 	line "Water Club!"
 	done
 
 Text044f: ; 429bd (10:69bd)
-	text "Aren't you ",TX_RAM1,"?"
+	text "Aren't you ", TX_RAM1, "?"
 	line "So you decided you want to"
 	line "duel me?"
 	done
@@ -698,7 +698,7 @@ Text0457: ; 42ba1 (10:6ba1)
 	done
 
 Text0458: ; 42be9 (10:6be9)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1, "."
 	line "Nice to see you again!!!"
 	line "Did you come to play the"
 	line "Pok`mon Trading Card Game?"
@@ -724,7 +724,7 @@ Text045b: ; 42d1e (10:6d1e)
 	line "Card Game. I'm not into dueling."
 	line "I prefer collecting the cards."
 	line "By the way, would you happen to have"
-	line TX_RAM2,"?"
+	line TX_RAM2, "?"
 	line "If you do, I was wondering if you"
 	line "might want to give it to me?"
 	line "How about it?"
@@ -734,20 +734,20 @@ Text045c: ; 42df7 (10:6df7)
 	text "Hi! It's you!"
 	line "What's up?"
 	line "Did you decide to give me"
-	line "your ",TX_RAM2,"?"
+	line "your ", TX_RAM2, "?"
 	done
 
 Text045d: ; 42e33 (10:6e33)
 	text "Hi! I see you're playing with"
 	line "the cards again."
 	line "By the way, I'm looking for"
-	line TX_RAM2," this time."
+	line TX_RAM2, " this time."
 	line "If you should happen to have one,"
 	line "would you mind giving it to me?"
 	done
 
 Text045e: ; 42ece (10:6ece)
-	text "Give away your ",TX_RAM2,"?"
+	text "Give away your ", TX_RAM2, "?"
 	done
 
 Text045f: ; 42ee1 (10:6ee1)
@@ -757,17 +757,17 @@ Text045f: ; 42ee1 (10:6ee1)
 	done
 
 Text0460: ; 42f2d (10:6f2d)
-	text "But you don't have ",TX_RAM2,"!"
+	text "But you don't have ", TX_RAM2, "!"
 	line "I appreciate your generosity, but "
 	line "you can't give me what you don't "
 	line "have. Come see me again after "
-	line "you get ",TX_RAM2,"."
+	line "you get ", TX_RAM2, "."
 	done
 
 Text0461: ; 42fb3 (10:6fb3)
 	text "You're going to give it to me?"
 	line "Thank you!"
-	line "But your ",TX_RAM2,""
+	line "But your ", TX_RAM2, ""
 	line "is in your Deck."
 	line "I can't take a card that you're"
 	line "playing with!"
@@ -786,7 +786,7 @@ Text0463: ; 430ab (10:70ab)
 	line "me so many cards,"
 	line "please accept this card as a gift"
 	line "from me to you."
-	line "It's a ",TX_LVL,"16 Pikachu."
+	line "It's a ", TX_LVL, "16 Pikachu."
 	line "Please take good care of it!"
 	done
 
@@ -815,7 +815,7 @@ Text0467: ; 43221 (10:7221)
 	line "I am the super musical star,"
 	line "Imakuni?!"
 	line "I'll sing the Pok`Rap - You dance!"
-	line $07,$03,$63,TX_START,"La di da la di da"
+	line $07,$03,$63, TX_START, "La di da la di da"
 	line "  La di da la di da..."
 	line "Hey!"
 	line "Move those feet!"
@@ -878,7 +878,7 @@ Text0471: ; 435a7 (10:75a7)
 	line "You weren't too bad, but since "
 	line "I won...Let's see you shake it!"
 	line "Come on, shake it!!!"
-	line $07,$03,$63,TX_START,"La di da la di da"
+	line $07,$03,$63, TX_START, "La di da la di da"
 	line "  La di da la di da..."
 	line "... You dance weird!"
 	done
diff --git a/src/text/text5.asm b/src/text/text5.asm
index 404dbfa..16f26e9 100644
--- a/src/text/text5.asm
+++ b/src/text/text5.asm
@@ -692,7 +692,7 @@ Text04f4: ; 46aae (11:6aae)
 	line "for Game Boy includes many "
 	line "original cards, like the "
 	line ""
-	text TX_LVL,"14 Meowth with the Cat Punch "
+	text TX_LVL, "14 Meowth with the Cat Punch "
 	line "attack. There are many new cards,"
 	line "so go search them out!"
 	done
@@ -743,7 +743,7 @@ Text04fb: ; 46dcb (11:6dcb)
 
 Text04fc: ; 46dec (11:6dec)
 	text "The first of the Legendary Pok`mon"
-	line "Cards is ",TX_LVL,"37 Moltres. With"
+	line "Cards is ", TX_LVL, "37 Moltres. With"
 	line "Firegiver, you can place Fire"
 	line "Energy cards in your hand! Also,"
 	line "Dive Bomb is a powerful attack!"
@@ -757,7 +757,7 @@ Text04fd: ; 46ec2 (11:6ec2)
 
 Text04fe: ; 46ee3 (11:6ee3)
 	text "The second Legendary Pok`mon Card"
-	line "is ",TX_LVL,"68 Zapdos. With Peal of"
+	line "is ", TX_LVL, "68 Zapdos. With Peal of"
 	line "Thunder, just putting this card on"
 	line "the bench causes damage!"
 	line "Also, Big Thunder is a powerful"
@@ -771,7 +771,7 @@ Text04ff: ; 46fb8 (11:6fb8)
 
 Text0500: ; 46fd9 (11:6fd9)
 	text "The third Legendary Pok`mon Card"
-	line "is ",TX_LVL,"37 Articuno. Its Quickfreeze"
+	line "is ", TX_LVL, "37 Articuno. Its Quickfreeze"
 	line "will paralyze opponents' Pok`mon"
 	line "when the card is put in play!"
 	line "Also, Ice Breath is a powerful"
@@ -785,7 +785,7 @@ Text0501: ; 470b3 (11:70b3)
 
 Text0502: ; 470d4 (11:70d4)
 	text "The fourth Legendary Pok`mon Card"
-	line "is ",TX_LVL,"41 Dragonite. Its Healing"
+	line "is ", TX_LVL, "41 Dragonite. Its Healing"
 	line "Wind will heal damage done to "
 	line "Pok`mon when this card is played!"
 	line "Also, Slam is a powerful attack!"
@@ -864,14 +864,14 @@ Text050c: ; 475ab (11:75ab)
 	done
 
 Text050d: ; 47644 (11:7644)
-	text "Most unfortunate, ",TX_RAM1,"."
+	text "Most unfortunate, ", TX_RAM1, "."
 	line "Once you enter, you won't be able"
 	line "to re-enter for some time. "
 	line "Please try again another day."
 	done
 
 Text050e: ; 476b6 (11:76b6)
-	text "Congratulations, ",TX_RAM1,"!"
+	text "Congratulations, ", TX_RAM1, "!"
 	line "You received a card!"
 	line "Please join us for the next "
 	line "Challenge Cup, too."
@@ -919,7 +919,7 @@ Text0514: ; 47913 (11:7913)
 	done
 
 Text0515: ; 47984 (11:7984)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1, "."
 	line "Are you competing, too?"
 	done
 
@@ -927,13 +927,13 @@ Text0516: ; 479a4 (11:79a4)
 	text "I'm the one who's going to"
 	line "defeat 3 opponents! The prize, "
 	line ""
-	text TX_LVL,"60 Mewtwo, belongs to me!"
+	text TX_LVL, "60 Mewtwo, belongs to me!"
 	line "You just sit tight and watch me win!"
 	line "See Ya! Ha ha ha ha ha ha!"
 	done
 
 Text0517: ; 47a3d (11:7a3d)
-	text "Hey, it's ",TX_RAM1," - the loser"
+	text "Hey, it's ", TX_RAM1, " - the loser"
 	line "of the Challenge Cup!"
 	done
 
@@ -947,26 +947,26 @@ Text0518: ; 47a6c (11:7a6c)
 	done
 
 Text0519: ; 47b25 (11:7b25)
-	text "Hey ",TX_RAM1,", too bad "
+	text "Hey ", TX_RAM1, ", too bad "
 	line "you're too late!"
 	done
 
 Text051a: ; 47b47 (11:7b47)
 	text "The Challenge Cup is over! I"
 	line "defeated 3 opponents and won"
-	line "the prize - ",TX_LVL,"60 Mewtwo!"
+	line "the prize - ", TX_LVL, "60 Mewtwo!"
 	line "See ya! Ha ha ha ha ha ha!"
 	done
 
 Text051b: ; 47bb6 (11:7bb6)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1, "."
 	line "What are you doing here?"
 	done
 
 Text051c: ; 47bd7 (11:7bd7)
 	text "The Challenge Cup is over! I"
 	line "defeated 3 opponents and won"
-	line "the prize - ",TX_LVL,"60 Mewtwo!"
+	line "the prize - ", TX_LVL, "60 Mewtwo!"
 	line "I guess you could try entering"
 	line "the next Challenge Cup, but "
 	line "you won't have a chance since "
@@ -975,7 +975,7 @@ Text051c: ; 47bd7 (11:7bd7)
 	done
 
 Text051d: ; 47cb9 (11:7cb9)
-	text "Hey, ",TX_RAM1,"."
+	text "Hey, ", TX_RAM1, "."
 	line "We meet again."
 	done
 
@@ -983,14 +983,14 @@ Text051e: ; 47cd1 (11:7cd1)
 	text "No matter who enters the Challenge"
 	line "Cup, I'll be the winner! "
 	line ""
-	text TX_LVL,"8 Mew, this Cup's prize, will "
+	text TX_LVL, "8 Mew, this Cup's prize, will "
 	line "belong to me! Why don't you just"
 	line "give up and go home!"
 	line "See ya! Ha ha ha ha ha ha!"
 	done
 
 Text051f: ; 47d82 (11:7d82)
-	text "Hey, it's ",TX_RAM1," - the"
+	text "Hey, it's ", TX_RAM1, " - the"
 	line "loser of the Challenge Cup!"
 	done
 
@@ -1003,7 +1003,7 @@ Text0520: ; 47db1 (11:7db1)
 	done
 
 Text0521: ; 47e4f (11:7e4f)
-	text "Hey, isn't that ",TX_RAM1,"?"
+	text "Hey, isn't that ", TX_RAM1, "?"
 	line "Late as always!"
 	done
 
@@ -1012,11 +1012,11 @@ Text0522: ; 47e73 (11:7e73)
 	line "over! What? Who won?"
 	line "Who do you expect!?! Me, of "
 	line "course! The prize belongs to"
-	line "me! ",TX_LVL,"8 Mew! See ya!"
+	line "me! ", TX_LVL, "8 Mew! See ya!"
 	line "Ha ha ha ha ha ha!"
 	done
 
 Text0523: ; 47f08 (11:7f08)
-	text "Hey, ",TX_RAM1,"!"
+	text "Hey, ", TX_RAM1, "!"
 	line "What are you doing here?"
 	done
diff --git a/src/text/text6.asm b/src/text/text6.asm
index 5cbf6dd..78e60cb 100644
--- a/src/text/text6.asm
+++ b/src/text/text6.asm
@@ -1,7 +1,7 @@
 Text0524: ; 48000 (12:4000)
 	text "The Challenge Cup is over already! "
 	line "Too bad you couldn't enter!"
-	line "The prize belongs to me! ",TX_LVL,"8 Mew!"
+	line "The prize belongs to me! ", TX_LVL, "8 Mew!"
 	line "You really should enter the next"
 	line "Challenge Cup! But then again, "
 	line "why bother, since I'll also win "
@@ -55,14 +55,14 @@ Text052b: ; 48376 (12:4376)
 	text "The first Challenge Cup is"
 	line "now underway!"
 	line "Defeat 3 opponents to win the"
-	line "wonderful prize of ",TX_LVL,"60 Mewtwo!"
+	line "wonderful prize of ", TX_LVL, "60 Mewtwo!"
 	done
 
 Text052c: ; 483de (12:43de)
 	text "The second Challenge Cup is"
 	line "now under way!"
 	line "Defeat 3 opponents to win the"
-	line "wonderful prize of ",TX_LVL,"8 Mew!"
+	line "wonderful prize of ", TX_LVL, "8 Mew!"
 	done
 
 Text052d: ; 48444 (12:4444)
@@ -98,12 +98,12 @@ Text0532: ; 4856a (12:456a)
 	done
 
 Text0533: ; 485a2 (12:45a2)
-	text "Presently, ",TX_RAM1," is still"
+	text "Presently, ", TX_RAM1, " is still"
 	line "a contender!"
 	done
 
 Text0534: ; 485c6 (12:45c6)
-	text TX_RAM1," is the new challenger!"
+	text TX_RAM1, " is the new challenger!"
 	done
 
 Text0535: ; 485e0 (12:45e0)
@@ -113,22 +113,22 @@ Text0535: ; 485e0 (12:45e0)
 	done
 
 Text0536: ; 48612 (12:4612)
-	text "The winner is ",TX_RAM2,"!!"
+	text "The winner is ", TX_RAM2, "!!"
 	line ""
-	text TX_RAM2," has defeated 2 opponents!"
+	text TX_RAM2, " has defeated 2 opponents!"
 	line "Just 1 more opponent to go"
 	line "before winning the prize!"
 	done
 
 Text0537: ; 48677 (12:4677)
-	text "Too bad, ",TX_RAM1,"."
+	text "Too bad, ", TX_RAM1, "."
 	line "Have a safe trip home!"
 	done
 
 Text0538: ; 4869b (12:469b)
-	text "The Winner is ",TX_RAM2,"!!!"
+	text "The Winner is ", TX_RAM2, "!!!"
 	line ""
-	text TX_RAM2," has defeated 1 opponent!"
+	text TX_RAM2, " has defeated 1 opponent!"
 	line "2 more opponents to go"
 	line "before winning the prize!"
 	done
@@ -136,7 +136,7 @@ Text0538: ; 4869b (12:469b)
 Text0539: ; 486fc (12:46fc)
 	text "How unfortunate!"
 	line "Unable to defeat the last opponent!"
-	line "It was close, but ",TX_RAM1," was "
+	line "It was close, but ", TX_RAM1, " was "
 	line "defeated by the third opponent!"
 	done
 
@@ -150,26 +150,26 @@ Text053b: ; 487c0 (12:47c0)
 	text "Ha ha ha! How about that!?!"
 	line "I win!!"
 	line "2 more opponents to go and"
-	line "the ",TX_LVL,"8 Mew belongs to me!"
+	line "the ", TX_LVL, "8 Mew belongs to me!"
 	done
 
 Text053c: ; 4881b (12:481b)
 	text "Congratulations!"
-	line "The Winner is ",TX_RAM1,"!"
+	line "The Winner is ", TX_RAM1, "!"
 	line ""
-	text TX_RAM1," has defeated"
+	text TX_RAM1, " has defeated"
 	line "1 opponent!!!"
 	done
 
 Text053d: ; 4885c (12:485c)
-	text "Way to go, ",TX_RAM1,"!"
+	text "Way to go, ", TX_RAM1, "!"
 	line "That's 2 wins!!!"
 	line "One more opponent to go before"
 	line "winning the Challenge Cup!"
 	done
 
 Text053e: ; 488b6 (12:48b6)
-	text "Most unfortunate, ",TX_RAM2,"."
+	text "Most unfortunate, ", TX_RAM2, "."
 	line "Have a safe trip home!"
 	done
 
@@ -180,27 +180,27 @@ Text053f: ; 488e3 (12:48e3)
 Text0540: ; 48904 (12:4904)
 	text "Our new challenger is..."
 	line ""
-	text TX_RAM2,"!"
+	text TX_RAM2, "!"
 	done
 
 Text0541: ; 48922 (12:4922)
 	text "The third opponent is"
 	line ""
-	text TX_RAM2,"!"
+	text TX_RAM2, "!"
 	done
 
 Text0542: ; 4893d (12:493d)
-	text "Hey, ",TX_RAM1,"!"
+	text "Hey, ", TX_RAM1, "!"
 	line "I'm not gonna lose to you!"
 	line ""
-	text TX_LVL,"60 Mewtwo belongs to me!!!"
+	text TX_LVL, "60 Mewtwo belongs to me!!!"
 	done
 
 Text0543: ; 4897f (12:497f)
-	text TX_RAM1,"!"
+	text TX_RAM1, "!"
 	line "I'm going to defeat you!"
 	line ""
-	text TX_LVL,"8 Mew belongs to me!!!"
+	text TX_LVL, "8 Mew belongs to me!!!"
 	done
 
 Text0544: ; 489b6 (12:49b6)
@@ -217,12 +217,12 @@ Text0546: ; 489f5 (12:49f5)
 	done
 
 Text0547: ; 48a09 (12:4a09)
-	text "Well then, ",TX_RAM1,"!"
+	text "Well then, ", TX_RAM1, "!"
 	line "Let the second match begin!"
 	done
 
 Text0548: ; 48a34 (12:4a34)
-	text "Well, ",TX_RAM1,", let the third,"
+	text "Well, ", TX_RAM1, ", let the third,"
 	line "and final, match begin!"
 	done
 
@@ -237,7 +237,7 @@ Text054a: ; 48a90 (12:4a90)
 	done
 
 Text054b: ; 48abf (12:4abf)
-	text "Most unfortunate, ",TX_RAM2,"."
+	text "Most unfortunate, ", TX_RAM2, "."
 	line "Do try again in the next"
 	line "Challenge Cup."
 	done
@@ -252,31 +252,31 @@ Text054d: ; 48b25 (12:4b25)
 	done
 
 Text054e: ; 48b3f (12:4b3f)
-	text TX_RAM1,"!"
+	text TX_RAM1, "!"
 	line "I won't lose next time!"
 	done
 
 Text054f: ; 48b5b (12:4b5b)
-	text TX_RAM1,"!"
+	text TX_RAM1, "!"
 	line "I'll win next time!"
 	done
 
 Text0550: ; 48b73 (12:4b73)
 	text "The Winner of this Challenge Cup "
-	line "is ",TX_START,TX_RAM1,"!!!"
+	line "is ", TX_START,  TX_RAM1, "!!!"
 	done
 
 Text0551: ; 48b9f (12:4b9f)
-	text TX_RAM1,", your prize"
-	line "is ",TX_RAM2,"!"
+	text TX_RAM1, ", your prize"
+	line "is ", TX_RAM2, "!"
 	done
 
 Text0552: ; 48bb4 (12:4bb4)
-	text "Congratulations, ",TX_START,TX_RAM1,"!!!"
+	text "Congratulations, ", TX_START,  TX_RAM1, "!!!"
 	done
 
 Text0553: ; 48bcc (12:4bcc)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1, "."
 	line "What are you doing here?"
 	done
 
@@ -296,9 +296,9 @@ Text0555: ; 48c87 (12:4c87)
 	done
 
 Text0556: ; 48cf5 (12:4cf5)
-	text "Hey, ",TX_RAM1,"!"
-	line "You only have ",TX_RAM3," Medals!"
-	line "I've already collected ",TX_RAM3,"!"
+	text "Hey, ", TX_RAM1, "!"
+	line "You only have ", TX_RAM3, " Medals!"
+	line "I've already collected ", TX_RAM3, "!"
 	line "Why don't you just give up? See ya!"
 	done
 
@@ -329,7 +329,7 @@ Text055a: ; 48eb8 (12:4eb8)
 	done
 
 Text055b: ; 48f10 (12:4f10)
-	text "You're very good, ",TX_RAM1,"."
+	text "You're very good, ", TX_RAM1, "."
 	line "Please take care of my card."
 	done
 
@@ -352,7 +352,7 @@ Text055e: ; 48fcb (12:4fcb)
 
 Text055f: ; 48ff9 (12:4ff9)
 	text "You've really improved your "
-	line "game, ",TX_START,TX_RAM1,"."
+	line "game, ", TX_START,  TX_RAM1, "."
 	line "Use my card to make it better!"
 	done
 
@@ -361,7 +361,7 @@ Text0560: ; 49040 (12:5040)
 	line "The Legendary Cards seem pleased"
 	line "to be passed on to you"
 	line ""
-	text TX_RAM1,". Hurry and go through"
+	text TX_RAM1, ". Hurry and go through"
 	line "to the Hall of Honor!"
 	done
 
@@ -372,14 +372,14 @@ Text0561: ; 490c6 (12:50c6)
 	done
 
 Text0562: ; 4911e (12:511e)
-	text TX_RAM1,", That is not the way"
+	text TX_RAM1, ", That is not the way"
 	line "to the Hall of Honor."
-	line "Hurry, ",TX_START,TX_RAM1,"! Go through to"
+	line "Hurry, ", TX_START,  TX_RAM1, "! Go through to"
 	line "the Hall of Honor!"
 	done
 
 Text0563: ; 49178 (12:5178)
-	text TX_RAM1,", if you leave the "
+	text TX_RAM1, ", if you leave the "
 	line "Grand Hall, you must defeat "
 	line "each of us again to enter"
 	line "the Hall of Honor."
@@ -460,7 +460,7 @@ Text0570: ; 49506 (12:5506)
 	done
 
 Text0571: ; 49570 (12:5570)
-	text TX_RAM1,","
+	text TX_RAM1, ","
 	line "take your place at the table."
 	done
 
@@ -521,12 +521,12 @@ Text057a: ; 49864 (12:5864)
 	done
 
 Text057b: ; 498b8 (12:58b8)
-	text "Very good, ",TX_RAM1,"!"
+	text "Very good, ", TX_RAM1, "!"
 	line "Your second opponent is Steve!"
 	done
 
 Text057c: ; 498e6 (12:58e6)
-	text TX_RAM1,"! Next, you must duel "
+	text TX_RAM1, "! Next, you must duel "
 	line "Steve!"
 	done
 
@@ -538,12 +538,12 @@ Text057d: ; 49906 (12:5906)
 	done
 
 Text057e: ; 49980 (12:5980)
-	text "Hey, ",TX_RAM1,"!"
+	text "Hey, ", TX_RAM1, "!"
 	line "Come battle Steve!"
 	done
 
 Text057f: ; 4999c (12:599c)
-	text "Is your Deck ready, ",TX_START,TX_RAM1,"?"
+	text "Is your Deck ready, ", TX_START,  TX_RAM1, "?"
 	done
 
 Text0580: ; 499b5 (12:59b5)
@@ -587,12 +587,12 @@ Text0586: ; 49b27 (12:5b27)
 	done
 
 Text0587: ; 49b50 (12:5b50)
-	text "Very good, ",TX_RAM1,"."
+	text "Very good, ", TX_RAM1, "."
 	line "Your next opponent is Jack!"
 	done
 
 Text0588: ; 49b7b (12:5b7b)
-	text "That's great, ",TX_RAM1,"!"
+	text "That's great, ", TX_RAM1, "!"
 	line "Jack is your next opponent!"
 	done
 
@@ -609,7 +609,7 @@ Text058a: ; 49c1c (12:5c1c)
 	done
 
 Text058b: ; 49c5f (12:5c5f)
-	text TX_RAM1,","
+	text TX_RAM1, ","
 	line "have you readied your deck?"
 	done
 
@@ -682,7 +682,7 @@ Text0597: ; 49f7e (12:5f7e)
 	done
 
 Text0598: ; 49fb5 (12:5fb5)
-	text "Is your Deck ready, ",TX_START,TX_RAM1,"?"
+	text "Is your Deck ready, ", TX_START,  TX_RAM1, "?"
 	done
 
 Text0599: ; 49fce (12:5fce)
@@ -719,7 +719,7 @@ Text059f: ; 4a11a (12:611a)
 	text "Wha-what on earth?  Even"
 	line "I, Rod, have been defeated?!?"
 	line "Wonderful! This is wonderful!!"
-	line "Congratulations, ",TX_RAM1,". "
+	line "Congratulations, ", TX_RAM1, ". "
 	line "You have proven yourself worthy"
 	line "enough to inherit the"
 	line "Legendary Pok`mon Cards!!!"
@@ -727,7 +727,7 @@ Text059f: ; 4a11a (12:611a)
 	done
 
 Text05a0: ; 4a1e1 (12:61e1)
-	text "Congratulations, ",TX_RAM1,"!"
+	text "Congratulations, ", TX_RAM1, "!"
 	line "You're a master duelist!!!"
 	line "But..."
 	done
@@ -744,7 +744,7 @@ Text05a2: ; 4a26c (12:626c)
 	done
 
 Text05a3: ; 4a289 (12:6289)
-	text "Congratulations, ",TX_RAM1,"!"
+	text "Congratulations, ", TX_RAM1, "!"
 	line "You're a master duelist!"
 	done
 
@@ -767,7 +767,7 @@ Text05a6: ; 4a369 (12:6369)
 	line "allowed! He, too, has earned "
 	line "the right to inherit the "
 	line "Legendary Pok`mon Cards!"
-	line "Ronald! ",TX_RAM1,"!"
+	line "Ronald! ", TX_RAM1, "!"
 	line "You two must duel to determine who "
 	line "will inherit the Legendary Pok`mon "
 	line "Cards. So say the Rules!"
@@ -782,11 +782,11 @@ Text05a8: ; 4a452 (12:6452)
 	line "Ronald!!!"
 	line "I'll take your challenge,"
 	line ""
-	text TX_RAM1,"!"
+	text TX_RAM1, "!"
 	done
 
 Text05a9: ; 4a49a (12:649a)
-	text "Is your Deck ready, ",TX_START,TX_RAM1,"?"
+	text "Is your Deck ready, ", TX_START,  TX_RAM1, "?"
 	done
 
 Text05aa: ; 4a4b3 (12:64b3)
@@ -802,7 +802,7 @@ Text05ac: ; 4a4f5 (12:64f5)
 	text "I was here first! The Legendary"
 	line "Pok`mon Cards belong to me!"
 	line "I'll make it all too clear to"
-	line "you, ",TX_START,TX_RAM1,"!"
+	line "you, ", TX_START,  TX_RAM1, "!"
 	done
 
 Text05ad: ; 4a559 (12:6559)
@@ -827,7 +827,7 @@ Text05af: ; 4a65c (12:665c)
 
 Text05b0: ; 4a67f (12:667f)
 	text "I'm sorry, but the Legendary Pok`mon"
-	line "Cards have chosen ",TX_RAM1,"."
+	line "Cards have chosen ", TX_RAM1, "."
 	done
 
 Text05b1: ; 4a6ba (12:66ba)
@@ -843,7 +843,7 @@ Text05b2: ; 4a6f4 (12:66f4)
 	done
 
 Text05b3: ; 4a72d (12:672d)
-	text "Congratulations, ",TX_RAM1,"!"
+	text "Congratulations, ", TX_RAM1, "!"
 	line "You are a Card Master"
 	line "worthy of inheriting"
 	line "the Legendary Pok`mon Cards!"
@@ -961,7 +961,7 @@ Text05c0: ; 4af26 (12:6f26)
 	done
 
 Text05c1: ; 4afb0 (12:6fb0)
-	text TX_RAM1," received some "
+	text TX_RAM1, " received some "
 	line "Energy cards!"
 	done
 
@@ -987,7 +987,7 @@ Text05c4: ; 4b129 (12:7129)
 	text "You finally inherited the"
 	line "Legendary Pok`mon Cards!"
 	line "Amazing!"
-	line "Congratulations, ",TX_RAM1,"!!!"
+	line "Congratulations, ", TX_RAM1, "!!!"
 	done
 
 Text05c5: ; 4b17c (12:717c)
@@ -1005,7 +1005,7 @@ Text05c6: ; 4b274 (12:7274)
 	text "Congratulations on inheriting "
 	line "the Legendary Pok`mon Cards,"
 	line ""
-	text TX_RAM1,"! Now you should try"
+	text TX_RAM1, "! Now you should try"
 	line "dueling different people using the"
 	line "cards you inherited. I'm sure "
 	line "you'll have a good time!"
@@ -1048,7 +1048,7 @@ Text05ca: ; 4b4ea (12:74ea)
 	line "opponents, you win! You can also "
 	line "play to extend your winning "
 	line "streak! Build a deck and "
-	line "give it a try, ",TX_RAM1,"!"
+	line "give it a try, ", TX_RAM1, "!"
 	done
 
 Text05cb: ; 4b63e (12:763e)
@@ -1129,8 +1129,8 @@ Text05d7: ; 4ba32 (12:7a32)
 	line "by attacking. Pok`mon need Energy "
 	line "cards in order to attack."
 	line "For example, the energy required "
-	line "for Seaking's Waterfall is ",TX_WATER,TX_COLORLESS,"."
-	line TX_WATER,TX_COLORLESS," stands for 1 Water Energy "
+	line "for Seaking's Waterfall is ", TX_WATER,  TX_COLORLESS, "."
+	line TX_WATER,  TX_COLORLESS, " stands for 1 Water Energy "
 	line "card and another Energy card of "
 	line "any type. The energy required "
 	line "differs according to the attack."
diff --git a/src/text/text7.asm b/src/text/text7.asm
index 76e2c47..d7b9b51 100644
--- a/src/text/text7.asm
+++ b/src/text/text7.asm
@@ -69,7 +69,7 @@ Text05e0: ; 4c5a1 (13:45a1)
 	done
 
 Text05e1: ; 4c66a (13:466a)
-	text "Congratulations, ",TX_RAM1,"!"
+	text "Congratulations, ", TX_RAM1, "!"
 	line "I hear you have inherited the"
 	line "Legendary Pok`mon Cards!"
 	line "The strength of a Deck does"
@@ -94,7 +94,7 @@ Text05e2: ; 4c786 (13:4786)
 	done
 
 Text05e3: ; 4c86f (13:486f)
-	text "Oh! Why the rush, ",TX_RAM1,"?"
+	text "Oh! Why the rush, ", TX_RAM1, "?"
 	line "What? "
 	line "You want to learn how to play"
 	line "the Pok`mon Trading Card Game?"
@@ -112,7 +112,7 @@ Text05e3: ; 4c86f (13:486f)
 
 Text05e4: ; 4c9d7 (13:49d7)
 	text "Yes, Dr. Mason."
-	line "Hello, ",TX_RAM1,"."
+	line "Hello, ", TX_RAM1, "."
 	done
 
 Text05e5: ; 4c9f2 (13:49f2)
@@ -121,7 +121,7 @@ Text05e5: ; 4c9f2 (13:49f2)
 	done
 
 Text05e6: ; 4ca0c (13:4a0c)
-	text "Hey! ",TX_RAM1,"!"
+	text "Hey! ", TX_RAM1, "!"
 	line "Hurry and come here!"
 	done
 
@@ -131,7 +131,7 @@ Text05e7: ; 4ca2a (13:4a2a)
 	done
 
 Text05e8: ; 4ca52 (13:4a52)
-	text "OK, ",TX_RAM1,"."
+	text "OK, ", TX_RAM1, "."
 	line "What do you want to ask about?"
 	done
 
@@ -196,31 +196,31 @@ Text05f0: ; 4ce5a (13:4e5a)
 	done
 
 Text05f1: ; 4ce96 (13:4e96)
-	text TX_RAM1," handed his cards to "
+	text TX_RAM1, " handed his cards to "
 	line "Dr. Mason."
 	done
 
 Text05f2: ; 4ceb9 (13:4eb9)
 	text "Hmm...let me add some of my own "
 	line "cards to yours!"
-	line "Now, ",TX_RAM1,", what kind"
+	line "Now, ", TX_RAM1, ", what kind"
 	line "of Deck do you want?"
 	done
 
 Text05f3: ; 4cf12 (13:4f12)
-	text "A ",TX_RAM2,"?"
+	text "A ", TX_RAM2, "?"
 	done
 
 Text05f4: ; 4cf18 (13:4f18)
-	text "OK, a ",TX_RAM2,"!"
+	text "OK, a ", TX_RAM2, "!"
 	line "Here are the remaining cards!"
 	done
 
 Text05f5: ; 4cf40 (13:4f40)
-	text TX_RAM1," received"
-	line "a ",TX_RAM2,"!"
+	text TX_RAM1, " received"
+	line "a ", TX_RAM2, "!"
 	line ""
-	text TX_RAM1," received"
+	text TX_RAM1, " received"
 	line "30 cards!"
 	done
 
@@ -284,7 +284,7 @@ Text05fb: ; 4d361 (13:5361)
 	done
 
 Text05fc: ; 4d423 (13:5423)
-	text TX_RAM1,", thanks to you, all"
+	text TX_RAM1, ", thanks to you, all"
 	line "the Auto Deck Machines have"
 	line "been activated!"
 	done
@@ -312,7 +312,7 @@ Text0600: ; 4d531 (13:5531)
 	done
 
 Text0601: ; 4d56a (13:556a)
-	text "Is it ",TX_RAM2,"?"
+	text "Is it ", TX_RAM2, "?"
 	done
 
 Text0602: ; 4d574 (13:5574)
@@ -341,17 +341,17 @@ Text0606: ; 4d655 (13:5655)
 	done
 
 Text0607: ; 4d676 (13:5676)
-	text "It's a ",TX_RAM2," Medal"
+	text "It's a ", TX_RAM2, " Medal"
 	line "Auto Deck Machine."
 	done
 
 Text0608: ; 4d699 (13:5699)
 	text "It isn't working since the "
-	line TX_RAM2," Medal is not inserted."
+	line TX_RAM2, " Medal is not inserted."
 	done
 
 Text0609: ; 4d6cf (13:56cf)
-	text "Insert the ",TX_RAM2," Medal?"
+	text "Insert the ", TX_RAM2, " Medal?"
 	done
 
 Text060a: ; 4d6e4 (13:56e4)
@@ -382,25 +382,25 @@ Text060e: ; 4d767 (13:5767)
 
 Text060f: ; 4d7fc (13:57fc)
 	text "Hey! Kid!"
-	line "I've got a ",TX_LVL,"20 Electabuzz,"
+	line "I've got a ", TX_LVL, "20 Electabuzz,"
 	line "but what I really want is"
-	line "a ",TX_LVL,"35 Electabuzz!"
+	line "a ", TX_LVL, "35 Electabuzz!"
 	line "Hey! Kid! Do you have a"
 	line ""
-	text TX_LVL,"35 Electabuzz?"
+	text TX_LVL, "35 Electabuzz?"
 	done
 
 Text0610: ; 4d87a (13:587a)
 	text "Hey! Kid!"
 	line "We meet again!"
-	line "Do you have a ",TX_LVL,"35 Electabuzz?"
+	line "Do you have a ", TX_LVL, "35 Electabuzz?"
 	line "Come on! Trade it for my"
 	line ""
-	text TX_LVL,"20 Electabuzz!"
+	text TX_LVL, "20 Electabuzz!"
 	done
 
 Text0611: ; 4d8de (13:58de)
-	text "Trade your ",TX_LVL,"35 Electabuzz?"
+	text "Trade your ", TX_LVL, "35 Electabuzz?"
 	done
 
 Text0612: ; 4d8fb (13:58fb)
@@ -413,14 +413,14 @@ Text0612: ; 4d8fb (13:58fb)
 Text0613: ; 4d938 (13:5938)
 	text "Hey, kid!"
 	line "It's not cool to lie!"
-	line "You don't own a ",TX_LVL,"35 Electabuzz!"
+	line "You don't own a ", TX_LVL, "35 Electabuzz!"
 	line "You could get hurt lying to me, kid!"
 	done
 
 Text0614: ; 4d99f (13:599f)
 	text "You're gonna trade me your"
 	line ""
-	text TX_LVL,"35 Electabuzz?"
+	text TX_LVL, "35 Electabuzz?"
 	line "Way cool!...Hey! Wait, kid!"
 	line "That card's in your Deck!"
 	line "It isn't cool to take that card!"
@@ -432,10 +432,10 @@ Text0614: ; 4d99f (13:599f)
 Text0615: ; 4da6d (13:5a6d)
 	text "You're gonna trade me your"
 	line ""
-	text TX_LVL,"35 Electabuzz? Way cool, kid!"
+	text TX_LVL, "35 Electabuzz? Way cool, kid!"
 	line "OK, I'll trade you my"
 	line ""
-	text TX_LVL,"20 Electabuzz for it!"
+	text TX_LVL, "20 Electabuzz for it!"
 	done
 
 Text0616: ; 4dad9 (13:5ad9)
@@ -445,8 +445,8 @@ Text0616: ; 4dad9 (13:5ad9)
 
 Text0617: ; 4dafe (13:5afe)
 	text "Whoa! Cool, kid! Thanks for "
-	line "that ",TX_LVL,"35 Electabuzz! "
-	line "My ",TX_LVL,"20 Electabuzz is a cool card!"
+	line "that ", TX_LVL, "35 Electabuzz! "
+	line "My ", TX_LVL, "20 Electabuzz is a cool card!"
 	line "Charge it up with Electabuzz!"
 	done
 
@@ -465,7 +465,7 @@ Text0619: ; 4dbcb (13:5bcb)
 	done
 
 Text061a: ; 4dc30 (13:5c30)
-	text "Hey! ",TX_RAM1,"!"
+	text "Hey! ", TX_RAM1, "!"
 	line "You beat the Grand Masters?"
 	line "Cool! Got all the Legendary "
 	line "Pok`mon Cards? Yeah!"
@@ -710,14 +710,14 @@ Text0644: ; 4e774 (13:6774)
 	done
 
 Text0645: ; 4e7e1 (13:67e1)
-	text "Well, getting the ",TX_RAM2," Medal "
+	text "Well, getting the ", TX_RAM2, " Medal "
 	line "wasn't that hard! If I keep "
 	line "this up, I should be able to get "
 	line "the Legendary Pok`mon Cards!"
 	done
 
 Text0646: ; 4e859 (13:6859)
-	text "What? It's you, ",TX_RAM1,"!"
+	text "What? It's you, ", TX_RAM1, "!"
 	line "What are you doing?"
 	line "Huh? That's a Deck!"
 	line "Are you... trying to get the"
@@ -752,12 +752,12 @@ Text0649: ; 4e991 (13:6991)
 	line "'Cause the Legendary Pok`mon Cards"
 	line "are gonna be mine!"
 	line "I already won the first Medal!"
-	line "See ya, ",TX_RAM1,"!"
+	line "See ya, ", TX_RAM1, "!"
 	line "Ha ha ha ha ha!!!"
 	done
 
 Text064a: ; 4eb39 (13:6b39)
-	text "Hi, ",TX_RAM1,"!"
+	text "Hi, ", TX_RAM1, "!"
 	line "How ya doin'?"
 	done
 
@@ -793,7 +793,7 @@ Text064e: ; 4ec9a (13:6c9a)
 	done
 
 Text064f: ; 4ed1c (13:6d1c)
-	text "Hi, ",TX_RAM1,"!"
+	text "Hi, ", TX_RAM1, "!"
 	line "Have you gotten any better?"
 	done
 
@@ -938,7 +938,7 @@ Text0663: ; 4f522 (13:7522)
 	done
 
 Text0664: ; 4f574 (13:7574)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1, "."
 	line "So you've finally come this far?"
 	line "I've already won 5 Medals!"
 	line "By the time you win your 8th Medal,"
diff --git a/src/text/text8.asm b/src/text/text8.asm
index f7dd0a1..4860e03 100644
--- a/src/text/text8.asm
+++ b/src/text/text8.asm
@@ -13,7 +13,7 @@ Text0685: ; 5005b (14:405b)
 	done
 
 Text0686: ; 500df (14:40df)
-	text "Hello, ",TX_RAM1,"!"
+	text "Hello, ", TX_RAM1, "!"
 	line "I just came up with a new card"
 	line "strategy and was looking for"
 	line "someone to test it on."
@@ -65,7 +65,7 @@ Text068d: ; 5037f (14:437f)
 	line "date. Why do I have to do it?"
 	line "Why me?"
 	line "I'm Jessica of the Fighting Club."
-	line "Oh! You must be ",TX_RAM1,"."
+	line "Oh! You must be ", TX_RAM1, "."
 	line "I heard about you from Mitch."
 	line "Defeating you should be more"
 	line "fun than training!"
@@ -75,7 +75,7 @@ Text068e: ; 5044a (14:444a)
 	text "Training's so boring and out of "
 	line "date. Why do I have to do it?"
 	line ""
-	text TX_RAM1,", it's you again!"
+	text TX_RAM1, ", it's you again!"
 	line "What a pain."
 	line "But defeating you should be more"
 	line "fun than training."
@@ -188,7 +188,7 @@ Text069f: ; 50988 (14:4988)
 	done
 
 Text06a0: ; 509d3 (14:49d3)
-	text TX_RAM1," lost all "
+	text TX_RAM1, " lost all "
 	line "his Energy cards!"
 	done
 
@@ -206,11 +206,11 @@ Text06a1: ; 509f2 (14:49f2)
 	done
 
 Text06a2: ; 50a9e (14:4a9e)
-	text TX_RAM1,""
+	text TX_RAM1, ""
 	line "checked the wall!"
 	line ""
-	text TX_RAM1,""
-	line "found a ",TX_LVL,"9 Slowpoke!"
+	text TX_RAM1, ""
+	line "found a ", TX_LVL, "9 Slowpoke!"
 	done
 
 Text06a3: ; 50acc (14:4acc)
@@ -472,7 +472,7 @@ Text06cd: ; 51720 (14:5720)
 
 Text06ce: ; 5175f (14:575f)
 	text "OK, "
-	line "To ",TX_RAM2,"."
+	line "To ", TX_RAM2, "."
 	line "Please write in your Diary before"
 	line "the transaction."
 	done
@@ -487,7 +487,7 @@ Text06d0: ; 517b4 (14:57b4)
 	done
 
 Text06d1: ; 517f7 (14:57f7)
-	text TX_RAM1,""
+	text TX_RAM1, ""
 	line "wrote in the Diary."
 	done
 
@@ -498,21 +498,21 @@ Text06d2: ; 5180e (14:580e)
 
 Text06d3: ; 5182d (14:582d)
 	text "You sent a card to"
-	line TX_RAM2,"!"
+	line TX_RAM2, "!"
 	line "Thank you."
 	line "Please come again."
 	done
 
 Text06d4: ; 51862 (14:5862)
 	text "You sent the configuration for"
-	line "the ",TX_RAM2," Deck!"
+	line "the ", TX_RAM2, " Deck!"
 	line "Thank you."
 	line "Please come again."
 	done
 
 Text06d5: ; 518ac (14:58ac)
 	text "You received the configuration for"
-	line "the ",TX_RAM2," Deck!"
+	line "the ", TX_RAM2, " Deck!"
 	line "Thank you."
 	line "Please come again."
 	done
@@ -544,14 +544,14 @@ Text06d8: ; 51a6f (14:5a6f)
 	line "are girls."
 	line "But I can't beat girls who"
 	line "are this tough!"
-	line "Huh? You must be ",TX_RAM1,"."
+	line "Huh? You must be ", TX_RAM1, "."
 	line "Mitch told me all about you."
 	line "Beating you will be much better"
 	line "than losing to the girls!"
 	done
 
 Text06d9: ; 51b2e (14:5b2e)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1, "."
 	line "Would you duel me?"
 	done
 
@@ -697,7 +697,7 @@ Text06f1: ; 521a8 (14:61a8)
 	done
 
 Text06f2: ; 521d8 (14:61d8)
-	text TX_RAM1," traded an Oddish"
+	text TX_RAM1, " traded an Oddish"
 	line "for a Vileplume!"
 	done
 
@@ -747,7 +747,7 @@ Text06f9: ; 523c4 (14:63c4)
 	done
 
 Text06fa: ; 523f0 (14:63f0)
-	text TX_RAM1," traded a Clefairy"
+	text TX_RAM1, " traded a Clefairy"
 	line "for a Pikachu!"
 	done
 
@@ -792,7 +792,7 @@ Text0700: ; 525d9 (14:65d9)
 	done
 
 Text0701: ; 5260b (14:660b)
-	text TX_RAM1," traded a Charizard"
+	text TX_RAM1, " traded a Charizard"
 	line "for a Blastoise!"
 	done
 
@@ -941,7 +941,7 @@ Text0718: ; 52cc3 (14:6cc3)
 	done
 
 Text0719: ; 52d1a (14:6d1a)
-	text "Hello, ",TX_RAM1,"."
+	text "Hello, ", TX_RAM1, "."
 	line "Did you come for a Duel?"
 	done
 
@@ -1050,7 +1050,7 @@ Text0727: ; 53245 (14:7245)
 	done
 
 Text0728: ; 53368 (14:7368)
-	text "Hello, ",TX_RAM1,"."
+	text "Hello, ", TX_RAM1, "."
 	line "Welcome."
 	line "There aren't any cards I want "
 	line "or can trade at the moment."
@@ -1061,7 +1061,7 @@ Text0728: ; 53368 (14:7368)
 	done
 
 Text0729: ; 53435 (14:7435)
-	text "Hello, ",TX_RAM1,"."
+	text "Hello, ", TX_RAM1, "."
 	line "I guess you're here because you"
 	line "heard the rumor that I'm looking"
 	line "for a Clefable..."
@@ -1071,7 +1071,7 @@ Text0729: ; 53435 (14:7435)
 	done
 
 Text072a: ; 534e1 (14:74e1)
-	text "Hello, ",TX_RAM1,"."
+	text "Hello, ", TX_RAM1, "."
 	line "Are you enjoying the "
 	line "Pok`mon Trading Card Game?"
 	line "By the way, I'm looking for a "
@@ -1114,7 +1114,7 @@ Text072f: ; 536f6 (14:76f6)
 	done
 
 Text0730: ; 5371b (14:771b)
-	text TX_RAM1," traded a Clefable"
+	text TX_RAM1, " traded a Clefable"
 	line "for a Surfing Pikachu!"
 	done
 
@@ -1124,7 +1124,7 @@ Text0731: ; 53747 (14:7747)
 	done
 
 Text0732: ; 5377f (14:777f)
-	text "Hello, ",TX_RAM1,"."
+	text "Hello, ", TX_RAM1, "."
 	line "I suppose you're here because you"
 	line "heard that I was looking for"
 	line "a Ditto this time..."
@@ -1134,7 +1134,7 @@ Text0732: ; 5377f (14:777f)
 	done
 
 Text0733: ; 53829 (14:7829)
-	text "Hello, ",TX_RAM1,". "
+	text "Hello, ", TX_RAM1, ". "
 	line "Are you enjoying the"
 	line "Pok`mon Trading Card Game?"
 	line "I'm looking for a Ditto"
@@ -1163,7 +1163,7 @@ Text0735: ; 5395a (14:795a)
 	done
 
 Text0736: ; 539ed (14:79ed)
-	text TX_RAM1," traded a Ditto"
+	text TX_RAM1, " traded a Ditto"
 	line "for a Flying Pikachu!"
 	done
 
@@ -1173,7 +1173,7 @@ Text0737: ; 53a15 (14:7a15)
 	done
 
 Text0738: ; 53a4a (14:7a4a)
-	text "Hello, ",TX_RAM1,"."
+	text "Hello, ", TX_RAM1, "."
 	line "You're really current on the news!"
 	line "I'm looking for a Chansey this "
 	line "time! I'm thinking about trading"
@@ -1184,7 +1184,7 @@ Text0738: ; 53a4a (14:7a4a)
 	done
 
 Text0739: ; 53b25 (14:7b25)
-	text "Hello, ",TX_RAM1,". "
+	text "Hello, ", TX_RAM1, ". "
 	line "Are you enjoying the"
 	line "Pok`mon Trading Card Game?"
 	line "I'm looking for a Chansey"
@@ -1212,7 +1212,7 @@ Text073b: ; 53c6a (14:7c6a)
 	done
 
 Text073c: ; 53cf9 (14:7cf9)
-	text TX_RAM1," traded a Chansey"
+	text TX_RAM1, " traded a Chansey"
 	line "for a Surfing Pikachu!"
 	done
 
@@ -1222,7 +1222,7 @@ Text073d: ; 53d24 (14:7d24)
 	done
 
 Text073e: ; 53d5b (14:7d5b)
-	text "Oh! Congratulations, ",TX_RAM1,"!"
+	text "Oh! Congratulations, ", TX_RAM1, "!"
 	line "I heard the news! You've finally "
 	line "inherited the Legendary Pok`mon "
 	line "Cards! Don't worry, I'm not going "
diff --git a/src/text/text9.asm b/src/text/text9.asm
index 17cd8cf..12f2203 100644
--- a/src/text/text9.asm
+++ b/src/text/text9.asm
@@ -1,6 +1,6 @@
 Text073f: ; 54000 (15:4000)
 	text "Who?"
-	line "Oh! It's you, ",TX_RAM1,"..."
+	line "Oh! It's you, ", TX_RAM1,  "..."
 	line "I couldn't believe that I could"
 	line "lose, but now..."
 	line "Now I understand."
@@ -16,14 +16,14 @@ Text073f: ; 54000 (15:4000)
 	line "the different cards to build "
 	line "different types of Decks, and"
 	line "to play against different people!"
-	line "So...",TX_RAM1,"..."
+	line "So...", TX_RAM1,  "..."
 	line "Will you play with me again?"
 	line "With all sorts of different Decks?"
 	line "And this time, I not gonna lose!"
 	done
 
 Text0740: ; 54223 (15:4223)
-	text "Oh, hi ",TX_RAM1,"..."
+	text "Oh, hi ", TX_RAM1,  "..."
 	line "Do you want to Duel?"
 	done
 
@@ -115,7 +115,7 @@ Text074c: ; 546cf (15:46cf)
 	done
 
 Text074d: ; 5471b (15:471b)
-	text "If I use ",TX_RAM2," now,"
+	text "If I use ", TX_RAM2,  " now,"
 	line "This will happen..."
 	done
 
@@ -420,7 +420,7 @@ Text0781: ; 5557a (15:557a)
 	done
 
 Text0782: ; 55621 (15:5621)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1,  "."
 	line "Would you like to duel?"
 	line "The Legendary Cards will eventually"
 	line "belong to me!"
@@ -429,7 +429,7 @@ Text0782: ; 55621 (15:5621)
 	done
 
 Text0783: ; 5569c (15:569c)
-	text "Hi, ",TX_RAM1,"."
+	text "Hi, ", TX_RAM1,  "."
 	line "Would you like to duel?"
 	done
 
@@ -634,7 +634,7 @@ Text07a2: ; 56049 (15:6049)
 Text07a3: ; 5606c (15:606c)
 	text "I am Gene, the Master of the"
 	line "Rock Club! Rock is good..."
-	line "Isn't Rock good, ",TX_RAM1,"...?"
+	line "Isn't Rock good, ", TX_RAM1,  "...?"
 	line "Rock is hard and strong!"
 	line "Doesn't crumble under pressure!"
 	line "After you Duel me, you'll know "
@@ -1010,7 +1010,7 @@ Text07d4: ; 5705e (15:705e)
 	done
 
 Text07d5: ; 57075 (15:7075)
-	text TX_RAM1,"'s Score"
+	text TX_RAM1,  "'s Score"
 	done
 
 Text07d6: ; 57080 (15:7080)
@@ -1023,7 +1023,7 @@ Text07d7: ; 570a4 (15:70a4)
 
 Text07d8: ; 570be (15:70be)
 	text "Maximum Consecutive Wins"
-	line "    [ ",TX_RAM2,"  ]"
+	line "    [ ", TX_RAM2,  "  ]"
 	done
 
 Text07d9: ; 570e3 (15:70e3)
@@ -1031,13 +1031,13 @@ Text07d9: ; 570e3 (15:70e3)
 	done
 
 Text07da: ; 570e9 (15:70e9)
-	text TX_RAM1," ",TX_RAM3," Consecutive Wins!"
+	text TX_RAM1,  " ", TX_RAM3,  " Consecutive Wins!"
 	line ""
-	text TX_RAM3," opponent is ",TX_RAM2,"."
+	text TX_RAM3,  " opponent is ", TX_RAM2,  "."
 	done
 
 Text07db: ; 57112 (15:7112)
-	text TX_RAM3," opponent is ",TX_RAM2,"."
+	text TX_RAM3,  " opponent is ", TX_RAM2,  "."
 	done
 
 Text07dc: ; 57124 (15:7124)
@@ -1063,13 +1063,13 @@ Text07e0: ; 571bd (15:71bd)
 	done
 
 Text07e1: ; 571df (15:71df)
-	text "You lost to the ",TX_RAM3," opponent,"
-	line TX_RAM2,"!"
+	text "You lost to the ", TX_RAM3,  " opponent,"
+	line TX_RAM2,  "!"
 	done
 
 Text07e2: ; 571ff (15:71ff)
-	text TX_RAM1,"'s consecutive wins"
-	line "ended at ",TX_RAM3,"."
+	text TX_RAM1,  "'s consecutive wins"
+	line "ended at ", TX_RAM3,  "."
 	done
 
 Text07e3: ; 57221 (15:7221)
@@ -1082,7 +1082,7 @@ Text07e4: ; 57240 (15:7240)
 
 Text07e5: ; 5725f (15:725f)
 	text "Congratulations!"
-	line "You won against ",TX_RAM3," opponents!"
+	line "You won against ", TX_RAM3,  " opponents!"
 	done
 
 DefeatedFiveOpponentsText: ; 5728e (15:728e)
@@ -1091,13 +1091,13 @@ DefeatedFiveOpponentsText: ; 5728e (15:728e)
 	done
 
 Text07e7: ; 572ba (15:72ba)
-	text TX_RAM1," successfully defeated "
-	line "5 opponents ",TX_START,TX_RAM3," time(s)!!!"
+	text TX_RAM1,  " successfully defeated "
+	line "5 opponents ", TX_START,   TX_RAM3,  " time(s)!!!"
 	done
 
 ConsecutiveWinRecordIncreasedText: ; 572ee (15:72ee)
-	text TX_RAM1,"'s consecutive win"
-	line "record increased to ",TX_RAM3,"!"
+	text TX_RAM1,  "'s consecutive win"
+	line "record increased to ", TX_RAM3,  "!"
 	done
 
 Text07e9: ; 5731a (15:731a)
@@ -1153,27 +1153,27 @@ Text07f5: ; 5736a (15:736a)
 	done
 
 Text07f6: ; 5736d (15:736d)
-	db $03,$50,TX_FIRE,$03,$51
+	db $03,$50, TX_FIRE,  $03,$51
 	done
 
 Text07f7: ; 57374 (15:7374)
-	db $03,$50,TX_LIGHTNING,$03,$51
+	db $03,$50, TX_LIGHTNING,  $03,$51
 	done
 
 Text07f8: ; 5737b (15:737b)
-	db $03,$50,TX_WATER,$03,$51
+	db $03,$50, TX_WATER,  $03,$51
 	done
 
 Text07f9: ; 57382 (15:7382)
-	db $03,$50,TX_FIGHTING,$03,$51
+	db $03,$50, TX_FIGHTING,  $03,$51
 	done
 
 Text07fa: ; 57389 (15:7389)
-	db $03,$50,TX_PSYCHIC,$03,$51
+	db $03,$50, TX_PSYCHIC,  $03,$51
 	done
 
 Text07fb: ; 57390 (15:7390)
-	db $03,$50,TX_GRASS,$03,$51
+	db $03,$50, TX_GRASS,  $03,$51
 	done
 
 GrassEnergyName: ; 57397 (15:7397)
@@ -1181,7 +1181,7 @@ GrassEnergyName: ; 57397 (15:7397)
 	done
 
 GrassEnergyDescription: ; 573a5 (15:73a5)
-	text "Provides 1 ",TX_GRASS," Energy."
+	text "Provides 1 ", TX_GRASS,  " Energy."
 	done
 
 FireEnergyName: ; 573bc (15:73bc)
@@ -1189,7 +1189,7 @@ FireEnergyName: ; 573bc (15:73bc)
 	done
 
 FireEnergyDescription: ; 573c9 (15:73c9)
-	text "Provides 1 ",TX_FIRE," Energy."
+	text "Provides 1 ", TX_FIRE,  " Energy."
 	done
 
 WaterEnergyName: ; 573e0 (15:73e0)
@@ -1197,7 +1197,7 @@ WaterEnergyName: ; 573e0 (15:73e0)
 	done
 
 WaterEnergyDescription: ; 573ee (15:73ee)
-	text "Provides 1 ",TX_WATER," Energy."
+	text "Provides 1 ", TX_WATER,  " Energy."
 	done
 
 LightningEnergyName: ; 57405 (15:7405)
@@ -1205,7 +1205,7 @@ LightningEnergyName: ; 57405 (15:7405)
 	done
 
 LightningEnergyDescription: ; 57417 (15:7417)
-	text "Provides 1 ",TX_LIGHTNING," Energy."
+	text "Provides 1 ", TX_LIGHTNING,  " Energy."
 	done
 
 FightingEnergyName: ; 5742e (15:742e)
@@ -1213,7 +1213,7 @@ FightingEnergyName: ; 5742e (15:742e)
 	done
 
 FightingEnergyDescription: ; 5743f (15:743f)
-	text "Provides 1 ",TX_FIGHTING," Energy."
+	text "Provides 1 ", TX_FIGHTING,  " Energy."
 	done
 
 PsychicEnergyName: ; 57456 (15:7456)
@@ -1221,7 +1221,7 @@ PsychicEnergyName: ; 57456 (15:7456)
 	done
 
 PsychicEnergyDescription: ; 57466 (15:7466)
-	text "Provides 1 ",TX_PSYCHIC," Energy."
+	text "Provides 1 ", TX_PSYCHIC,  " Energy."
 	done
 
 DoubleColorlessEnergyName: ; 5747d (15:747d)
@@ -1229,7 +1229,7 @@ DoubleColorlessEnergyName: ; 5747d (15:747d)
 	done
 
 DoubleColorlessEnergyDescription: ; 57496 (15:7496)
-	text "Provides ",TX_COLORLESS,TX_COLORLESS," Energy. (Doesn't"
+	text "Provides ", TX_COLORLESS,   TX_COLORLESS,  " Energy. (Doesn't"
 	line "count as a basic Energy card.) "
 	line "Colorless Energy can't be used to"
 	line "pay colored Energy costs. (Any type"
@@ -1340,7 +1340,7 @@ EnergyTransName: ; 57960 (15:7960)
 EnergyTransDescription: ; 5796e (15:796e)
 	text "As often as you like during your"
 	line "turn (before your attack), you may"
-	line "take 1 ",TX_GRASS," Energy card attached to 1"
+	line "take 1 ", TX_GRASS,  " Energy card attached to 1"
 	line "of your Pok`mon and attach it to a"
 	line "different one. This power can't be"
 	line "used if Venusaur is Asleep,"