rename text macro to textpointer and text/line/done for better text readability

1 files changed, 122 insertions, 90 deletions

diff --git a/src/text/textd.asm b/src/text/textd.asm
index d300663..dea889e 100644
--- a/src/text/textd.asm
+++ b/src/text/textd.asm
@@ -1,156 +1,188 @@
 ScoopUpDescription: ; 64000 (19:4000)
-	db TX_START,"Choose 1 of your Pok`mon in play\n"
-	db "and return its Basic Pok`mon card to\n"
-	db "your hand. (Discard all cards\n"
-	db "attached to that card.)",TX_END
+	text "Choose 1 of your Pok`mon in play"
+	line "and return its Basic Pok`mon card to"
+	line "your hand. (Discard all cards"
+	line "attached to that card.)"
+	done
 
 ComputerSearchName: ; 6407d (19:407d)
-	db TX_START,"Computer Search",TX_END
+	text "Computer Search"
+	done
 
 ComputerSearchDescription: ; 6408e (19:408e)
-	db TX_START,"Discard 2 of the other cards from\n"
-	db "your hand in order to search your\n"
-	db "deck for any card and put it into\n"
-	db "your hand. Shuffle your deck\n"
-	db "afterward.",TX_END
+	text "Discard 2 of the other cards from"
+	line "your hand in order to search your"
+	line "deck for any card and put it into"
+	line "your hand. Shuffle your deck"
+	line "afterward."
+	done
 
 PokedexName: ; 6411d (19:411d)
-	db TX_START,"Pok`dex",TX_END
+	text "Pok`dex"
+	done
 
 PokedexDescription: ; 64126 (19:4126)
-	db TX_START,"Look at up to 5 cards from the top\n"
-	db "of your deck and rearrange them as\n"
-	db "you like.",TX_END
+	text "Look at up to 5 cards from the top"
+	line "of your deck and rearrange them as"
+	line "you like."
+	done
 
 PlusPowerName: ; 64177 (19:4177)
-	db TX_START,"PlusPower",TX_END
+	text "PlusPower"
+	done
 
 PlusPowerDescription: ; 64182 (19:4182)
-	db TX_START,"Attach PlusPower to your Active\n"
-	db "Pok`mon. At the end of your turn,\n"
-	db "discard PlusPower. If this Pok`mon's\n"
-	db "attack does damage to any Active\n"
-	db "Pok`mon (after applying Weakness and\n"
-	db "Resistance), the attack does 10 more\n"
-	db "damage to that Active Pok`mon.",TX_END
+	text "Attach PlusPower to your Active"
+	line "Pok`mon. At the end of your turn,"
+	line "discard PlusPower. If this Pok`mon's"
+	line "attack does damage to any Active"
+	line "Pok`mon (after applying Weakness and"
+	line "Resistance), the attack does 10 more"
+	line "damage to that Active Pok`mon."
+	done
 
 DefenderName: ; 64274 (19:4274)
-	db TX_START,"Defender",TX_END
+	text "Defender"
+	done
 
 DefenderDescription: ; 6427e (19:427e)
-	db TX_START,"Attach Defender to 1 of your\n"
-	db "Pok`mon. At the end of your\n"
-	db "opponent's next turn, discard\n"
-	db "Defender. Damage done to that\n"
-	db "Pok`mon by attacks is reduced by 20\n"
-	db "(after applying Weakness and\n"
-	db "Resistance).",TX_END
+	text "Attach Defender to 1 of your"
+	line "Pok`mon. At the end of your"
+	line "opponent's next turn, discard"
+	line "Defender. Damage done to that"
+	line "Pok`mon by attacks is reduced by 20"
+	line "(after applying Weakness and"
+	line "Resistance)."
+	done
 
 ItemFinderName: ; 64342 (19:4342)
-	db TX_START,"Item Finder",TX_END
+	text "Item Finder"
+	done
 
 ItemFinderDescription: ; 6434f (19:434f)
-	db TX_START,"Discard 2 of the other cards from\n"
-	db "your hand in order to put a Trainer\n"
-	db "card from your discard pile into\n"
-	db "your hand.",TX_END
+	text "Discard 2 of the other cards from"
+	line "your hand in order to put a Trainer"
+	line "card from your discard pile into"
+	line "your hand."
+	done
 
 GustofWindName: ; 643c2 (19:43c2)
-	db TX_START,"Gust of Wind",TX_END
+	text "Gust of Wind"
+	done
 
 GustofWindDescription: ; 643d0 (19:43d0)
-	db TX_START,"Choose 1 of your opponent's Benched\n"
-	db "Pok`mon and switch it with his or\n"
-	db "her Active Pok`mon.",TX_END
+	text "Choose 1 of your opponent's Benched"
+	line "Pok`mon and switch it with his or"
+	line "her Active Pok`mon."
+	done
 
 DevolutionSprayName: ; 6442b (19:442b)
-	db TX_START,"Devolution Spray",TX_END
+	text "Devolution Spray"
+	done
 
 DevolutionSprayDescription: ; 6443d (19:443d)
-	db TX_START,"Choose 1 of your own Pok`mon in play\n"
-	db "and a Stage of Evolution. Discard\n"
-	db "all Evolution cards of that Stage or\n"
-	db "higher attached to that Pok`mon.",TX_END
+	text "Choose 1 of your own Pok`mon in play"
+	line "and a Stage of Evolution. Discard"
+	line "all Evolution cards of that Stage or"
+	line "higher attached to that Pok`mon."
+	done
 
 DevolutionSprayDescriptionCont: ; 644cb (19:44cb)
-	db TX_START,"That Pok`mon is no longer Asleep,\n"
-	db "Confused, Paralyzed, Poisoned, or\n"
-	db "anything else that might be the\n"
-	db "result of an attack (just as if you\n"
-	db "had evolved it).",TX_END
+	text "That Pok`mon is no longer Asleep,"
+	line "Confused, Paralyzed, Poisoned, or"
+	line "anything else that might be the"
+	line "result of an attack (just as if you"
+	line "had evolved it)."
+	done
 
 PotionName: ; 64565 (19:4565)
-	db TX_START,"Potion",TX_END
+	text "Potion"
+	done
 
 PotionDescription: ; 6456d (19:456d)
-	db TX_START,"Remove 2 damage counters from 1 of\n"
-	db "your Pok`mon. If that Pok`mon has\n"
-	db "fewer damage counters than that,\n"
-	db "remove all of them.",TX_END
+	text "Remove 2 damage counters from 1 of"
+	line "your Pok`mon. If that Pok`mon has"
+	line "fewer damage counters than that,"
+	line "remove all of them."
+	done
 
 SuperPotionName: ; 645e8 (19:45e8)
-	db TX_START,"Super Potion",TX_END
+	text "Super Potion"
+	done
 
 SuperPotionDescription: ; 645f6 (19:45f6)
-	db TX_START,"Discard 1 Energy card attached to 1\n"
-	db "of your own Pok`mon in order to\n"
-	db "remove 4 damage counters from that\n"
-	db "Pok`mon. If the Pok`mon has fewer\n"
-	db "damage counters than that, remove\n"
-	db "all of them.",TX_END
+	text "Discard 1 Energy card attached to 1"
+	line "of your own Pok`mon in order to"
+	line "remove 4 damage counters from that"
+	line "Pok`mon. If the Pok`mon has fewer"
+	line "damage counters than that, remove"
+	line "all of them."
+	done
 
 FullHealName: ; 646af (19:46af)
-	db TX_START,"Full Heal",TX_END
+	text "Full Heal"
+	done
 
 FullHealDescription: ; 646ba (19:46ba)
-	db TX_START,"Your Active Pok`mon is no longer\n"
-	db "Asleep, Confused, Paralyzed, or\n"
-	db "Poisoned.",TX_END
+	text "Your Active Pok`mon is no longer"
+	line "Asleep, Confused, Paralyzed, or"
+	line "Poisoned."
+	done
 
 ReviveName: ; 64706 (19:4706)
-	db TX_START,"Revive",TX_END
+	text "Revive"
+	done
 
 ReviveDescription: ; 6470e (19:470e)
-	db TX_START,"Put 1 Basic Pok`mon card from your\n"
-	db "discard pile onto your Bench.\n"
-	db "Put damage counters on that Pok`mon\n"
-	db "equal to half its HP (rounded down\n"
-	db "to the nearest 10). (You can't play\n"
-	db "Revive if your Bench is full.)",TX_END
+	text "Put 1 Basic Pok`mon card from your"
+	line "discard pile onto your Bench."
+	line "Put damage counters on that Pok`mon"
+	line "equal to half its HP (rounded down"
+	line "to the nearest 10). (You can't play"
+	line "Revive if your Bench is full.)"
+	done
 
 MaintenanceName: ; 647da (19:47da)
-	db TX_START,"Maintenance",TX_END
+	text "Maintenance"
+	done
 
 MaintenanceDescription: ; 647e7 (19:47e7)
-	db TX_START,"Shuffle 2 of the other cards from\n"
-	db "your hand into your deck in order\n"
-	db "to draw a card.",TX_END
+	text "Shuffle 2 of the other cards from"
+	line "your hand into your deck in order"
+	line "to draw a card."
+	done
 
 PokemonFluteName: ; 6483c (19:483c)
-	db TX_START,"Pok`mon Flute",TX_END
+	text "Pok`mon Flute"
+	done
 
 PokemonFluteDescription: ; 6484b (19:484b)
-	db TX_START,"Choose 1 Basic Pok`mon card from\n"
-	db "your opponent's discard pile and put\n"
-	db "it onto his or her Bench. (You can't\n"
-	db "play Pok`mon Flute if your\n"
-	db "opponent's Bench is full.)",TX_END
+	text "Choose 1 Basic Pok`mon card from"
+	line "your opponent's discard pile and put"
+	line "it onto his or her Bench. (You can't"
+	line "play Pok`mon Flute if your"
+	line "opponent's Bench is full.)"
+	done
 
 GamblerName: ; 648ed (19:48ed)
-	db TX_START,"Gambler",TX_END
+	text "Gambler"
+	done
 
 GamblerDescription: ; 648f6 (19:48f6)
-	db TX_START,"Shuffle your hand into your deck.\n"
-	db "Flip a coin. If heads, draw 8 cards.\n"
-	db "If tails, draw 1 card.",TX_END
+	text "Shuffle your hand into your deck."
+	line "Flip a coin. If heads, draw 8 cards."
+	line "If tails, draw 1 card."
+	done
 
 RecycleName: ; 64955 (19:4955)
-	db TX_START,"Recycle",TX_END
+	text "Recycle"
+	done
 
 RecycleDescription: ; 6495e (19:495e)
-	db TX_START,"Flip a coin. If heads, put a card\n"
-	db "in your discard pile on top of your\n"
-	db "deck.",TX_END
+	text "Flip a coin. If heads, put a card"
+	line "in your discard pile on top of your"
+	line "deck."
+	done
 
 rept $3655
 db $ff