Tidy up ewram.h; yeet some more redundant definitions

1 files changed, 15 insertions, 20 deletions

diff --git a/src/tv.c b/src/tv.c
index 0df2e7c54..9381a592b 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -2189,12 +2189,6 @@ void sub_80BFD20(void)
     RemoveObjectEventByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
 }
 
-typedef union ewramStruct_02007000
-{
-    TVShow tvshows[4][TV_SHOWS_COUNT];
-    struct PokeNews pokeNews[4][POKE_NEWS_COUNT];
-} ewramStruct_02007000;
-
 void sub_80BFE24(TVShow arg0[TV_SHOWS_COUNT], TVShow arg1[TV_SHOWS_COUNT], TVShow arg2[TV_SHOWS_COUNT], TVShow arg3[TV_SHOWS_COUNT]);
 
 void sub_80C04A0(void);
@@ -2204,24 +2198,24 @@ void sub_80C0408(void);
 void ReceiveTvShowsData(u8 * arg0, u32 arg1 , u8 arg2)
 {
     u8 i;
-    ewramStruct_02007000 *ewramTVShows;
+    union TVShow (*tvShows)[TV_SHOWS_COUNT];
 
     for (i = 0; i < 4; i++)
-        memcpy(&gUnknown_02007000.tvshows[i], &arg0[i * arg1], TV_SHOWS_COUNT * sizeof(TVShow));
-    ewramTVShows = &gUnknown_02007000;
+        memcpy(eRecordMixTvShows[i], &arg0[i * arg1], TV_SHOWS_COUNT * sizeof(TVShow));
+    tvShows = eRecordMixTvShows;
     switch (arg2)
     {
     case 0:
-        sub_80BFE24(gSaveBlock1.tvShows, ewramTVShows->tvshows[1], ewramTVShows->tvshows[2], ewramTVShows->tvshows[3]);
+        sub_80BFE24(gSaveBlock1.tvShows, tvShows[1], tvShows[2], tvShows[3]);
         break;
     case 1:
-        sub_80BFE24(ewramTVShows->tvshows[0], gSaveBlock1.tvShows, ewramTVShows->tvshows[2], ewramTVShows->tvshows[3]);
+        sub_80BFE24(tvShows[0], gSaveBlock1.tvShows, tvShows[2], tvShows[3]);
         break;
     case 2:
-        sub_80BFE24(ewramTVShows->tvshows[0], ewramTVShows->tvshows[1], gSaveBlock1.tvShows, ewramTVShows->tvshows[3]);
+        sub_80BFE24(tvShows[0], tvShows[1], gSaveBlock1.tvShows, tvShows[3]);
         break;
     case 3:
-        sub_80BFE24(ewramTVShows->tvshows[0], ewramTVShows->tvshows[1], ewramTVShows->tvshows[2], gSaveBlock1.tvShows);
+        sub_80BFE24(tvShows[0], tvShows[1], tvShows[2], gSaveBlock1.tvShows);
         break;
     }
     sub_80BF588(gSaveBlock1.tvShows);
@@ -2495,25 +2489,26 @@ void sub_80C06BC(struct PokeNews *[POKE_NEWS_COUNT], struct PokeNews *[POKE_NEWS
 
 void ReceivePokeNewsData(void * a0, u32 a1, u8 a2)
 {
-    ewramStruct_02007000 *struct02007000;
+    struct PokeNews (* pokeNews)[POKE_NEWS_COUNT];
     u8 i;
 
     for (i = 0; i < 4; i++)
-        memcpy(gUnknown_02007000.pokeNews[i], a0 + i * a1, 64);
-    struct02007000 = &gUnknown_02007000;
+        memcpy(eRecordMixPokeNews[i], a0 + i * a1, 64);
+    
+    pokeNews = eRecordMixPokeNews;
     switch (a2)
     {
     case 0:
-        sub_80C05C4(gSaveBlock1.pokeNews, struct02007000->pokeNews[1], struct02007000->pokeNews[2], struct02007000->pokeNews[3]);
+        sub_80C05C4(gSaveBlock1.pokeNews, pokeNews[1], pokeNews[2], pokeNews[3]);
         break;
     case 1:
-        sub_80C05C4(struct02007000->pokeNews[0], gSaveBlock1.pokeNews, struct02007000->pokeNews[2], struct02007000->pokeNews[3]);
+        sub_80C05C4(pokeNews[0], gSaveBlock1.pokeNews, pokeNews[2], pokeNews[3]);
         break;
     case 2:
-        sub_80C05C4(struct02007000->pokeNews[0], struct02007000->pokeNews[1], gSaveBlock1.pokeNews, struct02007000->pokeNews[3]);
+        sub_80C05C4(pokeNews[0], pokeNews[1], gSaveBlock1.pokeNews, pokeNews[3]);
         break;
     case 3:
-        sub_80C05C4(struct02007000->pokeNews[0], struct02007000->pokeNews[1], struct02007000->pokeNews[2], gSaveBlock1.pokeNews);
+        sub_80C05C4(pokeNews[0], pokeNews[1], pokeNews[2], gSaveBlock1.pokeNews);
         break;
     }
     sub_80C0750();