Some TV clean-up

include/constants/event_objects.h

@@ -311,5 +311,6 @@
 #define LOCALID_MOSSDEEP_MART_CLERK 1
 #define LOCALID_SOOTOPOLIS_MART_CLERK 1
 #define LOCALID_BATTLE_FRONTIER_MART_CLERK 1
+#define LOCALID_SLATEPORT_ENERGY_GURU 25
 
 #endif  // GUARD_CONSTANTS_EVENT_OBJECTS_H

include/constants/tv.h

@@ -8,6 +8,14 @@
 #define POKENEWS_BLENDMASTER  4
 #define NUM_POKENEWS_TYPES    4 // Excludes NONE
 
+#define POKENEWS_STATE_INACTIVE 0
+#define POKENEWS_STATE_UPCOMING 1
+#define POKENEWS_STATE_ACTIVE   2
+
+// Number of days to count down until the news event occurs.
+// Nothing is aired on TV the first day
+#define POKENEWS_COUNTDOWN 4
+
 // TV shows are categorized as being in one of 3 groups
 // - TVGROUP_NORMAL, TV shows that can appear without Record Mixing
 // - TVGROUP_RECORD_MIX, TV shows that can only appear via Record Mixing

include/global.h

@@ -972,10 +972,10 @@ struct SaveBlock1
     /*0x2B92*/ u8 outbreakLocationMapNum;
     /*0x2B93*/ u8 outbreakLocationMapGroup;
     /*0x2B94*/ u8 outbreakPokemonLevel;
-    /*0x2B95*/ u8 outbreakUnk1;
-    /*0x2B96*/ u16 outbreakUnk2;
+    /*0x2B95*/ u8 outbreakUnused1;
+    /*0x2B96*/ u16 outbreakUnused2;
     /*0x2B98*/ u16 outbreakPokemonMoves[MAX_MON_MOVES];
-    /*0x2BA0*/ u8 outbreakUnk4;
+    /*0x2BA0*/ u8 outbreakUnused3;
     /*0x2BA1*/ u8 outbreakPokemonProbability;
     /*0x2BA2*/ u16 outbreakDaysLeft;
     /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData;

include/global.tv.h

@@ -61,7 +61,7 @@ typedef union // size = 0x24
         /*0x0F*/ u8 filler_0F[1];
         /*0x10*/ u8 nickname[PLAYER_NAME_LENGTH + 1];
         /*0x18*/ u16 words18[2];
-        /*0x1C*/ u16 words[4];
+        /*0x1C*/ u16 words[2];
     } fanclubOpinions;
 
     // TVSHOW_DUMMY
@@ -334,7 +334,7 @@ typedef union // size = 0x24
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
         /*0x02*/ u8 avgLevel;
-        /*0x03*/ u8 nDecorations;
+        /*0x03*/ u8 numDecorations;
         /*0x04*/ u8 decorations[4];
         /*0x08*/ u16 species;
         /*0x0a*/ u16 move;
@@ -437,8 +437,8 @@ typedef union // size = 0x24
     struct {
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
-        /*0x02*/ u8 nMonsCaught;
-        /*0x03*/ u8 nPkblkUsed;
+        /*0x02*/ u8 monsCaught;
+        /*0x03*/ u8 pokeblocksUsed;
         /*0x04*/ u8 language;
         /*0x05*/ u8 filler_05[14];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@@ -449,27 +449,27 @@ typedef union // size = 0x24
     struct {
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
-        /*0x02*/ u8 var02;
-        /*0x03*/ u8 var03;
+        /*0x02*/ u8 unused1;
+        /*0x03*/ u8 unused3;
         /*0x04*/ u16 moves[MAX_MON_MOVES];
         /*0x0C*/ u16 species;
-        /*0x0E*/ u16 var0E;
+        /*0x0E*/ u16 unused2;
         /*0x10*/ u8 locationMapNum;
         /*0x11*/ u8 locationMapGroup;
-        /*0x12*/ u8 var12;
+        /*0x12*/ u8 unused4;
         /*0x13*/ u8 probability;
         /*0x14*/ u8 level;
-        /*0x15*/ u8 var15;
+        /*0x15*/ u8 unused5;
         /*0x16*/ u16 daysLeft;
         /*0x18*/ u8 language;
     } massOutbreak;
 } TVShow;
 
-typedef struct // 2b50
+typedef struct
 {
     u8 kind;
     u8 state;
-    u16 days;
+    u16 dayCountdown;
 } PokeNews;
 
 struct GabbyAndTyData