From c0be66fc2e0ace7a9004fcbebe3a7595c30cda87 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Fri, 24 Jan 2020 14:42:46 -0500
Subject: Document Viridian City scripts and adjacent routes

---
 src/battle_main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/battle_main.c')

diff --git a/src/battle_main.c b/src/battle_main.c
index fd8aeffbc..76f373f8f 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -50,6 +50,7 @@
 #include "cable_club.h"
 #include "constants/abilities.h"
 #include "constants/battle_move_effects.h"
+#include "constants/battle_setup.h"
 #include "constants/hold_effects.h"
 #include "constants/items.h"
 #include "constants/moves.h"
@@ -3716,12 +3717,12 @@ static void HandleEndTurn_BattleLost(void)
     }
     else
     {
-        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == 9)
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL)
         {
-            if (sub_80803D8() & 1)
-                gBattleCommunication[MULTISTRING_CHOOSER] = 1;
+            if (GetRivalBattleFlags() & RIVAL_BATTLE_HEAL_AFTER)
+                gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Dont do white out text
             else
-                gBattleCommunication[MULTISTRING_CHOOSER] = 2;
+                gBattleCommunication[MULTISTRING_CHOOSER] = 2; // Do white out text
             gBattlerAttacker = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         }
         else
-- 
cgit v1.2.3


From 4770fac9eb9696236fa998554a353f1f140a1ed4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 4 Feb 2020 14:16:45 -0500
Subject: More mevent documentation

---
 src/battle_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle_main.c')

diff --git a/src/battle_main.c b/src/battle_main.c
index 76f373f8f..80a0cd588 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1154,7 +1154,7 @@ static void CB2_PreInitMultiBattle(void)
             if (gWirelessCommType)
                 sub_800AB9C();
             else
-                sub_800AAC0();
+                Link_TryStartSend5FFF();
         }
         break;
     case 3:
-- 
cgit v1.2.3


From aa4a979334036eb647cef5cd6a4ecd0bcad4b235 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 12 Feb 2020 15:32:14 -0500
Subject: More function documentation in union_room, link, link_rfu_2

---
 src/battle_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle_main.c')

diff --git a/src/battle_main.c b/src/battle_main.c
index 80a0cd588..3f20399f6 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1152,7 +1152,7 @@ static void CB2_PreInitMultiBattle(void)
         {
             ++gBattleCommunication[MULTIUSE_STATE];
             if (gWirelessCommType)
-                sub_800AB9C();
+                PrepareSendLinkCmd2FFE_or_RfuCmd6600();
             else
                 Link_TryStartSend5FFF();
         }
-- 
cgit v1.2.3