Merge branch 'main' into camera-hint

randovania · Jun 14, 2024 · faa2873 · faa2873
2 parents abd965f + 1e32c4c
commit faa2873
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/custom_assets.rs b/src/custom_assets.rs
@@ -718,7 +718,7 @@ pub fn custom_assets<'r>(
         vec![
             "Chozo script translated.\0".to_string(),
             "Racing\0".to_string(),
-            "As we have done for millennia, we Chozo work constantly on our speed. Our fastest are our sentinels; They are, and have always been, repositories for our most precious secrets and strongest powers.\n\n2023 (CGC) - TheGingerChris + BajaBlood\n2023 - Cosmonawt\n2022 (CGC) - Cosmo + Cestrion\n2021 - Dinopony\n2020 - Interslice\n2019 - TheWeakestLink64\0".to_string(),
+            "As we have done for millennia, we Chozo work constantly on our speed. Our fastest are our sentinels; They are, and have always been, repositories for our most precious secrets and strongest powers.\n\n2024 (Mentor Tournament) - Belokuikuini\n2023 (CGC) - TheGingerChris + BajaBlood\n2023 - Cosmonawt\n2022 (CGC) - Cosmo + Cestrion\n2021 - Dinopony\n2020 - Interslice\n2019 - TheWeakestLink64\0".to_string(),
         ],
         1,
         0,

diff --git a/src/patches.rs b/src/patches.rs
@@ -16882,7 +16882,7 @@ fn build_and_run_patches<'r>(
 
                     // Some doors have their object IDs changed in non NTSC-U versions
                     // NTSC-K is based on NTSC-U and shouldn't be part of those changes
-                    if config.version == Version::Pal || config.version == Version::NtscJ {
+                    if [Version::Pal, Version::NtscJ, Version::NtscJTrilogy, Version::NtscUTrilogy, Version::PalTrilogy].contains(&config.version) {
                         // Tallon Overworld - Temple Security Station
                         if mrea_id == 0xBDB1FCAC
                             && local_dl.door_location.unwrap().instance_id == 0x00070055