summaryrefslogtreecommitdiff
path: root/src/walda_phrase.c
diff options
context:
space:
mode:
authoritskobold <itskobold@users.noreply.github.com>2017-11-15 12:42:18 +0000
committeritskobold <itskobold@users.noreply.github.com>2017-11-15 12:42:18 +0000
commit7c79b030e90ae6f4b3b3c91518c315959ede456e (patch)
treeb12fe2ca0d42b900fb1d45491e81a1bc6d86a348 /src/walda_phrase.c
parent2acab81713aac51f96a50dc42a67ec7761901aa4 (diff)
parent055a419830c0725a629f971b0299c89082c192fd (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/walda_phrase.c')
-rw-r--r--src/walda_phrase.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/walda_phrase.c b/src/walda_phrase.c
index 7e06d1319..59fd3fedb 100644
--- a/src/walda_phrase.c
+++ b/src/walda_phrase.c
@@ -98,17 +98,17 @@ u16 TryGetWallpaperWithWaldaPhrase(void)
u16 backgroundClr, foregroundClr;
u8 patternId, iconId;
u16 trainerId = ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId);
- gScriptResult = TryCalculateWallpaper(&backgroundClr, &foregroundClr, &iconId, &patternId, trainerId, GetWaldaPhrasePtr());
+ gSpecialVar_Result = TryCalculateWallpaper(&backgroundClr, &foregroundClr, &iconId, &patternId, trainerId, GetWaldaPhrasePtr());
- if (gScriptResult)
+ if (gSpecialVar_Result)
{
SetWaldaWallpaperPatternId(patternId);
SetWaldaWallpaperIconId(iconId);
SetWaldaWallpaperColors(backgroundClr, foregroundClr);
}
- SetWaldaWallpaperLockedOrUnlocked(gScriptResult);
- return (bool8)(gScriptResult);
+ SetWaldaWallpaperLockedOrUnlocked(gSpecialVar_Result);
+ return (bool8)(gSpecialVar_Result);
}
static u8 GetLetterTableId(u8 letter)