summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-16 16:13:52 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-11-16 16:22:17 -0500
commitd4147879320c563254059a92eb7a07b5cfcc2143 (patch)
treea6bfe4642d38f26f3bfba9328aa379fbad8b8e58 /data
parent5d9c31a610d8a6680a44b772fc1b88135d3884c3 (diff)
Some TV clean-up
Diffstat (limited to 'data')
-rw-r--r--data/maps/SlateportCity/scripts.inc2
-rw-r--r--data/scripts/tv.inc4
2 files changed, 5 insertions, 1 deletions
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 693a99e49..be2f3f3e5 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -19,6 +19,8 @@
.set LOCALID_GRUNT_11, 33
.set LOCALID_SCOTT, 35
+@ Note: LOCALID_SLATEPORT_ENERGY_GURU is a local id for this map used elsewhere. It's defined in event_objects.h
+
SlateportCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_OnFrame
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 14f3ade48..f8832a3ab 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -52,11 +52,13 @@ EventScript_PlayersHouseLatiNewsFlash::
releaseall
end
+@ The following is a loop for the TV show messages
+@ VAR_RESULT is set to TRUE when the show has printed its final message
EventScript_DoTVShow::
special DoTVShow
waitmessage
waitbuttonpress
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_ne EventScript_DoTVShow
goto EventScript_TurnOffTV
end