diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h
index c6afed12cb..9baabde5c0 100644
--- a/include/constants/battle_move_effects.h
+++ b/include/constants/battle_move_effects.h
@@ -393,6 +393,6 @@
 #define EFFECT_BEAK_BLAST 387
 #define EFFECT_COURT_CHANGE 388
 
-#define NUM_BATTLE_MOVE_EFFECTS 390
+#define NUM_BATTLE_MOVE_EFFECTS 389
 
 #endif  // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 897bf35fbb..96796ea2d9 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -208,9 +208,8 @@
 #define VARIOUS_SET_OCTOLOCK                    135
 #define VARIOUS_CUT_1_3_HP_RAISE_STATS          136
 #define VARIOUS_TRY_END_NEUTRALIZING_GAS        137
-#define VARIOUS_TRY_SET_CORROSIVE_GAS           138
-#define VARIOUS_SET_BEAK_BLAST                  139
-#define VARIOUS_SWAP_SIDE_STATUSES              140
+#define VARIOUS_SET_BEAK_BLAST                  138
+#define VARIOUS_SWAP_SIDE_STATUSES              139
 
 // Cmd_manipulatedamage
 #define DMG_CHANGE_SIGN            0
diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h
index ee4b25115a..ccbc5a5368 100644
--- a/include/constants/battle_string_ids.h
+++ b/include/constants/battle_string_ids.h
@@ -611,12 +611,10 @@
 #define STRINGID_NEUTRALIZINGGASOVER                  608
 #define STRINGID_PKMNINSNAPTRAP                       609
 #define STRINGID_METEORBEAMCHARGING                   610
-#define STRINGID_ITEMMELTED                           611
-#define STRINGID_HEATUPBEAK                           612
-#define STRINGID_COURTCHANGE                          613
-#define STRINGID_PREPARESHELLTRAP                     614
+#define STRINGID_HEATUPBEAK                           611
+#define STRINGID_COURTCHANGE                          612
 
-#define BATTLESTRINGS_COUNT                           615
+#define BATTLESTRINGS_COUNT                           613
 
 // The below IDs are all indexes into battle message tables,
 // used to determine which of a set of messages to print.
diff --git a/src/battle_message.c b/src/battle_message.c
index 18364849ad..4ac9ef9b49 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -737,17 +737,13 @@ static const u8 sText_CantEscapeBecauseOfCurrentMove[] = _("{B_DEF_NAME_WITH_PRE
 static const u8 sText_NeutralizingGasEnters[] = _("Neutralizing Gas filled the area!");
 static const u8 sText_NeutralizingGasOver[] = _("The effects of Neutralizing\nGas wore off!");
 static const u8 sText_MeteorBeamCharging[] = _("{B_ATK_NAME_WITH_PREFIX} is overflowing\nwith space energy!");
-static const u8 sText_PkmnItemMelted[] = _("{B_ATK_NAME_WITH_PREFIX} corroded\n{B_DEF_NAME_WITH_PREFIX}'s {B_LAST_ITEM}!");
 static const u8 sText_HeatingUpBeak[] = _("{B_ATK_NAME_WITH_PREFIX} started\nheating up its beak!");
 static const u8 sText_CourtChange[] = _("{B_ATK_NAME_WITH_PREFIX} swapped the battle\neffects affecting each side!");
-static const u8 sText_PrepareShellTrap[] = _("{B_ATK_NAME_WITH_PREFIX} set\n a shell trap!");
 
 const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
 {
-    [STRINGID_PREPARESHELLTRAP - 12] = sText_PrepareShellTrap,
     [STRINGID_COURTCHANGE - 12] = sText_CourtChange,
     [STRINGID_HEATUPBEAK - 12] = sText_HeatingUpBeak,
-    [STRINGID_ITEMMELTED - 12] = sText_PkmnItemMelted,
     [STRINGID_METEORBEAMCHARGING - 12] = sText_MeteorBeamCharging,
     [STRINGID_PKMNINSNAPTRAP - 12] = sText_PkmnInSnapTrap,
     [STRINGID_NEUTRALIZINGGASOVER - 12] = sText_NeutralizingGasOver,
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 8e2c59d8a4..21150f8333 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -7525,15 +7525,15 @@ static bool32 IsRototillerAffected(u32 battlerId)
 
 #define COURTCHANGE_SWAP(status, structField, temp)              \
 {                                                                \
-    temp = gSideStatuses[0];                                     \
-    if (gSideStatuses[1] & status)                               \
-        gSideStatuses[0] |= status;                              \
+    temp = gSideStatuses[B_SIDE_PLAYER];                         \
+    if (gSideStatuses[B_SIDE_OPPONENT] & status)                 \
+        gSideStatuses[B_SIDE_PLAYER] |= status;                  \
     else                                                         \
-        gSideStatuses[0] &= ~(status);                           \
+        gSideStatuses[B_SIDE_PLAYER] &= ~(status);               \
     if (temp & status)                                           \
-        gSideStatuses[1] |= status;                              \
+        gSideStatuses[B_SIDE_OPPONENT] |= status;                \
     else                                                         \
-        gSideStatuses[1] &= ~(status);                           \
+        gSideStatuses[B_SIDE_OPPONENT] &= ~(status);             \
     SWAP(sideTimer0->structField, sideTimer1->structField, temp);\
 }                                                                \
 
@@ -7545,8 +7545,8 @@ static bool32 IsRototillerAffected(u32 battlerId)
 
 static bool32 CourtChangeSwapSideStatuses(void)
 {
-    struct SideTimer *sideTimer0 = &gSideTimers[0];
-    struct SideTimer *sideTimer1 = &gSideTimers[1];
+    struct SideTimer *sideTimer0 = &gSideTimers[B_SIDE_PLAYER];
+    struct SideTimer *sideTimer1 = &gSideTimers[B_SIDE_OPPONENT];
     u32 temp;
 
     // TODO: add Pledge-related effects
@@ -11290,7 +11290,8 @@ static bool8 IsTwoTurnsMove(u16 move)
         || gBattleMoves[move].effect == EFFECT_TWO_TURNS_ATTACK
         || gBattleMoves[move].effect == EFFECT_SOLARBEAM
         || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE
-        || gBattleMoves[move].effect == EFFECT_BIDE)
+        || gBattleMoves[move].effect == EFFECT_BIDE
+        || gBattleMoves[move].effect == EFFECT_METEOR_BEAM)
         return TRUE;
     else
         return FALSE;