Remove checkmorn/checkday/checknite macros

2018-02-02 21:20:13 -05:00
parent 2a53d75807
commit aa8db1632c
16 changed files with 57 additions and 65 deletions
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -13,7 +13,7 @@ PharmacistScript_0x71afd:
 	iftrue UnknownScript_0x71b21
 	writetext UnknownText_0x71b27
 	buttonsound
-	checknite
+	checktime NITE
 	iftrue UnknownScript_0x71b14
 	writetext UnknownText_0x71b4a
 	waitbutton
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -64,7 +64,7 @@ GoldenrodUnderground_MapScripts:

 .Monday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
-	checkmorn
+	checktime MORN
 	iffalse .NotMondayMorning
 	appear GOLDENRODUNDERGROUND_GRAMPS
 .NotMondayMorning:
@@ -173,7 +173,7 @@ GrampsScript_0x7c146:
 	jump GoldenrodUndergroundScript_ShopClosed

 .CheckMorn:
-	checkmorn
+	checktime MORN
 	iffalse GoldenrodUndergroundScript_ShopClosed
 	pokemart MARTTYPE_BARGAIN, 0
 	closetext
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -27,7 +27,7 @@ ClefairyDance:
 	iftrue .NoDancing
 	checkcode VAR_WEEKDAY
 	ifnotequal MONDAY, .NoDancing
-	checknite
+	checktime NITE
 	iffalse .NoDancing
 	appear MOUNTMOONSQUARE_FAIRY1
 	appear MOUNTMOONSQUARE_FAIRY2
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -153,11 +153,11 @@ UnknownScript_0x7a5b8:
 NeighborScript:
 	faceplayer
 	opentext
-	checkmorn
+	checktime MORN
 	iftrue .MornScript
-	checkday
+	checktime DAY
 	iftrue .DayScript
-	checknite
+	checktime NITE
 	iftrue .NiteScript

 .MornScript:
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -148,9 +148,9 @@ Route29FisherScript:
 CooltrainerMScript_0x1a1031:
 	faceplayer
 	opentext
-	checkday
+	checktime DAY
 	iftrue .day_morn
-	checknite
+	checktime NITE
 	iftrue .nite
 .day_morn
 	writetext Text_WaitingForNight
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -351,7 +351,7 @@ TrainerPicnickerGina1:
 OfficerKeithScript:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NoFight
 	checkevent EVENT_BEAT_OFFICER_KEITH
 	iftrue .AfterScript
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -237,7 +237,7 @@ TrainerFirebreatherWalt:
 TrainerOfficerDirk:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NotNight
 	checkevent EVENT_BEAT_OFFICER_DIRK
 	iftrue .AfterBattle
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -138,7 +138,7 @@ TrainerPsychicNorman:
 TrainerPokefanfJaime:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NotNight
 	checkevent EVENT_BEAT_POKEFANF_JAIME
 	iftrue .Beaten
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -49,9 +49,9 @@ TrainerBlackbeltKenji:
 .Registered:
 	checkcode VAR_KENJI_BREAK
 	ifnotequal 1, Route45NumberAcceptedM
-	checkmorn
+	checktime MORN
 	iftrue .Morning
-	checknite
+	checktime NITE
 	iftrue .Night
 	checkevent EVENT_KENJI_ON_BREAK
 	iffalse Route45NumberAcceptedM