From ca127b0e5b09bddda9f6a5d03deeb6924be9cd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 12 Feb 2026 01:35:57 +0100
Subject: [PATCH] More fixes, more gamescreen button fixes

---
 Core/MIPS/ARM64/Arm64RegCache.cpp |  1 +
 UI/GameScreen.cpp                 | 13 ++++++++++---
 UI/MainScreen.cpp                 | 13 +------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Core/MIPS/ARM64/Arm64RegCache.cpp b/Core/MIPS/ARM64/Arm64RegCache.cpp
index d83d7c1755..1904cc2286 100644
--- a/Core/MIPS/ARM64/Arm64RegCache.cpp
+++ b/Core/MIPS/ARM64/Arm64RegCache.cpp
@@ -22,6 +22,7 @@
 #include "Core/MemMap.h"
 #include "Core/MIPS/ARM64/Arm64RegCache.h"
 #include "Core/MIPS/ARM64/Arm64Jit.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/Reporting.h"
 #include "Common/Arm64Emitter.h"
 
diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp
index 004191fce2..744343d67a 100644
--- a/UI/GameScreen.cpp
+++ b/UI/GameScreen.cpp
@@ -202,7 +202,6 @@ void GameScreen::CreateContentViews(UI::ViewGroup *parent) {
 	}
 	mainGameInfo->SetSpacing(3.0f);
 
-	GameDBInfo dbInfo;
 	std::vector<GameDBInfo> dbInfos;
 	const bool inGameDB = g_gameDB.GetGameInfos(info_->id_version, &dbInfos);
 
@@ -482,10 +481,18 @@ void GameScreen::OnCreateConfig(UI::EventParams &e) {
 }
 
 std::string_view GameScreen::GetTitle() const {
-	if (knownFlags_ & GameInfoFlags::PARAM_SFO) {
-		titleCache_ = info_->GetDBTitle();
+	if (!info_->Ready(GameInfoFlags::PARAM_SFO)) {
+		return "";
 	}
 
+	// Don't look up homebrew in the database, sometimes they take IDs from games.
+	if (info_->fileType != IdentifiedFileType::PSP_PBP_DIRECTORY) {
+		if (knownFlags_ & GameInfoFlags::PARAM_SFO) {
+			titleCache_ = info_->GetDBTitle();
+		}
+	} else {
+		titleCache_ = info_->GetTitle();
+	}
 	return titleCache_;
 }
 
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index d2823aaa9a..a754d77577 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -416,7 +416,6 @@ void GameButton::Draw(UIContext &dc) {
 		if (overlayColor) {
 			dc.FillRect(Drawable(overlayColor), overlayBounds);
 		}
-		return;
 	}
 
 	char discNumInfo[8];
@@ -428,17 +427,7 @@ void GameButton::Draw(UIContext &dc) {
 	dc.Draw()->Flush();
 	dc.RebindTexture();
 	dc.SetFontStyle(dc.GetTheme().uiFont);
-	if (gridStyle_ && ginfo->fileType == IdentifiedFileType::PPSSPP_GE_DUMP) {
-		// Super simple drawing for GE dumps (no icon, just the filename).
-		dc.PushScissor(bounds_);
-		const std::string currentTitle = ginfo->GetTitle();
-		dc.SetFontStyle(*GetTextStyle(dc, UI::TextSize::Small));
-		dc.DrawText(title_, bounds_.x + 4.0f, bounds_.centerY(), style.fgColor, ALIGN_VCENTER | ALIGN_LEFT);
-		dc.SetFontStyle(dc.GetTheme().uiFont);
-		title_ = currentTitle;
-		dc.Draw()->Flush();
-		dc.PopScissor();
-	} else if (!gridStyle_) {
+	if (!gridStyle_) {
 		float tw, th;
 		dc.Draw()->Flush();
 		dc.PushScissor(bounds_);