summaryrefslogtreecommitdiff
path: root/src/field/mauville_man.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/field/mauville_man.c')
-rw-r--r--src/field/mauville_man.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index fad6674db..30f6f5233 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -21,7 +21,7 @@
extern struct MusicPlayerInfo gMPlay_SE2;
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
extern u16 gSpecialVar_0x8004;
extern const u8 gTextStoryteller_Story1Title[];
@@ -258,12 +258,12 @@ static u8 GetCurrentMauvilleOldMan(void)
void ScrSpecial_GetCurrentMauvilleMan(void)
{
- gScriptResult = GetCurrentMauvilleOldMan();
+ gSpecialVar_Result = GetCurrentMauvilleOldMan();
}
void ScrSpecial_HasBardSongBeenChanged(void)
{
- u16 *scriptResult = &gScriptResult; // why??
+ u16 *scriptResult = &gSpecialVar_Result; // why??
struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
*scriptResult = bard->hasChangedSong;
@@ -350,7 +350,7 @@ void ScrSpecial_PlayBardSong(void)
void ScrSpecial_GetHipsterSpokenFlag(void)
{
- u16 *scriptResult = &gScriptResult; // again??
+ u16 *scriptResult = &gSpecialVar_Result; // again??
struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
*scriptResult = hipster->alreadySpoken;
@@ -369,12 +369,12 @@ void ScrSpecial_HipsterTeachWord(void)
if (var == 0xFFFF)
{
- gScriptResult = FALSE;
+ gSpecialVar_Result = FALSE;
}
else
{
EasyChat_GetWordText(gStringVar1, var);
- gScriptResult = TRUE;
+ gSpecialVar_Result = TRUE;
}
}
@@ -384,12 +384,12 @@ void ScrSpecial_GiddyShouldTellAnotherTale(void)
if (giddy->taleCounter == 10)
{
- gScriptResult = FALSE;
+ gSpecialVar_Result = FALSE;
giddy->taleCounter = 0;
}
else
{
- gScriptResult = TRUE;
+ gSpecialVar_Result = TRUE;
}
}
@@ -421,7 +421,7 @@ void ScrSpecial_GenerateGiddyLine(void)
else
giddy->taleCounter++;
- gScriptResult = TRUE;
+ gSpecialVar_Result = TRUE;
}
#ifdef NONMATCHING
@@ -1251,11 +1251,11 @@ static void Task_StoryListMenu(u8 taskId)
break;
if (selection == -1 || selection == GetFreeStorySlot())
{
- gScriptResult = 0;
+ gSpecialVar_Result = 0;
}
else
{
- gScriptResult = 1;
+ gSpecialVar_Result = 1;
gUnknown_03000748 = selection;
}
HandleDestroyMenuCursors();
@@ -1266,7 +1266,7 @@ static void Task_StoryListMenu(u8 taskId)
}
}
-// Sets gScriptResult to TRUE if player selected a story
+// Sets gSpecialVar_Result to TRUE if player selected a story
void ScrSpecial_StorytellerStoryListMenu(void)
{
CreateTask(Task_StoryListMenu, 0x50);