diff --git a/soh/assets/custom/accessibility/texts/scenes_fra.json b/soh/assets/custom/accessibility/texts/scenes_fra.json index fa36c8840..3f73410e7 100644 --- a/soh/assets/custom/accessibility/texts/scenes_fra.json +++ b/soh/assets/custom/accessibility/texts/scenes_fra.json @@ -1,5 +1,5 @@ { - "0": "Abre Mojo", + "0": "Arbre Mojo", "1": "Caverne Dodongo", "2": "Ventre de Jabu-Jabu", "3": "Temple de la Forêt", @@ -58,9 +58,9 @@ "56": "Laboratoire du Lac", "57": "", // Tente du Marathonien (No title card) "58": "Cabane du fossoyeur", - "59": "Fountaine Royale des Fées", - "60": "Fountaine des Fées", - "61": "Fountaine Royale des Fées", + "59": "Fontaine Royale des Fées", + "60": "Fontaine des Fées", + "61": "Fontaine Royale des Fées", "62": "", // Grottes (No title card) "63": "", // Tombe 1 (No title card) "64": "", // Tombe 2 (No title card) @@ -109,4 +109,4 @@ "107": "", "108": "", // Debug: SRD Room (No title card) "109": "" // Debug: Treasure Chest Warp (No title card) -} \ No newline at end of file +} diff --git a/soh/macosx/Info.plist.in b/soh/macosx/Info.plist.in index dd0a49e8f..61316a18f 100644 --- a/soh/macosx/Info.plist.in +++ b/soh/macosx/Info.plist.in @@ -33,5 +33,10 @@ public.app-category.games LSMinimumSystemVersion 10.15 + LSArchitecturePriority + + arm64 + x86_64 + diff --git a/soh/macosx/soh-macos.sh.in b/soh/macosx/soh-macos.sh.in index 0983f63b1..867d2395d 100755 --- a/soh/macosx/soh-macos.sh.in +++ b/soh/macosx/soh-macos.sh.in @@ -248,11 +248,6 @@ fi cd "$SNAME" -arch_name="$(uname -m)" -launch_arch="arm64" -if [ "${arch_name}" = "x86_64" ] && [ "$(sysctl -in sysctl.proc_translated)" != "1" ]; then - launch_arch="x86_64" -fi +"$RESPATH"/soh-macos -arch -${launch_arch} "$RESPATH"/soh-macos exit diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index a4e40cd6e..e6e0aa561 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -1267,18 +1267,15 @@ void PatchToTMedallions() { } } -void RegisterToTMedallionsFromItem() { - GameInteractor::Instance->RegisterGameHook([](GetItemEntry _unused) { - if (!CVarGetInteger("gToTMedallionsColors", 0) && gPlayState->sceneNum != SCENE_TEMPLE_OF_TIME) { +void RegisterToTMedallions() { + GameInteractor::Instance->RegisterGameHook([](GetItemEntry _unused) { + if (!CVarGetInteger("gToTMedallionsColors", 0) || !gPlayState || gPlayState->sceneNum != SCENE_TEMPLE_OF_TIME) { return; } PatchToTMedallions(); }); -} - -void RegisterToTMedallionsFromScene() { - GameInteractor::Instance->RegisterGameHook([](int16_t sceneNum) { - if (!CVarGetInteger("gToTMedallionsColors", 0) && gPlayState->sceneNum != SCENE_TEMPLE_OF_TIME) { + GameInteractor::Instance->RegisterGameHook([](int16_t sceneNum) { + if (!CVarGetInteger("gToTMedallionsColors", 0) || sceneNum != SCENE_TEMPLE_OF_TIME) { return; } PatchToTMedallions(); @@ -1317,7 +1314,6 @@ void InitMods() { RegisterRandomizerSheikSpawn(); RegisterBossSouls(); RegisterRandomizedEnemySizes(); - RegisterToTMedallionsFromItem(); - RegisterToTMedallionsFromScene(); + RegisterToTMedallions(); NameTag_RegisterHooks(); } diff --git a/soh/src/overlays/gamestates/ovl_select/z_select.c b/soh/src/overlays/gamestates/ovl_select/z_select.c index fe273dd41..dbc7e1796 100644 --- a/soh/src/overlays/gamestates/ovl_select/z_select.c +++ b/soh/src/overlays/gamestates/ovl_select/z_select.c @@ -355,10 +355,11 @@ static BetterSceneSelectEntry sBetterScenes[] = { { "From Zelda", "Von Zelda", "Depuis Zelda", ENTR_CASTLE_COURTYARD_GUARDS_DAY_1, 0 }, { "Zeldas Courtyard", "Zeldas Burghof", "Depuis la Cour de Zelda", ENTR_CASTLE_COURTYARD_ZELDA_0, 0 }, }}, - { "13:Lon Lon Ranch", "13:Lon Lon-Farm", "13:Ranch Lon Lon", Select_LoadGame, 4, { + { "13:Lon Lon Ranch", "13:Lon Lon-Farm", "13:Ranch Lon Lon", Select_LoadGame, 5, { { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_LON_LON_RANCH_0, 0 }, { "From Ranch House", "Vom Farmhaus", "Depuis la Maison du Ranch", ENTR_LON_LON_RANCH_4, 0 }, { "From Stables", "Vom Stall", "Depuis l'Etable", ENTR_LON_LON_RANCH_5, 0 }, + { "From Back Tower", "Vom Silo", "Depuis Silo du Ranch", ENTR_LON_LON_RANCH_10, 0 }, { "Epona Song Cutscene", "Eponas Song Cutscene", "Cinematique du Chant d'Epona", ENTR_LON_LON_RANCH_1, 0 }, }}, { "14:Lon Lon Ranch Buildings", "14:Lon Lon-Farm Gebaeude", "14:Batiments du Ranch Lon Lon", Select_LoadGame, 3, {