Retropex/dolphin
1
0
Fork 0
mirror of https://github.com/Retropex/dolphin.git synced 2025-05-12 19:30:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gandrayda fix mp3 standalone NTSC

Browse Source
This commit is contained in:
vyuuui 2022-09-17 15:40:15 -07:00
parent 539582b3c0
commit 02b668b045
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/PrimeHack/Mods/FpsControls.cpp
View File

@ -1901,6 +1901,8 @@ void FpsControls::init_mod_mp3_standalone(Region region) {
// Steps over bounds checking on the reticle // Steps over bounds checking on the reticle
add_code_change(0x80017290, 0x48000120); add_code_change(0x80017290, 0x48000120);
const int wiimote_shake_override_idx = PowerPC::RegisterVmcall(wiimote_shake_override);
add_code_change(0x800a8f40, gen_vmcall(wiimote_shake_override_idx, 0));
} else if (region == Region::NTSC_J) { } else if (region == Region::NTSC_J) {
add_code_change(0x80081018, 0xec010072); add_code_change(0x80081018, 0xec010072);
add_code_change(0x80153ed4, 0x60000000); add_code_change(0x80153ed4, 0x60000000);

34
Source/Core/Core/PrimeHack/Mods/STRGPatch.cpp
View File

@ -28,10 +28,20 @@ u32 bsearch_strg_table(std::string const& key, u32 strg_header) {
return bsearch_left; return bsearch_left;
} }
void patch_strg_entry_mp3(u32 rgn) { void patch_strg_entry_mp3(u32 vers) {
u32 strg_header = GPR(31), key_ptr = GPR(4); u32 strg_header = GPR(31), key_ptr = GPR(4);
u32 patched_table_addr = rgn == 0 ? 0x80676c00 : 0x8067a400; u32 patched_table_addr = 0;
switch (vers) {
case 0:
patched_table_addr = 0x80676c00;
case 1:
patched_table_addr = 0x8067a400;
case 2:
patched_table_addr = 0x80684800;
default:
break;
}
std::string key = readin_str(key_ptr); std::string key = readin_str(key_ptr);
if (key == "ShakeOffGandrayda") { if (key == "ShakeOffGandrayda") {
u32 bsearch_result = bsearch_strg_table(key, strg_header); u32 bsearch_result = bsearch_strg_table(key, strg_header);
@ -54,21 +64,20 @@ void STRGPatch::run_mod(Game game, Region region) {
case Game::PRIME_1_GCN_R2: case Game::PRIME_1_GCN_R2:
case Game::PRIME_2: case Game::PRIME_2:
case Game::PRIME_2_GCN: case Game::PRIME_2_GCN:
case Game::PRIME_3_STANDALONE:
break; break;
case Game::PRIME_3_STANDALONE:
case Game::PRIME_3: case Game::PRIME_3:
run_mod_mp3(region); run_mod_mp3();
break; break;
default: default:
break; break;
} }
} }
void STRGPatch::run_mod_mp3(Region region) { void STRGPatch::run_mod_mp3() {
u32 addr = region == Region::NTSC_U ? 0x80676c00 : 0x8067a400;
char str[] = "&just=center;Mash Jump [&image=0x5FC17B1F30BAA7AE;] to shake off Gandrayda!"; char str[] = "&just=center;Mash Jump [&image=0x5FC17B1F30BAA7AE;] to shake off Gandrayda!";
for (size_t i = 0; i < sizeof(str); i++) { for (size_t i = 0; i < sizeof(str); i++) {
write8(str[i], addr + i); write8(str[i], replace_string_addr + i);
} }
} }
@ -80,13 +89,22 @@ bool STRGPatch::init_mod(Game game, Region region) {
case Game::PRIME_1_GCN_R2: case Game::PRIME_1_GCN_R2:
case Game::PRIME_2: case Game::PRIME_2:
case Game::PRIME_2_GCN: case Game::PRIME_2_GCN:
case Game::PRIME_3_STANDALONE:
break; break;
case Game::PRIME_3_STANDALONE: {
int vmc_id = PowerPC::RegisterVmcall(patch_strg_entry_mp3);
if (region == Region::NTSC_U) {
replace_string_addr = 0x80684800;
add_code_change(0x803cdd64, gen_vmcall(vmc_id, 2));
}
break;
}
case Game::PRIME_3: { case Game::PRIME_3: {
int vmc_id = PowerPC::RegisterVmcall(patch_strg_entry_mp3); int vmc_id = PowerPC::RegisterVmcall(patch_strg_entry_mp3);
if (region == Region::NTSC_U) { if (region == Region::NTSC_U) {
replace_string_addr = 0x80676c00;
add_code_change(0x803cc3f4, gen_vmcall(vmc_id, 0)); add_code_change(0x803cc3f4, gen_vmcall(vmc_id, 0));
} else if (region == Region::PAL) { } else if (region == Region::PAL) {
replace_string_addr = 0x8067a400;
add_code_change(0x803cbb10, gen_vmcall(vmc_id, 1)); add_code_change(0x803cbb10, gen_vmcall(vmc_id, 1));
} }
break; break;

4
Source/Core/Core/PrimeHack/Mods/STRGPatch.h
View File

@ -12,7 +12,9 @@ public:
void on_state_change(ModState old_state) override {} void on_state_change(ModState old_state) override {}
private: private:
void run_mod_mp3(Region region); void run_mod_mp3();
u32 replace_string_addr;
}; };
} }