Skip to content

Commit 28fd65e

Browse files
committed
Fix Silver HUD color offset
Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>
1 parent 5efa553 commit 28fd65e

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

MarathonRecomp/patches/misc_patches.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ void ContextualHUD_Init()
1919
PPC_STORE_U32(0x82036BE8, 0x3F800000); // Shadow
2020
PPC_STORE_U32(0x82036BFC, 0x3F800000); // E-123 Omega
2121
PPC_STORE_U32(0x82036C00, 0x3F800000); // Rouge
22-
PPC_STORE_U32(0x82036BEC, 0x3F800000); // Silver
23-
PPC_STORE_U32(0x82036BF4, 0x3F800000); // Amy
24-
PPC_STORE_U32(0x82036C04, 0x3F800000); // Blaze
22+
PPC_STORE_U32(0x82036BEC, 0x40000000); // Silver
23+
PPC_STORE_U32(0x82036BF4, 0x40000000); // Amy
24+
PPC_STORE_U32(0x82036C04, 0x40000000); // Blaze
2525

2626
Contextual_init = true;
2727
}
@@ -46,7 +46,6 @@ void ContextualHUD_LIFE_BER_ANIME_1(PPCRegister& str, PPCRegister& hud)
4646
Omega,
4747
Rouge,
4848
Blaze
49-
5049
};
5150

5251
auto base = g_memory.base;
@@ -73,7 +72,6 @@ void ContextualHUD_LIFE_BER_ANIME_1(PPCRegister& str, PPCRegister& hud)
7372
}
7473

7574
str.u32 = chr_in;
76-
printf("chr_in:%x\n", chr_in);
7775
}
7876

7977
void ContextualHUD_RING_1(PPCRegister& index, PPCRegister& hud)

MarathonRecompLib/config/Marathon.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,19 @@ registers = ["r4"]
132132
[[midasm_hook]]
133133
name = "ContextualHUD_LIFE_BER_ANIME_1"
134134
address = 0x824D8044
135-
registers = ["r5","r31"]
135+
registers = ["r5", "r31"]
136136

137137
[[midasm_hook]]
138138
name = "ContextualHUD_LIFE_BER_ANIME_1"
139139
address = 0x824D80A0
140-
registers = ["r5","r31"]
140+
registers = ["r5", "r31"]
141141

142142
[[midasm_hook]]
143143
name = "ContextualHUD_LIFE_BER_ANIME_1"
144144
address = 0x824D8F2C
145-
registers = ["r5","r31"]
145+
registers = ["r5", "r31"]
146146

147147
[[midasm_hook]]
148148
name = "ContextualHUD_RING_1"
149149
address = 0x824DEB38
150-
registers = ["r5","r31"]
150+
registers = ["r5", "r31"]

0 commit comments

Comments
 (0)