diff options
Diffstat (limited to 'src/fldeff_sweetscent.c')
| -rw-r--r-- | src/fldeff_sweetscent.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 082a7b184..e9373bd05 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -10,7 +10,7 @@ #include "wild_encounter.h" #include "constants/songs.h" -static EWRAM_DATA u8 *gUnknown_203AAB0 = NULL; +static EWRAM_DATA u8 *sPlttBufferBak = NULL; static void FieldCallback_SweetScent(void); static void StartSweetScentFieldEffect(void); @@ -51,9 +51,9 @@ static void StartSweetScentFieldEffect(void) u8 taskId; PlaySE(SE_M_SWEET_SCENT); - gUnknown_203AAB0 = (u8 *)Alloc(0x400); - CpuFastSet(gPlttBufferUnfaded, gUnknown_203AAB0, 0x100); - CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100); + sPlttBufferBak = (u8 *)Alloc(PLTT_SIZE); + CpuFastCopy(gPlttBufferUnfaded, sPlttBufferBak, PLTT_SIZE); + CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE); BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0)); taskId = CreateTask(TrySweetScentEncounter, 0); gTasks[taskId].data[0] = 0; @@ -71,7 +71,7 @@ static void TrySweetScentEncounter(u8 taskId) data[0] = 0; if (SweetScentWildEncounter() == TRUE) { - Free(gUnknown_203AAB0); + Free(sPlttBufferBak); DestroyTask(taskId); } else @@ -91,9 +91,9 @@ static void FailSweetScentEncounter(u8 taskId) { if (!gPaletteFade.active) { - CpuFastSet(gUnknown_203AAB0, gPlttBufferUnfaded, 0x100); - sub_807B070(); - Free(gUnknown_203AAB0); + CpuFastCopy(sPlttBufferBak, gPlttBufferUnfaded, PLTT_SIZE); + WeatherProcessingIdle(); + Free(sPlttBufferBak); ScriptContext1_SetupScript(EventScript_FailSweetScent); DestroyTask(taskId); } |