From 38febc8bafcab19965608e434135c054893dfb68 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Sat, 29 Jun 2019 06:38:36 +0800
Subject: finished fldeff_sweetscent

---
 include/event_scripts.h       | 1 +
 include/field_player_avatar.h | 1 +
 include/field_weather.h       | 2 ++
 include/fldeff.h              | 3 +++
 include/palette.h             | 2 +-
 include/wild_encounter.h      | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index b1b65da11..b12539476 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1145,5 +1145,6 @@ extern const u8 gUnknown_81BB0DF[];
 extern const u8 gUnknown_81BB156[];
 
 extern const u8 EventScript_FldEffStrength[];
+extern const u8 EventScript_FailSweetScent[];
 
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 4871bd082..0e8877dca 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -24,5 +24,6 @@ void sub_805DAE4(u8 direction);
 void SetPlayerAvatarTransitionFlags(u16 a);
 bool8 IsPlayerFacingSurfableFishableWater(void);
 void sub_805D2C0(u8 secondaryId);
+u8 GetPlayerAvatarObjectId(void);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_weather.h b/include/field_weather.h
index 13a1b4fcb..c3ecd4fa6 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -14,5 +14,7 @@ void SetSav1WeatherFromCurrMapHeader(void);
 void sub_807B0C4(u16 *, u16 *, u32);
 void PlayRainStoppingSoundEffect(void);
 bool8 sub_807AA70(void);
+void SetWeatherScreenFadeOut(void);
+void sub_807B070(void);
 
 #endif // GUARD_WEATHER_H
diff --git a/include/fldeff.h b/include/fldeff.h
index 749b09da7..3f2591516 100644
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -26,5 +26,8 @@ bool8 hm_prepare_dive_probably(void);
 void sub_80E56DC(u8 taskId);
 void sub_80E5724(u8 taskId);
 
+// sweetscent
+bool8 SetUpFieldMove_SweetScent(void);
+bool8 FldEff_SweetScent(void);
 
 #endif // GUARD_FLDEFF_H
diff --git a/include/palette.h b/include/palette.h
index 31c8ffefe..78f398873 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -43,7 +43,7 @@ struct PaletteFadeControl
 
 extern struct PaletteFadeControl gPaletteFade;
 extern u32 gPlttBufferTransferPending;
-extern u8 gPaletteDecompressionBuffer[];
+extern u8 *gPaletteDecompressionBuffer;
 extern u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE];
 extern u16 gPlttBufferFaded[PLTT_BUFFER_SIZE];
 
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 2ca30ac8b..bf53ed6ee 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -44,5 +44,6 @@ u16 GetLocalWaterMon(void);
 bool8 UpdateRepelCounter(void);
 void sub_8082740(u8);
 u8 GetUnownLetterByPersonalityLoByte(u32 personality);
+bool8 SweetScentWildEncounter(void);
 
 #endif // GUARD_WILD_ENCOUNTER_H
-- 
cgit v1.2.3