summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-09-25 18:44:56 -0400
committerhuderlem <huderlem@gmail.com>2019-09-25 18:46:25 -0500
commit37373c1b21a415206a37cddb563fbb6912313587 (patch)
treeb8a7e849bca146af02be6284ff88cab22ce971f5 /include
parent4e98a0cc4b13b4b4f504025106c4c53e4ca0db2f (diff)
Review changes for #817
Diffstat (limited to 'include')
-rw-r--r--include/daycare.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/daycare.h b/include/daycare.h
index b4c4a955d..7d6f2fb19 100644
--- a/include/daycare.h
+++ b/include/daycare.h
@@ -3,8 +3,8 @@
#include "constants/daycare.h"
-u8 *GetMonNick(struct Pokemon *mon, u8 *dest);
-u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest);
+u8 *GetMonNickname2(struct Pokemon *mon, u8 *dest);
+u8 *GetBoxMonNickname(struct BoxPokemon *mon, u8 *dest);
u8 CountPokemonInDaycare(struct DayCare *daycare);
void InitDaycareMailRecordMixing(struct DayCare *daycare, struct RecordMixingDayCareMail *daycareMail);
void StoreSelectedPokemonInDaycare(void);
@@ -16,7 +16,7 @@ void RejectEggFromDayCare(void);
void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation);
void GiveEggFromDaycare(void);
bool8 ShouldEggHatch(void);
-u16 GetSelectedMonNickAndSpecies(void);
+u16 GetSelectedMonNicknameAndSpecies(void);
void GetDaycareMonNicknames(void);
u8 GetDaycareState(void);
void SetDaycareCompatibilityString(void);