diff --git a/include/personality_test1.h b/include/personality_test1.h
index d0d2a4b05..108a2d666 100644
--- a/include/personality_test1.h
+++ b/include/personality_test1.h
@@ -9,7 +9,7 @@ typedef struct PersonalityQuestion
 {
     /* 0x0 */ const u8 *question;
     /* 0x4 */ const MenuItem *answers;
-    /* 0x8 */ const u8 *effects;
+    /* 0x8 */ const u8 (*effects)[16];
 } PersonalityQuestion;
 
 struct PersonalityTestTracker
@@ -34,4 +34,4 @@ bool8 CreateTestTracker(void);
 void DeleteTestTracker(void);
 u8 HandleTestTrackerState(void);
 
-#endif // GUARD_PERSONALITY_TEST1_H
\ No newline at end of file
+#endif // GUARD_PERSONALITY_TEST1_H
diff --git a/src/data/personality_test1.h b/src/data/personality_test1.h
index bae1a59dd..db143f302 100644
--- a/src/data/personality_test1.h
+++ b/src/data/personality_test1.h
@@ -1,8 +1,8 @@
-ALIGNED(4) static const u8 HardyQuest1Points[48] =
+ALIGNED(4) static const u8 HardyQuest1Points[3][16] =
 {
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [HARDY] = 0x02, },
+    { [RELAXED] = 0x02, },
+    { [IMPISH] = 0x02, }
 };
 
 static const MenuItem HardyQuest1Answers[] =
@@ -19,10 +19,10 @@ ALIGNED(4) static const u8 HardyQuest1Question[] = _(
     "A test is coming up.\n"
     "How do you study for it?");
 
-ALIGNED(4) static const u8 HardyQuest2Points[32] =
+ALIGNED(4) static const u8 HardyQuest2Points[2][16] =
 {
-    0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+    { [HARDY] = 0x02, [DOCILE] = 0x01, },
+    { [QUIRKY] = 0x02, }
 };
 
 static const MenuItem HardyQuest2Answers[] =
@@ -36,10 +36,10 @@ static const u8 HardyQuest2Question[];
 static const PersonalityQuestion HardyQuest2 = { HardyQuest2Question, HardyQuest2Answers, HardyQuest2Points };
 ALIGNED(4) static const u8 HardyQuest2Question[] = _("Can you focus on something you like?");
 
-ALIGNED(4) static const u8 HardyQuest3Points[32] =
+ALIGNED(4) static const u8 HardyQuest3Points[2][16] =
 {
-    0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+    { [HARDY] = 0x02, [BRAVE] = 0x02, },
+    { [SASSY] = 0x02, [QUIRKY] = 0x02, }
 };
 
 static const MenuItem HardyQuest3Answers[] =
@@ -55,11 +55,11 @@ ALIGNED(4) static const u8 HardyQuest3Question[] = _(
     "When the going gets tough, do you get\n"
     "going?");
 
-ALIGNED(4) static const u8 HardyQuest4Points[48] =
+ALIGNED(4) static const u8 HardyQuest4Points[3][16] =
 {
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+    { [HARDY] = 0x02, },
+    { [CALM] = 0x02, },
+    { [QUIRKY] = 0x02, }
 };
 
 static const MenuItem HardyQuest4Answers[] =
@@ -76,10 +76,10 @@ ALIGNED(4) static const u8 HardyQuest4Question[] = _(
     "There is a bucket. If you put\n"
     "water in it, how high will you fill it?");
 
-ALIGNED(4) static const u8 DocileQuest1Points[32] =
+ALIGNED(4) static const u8 DocileQuest1Points[2][16] =
 {
-    0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [DOCILE] = 0x02, [NAIVE] = 0x01, },
+    { [TIMID] = 0x02, [CALM] = 0x01, }
 };
 
 static const MenuItem DocileQuest1Answers[] =
@@ -95,10 +95,10 @@ ALIGNED(4) static const u8 DocileQuest1Question[] = _(
     "You are offered a choice of two gifts.\n"
     "Which one will you take?");
 
-ALIGNED(4) static const u8 DocileQuest2Points[32] =
+ALIGNED(4) static const u8 DocileQuest2Points[2][16] =
 {
-    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [DOCILE] = 0x02, [HASTY] = 0x01, },
+    { [NAIVE] = 0x02, [RELAXED] = 0x01, }
 };
 
 static const MenuItem DocileQuest2Answers[] =
@@ -114,11 +114,11 @@ ALIGNED(4) static const u8 DocileQuest2Question[] = _(
     "You broke a rotten egg in your room!\n"
     "What will you do?");
 
-ALIGNED(4) static const u8 DocileQuest3Points[48] =
+ALIGNED(4) static const u8 DocileQuest3Points[3][16] =
 {
-    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [DOCILE] = 0x02, },
+    { [NAIVE] = 0x01, [LONELY] = 0x01, },
+    { [SASSY] = 0x02, }
 };
 
 static const u8 DocileQuest3_Regular[];
@@ -142,11 +142,11 @@ ALIGNED(4) static const u8 DocileQuest3Question[] = _(
     "forgotten.{WAIT_PRESS}\n"
     "How do you thank your friend?");
 
-ALIGNED(4) static const u8 DocileQuest4Points[48] =
+ALIGNED(4) static const u8 DocileQuest4Points[3][16] =
 {
-    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [DOCILE] = 0x02, },
+    { [NAIVE] = 0x02, },
+    { [IMPISH] = 0x02, }
 };
 
 static const MenuItem DocileQuest4Answers[] =
@@ -161,10 +161,10 @@ static const u8 DocileQuest4Question[];
 static const PersonalityQuestion DocileQuest4 = { DocileQuest4Question, DocileQuest4Answers, DocileQuest4Points };
 ALIGNED(4) static const u8 DocileQuest4Question[] = _("There is a wallet at the side of a road.");
 
-ALIGNED(4) static const u8 BraveQuest1Points[32] =
+ALIGNED(4) static const u8 BraveQuest1Points[2][16] =
 {
-    0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [BRAVE] = 0x03, [IMPISH] = 0x01, },
+    { [DOCILE] = 0x02, [TIMID] = 0x01, }
 };
 
 static const MenuItem BraveQuest1Answers[] =
@@ -183,11 +183,11 @@ ALIGNED(4) static const u8 BraveQuest1Question[] = _(
     "And the bungee cord snaps!{EXTRA_MSG}"
     "Will you still try to make a jump anyway?");
 
-ALIGNED(4) static const u8 BraveQuest2APoints[48] =
+ALIGNED(4) static const u8 BraveQuest2APoints[3][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
+    { },
+    { [TIMID] = 0x02, },
+    { [RELAXED] = 0x02, }
 };
 
 static const MenuItem BraveQuest2AAnswers[] =
@@ -204,10 +204,10 @@ ALIGNED(4) static const u8 BraveQuest2AQuestion[] = _(
     "There is an alien invasion!\n"
     "What will you do?");
 
-ALIGNED(4) static const u8 BraveQuest2BPoints[32] =
+ALIGNED(4) static const u8 BraveQuest2BPoints[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [SASSY] = 0x01, [RELAXED] = 0x01, },
+    { [BRAVE] = 0x04, }
 };
 
 static const MenuItem BraveQuest2BAnswers[] =
@@ -226,10 +226,10 @@ ALIGNED(4) static const u8 BraveQuest2BQuestion[] = _(
     "RULE THE WORLD.”{WAIT_PRESS}\n"
     "What will you do?");
 
-ALIGNED(4) static const u8 BraveQuest3Points[32] =
+ALIGNED(4) static const u8 BraveQuest3Points[2][16] =
 {
-    0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [HARDY] = 0x01, [BRAVE] = 0x02, },
+    { [NAIVE] = 0x02, }
 };
 
 static const MenuItem BraveQuest3Answers[] =
@@ -245,12 +245,12 @@ ALIGNED(4) static const u8 BraveQuest3Question[] = _(
     "There is a scream from behind a door!{WAIT_PRESS}\n"
     "How will you react?");
 
-ALIGNED(4) static const u8 BraveQuest4Points[64] =
+ALIGNED(4) static const u8 BraveQuest4Points[4][16] =
 {
-    0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [BRAVE] = 0x03, },
+    { [HARDY] = 0x02, [BRAVE] = 0x02, },
+    { [DOCILE] = 0x01, [TIMID] = 0x01, [RELAXED] = 0x01, },
+    { [TIMID] = 0x02, }
 };
 
 static const u8 BraveQuest4_Hesitation[];
@@ -277,10 +277,10 @@ ALIGNED(4) static const u8 BraveQuest4Question[] = _(
     "a busy city street!{WAIT_PRESS}\n"
     "What will you do?");
 
-ALIGNED(4) static const u8 JollyQuest1Points[32] =
+ALIGNED(4) static const u8 JollyQuest1Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x02, [NAIVE] = 0x01, },
+    { [SASSY] = 0x01, [QUIRKY] = 0x01, }
 };
 
 static const MenuItem JollyQuest1Answers[] =
@@ -294,10 +294,10 @@ static const u8 JollyQuest1Question[];
 static const PersonalityQuestion JollyQuest1 = { JollyQuest1Question, JollyQuest1Answers, JollyQuest1Points };
 ALIGNED(4) static const u8 JollyQuest1Question[] = _("Are you a cheerful personality?");
 
-ALIGNED(4) static const u8 JollyQuest2Points[32] =
+ALIGNED(4) static const u8 JollyQuest2Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x02, [LONELY] = 0x01, },
+    { [TIMID] = 0x01, }
 };
 
 static const MenuItem JollyQuest2Answers[] =
@@ -313,11 +313,11 @@ ALIGNED(4) static const u8 JollyQuest2Question[] = _(
     "Do you like to noisily enjoy yourself\n"
     "with others?");
 
-ALIGNED(4) static const u8 JollyQuest3Points[48] =
+ALIGNED(4) static const u8 JollyQuest3Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x02, },
+    { [CALM] = 0x02, },
+    { [QUIRKY] = 0x02, }
 };
 
 static const MenuItem JollyQuest3Answers[] =
@@ -334,11 +334,11 @@ ALIGNED(4) static const u8 JollyQuest3Question[] = _(
     "It's the summer holidays!\n"
     "Where would you like to go?");
 
-ALIGNED(4) static const u8 JollyQuest4Points[48] =
+ALIGNED(4) static const u8 JollyQuest4Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x03, },
+    { [HARDY] = 0x02, },
+    { [TIMID] = 0x02, }
 };
 
 static const u8 JollyQuest4_Funny[];
@@ -364,10 +364,10 @@ ALIGNED(4) static const u8 JollyQuest4Question[] = _(
     "this fellow is saying.{WAIT_PRESS}\n"
     "How do you reply?");
 
-ALIGNED(4) static const u8 ImpishQuest1Points[32] =
+ALIGNED(4) static const u8 ImpishQuest1Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [IMPISH] = 0x02, [LONELY] = 0x01, },
+    { [CALM] = 0x02, }
 };
 
 static const MenuItem ImpishQuest1Answers[] =
@@ -381,10 +381,10 @@ static const u8 ImpishQuest1Question[];
 static const PersonalityQuestion ImpishQuest1 = { ImpishQuest1Question, ImpishQuest1Answers, ImpishQuest1Points };
 ALIGNED(4) static const u8 ImpishQuest1Question[] = _("Have you ever made a pitfall trap?");
 
-ALIGNED(4) static const u8 ImpishQuest2Points[32] =
+ALIGNED(4) static const u8 ImpishQuest2Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [IMPISH] = 0x02, },
+    { [DOCILE] = 0x01, [RELAXED] = 0x01, }
 };
 
 static const MenuItem ImpishQuest2Answers[] =
@@ -398,10 +398,10 @@ static const u8 ImpishQuest2Question[];
 static const PersonalityQuestion ImpishQuest2 = { ImpishQuest2Question, ImpishQuest2Answers, ImpishQuest2Points };
 ALIGNED(4) static const u8 ImpishQuest2Question[] = _("Do you like pranks?");
 
-ALIGNED(4) static const u8 ImpishQuest3Points[32] =
+ALIGNED(4) static const u8 ImpishQuest3Points[2][16] =
 {
-    0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+    { [HARDY] = 0x01, [IMPISH] = 0x02, },
+    { [SASSY] = 0x01, [QUIRKY] = 0x02, }
 };
 
 static const MenuItem ImpishQuest3Answers[] =
@@ -415,11 +415,11 @@ static const u8 ImpishQuest3Question[];
 static const PersonalityQuestion ImpishQuest3 = { ImpishQuest3Question, ImpishQuest3Answers, ImpishQuest3Points };
 ALIGNED(4) static const u8 ImpishQuest3Question[] = _("Are there many things that you would like\nto do?");
 
-ALIGNED(4) static const u8 ImpishQuest4Points[48] =
+ALIGNED(4) static const u8 ImpishQuest4Points[3][16] =
 {
-    0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [BRAVE] = 0x03, },
+    { [TIMID] = 0x02, },
+    { [IMPISH] = 0x02, }
 };
 
 static const MenuItem ImpishQuest4Answers[] =
@@ -436,11 +436,11 @@ ALIGNED(4) static const u8 ImpishQuest4Question[] = _(
     "Your friend is being bullied!\n"
     "What do you do?");
 
-ALIGNED(4) static const u8 NaiveQuest1Points[48] =
+ALIGNED(4) static const u8 NaiveQuest1Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [IMPISH] = 0x01, [NAIVE] = 0x03, },
+    { [JOLLY] = 0x02, },
+    { [SASSY] = 0x02, }
 };
 
 static const MenuItem NaiveQuest1Answers[] =
@@ -455,10 +455,10 @@ static const u8 NaiveQuest1Question[];
 static const PersonalityQuestion NaiveQuest1 = { NaiveQuest1Question, NaiveQuest1Answers, NaiveQuest1Points };
 ALIGNED(4) static const u8 NaiveQuest1Question[] = _("Do you like groan-inducing puns?");
 
-ALIGNED(4) static const u8 NaiveQuest2Points[32] =
+ALIGNED(4) static const u8 NaiveQuest2Points[2][16] =
 {
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+    { [DOCILE] = 0x01, [NAIVE] = 0x02, },
+    { [QUIRKY] = 0x02, }
 };
 
 static const MenuItem NaiveQuest2Answers[] =
@@ -472,10 +472,10 @@ static const u8 NaiveQuest2Question[];
 static const PersonalityQuestion NaiveQuest2 = { NaiveQuest2Question, NaiveQuest2Answers, NaiveQuest2Points };
 ALIGNED(4) static const u8 NaiveQuest2Question[] = _("Do you tend to laugh a lot?");
 
-ALIGNED(4) static const u8 NaiveQuest3Points[32] =
+ALIGNED(4) static const u8 NaiveQuest3Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x01, [NAIVE] = 0x02, },
+    { [CALM] = 0x02, }
 };
 
 static const MenuItem NaiveQuest3Answers[] =
@@ -489,10 +489,10 @@ static const u8 NaiveQuest3Question[];
 static const PersonalityQuestion NaiveQuest3 = { NaiveQuest3Question, NaiveQuest3Answers, NaiveQuest3Points };
 ALIGNED(4) static const u8 NaiveQuest3Question[] = _("Do others often call you childish?");
 
-ALIGNED(4) static const u8 NaiveQuest4Points[32] =
+ALIGNED(4) static const u8 NaiveQuest4Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [NAIVE] = 0x02, },
+    { [HASTY] = 0x02, }
 };
 
 static const MenuItem NaiveQuest4Answers[] =
@@ -508,11 +508,11 @@ ALIGNED(4) static const u8 NaiveQuest4Question[] = _(
     "Do you like to imagine things for your\n"
     "amusement?");
 
-ALIGNED(4) static const u8 TimidQuest1Points[48] =
+ALIGNED(4) static const u8 TimidQuest1Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [TIMID] = 0x02, },
+    { [HARDY] = 0x01, [CALM] = 0x02, },
+    { [BRAVE] = 0x02, [IMPISH] = 0x01, [NAIVE] = 0x01, }
 };
 
 static const MenuItem TimidQuest1Answers[] =
@@ -529,13 +529,13 @@ ALIGNED(4) static const u8 TimidQuest1Question[] = _(
     "A human hand extends out of a toilet!\n"
     "What would you do?");
 
-ALIGNED(4) static const u8 TimidQuest2Points[80] =
+ALIGNED(4) static const u8 TimidQuest2Points[5][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+    { [TIMID] = 0x02, },
+    { [HASTY] = 0x02, },
+    { [JOLLY] = 0x02, },
+    { [SASSY] = 0x02, },
+    { [LONELY] = 0x02, }
 };
 
 static const MenuItem TimidQuest2Answers[] =
@@ -555,11 +555,11 @@ ALIGNED(4) static const u8 TimidQuest2Question[] = _(
     "right hand.{WAIT_PRESS}\n"
     "Which digit did you grab?");
 
-ALIGNED(4) static const u8 TimidQuest3Points[48] =
+ALIGNED(4) static const u8 TimidQuest3Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+    { [TIMID] = 0x02, },
+    { [LONELY] = 0x02, },
+    { [IMPISH] = 0x02, [QUIRKY] = 0x01, }
 };
 
 static const MenuItem TimidQuest3Answers[] =
@@ -577,11 +577,11 @@ ALIGNED(4) static const u8 TimidQuest3Question[] = _(
     "pitch-black room!{WAIT_PRESS}\n"
     "What do you do?");
 
-ALIGNED(4) static const u8 TimidQuest4Points[48] =
+ALIGNED(4) static const u8 TimidQuest4Points[3][16] =
 {
-    0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [BRAVE] = 0x03, },
+    { [TIMID] = 0x02, },
+    { [SASSY] = 0x02, }
 };
 
 static const MenuItem TimidQuest4Answers[] =
@@ -596,11 +596,11 @@ static const u8 TimidQuest4Question[];
 static const PersonalityQuestion TimidQuest4 = { TimidQuest4Question, TimidQuest4Answers, TimidQuest4Points };
 ALIGNED(4) static const u8 TimidQuest4Question[] = _("Can you go into a haunted house?");
 
-ALIGNED(4) static const u8 HastyQuest1Points[48] =
+ALIGNED(4) static const u8 HastyQuest1Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [HASTY] = 0x02, },
+    { [CALM] = 0x02, },
+    { [TIMID] = 0x02, }
 };
 
 static const MenuItem HastyQuest1Answers[] =
@@ -618,11 +618,11 @@ ALIGNED(4) static const u8 HastyQuest1Question[] = _(
     "But you don't know what's in it.{WAIT_PRESS}\n"
     "You're curious, so what do you do?");
 
-ALIGNED(4) static const u8 HastyQuest2Points[48] =
+ALIGNED(4) static const u8 HastyQuest2Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x02, [HASTY] = 0x01, },
+    { [HARDY] = 0x01, [CALM] = 0x01, },
+    { [BRAVE] = 0x02, [QUIRKY] = 0x02, }
 };
 
 static const MenuItem HastyQuest2Answers[] =
@@ -639,11 +639,11 @@ ALIGNED(4) static const u8 HastyQuest2Question[] = _(
     "You win a lottery!{WAIT_PRESS}\n"
     "What do you do with the money?");
 
-ALIGNED(4) static const u8 HastyQuest3Points[48] =
+ALIGNED(4) static const u8 HastyQuest3Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [HASTY] = 0x02, },
+    { [TIMID] = 0x02, },
+    { [SASSY] = 0x02, }
 };
 
 static const u8 HastyQuest3_Open[];
@@ -666,11 +666,11 @@ ALIGNED(4) static const u8 HastyQuest3Question[] = _(
     "You come across a treasure chest!\n"
     "What do you do?");
 
-ALIGNED(4) static const u8 HastyQuest4Points[48] =
+ALIGNED(4) static const u8 HastyQuest4Points[3][16] =
 {
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [DOCILE] = 0x01, [HASTY] = 0x02, },
+    { [RELAXED] = 0x02, },
+    { [HASTY] = 0x03, }
 };
 
 static const MenuItem HastyQuest4Answers[] =
@@ -688,11 +688,11 @@ ALIGNED(4) static const u8 HastyQuest4Question[] = _(
     "at the promised time.\n"
     "What do you do?");
 
-ALIGNED(4) static const u8 SassyQuest1Points[48] =
+ALIGNED(4) static const u8 SassyQuest1Points[3][16] =
 {
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [HARDY] = 0x02, },
+    { [DOCILE] = 0x02, },
+    { [SASSY] = 0x02, }
 };
 
 static const MenuItem SassyQuest1Answers[] =
@@ -709,10 +709,10 @@ ALIGNED(4) static const u8 SassyQuest1Question[] = _(
     "Your country's leader is in front of you.\n"
     "How do you speak to him or her?");
 
-ALIGNED(4) static const u8 SassyQuest2Points[32] =
+ALIGNED(4) static const u8 SassyQuest2Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [IMPISH] = 0x01, [SASSY] = 0x02, },
+    { [CALM] = 0x02, }
 };
 
 static const MenuItem SassyQuest2Answers[] =
@@ -726,10 +726,10 @@ static const u8 SassyQuest2Question[];
 static const PersonalityQuestion SassyQuest2 = { SassyQuest2Question, SassyQuest2Answers, SassyQuest2Points };
 ALIGNED(4) static const u8 SassyQuest2Question[] = _("Do others tell you to watch what you say?");
 
-ALIGNED(4) static const u8 SassyQuest3Points[32] =
+ALIGNED(4) static const u8 SassyQuest3Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [SASSY] = 0x02, },
+    { [RELAXED] = 0x02, }
 };
 
 static const MenuItem SassyQuest3Answers[] =
@@ -745,10 +745,10 @@ ALIGNED(4) static const u8 SassyQuest3Question[] = _(
     "Do you think you are cool?\n"
     "Be honest.");
 
-ALIGNED(4) static const u8 SassyQuest4Points[32] =
+ALIGNED(4) static const u8 SassyQuest4Points[2][16] =
 {
-    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+    { [DOCILE] = 0x02, [CALM] = 0x01, },
+    { [SASSY] = 0x02, [QUIRKY] = 0x01, }
 };
 
 static const MenuItem SassyQuest4Answers[] =
@@ -764,10 +764,10 @@ ALIGNED(4) static const u8 SassyQuest4Question[] = _(
     "Can you sincerely thank someone when you\n"
     "feel grateful?");
 
-ALIGNED(4) static const u8 CalmQuest1Points[32] =
+ALIGNED(4) static const u8 CalmQuest1Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [CALM] = 0x02, [LONELY] = 0x01, },
+    { [HARDY] = 0x02, }
 };
 
 static const MenuItem CalmQuest1Answers[] =
@@ -783,10 +783,10 @@ ALIGNED(4) static const u8 CalmQuest1Question[] = _(
     "Do you occasionally consider yourself\n"
     "dull and overly cautious?");
 
-ALIGNED(4) static const u8 CalmQuest2Points[32] =
+ALIGNED(4) static const u8 CalmQuest2Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [CALM] = 0x02, },
+    { [IMPISH] = 0x02, }
 };
 
 static const MenuItem CalmQuest2Answers[] =
@@ -802,10 +802,10 @@ ALIGNED(4) static const u8 CalmQuest2Question[] = _(
     "Do you dream of lounging around idly\n"
     "without much excitement?");
 
-ALIGNED(4) static const u8 CalmQuest3Points[32] =
+ALIGNED(4) static const u8 CalmQuest3Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
+    { [IMPISH] = 0x01, [TIMID] = 0x02, },
+    { [CALM] = 0x02, [LONELY] = 0x01, }
 };
 
 static const MenuItem CalmQuest3Answers[] =
@@ -819,10 +819,10 @@ static const u8 CalmQuest3Question[];
 static const PersonalityQuestion CalmQuest3 = { CalmQuest3Question, CalmQuest3Answers, CalmQuest3Points };
 ALIGNED(4) static const u8 CalmQuest3Question[] = _("Do you like to fight?");
 
-ALIGNED(4) static const u8 CalmQuest4Points[32] =
+ALIGNED(4) static const u8 CalmQuest4Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [CALM] = 0x02, [RELAXED] = 0x01, },
+    { [HARDY] = 0x01, [HASTY] = 0x02, }
 };
 
 static const MenuItem CalmQuest4Answers[] =
@@ -836,10 +836,10 @@ static const u8 CalmQuest4Question[];
 static const PersonalityQuestion CalmQuest4 = { CalmQuest4Question, CalmQuest4Answers, CalmQuest4Points };
 ALIGNED(4) static const u8 CalmQuest4Question[] = _("Do you often yawn?");
 
-ALIGNED(4) static const u8 RelaxedQuest1Points[32] =
+ALIGNED(4) static const u8 RelaxedQuest1Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [SASSY] = 0x01, [RELAXED] = 0x02, },
+    { [HARDY] = 0x02, [HASTY] = 0x01, }
 };
 
 static const MenuItem RelaxedQuest1Answers[] =
@@ -853,10 +853,10 @@ static const u8 RelaxedQuest1Question[];
 static const PersonalityQuestion RelaxedQuest1 = { RelaxedQuest1Question, RelaxedQuest1Answers, RelaxedQuest1Points };
 ALIGNED(4) static const u8 RelaxedQuest1Question[] = _("Are you often late for school or meetings?");
 
-ALIGNED(4) static const u8 RelaxedQuest2Points[32] =
+ALIGNED(4) static const u8 RelaxedQuest2Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [RELAXED] = 0x02, },
+    { [IMPISH] = 0x01, [HASTY] = 0x02, }
 };
 
 static const MenuItem RelaxedQuest2Answers[] =
@@ -872,11 +872,11 @@ ALIGNED(4) static const u8 RelaxedQuest2Question[] = _(
     "Do you get the feeling that you've slowed\n"
     "down lately?");
 
-ALIGNED(4) static const u8 RelaxedQuest3Points[48] =
+ALIGNED(4) static const u8 RelaxedQuest3Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x02, },
+    { [RELAXED] = 0x02, },
+    { [HASTY] = 0x02, }
 };
 
 static const MenuItem RelaxedQuest3Answers[] =
@@ -893,10 +893,10 @@ ALIGNED(4) static const u8 RelaxedQuest3Question[] = _(
     "It is a pleasant day at the beach.\n"
     "How do you feel?");
 
-ALIGNED(4) static const u8 RelaxedQuest4Points[32] =
+ALIGNED(4) static const u8 RelaxedQuest4Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [CALM] = 0x01, [RELAXED] = 0x02, },
+    { [HARDY] = 0x02, }
 };
 
 static const MenuItem RelaxedQuest4Answers[] =
@@ -910,10 +910,10 @@ static const u8 RelaxedQuest4Question[];
 static const PersonalityQuestion RelaxedQuest4 = { RelaxedQuest4Question, RelaxedQuest4Answers, RelaxedQuest4Points };
 ALIGNED(4) static const u8 RelaxedQuest4Question[] = _("Do you fall asleep without noticing?");
 
-ALIGNED(4) static const u8 LonelyQuest1Points[32] =
+ALIGNED(4) static const u8 LonelyQuest1Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [TIMID] = 0x01, [LONELY] = 0x02, },
+    { [SASSY] = 0x02, }
 };
 
 static const MenuItem LonelyQuest1Answers[] =
@@ -927,10 +927,10 @@ static const u8 LonelyQuest1Question[];
 static const PersonalityQuestion LonelyQuest1 = { LonelyQuest1Question, LonelyQuest1Answers, LonelyQuest1Points };
 ALIGNED(4) static const u8 LonelyQuest1Question[] = _("Do you feel lonesome when you are alone?");
 
-ALIGNED(4) static const u8 LonelyQuest2Points[32] =
+ALIGNED(4) static const u8 LonelyQuest2Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [TIMID] = 0x01, [LONELY] = 0x02, },
+    { [BRAVE] = 0x03, [RELAXED] = 0x01, }
 };
 
 static const MenuItem LonelyQuest2Answers[] =
@@ -946,10 +946,10 @@ ALIGNED(4) static const u8 LonelyQuest2Question[] = _(
     "Do you hate to be the last person to leave\n"
     "class at the end of a school day?");
 
-ALIGNED(4) static const u8 LonelyQuest3Points[32] =
+ALIGNED(4) static const u8 LonelyQuest3Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [TIMID] = 0x01, [LONELY] = 0x02, },
+    { [CALM] = 0x02, }
 };
 
 static const MenuItem LonelyQuest3Answers[] =
@@ -965,11 +965,11 @@ ALIGNED(4) static const u8 LonelyQuest3Question[] = _(
     "What do you do with your room's light\n"
     "when you're going to bed at night?");
 
-ALIGNED(4) static const u8 LonelyQuest4Points[48] =
+ALIGNED(4) static const u8 LonelyQuest4Points[3][16] =
 {
-    0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x01, [LONELY] = 0x01, },
+    { [CALM] = 0x01, [RELAXED] = 0x02, },
+    { [TIMID] = 0x01, [LONELY] = 0x03, }
 };
 
 static const MenuItem LonelyQuest4Answers[] =
@@ -987,10 +987,10 @@ ALIGNED(4) static const u8 LonelyQuest4Question[] = _(
     "with you...\n"
     "What do you do?");
 
-ALIGNED(4) static const u8 QuirkyQuest1Points[32] =
+ALIGNED(4) static const u8 QuirkyQuest1Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [QUIRKY] = 0x02, },
+    { [HARDY] = 0x02, }
 };
 
 static const MenuItem QuirkyQuest1Answers[] =
@@ -1006,11 +1006,11 @@ ALIGNED(4) static const u8 QuirkyQuest1Question[] = _(
     "Do you sometimes run out of things to do\n"
     "all of a sudden?");
 
-ALIGNED(4) static const u8 QuirkyQuest2Points[48] =
+ALIGNED(4) static const u8 QuirkyQuest2Points[3][16] =
 {
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [HARDY] = 0x01, [HASTY] = 0x01, },
+    { [QUIRKY] = 0x02, },
+    { [SASSY] = 0x02, }
 };
 
 static const u8 QuirkyQuest2_Reply[];
@@ -1031,12 +1031,12 @@ static const u8 QuirkyQuest2Question[];
 static const PersonalityQuestion QuirkyQuest2 = { QuirkyQuest2Question, QuirkyQuest2Answers, QuirkyQuest2Points };
 ALIGNED(4) static const u8 QuirkyQuest2Question[] = _("How quickly do you respond to an e-mail?");
 
-ALIGNED(4) static const u8 QuirkyQuest3Points[64] =
+ALIGNED(4) static const u8 QuirkyQuest3Points[4][16] =
 {
-    0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [HARDY] = 0x01, [BRAVE] = 0x03, },
+    { [QUIRKY] = 0x02, },
+    { [IMPISH] = 0x02, },
+    { [TIMID] = 0x02, }
 };
 
 static const MenuItem QuirkyQuest3Answers[] =
@@ -1055,11 +1055,11 @@ ALIGNED(4) static const u8 QuirkyQuest3Question[] = _(
     "But there's no opportunity to get close.\n"
     "What do you do?");
 
-ALIGNED(4) static const u8 QuirkyQuest4Points[48] =
+ALIGNED(4) static const u8 QuirkyQuest4Points[3][16] =
 {
-    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+    { [DOCILE] = 0x02, },
+    { [SASSY] = 0x02, },
+    { [QUIRKY] = 0x02, }
 };
 
 static const u8 QuirkyQuest4_GoRight[];
@@ -1083,10 +1083,10 @@ ALIGNED(4) static const u8 QuirkyQuest4Question[] = _(
     "You are told there is a treasure on the\n"
     "right side. What do you do?");
 
-ALIGNED(4) static const u8 MiscQuest1Points[32] =
+ALIGNED(4) static const u8 MiscQuest1Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
+    { [HASTY] = 0x01, [QUIRKY] = 0x01, },
+    { [JOLLY] = 0x01, [LONELY] = 0x01, }
 };
 
 static const MenuItem MiscQuest1Answers[] =
@@ -1100,10 +1100,10 @@ static const u8 MiscQuest1Question[];
 static const PersonalityQuestion MiscQuest1 = { MiscQuest1Question, MiscQuest1Answers, MiscQuest1Points };
 ALIGNED(4) static const u8 MiscQuest1Question[] = _("On vacation outings, you want to...");
 
-ALIGNED(4) static const u8 MiscQuest2Points[32] =
+ALIGNED(4) static const u8 MiscQuest2Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+    { [JOLLY] = 0x02, },
+    { [SASSY] = 0x01, [QUIRKY] = 0x01, }
 };
 
 static const u8 MiscQuest2_DontCare[];
@@ -1121,10 +1121,10 @@ ALIGNED(4) static const u8 MiscQuest2Question[] = _(
     "It's the summer festival!\n"
     "Do you like carnivals?");
 
-ALIGNED(4) static const u8 MiscQuest3Points[32] =
+ALIGNED(4) static const u8 MiscQuest3Points[2][16] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    { [NAIVE] = 0x01, [LONELY] = 0x01, },
+    { [HASTY] = 0x01, [SASSY] = 0x01, }
 };
 
 static const MenuItem MiscQuest3Answers[] =
@@ -1506,4 +1506,4 @@ static const UnkTextStruct2 sUnknown_80F4244 =
     5, 5,
     5, 0,
     NULL
-};
\ No newline at end of file
+};
diff --git a/src/personality_test1.c b/src/personality_test1.c
index 65170594d..760479496 100644
--- a/src/personality_test1.c
+++ b/src/personality_test1.c
@@ -215,7 +215,7 @@ static void UpdateNatureTotals(void)
 {
     s32 answerIndex;
     s32 natureIndex;
-    const u8 *pointArray;
+    const u8 (*pointArray)[16];
 
     if (sub_80144A4(&answerIndex))
         return;
@@ -228,11 +228,9 @@ static void UpdateNatureTotals(void)
     }
     else {
         pointArray = gPersonalityQuestionPointerTable[sPersonalityTestTracker->currQuestionIndex]->effects;
-        // Skip until we get to the one for our answer
-        // Each Answer has 16 bytes. 13 are currently used with 3 remaining
-        pointArray += (NUM_PERSONALITIES + 3) * answerIndex;
+        pointArray += answerIndex;
         for (natureIndex = 0; natureIndex < NUM_PERSONALITIES; natureIndex++)
-            sPersonalityTestTracker->NatureTotals[natureIndex] += pointArray[natureIndex];
+            sPersonalityTestTracker->NatureTotals[natureIndex] += (*pointArray)[natureIndex];
 
         sPersonalityTestTracker->TestState = PERSONALITY_GENERATE_NEW_QUESTION;
     }