From 24141bfbaa94849da7c8643a3ee4209570f5bae7 Mon Sep 17 00:00:00 2001
From: Crementif <26669564+Crementif@users.noreply.github.com>
Date: Thu, 30 Dec 2021 18:53:56 +0100
Subject: [PATCH] [BotW] Fix location being stretched and unfix cutscene

Apparently lowering the FPS doesn't fix the opening cutscene completely while setting the FPS to 30FPS does. Needs a more extensive fix, so for now I can remove some of the limitations.
---
 src/BreathOfTheWild/Graphics/patch_GUIAspectRatio.asm | 4 ++--
 src/BreathOfTheWild/Mods/FPS++/patch_Cutscene.asm     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/BreathOfTheWild/Graphics/patch_GUIAspectRatio.asm b/src/BreathOfTheWild/Graphics/patch_GUIAspectRatio.asm
index 2756a80f..ef407e4c 100644
--- a/src/BreathOfTheWild/Graphics/patch_GUIAspectRatio.asm
+++ b/src/BreathOfTheWild/Graphics/patch_GUIAspectRatio.asm
@@ -656,8 +656,8 @@ beq scalePaneNormal
 b exitScale
 scaleMainScreenLocationTextPanes:
 addi r5, r31, 0x80
-lis r10, str_N_In_00@ha
-addi r10, r10, str_N_In_00@l
+lis r10, str_Pa_LocationName_00@ha
+addi r10, r10, str_Pa_LocationName_00@l
 bla _compareString
 beq scalePaneNormal
 b exitScale
diff --git a/src/BreathOfTheWild/Mods/FPS++/patch_Cutscene.asm b/src/BreathOfTheWild/Mods/FPS++/patch_Cutscene.asm
index ac0b4998..788ee733 100644
--- a/src/BreathOfTheWild/Mods/FPS++/patch_Cutscene.asm
+++ b/src/BreathOfTheWild/Mods/FPS++/patch_Cutscene.asm
@@ -83,8 +83,8 @@ beq _setCutscene30FPSLimit
 cmpwi r22, 3340 ; demo334_0 ; Perhaps the crash at the end of vah ruta
 beq _setCutscene30FPSLimit
 
-cmpwi r22, 1020 ; demo102_0 ; Start Game - Bright light waking up link on blackscreen
-beq _setCutscene30FPSLimit
+# cmpwi r22, 1020 ; demo102_0 ; Start Game - Bright light waking up link on blackscreen
+# beq _setCutscene30FPSLimit
 cmpwi r22, 1690 ; demo169_0 ; Start Game - Zelda waking up link dialogue on blackscreen
 beq _setCutscene30FPSLimit