Label remaining battle types

2 files changed, 33 insertions, 33 deletions

diff --git a/include/constants/battle.h b/include/constants/battle.h
index fa8f422c4..e6ebc85e4 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -44,38 +44,38 @@
 #define BIT_FLANK       2
 
 // Battle Type Flags
-#define BATTLE_TYPE_DOUBLE          (1 << 0)
-#define BATTLE_TYPE_LINK            (1 << 1)
-#define BATTLE_TYPE_IS_MASTER       (1 << 2) // In not-link battles, it's always set.
-#define BATTLE_TYPE_TRAINER         (1 << 3)
-#define BATTLE_TYPE_FIRST_BATTLE    (1 << 4)
-#define BATTLE_TYPE_20              (1 << 5)
-#define BATTLE_TYPE_MULTI           (1 << 6)
-#define BATTLE_TYPE_SAFARI          (1 << 7)
-#define BATTLE_TYPE_BATTLE_TOWER    (1 << 8)
-#define BATTLE_TYPE_WALLY_TUTORIAL  (1 << 9)
-#define BATTLE_TYPE_ROAMER          (1 << 10)
-#define BATTLE_TYPE_EREADER_TRAINER (1 << 11)
-#define BATTLE_TYPE_KYOGRE_GROUDON  (1 << 12)
-#define BATTLE_TYPE_LEGENDARY       (1 << 13)
-#define BATTLE_TYPE_REGI            (1 << 14)
-#define BATTLE_TYPE_TWO_OPPONENTS   (1 << 15)
-#define BATTLE_TYPE_DOME            (1 << 16)
-#define BATTLE_TYPE_PALACE          (1 << 17)
-#define BATTLE_TYPE_ARENA           (1 << 18)
-#define BATTLE_TYPE_FACTORY         (1 << 19)
-#define BATTLE_TYPE_PIKE            (1 << 20)
-#define BATTLE_TYPE_PYRAMID         (1 << 21)
-#define BATTLE_TYPE_INGAME_PARTNER  (1 << 22)
-#define BATTLE_TYPE_x800000         (1 << 23)
-#define BATTLE_TYPE_RECORDED        (1 << 24)
-#define BATTLE_TYPE_x2000000        (1 << 25)
-#define BATTLE_TYPE_TRAINER_HILL    (1 << 26)
-#define BATTLE_TYPE_SECRET_BASE     (1 << 27)
-#define BATTLE_TYPE_GROUDON         (1 << 28)
-#define BATTLE_TYPE_KYOGRE          (1 << 29)
-#define BATTLE_TYPE_RAYQUAZA        (1 << 30)
-#define BATTLE_TYPE_x80000000       (1 << 31)
+#define BATTLE_TYPE_DOUBLE             (1 << 0)
+#define BATTLE_TYPE_LINK               (1 << 1)
+#define BATTLE_TYPE_IS_MASTER          (1 << 2) // In not-link battles, it's always set.
+#define BATTLE_TYPE_TRAINER            (1 << 3)
+#define BATTLE_TYPE_FIRST_BATTLE       (1 << 4)
+#define BATTLE_TYPE_LINK_IN_BATTLE     (1 << 5) // Set on battle entry, cleared on exit. Checked rarely
+#define BATTLE_TYPE_MULTI              (1 << 6)
+#define BATTLE_TYPE_SAFARI             (1 << 7)
+#define BATTLE_TYPE_BATTLE_TOWER       (1 << 8)
+#define BATTLE_TYPE_WALLY_TUTORIAL     (1 << 9)
+#define BATTLE_TYPE_ROAMER             (1 << 10)
+#define BATTLE_TYPE_EREADER_TRAINER    (1 << 11)
+#define BATTLE_TYPE_KYOGRE_GROUDON     (1 << 12)
+#define BATTLE_TYPE_LEGENDARY          (1 << 13)
+#define BATTLE_TYPE_REGI               (1 << 14)
+#define BATTLE_TYPE_TWO_OPPONENTS      (1 << 15)
+#define BATTLE_TYPE_DOME               (1 << 16)
+#define BATTLE_TYPE_PALACE             (1 << 17)
+#define BATTLE_TYPE_ARENA              (1 << 18)
+#define BATTLE_TYPE_FACTORY            (1 << 19)
+#define BATTLE_TYPE_PIKE               (1 << 20)
+#define BATTLE_TYPE_PYRAMID            (1 << 21)
+#define BATTLE_TYPE_INGAME_PARTNER     (1 << 22)
+#define BATTLE_TYPE_TOWER_LINK_MULTI   (1 << 23)
+#define BATTLE_TYPE_RECORDED           (1 << 24)
+#define BATTLE_TYPE_RECORDED_LINK      (1 << 25)
+#define BATTLE_TYPE_TRAINER_HILL       (1 << 26)
+#define BATTLE_TYPE_SECRET_BASE        (1 << 27)
+#define BATTLE_TYPE_GROUDON            (1 << 28)
+#define BATTLE_TYPE_KYOGRE             (1 << 29)
+#define BATTLE_TYPE_RAYQUAZA           (1 << 30)
+#define BATTLE_TYPE_RECORDED_IS_MASTER (1 << 31)
 #define BATTLE_TYPE_FRONTIER                (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID)
 #define BATTLE_TYPE_FRONTIER_NO_PYRAMID     (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE)
 
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 252b25502..55353a6d1 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -3,7 +3,7 @@
 
 extern u32 gRecordedBattleRngSeed;
 extern u32 gBattlePalaceMoveSelectionRngValue;
-extern u8 gUnknown_0203C7B4;
+extern u8 gRecordedBattleMultiplayerId;
 
 void sub_8184DA4(u8 arg0);
 void sub_8184E58(void);