From 34037c40d28c9fe179d930949320090448b249e9 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 15 Nov 2015 00:54:33 +0100
Subject: Fixed too-generic constant names of gettime() types

- Follow-up to 3bd77ffc0daca508352834add828766490075aee
- The names were too generic (not namespaced), and were easily clashing
  with custom (and potential future official) constants or variables.
- Constants are now prefixed with a 'GETTIME_' namespace:
  - GETTIME_SECOND
  - GETTIME_MINUTE
  - GETTIME_HOUR
  - GETTIME_WEEKDAY
  - GETTIME_DAYOFMONTH
  - GETTIME_MONTH
  - GETTIME_YEAR
  - GETTIME_DAYOFYEAR
- Fixed some excessive (and some times incorrect) parentheses in
  various scripts using gettime().
- Updated documentation.

Signed-off-by: Haru <haru@dotalux.com>
---
 db/const.txt                            | 16 +++----
 db/pre-re/item_db.conf                  |  9 ++--
 db/re/item_db.conf                      |  9 ++--
 doc/sample/npc_test_time.txt            | 26 +++++------
 doc/script_commands.txt                 | 38 ++++++++--------
 doc/woe_time_explanation.txt            | 77 +++++++++++++++------------------
 npc/airports/airships.txt               |  8 ++--
 npc/custom/etc/airplane.txt             |  4 +-
 npc/custom/etc/bank_kafra.txt           |  2 +-
 npc/custom/events/valentinesdayexp.txt  | 10 ++---
 npc/custom/events/xmas_rings_event.txt  |  2 +-
 npc/custom/quests/thq/THQS_QuestNPC.txt |  8 ++--
 npc/custom/woe_controller.txt           |  8 ++--
 npc/events/idul_fitri.txt               |  2 +-
 npc/other/arena/arena_lvl50.txt         |  8 ++--
 npc/other/arena/arena_lvl60.txt         |  8 ++--
 npc/other/arena/arena_lvl70.txt         |  8 ++--
 npc/other/arena/arena_lvl80.txt         |  8 ++--
 npc/other/arena/arena_party.txt         |  8 ++--
 npc/quests/first_class/tu_archer.txt    |  4 +-
 npc/quests/guildrelay.txt               | 60 ++++++++++++-------------
 npc/quests/newgears/2010_headgears.txt  |  2 +-
 npc/quests/partyrelay.txt               |  6 +--
 npc/quests/quests_ein.txt               |  4 +-
 npc/quests/quests_lighthalzen.txt       |  8 ++--
 npc/quests/quests_louyang.txt           | 66 +++++++++++-----------------
 npc/quests/quests_moscovia.txt          | 17 +++++---
 npc/quests/quests_umbala.txt            |  6 +--
 npc/quests/the_sign_quest.txt           | 19 ++++----
 npc/re/quests/quests_mora.txt           |  2 +-
 npc/re/woe-fe/invest_main.txt           | 14 +++---
 npc/woe-fe/agit_controller.txt          | 16 +++----
 npc/woe-se/agit_start_se.txt            | 16 +++----
 33 files changed, 240 insertions(+), 259 deletions(-)

diff --git a/db/const.txt b/db/const.txt
index 7b0b7c076..792f8f56e 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -3400,14 +3400,14 @@ MOUNT_DRAGON_BLUE	7
 MOUNT_DRAGON_RED	8
 
 // gettime( <param> )
-SECOND	1
-MINUTE	2
-HOUR	3
-WEEKDAY	4
-DAYOFMONTH	5
-MONTH	6
-YEAR	7
-DAYOFYEAR	8
+GETTIME_SECOND	1
+GETTIME_MINUTE	2
+GETTIME_HOUR	3
+GETTIME_WEEKDAY	4
+GETTIME_DAYOFMONTH	5
+GETTIME_MONTH	6
+GETTIME_YEAR	7
+GETTIME_DAYOFYEAR	8
 
 // Weekday
 SUNDAY	0
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 42d75e300..b66b1198c 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -38844,7 +38844,10 @@ item_db: (
 	Weight: 100
 	Loc: 256
 	View: 433
-	Script: <" if(gettime(6)==9&&gettime(5)>=10&&gettime(5)<=24) bonus bAllStats, 4; ">
+	Script: <"
+		if (gettime(GETTIME_MONTH) == SEPTEMBER && gettime(GETTIME_DAYOFMONTH) >= 10 && gettime(GETTIME_DAYOFMONTH) <= 24)
+			bonus bAllStats, 4;
+	">
 },
 {
 	Id: 5433
@@ -63137,8 +63140,8 @@ item_db: (
 	Buy: 0
 	Weight: 80
 	Script: <"
-		if(gettime(5)!=MDiceCone) {
-			MDiceCone = gettime(5);
+		if (gettime(GETTIME_DAYOFMONTH) != MDiceCone) {
+			MDiceCone = gettime(GETTIME_DAYOFMONTH);
 			percentheal 50,50;
 		}
 
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 9203ef46d..2b0f70489 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -50364,7 +50364,10 @@ item_db: (
 	Weight: 100
 	Loc: 256
 	View: 433
-	Script: <" if(gettime(6)==9&&gettime(5)>=10&&gettime(5)<=24) bonus bAllStats,4; ">
+	Script: <"
+		if (gettime(GETTIME_MONTH) == SEPTEMBER && gettime(GETTIME_DAYOFMONTH) >= 10 && gettime(GETTIME_DAYOFMONTH) <= 24)
+			bonus bAllStats,4;
+	">
 },
 {
 	Id: 5433
@@ -77254,8 +77257,8 @@ item_db: (
 	Buy: 0
 	Weight: 80
 	Script: <"
-		if(gettime(5)!=MDiceCone) {
-			MDiceCone = gettime(5);
+		if (gettime(GETTIME_DAYOFMONTH) != MDiceCone) {
+			MDiceCone = gettime(GETTIME_DAYOFMONTH);
 			percentheal 50,50;
 		}
 	">
diff --git a/doc/sample/npc_test_time.txt b/doc/sample/npc_test_time.txt
index 2af1dadd8..c3d4eae1d 100644
--- a/doc/sample/npc_test_time.txt
+++ b/doc/sample/npc_test_time.txt
@@ -3,23 +3,23 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 20070315
-//===== Description: ========================================= 
+//= 20151115
+//===== Description: =========================================
 //= Demonstrates time commands.
 //============================================================
 
 prontera,157,181,6	script	Time Sample	8W_SOLDIER,{
 	mes "[Time Sample]";
-	mes "System Tick : " + gettimetick(0);
-	mes "  Time Tick : " + gettimetick(1);
-	mes " GetTime(0) : " + gettime(0);
-	mes " GetTime(1) : " + gettime(1) + " (Sec)";
-	mes " GetTime(2) : " + gettime(2) + " (Min)";
-	mes " GetTime(3) : " + gettime(3) + " (Hour)";
-	mes " GetTime(4) : " + gettime(4) + " (WeekDay)";
-	mes " GetTime(5) : " + gettime(5) + " (MonthDay)";
-	mes " GetTime(6) : " + gettime(6) + " (Month)";
-	mes " GetTime(7) : " + gettime(7) + " (Year)";
-	mes " GetTimeStr : " + gettimestr("%Y-%m/%d %H:%M:%S",19);
+	mes "       System Tick : " + gettimetick(0);
+	mes "         Time Tick : " + gettimetick(1);
+	mes "    GETTIME_SECOND : " + gettime(GETTIME_SECOND)     + " (Sec)";
+	mes "    GETTIME_MINUTE : " + gettime(GETTIME_MINUTE)     + " (Min)";
+	mes "      GETTIME_HOUR : " + gettime(GETTIME_HOUR)       + " (Hour)";
+	mes "   GETTIME_WEEKDAY : " + gettime(GETTIME_WEEKDAY)    + " (WeekDay)";
+	mes "GETTIME_DAYOFMONTH : " + gettime(GETTIME_DAYOFMONTH) + " (MonthDay)";
+	mes "     GETTIME_MONTH : " + gettime(GETTIME_MONTH)      + " (Month)";
+	mes "      GETTIME_YEAR : " + gettime(GETTIME_YEAR)       + " (Year)";
+	mes " GETTIME_DAYOFYEAR : " + gettime(GETTIME_DAYOFYEAR)  + " (Day of Year)";
+	mes "        gettimestr : " + gettimestr("%Y-%m/%d %H:%M:%S",19);
 	close;
 }
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 5219eed47..dff4461af 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3181,30 +3181,28 @@ Valid types are :
 
 This function returns specified information about the current system time.
 
-Valid types are listed in const.txt:
-	1 - SECOND		- Seconds (of a minute)
-	2 - MINUTE		- Minutes (of an hour)
-	3 - HOUR		- Hour (of a day)
-	4 - WEEKDAY		- Week day (0 for Sunday, 6 is Saturday)
-					- Additional: (SUNDAY,MONDAY,TUESDAY,WEDNESDAY,THURSDAY,FRIDAY,SATURDAY)
-	5 - DAYOFMONTH	- Day of the month.
-	6 - MONTH		- Number of the month.
-					- Additional: ( JANUARY,FEBRUARY,MARCH,APRIL,MAY,JUNE,JULY,AUGUST,SEPTEMBER,OCTOBER,NOVEMBER,DECEMBER)
-	7 - YEAR		- Year.
-	8 - DAYOFYEAR	- Day of the year.
+Valid types:
+	1 - GETTIME_SECOND     - Seconds (of a minute)
+	2 - GETTIME_MINUTE     - Minutes (of an hour)
+	3 - GETTIME_HOUR       - Hour (of a day)
+	4 - GETTIME_WEEKDAY    - Week day (0 for Sunday, 6 is Saturday)
+	                       - Additional: SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY
+	5 - GETTIME_DAYOFMONTH - Day of the month.
+	6 - GETTIME_MONTH      - Number of the month.
+	                       - Additional: JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBER, DECEMBER
+	7 - GETTIME_YEAR       - Year
+	8 - GETTIME_DAYOFYEAR  - Day of the year.
 
 It will only return numbers based on types.
 Example :
-	if ( gettime(WEEKDAY) == SATURDAY ) {
+	if (gettime(GETTIME_WEEKDAY) == SATURDAY) {
 		mes "It's a Saturday. I don't work on Saturdays.";
+	} else if (gettime(GETTIME_MONTH) == JANUARY) {
+		mes "It's January. I don't work on January.";
+	} else if (gettime(GETTIME_MONTH) == OCTOBER && gettime(GETTIME_DAYOFMONTH) == 31) {
+		mes "It's Halloween.";
 	}
-	else if ( gettime(MONTH) == JANUARY ) {
-		mes "It's a January. I don't work on January.";
-	}
-	else if ( gettime(MONTH) == OCTOBER && gettime(DAYOFMONTH) == 31 ) {
-		mes "It's a Halloween.";
-	}
-	
+
 ---------------------------------------
 
 *gettimestr(<format string>,<max length>)
@@ -7578,7 +7576,7 @@ OnClock0600:
 	end;
 OnInit:
 	// setting correct mode upon server start-up
-	if(gettime(3)>=6 && gettime(3)<18) end;
+	if (gettime(GETTIME_HOUR) >= 6 && gettime(GETTIME_HOUR) < 18) end;
 OnClock1800:
 	night;
 	end;
diff --git a/doc/woe_time_explanation.txt b/doc/woe_time_explanation.txt
index 9f288eae7..d030355f8 100644
--- a/doc/woe_time_explanation.txt
+++ b/doc/woe_time_explanation.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= erKURITA
 //===== Current Version: =====================================
-//= 20120717
+//= 20151115
 //===== Description: =========================================
 //= Details on the behavior of the default WoE controller.
 //============================================================
@@ -15,19 +15,8 @@ OnClock<time> triggers when <time> is reached.
 The format is HHMM, where H = hour, M = minute.
 OnClock2350: would run at 23:50, server time.
 
-gettime(<type>) is a function that checks for certain
-information regarding time. The types are:
-
-	1 - Seconds (of a minute)
-	2 - Minutes (of an hour)
-	3 - Hour (of a day), ranging from 0 to 23
-	4 - Weekday, ranging from 0 (Sunday) to 6 (Saturday)
-	5 - Day of the month
-	6 - Number of the month
-	7 - Year
-	8 - Day of the year
-
-This way, we can check for a desired minute, hour, day, month, etc.
+gettime(<type>) is a function that checks for certain information regarding
+time. For more information about it, see script_commands.txt.
 
 -------------------------------------------------------------------------------
 
@@ -40,45 +29,36 @@ Now the structure:
 
 These 4 labels will run one after the other, reaching the next check:
 
-	if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
-	if((gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
-	if((gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) goto L_Start;
+	if ((gettime(GETTIME_WEEKDAY) == TUESDAY  && gettime(GETTIME_HOUR) >= 21 && gettime(GETTIME_HOUR) < 23) ||
+	    (gettime(GETTIME_WEEKDAY) == THURSDAY && gettime(GETTIME_HOUR) >= 21 && gettime(GETTIME_HOUR) < 23) ||
+	    (gettime(GETTIME_WEEKDAY) == SATURDAY && gettime(GETTIME_HOUR) >= 16 && gettime(GETTIME_HOUR) < 18)) {
+		agitstart();
+	}
 
 This part will check for the times. Since both Start and End times run
 through the same chain of commands, these are important checks to ensure
 it's the right time. Let's take the following example:
 
-	if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23))
+	if (gettime(GETTIME_WEEKDAY) == TUESDAY && gettime(GETTIME_HOUR) >= 21 && gettime(GETTIME_HOUR) < 23)
 
-The first gettime() is checking for a type 4, the day of the week, and it's
-comparing it to the one desired, which is 2 (Tuesday). The function will
+The first gettime() is checking for type GETTIME_WEEKDAY, the day of the week,
+and it's comparing it to the one desired, which is TUESDAY. The function will
 return either 1 (true) or 0 (false).
 
-The second gettime is checking type 3, the hour, and it's comparing
+The second gettime is checking type GETTIME_HOUR, the hour, and it's comparing
 it to 21. If the first part is greater than or equal to (>=) the second part,
 the comparison will return 1.
 
 The third and last gettime is checking again for the hour, but the time has to be less
 than the specified time (in this case, 23).
 
-Now, look at the parentheses. Parentheses are very important when making comparisons
-and conditions. Check the order of these. I'll place dummy characters for this example:
-
-	if ((X && (Y && Z)) goto L_Start;
-
-It's saying, if Y and Z are true, the condition is met. Now let's use another set
-of dummy characters. We're checking if (Y && Z) = G:
-
-	if (X && G) goto L_Start;
-
-It's saying that if X and G are true, the condition is met, thus proceeding to L_Start.
-
 Now, the last part of the script, regarding the end of WoE time:
 
-	if((gettime(4)==2) && (gettime(3)==23)) goto L_End;
-	if((gettime(4)==4) && (gettime(3)==23)) goto L_End;
-	if((gettime(4)==6) && (gettime(3)==18)) goto L_End;
-	end;
+	if ((gettime(GETTIME_WEEKDAY) == TUESDAY  && gettime(GETTIME_HOUR) == 23) ||
+	    (gettime(GETTIME_WEEKDAY) == THURSDAY && gettime(GETTIME_HOUR) == 23) ||
+	    (gettime(GETTIME_WEEKDAY) == SATURDAY && gettime(GETTIME_HOUR) == 18)) {
+		agitend();
+	}
 
 This is the same as before, but it's checking for the day in the first gettime() and
 the hour on the second. If both conditions are true, WoE will end. We're checking 
@@ -95,8 +75,23 @@ An example of how to set the WoE so it starts on Monday, at 4 pm and ends up at
 	OnClock1600: // 16:00 = 4 pm
 	OnClock2200: // 22:00 = 10 pm
 
-	OnAgitInit: // This can only be written once: put OnClock above and the checks below.
-
-	if ((gettime(4)==1) && (gettime(3)>=16 && gettime(3)<22)) goto L_Start;
-	if ((gettime(4)==1) && (gettime(3)==22) goto L_End;
+	OnAgitInit: // This label should appear once and only once in the script
+
+	// starting time checks
+	if (gettime(GETTIME_WEEKDAY) == MONDAY && gettime(GETTIME_HOUR) >= 16 && gettime(GETTIME_HOUR) < 22) {
+		if (!agitcheck()) {
+			agitstart;
+			callsub S_DisplayOwners;
+		}
+		end;
+	}
+
+	// end time checks
+	if (gettime(GETTIME_WEEKDAY) == MONDAY && gettime(GETTIME_HOUR) == 22) {
+		if (agitcheck()) {
+			agitend;
+			callsub S_DisplayOwners;
+		}
+		end;
+	}
 	end; // Don't forget this!
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 2faab33af..58652ab56 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -1135,18 +1135,18 @@ airplane_01,32,61,4	script	Nils#ein	1_M_03,1,1,{
 		mes .@line1_1$[.@wordtest];
 		mes .@line1_2$[.@wordtest];
 		mes .@line1_3$[.@wordtest];
-		.@start_time = gettime(HOUR)*60*60 + gettime(MINUTE)*60 + gettime(SECOND);
+		.@start_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND);
 		next;
 		input .@save1$;
-		.@end_time = gettime(HOUR)*60*60 + gettime(MINUTE)*60 + gettime(SECOND);
+		.@end_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND);
 		.@total_time = .@end_time - .@start_time;
 		mes "[Nils]";
 		mes .@line2_1$[.@wordtest];
 		mes .@line2_2$[.@wordtest];
-		.@start_time = gettime(HOUR)*60*60 + gettime(MINUTE)*60 + gettime(SECOND);
+		.@start_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND);
 		next;
 		input .@save2$;
-		.@end_time = gettime(HOUR)*60*60 + gettime(MINUTE)*60 + gettime(SECOND);
+		.@end_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND);
 		.@total_time = .@total_time + (.@start_time - .@end_time);
 		.@tasoo = (.@letters[.@wordtest] / .@total_time) * 6;
 		if ((.@save1$ == .@word1$[.@wordtest]) && (.@save2$ == .@word2$[.@wordtest])) {
diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt
index de321ebfd..544dbed61 100644
--- a/npc/custom/etc/airplane.txt
+++ b/npc/custom/etc/airplane.txt
@@ -385,7 +385,7 @@ function	script	F_Itin	{
 
 seta:
 	set @tempo, @tempo + 1;
-	set @time, gettime(HOUR);
+	set @time, gettime(GETTIME_HOUR);
 	set @minutes, 5 * @tempo - 5;
 	set @minutess, 5 * @tempo - 2;
 	if(@minutes<10)set @minutes$, "0" + @minutes;
@@ -406,7 +406,7 @@ seta:
 setb:
 	if($@currenttime - 1==@tempo)goto setc;
 	set @tempo, @tempo + 1;
-	set @time, gettime(HOUR) + 1;
+	set @time, gettime(GETTIME_HOUR) + 1;
 	set @minutes, 5 * @tempo - 5;
 	set @minutess, 5 * @tempo - 2;
 	if(@minutes<10)set @minutes$, "0" + @minutes;
diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt
index 02a0b1846..c4e16a9ec 100644
--- a/npc/custom/etc/bank_kafra.txt
+++ b/npc/custom/etc/bank_kafra.txt
@@ -22,7 +22,7 @@
 	mes"[Maniss]";
 	mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!";
 
-	set @kb_int,(gettime(MONTH)*31)+gettime(DAYOFMONTH); //today's number
+	set @kb_int,(gettime(GETTIME_MONTH)*31)+gettime(GETTIME_DAYOFMONTH); //today's number
 	set @income,0;
 	//calculate %
 	if (#kafrabank<=0 || #kb_int>=@kb_int) goto L_NoIncomeToday;
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index 7a22909e6..933afc647 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -19,7 +19,7 @@ prontera,156,172,4	script	Tine	1_M_MERCHANT,{
 //	mes "@dsv: "+@dsv;
 //	mes "ispartneron()=="+ispartneron();
 //	mes "sex == "+Sex;
-//	if(@dsv == gettime(HOUR)+1) mes "@dsv == gettime(HOUR)+1";
+//	if(@dsv == gettime(GETTIME_HOUR)+1) mes "@dsv == gettime(GETTIME_HOUR)+1";
 
 	mes "[Tine]";
 	mes "The legend says that on 14th February... on the Day of Saint Valentine...";
@@ -60,14 +60,14 @@ M_INFO:
 
 OnInit:
 	//559,Hand-made_Chocolate
-	setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(HOUR)+1; misceffect 113; }";
+	setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; misceffect 113; }";
 	//560,Hand-made_White_Chocolate
-	setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(HOUR)+1; misceffect 113; }";
+	setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; misceffect 113; }";
 
 	//2634,Wedding_Ring_M,Wedding Ring,5,,10,0,,0,,0,127918079,7,1,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; }
-	setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(HOUR)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }";
+	setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(GETTIME_HOUR)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }";
 	//2635,Wedding_Ring_F,Wedding Ring,5,,10,0,,0,,0,127918079,7,0,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; }
-	setitemscript 2635,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(HOUR)+1 && ispartneron()){ bonus2 bExpAddRace,0,50; bonus2 bExpAddRace,9,50; bonus2 bExpAddRace,2,50; bonus2 bExpAddRace,3,50; bonus2 bExpAddRace,4,50; } }";
+	setitemscript 2635,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(GETTIME_HOUR)+1 && ispartneron()){ bonus2 bExpAddRace,0,50; bonus2 bExpAddRace,9,50; bonus2 bExpAddRace,2,50; bonus2 bExpAddRace,3,50; bonus2 bExpAddRace,4,50; } }";
 	end;
 }
 
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 0bbf36df1..71be79aa5 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -89,7 +89,7 @@ M_QUEST:
 
 OnInit:
 //Santa's Hat
-	setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(MINUTE))end; set @xmr,gettime(MINUTE); misceffect 410; end;} if(isequipped(2636)){if(@xmr == gettime(MINUTE))end; set @xmr,gettime(MINUTE); misceffect 72;} if(isequipped(2637)){if(@xmr == gettime(MINUTE))end; set @xmr,gettime(MINUTE); misceffect 338;}}";
+	setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 410; end;} if(isequipped(2636)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 72;} if(isequipped(2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 338;}}";
 //Gold Xmas Ring
 	setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv(\"AL_HEAL\")){skill \"TF_HIDING\",4+isequipped(2637);}else{skill \"AL_HEAL\",1+4*isequipped(2637);} }";
 //Silver Xmas Ring
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 55b1b5676..9b655625c 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -44,7 +44,7 @@ N_PayZeny:
 	set On_Quest, 0;
 	Zeny -= 2500;
 	//add time delay penalty. You can get another quest after 2 - 3 hours. [Lupus]
-	set #THQ_DELAY, (gettime(YEAR)*12*31*24+gettime(MONTH)*31*24+gettime(DAYOFMONTH)*24+gettime(HOUR)+rand(2,3));
+	set #THQ_DELAY, (gettime(GETTIME_YEAR)*12*31*24+gettime(GETTIME_MONTH)*31*24+gettime(GETTIME_DAYOFMONTH)*24+gettime(GETTIME_HOUR)+rand(2,3));
 	mes "[Guy]";
 	mes "Its sad to see someone give a quest up...";
 	mes "Shame on you.";
@@ -59,7 +59,7 @@ N_ZenyFail:
 N_NewQuest:
 	if (Event_THQS == 0) goto N_Signup;
 	//checking if time penalty is over [Lupus]
-	if (#THQ_DELAY > (gettime(YEAR)*12*31*24 + gettime(MONTH)*31*24 + gettime(DAYOFMONTH)*24 + gettime(HOUR)) ) goto L_NoQuestsForYet;
+	if (#THQ_DELAY > (gettime(GETTIME_YEAR)*12*31*24 + gettime(GETTIME_MONTH)*31*24 + gettime(GETTIME_DAYOFMONTH)*24 + gettime(GETTIME_HOUR)) ) goto L_NoQuestsForYet;
 	mes "[Guy]";
 	mes "Ahh welcome fellow Treasure Hunter.";
 	mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!";
@@ -71,7 +71,7 @@ N_NewQuest:
 	mes "Ok lets see what quest we can give you today.";
 	mes "The quest names in ^FF0000This Colour^000000 mean that they are more challanging then the rest, but have better rewards.";
 	next;
-	set #THQ_DELAY,(gettime(YEAR)*12*31*24+gettime(MONTH)*31*24+gettime(DAYOFMONTH)*24+gettime(HOUR) + 1); //you can get another quest after 1 hour [Lupus]
+	set #THQ_DELAY,(gettime(GETTIME_YEAR)*12*31*24+gettime(GETTIME_MONTH)*31*24+gettime(GETTIME_DAYOFMONTH)*24+gettime(GETTIME_HOUR) + 1); //you can get another quest after 1 hour [Lupus]
 	emotion 21;
 	if(@treasure_job==0) set @treasure_job,rand(1,10); //doesn't allow cheaters to pick any quest they want
 	if(@treasure_job==2) goto N_JobList2;
@@ -100,7 +100,7 @@ N_Signup:
 L_NoQuestsForYet:
 	mes "[Guy]";
 	mes "I'm afraid there aren't any Quests for you yet.";
-	mes "Call in "+ (#THQ_DELAY - (gettime(YEAR)*12*31*24+gettime(MONTH)*31*24+gettime(DAYOFMONTH)*24+gettime(HOUR)) )+" hours later.";
+	mes "Call in "+ (#THQ_DELAY - (gettime(GETTIME_YEAR)*12*31*24+gettime(GETTIME_MONTH)*31*24+gettime(GETTIME_DAYOFMONTH)*24+gettime(GETTIME_HOUR)) )+" hours later.";
 	emotion 17;
 	close;
 
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index 86590ebc8..9e35d1ef7 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -102,7 +102,7 @@ OnMinute00:
 	freeloop(1);
 	if (agitcheck() || agitcheck2()) {
 		for(set .@i,0; .@i<.Size; set .@i,.@i+4)
-			if (gettime(WEEKDAY) == $WOE_CONTROL[.@i] && gettime(HOUR) == $WOE_CONTROL[.@i+2]) {
+			if (gettime(GETTIME_WEEKDAY) == $WOE_CONTROL[.@i] && gettime(GETTIME_HOUR) == $WOE_CONTROL[.@i+2]) {
 			OnWOEEnd:
 				announce "The War Of Emperium is over!",bc_all|bc_woe;
 				agitend; agitend2;
@@ -120,7 +120,7 @@ OnMinute00:
 	if ((!agitcheck() && !agitcheck2()) || .Init) {
 		if (!agitcheck() && !agitcheck2()) set .Init,0;
 		for(set .@i,0; .@i<.Size; set .@i,.@i+4)
-			if (gettime(WEEKDAY) == $WOE_CONTROL[.@i] && gettime(HOUR) >= $WOE_CONTROL[.@i+1] && gettime(HOUR) < $WOE_CONTROL[.@i+2]) {
+			if (gettime(GETTIME_WEEKDAY) == $WOE_CONTROL[.@i] && gettime(GETTIME_HOUR) >= $WOE_CONTROL[.@i+1] && gettime(GETTIME_HOUR) < $WOE_CONTROL[.@i+2]) {
 				deletearray .Active[0],2;
 				set .Active[0], $WOE_CONTROL[.@i+3];
 				if (.Init) { agitend; agitend2; }
@@ -208,7 +208,7 @@ while(1) {
 	if (agitcheck() || agitcheck2()) {
 		if (.Active[0]) {
 			for(set .@i,0; .@i<.Size; set .@i,.@i+4)
-				if (gettime(WEEKDAY) == $WOE_CONTROL[.@i] && gettime(HOUR) >= $WOE_CONTROL[.@i+1] && gettime(HOUR) < $WOE_CONTROL[.@i+2]) {
+				if (gettime(GETTIME_WEEKDAY) == $WOE_CONTROL[.@i] && gettime(GETTIME_HOUR) >= $WOE_CONTROL[.@i+1] && gettime(GETTIME_HOUR) < $WOE_CONTROL[.@i+2]) {
 					set .@i, $WOE_CONTROL[.@i+2];
 					break;
 				}
@@ -220,7 +220,7 @@ while(1) {
 			mes "The War of Emperium is ^0055FFactive^000000.";
 	} else {
 		for(set .@i,0; .@i<.Size; set .@i,.@i+4)
-			if ((gettime(WEEKDAY) == $WOE_CONTROL[.@i] && gettime(HOUR) <= $WOE_CONTROL[.@i+1]) || gettime(WEEKDAY) < $WOE_CONTROL[.@i]) {
+			if ((gettime(GETTIME_WEEKDAY) == $WOE_CONTROL[.@i] && gettime(GETTIME_HOUR) <= $WOE_CONTROL[.@i+1]) || gettime(GETTIME_WEEKDAY) < $WOE_CONTROL[.@i]) {
 				setarray .@time[0],$WOE_CONTROL[.@i],$WOE_CONTROL[.@i+1];
 				break;
 			}
diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt
index cca86d1fc..df24208eb 100644
--- a/npc/events/idul_fitri.txt
+++ b/npc/events/idul_fitri.txt
@@ -12,7 +12,7 @@
 
 prontera,146,92,3	script	Cellerb	1_M_MERCHANT,{
 	mes "[Staff Idul Fitri]";
-	if((gettime(MONTH)==OCTOBER && (gettime(DAYOFMONTH)==24 || gettime(DAYOFMONTH)==25))==0) {
+	if ((gettime(GETTIME_MONTH)==OCTOBER && (gettime(GETTIME_DAYOFMONTH)==24 || gettime(GETTIME_DAYOFMONTH)==25))==0) {
 		mes "Congratulation! Celebrate Feast Day Of Ramadan Idul Fitri 1427 H.";
 		specialeffect EF_SANDMAN;
 		close;
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index 015dc64db..2c1301368 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -37,8 +37,8 @@ force_1-1,99,20,4	script	Heel and Toe#arena	4_F_TELEPORTER,{
 
 OnStart:
 	initnpctimer;
-	$arena_min50st = gettime(MINUTE);
-	$arena_sec50st = gettime(SECOND);
+	$arena_min50st = gettime(GETTIME_MINUTE);
+	$arena_sec50st = gettime(GETTIME_SECOND);
 	end;
 
 OnTimer3000:
@@ -774,8 +774,8 @@ OnMyMobDead:
 		donpcevent "Heel and Toe#arena::On09_End";
 		donpcevent "arena#50::OnReset_09";
 		donpcevent "arena#50::OnReset_All";
-		$arena_min50end = gettime(MINUTE);
-		$arena_sec50end = gettime(SECOND);
+		$arena_min50end = gettime(GETTIME_MINUTE);
+		$arena_sec50end = gettime(GETTIME_SECOND);
 	}
 	end;
 }
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index 7fbaea869..71f80dcd4 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -38,8 +38,8 @@ force_2-1,99,20,4	script	Minilover#arena	4_F_TELEPORTER,{
 
 OnStart:
 	initnpctimer;
-	$arena_min60st = gettime(MINUTE);
-	$arena_sec60st = gettime(SECOND);
+	$arena_min60st = gettime(GETTIME_MINUTE);
+	$arena_sec60st = gettime(GETTIME_SECOND);
 	end;
 
 OnTimer3000:
@@ -784,8 +784,8 @@ OnMyMobDead:
 		donpcevent "Minilover#arena::On09_End";
 		donpcevent "arena#60::OnReset_09";
 		donpcevent "arena#60::OnReset_All";
-		$arena_min60end = gettime(MINUTE);
-		$arena_sec60end = gettime(SECOND);
+		$arena_min60end = gettime(GETTIME_MINUTE);
+		$arena_sec60end = gettime(GETTIME_SECOND);
 	}
 	end;
 }
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index a0b88f5dd..889089107 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -37,8 +37,8 @@ force_3-1,99,20,4	script	Cadillac#arena	4_F_TELEPORTER,{
 
 OnStart:
 	initnpctimer;
-	$arena_min70st = gettime(MINUTE);
-	$arena_sec70st = gettime(SECOND);
+	$arena_min70st = gettime(GETTIME_MINUTE);
+	$arena_sec70st = gettime(GETTIME_SECOND);
 	end;
 
 OnTimer3000:
@@ -749,8 +749,8 @@ OnMyMobDead:
 		donpcevent "Cadillac#arena::On09_End";
 		donpcevent "arena#70::OnReset_09";
 		donpcevent "arena#70::OnReset_All";
-		$arena_min70end = gettime(MINUTE);
-		$arena_sec70end = gettime(SECOND);
+		$arena_min70end = gettime(GETTIME_MINUTE);
+		$arena_sec70end = gettime(GETTIME_SECOND);
 	}
 	end;
 }
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 8922a3376..1529e555d 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -37,8 +37,8 @@ force_4-1,99,20,4	script	Octus#arena	4_F_TELEPORTER,{
 
 OnStart:
 	initnpctimer;
-	$arena_min80st = gettime(MINUTE);
-	$arena_sec80st = gettime(SECOND);
+	$arena_min80st = gettime(GETTIME_MINUTE);
+	$arena_sec80st = gettime(GETTIME_SECOND);
 	end;
 
 OnTimer3000:
@@ -730,8 +730,8 @@ OnMyMobDead:
 		donpcevent "Octus#arena::On09_End";
 		donpcevent "arena#80::OnReset_09";
 		donpcevent "arena#80::OnReset_All";
-		$arena_min80end = gettime(MINUTE);
-		$arena_sec80end = gettime(SECOND);
+		$arena_min80end = gettime(GETTIME_MINUTE);
+		$arena_sec80end = gettime(GETTIME_SECOND);
 	}
 	end;
 }
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 3011e7a43..ac9c5ff53 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -147,8 +147,8 @@ OnTouch:
 force_1-2,99,31,4	script	Slipslowrun#party	4_F_TELEPORTER,{
 OnStart:
 	initnpctimer;
-	$arena_minptst = gettime(MINUTE);
-	$arena_secptst = gettime(SECOND);
+	$arena_minptst = gettime(GETTIME_MINUTE);
+	$arena_secptst = gettime(GETTIME_SECOND);
 	end;
 
 OnTimer2000:
@@ -412,8 +412,8 @@ OnReset:
 
 force_1-2,95,187,0	script	force_09_exit	WARPNPC,1,1,{
 OnTouch:
-	$arena_minptend = gettime(MINUTE);
-	$arena_secptend = gettime(SECOND);
+	$arena_minptend = gettime(GETTIME_MINUTE);
+	$arena_secptend = gettime(GETTIME_SECOND);
 	warp "prt_are_in",73,139;
 	donpcevent "#arn_timer_pt::OnEnter";
 	donpcevent "arena_p::OnReset";
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index c2b34db1a..2ca63f2f5 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -1400,7 +1400,7 @@ pay_arche,76,135,3	script	#Target	HIDDEN_NPC,{ end; }
 -	script	::Acolyte_Tu	-1,{
 	mes "[Acolyte]";
 	if(tu_archer01 == 14){
-		if(gettime(HOUR) >= 18 && gettime(HOUR) < 22){
+		if (gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 22) {
 			mes "H-hello!";
 			mes "Umm, umm...";
 			mes "Are you R-Reidin Corse's";
@@ -1500,7 +1500,7 @@ pay_arche,76,135,3	script	#Target	HIDDEN_NPC,{ end; }
 			close;
 		}
 	} else if(tu_archer01 == 15){
-		if((gettime(HOUR) >= 18) && (gettime(HOUR) < 22)){
+		if (gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 22) {
 			mes "^666666Zzzzz...^000000";
 			mes "Wh-wha...?";
 			mes "Who are you?";
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index de61abad4..6c12574f0 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -70,7 +70,7 @@
 		if (strcharinfo(0) == getguildmaster(.@GID)) {
 			if (guildrelay_q == 100) {
 				if (guildtime > 22) {
-					if ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) {
+					if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
 						mes "[" + .@name$ + "]";
 						mes "Oh, you're back. So did you";
 						mes "rest up enough? I'm sure the";
@@ -127,7 +127,7 @@
 					}
 				}
 				else if (guildtime > 22) {
-					if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+					if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
 						mes "[" + .@name$ + "]";
 						mes "Oh, you're back. So did you";
 						mes "rest up enough? I'm sure the";
@@ -182,8 +182,7 @@
 						mes "come back to me later.";
 						close;
 					}
-				}
-				else if ((gettime(HOUR) - guildtime) > 2) {
+				} else if (gettime(GETTIME_HOUR) - guildtime > 2) {
 					mes "[" + .@name$ + "]";
 					mes "Oh, you're back. So did you";
 					mes "rest up enough? I'm sure the";
@@ -240,7 +239,9 @@
 				}
 			}
 			else if (guildrelay_q == 150) {
-				if (((guildtime > 22) && (gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) || ((guildtime > 21) && (gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) || ((gettime(HOUR) - guildtime) > 2)) {
+				if ((guildtime > 22 && gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 21 && gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime)
+				 || (gettime(GETTIME_HOUR) - guildtime > 2)) {
 					mes "[" + .@name$ + "]";
 					mes "Ah, you look well rested,";
 					mes "master. It is now time for";
@@ -304,12 +305,12 @@
 				}
 			}
 			else if (guildrelay_q == 25) {
-				if (((guildtime > 22) && ((gettime(HOUR) > 4) && (gettime(HOUR) < guildtime)))
-				|| ((guildtime > 21) && ((gettime(HOUR) > 3) && (gettime(HOUR) < guildtime)))
-				|| ((guildtime > 20) && ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)))
-				|| ((guildtime > 19) && ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)))
-				|| ((guildtime > 18) && ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)))
-				|| ((gettime(HOUR) - guildtime) > 5)) {
+				if ((guildtime > 22 && gettime(GETTIME_HOUR) > 4 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 21 && gettime(GETTIME_HOUR) > 3 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 20 && gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 19 && gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 18 && gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime)
+				 || gettime(GETTIME_HOUR) - guildtime > 5) {
 					mes "[" + .@name$ + "]";
 					mes "Ah, have you rested well,";
 					mes "master? Please excuse my";
@@ -413,7 +414,7 @@
 					mes "Hand me the spirit, and allow";
 					mes "me to give you your guild's reward.";
 					delitem 7239,1; //Soul_Of_Proceeding
-					guildtime = gettime(HOUR);
+					guildtime = gettime(GETTIME_HOUR);
 					guildrelay_q = 100;
 					.@incen_item = rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 25)) {
@@ -481,7 +482,7 @@
 					mes "challenges that you will all";
 					mes "face together. Good work!";
 					delitem 7245,1; //Soul_Of_Friendship
-					guildtime = gettime(HOUR);
+					guildtime = gettime(GETTIME_HOUR);
 					guildrelay_q = 150;
 					.@incen_item = rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 16)) {
@@ -574,7 +575,7 @@
 					mes "Tristan III, and share it with";
 					mes "guild. Once again, good work.";
 					delitem 7251,1; //Soul_Of_Victory
-					guildtime = gettime(HOUR);
+					guildtime = gettime(GETTIME_HOUR);
 					guildrelay_q = 25;
 					.@incen_item = rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 26)) {
@@ -1409,11 +1410,11 @@
 				mes "don't you worry about it.";
 				delitem 7235,1; //Soul_Of_Courage
 				guildrelay_q = 4;
-				guildtime = gettime(HOUR);
+				guildtime = gettime(GETTIME_HOUR);
 				close;
 			}
 			if ((guildtime > 22) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1427,7 +1428,7 @@
 				}
 			}
 			if ((guildtime > 21) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(HOUR) > 0101) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 0101 && gettime(GETTIME_HOUR) < guildtime) { // FIXME[Haru]: hour is clearly wrong
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1441,7 +1442,7 @@
 				}
 			}
 			if ((guildtime > 20) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(HOUR) > 0001) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 0001 && gettime(GETTIME_HOUR) < guildtime) { // FIXME[Haru]: Hour is probably wrong
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1454,7 +1455,7 @@
 					close;
 				}
 			}
-			if ((gettime(HOUR) - guildtime > 0300) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
+			if (gettime(GETTIME_HOUR) - guildtime > 0300 && guildrelay_q == 4 && BaseJob == Job_Blacksmith) { // FIXME[Haru]: Hour is clearly wrong
 				mes "[" + .@name$ + "]";
 				mes "I guess enough time";
 				mes "has passed. You ready";
@@ -1795,11 +1796,11 @@
 				mes "in order to be successful.";
 				delitem 7240,1; //Soul_Of_Confidence
 				guildrelay_q = 9;
-				guildtime = gettime(HOUR);
+				guildtime = gettime(GETTIME_HOUR);
 				close;
 			}
 			if ((guildtime > 22) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(HOUR) > 02) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1830,7 +1831,7 @@
 				}
 			}
 			else if ((guildtime > 21) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(HOUR) > 01) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1861,7 +1862,7 @@
 				}
 			}
 			else if ((guildtime > 20) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1890,8 +1891,7 @@
 					mes "dreams, passions, and goals!";
 					close;
 				}
-			}
-			else if ((gettime(HOUR) - guildtime > 3) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
+			} else if (gettime(GETTIME_HOUR) - guildtime > 3 && guildrelay_q == 9 && BaseJob == Job_Sage) {
 				mes "[" + .@name$ + "]";
 				mes "So did you spend some";
 				mes "quality time with your";
@@ -2765,11 +2765,11 @@
 				mes "to your feelings this time...";
 				delitem 7249,1; //Soul_Of_Service
 				guildrelay_q = 21;
-				guildtime = gettime(HOUR);
+				guildtime = gettime(GETTIME_HOUR);
 				close;
 			}
 			if ((guildtime > 22) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2791,7 +2791,7 @@
 				}
 			}
 			if ((guildtime > 21) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2813,7 +2813,7 @@
 				}
 			}
 			if ((guildtime > 20) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2834,7 +2834,7 @@
 					close;
 				}
 			}
-			if ((gettime(HOUR) - guildtime > 3) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
+			if (gettime(GETTIME_HOUR) - guildtime > 3 && guildrelay_q == 21 && BaseJob == Job_Crusader) {
 				mes "[" + .@name$ + "]";
 				mes "Yes. You've come at just";
 				mes "the right time. Remember";
diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt
index 3dfa0b754..34d1e8b2b 100644
--- a/npc/quests/newgears/2010_headgears.txt
+++ b/npc/quests/newgears/2010_headgears.txt
@@ -1036,7 +1036,7 @@ alberta,120,206,3	script	Alonie#Solo_Play_Box	4_M_UMKID,{
 			mes "My affection-lacked student!";
 			mes "This is the end of your training!";
 			next;
-			if (gettime(HOUR) < 12) {
+			if (gettime(GETTIME_HOUR) < 12) {
 				if (checkweight(Solo_Play_Box1,1) == 0) {
 					 mes "[Alonie]";
 					 mes "Playing outside with this heavy bag?";
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index 0a0c3948c..151e5c193 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -401,7 +401,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	4_M_04,{
 		mes "instructions, didn't you?";
 		close;
 	}
-	.@relaytime = gettime(HOUR);
+	.@relaytime = gettime(GETTIME_HOUR);
 	if (party_relay == 28) {
 		mes "[Gatan]";
 		mes "Say, I don't think it's";
@@ -1837,7 +1837,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "with any of the other guys?";
 		close;
 	}
-	.@relaytime = gettime(HOUR);
+	.@relaytime = gettime(GETTIME_HOUR);
 	if (party_relay == 30) {
 		mes "[Bafhail]";
 		mes "Did you give that ticket";
@@ -2471,7 +2471,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	4_M_KID1,{
 		mes "have to meet either, but...";
 		close;
 	}
-	.@relaytime = gettime(HOUR);
+	.@relaytime = gettime(GETTIME_HOUR);
 	getmapxy(.@m$,.@x,.@y,1,strnpcinfo(3));
 	.@juwi = getareausers(.@m$,.@x-8,.@y-8,.@x+8,.@y+8);
 	if (party_relay == 32) {
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index c5a470507..d2bf684a0 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -5692,7 +5692,7 @@ OnTouch:
 			mes "Failure to do so will result";
 			mes "in lockout. Please wait.";
 			next;
-			.@startseconds = gettime(HOUR)*60*60+gettime(MINUTE)*60+gettime(SECOND);
+			.@startseconds = gettime(GETTIME_HOUR)*60*60+gettime(GETTIME_MINUTE)*60+gettime(GETTIME_SECOND);
 			mes "[Security System]";
 			switch(rand(1,7)) {
 			case 1:
@@ -5761,7 +5761,7 @@ OnTouch:
 			}
 			next;
 			input .@input2$;
-			.@endtime = gettime(HOUR)*60*60+gettime(MINUTE)*60+gettime(SECOND);
+			.@endtime = gettime(GETTIME_HOUR)*60*60+gettime(GETTIME_MINUTE)*60+gettime(GETTIME_SECOND);
 			.@time = .@endtime-.@startseconds;
 			mes "[Security System]";
 			if ((.@input1$ == .@word1$) && (.@input2$ == .@word2$)) {
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 2636b1f77..d7b184f6c 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -85,7 +85,7 @@ lighthalzen,267,200,3	script	Guard#lhz01	4_M_LGTGUARD,{
 		$@Lhz_Gangster_Alert = 100;
 		close;
 	}
-	if (gettime(HOUR) >= 22 || gettime(HOUR) < 2) {
+	if (gettime(GETTIME_HOUR) >= 22 || gettime(GETTIME_HOUR) < 2) {
 		mes "[Guard]";
 		mes "Zzzz... Zzz...";
 		mes "ZZZzzzzzzzzzz...";
@@ -152,7 +152,7 @@ lighthalzen,294,223,7	script	Guard#lhz02	4_M_LGTGUARD,{
 		$@Lhz_Gangster_Alert = 100;
 		close;
 	}
-	if (gettime(HOUR) >= 22 || gettime(HOUR) < 2) {
+	if (gettime(GETTIME_HOUR) >= 22 || gettime(GETTIME_HOUR) < 2) {
 		mes "[Guard]";
 		mes "Zzzz... Zzz...";
 		mes "ZZZzzzzzzzzzz...";
@@ -7378,8 +7378,8 @@ yuno_pre,69,20,4	script	Secretary#1	4_F_LGTGIRL,{
 					mes "Membership Card.^000000";
 					close;
 				}
-				if(((gettime(HOUR) > 10) && (gettime(HOUR) < 15)) || ((gettime(HOUR) > 19) && (gettime(HOUR) <= 23)))
-				{
+				if ((gettime(GETTIME_HOUR) > 10 && gettime(GETTIME_HOUR) < 15)
+				 || (gettime(GETTIME_HOUR) > 19 && gettime(GETTIME_HOUR) <= 23)) {
 					mes "^3355FFYou suavely flash";
 					mes "your ''Secret Wing''";
 					mes "Membership Card.^000000";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 8d5113cd5..c4658a3aa 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -38,7 +38,7 @@
 // Soup Quest :: lou_tre
 //============================================================
 lou_in02,53,174,7	script	Employee#1	4_M_CHNMAN,6,62,{
-	if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+	if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
 		mes "[Chang Pai]";
 		mes "Welcome, welcome!";
 		mes "We are ready to serve you~!";
@@ -51,7 +51,7 @@ lou_in02,53,174,7	script	Employee#1	4_M_CHNMAN,6,62,{
 
 OnTouch:
 	if (ch_tre == 2 || ch_tre == 3) {
-		if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+		if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
 			if (rand(1,10) < 9) {
 				mes "[Chang Pai]";
 				mes "Wait, who are you?!";
@@ -63,8 +63,7 @@ OnTouch:
 				ch_tre = 1;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+		} else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
 			if (rand(1,10) < 10) {
 				mes "[Chang Pai]";
 				mes "Wait, who are you?!";
@@ -76,8 +75,7 @@ OnTouch:
 				ch_tre = 1;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 17 && gettime(HOUR) < 21) {
+		} else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 21) {
 			if (rand(1,10) < 6) {
 				mes "[Chang Pai]";
 				mes "Wait, who are you?!";
@@ -113,7 +111,7 @@ OnTouch:
 }
 
 lou_in02,76,181,3	script	Employee#2	4_M_CHNMAN,2,2,{
-	if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+	if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
 		mes "[Huang Jia Xian]";
 		mes "Welcome~";
 		mes "Sorry for making you wait. If you wish to rest, please go upstairs.";
@@ -138,7 +136,7 @@ lou_in02,76,181,3	script	Employee#2	4_M_CHNMAN,2,2,{
 
 OnTouch:
 	if (ch_tre == 2 || ch_tre == 3) {
-		if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+		if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
 			if (rand(1,10) < 9) {
 				mes "[Huang Jia Xian]";
 				mes "What the...?";
@@ -151,8 +149,7 @@ OnTouch:
 				ch_tre = 1;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+		} else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
 			if (rand(1,10) < 10) {
 				mes "[Huang Jia Xian]";
 				mes "What the...?";
@@ -165,8 +162,7 @@ OnTouch:
 				ch_tre = 1;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+		} else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
 			if (rand(1,10) < 6) {
 				mes "[Huang Jia Xian]";
 				mes "What the...?";
@@ -203,7 +199,7 @@ OnTouch:
 }
 
 lou_in02,61,175,3	script	Employee#3	4_F_CHNWOMAN,2,2,{
-	if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+	if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
 		if (ch_tre == 5) {
 			mes "[Ya Hua]";
 			mes "Welcome, welcome!";
@@ -234,7 +230,7 @@ lou_in02,61,175,3	script	Employee#3	4_F_CHNWOMAN,2,2,{
 
 OnTouch:
 	if (ch_tre == 2 || ch_tre == 3) {
-		if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+		if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
 			if (rand(1,10) < 9) {
 				mes "[Ya Hua]";
 				mes "What do you think";
@@ -247,8 +243,7 @@ OnTouch:
 				ch_tre = 1;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+		} else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
 			if (rand(1,10) < 10) {
 				mes "[Ya Hua]";
 				mes "What do you think";
@@ -261,8 +256,7 @@ OnTouch:
 				ch_tre = 1;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+		} else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
 			if (rand(1,10) < 6) {
 				mes "[Ya Hua]";
 				mes "What do you think";
@@ -367,7 +361,7 @@ lou_in02,62,183,3	script	Chef#1-2	4_M_CHNCOOK,2,2,{
 
 OnTouch:
 	if (ch_tre == 2 || ch_tre == 3) {
-		if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+		if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
 			if (rand(1,10) < 9) {
 				mes "[Wang Shi Long]";
 				mes "Hey, what do you";
@@ -381,8 +375,7 @@ OnTouch:
 				warp "louyang",280,161;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+		} else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
 			if (rand(1,10) < 10) {
 				mes "[Wang Shi Long]";
 				mes "Hey, what do you";
@@ -396,8 +389,7 @@ OnTouch:
 				warp "louyang",280,161;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+		} else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
 			if (rand(1,10) < 6) {
 				mes "[Wang Shi Long]";
 				mes "Hey, what do you";
@@ -720,16 +712,14 @@ lou_in02,50,185,5	script	Pot#1	HIDDEN_NPC,{
 			mes "^3131FFYou take a careful look around.";
 			mes "It wouldn't be wise to steal this now if anyone is watching.^000000";
 			next;
-			if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+			if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
 				mes "^3131FFThe restaurant doesn't seem busy right now, so there's only a few employees and customers.^000000";
-			}
-			else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+			} else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
 				mes "^3131FFOnly the restaurant";
 				mes "employees are around,";
 				mes "and they busy chatting";
 				mes "amongst each other.^000000";
-			}
-			else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+			} else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
 				mes "^3131FFThe restaurant is filled";
 				mes "with customers, and the";
 				mes "hustle and bustle of the";
@@ -770,7 +760,7 @@ lou_in02,50,185,5	script	Pot#1	HIDDEN_NPC,{
 		mes "^3131FFHowever, it's empty.^000000";
 		close;
 	}
-	if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+	if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
 		mes "[Chef]";
 		mes "Ah...!";
 		mes "Please, do not";
@@ -792,16 +782,14 @@ lou_in02,49,185,5	script	Pot#2	HIDDEN_NPC,{
 			mes "^3131FFYou take a careful look around.";
 			mes "It wouldn't be wise to steal this now if anyone is watching.^000000";
 			next;
-			if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+			if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
 				mes "^3131FFThe restaurant doesn't seem busy right now, so there's only a few employees and customers.^000000";
-			}
-			else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+			} else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
 				mes "^3131FFOnly the restaurant";
 				mes "employees are around,";
 				mes "and they busy chatting";
 				mes "amongst each other.^000000";
-			}
-			else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+			} else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
 				mes "^3131FFThe restaurant is filled";
 				mes "with customers, and the";
 				mes "hustle and bustle of the";
@@ -842,7 +830,7 @@ lou_in02,49,185,5	script	Pot#2	HIDDEN_NPC,{
 		mes "an empty pot.^000000";
 		close;
 	}
-	if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+	if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
 		mes "[Chef]";
 		mes "Ah...!";
 		mes "Please, do not";
@@ -894,7 +882,7 @@ lou_in02,58,183,5	script	Chef Assistant#lou1	4_M_CHNMONK,5,5,{
 
 OnTouch:
 	if (ch_tre == 2 || ch_tre == 3) {
-		if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+		if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
 			if (rand(1,10) < 9) {
 				mes "[Jin Wei Ling]";
 				mes "Wait! Who are you!";
@@ -907,8 +895,7 @@ OnTouch:
 				ch_tre = 1;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+		} else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
 			if (rand(1,10) < 10) {
 				mes "[Jin Wei Ling]";
 				mes "Wait! Who are you!";
@@ -921,8 +908,7 @@ OnTouch:
 				ch_tre = 1;
 				close;
 			}
-		}
-		else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+		} else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
 			if (rand(1,10) < 6) {
 				mes "[Jin Wei Ling]";
 				mes "Wait! Who are you!";
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.";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 7010ba494..3bcbb7e1d 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -1126,7 +1126,7 @@ um_in,101,73,3	script	Wainatan	4_F_UMWOMAN,{
 		close;
 	}
 	if (um_wind == 1) {
-		if (gettime(HOUR) > 18) {
+		if (gettime(GETTIME_HOUR) > 18) {
 			um_wind = 2;
 			emotion e_an;
 			mes "[Wainatan]";
@@ -1170,7 +1170,7 @@ um_in,94,123,5	script	Bertztan	4_F_UMWOMAN,{
 		close;
 	}
 	if (um_wind == 2) {
-		if (gettime(HOUR) > 18) {
+		if (gettime(GETTIME_HOUR) > 18) {
 			um_wind = 3;
 			emotion e_an;
 			mes "[Bertztan]";
@@ -1222,7 +1222,7 @@ umbala,145,217,3	script	Chabimatan	4_F_UMWOMAN,{
 		close;
 	}
 	if (um_wind == 3) {
-		if (gettime(HOUR) > 18) {
+		if (gettime(GETTIME_HOUR) > 18) {
 			um_wind = 4;
 			emotion e_an;
 			mes "[Chabimatan]";
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 48872392e..5ce92aa0e 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -553,7 +553,7 @@ prt_in,227,45,0	script	Archeologist#sign	1_M_SIGN1,{
 		mes "this and come back later~";
 		delitem 7314,1; //The_Sign
 		sign_q = 138;
-		.@stime_s = gettime(HOUR);
+		.@stime_s = gettime(GETTIME_HOUR);
 		if (.@stime_s < 1) sign_sq = 1;
 		else if (.@stime_s < 3) sign_sq = 2;
 		else if (.@stime_s < 5) sign_sq = 3;
@@ -568,7 +568,7 @@ prt_in,227,45,0	script	Archeologist#sign	1_M_SIGN1,{
 		else sign_sq = 12;
 	}
 	else if (sign_q == 138) {
-		.@stime_s1 = gettime(HOUR);
+		.@stime_s1 = gettime(GETTIME_HOUR);
 		if (.@stime_s1 < 1) {
 			if (sign_sq == 11) {
 				.@pass_s = 1;
@@ -2567,7 +2567,7 @@ aldeba_in,139,103,5	script	Monograph#sign	HIDDEN_NPC,{
 
 aldeba_in,155,101,3	script	Sir Jore#sign	1_M_SIGNALCHE,7,7,{
 	callfunc "F_UpdateSignVars";
-	if ((gettime(HOUR) > 16) && (gettime(HOUR) < 22)) {
+	if (gettime(GETTIME_HOUR) > 16 && gettime(GETTIME_HOUR) < 22) {
 		if (sign_q == 15) {
 			mes "["+ strcharinfo(0) +"]";
 			mes "Excuse me...";
@@ -2857,8 +2857,7 @@ aldeba_in,155,101,3	script	Sir Jore#sign	1_M_SIGNALCHE,7,7,{
 			mes "What's the answer?!";
 			close;
 		}
-	}
-	else if ((gettime(HOUR) > 6) && (gettime(HOUR) < 17)) {
+	} else if (gettime(GETTIME_HOUR) > 6 && gettime(GETTIME_HOUR) < 17) {
 		mes "^3355FFYou find a tense man";
 		mes "holding test tubes between";
 		mes "his fingers, standing in a pile";
@@ -2938,7 +2937,7 @@ OnTouch:
 aldeba_in,156,118,4	script	Piru Piru#sign	8_F,{
 	callfunc "F_UpdateSignVars";
 	mes "[Piru Piru]";
-	if ((gettime(HOUR) >= 12) && (gettime(HOUR) <= 24)) { //235959
+	if (gettime(GETTIME_HOUR) >= 12 && gettime(GETTIME_HOUR) <= 24) { //235959
 		if (sign_q == 17) {
 			emotion e_sob;
 			mes "Oh, I'm sooo tired~";
@@ -3018,7 +3017,7 @@ aldeba_in,156,118,4	script	Piru Piru#sign	8_F,{
 			close;
 		}
 	}
-	else if ((gettime(HOUR) >= 6) && (gettime(HOUR) < 12)) {
+	else if (gettime(GETTIME_HOUR) >= 6 && gettime(GETTIME_HOUR) < 12) {
 		mes "Everyday we study and";
 		mes "take notes and test and";
 		mes "experiment and record";
@@ -4533,7 +4532,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	1_M_SIGNART,{
 		}
 	}
 	else if (sign_q == 27) {
-		if ((gettime(HOUR) > 18) && (gettime(HOUR) < 23)) {
+		if (gettime(GETTIME_HOUR) > 18 && gettime(GETTIME_HOUR) < 23) {
 			mes "Nice, you're here";
 			mes "just in time. Well,";
 			mes "all that matters is that";
@@ -7550,7 +7549,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	4_M_03,{
 		mes "But I'll do my best for you.";
 		delitem 7314,1; //The_Sign
 		sign_q = 140;
-		.@stime_e = gettime(HOUR);
+		.@stime_e = gettime(GETTIME_HOUR);
 		if (.@stime_e < 2) sign_sq = 1;
 		else if (.@stime_e < 4) sign_sq = 2;
 		else if (.@stime_e < 6) sign_sq = 3;
@@ -7566,7 +7565,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	4_M_03,{
 		close;
 	}
 	else if (sign_q == 140) {
-		.@stime_e1 = gettime(HOUR);
+		.@stime_e1 = gettime(GETTIME_HOUR);
 		if (.@stime_e1 < 2) {
 			if (sign_sq == 11) {
 				.@pass_s1 = 1;
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 6bfb908d1..53b63e881 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -2519,7 +2519,7 @@ mora,31,138,6	script	Raffle Researcher#ep14	4_M_RAFLE_OR,{
 		close;
 	}
 	// NPC disabled from 12am ~ 5am.
-	if (gettime(HOUR) >= 0 && gettime(HOUR) < 5) {
+	if (gettime(GETTIME_HOUR) >= 0 && gettime(GETTIME_HOUR) < 5) {
 		if (ep14_1_muk > 0) {
 			mes "[Raffle Researcher]";
 			mes "Don't humans sleep?";
diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt
index 88e88d385..b0f594f7f 100644
--- a/npc/re/woe-fe/invest_main.txt
+++ b/npc/re/woe-fe/invest_main.txt
@@ -62,31 +62,31 @@ $@vfund_*_extra
 
 -	script	#invest_timer	-1,{
 OnClock0000:	// Open investments on Wed (1 hour after WoE)
-	if (gettime(WEEKDAY) == WEDNESDAY && !agitcheck()) {
+	if (gettime(GETTIME_WEEKDAY) == WEDNESDAY && !agitcheck()) {
 		$2011_agit_invest = 1;
 		donpcevent "#fund_master::OnInvest_start";
 	}
 	end;
 OnClock1200:	// Close investments on Fri (60 hours after investments open)
-	if (gettime(WEEKDAY) == FRIDAY && !agitcheck()) {
+	if (gettime(GETTIME_WEEKDAY) == FRIDAY && !agitcheck()) {
 		$2011_agit_invest = 2;
 		donpcevent "#fund_master::OnInvest_stop";
 	}
 	end;
 OnClock1235:	// Open dungeons on Fri (at least 31 minutes after investments close)
-	if (gettime(WEEKDAY) == FRIDAY && !agitcheck())
+	if (gettime(GETTIME_WEEKDAY) == FRIDAY && !agitcheck())
 		donpcevent "#fund_master::OnResult";
 	end;
 OnClock2000:	// Close dungeons on Tues (1 hour before WoE)
-	if (gettime(WEEKDAY) == TUESDAY)
+	if (gettime(GETTIME_WEEKDAY) == TUESDAY)
 		donpcevent "#fund_master::OnReset";
 	end;
 }
 
 function	script	F_Invest_Status	{
-	.@day = gettime(WEEKDAY);
-	.@hour = gettime(HOUR);
-	.@minute = gettime(MINUTE);
+	.@day = gettime(GETTIME_WEEKDAY);
+	.@hour = gettime(GETTIME_HOUR);
+	.@minute = gettime(GETTIME_MINUTE);
 
 	// Inactive.
 	if (agitcheck())
diff --git a/npc/woe-fe/agit_controller.txt b/npc/woe-fe/agit_controller.txt
index 8d038c322..3644ad67b 100644
--- a/npc/woe-fe/agit_controller.txt
+++ b/npc/woe-fe/agit_controller.txt
@@ -7,10 +7,6 @@
 //= 2.0a
 //===== Description: =========================================
 //= Auto Start for War of Emperium
-//=============================================
-//= gettime(3): Gets hour (24 hour time)
-//= gettime(4): Gets day of week 1=Monday, 2=Tuesday,
-//= 3=Wednesday, 4=Thursday, etc.
 //===== Additional Comments: =================================
 //= v1.1a changed OnInit to OnAgitInit.[kobra_k88]
 //= v1.2 added gettime checks. removed $AgitStarted var.[kobra_k88]
@@ -44,9 +40,9 @@ OnClock1800:	//end time for Sat(6)
 
 OnAgitInit:
 	// starting time checks
-	if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23) ||
-	   (gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23) ||
-	   (gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) {
+	if((gettime(GETTIME_WEEKDAY) == TUESDAY  && gettime(GETTIME_HOUR) >= 21 && gettime(GETTIME_HOUR) < 23) ||
+	   (gettime(GETTIME_WEEKDAY) == THURSDAY && gettime(GETTIME_HOUR) >= 21 && gettime(GETTIME_HOUR) < 23) ||
+	   (gettime(GETTIME_WEEKDAY) == SATURDAY && gettime(GETTIME_HOUR) >= 16 && gettime(GETTIME_HOUR) < 18)) {
 		if (!agitcheck()) {
 			agitstart;
 			callsub S_DisplayOwners;
@@ -55,9 +51,9 @@ OnAgitInit:
 	}
 
 	// end time checks
-	if ((gettime(4)==2) && (gettime(3)==23) ||
-	    (gettime(4)==4) && (gettime(3)==23) ||
-	    (gettime(4)==6) && (gettime(3)==18)) {
+	if ((gettime(GETTIME_WEEKDAY) == 2 && gettime(GETTIME_HOUR) == 23) ||
+	    (gettime(GETTIME_WEEKDAY) == 4 && gettime(GETTIME_HOUR) == 23) ||
+	    (gettime(GETTIME_WEEKDAY) == 6 && gettime(GETTIME_HOUR) == 18)) {
 		if (agitcheck()) {
 			agitend;
 			callsub S_DisplayOwners;
diff --git a/npc/woe-se/agit_start_se.txt b/npc/woe-se/agit_start_se.txt
index 74f03cb28..c225d9874 100644
--- a/npc/woe-se/agit_start_se.txt
+++ b/npc/woe-se/agit_start_se.txt
@@ -7,10 +7,6 @@
 //===== Description: =========================================
 //= Auto Start for War of Emperium
 //= To know how to set up WoE times, go to doc\woe_time_explanation.txt
-//=============================================
-//= gettime(3): Gets hour (24 hour time)
-//= gettime(4): Gets day of week 1=Monday, 2=Tuesday,
-//= 3=Wednesday, 4=Thursday, etc.
 //===== Additional Comments: =================================
 //= 1.0 Copy/Paste of the original setter.
 //============================================================
@@ -27,9 +23,9 @@ OnClock2300:	//end time for Sat(6)
 
 OnAgitInit2:
 	// starting time checks
-	if((gettime(4)==2) && (gettime(3)>=18 && gettime(3)<21) ||
-	   (gettime(4)==4) && (gettime(3)>=18 && gettime(3)<21) ||
-	   (gettime(4)==6) && (gettime(3)>=22 && gettime(3)<23)) {
+	if((gettime(GETTIME_WEEKDAY) == 2 && gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 21) ||
+	   (gettime(GETTIME_WEEKDAY) == 4 && gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 21) ||
+	   (gettime(GETTIME_WEEKDAY) == 6 && gettime(GETTIME_HOUR) >= 22 && gettime(GETTIME_HOUR) < 23)) {
 		if (!agitcheck2()) {
 			agitstart2;
 		}
@@ -37,9 +33,9 @@ OnAgitInit2:
 	}
 
 	// end time checks
-	if ((gettime(4)==2) && (gettime(3)==21) ||
-	    (gettime(4)==4) && (gettime(3)==21) ||
-	    (gettime(4)==6) && (gettime(3)==23)) {
+	if ((gettime(GETTIME_WEEKDAY) == 2 && gettime(GETTIME_HOUR) == 21) ||
+	    (gettime(GETTIME_WEEKDAY) == 4 && gettime(GETTIME_HOUR) == 21) ||
+	    (gettime(GETTIME_WEEKDAY) == 6 && gettime(GETTIME_HOUR) == 23)) {
 		if (agitcheck2()) {
 			agitend2;
 		}
-- 
cgit v1.2.3-60-g2f50