diff --git a/recomp/patches-v143.txt b/recomp/patches-v143.txt index 16189169..498af650 100644 --- a/recomp/patches-v143.txt +++ b/recomp/patches-v143.txt @@ -47,6 +47,18 @@ site cloth main 28bc98 9400546a @page:x8 bd400104 1e240842 1e240863 9400546a # # s1 is set again by the fmov two instructions on. site bounce main 562a64 bd402920 bd402920 bd403921 1e210800 # ldr s0, [x9, #0x28]; ldr s1, [x9, #0x38]; fmul s0, s0, s1 +# Fades (MacNativeGames game_patches_v143.c patch_fade_increment, upstream 3e9e7f67): the distance/LOD mesh fades and +# the pre-actor fades add trunc(2.1 * ratio) to a counter each frame: 2 at 30 fps, 1 at 60, 0 above about 63.5 fps +# (ratio below 1 / 2.1), where a fade stops and its object stays translucent or invisible until a slower frame moves +# it on. Each site floors the increment at 1 without the flags: clz is 32 only for 0, so increment += clz >> 5. The +# scratch register is one the next instruction writes (w10 at 0x0a7ac4: ldrb w10; w11 at the pre-actor sites: add +# w11), or at 0x95dd24 a temporary the function no longer reads (add, strb, return). +set fade TOTK_HIGHFPS_FIX 1 +site fade main 0a7ac4 1e380008 1e380008 5ac0110a 53057d4a 0b0a0108 # fcvtzs w8, s0; clz w10, w8; lsr w10, w10, #5; add w8, w8, w10 +site fade main 95dd24 1e380008 1e380008 5ac0110a 53057d4a 0b0a0108 # the same, second mesh fade +site fade main 6155e4 1e38000a 1e38000a 5ac0114b 53057d6b 0b0b014a # fcvtzs w10, s0; clz w11, w10; lsr w11, w11, #5; add w10, w10, w11 +site fade main 615660 1e38000a 1e38000a 5ac0114b 53057d6b 0b0b014a # the same, second pre-actor fade path + # Output size (upstream game_patches_v143.c patch_output_res; runtime/resolution.c switches the set on). The swapchain # size nnMain writes comes from page +48; the display configuration's canvas (+0x10) and active output (+0x508) from # page +32, and the configuration goes to page +40. x9 is dead at the publication point. diff --git a/runtime/ui_text.c b/runtime/ui_text.c index f93107ae..519fcbe3 100644 --- a/runtime/ui_text.c +++ b/runtime/ui_text.c @@ -74,8 +74,8 @@ static const char *const text_en[UI_TEXT_COUNT] = { [UI_MENU_REALTIME_DESC] = "Steps the game by real time, so a slow frame does not slow the game down.", [UI_MENU_CLOTH_REALTIME] = "Cloth on the clock", [UI_MENU_CLOTH_REALTIME_DESC] = "Steps cloth and hair by real time as well.", - [UI_MENU_HIGHFPS_FIX] = "High frame rate physics fix", - [UI_MENU_HIGHFPS_FIX_DESC] = "Corrects physics that misbehave above 30 frames per second.", + [UI_MENU_HIGHFPS_FIX] = "High frame rate fixes", + [UI_MENU_HIGHFPS_FIX_DESC] = "Corrects physics that misbehave above 30 frames per second, and objects that stay see-through or invisible above 60.", [UI_MENU_GAME_LANG] = "Game language", [UI_MENU_GAME_LANG_DESC] = "Language of the game's text and voices.", [UI_MENU_GAME_LANG_AUTO] = "Automatic", [UI_MENU_OPERATION_MODE] = "Console mode", @@ -291,8 +291,8 @@ static const char *const text_ru[UI_TEXT_COUNT] = { [UI_MENU_REALTIME_DESC] = "Игра идёт по реальному времени, медленный кадр её не замедляет.", [UI_MENU_CLOTH_REALTIME] = "Ткань по часам", [UI_MENU_CLOTH_REALTIME_DESC] = "Ткань и волосы тоже идут по реальному времени.", - [UI_MENU_HIGHFPS_FIX] = "Исправление физики на высоком FPS", - [UI_MENU_HIGHFPS_FIX_DESC] = "Исправляет физику, которая ломается при частоте выше 30 кадров в секунду.", + [UI_MENU_HIGHFPS_FIX] = "Исправления для высокого FPS", + [UI_MENU_HIGHFPS_FIX_DESC] = "Исправляет физику, которая ломается при частоте выше 30 кадров в секунду, и объекты, которые выше 60 остаются полупрозрачными или невидимыми.", [UI_MENU_GAME_LANG] = "Язык игры", [UI_MENU_GAME_LANG_DESC] = "Язык текста и озвучки игры.", [UI_MENU_GAME_LANG_AUTO] = "Автоматически", [UI_MENU_OPERATION_MODE] = "Режим консоли",