diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 7e94460ef..61eca0c01 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -5117,7 +5117,7 @@ BattleScript_EffectTeleportNew:
 BattleScript_EffectTeleportNewEnd:
 	goto BattleScript_MoveEnd
 
-.if B_BEAT_UP_DMG < GEN_5
+.if B_BEAT_UP < GEN_5
 BattleScript_EffectBeatUp::
 	attackcanceler
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
diff --git a/include/battle.h b/include/battle.h
index 8e9f6c300..5d9f57e43 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -168,7 +168,7 @@ struct SpecialStatus
     u8 sturdied:1;
     u8 stormDrainRedirected:1;
     u8 switchInAbilityDone:1;
-    u8 switchInItemDone:1; 
+    u8 switchInItemDone:1;
     u8 instructedChosenTarget:3;
     // End of byte
     u8 berryReduced:1;
diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h
index a83da731c..aee3b78a0 100644
--- a/include/constants/battle_config.h
+++ b/include/constants/battle_config.h
@@ -29,7 +29,7 @@
 #define B_KNOCK_OFF_DMG             GEN_LATEST // In Gen6+, Knock Off deals 50% more damage when knocking off an item.
 #define B_SPORT_DMG_REDUCTION       GEN_LATEST // In Gen5+, Water/Mud Sport reduce Fire/Electric Damage by 67% instead of 50%.
 #define B_EXPLOSION_DEFENSE         GEN_LATEST // In Gen5+, Self-Destruct and Explosion don't halve the targets' defense.
-#define B_PARENTAL_BOND_DAMAGE      GEN_LATEST // In Gen7+, Parental Bond's second hit does 25% of the initial hits damage. Before, it did 50%.
+#define B_PARENTAL_BOND_DMG         GEN_LATEST // In Gen7+, Parental Bond's second hit does 25% of the initial hits damage. Before, it did 50%.
 
 // Type settings
 #define B_GHOSTS_ESCAPE             GEN_LATEST // In Gen6+, abilities like Shadow Tag or moves like Mean Look fail on Ghost-type Pokémon. They can also escape any Wild Battle.
@@ -90,7 +90,7 @@
 #define B_ROOTED_GROUNDING          GEN_LATEST // In Gen4+, Ingrain causes the affected Pokémon to become grounded.
 #define B_METRONOME_MOVES           GEN_LATEST // This config will determine up to which generation will Metronome pull moves from.
 #define B_TELEPORT_BEHAVIOR         GEN_LATEST // In Gen7+, starting with Pokémon LGPE, Teleport allows the user to swap out with another party member.
-#define B_BEAT_UP_DMG               GEN_LATEST // In Gen5+, Beat Up uses a different formula to calculate the damage of each hit, and deals Dark-type damage.
+#define B_BEAT_UP                   GEN_LATEST // In Gen5+, Beat Up uses a different formula to calculate its damage, and deals Dark-type damage. Prior to Gen 5, each hit also announces the party member's name.
 
 // Ability settings
 #define B_EXPANDED_ABILITY_NAMES    TRUE       // If TRUE, ability names are increased from 12 characters to 16 characters.
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 686a44d6e..fd2129dbb 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -5678,7 +5678,7 @@ static void Cmd_moveend(void)
                 {
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
-                    effect = 1;
+                    effect = TRUE;
                 }
                 else
                 {
@@ -5711,7 +5711,7 @@ static void Cmd_moveend(void)
                     {
                         BattleScriptPushCursor();
                         gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
-                        effect = 1;
+                        effect = TRUE;
                     }
                 }
             }
diff --git a/src/battle_util.c b/src/battle_util.c
index 385790b8c..033571ab0 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -3887,7 +3887,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 gMultiHitCounter = 3;
                 PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
             }
-            #if B_BEAT_UP_DMG >= GEN_5
+            #if B_BEAT_UP >= GEN_5
             else if (gBattleMoves[gCurrentMove].effect == EFFECT_BEAT_UP)
             {
                 struct Pokemon* party;
@@ -8487,7 +8487,7 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
             basePower *= 2;
         break;
     case EFFECT_BEAT_UP:
-        #if B_BEAT_UP_DMG >= GEN_5
+        #if B_BEAT_UP >= GEN_5
         basePower = CalcBeatUpPower();
         #endif
         break;
@@ -9268,7 +9268,7 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move
     // Parental Bond Second Strike
     if (gSpecialStatuses[gBattlerAttacker].parentalBondState == PARENTAL_BOND_2ND_HIT)
     {
-        if (B_PARENTAL_BOND_DAMAGE < GEN_7)
+        if (B_PARENTAL_BOND_DMG < GEN_7)
             MulModifier(&finalModifier, UQ_4_12(0.5));
         else
             MulModifier(&finalModifier, UQ_4_12(0.25));