summaryrefslogtreecommitdiff
path: root/src/fldeff_sweetscent.c
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-13 00:31:06 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-13 00:31:06 -0500
commit6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch)
treef6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /src/fldeff_sweetscent.c
parent2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff)
parent170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/fldeff_sweetscent.c')
-rw-r--r--src/fldeff_sweetscent.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 9951fe581..cd8fa400d 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -3,7 +3,8 @@
#include "event_scripts.h"
#include "field_effect.h"
#include "field_player_avatar.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
+#include "field_weather.h"
#include "palette.h"
#include "party_menu.h"
#include "rom6.h"
@@ -40,7 +41,7 @@ bool8 FldEff_SweetScent(void)
{
u8 taskId;
- sub_80AC3D0();
+ SetWeatherScreenFadeOut();
taskId = oei_task_add();
gTasks[taskId].data[8] = (u32)StartSweetScentFieldEffect >> 16;
gTasks[taskId].data[9] = (u32)StartSweetScentFieldEffect;