Restore HUD Colors Code

Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>

Author: IsaacMarovitz

MarathonRecomp/patches/misc_patches.cpp

@@ -1,7 +1,88 @@
+#include <api/Marathon.h>
+#include <user/config.h>
 #include <user/achievement_manager.h>
 
 // TODO (Hyper): implement achievements menu.
 void AchievementManagerUnlockMidAsmHook(PPCRegister& id)
 {
     AchievementManager::Unlock(id.u32);
 }
+
+void ContextualHUD_Init()
+{
+    auto base = g_memory.base;
+
+    static bool Contextual_init;
+    if (Contextual_init) return;
+
+    PPC_STORE_U32(0x82036BE4, 0x0); // Sonic
+    PPC_STORE_U32(0x82036BE8, 0x3F800000); // Shadow
+    PPC_STORE_U32(0x82036BFC, 0x3F800000); // E-123 Omega
+    PPC_STORE_U32(0x82036C00, 0x3F800000); // Rouge
+    PPC_STORE_U32(0x82036BEC, 0x3F800000); // Silver
+    PPC_STORE_U32(0x82036BF4, 0x3F800000); // Amy
+    PPC_STORE_U32(0x82036C04, 0x3F800000); // Blaze
+
+    Contextual_init = true;
+}
+
+void ContextualHUD_LIFE_BER_ANIME_1(PPCRegister& str, PPCRegister& hud)
+{
+    if (!Config::RestoreHUDColors) {
+        return;
+    }
+
+    ContextualHUD_Init();
+
+    enum {
+        Sonic,
+        Shadow,
+        Silver,
+
+        Tails,
+        Amy,
+        Knuckles,
+
+        Omega,
+        Rouge,
+        Blaze
+
+    };
+
+    auto base = g_memory.base;
+    auto chr_index = PPC_LOAD_U32(hud.u32 + 0x78);
+
+    uint32_t chr_in = str.u32;
+
+    switch (chr_index) {
+        case Sonic:
+        case Tails:
+        case Knuckles:
+            chr_in = 0x82036778; // sonic_in
+            break;
+        case Shadow:
+        case Omega:
+        case Rouge:
+            chr_in = 0x8203676C; // shadow_in
+            break;
+        case Silver:
+        case Amy:
+        case Blaze:
+            chr_in = 0x82036760; // silver_in
+            break;
+    }
+
+    str.u32 = chr_in;
+    printf("chr_in:%x\n", chr_in);
+}
+
+void ContextualHUD_RING_1(PPCRegister& index, PPCRegister& hud)
+{
+    if (!Config::RestoreHUDColors) {
+        return;
+    }
+
+    auto base = g_memory.base;
+    auto chr_index = PPC_LOAD_U32(hud.u32 + 0x78);
+    index.u32 = chr_index;
+}

MarathonRecomp/user/config_def.h

@@ -81,5 +81,6 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, HUDToggleKey, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, SkipIntroLogos, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, UseOfficialTitleOnTitleBar, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, DisableLowResolutionFontOnCustomUI, false);
+CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreHUDColors, false);
 
 CONFIG_DEFINE("Update", time_t, LastChecked, 0);

MarathonRecompLib/config/Marathon.toml

@@ -128,3 +128,23 @@ registers = ["r10", "r24"]
 name = "RenderCsdCastMidAsmHook"
 address = 0x828C8FFC
 registers = ["r4"]
+
+[[midasm_hook]]
+name = "ContextualHUD_LIFE_BER_ANIME_1"
+address = 0x824D8044
+registers = ["r5","r31"]
+
+[[midasm_hook]]
+name = "ContextualHUD_LIFE_BER_ANIME_1"
+address = 0x824D80A0
+registers = ["r5","r31"]
+
+[[midasm_hook]]
+name = "ContextualHUD_LIFE_BER_ANIME_1"
+address = 0x824D8F2C
+registers = ["r5","r31"]
+
+[[midasm_hook]]
+name = "ContextualHUD_RING_1"
+address = 0x824DEB38
+registers = ["r5","r31"]