From 7e6511db7739269319e0c54a62073c12ba9c3677 Mon Sep 17 00:00:00 2001 From: DeaTh-G Date: Mon, 24 Feb 2025 19:45:23 +0100 Subject: [PATCH] Fix Windmill Isle Act 1 (Night) chip 'hint' not being shown --- UnleashedRecomp/patches/misc_patches.cpp | 18 ++++++++++++++++++ UnleashedRecompLib/config/SWA.toml | 6 ------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/UnleashedRecomp/patches/misc_patches.cpp b/UnleashedRecomp/patches/misc_patches.cpp index f9365ec0..b78ee02b 100644 --- a/UnleashedRecomp/patches/misc_patches.cpp +++ b/UnleashedRecomp/patches/misc_patches.cpp @@ -108,3 +108,21 @@ PPC_FUNC(sub_82586698) __imp__sub_82586698(ctx, base); } + +// Disable only certain hints coming from invisible hints +PPC_FUNC_IMPL(__imp__sub_82736E80); +PPC_FUNC(sub_82736E80) +{ + // GroupID parameter text + auto* groupId = (const char*)g_memory.Translate(PPC_LOAD_U32(ctx.r3.u32 + 256)); + + // WhiteIsland_ACT1_001 (Windmill Isle Act 1 Night, Start) + // Your friend went off that way, Sonic. + // Quick, let's go after him! + if (!Config::Hints && strcmp(groupId, "WhiteIsland_ACT1_001")) + { + return; + } + + __imp__sub_82736E80(ctx, base); +} diff --git a/UnleashedRecompLib/config/SWA.toml b/UnleashedRecompLib/config/SWA.toml index 6f5781cc..c31327af 100644 --- a/UnleashedRecompLib/config/SWA.toml +++ b/UnleashedRecompLib/config/SWA.toml @@ -106,12 +106,6 @@ jump_address = 0x82468EE0 name = "ResetScoreOnRestartMidAsmHook" address = 0x82304374 -# Disable hint volumes -[[midasm_hook]] -name = "DisableHintsMidAsmHook" -address = 0x827A2504 -jump_address_on_true = 0x827A251C - # Disable hint rings [[midasm_hook]] name = "DisableHintsMidAsmHook"