From 6cd991bc57bf184f51ba160d5786530062367f9b Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Tue, 10 Nov 2020 21:35:03 +1000
Subject: [PATCH] BIOS: Turn display on with fast boot

Fixes black screen in SaGa Frontier with fast boot disabled.
---
 src/core/bios.cpp     | 7 +++++--
 src/core/cpu_core.cpp | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/core/bios.cpp b/src/core/bios.cpp
index c079c6df4..9a86d3e73 100644
--- a/src/core/bios.cpp
+++ b/src/core/bios.cpp
@@ -189,8 +189,11 @@ bool PatchBIOSFastBoot(u8* image, u32 image_size, const Hash& hash)
 
   // Replace the shell entry point with a return back to the bootstrap.
   Log_InfoPrintf("Patching BIOS to skip intro");
-  PatchBIOS(image, image_size, 0x1FC18000, 0x03E00008);
-  PatchBIOS(image, image_size, 0x1FC18004, 0x00000000);
+  PatchBIOS(image, image_size, 0x1FC18000, 0x3C011F80); // lui at, 1f80
+  PatchBIOS(image, image_size, 0x1FC18004, 0x3C0A0300); // lui t2, 0300h
+  PatchBIOS(image, image_size, 0x1FC18008, 0xAC2A1814); // sw zero, 1814h(at)        ; turn the display on
+  PatchBIOS(image, image_size, 0x1FC1800C, 0x03E00008); // jr ra
+  PatchBIOS(image, image_size, 0x1FC18010, 0x00000000); // nop
   return true;
 }
 
diff --git a/src/core/cpu_core.cpp b/src/core/cpu_core.cpp
index a8e21e2f7..36d50063a 100644
--- a/src/core/cpu_core.cpp
+++ b/src/core/cpu_core.cpp
@@ -483,9 +483,9 @@ restart_instruction:
   const Instruction inst = g_state.current_instruction;
 
 #if 0
-  if (g_state.m_current_instruction_pc == 0x80010000)
+  if (g_state.current_instruction_pc == 0x80030000)
   {
-    LOG_EXECUTION = true;
+    TRACE_EXECUTION = true;
     __debugbreak();
   }
 #endif