summaryrefslogtreecommitdiff
path: root/src/tv.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tv.c')
-rw-r--r--src/tv.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/tv.c b/src/tv.c
index 4cb6df16f..cb44fdb62 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -3436,13 +3436,14 @@ bool8 TV_IsScriptShowKindAlreadyInQueue(void)
return FALSE;
}
-bool8 TV_PutNameRaterShowOnTheAirIfNicknameChanged(void)
+bool8 TryPutNameRaterShowOnTheAir(void)
{
GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
+
+ // Nickname wasnt changed
if (!StringCompare(gStringVar3, gStringVar1))
- {
return FALSE;
- }
+
PutNameRaterShowOnTheAir();
return TRUE;
}
@@ -3478,22 +3479,18 @@ void ChangeBoxPokemonNickname_CB(void)
CB2_ReturnToFieldContinueScriptPlayMapMusic();
}
-void TV_CopyNicknameToStringVar1AndEnsureTerminated(void)
+void BufferMonNickname(void)
{
GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
StringGetEnd10(gStringVar1);
}
-void TV_CheckMonOTIDEqualsPlayerID(void)
+void IsMonOTIDNotPlayers(void)
{
if (GetPlayerIDAsU32() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL))
- {
gSpecialVar_Result = FALSE;
- }
else
- {
gSpecialVar_Result = TRUE;
- }
}
u8 GetTVChannelByShowType(u8 kind)