Leahnaya/pk3DS
1
0
Fork 0
mirror of https://github.com/kwsch/pk3DS.git synced 2026-10-01 21:36:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc stragglers from previous commit

Browse Source
This commit is contained in:
Kurt
2024-06-02 22:17:57 -05:00
parent a4dde6cf1b
commit fb53aa62d0
5 changed files with 25 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pk3DS.Core/CTR/BLZ.cs
View File

@@ -209,7 +209,7 @@ private static BLZResult BLZ_Decode(byte[] data)
while (raw < raw_end)
{
if ((mask = (int)((uint)mask >> BLZ_SHIFT)) == 0)
if ((mask >>>= BLZ_SHIFT) == 0)
{
if (pak == pak_end)
break;
@@ -232,7 +232,7 @@ private static BLZResult BLZ_Decode(byte[] data)
int pos = pak_buffer[pak++] << 8;
pos |= pak_buffer[pak++];
len = (int)((uint)pos >> 12) + BLZ_THRESHOLD + 1;
len = (pos >>> 12) + BLZ_THRESHOLD + 1;
if (raw + len > raw_end)
{
Console.Write(", WARNING: wrong decoded length!");
@@ -346,7 +346,7 @@ private byte[] BLZ_Code(byte[] raw_buffer, int raw_len, int best)
while (raw < raw_end)
{
SetProgressPosition(raw);
if ((mask = (int)((uint)mask >> BLZ_SHIFT)) == 0)
if ((mask >>>= BLZ_SHIFT) == 0)
{
pak_buffer[flg = pak++] = 0;
mask = BLZ_MASK;
@@ -407,7 +407,7 @@ private byte[] BLZ_Code(byte[] raw_buffer, int raw_len, int best)
while (mask > 0 && mask != 1)
{
mask = (int)((uint)mask >> BLZ_SHIFT);
mask >>>= BLZ_SHIFT;
pak_buffer[flg] = (byte)(pak_buffer[flg] << 1);
}

22
pk3DS.Core/CTR/RomFS.cs
View File

@@ -547,22 +547,14 @@ internal static void CalcRomfsSize(Romfs_MetaData MetaData)
for (int i = 0; i < 4; i++)
{
MetaData.InfoHeader.Sections[i].Offset = Pos;
uint size = 0;
switch (i)
uint size = i switch
{
case 0:
size = MetaData.M_DirHashTableEntry * 4;
break;
case 1:
size = MetaData.M_DirTableLen;
break;
case 2:
size = MetaData.M_FileHashTableEntry * 4;
break;
case 3:
size = MetaData.M_FileTableLen;
break;
}
0 => MetaData.M_DirHashTableEntry * 4,
1 => MetaData.M_DirTableLen,
2 => MetaData.M_FileHashTableEntry * 4,
3 => MetaData.M_FileTableLen,
_ => 0
};
MetaData.InfoHeader.Sections[i].Size = size;
Pos += size;
}

30
pk3DS.Core/Game/GameConfig.cs
View File

@@ -32,28 +32,16 @@ public class GameConfig
public GameConfig(int fileCount)
{
GameVersion game = GameVersion.Invalid;
switch (fileCount)
GameVersion game = fileCount switch
{
case FILECOUNT_XY:
game = GameVersion.XY;
break;
case FILECOUNT_ORASDEMO:
game = GameVersion.ORASDEMO;
break;
case FILECOUNT_ORAS:
game = GameVersion.ORAS;
break;
case FILECOUNT_SMDEMO:
game = GameVersion.SMDEMO;
break;
case FILECOUNT_SM:
game = GameVersion.SM;
break;
case FILECOUNT_USUM:
game = GameVersion.USUM;
break;
}
FILECOUNT_XY => GameVersion.XY,
FILECOUNT_ORASDEMO => GameVersion.ORASDEMO,
FILECOUNT_ORAS => GameVersion.ORAS,
FILECOUNT_SMDEMO => GameVersion.SMDEMO,
FILECOUNT_SM => GameVersion.SM,
FILECOUNT_USUM => GameVersion.USUM,
_ => GameVersion.Invalid,
};
if (game == GameVersion.Invalid)
return;

11
pk3DS.Core/Structures/Gen7/EncounterTrade7.cs
View File

@@ -25,13 +25,10 @@ public int String1
public int[] IVs
{
get
{
return
[
(sbyte) Data[0x6], (sbyte) Data[0x7], (sbyte) Data[0x8], (sbyte) Data[0x9], (sbyte) Data[0xA], (sbyte) Data[0xB],
];
}
get =>
[
(sbyte) Data[0x6], (sbyte) Data[0x7], (sbyte) Data[0x8], (sbyte) Data[0x9], (sbyte) Data[0xA], (sbyte) Data[0xB],
];
set
{
if (value.Length != 6)

2
pk3DS.WinForms/Tools/Scripts.cs
View File

@@ -107,7 +107,7 @@ internal static uint[] QuickDecompress(byte[] data, int count)
internal static byte[] CompressScript(byte[] data)
{
if (data.Length % 4 != 0) // Bad Input
throw new ArgumentException(nameof(data));
throw new ArgumentException(null, nameof(data));
using var mn = new MemoryStream();
using var bw = new BinaryWriter(mn);
int pos = 0;