Skip to content

Commit

Permalink
Updated and merged RestoreDashing PR
Browse files Browse the repository at this point in the history
  • Loading branch information
@SirMangler
SirMangler committed Dec 25, 2020
1 parent 49ca7b9 commit 03396b6
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 37 deletions.
1 change: 0 additions & 1 deletion Source/Core/Core/PrimeHack/Mods/FpsControls.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "Core/PrimeHack/PrimeUtils.h"

#pragma optimize("", off)
namespace prime {
namespace {
const std::array<int, 4> prime_one_beams = {0, 2, 1, 3};
Expand Down
73 changes: 37 additions & 36 deletions Source/Core/Core/PrimeHack/Mods/RestoreDashing.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace prime {
class RestoreDashing : public PrimeMod {
public:
void run_mod(Game game, Region region) override {}
void init_mod(Game game, Region region) override {
bool init_mod(Game game, Region region) override {
// d0210014 d0010010 4b -> pattern to search for CPlayer::FinishSidewaysDash() for Prime 2 GC
// d0210024 d0010020 4b -> pattern to search for CPlayer::FinishSidewaysDash() for Prime 2 and 3 Wii

Expand All @@ -17,121 +17,122 @@ namespace prime {
case Game::PRIME_1:
if (region == Region::NTSC_U) {
// remove scan visor check
code_changes.emplace_back(0x80193334, 0x48000018);
add_code_change(0x80193334, 0x48000018);
// restore dashing speed
code_changes.emplace_back(0x80194b60, 0x4800001c);
add_code_change(0x80194b60, 0x4800001c);
// stop dash when done dashing
code_changes.emplace_back(0x80192cc0, 0x801f037c); // CPlayer + 0x37c
add_code_change(0x80192cc0, 0x801f037c); // CPlayer + 0x37c
}
else if (region == Region::PAL) {
// remove scan visor check
code_changes.emplace_back(0x801935cc, 0x48000018);
add_code_change(0x801935cc, 0x48000018);
// restore dashing speed
code_changes.emplace_back(0x80194df8, 0x4800001c);
add_code_change(0x80194df8, 0x4800001c);
// stop dash when done dashing
code_changes.emplace_back(0x80192f58, 0x801f037c); // CPlayer + 0x37c
add_code_change(0x80192f58, 0x801f037c); // CPlayer + 0x37c
}
else { // region == Region::NTSC-J
// remove scan visor check
code_changes.emplace_back(0x80193eb4, 0x48000018);
add_code_change(0x80193eb4, 0x48000018);
// restore dashing speed
code_changes.emplace_back(0x801956e0, 0x4800001c);
add_code_change(0x801956e0, 0x4800001c);
// stop dash when done dashing
code_changes.emplace_back(0x80193840, 0x801f037c); // CPlayer + 0x37c
add_code_change(0x80193840, 0x801f037c); // CPlayer + 0x37c
}
break;
case Game::PRIME_1_GCN:
if (region == Region::NTSC_U) {
if (version == 2) {
// remove scan visor check
code_changes.emplace_back(0x802888d0, 0x48000018);
add_code_change(0x802888d0, 0x48000018);
}
}
else if (region == Region::NTSC_J) {
// remove scan visor check
code_changes.emplace_back(0x802770e4, 0x48000018);
add_code_change(0x802770e4, 0x48000018);
}
else if (region == Region::PAL) {
// remove scan visor check
code_changes.emplace_back(0x80275328, 0x48000018);
add_code_change(0x80275328, 0x48000018);
}
break;
case Game::PRIME_2:
if (region == Region::NTSC_U) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x8015d690, 0x60000000);
add_code_change(0x8015d690, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x8015cd1c, 0x881e0574); // CPlayer + 0x574 as u8
add_code_change(0x8015cd1c, 0x881e0574); // CPlayer + 0x574 as u8
}
else if (region == Region::NTSC_J) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x8015cc58, 0x60000000);
add_code_change(0x8015cc58, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x8015c2e4, 0x881e0574); // CPlayer + 0x574 as u8
add_code_change(0x8015c2e4, 0x881e0574); // CPlayer + 0x574 as u8
}
else if (region == Region::PAL) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x8015ee08, 0x60000000);
add_code_change(0x8015ee08, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x8015e494, 0x881e0574); // CPlayer + 0x574 as u8
add_code_change(0x8015e494, 0x881e0574); // CPlayer + 0x574 as u8
}
break;
case Game::PRIME_2_GCN:
if (region == Region::NTSC_U) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x8018961c, 0x60000000);
add_code_change(0x8018961c, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x80189d6c, 0x881e0588); // CPlayer + 0x588 as u8
add_code_change(0x80189d6c, 0x881e0588); // CPlayer + 0x588 as u8
}
else if (region == Region::NTSC_J) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x8018b130, 0x60000000);
add_code_change(0x8018b130, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x8018b884, 0x881e0588); // CPlayer + 0x588 as u8
add_code_change(0x8018b884, 0x881e0588); // CPlayer + 0x588 as u8
}
else if (region == Region::PAL) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x80189914, 0x60000000);
add_code_change(0x80189914, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x8018a068, 0x881e0588); // CPlayer + 0x588 as u8
add_code_change(0x8018a068, 0x881e0588); // CPlayer + 0x588 as u8
}
break;
case Game::PRIME_3:
if (region == Region::NTSC_U) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x80174c60, 0x60000000);
add_code_change(0x80174c60, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x8017432c, 0x881e06cc); // CPlayer + 0x6cc as u8
add_code_change(0x8017432c, 0x881e06cc); // CPlayer + 0x6cc as u8
}
else if (region == Region::PAL) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x801745ac, 0x60000000);
add_code_change(0x801745ac, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x80173c78, 0x881e06cc); // CPlayer + 0x6cc as u8
add_code_change(0x80173c78, 0x881e06cc); // CPlayer + 0x6cc as u8
}
break;
case Game::PRIME_3_STANDALONE:
if (region == Region::NTSC_U) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x80178d90, 0x60000000);
add_code_change(0x80178d90, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x8017845c, 0x881e06cc); // CPlayer + 0x6cc as u8
add_code_change(0x8017845c, 0x881e06cc); // CPlayer + 0x6cc as u8
}
else if (region == Region::NTSC_J) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x8017aa90, 0x60000000);
add_code_change(0x8017aa90, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x8017a15c, 0x881e06cc); // CPlayer + 0x6cc as u8
add_code_change(0x8017a15c, 0x881e06cc); // CPlayer + 0x6cc as u8
}
else if (region == Region::PAL) {
// don't slow down when finishing the dash
code_changes.emplace_back(0x80179884, 0x60000000);
add_code_change(0x80179884, 0x60000000);
// stop dash when done dashing
code_changes.emplace_back(0x80178F50, 0x881e06cc); // CPlayer + 0x6cc as u8
add_code_change(0x80178F50, 0x881e06cc); // CPlayer + 0x6cc as u8
}
break;
}
initialized = true;

return true;
}
};
}

0 comments on commit 03396b6

Please # to comment.