diff --git a/PCCS b/PCCS
index 232c9de..e4e2173 160000
--- a/PCCS
+++ b/PCCS
@@ -1 +1 @@
-Subproject commit 232c9def940031352da5fd64323eab592359c595
+Subproject commit e4e2173c80bfca677550bbd2df7d4070c4a93472
diff --git a/source/box_menu.cpp b/source/box_menu.cpp
index 9aeb658..3ff8713 100644
--- a/source/box_menu.cpp
+++ b/source/box_menu.cpp
@@ -11,6 +11,7 @@
 #include "translated_text.h"
 #include "FileContainerReader.h"
 #include "text_tables.h"
+#include "dbg/debug_mode.h"
 
 Box_Menu::Box_Menu() {};
 
@@ -27,7 +28,16 @@ int Box_Menu::box_main(PokeBox* box, Version vers)
     FileContainerReader namesReader(chunkList, numChunks, chunkSize);
 
     tte_erase_screen();
-    load_flex_background((FlexBackground)((int)FBG_Box_Green + (int)vers), 2); // This is kinda gross, but it works
+    
+    if (vers == VERSION_UNKNOWN)
+    {
+        load_flex_background(FBG_Box_Green, 2);
+    }
+    else
+    {
+        load_flex_background((FlexBackground)((int)FBG_Box_Green + (int)vers), 2); // This is kinda gross, but it works
+    }
+
     REG_BG1VOFS = 0;
     REG_BG1HOFS = 0;
     load_temp_box_sprites(box);
@@ -144,8 +154,11 @@ int Box_Menu::box_main(PokeBox* box, Version vers)
                 u32 nameEntryIndex = curr_pkmn->getSpeciesIndexNumber();
 
                 tte_set_pos(6, 88);
-                curr_pkmn->externalConvertNickname(&pkmnTables, val);
-                ptgb_write_simple(val, true);
+                if ((curr_GBA_rom.language == LANG_JPN) != (PTGB_BUILD_LANGUAGE == JPN_ID))
+                {
+                    curr_pkmn->externalConvertNickname(&pkmnTables, val);
+                    ptgb_write_simple(val, true);
+                }
                 if (curr_pkmn->getIsShiny())
                 {
                     tte_set_pos(64, 16);
diff --git a/source/script_array.cpp b/source/script_array.cpp
index 10daf05..d6eb779 100644
--- a/source/script_array.cpp
+++ b/source/script_array.cpp
@@ -14,6 +14,7 @@
 #include "text_engine.h"
 #include "text_tables.h"
 #include "translated_text.h"
+#include "dbg/debug_mode.h"
 #include <tonc.h>
 
 int last_error;
diff --git a/tools/text_helper/text.xlsx b/tools/text_helper/text.xlsx
index dfaea15..c5db6dc 100644
Binary files a/tools/text_helper/text.xlsx and b/tools/text_helper/text.xlsx differ