Add daily+weekly bit flags (close issue #429)

2018-01-22 15:59:24 -05:00
parent 3a7f518de4
commit efe6981a0d
14 changed files with 68 additions and 47 deletions
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -19,7 +19,7 @@ DaisyScript:
 	end

 .ThreePM:
-	checkflag ENGINE_TEA_IN_BLUES_HOUSE
+	checkflag ENGINE_DAISYS_GROOMING
 	iftrue .AlreadyGroomedMon
 	writetext DaisyOfferGroomingText
 	yesorno
@@ -29,7 +29,7 @@ DaisyScript:
 	special Special_DaisyMassage
 	if_equal $0, .Refused
 	if_equal $1, .CantGroomEgg
-	setflag ENGINE_TEA_IN_BLUES_HOUSE
+	setflag ENGINE_DAISYS_GROOMING
 	writetext DaisyAlrightText
 	waitbutton
 	closetext
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -63,7 +63,7 @@ ReceptionistScript_0x560ce:
 	opentext
 	checkcode VAR_WEEKDAY
 	if_not_equal SUNDAY, .EventIsOver
-	checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
+	checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
 	iftrue .EventIsOver
 	special Special_GetFirstPokemonHappiness
 	writetext UnknownText_0x56143
@@ -77,7 +77,7 @@ ReceptionistScript_0x560ce:
 	buttonsound
 	verbosegiveitem TM_RETURN
 	iffalse .Done
-	setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
+	setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
 	closetext
 	end

@@ -92,7 +92,7 @@ ReceptionistScript_0x560ce:
 	buttonsound
 	verbosegiveitem TM_FRUSTRATION
 	iffalse .Done
-	setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
+	setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
 	closetext
 	end

--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -31,7 +31,7 @@ ManiaScript:
 	end

 .alreadyhaveshuckie
-	checkflag ENGINE_SHUCKLE_GIVEN
+	checkflag ENGINE_GOT_SHUCKIE_TODAY
 	iffalse .returnshuckie
 	writetext ManiaText_TakeCareOfShuckle
 	waitbutton
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -174,7 +174,7 @@ TrainerFisherRalph1:
 	opentext
 	checkflag ENGINE_RALPH
 	iftrue .Rematch
-	checkflag ENGINE_SPECIAL_WILDDATA
+	checkflag ENGINE_FISH_SWARM
 	iftrue .Swarm
 	checkcellnum PHONE_FISHER_RALPH
 	iftrue .NumberAccepted