summaryrefslogtreecommitdiff
path: root/src/walda_phrase.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-11-15 09:01:56 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2017-11-15 09:01:56 -0500
commit89b695278d0a126279ac232d534aebdc351cc2be (patch)
tree2b22248f02a30a906187553274dee989c6ddb74e /src/walda_phrase.c
parent79609d52c8d8489b490589a1150b0754c0f61568 (diff)
parent055a419830c0725a629f971b0299c89082c192fd (diff)
Merge branch 'master' into heal_location
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)