summaryrefslogtreecommitdiff
path: root/src/lilycove_lady.c
diff options
context:
space:
mode:
authorGriffinR <25753467+GriffinRichards@users.noreply.github.com>2019-08-04 10:15:50 -0400
committerhuderlem <huderlem@gmail.com>2019-08-21 17:06:55 -0500
commit5d96a0cc97431d4935042fa58e0ff06f4db8a43d (patch)
tree8bfa6d1e128eeff8785b9bedd7578eb6e32da7ed /src/lilycove_lady.c
parentfc467a9d52e200a9ffae663161c8b2b2b7c79689 (diff)
minor fixes
Diffstat (limited to 'src/lilycove_lady.c')
-rw-r--r--src/lilycove_lady.c40
1 files changed, 21 insertions, 19 deletions
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