Some script clean up, document secret base secrets show

8 files changed, 336 insertions, 76 deletions

diff --git a/include/battle_tower.h b/include/battle_tower.h
index 2366cac12..2e85c8018 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -71,7 +71,7 @@ void GetEreaderTrainerName(u8 *dst);
 void ValidateEReaderTrainer(void);
 void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer);
 void CopyEReaderTrainerGreeting(void);
-void sub_81653CC(void);
+void TryHideBattleTowerReporter(void);
 bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst);
 bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst);
 void CalcApprenticeChecksum(struct Apprentice *apprentice);
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 58ac90eab..a0ea6855b 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -2,29 +2,39 @@
 #define GUARD_METATILE_LABELS_H
 
 // gTileset_General
-#define METATILE_General_Grass               0x001
-#define METATILE_General_TallGrass           0x00D
-#define METATILE_General_LongGrass           0x015
-#define METATILE_General_TallGrass_TreeUp    0x025
-#define METATILE_General_Grass_TreeUp        0x00E
-#define METATILE_General_TallGrass_TreeLeft  0x1C6
-#define METATILE_General_TallGrass_TreeRight 0x1C7
-#define METATILE_General_Grass_TreeLeft      0x1CE
-#define METATILE_General_Grass_TreeRight     0x1CF
-#define METATILE_General_MuddySlope_Frame0   0x0E8
-#define METATILE_General_MuddySlope_Frame1   0x0E9
-#define METATILE_General_MuddySlope_Frame2   0x0EA
-#define METATILE_General_MuddySlope_Frame3   0x0EB
-#define METATILE_General_SandPit_Center      0x121
-#define METATILE_General_CaveEntrance_Top    0x09F
-#define METATILE_General_CaveEntrance_Bottom 0x0A7
-#define METATILE_General_RockWall_GrassBase  0x079
-#define METATILE_General_RockWall_RockBase   0x07C
-#define METATILE_General_RockWall_SandBase   0x091
-#define METATILE_General_CalmWater           0x170
-#define METATILE_General_RoughWater          0x14E
-#define METATILE_General_RoughDeepWater      0x14F
-#define METATILE_General_ReflectiveWater     0x0A1
+#define METATILE_General_Grass                0x001
+#define METATILE_General_TallGrass            0x00D
+#define METATILE_General_LongGrass            0x015
+#define METATILE_General_TallGrass_TreeUp     0x025
+#define METATILE_General_Grass_TreeUp         0x00E
+#define METATILE_General_TallGrass_TreeLeft   0x1C6
+#define METATILE_General_TallGrass_TreeRight  0x1C7
+#define METATILE_General_Grass_TreeLeft       0x1CE
+#define METATILE_General_Grass_TreeRight      0x1CF
+#define METATILE_General_MuddySlope_Frame0    0x0E8
+#define METATILE_General_MuddySlope_Frame1    0x0E9
+#define METATILE_General_MuddySlope_Frame2    0x0EA
+#define METATILE_General_MuddySlope_Frame3    0x0EB
+#define METATILE_General_SandPit_Center       0x121
+#define METATILE_General_CaveEntrance_Top     0x09F
+#define METATILE_General_CaveEntrance_Bottom  0x0A7
+#define METATILE_General_RockWall_GrassBase   0x079
+#define METATILE_General_RockWall_RockBase    0x07C
+#define METATILE_General_RockWall_SandBase    0x091
+#define METATILE_General_CalmWater            0x170
+#define METATILE_General_RoughWater           0x14E
+#define METATILE_General_RoughDeepWater       0x14F
+#define METATILE_General_ReflectiveWater      0x0A1
+#define METATILE_General_SecretBase_TreeLeft  0x026
+#define METATILE_General_SecretBase_TreeRight 0x027
+#define METATILE_General_SecretBase_VineLeft  0x036
+#define METATILE_General_SecretBase_VineRight 0x037
+#define METATILE_General_RedCaveIndent        0x1A0
+#define METATILE_General_RedCaveOpen          0x1A1 
+#define METATILE_General_YellowCaveIndent     0x1A8
+#define METATILE_General_YellowCaveOpen       0x1A9
+#define METATILE_General_BlueCaveIndent       0x1B0
+#define METATILE_General_BlueCaveOpen         0x1B1
 
 // gTileset_Building
 #define METATILE_Building_PC_Off 0x004
@@ -143,6 +153,8 @@
 #define METATILE_Fortree_BridgeOverGrass_Lowered          0x24F
 #define METATILE_Fortree_BridgeOverTrees_Raised           0x256
 #define METATILE_Fortree_BridgeOverTrees_Lowered          0x257
+#define METATILE_Fortree_SecretBase_Shrub                 0x271
+#define METATILE_Fortree_SecretBase_ShrubOpen             0x278
 #define METATILE_Fortree_SecretBase_LongGrass_TopLeft     0x279
 #define METATILE_Fortree_SecretBase_LongGrass_TopMid      0x27A
 #define METATILE_Fortree_SecretBase_LongGrass_TopRight    0x27B
@@ -164,6 +176,8 @@
 
 // gTileset_Fallarbor
 #define METATILE_Fallarbor_AshGrass                 0x20A
+#define METATILE_Fallarbor_BrownCaveIndent          0x208
+#define METATILE_Fallarbor_BrownCaveOpen            0x210
 #define METATILE_Fallarbor_NormalGrass              0x212
 #define METATILE_Fallarbor_AshField                 0x218
 #define METATILE_Fallarbor_BrownCaveEntrance_Top    0x259
@@ -414,4 +428,162 @@
 #define METATILE_Underwater_RockWall    0x21E
 #define METATILE_Underwater_FloorShadow 0x228
 
+// gTileset_SecretBase
+#define METATILE_SecretBase_Wall_TopMid                 0x202
+#define METATILE_SecretBase_Ground                      0x20A
+#define METATILE_SecretBase_PC                          0x220
+#define METATILE_SecretBase_RegisterPC                  0x221
+#define METATILE_SecretBase_PC_On                       0x224
+#define METATILE_SecretBase_RedBrick_Top                0x225
+#define METATILE_SecretBase_RedBrick_Bottom             0x22D
+#define METATILE_SecretBase_YellowBrick_Top             0x226
+#define METATILE_SecretBase_YellowBrick_Bottom          0x22E
+#define METATILE_SecretBase_BlueBrick_Top               0x227
+#define METATILE_SecretBase_BlueBrick_Bottom            0x22F
+#define METATILE_SecretBase_MudBall                     0x228
+#define METATILE_SecretBase_Fence_Horizontal            0x22C
+#define METATILE_SecretBase_Fence_Vertical              0x233
+#define METATILE_SecretBase_Board_Top                   0x234
+#define METATILE_SecretBase_Board_Bottom                0x23C
+#define METATILE_SecretBase_RedTent_DoorTop             0x239
+#define METATILE_SecretBase_RedTent_Door                0x241
+#define METATILE_SecretBase_BlueTent_DoorTop            0x251
+#define METATILE_SecretBase_BlueTent_Door               0x259
+#define METATILE_SecretBase_Slide_Stairs                0x23D
+#define METATILE_SecretBase_Slide                       0x23E
+#define METATILE_SecretBase_Stand_LeftCorner            0x26A
+#define METATILE_SecretBase_Stand_RightCorner           0x26D
+#define METATILE_SecretBase_BreakableDoor_TopClosed     0x237
+#define METATILE_SecretBase_BreakableDoor_BottomClosed  0x23F
+#define METATILE_SecretBase_BreakableDoor_TopOpen       0x26E
+#define METATILE_SecretBase_BreakableDoor_BottomOpen    0x276
+#define METATILE_SecretBase_NoteMat_C                   0x278
+#define METATILE_SecretBase_NoteMat_D                   0x279
+#define METATILE_SecretBase_NoteMat_E                   0x27A
+#define METATILE_SecretBase_NoteMat_F                   0x27B
+#define METATILE_SecretBase_NoteMat_G                   0x27C
+#define METATILE_SecretBase_NoteMat_A                   0x27D
+#define METATILE_SecretBase_NoteMat_B                   0x27E
+#define METATILE_SecretBase_NoteMat_C_Sharp             0x2B3
+#define METATILE_SecretBase_Tire_TopLeft                0x280
+#define METATILE_SecretBase_Tire_TopRight               0x281
+#define METATILE_SecretBase_Tire_BottomLeft             0x288
+#define METATILE_SecretBase_Tire_BottomRight            0x289
+#define METATILE_SecretBase_GlassOrnament_Base1         0x28A
+#define METATILE_SecretBase_GlassOrnament_Base2         0x28B
+#define METATILE_SecretBase_SandOrnament_BrokenTop      0x284
+#define METATILE_SecretBase_SandOrnament_BrokenBase     0x28C
+#define METATILE_SecretBase_SandOrnament_Top            0x285
+#define METATILE_SecretBase_SandOrnament_Base1          0x28D
+#define METATILE_SecretBase_SandOrnament_TopWall        0x286
+#define METATILE_SecretBase_SandOrnament_Base2          0x28E
+#define METATILE_SecretBase_SmallDesk                   0x287
+#define METATILE_SecretBase_PokemonDesk                 0x28F
+#define METATILE_SecretBase_HeavyDesk_TopLeft           0x290
+#define METATILE_SecretBase_HeavyDesk_TopMid            0x291
+#define METATILE_SecretBase_HeavyDesk_TopRight          0x292
+#define METATILE_SecretBase_HeavyDesk_BottomLeft        0x298
+#define METATILE_SecretBase_HeavyDesk_BottomMid         0x299
+#define METATILE_SecretBase_HeavyDesk_BottomRight       0x29A
+#define METATILE_SecretBase_RaggedDesk_TopLeft          0x293
+#define METATILE_SecretBase_RaggedDesk_TopMid           0x294
+#define METATILE_SecretBase_RaggedDesk_TopRight         0x295
+#define METATILE_SecretBase_RaggedDesk_BottomLeft       0x29B
+#define METATILE_SecretBase_RaggedDesk_BottomMid        0x29C
+#define METATILE_SecretBase_RaggedDesk_BottomRight      0x29D
+#define METATILE_SecretBase_ComfortDesk_TopLeft         0x296
+#define METATILE_SecretBase_ComfortDesk_TopMid          0x297
+#define METATILE_SecretBase_ComfortDesk_TopRight        0x2A3
+#define METATILE_SecretBase_ComfortDesk_BottomLeft      0x29E
+#define METATILE_SecretBase_ComfortDesk_BottomMid       0x29F
+#define METATILE_SecretBase_ComfortDesk_BottomRight     0x2AB
+#define METATILE_SecretBase_BrickDesk_TopLeft           0x2A0
+#define METATILE_SecretBase_BrickDesk_TopMid            0x2A1
+#define METATILE_SecretBase_BrickDesk_TopRight          0x2A2
+#define METATILE_SecretBase_BrickDesk_MidLeft           0x2A8
+#define METATILE_SecretBase_BrickDesk_Center            0x2A9
+#define METATILE_SecretBase_BrickDesk_MidRight          0x2AA
+#define METATILE_SecretBase_BrickDesk_BottomLeft        0x2B0
+#define METATILE_SecretBase_BrickDesk_BottomMid         0x2B1
+#define METATILE_SecretBase_BrickDesk_BottomRight       0x2B2
+#define METATILE_SecretBase_CampDesk_TopLeft            0x2A4
+#define METATILE_SecretBase_CampDesk_TopMid             0x2A5
+#define METATILE_SecretBase_CampDesk_TopRight           0x2A6
+#define METATILE_SecretBase_CampDesk_MidLeft            0x2AC
+#define METATILE_SecretBase_CampDesk_Center             0x2AD
+#define METATILE_SecretBase_CampDesk_MidRight           0x2AE
+#define METATILE_SecretBase_CampDesk_BottomLeft         0x2B4
+#define METATILE_SecretBase_CampDesk_BottomMid          0x2B5
+#define METATILE_SecretBase_CampDesk_BottomRight        0x2B6
+#define METATILE_SecretBase_HardDesk_TopLeft            0x2A7
+#define METATILE_SecretBase_HardDesk_TopMid             0x2BB
+#define METATILE_SecretBase_HardDesk_TopRight           0x2BC
+#define METATILE_SecretBase_HardDesk_MidLeft            0x2AF
+#define METATILE_SecretBase_HardDesk_Center             0x2C3
+#define METATILE_SecretBase_HardDesk_MidRight           0x2C4
+#define METATILE_SecretBase_HardDesk_BottomLeft         0x2B7
+#define METATILE_SecretBase_HardDesk_BottomMid          0x2CB
+#define METATILE_SecretBase_HardDesk_BottomRight        0x2CC
+#define METATILE_SecretBase_PrettyDesk_TopLeft          0x2BD
+#define METATILE_SecretBase_PrettyDesk_TopMid           0x2BE
+#define METATILE_SecretBase_PrettyDesk_TopRight         0x2BF
+#define METATILE_SecretBase_PrettyDesk_MidLeft          0x2C5
+#define METATILE_SecretBase_PrettyDesk_Center           0x2C6
+#define METATILE_SecretBase_PrettyDesk_MidRight         0x2C7
+#define METATILE_SecretBase_PrettyDesk_BottomLeft       0x2CD
+#define METATILE_SecretBase_PrettyDesk_BottomMid        0x2CE
+#define METATILE_SecretBase_PrettyDesk_BottomRight      0x2CF
+#define METATILE_SecretBase_SmallChair                  0x2B8
+#define METATILE_SecretBase_PokemonChair                0x2B9
+#define METATILE_SecretBase_HeavyChair                  0x2BA
+#define METATILE_SecretBase_PrettyChair                 0x2C0
+#define METATILE_SecretBase_ComfortChair                0x2C1
+#define METATILE_SecretBase_RaggedChair                 0x2C2
+#define METATILE_SecretBase_BrickChair                  0x2C8
+#define METATILE_SecretBase_CampChair                   0x2C9
+#define METATILE_SecretBase_HardChair                   0x2Ca
+#define METATILE_SecretBase_RedPlant_Base1              0x2D8
+#define METATILE_SecretBase_RedPlant_Base2              0x2D9
+#define METATILE_SecretBase_TropicalPlant_Base1         0x2DA
+#define METATILE_SecretBase_TropicalPlant_Base2         0x2DB
+#define METATILE_SecretBase_PrettyFlower_Base1          0x2DC
+#define METATILE_SecretBase_PrettyFlower_Base2          0x2DD
+#define METATILE_SecretBase_ColorfulFlowers_BaseLeft1   0x2E8
+#define METATILE_SecretBase_ColorfulFlowers_BaseRight1  0x2E9
+#define METATILE_SecretBase_ColorfulFlowers_BaseLeft2   0x2EA
+#define METATILE_SecretBase_ColorfulFlowers_BaseRight2  0x2EB
+#define METATILE_SecretBase_BigPlant_BaseLeft1          0x2EC
+#define METATILE_SecretBase_BigPlant_BaseRight1         0x2ED
+#define METATILE_SecretBase_BigPlant_BaseLeft2          0x2EE
+#define METATILE_SecretBase_BigPlant_BaseRight2         0x2EF
+#define METATILE_SecretBase_GorgeousPlant_BaseLeft1     0x2F8
+#define METATILE_SecretBase_GorgeousPlant_BaseRight1    0x2F9
+#define METATILE_SecretBase_GorgeousPlant_BaseLeft2     0x2FA
+#define METATILE_SecretBase_GorgeousPlant_BaseRight2    0x2FB
+#define METATILE_SecretBase_TV                          0x2F4
+#define METATILE_SecretBase_RoundTV                     0x2F5
+#define METATILE_SecretBase_CuteTV                      0x2F6
+#define METATILE_SecretBase_PikaPoster_Left             0x31C
+#define METATILE_SecretBase_PikaPoster_Right            0x31D
+#define METATILE_SecretBase_LongPoster_Left             0x31E
+#define METATILE_SecretBase_LongPoster_Right            0x31F
+#define METATILE_SecretBase_SeaPoster_Left              0x324
+#define METATILE_SecretBase_SeaPoster_Right             0x325
+#define METATILE_SecretBase_SkyPoster_Left              0x326
+#define METATILE_SecretBase_SkyPoster_Right             0x327
+#define METATILE_SecretBase_KissPoster_Left             0x32C
+#define METATILE_SecretBase_KissPoster_Right            0x32D
+#define METATILE_SecretBase_BallPoster                  0x330
+#define METATILE_SecretBase_GreenPoster                 0x331
+#define METATILE_SecretBase_RedPoster                   0x332
+#define METATILE_SecretBase_BluePoster                  0x333
+#define METATILE_SecretBase_CutePoster                  0x334
+#define METATILE_SecretBase_SilverShield_Base1          0x2DE
+#define METATILE_SecretBase_SilverShield_Base2          0x2DF
+#define METATILE_SecretBase_GoldShield_Base1            0x336
+#define METATILE_SecretBase_GoldShield_Base2            0x337
+#define METATILE_SecretBase_RedBalloon                  0x338
+#define METATILE_SecretBase_BlueBalloon                 0x33c
+#define METATILE_SecretBase_YellowBalloon               0x340
+
 #endif // GUARD_METATILE_LABELS_H
diff --git a/include/constants/tv.h b/include/constants/tv.h
index fddf650e4..6f686f727 100644
--- a/include/constants/tv.h
+++ b/include/constants/tv.h
@@ -46,4 +46,92 @@
 // Number of ribbons to put Spot the Cuties on air
 #define NUM_CUTIES_RIBBONS  4
 
+// TV Show states for Secret Base Secrets
+#define SBSECRETS_STATE_INTRO                   0
+#define SBSECRETS_STATE_DO_NEXT1                1
+#define SBSECRETS_STATE_DO_NEXT2                2
+#define SBSECRETS_STATE_TOOK_X_STEPS            3
+#define SBSECRETS_STATE_BASE_INTEREST_LOW       4
+#define SBSECRETS_STATE_BASE_INTEREST_MED       5
+#define SBSECRETS_STATE_BASE_INTEREST_HIGH      6
+#define SBSECRETS_STATE_OUTRO                   7
+#define SBSECRETS_STATE_NOTHING_USED1           8
+#define SBSECRETS_STATE_NOTHING_USED2           9
+#define SBSECRETS_STATE_USED_CHAIR              10
+#define SBSECRETS_STATE_USED_BALLOON            11
+#define SBSECRETS_STATE_USED_TENT               12
+#define SBSECRETS_STATE_USED_PLANT              13
+#define SBSECRETS_STATE_USED_GOLD_SHIELD        14
+#define SBSECRETS_STATE_USED_SILVER_SHIELD      15
+#define SBSECRETS_STATE_USED_GLASS_ORNAMENT     16
+#define SBSECRETS_STATE_USED_TV                 17
+#define SBSECRETS_STATE_USED_MUD_BALL           18
+#define SBSECRETS_STATE_USED_BAG                19
+#define SBSECRETS_STATE_USED_CUSHION            20
+#define SBSECRETS_STATE_HIT_CUSHION             21
+#define SBSECRETS_STATE_HUGGED_CUSHION          22
+#define SBSECRETS_STATE_BATTLED_WON             23
+#define SBSECRETS_STATE_BATTLED_LOST            24
+#define SBSECRETS_STATE_DECLINED_BATTLE         25
+#define SBSECRETS_STATE_USED_POSTER             26
+#define SBSECRETS_STATE_USED_NOTE_MAT           27
+#define SBSECRETS_STATE_BATTLED_DRAW            28
+#define SBSECRETS_STATE_USED_SPIN_MAT           29
+#define SBSECRETS_STATE_USED_SAND_ORNAMENT      30
+#define SBSECRETS_STATE_USED_DESK               31
+#define SBSECRETS_STATE_USED_BRICK              32
+#define SBSECRETS_STATE_USED_SOLID_BOARD        33
+#define SBSECRETS_STATE_USED_FENCE              34
+#define SBSECRETS_STATE_USED_GLITTER_MAT        35
+#define SBSECRETS_STATE_USED_TIRE               36
+#define SBSECRETS_STATE_USED_STAND              37
+#define SBSECRETS_STATE_USED_BREAKABLE_DOOR     38
+#define SBSECRETS_STATE_USED_DOLL               39
+#define SBSECRETS_STATE_USED_SLIDE              40
+#define SBSECRETS_STATE_DECLINED_SLIDE          41
+#define SBSECRETS_STATE_USED_JUMP_MAT           42
+#define SBSECRETS_NUM_STATES                    43
+
+// The below flags are set when interacting with objects in a friends secret base
+// Theyre set as bits in a var, and with 32 flags they're spread across 2 vars
+
+// VAR_SECRET_BASE_LOW_TV_FLAGS
+#define SECRET_BASE_USED_CHAIR          (1 << 0)
+#define SECRET_BASE_USED_BALLOON        (1 << 1)
+#define SECRET_BASE_USED_TENT           (1 << 2)
+#define SECRET_BASE_USED_PLANT          (1 << 3)
+#define SECRET_BASE_USED_GOLD_SHIELD    (1 << 4)
+#define SECRET_BASE_USED_SILVER_SHIELD  (1 << 5)
+#define SECRET_BASE_USED_GLASS_ORNAMENT (1 << 6)
+#define SECRET_BASE_USED_TV             (1 << 7)
+#define SECRET_BASE_USED_MUD_BALL       (1 << 8)
+#define SECRET_BASE_USED_BAG            (1 << 9)
+#define SECRET_BASE_USED_CUSHION        (1 << 10)
+#define SECRET_BASE_BATTLED_WON         (1 << 11)
+#define SECRET_BASE_BATTLED_LOST        (1 << 12)
+#define SECRET_BASE_DECLINED_BATTLE     (1 << 13)
+#define SECRET_BASE_USED_POSTER         (1 << 14)
+#define SECRET_BASE_USED_NOTE_MAT       (1 << 15)
+
+// VAR_SECRET_BASE_HIGH_TV_FLAGS
+#define SECRET_BASE_BATTLED_DRAW        (1 << 0)
+#define SECRET_BASE_USED_SPIN_MAT       (1 << 1)
+#define SECRET_BASE_USED_SAND_ORNAMENT  (1 << 2)
+#define SECRET_BASE_USED_DESK           (1 << 3)
+#define SECRET_BASE_USED_BRICK          (1 << 4)
+#define SECRET_BASE_USED_SOLID_BOARD    (1 << 5)
+#define SECRET_BASE_USED_FENCE          (1 << 6)
+#define SECRET_BASE_USED_GLITTER_MAT    (1 << 7)
+#define SECRET_BASE_USED_TIRE           (1 << 8)
+#define SECRET_BASE_USED_STAND          (1 << 9)
+#define SECRET_BASE_USED_BREAKABLE_DOOR (1 << 10)
+#define SECRET_BASE_USED_DOLL           (1 << 11)
+#define SECRET_BASE_USED_SLIDE          (1 << 12)
+#define SECRET_BASE_DECLINED_SLIDE      (1 << 13)
+#define SECRET_BASE_USED_JUMP_MAT       (1 << 14)
+#define SECRET_BASE_UNUSED_FLAG         (1 << 15)
+
+#define NUM_SECRET_BASE_FLAGS  32  // by definition, bitfield of 2 u16s
+
+
 #endif //GUARD_CONSTANTS_TV_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index c2716a214..a56ab89e0 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -240,49 +240,49 @@ extern const u8 gTVWhatsNo1InHoennTodayText05[];
 extern const u8 gTVWhatsNo1InHoennTodayText06[];
 extern const u8 gTVWhatsNo1InHoennTodayText07[];
 extern const u8 gTVWhatsNo1InHoennTodayText08[];
-extern const u8 gTVSecretBaseSecretsText00[];
-extern const u8 gTVSecretBaseSecretsText01[];
-extern const u8 gTVSecretBaseSecretsText02[];
-extern const u8 gTVSecretBaseSecretsText03[];
-extern const u8 gTVSecretBaseSecretsText04[];
-extern const u8 gTVSecretBaseSecretsText05[];
-extern const u8 gTVSecretBaseSecretsText06[];
-extern const u8 gTVSecretBaseSecretsText07[];
-extern const u8 gTVSecretBaseSecretsText08[];
-extern const u8 gTVSecretBaseSecretsText09[];
-extern const u8 gTVSecretBaseSecretsText10[];
-extern const u8 gTVSecretBaseSecretsText11[];
-extern const u8 gTVSecretBaseSecretsText12[];
-extern const u8 gTVSecretBaseSecretsText13[];
-extern const u8 gTVSecretBaseSecretsText14[];
-extern const u8 gTVSecretBaseSecretsText15[];
-extern const u8 gTVSecretBaseSecretsText16[];
-extern const u8 gTVSecretBaseSecretsText17[];
-extern const u8 gTVSecretBaseSecretsText18[];
-extern const u8 gTVSecretBaseSecretsText19[];
-extern const u8 gTVSecretBaseSecretsText20[];
-extern const u8 gTVSecretBaseSecretsText21[];
-extern const u8 gTVSecretBaseSecretsText22[];
-extern const u8 gTVSecretBaseSecretsText23[];
-extern const u8 gTVSecretBaseSecretsText24[];
-extern const u8 gTVSecretBaseSecretsText25[];
-extern const u8 gTVSecretBaseSecretsText26[];
-extern const u8 gTVSecretBaseSecretsText27[];
-extern const u8 gTVSecretBaseSecretsText28[];
-extern const u8 gTVSecretBaseSecretsText29[];
-extern const u8 gTVSecretBaseSecretsText30[];
-extern const u8 gTVSecretBaseSecretsText31[];
-extern const u8 gTVSecretBaseSecretsText32[];
-extern const u8 gTVSecretBaseSecretsText33[];
-extern const u8 gTVSecretBaseSecretsText34[];
-extern const u8 gTVSecretBaseSecretsText35[];
-extern const u8 gTVSecretBaseSecretsText36[];
-extern const u8 gTVSecretBaseSecretsText37[];
-extern const u8 gTVSecretBaseSecretsText38[];
-extern const u8 gTVSecretBaseSecretsText39[];
-extern const u8 gTVSecretBaseSecretsText40[];
-extern const u8 gTVSecretBaseSecretsText41[];
-extern const u8 gTVSecretBaseSecretsText42[];
+extern const u8 TVSecretBaseSecrets_Text_Intro[]; 
+extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1[];
+extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2[];
+extern const u8 TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving[];
+extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[]; 
+extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[]; 
+extern const u8 TVSecretBaseSecrets_Text_PlayerHugeFanOfBase[];
+extern const u8 TVSecretBaseSecrets_Text_Outro[]; 
+extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[]; 
+extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedChair[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedTent[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedPlant[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedTV[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedBag[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedCushion[]; 
+extern const u8 TVSecretBaseSecrets_Text_HitCushion[]; 
+extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[]; 
+extern const u8 TVSecretBaseSecrets_Text_BattledWon[]; 
+extern const u8 TVSecretBaseSecrets_Text_BattledLost[]; 
+extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedPoster[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[]; 
+extern const u8 TVSecretBaseSecrets_Text_BattledDraw[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedDesk[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedBrick[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedFence[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedTire[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedStand[]; 
+extern const u8 TVSecretBaseSecrets_Text_BrokeDoor[];
+extern const u8 TVSecretBaseSecrets_Text_UsedDoll[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedSlide[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedJumpMat[];
 extern const u8 gTVSafariFanClubText00[];
 extern const u8 gTVSafariFanClubText01[];
 extern const u8 gTVSafariFanClubText02[];
diff --git a/include/fldeff_misc.h b/include/fldeff_misc.h
index fd96f5646..6fd15c1ea 100644
--- a/include/fldeff_misc.h
+++ b/include/fldeff_misc.h
@@ -21,7 +21,7 @@ void ShatterSecretBaseBreakableDoor(s16 x, s16 y);
 void PlaySecretBaseMusicNoteMatSound(s16 metatileId);
 void DoSecretBaseGlitterMatSparkle(void);
 bool8 FldEff_SandPillar(void);
-void GetShieldToyTVDecorationInfo(void);
+void InteractWithShieldOrTVDecoration(void);
 bool8 sub_80FADE4(u16 arg0, u8 arg1);
 void FldEffPoison_Start(void);
 bool32 FldEffPoison_IsActive(void);
diff --git a/include/link.h b/include/link.h
index 4d6771a03..f41161d23 100644
--- a/include/link.h
+++ b/include/link.h
@@ -84,7 +84,7 @@
 #define LINKTYPE_MULTI_BATTLE        0x2255
 #define LINKTYPE_BATTLE_TOWER_50     0x2266
 #define LINKTYPE_BATTLE_TOWER_OPEN   0x2277 
-#define LINKTYPE_0x2288              0x2288  // battle?
+#define LINKTYPE_BATTLE_TOWER        0x2288
 #define LINKTYPE_0x3311              0x3311
 #define LINKTYPE_0x3322              0x3322
 #define LINKTYPE_BERRY_BLENDER_SETUP 0x4411
diff --git a/include/secret_base.h b/include/secret_base.h
index 4e323b0c6..b7d36a8ee 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -12,13 +12,13 @@ void InitSecretBaseAppearance(bool8 hidePC);
 bool8 CurMapIsSecretBase(void);
 void SecretBasePerStepCallback(u8 taskId);
 bool8 TrySetCurSecretBase(void);
-void SetSecretBaseSecretsTvFlags_Poster(void);
-void SetSecretBaseSecretsTvFlags_MiscFurnature(void);
-void SetSecretBaseSecretsTvFlags_LargeDecorationSpot(void);
-void SetSecretBaseSecretsTvFlags_SmallDecorationSpot(void);
+void CheckInteractedWithFriendsPosterDecor(void);
+void CheckInteractedWithFriendsFurnitureBottom(void);
+void CheckInteractedWithFriendsFurnitureMiddle(void);
+void CheckInteractedWithFriendsFurnitureTop(void);
 void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events);
 bool8 SecretBaseMapPopupEnabled(void);
-void sub_80EB218(void);
+void CheckLeftFriendsSecretBase(void);
 void ClearSecretBases(void);
 void SetCurSecretBaseIdFromPosition(const struct MapPosition *position, const struct MapEvents *events);
 void TrySetCurSecretBaseIndex(void);
diff --git a/include/tv.h b/include/tv.h
index dc4b22a99..8e9233c2b 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -18,7 +18,7 @@ void TryPutTrainerFanClubOnAir(void);
 void IncrementDailyPlantedBerries(void);
 void IncrementDailyPickedBerries(void);
 void IncrementDailyBattlePoints(u16 delta);
-void sub_80F01B8(void);
+void HideBattleTowerReporter(void);
 void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx);
 void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
 u32 GetPlayerIDAsU32(void);
@@ -29,7 +29,7 @@ u8 GetRibbonCount(struct Pokemon *pokemon);
 void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent);
 void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent);
 void AlertTVOfNewCoinTotal(u16 nCoinsPaidOut);
-void sub_80EEA70(void);
+void TryPutSecretBaseSecretsOnAir(void);
 void sub_80EDB44(void);
 void sub_80EDC60(const u16 *words);
 void sub_80EDA80(void);