Merge branch 'master' into battle

1 files changed, 4 insertions, 3 deletions

diff --git a/include/field_specials.h b/include/field_specials.h
index 2abe168e0..c435bdaee 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -12,17 +12,18 @@ enum HiddenItemAttr
 };
 
 u8 GetLeadMonIndex(void);
-u8 CountDigits(u16 number);
+s32 CountDigits(s32 number);
 void TV_PrintIntToStringVar(u8, int);
 u16 ScrSpecial_GetStarter(void);
-void sub_80CCB68(void);
+void StopPokemonLeagueLightingEffectTask(void);
 void nullsub_60(void);
 void nullsub_61(void);
 u8 ContextNpcGetTextColor(void);
 void set_unknown_box_id(u8);
 u16 get_unknown_box_id(void);
 bool8 sub_80CC7B4(void);
-u16 GetHiddenItemAttr(struct HiddenItemStruct hiddenItem, u8 attr);
+u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr);
 u8 GetUnlockedSeviiAreas(void);
+u32 GetPlayerTrainerId(void);
 
 #endif // GUARD_FIELD_SPECIALS_H