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

Fixed Meta Ridley Battle from Ishiiruka

Browse Source
This commit is contained in:
SirMangler 2020-08-23 16:50:04 +01:00
parent ffdb8ef397
commit 84993c6740
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,27 @@ namespace {
std::make_tuple<int, int>(2, 0x0d), std::make_tuple<int, int>(3, 0x0e)};
constexpr u32 ORBIT_STATE_GRAPPLE = 5;
bool is_string_ridley(u32 string_base) {
if (string_base == 0) {
return false;
}
const char ridley_str[] = "Meta Ridley";
constexpr auto str_len = sizeof(ridley_str) - 1;
int str_idx = 0;
while (read16(string_base) != 0 && str_idx < str_len) {
if (static_cast<char>(read16(string_base)) != ridley_str[str_idx]) {
return false;
}
str_idx++;
string_base += 2;
}
return str_idx == str_len && read16(string_base) == 0;
}
}
void FpsControls::run_mod(Game game, Region region) {
switch (game) {
case Game::MENU:
@ -272,8 +292,6 @@ void FpsControls::run_mod_mp3() {
}
}
//DevInfo("OBJ", "(state: %x) (addr: %x) (flags: %x) (editorid: %x)", state, obj, flags, read32(obj + 0xC));
if (LockCameraInPuzzles()) {
// if object is active
if (st > 0) {
@ -302,17 +320,17 @@ void FpsControls::run_mod_mp3() {
if (lock_camera)
return;
// This is VERY LIKELY not to be "boss address" as that would be dynamic (LOL)
// this is just something that always seems to match every ridley fight, but
// nowhere else (except defense drone). Never looked into it. Never will. This
// stupid game cannot be debugged, I just don't care about it anymore.
if (read8(mp3_static.cursor_dlg_enabled_address) ||
read64(mp3_static.boss_id_address) == mp3_static.boss_id) {
if (read64(mp3_static.boss_id_address) == mp3_static.boss_id && !fighting_ridley) {
u32 boss_name_str = read32(read32(read32(read32(mp3_static.boss_info_address) + 0x6e0) + 0x24) + 0x150);
bool is_boss_metaridley = is_string_ridley(boss_name_str);
// Compare based on boss name string, Meta Ridley only appears once
if (read8(mp3_static.cursor_dlg_enabled_address) || is_boss_metaridley) {
if (is_boss_metaridley && !fighting_ridley) {
fighting_ridley = true;
set_state(ModState::CODE_DISABLED);
}
mp3_handle_cursor(false);
return;
}
else {
if (fighting_ridley) {
@ -1077,8 +1095,7 @@ void FpsControls::init_mod_mp3(Region region) {
mp3_static.cursor_dlg_enabled_address = 0x805c8d77;
mp3_static.cursor_ptr_address = 0x8066fd08;
mp3_static.cursor_offset = 0xc54;
mp3_static.boss_id_address = 0x805c6f44;
mp3_static.boss_id = 0x000201cd442f0000;
mp3_static.boss_info_address = 0x8066e1ec;
mp3_static.lockon_address = 0x805c6db7;
mp3_static.gun_lag_toc_offset = 0x5ff0;
mp3_static.motion_vtf_address = 0x802e0dac;
@ -1103,8 +1120,7 @@ void FpsControls::init_mod_mp3(Region region) {
mp3_static.cursor_dlg_enabled_address = 0x805cc1d7;
mp3_static.cursor_ptr_address = 0x80673588;
mp3_static.cursor_offset = 0xd04;
mp3_static.boss_id_address = 0x805ca3c4;
mp3_static.boss_id = 0x00020230442f0000;
mp3_static.boss_info_address = 0x80671a6c;
mp3_static.lockon_address = 0x805ca237;
mp3_static.gun_lag_toc_offset = 0x6000;
mp3_static.motion_vtf_address = 0x802e0a88;

1
Source/Core/Core/PrimeHack/Mods/FpsControls.h
View File

@ -96,6 +96,7 @@ private:
u32 cursor_dlg_enabled_address;
u32 cursor_ptr_address;
u32 cursor_offset;
u32 boss_info_address;
u32 boss_id_address;
u64 boss_id;
u32 lockon_address;