Document interview and TV scripts, and misc script clean up

1 files changed, 29 insertions, 29 deletions

diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 427775a76..a2d5473b1 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -7,28 +7,28 @@ EventScript_TV:: @ 827EE0B
 	goto_if_eq EventScript_PlayersHouseMovie
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_PlayersHouseLatiNewsFlash
-	goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A
-	goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A
+	goto_if_unset FLAG_SYS_TV_START, EventScript_MomDadMightLikeThis1
+	goto_if_set FLAG_SYS_TV_WATCH, EventScript_MomDadMightLikeThis1
 	specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_27EEFF
-	goto EventScript_27EEE9
+	compare VAR_RESULT, TRUE
+	goto_if_eq EventScript_DoInSearchOfTrainers
+	goto EventScript_TryDoPokeNews
 	end
 
-EventScript_27EE54:: @ 827EE54
-	specialvar VAR_0x8004, special_0x44
+EventScript_TryDoTVShow:: @ 827EE54
+	specialvar VAR_0x8004, GetRandomActiveShowIdx
 	compare VAR_0x8004, 255
-	goto_if_eq EventScript_27EED8
-	specialvar VAR_RESULT, special_0x4a
+	goto_if_eq EventScript_MomDadMightLikeThis2
+	specialvar VAR_RESULT, GetNextActiveShowIfMassOutbreak
 	compare VAR_RESULT, 255
-	goto_if_eq EventScript_27EED8
+	goto_if_eq EventScript_MomDadMightLikeThis2
 	copyvar VAR_0x8004, VAR_RESULT
-	specialvar VAR_RESULT, special_0x45
+	specialvar VAR_RESULT, GetSelectedTVShow
 	compare VAR_RESULT, 0
-	goto_if_ne EventScript_27EEBA
+	goto_if_ne EventScript_DoTVShow
 	end
 
-EventScript_27EE8A:: @ 827EE8A
+EventScript_MomDadMightLikeThis1:: @ 827EE8A
 	special GetMomOrDadStringForTVMessage
 	msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
 	special TurnOffTVScreen
@@ -40,11 +40,11 @@ EventScript_PlayersHouseMovie:: @ 827EE9A
 	releaseall
 	end
 
+@ special InitRoamer is a junk call. Its input var (VAR_0x8004) hasn't been set, and
+@ It's called again when Mom actually asks for the color, overwriting
+@ whatever it does here.
 EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
 	msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT
-	@ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and
-	@ It's called again when Mom actually asks for the color, overwriting
-	@ whatever it does here.
 	special InitRoamer
 	clearflag FLAG_SYS_TV_LATIAS_LATIOS
 	setflag FLAG_LATIOS_OR_LATIAS_ROAMING
@@ -52,41 +52,41 @@ EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
 	releaseall
 	end
 
-EventScript_27EEBA:: @ 827EEBA
+EventScript_DoTVShow:: @ 827EEBA
 	special DoTVShow
 	waitmessage
 	waitbuttonpress
 	compare VAR_RESULT, 1
-	goto_if_ne EventScript_27EEBA
-	goto EventScript_27EED0
+	goto_if_ne EventScript_DoTVShow
+	goto EventScript_TurnOffTV
 	end
 
-EventScript_27EED0:: @ 827EED0
+EventScript_TurnOffTV:: @ 827EED0
 	special TurnOffTVScreen
 	setflag FLAG_SYS_TV_WATCH
 	releaseall
 	end
 
-EventScript_27EED8:: @ 827EED8
+EventScript_MomDadMightLikeThis2:: @ 827EED8
 	special GetMomOrDadStringForTVMessage
 	msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
-	goto EventScript_27EED0
+	goto EventScript_TurnOffTV
 	end
 
-EventScript_27EEE9:: @ 827EEE9
+EventScript_TryDoPokeNews:: @ 827EEE9
 	special DoPokeNews
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_27EE54
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_TryDoTVShow
 	waitmessage
 	waitbuttonpress
-	goto EventScript_27EED0
+	goto EventScript_TurnOffTV
 	end
 
-EventScript_27EEFF:: @ 827EEFF
+EventScript_DoInSearchOfTrainers:: @ 827EEFF
 	special DoTVShowInSearchOfTrainers
 	waitmessage
 	waitbuttonpress
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_27EEFF
-	goto EventScript_27EED0
+	goto_if_eq EventScript_DoInSearchOfTrainers
+	goto EventScript_TurnOffTV
 	end