summaryrefslogtreecommitdiff
path: root/src/fldeff_sweetscent.c
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-15 00:04:06 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-15 00:04:06 +0800
commit96fa1a23edaf12082034b4ef79244e6ce3dd3128 (patch)
tree969c8a73b9f5b3ecdb0f7fc13d551f73d4d70e63 /src/fldeff_sweetscent.c
parent277726fd5e8c6da021206deeecb163f40073ff3c (diff)
parent53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff)
Merge branch 'master' into pokemon
Diffstat (limited to 'src/fldeff_sweetscent.c')
-rw-r--r--src/fldeff_sweetscent.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 9c6115044..aca56ef4c 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -52,8 +52,8 @@ static void StartSweetScentFieldEffect(void)
u8 taskId;
PlaySE(SE_W260);
- gPaletteDecompressionBuffer = (u8 *)Alloc(0x400);
- CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100);
+ gUnknown_203AAB0 = (u8 *)Alloc(0x400);
+ CpuFastSet(gPlttBufferUnfaded, gUnknown_203AAB0, 0x100);
CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0));
taskId = CreateTask(TrySweetScentEncounter, 0);
@@ -72,7 +72,7 @@ static void TrySweetScentEncounter(u8 taskId)
data[0] = 0;
if (SweetScentWildEncounter() == TRUE)
{
- Free(gPaletteDecompressionBuffer);
+ Free(gUnknown_203AAB0);
DestroyTask(taskId);
}
else
@@ -92,9 +92,9 @@ static void FailSweetScentEncounter(u8 taskId)
{
if (!gPaletteFade.active)
{
- CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
+ CpuFastSet(gUnknown_203AAB0, gPlttBufferUnfaded, 0x100);
sub_807B070();
- Free(gPaletteDecompressionBuffer);
+ Free(gUnknown_203AAB0);
ScriptContext1_SetupScript(EventScript_FailSweetScent);
DestroyTask(taskId);
}