From 2d2e712eabe36012af520183f62b5178682ff613 Mon Sep 17 00:00:00 2001
From: dawnDus <96957561+dawndus@users.noreply.github.com>
Date: Sat, 30 Apr 2022 11:54:48 -0400
Subject: [PATCH] fix loading order

---
 src/engine_constants/mod.rs | 11 +++++------
 src/shared_game_state.rs    |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/engine_constants/mod.rs b/src/engine_constants/mod.rs
index ebb16b6..dce4934 100644
--- a/src/engine_constants/mod.rs
+++ b/src/engine_constants/mod.rs
@@ -1796,12 +1796,11 @@ impl EngineConstants {
 
         for language in Language::values() {
             // Only Switch 1.3+ data contains an entirely valid JP font
-            let font =
-                if language == Language::Japanese && filesystem::exists_find(ctx, &self.base_paths, "/credit_jp.tsc") {
-                    FontData::new("csfontjp.fnt".to_owned(), 0.5, 0.0)
-                } else {
-                    language.font()
-                };
+            let font = if language == Language::Japanese && filesystem::exists(ctx, "/base/credit_jp.tsc") {
+                FontData::new("csfontjp.fnt".to_owned(), 0.5, 0.0)
+            } else {
+                language.font()
+            };
             self.locales.insert(language.to_string(), Locale::new(ctx, language.to_language_code(), font));
             log::info!("Loaded locale {} ({}).", language.to_string(), language.to_language_code());
         }
diff --git a/src/shared_game_state.rs b/src/shared_game_state.rs
index 5e9091b..f8639a1 100644
--- a/src/shared_game_state.rs
+++ b/src/shared_game_state.rs
@@ -317,11 +317,11 @@ impl SharedGameState {
             }
         }
 
+        constants.load_locales(ctx)?;
+
         let season = Season::current();
         constants.rebuild_path_list(None, season, &settings);
 
-        constants.load_locales(ctx)?;
-
         let active_locale = constants.locales.get(&settings.locale.to_string()).unwrap();
 
         if constants.is_cs_plus {