minor fixes

5 files changed, 70 insertions, 68 deletions

diff --git a/include/strings.h b/include/strings.h
index d6a239559..78ae2c140 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2745,23 +2745,23 @@ extern const u8 gText_BestScore2[];
 extern const u8 gText_ExcellentsInARow[];
 
 // Lilycove Lady
-extern const u8 gText_Handsome[];
-extern const u8 gText_Vinny[];
-extern const u8 gText_Moreme[];
-extern const u8 gText_Ironhard[];
-extern const u8 gText_Muscle[];
-extern const u8 gText_Coolness[];
-extern const u8 gText_Beauty[];
-extern const u8 gText_Cuteness[];
-extern const u8 gText_Smartness[];
-extern const u8 gText_Toughness[];
-extern const u8 gText_Lady2[];
-extern const u8 gText_Slippery[];
-extern const u8 gText_Roundish[];
-extern const u8 gText_Whamish[];
-extern const u8 gText_Shiny[];
-extern const u8 gText_Sticky[];
-extern const u8 gText_Pointy[];
+extern const u8 gText_ContestLady_Handsome[];
+extern const u8 gText_ContestLady_Vinny[];
+extern const u8 gText_ContestLady_Moreme[];
+extern const u8 gText_ContestLady_Ironhard[];
+extern const u8 gText_ContestLady_Muscle[];
+extern const u8 gText_ContestLady_Coolness[];
+extern const u8 gText_ContestLady_Beauty[];
+extern const u8 gText_ContestLady_Cuteness[];
+extern const u8 gText_ContestLady_Smartness[];
+extern const u8 gText_ContestLady_Toughness[];
+extern const u8 gText_QuizLady_Lady[];
+extern const u8 gText_FavorLady_Slippery[];
+extern const u8 gText_FavorLady_Roundish[];
+extern const u8 gText_FavorLady_Whamish[];
+extern const u8 gText_FavorLady_Shiny[];
+extern const u8 gText_FavorLady_Sticky[];
+extern const u8 gText_FavorLady_Pointy[];
 
 extern const u8 gText_CoolnessContest[];
 extern const u8 gText_BeautyContest[];
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 93456631a..9a529afe3 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -1305,15 +1305,15 @@ void ShowEasyChatScreen(void)
         displayedPersonType = EASY_CHAT_PERSON_BOY;
         break;
     case EASY_CHAT_TYPE_QUIZ_ANSWER:
-        words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016;
+        words = &gSaveBlock1Ptr->lilycoveLady.quiz.response;
         break;
     case EASY_CHAT_TYPE_QUIZ_QUESTION:
         return;
     case EASY_CHAT_TYPE_QUIZ_SET_QUESTION:
-        words = gSaveBlock1Ptr->lilycoveLady.quiz.unk_002;
+        words = gSaveBlock1Ptr->lilycoveLady.quiz.question;
         break;
     case EASY_CHAT_TYPE_QUIZ_SET_ANSWER:
-        words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014;
+        words = &gSaveBlock1Ptr->lilycoveLady.quiz.answer;
         break;
     case EASY_CHAT_TYPE_APPRENTICE:
         words = gSaveBlock2Ptr->apprentices[0].easyChatWords;
@@ -1343,7 +1343,7 @@ static void sub_811A7E4(void)
         if (!gPaletteFade.active)
         {
             lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
-            lilycoveLady->quiz.unk_016 = -1;
+            lilycoveLady->quiz.response = -1;
             CleanupOverworldWindowsAndTilemaps();
             DoQuizQuestionEasyChatScreen();
         }
@@ -1387,7 +1387,7 @@ static void DoQuizAnswerEasyChatScreen(void)
 {
     DoEasyChatScreen(
         EASY_CHAT_TYPE_QUIZ_ANSWER,
-        &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016,
+        &gSaveBlock1Ptr->lilycoveLady.quiz.response,
         CB2_ReturnToFieldContinueScript,
         EASY_CHAT_PERSON_DISPLAY_NONE);
 }
@@ -1395,7 +1395,7 @@ static void DoQuizAnswerEasyChatScreen(void)
 static void DoQuizQuestionEasyChatScreen(void)
 {
     DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_QUESTION,
-        gSaveBlock1Ptr->lilycoveLady.quiz.unk_002,
+        gSaveBlock1Ptr->lilycoveLady.quiz.question,
         CB2_ReturnToFieldContinueScript,
         EASY_CHAT_PERSON_DISPLAY_NONE);
 }
@@ -1403,7 +1403,7 @@ static void DoQuizQuestionEasyChatScreen(void)
 static void DoQuizSetAnswerEasyChatScreen(void)
 {
     DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_SET_ANSWER,
-        &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014,
+        &gSaveBlock1Ptr->lilycoveLady.quiz.answer,
         CB2_ReturnToFieldContinueScript,
         EASY_CHAT_PERSON_DISPLAY_NONE);
 }
@@ -1411,7 +1411,7 @@ static void DoQuizSetAnswerEasyChatScreen(void)
 static void DoQuizSetQuestionEasyChatScreen(void)
 {
     DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_SET_QUESTION,
-        gSaveBlock1Ptr->lilycoveLady.quiz.unk_002,
+        gSaveBlock1Ptr->lilycoveLady.quiz.question,
         CB2_ReturnToFieldContinueScript,
         EASY_CHAT_PERSON_DISPLAY_NONE);
 }
@@ -2662,7 +2662,7 @@ static int sub_811BD64(void)
     saveBlock1 = gSaveBlock1Ptr;
     for (i = 0; i < 9; i++)
     {
-        if (saveBlock1->lilycoveLady.quiz.unk_002[i] != 0xFFFF)
+        if (saveBlock1->lilycoveLady.quiz.question[i] != 0xFFFF)
             return 0;
     }
 
@@ -2676,7 +2676,7 @@ static int sub_811BDB0(void)
         return sub_811BCF4();
 
     quiz = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    return quiz->unk_014 == 0xFFFF ? 1 : 0;
+    return quiz->answer == 0xFFFF ? 1 : 0;
 }
 
 static void sub_811BDF0(u8 *arg0)
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index a3ab2228d..fe1129dd1 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -20,6 +20,8 @@
 #include "constants/easy_chat.h"
 #include "constants/event_objects.h"
 #include "constants/items.h"
+#include "constants/species.h"
+#include "constants/moves.h"
 
 enum
 {
@@ -339,12 +341,12 @@ static const u16 sQuizLadyPrizes[] =
 // Favor Lady data
 static const u8 *const sFavorLadyDescriptions[] =
 {
-    gText_Slippery,
-    gText_Roundish,
-    gText_Whamish,
-    gText_Shiny,
-    gText_Sticky,
-    gText_Pointy
+    gText_FavorLady_Slippery,
+    gText_FavorLady_Roundish,
+    gText_FavorLady_Whamish,
+    gText_FavorLady_Shiny,
+    gText_FavorLady_Sticky,
+    gText_FavorLady_Pointy
 };
 
 static const u16 sFavorLadyAcceptedItems_Slippery[] =
@@ -356,8 +358,8 @@ static const u16 sFavorLadyAcceptedItems_Slippery[] =
     ITEM_PARALYZE_HEAL,
     ITEM_BURN_HEAL,
     ITEM_BELUE_BERRY,
-    ITEM_LUXURY_BALL,
-    ITEM_TIMER_BALL,
+    ITEM_AWAKENING,
+    ITEM_ICE_HEAL,
     ITEM_REVIVE,
     ITEM_MAX_REVIVE,
     ITEM_ENERGY_POWDER,
@@ -482,20 +484,20 @@ static const u16 sFavorLadyPrizes[] =
 
 static const u8 *const sContestLadyMonNames[] =
 {
-    gText_Handsome,
-    gText_Vinny,
-    gText_Moreme,
-    gText_Ironhard,
-    gText_Muscle
+    gText_ContestLady_Handsome,
+    gText_ContestLady_Vinny,
+    gText_ContestLady_Moreme,
+    gText_ContestLady_Ironhard,
+    gText_ContestLady_Muscle
 };
 
 static const u8 *const sContestLadyCategoryNames[] =
 {
-    gText_Coolness,
-    gText_Beauty,
-    gText_Cuteness,
-    gText_Smartness,
-    gText_Toughness
+    gText_ContestLady_Coolness,
+    gText_ContestLady_Beauty,
+    gText_ContestLady_Cuteness,
+    gText_ContestLady_Smartness,
+    gText_ContestLady_Toughness
 };
 
 static const u8 *const sContestNames[] =
@@ -913,7 +915,7 @@ static u8 BufferAuthorName(void)
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
     if (sQuizLadyPtr->playerName[0] == EOS)
     {
-        StringCopy7(gStringVar1, gText_Lady2);
+        StringCopy7(gStringVar1, gText_QuizLady_Lady);
         author = QUIZ_AUTHOR_LADY;
     }
     else
diff --git a/src/script_menu.c b/src/script_menu.c
index b17d3df38..b0e0ec920 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -41,11 +41,11 @@ const struct MenuAction MultichoiceList_003[] =
 
 const struct MenuAction MultichoiceList_004[] =
 {
-    {gUnknown_085EADA4, NULL},
-    {gUnknown_085EADB5, NULL},
-    {gUnknown_085EADC4, NULL},
-    {gUnknown_085EADD5, NULL},
-    {gUnknown_085EADE7, NULL},
+    {gText_CoolnessContest, NULL},
+    {gText_BeautyContest, NULL},
+    {gText_CutenessContest, NULL},
+    {gText_SmartnessContest, NULL},
+    {gText_ToughnessContest, NULL},
     {gText_Exit, NULL},
 };
 
diff --git a/src/strings.c b/src/strings.c
index 8134265f3..ebc995f13 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1591,23 +1591,23 @@ const u8 gText_PkmnsNickname[] = _("{STR_VAR_1}'s nickname?");
 const u8 gText_TellHimTheWords[] = _("Tell him the words.");
 const u8 gText_MoveOkBack[] = _("{DPAD_NONE}MOVE  {A_BUTTON}OK  {B_BUTTON}BACK");
 const u8 gText_CallCantBeMadeHere[] = _("A call can't be made from here.");
-const u8 gText_Handsome[] = _("HANDSOME");
-const u8 gText_Vinny[] = _("VINNY");
-const u8 gText_Moreme[] = _("MOREME");
-const u8 gText_Ironhard[] = _("IRONHARD");
-const u8 gText_Muscle[] = _("MUSCLE");
-const u8 gText_Coolness[] = _("coolness");
-const u8 gText_Beauty[] = _("beauty");
-const u8 gText_Cuteness[] = _("cuteness");
-const u8 gText_Smartness[] = _("smartness");
-const u8 gText_Toughness[] = _("toughness");
-const u8 gText_Lady2[] = _("Lady");
-const u8 gText_Slippery[] = _("slippery");
-const u8 gText_Roundish[] = _("roundish");
-const u8 gText_Whamish[] = _("wham-ish");
-const u8 gText_Shiny[] = _("shiny");
-const u8 gText_Sticky[] = _("sticky");
-const u8 gText_Pointy[] = _("pointy");
+const u8 gText_ContestLady_Handsome[] = _("HANDSOME");
+const u8 gText_ContestLady_Vinny[] = _("VINNY");
+const u8 gText_ContestLady_Moreme[] = _("MOREME");
+const u8 gText_ContestLady_Ironhard[] = _("IRONHARD");
+const u8 gText_ContestLady_Muscle[] = _("MUSCLE");
+const u8 gText_ContestLady_Coolness[] = _("coolness");
+const u8 gText_ContestLady_Beauty[] = _("beauty");
+const u8 gText_ContestLady_Cuteness[] = _("cuteness");
+const u8 gText_ContestLady_Smartness[] = _("smartness");
+const u8 gText_ContestLady_Toughness[] = _("toughness");
+const u8 gText_QuizLady_Lady[] = _("Lady");
+const u8 gText_FavorLady_Slippery[] = _("slippery");
+const u8 gText_FavorLady_Roundish[] = _("roundish");
+const u8 gText_FavorLady_Whamish[] = _("wham-ish");
+const u8 gText_FavorLady_Shiny[] = _("shiny");
+const u8 gText_FavorLady_Sticky[] = _("sticky");
+const u8 gText_FavorLady_Pointy[] = _("pointy");
 const u8 gText_RentalPkmn2[] = _("RENTAL POKéMON");
 const u8 gText_SelectFirstPkmn[] = _("Select the first POKéMON.");
 const u8 gText_SelectSecondPkmn[] = _("Select the second POKéMON.");