Merge branch 'master' into pokenav-decomp-again

1 files changed, 8 insertions, 8 deletions

diff --git a/src/tv.c b/src/tv.c
index 17243a456..01b43f100 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -37,7 +37,7 @@
 #include "decoration.h"
 #include "secret_base.h"
 #include "tv.h"
-#include "data2.h"
+#include "data.h"
 #include "constants/layouts.h"
 #include "constants/metatile_behaviors.h"
 
@@ -2567,7 +2567,7 @@ void sub_80EEA70(void)
             show->secretBaseSecrets.active = FALSE;
             StringCopy(show->secretBaseSecrets.playerName, gSaveBlock2Ptr->playerName);
             show->secretBaseSecrets.stepsInBase = VarGet(VAR_SECRET_BASE_STEP_COUNTER);
-            sub_80E980C();
+            CopyCurSecretBaseOwnerName_StrVar1();
             StringCopy(strbuf, gStringVar1);
             StripExtCtrlCodes(strbuf);
             StringCopy(show->secretBaseSecrets.baseOwnersName, strbuf);
@@ -7366,7 +7366,7 @@ u8 TVShowGetFlagCount(TVShow *show)
     return tot;
 }
 
-u8 TVShowGetStateForFlagNumber(TVShow *show, u8 a1)
+static u8 SecretBaseSecrets_GetStateForFlagNumber(TVShow *show, u8 a1)
 {
     u8 i;
     u8 tot;
@@ -7409,7 +7409,7 @@ static void DoTVShowSecretBaseSecrets(void)
             {
                 show->secretBaseSecrets.savedState = 1;
                 sTVSecretBaseSecretsRandomValues[0] = Random() % bitCount;
-                sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[0]);
+                sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[0]);
             }
             break;
         case 1:
@@ -7424,11 +7424,11 @@ static void DoTVShowSecretBaseSecrets(void)
                     show->secretBaseSecrets.savedState = 2;
                     if (sTVSecretBaseSecretsRandomValues[0] == 0)
                     {
-                        sTVShowState = TVShowGetStateForFlagNumber(show, 1);
+                        sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, 1);
                     }
                     else
                     {
-                        sTVShowState = TVShowGetStateForFlagNumber(show, 0);
+                        sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, 0);
                     }
                     break;
                 default:
@@ -7441,7 +7441,7 @@ static void DoTVShowSecretBaseSecrets(void)
                         }
                     }
                     show->secretBaseSecrets.savedState = 2;
-                    sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[1]);
+                    sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[1]);
                     break;
             }
             break;
@@ -7463,7 +7463,7 @@ static void DoTVShowSecretBaseSecrets(void)
                     }
                 }
                 show->secretBaseSecrets.savedState = 3;
-                sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[2]);
+                sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[2]);
             }
             break;
         case 3: