1 files changed, 11 insertions, 6 deletions

diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index caedd20b6..2ae62a0ae 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -752,7 +752,10 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	4_M_RUSBALD,{
 		mos_whale_edq = 19;
 		close;
 	}
-	if ((gettime(HOUR) >= 0 && gettime(HOUR) < 3) || (gettime(HOUR) >= 6 && gettime(HOUR) < 9) || (gettime(HOUR) >= 12 && gettime(HOUR) < 15) || (gettime(HOUR) >= 18 && gettime(HOUR) < 21))  {
+	if ((gettime(GETTIME_HOUR) >= 0 && gettime(GETTIME_HOUR) < 3)
+	 || (gettime(GETTIME_HOUR) >= 6 && gettime(GETTIME_HOUR) < 9)
+	 || (gettime(GETTIME_HOUR) >= 12 && gettime(GETTIME_HOUR) < 15)
+	 || (gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 21))  {
 		mes "[Mr. Ibanoff]";
 		mes "Hmm. It's not a bad time.";
 		mes "We should hurry up";
@@ -8676,7 +8679,7 @@ OnTouch:
 		end;
 	}
 	if (rhea_rus_hair == 2) {
-		if (gettime(HOUR)>=23 || gettime(HOUR)<=5) {
+		if (gettime(GETTIME_HOUR) >= 23 || gettime(GETTIME_HOUR) <= 5) {
 			mes "- Splash !! -";
 			next;
 			if (countitem(523) > 0) {
@@ -8701,7 +8704,7 @@ OnTouch:
 		mes "And please, tell him to stop suffering and to be happy. This is my request.";
 		close;
 	} else if (rhea_rus_hair == 7) {
-		if (gettime(HOUR)>=23 || gettime(HOUR)<=5) {
+		if (gettime(GETTIME_HOUR) >= 23 || gettime(GETTIME_HOUR) <= 5) {
 			mes "- Splash !! -";
 			next;
 			if (countitem(523) > 0) {
@@ -9520,11 +9523,13 @@ mosk_fild02,243,270,0	script	Marozka#rus31	4_M_LGTGRAND,{
 			mes "[Marozka]";
 			mes "I will begin making it now... let me see... Could you please come back to me in an hour?";
 			rhea_rus_quiz = 4;
-			rus_time01 = gettime(HOUR);
-			rus_time02 = gettime(WEEKDAY);
+			rus_time01 = gettime(GETTIME_HOUR);
+			rus_time02 = gettime(GETTIME_WEEKDAY);
 			close;
 		} else if (rhea_rus_quiz == 4) {
-			if (rus_time01 < gettime(HOUR) || rus_time02 < gettime(WEEKDAY) || (rus_time02 == 6 && gettime(WEEKDAY) == SUNDAY)) {
+			if (rus_time01 < gettime(GETTIME_HOUR)
+			 || rus_time02 < gettime(GETTIME_WEEKDAY)
+			 || (rus_time02 == SATURDAY && gettime(GETTIME_WEEKDAY) == SUNDAY)) {
 				mes "[Marozka]";
 				mes "Ah, just in time.";
 				mes "I have finally finished making the 'Golden Thread'. Just wait one more second and it'll be ready.";