diff --git a/CREDITS.md b/CREDITS.md
index 6d884c8fd60..bca89c816ca 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -40,6 +40,7 @@
 ## Backgrounds
 - Squip (Paid Commissions)
 - Contributions by Someonealive-QN
+- Contributions by redactedinlight
 
 ## UI
 - GAMEFREAK
diff --git a/lefthook.yml b/lefthook.yml
index 28178432c31..40875073fdd 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -15,4 +15,6 @@ post-merge:
 post-checkout:
   commands:
     update-submodules:
-      run: git submodule update --init --recursive
\ No newline at end of file
+      # cf https://git-scm.com/docs/githooks#_post_checkout:
+      # The 3rd argument is 1 for branch checkouts and 0 for file checkouts.
+      run: if test {3} -eq "1"; then git submodule update --init --recursive; fi
\ No newline at end of file
diff --git a/public/images/arenas/plains_b_1.png b/public/images/arenas/plains_b_1.png
new file mode 100644
index 00000000000..7312a61af32
Binary files /dev/null and b/public/images/arenas/plains_b_1.png differ
diff --git a/public/images/arenas/plains_b_2.png b/public/images/arenas/plains_b_2.png
new file mode 100644
index 00000000000..e270986dd21
Binary files /dev/null and b/public/images/arenas/plains_b_2.png differ
diff --git a/public/images/arenas/plains_b_3.png b/public/images/arenas/plains_b_3.png
new file mode 100644
index 00000000000..b149daccd72
Binary files /dev/null and b/public/images/arenas/plains_b_3.png differ
diff --git a/public/images/arenas/plains_bg.png b/public/images/arenas/plains_bg.png
index 7815fd8843f..092f7e9cdbc 100644
Binary files a/public/images/arenas/plains_bg.png and b/public/images/arenas/plains_bg.png differ
diff --git a/public/locales b/public/locales
index 288ffa034d0..362b2c4fcc2 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit 288ffa034d07a90ea227710703eb1331b99ffed0
+Subproject commit 362b2c4fcc20b31a7be6c2dab537055fbaeb247f
diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index 3a76958571e..0c369f8b22d 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -1117,7 +1117,6 @@ export class TrickRoomTag extends ArenaTag {
     globalScene.phaseManager.queueMessage(
       i18next.t("arenaTag:trickRoomOnAdd", {
         moveName: this.getMoveName(),
-        opponentDesc: source.getOpponentDescriptor(),
       }),
     );
   }
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 2e15ef3fede..b28ebd0b46b 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -925,6 +925,7 @@ export function getBiomeKey(biome: BiomeId): string {
 
 export function getBiomeHasProps(biomeType: BiomeId): boolean {
   switch (biomeType) {
+    case BiomeId.PLAINS:
     case BiomeId.METROPOLIS:
     case BiomeId.BEACH:
     case BiomeId.LAKE:
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 8129ecdff3d..6ccccec7d91 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3382,10 +3382,6 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   getOpponentDescriptor(): string {
-    const opponents = this.getOpponents();
-    if (opponents.length === 1) {
-      return opponents[0].name;
-    }
     return this.isPlayer() ? i18next.t("arenaTag:opposingTeam") : i18next.t("arenaTag:yourTeam");
   }