Skip to content

Commit

Permalink
Implement dex patch for PAL
Browse files Browse the repository at this point in the history
  • Loading branch information
@bgsamm
bgsamm committed Feb 24, 2022
1 parent 6163c58 commit 305af28
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 39 deletions.
8 changes: 4 additions & 4 deletions PBRHex Setup/PBRHex Setup.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3141,15 +3141,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:PBRHex"
"ProductCode" = "8:{D34F3B6D-8EB0-46F0-8DAE-4F4D73C5BCAD}"
"PackageCode" = "8:{6C8B60FD-8849-47DA-ABB5-EE8281838E8A}"
"ProductCode" = "8:{66CD1B27-3839-4494-8DEB-68D9A034CF36}"
"PackageCode" = "8:{F9B1A83E-DE91-4220-9F21-1361BBCD14DD}"
"UpgradeCode" = "8:{D48A0932-A217-4C66-91CB-5BF77D165DBB}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.1"
"ProductVersion" = "8:1.1.2"
"Manufacturer" = "8:PBRHex"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down Expand Up @@ -3629,7 +3629,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FFFCF4EE22884D0D8F8380EC9CCA4EDD"
{
"SourcePath" = "8:"
"SourcePath" = "8:..\\PBRHex\\obj\\Release\\PBRHex.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5092C41DA61F4D24B1B9ADB71B4CCD91"
Expand Down
139 changes: 104 additions & 35 deletions PBRHex/PatchManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ static PatchManager() {
freeSpaceStart = 0x801d9474;
freeSpaceEnd = 0x801df670;
break;
case GameRegion.PAL:
freeSpaceStart = 0x801d4838;
freeSpaceEnd = 0x801daa30;
break;
default:
throw new NotImplementedException();
}
Expand All @@ -27,9 +31,8 @@ static PatchManager() {
if (DOL.ReadInstruction(addr) == 0)
break;
}
if (addr == freeSpaceEnd)
if (addr >= freeSpaceEnd)
throw new Exception("No free space available in main.dol");
//nextFreeAddr = addr;
NextFreeAddr = freeSpaceStart;
}

Expand Down Expand Up @@ -61,11 +64,16 @@ public static void ClearDebugFunctions() {
call2 = 0x80006278;
call3 = 0x8026da80;
break;
case GameRegion.PAL:
call1 = 0x800061b8;
call2 = 0x80006278;
call3 = 0x802690d8;
break;
default:
throw new NotImplementedException();
}
// check if already cleared
if (DOL.ReadInstruction(call1) == 0xDEADC0DE)
if (DOL.ReadInstruction(call1) == 0xfee15bad)
return;
// replace calls to debug functions w/ invalid
// instructions in case they *are* ever reached
Expand All @@ -82,24 +90,27 @@ public static void ClearDebugFunctions() {
}

public static void ExpandDOL() {
uint address;
switch (Program.ISORegion) {
case GameRegion.NTSCU:
address = 0x80275b5c;
break;
default:
throw new NotImplementedException();
// reserves 0xdf00 bytes of space
if (Program.ISORegion == GameRegion.NTSCU) {
DOL.WriteInstruction(0x80275b5c, "lis r5, -0x7f9c");
DOL.WriteInstruction(0x80275b5c + 0xc, "subi r5, r5, 0x6e50"); // 806391B0
DOL.AddSection(0x8062b2b0);
} else if (Program.ISORegion == GameRegion.PAL) {
DOL.WriteInstruction(0x802710e4, "lis r5, -0x7f9b");
DOL.WriteInstruction(0x802710e4 + 0xc, "addi r5, r5, 0xf50"); // 80650F50
DOL.AddSection(0x80643050);
} else {
throw new NotImplementedException();
}
DOL.WriteInstruction(address, "lis r5, -0x7f9c");
DOL.WriteInstruction(address + 0xc, "subi r5, r5, 0x6d50");
DOL.AddSection(0x8062b2b0);
DOL.Write();
}

public static void PatchDex() {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
break;
case GameRegion.PAL:
break;
default:
throw new NotImplementedException();
}
Expand Down Expand Up @@ -176,6 +187,22 @@ private static void ReassignEggIDs() {
formCmp1 = 0x8005d250; formCmp2 = 0x8005d52c; formCmp3 = 0x8005d85c;
formCmp4 = 0x8005dbe8; formCmp5 = 0x8005debc; formCmp6 = 0x8005e198;
break;
case GameRegion.PAL:
eggLoad1 = 0x8005ca90; eggLoad2 = 0x8005cbdc; eggLoad3 = 0x8005cd80;
eggLoad4 = 0x803db0b0; eggLoad5 = 0x803db0d8;
badEggLoad1 = 0x803db2c4; badEggLoad2 = 0x803db320;
eggCmp1 = 0x8005ca94; eggCmp2 = 0x8005cc0c; eggCmp3 = 0x8005cdb4;
eggCmp4 = 0x803d4a68; eggCmp5 = 0x803d4b64;
eggCompares = new uint[] {
0x803b0328, 0x803b0474, 0x803b0578, 0x803b065c, 0x803b28c8,
0x803b2990, 0x803b2a70, 0x803b5a08, 0x803b5b00, 0x803b7cc8,
0x803b98b0, 0x803b99ac, 0x803b9a18, 0x803b9af4, 0x803d2394,
0x803d256c, 0x803d29f4, 0x803d6160, 0x803d61f0, 0x803d6290,
0x803d6d1c, 0x803d6df0, 0x803dbe28, 0x803dce5c
};
formCmp1 = 0x8005b760; formCmp2 = 0x8005ba3c; formCmp3 = 0x8005bd6c;
formCmp4 = 0x8005c0f8; formCmp5 = 0x8005c3cc; formCmp6 = 0x8005c6a8;
break;
default:
throw new NotImplementedException();
}
Expand Down Expand Up @@ -229,6 +256,9 @@ private static void PatchCommon08() {
case GameRegion.NTSCU:
getKanjiCall = 0x8018125c;
break;
case GameRegion.PAL:
getKanjiCall = 0x8017c91c;
break;
default:
throw new NotImplementedException();
}
Expand Down Expand Up @@ -383,7 +413,12 @@ private static void Patch_GET_FORM_COUNT() {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
calls = new uint[] {
0x8005e8c0, 0x8005e5a0, 0x8005e718
0x8005e5a0, 0x8005e718, 0x8005e8c0
};
break;
case GameRegion.PAL:
calls = new uint[] {
0x8005cab0, 0x8005cc28, 0x8005cdd0
};
break;
default:
Expand All @@ -407,6 +442,10 @@ private static void Patch_IS_UNEVOLVED() {
call1 = 0x8008eef0;
call2 = 0x800da490;
break;
case GameRegion.PAL:
call1 = 0x8008d6c4;
call2 = 0x800d782c;
break;
default:
throw new NotImplementedException();
}
Expand Down Expand Up @@ -444,16 +483,21 @@ private static void Patch_IS_UNEVOLVED() {

private static void PatchCommon0D() {
uint addr1, addr2, addr3, addr4, addr5,
getEntryAddrFunc, unkFunc;
addr4Reg1, addr4Reg2, getEntryAddrFunc;
switch (Program.ISORegion) {
case GameRegion.NTSCU:
addr1 = 0x80182554;
addr2 = 0x8018390c;
addr3 = 0x801843a4;
addr4 = 0x8018502c;
addr5 = 0x8018726c;
addr1 = 0x80182554; addr2 = 0x8018390c; addr3 = 0x801843a4;
addr4 = 0x8018502c; addr5 = 0x8018726c;
addr4Reg1 = 25;
addr4Reg2 = 28;
getEntryAddrFunc = 0x8039d068;
unkFunc = 0x801c8774;
break;
case GameRegion.PAL:
addr1 = 0x8017dc58; addr2 = 0x8017f000; addr3 = 0x8017faa8;
addr4 = 0x801806f8; addr5 = 0x801828ec;
addr4Reg1 = 28;
addr4Reg2 = 31;
getEntryAddrFunc = 0x803994f0;
break;
default:
throw new NotImplementedException();
Expand Down Expand Up @@ -521,8 +565,8 @@ private static void PatchCommon0D() {
asm = new string[] {
"rlwinm r0, r23, 0x2, 0xe, 0x1d",
"lwzx r3, r26, r0",
$"bl 0x{unkFunc:x08}",
"lbz r5, 0xc(r3)", // form index
"lwz r3, 0x8(r3)",
"lbz r5, 0x10(r3)", // form index
"addi r3, r29, 0x74"
};
InsertAssembly(asm, addr2);
Expand All @@ -535,8 +579,8 @@ private static void PatchCommon0D() {
InsertAssembly(asm, addr3);
// add form index as param to call
asm = new string[] {
"lbz r5, 0xc(r25)",
"addi r3, r28, 0x74"
$"lbz r5, 0xc(r{addr4Reg1})",
$"addi r3, r{addr4Reg2}, 0x74"
};
InsertAssembly(asm, addr4);
// add form index as param to call
Expand Down Expand Up @@ -614,13 +658,15 @@ private static void Patch_GET_BODY_SPRITE_IDX() {
getEntryAddr;
switch (Program.ISORegion) {
case GameRegion.NTSCU:
call1 = 0x8005db9c;
call2 = 0x8005dbc0;
call3 = 0x8005de70;
call4 = 0x8005de94;
call5 = 0x8005e188;
call1 = 0x8005db9c; call2 = 0x8005dbc0; call3 = 0x8005de70;
call4 = 0x8005de94; call5 = 0x8005e188;
getEntryAddr = 0x8039a570;
break;
case GameRegion.PAL:
call1 = 0x8005c0ac; call2 = 0x8005c0d0; call3 = 0x8005c380;
call4 = 0x8005c3a4; call5 = 0x8005c698;
getEntryAddr = 0x803969f8;
break;
default:
throw new NotImplementedException();
}
Expand Down Expand Up @@ -752,13 +798,15 @@ private static void Patch_GET_FACE_SPRITE_IDX() {
getEntryAddr;
switch (Program.ISORegion) {
case GameRegion.NTSCU:
call1 = 0x8005d204;
call2 = 0x8005d228;
call3 = 0x8005d4e0;
call4 = 0x8005d504;
call5 = 0x8005d84c;
call1 = 0x8005d204; call2 = 0x8005d228; call3 = 0x8005d4e0;
call4 = 0x8005d504; call5 = 0x8005d84c;
getEntryAddr = 0x80395600;
break;
case GameRegion.PAL:
call1 = 0x8005b714; call2 = 0x8005b738; call3 = 0x8005b9f0;
call4 = 0x8005ba14; call5 = 0x8005bd5c;
getEntryAddr = 0x803908e8;
break;
default:
throw new NotImplementedException();
}
Expand Down Expand Up @@ -847,6 +895,11 @@ private static string[] COMMON_08_PTR {
"lis r3, -0x7f9e",
"addi r3, r3, 0x5184"
};
case GameRegion.PAL:
return new string[] {
"lis r3, -0x7f9c",
"subi r3, r3, 0x31bc"
};
default:
throw new NotImplementedException();
}
Expand All @@ -859,6 +912,8 @@ private static uint READ_MON_DATA {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
return 0x803de52c;
case GameRegion.PAL:
return 0x803daefc;
default:
throw new NotImplementedException();
}
Expand All @@ -870,6 +925,8 @@ private static uint GET_MON_DATA_ATTR {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
return 0x803e100c;
case GameRegion.PAL:
return 0x803dd9dc;
default:
throw new NotImplementedException();
}
Expand All @@ -881,6 +938,8 @@ private static uint GET_MON_ATTRS_IDX {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
return 0x803e0f0c;
case GameRegion.PAL:
return 0x803dd8dc;
default:
throw new NotImplementedException();
}
Expand All @@ -892,6 +951,8 @@ private static uint GET_MON_TYPE {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
return 0x80058f70;
case GameRegion.PAL:
return 0x80056f68;
default:
throw new NotImplementedException();
}
Expand All @@ -903,6 +964,8 @@ private static uint GET_PRIMARY_TYPE {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
return 0x8039653c;
case GameRegion.PAL:
return 0x803919c4;
default:
throw new NotImplementedException();
}
Expand All @@ -914,6 +977,8 @@ private static uint GET_SECONDARY_TYPE {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
return 0x80396570;
case GameRegion.PAL:
return 0x803919f8;
default:
throw new NotImplementedException();
}
Expand All @@ -925,6 +990,8 @@ private static uint GET_COLOR_GROUP {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
return 0x803969cc;
case GameRegion.PAL:
return 0x80391e54;
default:
throw new NotImplementedException();
}
Expand All @@ -936,6 +1003,8 @@ private static uint GET_FLIP_FLAG {
switch (Program.ISORegion) {
case GameRegion.NTSCU:
return 0x80396a04;
case GameRegion.PAL:
return 0x80391e8c;
default:
throw new NotImplementedException();
}
Expand Down

0 comments on commit 305af28

Please sign in to comment.