Skip to content

Commit

Permalink
Version 1.1fix
Browse files Browse the repository at this point in the history 
Fixed patches not being applied to the right dol file
Restoring original dol file before applying any patches
  • Loading branch information
@UltiNaruto
UltiNaruto committed Aug 4, 2020
1 parent 51abe01 commit 79c0cd4
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 29 deletions.
2 changes: 2 additions & 0 deletions MP1_Trilogy_Rando_Generator/Form1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,8 @@ private void button4_Click(object sender, EventArgs e)
}
}

File.Copy(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", ".\\tmp\\wii\\DATA\\files\\main.dol", true);

NodManager.ExtractISO(".\\tmp\\"+ gc_iso_filename, true);

File.Delete(".\\tmp\\" + gc_iso_filename);
Expand Down
60 changes: 31 additions & 29 deletions MP1_Trilogy_Rando_Generator/Patcher/Patches.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,68 +4,70 @@ namespace MP1_Trilogy_Rando_Generator.Patcher
{
class Patches
{
static String MP1_Dol_Path = ".\\tmp\\wii\\DATA\\files\\main.dol";

public static void SetStartingArea(Enums.SpawnRoom spawnRoom)
{
UInt16 MLVL_H = (UInt16)((spawnRoom.MLVL & 0xFFFF0000) >> 16);
UInt16 MLVL_L = (UInt16)(spawnRoom.MLVL & 0xFFFF);
if (MLVL_L > 0x7FFF)
MLVL_H++;

new Patcher.DOL_Patch<UInt16>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801098EC + 2, MLVL_H).Apply();
new Patcher.DOL_Patch<UInt16>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801098EC + 14, MLVL_L).Apply();
new Patcher.DOL_Patch<UInt16>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x800CD1F8 + 18, (UInt16)spawnRoom.MREA_ID).Apply();
new Patcher.DOL_Patch<UInt16>(MP1_Dol_Path, 0x801098EC + 2, MLVL_H).Apply();
new Patcher.DOL_Patch<UInt16>(MP1_Dol_Path, 0x801098EC + 14, MLVL_L).Apply();
new Patcher.DOL_Patch<UInt16>(MP1_Dol_Path, 0x800CD1F8 + 18, (UInt16)spawnRoom.MREA_ID).Apply();

// Set default MLVL in case of crash or save corruption
/*new Patcher.DOL_Patch<UInt16>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x8010D278 + 2, MLVL_H).Apply();
new Patcher.DOL_Patch<UInt16>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x8010D278 + 14, MLVL_L).Apply();
new Patcher.DOL_Patch<UInt16>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x8010D27C + 2, (UInt16)spawnRoom.PakIndex).Apply();*/
/*new Patcher.DOL_Patch<UInt16>(MP1_Dol_Path, 0x8010D278 + 2, MLVL_H).Apply();
new Patcher.DOL_Patch<UInt16>(MP1_Dol_Path, 0x8010D278 + 14, MLVL_L).Apply();
new Patcher.DOL_Patch<UInt16>(MP1_Dol_Path, 0x8010D27C + 2, (UInt16)spawnRoom.PakIndex).Apply();*/
}

public static void ApplySkipCutscenePatch(bool enabled)
{
if (enabled)
{
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FC70C, (UInt32)0x38600001).Apply(); // li r3, 1
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FC70C + 4, (UInt32)0x4E800020).Apply(); // blr
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FC70C, (UInt32)0x38600001).Apply(); // li r3, 1
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FC70C + 4, (UInt32)0x4E800020).Apply(); // blr
}
else
{
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FC70C, (UInt32)0x9421FFE0).Apply(); // stwu r1, local_20(r1)
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FC70C + 4, (UInt32)0x7C0802A6).Apply(); // mfspr r0, LR
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FC70C, (UInt32)0x9421FFE0).Apply(); // stwu r1, local_20(r1)
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FC70C + 4, (UInt32)0x7C0802A6).Apply(); // mfspr r0, LR
}
}

public static void ApplyHeatProtectionPatch(String type)
{
if (type == "Any Suit")
{
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48, (UInt32)0x7C0800D0).Apply(); // neg r0, r8
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48 + 4, (UInt32)0x7C004078).Apply(); // andc r0, r0, r8
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48 + 8, (UInt32)0x7CC63850).Apply(); // subf r6, r6, r7
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48 + 12, (UInt32)0x7CC60034).Apply(); // cntlzw r6, r6
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48 + 16, (UInt32)0x54070FFE).Apply(); // rlwinm r7, r0, 0x1, 0x1f, 0x1f
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48, (UInt32)0x7C0800D0).Apply(); // neg r0, r8
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48 + 4, (UInt32)0x7C004078).Apply(); // andc r0, r0, r8
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48 + 8, (UInt32)0x7CC63850).Apply(); // subf r6, r6, r7
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48 + 12, (UInt32)0x7CC60034).Apply(); // cntlzw r6, r6
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48 + 16, (UInt32)0x54070FFE).Apply(); // rlwinm r7, r0, 0x1, 0x1f, 0x1f
}
if (type == "Varia Only")
{
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48, (UInt32)0x7CC63850).Apply(); // subf r6, r6, r7
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48 + 4, (UInt32)0x80F000E0).Apply(); // cntlzw r6, r6
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48 + 8, (UInt32)0x80E600E0).Apply(); // lwz r7, 0xe0(r6)
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48 + 12, (UInt32)0x60000000).Apply(); // nop
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801FEBCC + 0x48 + 16, (UInt32)0x60000000).Apply(); // nop
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48, (UInt32)0x7CC63850).Apply(); // subf r6, r6, r7
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48 + 4, (UInt32)0x80F000E0).Apply(); // cntlzw r6, r6
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48 + 8, (UInt32)0x80E600E0).Apply(); // lwz r7, 0xe0(r6)
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48 + 12, (UInt32)0x60000000).Apply(); // nop
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801FEBCC + 0x48 + 16, (UInt32)0x60000000).Apply(); // nop
}
}

public static void ApplyScanDashPatch(bool enabled)
{
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801932FC + 0x38, (UInt32)(enabled ? 0x42800018 : 0x41820010)).Apply();
new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x80194AF0 + 0x70, (UInt32)(enabled ? 0x4280001C : 0x4082001C)).Apply();
//new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x8019377C + 0x2BC, (UInt32)(enabled ? 0x60000000 : 0x2C060002)).Apply();
//new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x8019377C + 0x4A8, (UInt32)(enabled ? 0x42800128 : 0x41820128)).Apply();
//new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x8019377C + 0x4B4, (UInt32)(enabled ? 0x4280035C : 0x4082035C)).Apply();
//new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801941C4 + 0x59C, (UInt32)(enabled ? 0x4280000C : 0x4182000C)).Apply();
//new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x8019377C + 0x300, (UInt32)(enabled ? 0x60000000 : 0x2C060002)).Apply();
//new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x8019377C + 0x328, (UInt32)(enabled ? 0x60000000 : 0x4082000C)).Apply();
//new Patcher.DOL_Patch<UInt32>(".\\tmp\\wii\\DATA\\files\\rs5mp1_p.dol", 0x801941C4 + 0xA0, (UInt32)(enabled ? 0x4280000C : 0x4182000C)).Apply();
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801932FC + 0x38, (UInt32)(enabled ? 0x42800018 : 0x41820010)).Apply();
new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x80194AF0 + 0x70, (UInt32)(enabled ? 0x4280001C : 0x4082001C)).Apply();
//new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x8019377C + 0x2BC, (UInt32)(enabled ? 0x60000000 : 0x2C060002)).Apply();
//new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x8019377C + 0x4A8, (UInt32)(enabled ? 0x42800128 : 0x41820128)).Apply();
//new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x8019377C + 0x4B4, (UInt32)(enabled ? 0x4280035C : 0x4082035C)).Apply();
//new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801941C4 + 0x59C, (UInt32)(enabled ? 0x4280000C : 0x4182000C)).Apply();
//new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x8019377C + 0x300, (UInt32)(enabled ? 0x60000000 : 0x2C060002)).Apply();
//new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x8019377C + 0x328, (UInt32)(enabled ? 0x60000000 : 0x4082000C)).Apply();
//new Patcher.DOL_Patch<UInt32>(MP1_Dol_Path, 0x801941C4 + 0xA0, (UInt32)(enabled ? 0x4280000C : 0x4182000C)).Apply();
// 804D3FA8 804D3FB0
}
}
Expand Down

0 comments on commit 79c0cd4

Please sign in to comment.