Labeled more symbols (#77)

* Labeled more symbols

* Fixed comment typo

* Renamed some functions

1 files changed, 52 insertions, 52 deletions

diff --git a/src/data/nature_description.h b/src/data/nature_description.h
index 7281705..8ee5d45 100644
--- a/src/data/nature_description.h
+++ b/src/data/nature_description.h
@@ -12,7 +12,7 @@ ALIGNED(4) const char gQuirkyDescription[] = _(
     "{CENTER_ALIGN}Maybe people are even upset\n"
     "{CENTER_ALIGN}with you for being so fickle?{EXTRA_MSG}"
     "{CENTER_ALIGN}If you realize how selfishly\n"
-    "{CENTER_ALIGN}you~27re behaving~2c try to think\n"
+    "{CENTER_ALIGN}you{APOSTROPHE}re behaving{COMMA} try to think\n"
     "{CENTER_ALIGN}before you do anything rash.{EXTRA_MSG}"
     "{CENTER_ALIGN}A quirky person like you should be...");
 
@@ -21,23 +21,23 @@ ALIGNED(4) const char gLonelyDescription[] = _(
     "{CENTER_ALIGN}The lonely type.{EXTRA_MSG}"
     "{CENTER_ALIGN}You always act cheerful and\n"
     "{CENTER_ALIGN}jocular around other people.{EXTRA_MSG}"
-    "{CENTER_ALIGN}But that~27s only because\n"
+    "{CENTER_ALIGN}But that{APOSTROPHE}s only because\n"
     "{CENTER_ALIGN}you are with other people.{EXTRA_MSG}"
-    "{CENTER_ALIGN}However~2c when you get alone...{EXTRA_MSG}"
+    "{CENTER_ALIGN}However{COMMA} when you get alone...{EXTRA_MSG}"
     "{CENTER_ALIGN}Do you find yourself\n"
     "{CENTER_ALIGN}feeling oddly depressed?{EXTRA_MSG}"
-    "{CENTER_ALIGN}That~27s why you always\n"
+    "{CENTER_ALIGN}That{APOSTROPHE}s why you always\n"
     "{CENTER_ALIGN}want to be with others.{EXTRA_MSG}"
     "{CENTER_ALIGN}But if you go around feeling\n"
     "{CENTER_ALIGN}depressed too much...{EXTRA_MSG}"
     "{CENTER_ALIGN}Your nutritional balance goes out\n"
     "{CENTER_ALIGN}of wack. Eat more vegetables!{EXTRA_MSG}"
     "{CENTER_ALIGN}However...{WAIT_PRESS}\n"
-    "{CENTER_ALIGN}It~27s not a bad thing\n"
+    "{CENTER_ALIGN}It{APOSTROPHE}s not a bad thing\n"
     "{CENTER_ALIGN}to feel lonely.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You know what it~27s like when you aren~27t\n"
-    "{CENTER_ALIGN}alone~2c so that~27s why you feel lonesome.{EXTRA_MSG}"
-    "{CENTER_ALIGN}And that~27s why you aren~27t really alone.{EXTRA_MSG}"
+    "{CENTER_ALIGN}You know what it{APOSTROPHE}s like when you aren{APOSTROPHE}t\n"
+    "{CENTER_ALIGN}alone{COMMA} so that{APOSTROPHE}s why you feel lonesome.{EXTRA_MSG}"
+    "{CENTER_ALIGN}And that{APOSTROPHE}s why you aren{APOSTROPHE}t really alone.{EXTRA_MSG}"
     "{CENTER_ALIGN}A lonely person like you should be...");
 
 ALIGNED(4) const char gRelaxedDescription[] = _(
@@ -48,28 +48,28 @@ ALIGNED(4) const char gRelaxedDescription[] = _(
     "{CENTER_ALIGN}Or do you find yourself dozing off?{EXTRA_MSG}"
     "{CENTER_ALIGN}Or is your reaction time\n"
     "{CENTER_ALIGN}a little slower than others?{EXTRA_MSG}"
-    "{CENTER_ALIGN}But that~27s not necessarily\n"
+    "{CENTER_ALIGN}But that{APOSTROPHE}s not necessarily\n"
     "{CENTER_ALIGN}a bad thing.{EXTRA_MSG}"
     "{CENTER_ALIGN}You can do things at your own\n"
     "{CENTER_ALIGN}tempo without feeling pressured.{EXTRA_MSG}"
     "{CENTER_ALIGN}You can live in a relaxed and\n"
     "{CENTER_ALIGN}unhurried manner without worries.{EXTRA_MSG}"
-    "{CENTER_ALIGN}I think that~27s a happy\n"
-    "{CENTER_ALIGN}lifestyle to be envied~2c even.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You~27re also surprisingly popular.{EXTRA_MSG}"
+    "{CENTER_ALIGN}I think that{APOSTROPHE}s a happy\n"
+    "{CENTER_ALIGN}lifestyle to be envied{COMMA} even.{EXTRA_MSG}"
+    "{CENTER_ALIGN}You{APOSTROPHE}re also surprisingly popular.{EXTRA_MSG}"
     "{CENTER_ALIGN}The way you vacantly stare\n"
     "{CENTER_ALIGN}off into the distance...{EXTRA_MSG}"
     "{CENTER_ALIGN}It should make that someone\n"
-    "{CENTER_ALIGN}special~27s pulse race.{EXTRA_MSG}"
+    "{CENTER_ALIGN}special{APOSTROPHE}s pulse race.{EXTRA_MSG}"
     "{CENTER_ALIGN}A relaxed person like you should be...");
 
 ALIGNED(4) const char gCalmDescription[] = _(
     "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}The calm type.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You~27re capable of giving advice\n"
+    "{CENTER_ALIGN}You{APOSTROPHE}re capable of giving advice\n"
     "{CENTER_ALIGN}to friends with worries.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You don~27t like to fight.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You~27re a warm~2c kindhearted\n"
+    "{CENTER_ALIGN}You don{APOSTROPHE}t like to fight.{EXTRA_MSG}"
+    "{CENTER_ALIGN}You{APOSTROPHE}re a warm{COMMA} kindhearted\n"
     "{CENTER_ALIGN}person who cares.{EXTRA_MSG}"
     "{CENTER_ALIGN}You must have many friends\n"
     "{CENTER_ALIGN}who look up to you.{EXTRA_MSG}"
@@ -85,21 +85,21 @@ ALIGNED(4) const char gSassyDescription[] = _(
     "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}The sassy type.{EXTRA_MSG}"
     "{CENTER_ALIGN}You tend to be somewhat cynical.{EXTRA_MSG}"
-    "{CENTER_ALIGN}Despite that~2c there is something\n"
+    "{CENTER_ALIGN}Despite that{COMMA} there is something\n"
     "{CENTER_ALIGN}appealing and lovable about you.{EXTRA_MSG}"
     "{CENTER_ALIGN}But do you occasionally say something\n"
     "{CENTER_ALIGN}arrogant that angers others?{EXTRA_MSG}"
     "{CENTER_ALIGN}Do you make that mistake?{EXTRA_MSG}"
     "{CENTER_ALIGN}Or have people called you\n"
-    "{CENTER_ALIGN}conceited~2c vain~2c or selfish?{EXTRA_MSG}"
+    "{CENTER_ALIGN}conceited{COMMA} vain{COMMA} or selfish?{EXTRA_MSG}"
     "{CENTER_ALIGN}Have people said that about you?{EXTRA_MSG}"
-    "{CENTER_ALIGN}Huh?{WAIT_PRESS} You~27re telling me to get lost?{EXTRA_MSG}"
-    "{CENTER_ALIGN}Why~2c you... Come here and say that!{WAIT_PRESS}\n"
+    "{CENTER_ALIGN}Huh?{WAIT_PRESS} You{APOSTROPHE}re telling me to get lost?{EXTRA_MSG}"
+    "{CENTER_ALIGN}Why{COMMA} you... Come here and say that!{WAIT_PRESS}\n"
     "{CENTER_ALIGN}......Gasp!{EXTRA_MSG}"
-    "{CENTER_ALIGN}...I~27m sorry.\n"
+    "{CENTER_ALIGN}...I{APOSTROPHE}m sorry.\n"
     "{CENTER_ALIGN}I let my feelings run away.\n"
-    "{CENTER_ALIGN}I truly regret this~2c really.{EXTRA_MSG}"
-    "{CENTER_ALIGN}Anyway~2c your cool and aloof\n"
+    "{CENTER_ALIGN}I truly regret this{COMMA} really.{EXTRA_MSG}"
+    "{CENTER_ALIGN}Anyway{COMMA} your cool and aloof\n"
     "{CENTER_ALIGN}attitude is what defines you.{EXTRA_MSG}"
     "{CENTER_ALIGN}It makes you exasperating and\n"
     "{CENTER_ALIGN}appealing at the same time.{EXTRA_MSG}"
@@ -110,18 +110,18 @@ ALIGNED(4) const char gHastyDescription[] = _(
     "{CENTER_ALIGN}The hasty type.{EXTRA_MSG}"
     "{CENTER_ALIGN}You like to take charge\n"
     "{CENTER_ALIGN}and get things done.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You~27re a real go-getter.{EXTRA_MSG}"
+    "{CENTER_ALIGN}You{APOSTROPHE}re a real go-getter.{EXTRA_MSG}"
     "{CENTER_ALIGN}But are you also stressed out?{EXTRA_MSG}"
     "{CENTER_ALIGN}You get irritated when your\n"
-    "{CENTER_ALIGN}friends don~27t show up on time.{EXTRA_MSG}"
+    "{CENTER_ALIGN}friends don{APOSTROPHE}t show up on time.{EXTRA_MSG}"
     "{CENTER_ALIGN}You get frustrated when things\n"
-    "{CENTER_ALIGN}don~27t turn out the way you expect.{EXTRA_MSG}"
+    "{CENTER_ALIGN}don{APOSTROPHE}t turn out the way you expect.{EXTRA_MSG}"
     "{CENTER_ALIGN}Maybe you jab the elevator button\n"
     "{CENTER_ALIGN}if the elevator is slow to arrive.{EXTRA_MSG}"
-    "{CENTER_ALIGN}...Maybe you~27re already jabbing\n"
+    "{CENTER_ALIGN}...Maybe you{APOSTROPHE}re already jabbing\n"
     "{CENTER_ALIGN}the A Button repeatedly now.{EXTRA_MSG}"
     "{CENTER_ALIGN}Beware--getting too easily irritated\n"
-    "{CENTER_ALIGN}just isn~27t good for your well-being.{EXTRA_MSG}"
+    "{CENTER_ALIGN}just isn{APOSTROPHE}t good for your well-being.{EXTRA_MSG}"
     "{CENTER_ALIGN}A hasty person like you should be...");
 
 ALIGNED(4) const char gTimidDescription[] = _(
@@ -132,8 +132,8 @@ ALIGNED(4) const char gTimidDescription[] = _(
     "{CENTER_ALIGN}You may also find it too frightening\n"
     "{CENTER_ALIGN}to go back to school to get something\n"
     "{CENTER_ALIGN}you left behind in class.{EXTRA_MSG}"
-    "{CENTER_ALIGN}If you~27re ever walking on a dark\n"
-    "{CENTER_ALIGN}street at night~2c you probably turn\n"
+    "{CENTER_ALIGN}If you{APOSTROPHE}re ever walking on a dark\n"
+    "{CENTER_ALIGN}street at night{COMMA} you probably turn\n"
     "{CENTER_ALIGN}around often to check behind you.{EXTRA_MSG}"
     "{CENTER_ALIGN}But your timid nature is\n"
     "{CENTER_ALIGN}also your good point!{EXTRA_MSG}"
@@ -144,7 +144,7 @@ ALIGNED(4) const char gTimidDescription[] = _(
 ALIGNED(4) const char gNaiveDescription[] = _(
     "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}The naive type.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You are highly curious~2c\n"
+    "{CENTER_ALIGN}You are highly curious{COMMA}\n"
     "{CENTER_ALIGN}and you love rare things.{EXTRA_MSG}"
     "{CENTER_ALIGN}Your cheerful and carefree\n"
     "{CENTER_ALIGN}attitude should make things fun\n"
@@ -152,38 +152,38 @@ ALIGNED(4) const char gNaiveDescription[] = _(
     "{CENTER_ALIGN}But you do have one flaw.\n"
     "{CENTER_ALIGN}You can be childish.{EXTRA_MSG}"
     "{CENTER_ALIGN}You can never sit still.\n"
-    "{CENTER_ALIGN}You~27re always on the move.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You can also be selfish~2c\n"
+    "{CENTER_ALIGN}You{APOSTROPHE}re always on the move.{EXTRA_MSG}"
+    "{CENTER_ALIGN}You can also be selfish{COMMA}\n"
     "{CENTER_ALIGN}so you should watch yourself.{EXTRA_MSG}"
     "{CENTER_ALIGN}A naive person like you should be...");
 
 ALIGNED(4) const char gImpishDescription[] = _(
     "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}The impish type.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You~27re playful~2c cheerful~2c\n"
+    "{CENTER_ALIGN}You{APOSTROPHE}re playful{COMMA} cheerful{COMMA}\n"
     "{CENTER_ALIGN}and you love pranks.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You~27re also kindhearted.{EXTRA_MSG}"
-    "{CENTER_ALIGN}That~27s why the people around\n"
+    "{CENTER_ALIGN}You{APOSTROPHE}re also kindhearted.{EXTRA_MSG}"
+    "{CENTER_ALIGN}That{APOSTROPHE}s why the people around\n"
     "{CENTER_ALIGN}you find you so irresistible.{EXTRA_MSG}"
     "{CENTER_ALIGN}You must be the most\n"
     "{CENTER_ALIGN}popular person around!{EXTRA_MSG}"
-    "{CENTER_ALIGN}Oh?{WAIT_PRESS} You~27re not that popular?{WAIT_PRESS}\n"
-    "{CENTER_ALIGN}You~27re either being modest...\n"
-    "{CENTER_ALIGN}or you just don~27t notice it.{EXTRA_MSG}"
+    "{CENTER_ALIGN}Oh?{WAIT_PRESS} You{APOSTROPHE}re not that popular?{WAIT_PRESS}\n"
+    "{CENTER_ALIGN}You{APOSTROPHE}re either being modest...\n"
+    "{CENTER_ALIGN}or you just don{APOSTROPHE}t notice it.{EXTRA_MSG}"
     "{CENTER_ALIGN}I bet people are just too shy\n"
     "{CENTER_ALIGN}to let their feelings be known.{EXTRA_MSG}"
-    "{CENTER_ALIGN}There~27s someone out there who~27s\n"
+    "{CENTER_ALIGN}There{APOSTROPHE}s someone out there who{APOSTROPHE}s\n"
     "{CENTER_ALIGN}afraid to declare their love for you!{EXTRA_MSG}"
     "{CENTER_ALIGN}An impish person like you should be...");
 
 ALIGNED(4) const char gJollyDescription[] = _(
     "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}The jolly type.{EXTRA_MSG}"
-    "{CENTER_ALIGN}Always laughing and smiling~2c\n"
+    "{CENTER_ALIGN}Always laughing and smiling{COMMA}\n"
     "{CENTER_ALIGN}you uplift everyone around you.{EXTRA_MSG}"
     "{CENTER_ALIGN}You love jokes!{EXTRA_MSG}"
-    "{CENTER_ALIGN}You have lots of friends~2c and\n"
-    "{CENTER_ALIGN}you~27re popular wherever you go.{EXTRA_MSG}"
+    "{CENTER_ALIGN}You have lots of friends{COMMA} and\n"
+    "{CENTER_ALIGN}you{APOSTROPHE}re popular wherever you go.{EXTRA_MSG}"
     "{CENTER_ALIGN}But sometimes you get carried away\n"
     "{CENTER_ALIGN}and say things that get you in trouble.{EXTRA_MSG}"
     "{CENTER_ALIGN}You should learn to think before\n"
@@ -201,19 +201,19 @@ ALIGNED(4) const char gBraveDescription[] = _(
     "{CENTER_ALIGN}For justice...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}For peace on earth...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}Fight the forces of evil!{EXTRA_MSG}"
-    "{CENTER_ALIGN}......{WAIT_PRESS}If I~27m wrong...{WAIT_PRESS}\n"
+    "{CENTER_ALIGN}......{WAIT_PRESS}If I{APOSTROPHE}m wrong...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}Work at becoming a true hero!{EXTRA_MSG}"
     "{CENTER_ALIGN}A brave person like you should be...");
 
 ALIGNED(4) const char gDocileDescription[] = _(
     "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}The docile type.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You~27re very kindhearted.{WAIT_PRESS}\n"
+    "{CENTER_ALIGN}You{APOSTROPHE}re very kindhearted.{WAIT_PRESS}\n"
     "{CENTER_ALIGN}Very helpful.{WAIT_PRESS}\n"
     "{CENTER_ALIGN}You can make friends with anyone.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You~27re a wonderful person.{EXTRA_MSG}"
+    "{CENTER_ALIGN}You{APOSTROPHE}re a wonderful person.{EXTRA_MSG}"
     "{CENTER_ALIGN}......{WAIT_PRESS}Is that going overboard?{WAIT_PRESS}\n"
-    "{CENTER_ALIGN}I don~27t think so.{EXTRA_MSG}"
+    "{CENTER_ALIGN}I don{APOSTROPHE}t think so.{EXTRA_MSG}"
     "{CENTER_ALIGN}You yourself should be\n"
     "{CENTER_ALIGN}the best judge of that.{EXTRA_MSG}"
     "{CENTER_ALIGN}A docile person like you should be...");
@@ -222,12 +222,12 @@ ALIGNED(4) const char gDocileDescription[] = _(
 ALIGNED(4) const char gHardyDescription[] = _(
     "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
     "{CENTER_ALIGN}The hardy type.{EXTRA_MSG}"
-    "{CENTER_ALIGN}You do your homework diligently~2c\n"
+    "{CENTER_ALIGN}You do your homework diligently{COMMA}\n"
     "{CENTER_ALIGN}and you know to eat properly.{EXTRA_MSG}"
     "{CENTER_ALIGN}You have strong willpower that lets\n"
-    "{CENTER_ALIGN}you complete tasks~2c however tough.{EXTRA_MSG}"
-    "{CENTER_ALIGN}But~2c you can also be stubborn to the\n"
+    "{CENTER_ALIGN}you complete tasks{COMMA} however tough.{EXTRA_MSG}"
+    "{CENTER_ALIGN}But{COMMA} you can also be stubborn to the\n"
     "{CENTER_ALIGN}point of even feuding with friends...{EXTRA_MSG}"
-    "{CENTER_ALIGN}Nothing will go right for you when you~27re\n"
-    "{CENTER_ALIGN}irritated~2c so learn to laugh it off.{EXTRA_MSG}"
+    "{CENTER_ALIGN}Nothing will go right for you when you{APOSTROPHE}re\n"
+    "{CENTER_ALIGN}irritated{COMMA} so learn to laugh it off.{EXTRA_MSG}"
     "{CENTER_ALIGN}A hardy person like you should be...");