more battlescript labels

3 files changed, 17 insertions, 17 deletions

diff --git a/src/battle_2.c b/src/battle_2.c
index 328eacd85..ad1c8a179 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -2872,7 +2872,7 @@ void SwitchInClearSetData(void)
              && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
              && (gDisableStructs[i].bankWithSureHit == gActiveBank))
             {
-                gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
+                gStatuses3[i] &= ~(STATUS3_ALWAYS_HITS);
                 gStatuses3[i] |= 0x10;
             }
         }
@@ -4729,7 +4729,7 @@ static void HandleEndTurn_BattleWon(void)
         gBattleTextBuff1[0] = gBattleOutcome;
         gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-        gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+        gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
             && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER))
@@ -4785,16 +4785,16 @@ static void HandleEndTurn_BattleLost(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
         {
-            if (gBattleOutcome & BATTLE_OUTCOME_BIT_x80)
+            if (gBattleOutcome & OUTCOME_LINK_BATTLE_RUN)
             {
-                gBattlescriptCurrInstr = BattleScript_82DB9C8;
-                gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+                gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle;
+                gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
                 gSaveBlock2Ptr->field_CA9_b = 1;
             }
             else
             {
                 gBattlescriptCurrInstr = BattleScript_82DAA0B;
-                gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+                gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
             }
         }
         else
@@ -4802,7 +4802,7 @@ static void HandleEndTurn_BattleLost(void)
             gBattleTextBuff1[0] = gBattleOutcome;
             gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
             gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-            gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+            gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
         }
     }
     else
@@ -4819,13 +4819,13 @@ static void HandleEndTurn_RanFromBattle(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
-        gBattlescriptCurrInstr = BattleScript_82DB9C1;
+        gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
         gBattleOutcome = BATTLE_FORFEITED;
         gSaveBlock2Ptr->field_CA9_b = 1;
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
     {
-        gBattlescriptCurrInstr = BattleScript_82DB9C1;
+        gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
         gBattleOutcome = BATTLE_FORFEITED;
     }
     else
@@ -5439,7 +5439,7 @@ static void HandleAction_Run(void)
             }
         }
 
-        gBattleOutcome |= BATTLE_OUTCOME_BIT_x80;
+        gBattleOutcome |= OUTCOME_LINK_BATTLE_RUN;
         gSaveBlock2Ptr->field_CA9_b = 1;
     }
     else
diff --git a/src/battle_message.c b/src/battle_message.c
index 77f7cc722..cf5a55140 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1632,9 +1632,9 @@ void BufferStringBattle(u16 stringID)
         stringPtr = gText_AttackerUsedX;
         break;
     case STRINGID_BATTLEEND: // battle end
-        if (gBattleTextBuff1[0] & BATTLE_OUTCOME_BIT_x80)
+        if (gBattleTextBuff1[0] & OUTCOME_LINK_BATTLE_RUN)
         {
-            gBattleTextBuff1[0] &= ~(BATTLE_OUTCOME_BIT_x80);
+            gBattleTextBuff1[0] &= ~(OUTCOME_LINK_BATTLE_RUN);
             if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != BATTLE_DREW)
                 gBattleTextBuff1[0] ^= (BATTLE_LOST | BATTLE_WON);
 
diff --git a/src/battle_util.c b/src/battle_util.c
index c08833858..b4268673c 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -364,7 +364,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DAE2A;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingDisabledMoveInPalace;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -379,7 +379,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         CancelMultiTurnMoves(gActiveBank);
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB098;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingTormentedMoveInPalace;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -394,7 +394,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB0AF;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingNotAllowedMoveTauntInPalace;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -409,7 +409,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB185;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingImprisionedMoveInPalace;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -1313,7 +1313,7 @@ void TryClearRageStatuses(void)
 u8 AtkCanceller_UnableToUseMove(void)
 {
     u8 effect = 0;
-    s32* bideDmg = &gBattleScripting.bideDmg;
+    s32 *bideDmg = &gBattleScripting.bideDmg;
     do
     {
         switch (gBattleStruct->atkCancellerTracker)