Leahnaya/DS-Pokemon-Rom-Editor
1
0
Fork 0
mirror of https://github.com/AdAstra-LD/DS-Pokemon-Rom-Editor.git synced 2026-05-12 06:54:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trainer Editor fix

Browse Source
This commit is contained in:
AdAstra-LD 2021-08-14 04:45:50 +02:00
parent 277830570d
commit c4f3d3d4a3
2 changed files with 86 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DS_Map/Main Window.cs
View File

@ -7654,8 +7654,8 @@ namespace DSPRE {
for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) {
partyGroupComponentList[i].Enabled = (partyCountUpDown.Value > i);
}
for (int i = 5; i >= partyCountUpDown.Value; i--) {
currentTrainerFile.party[i] = new PartyPokemon();
for (int i = Math.Min(currentTrainerFile.trp.partyCount, (int)partyCountUpDown.Value); i < TrainerFile.POKE_IN_PARTY; i++) {
currentTrainerFile.party[i] = new PartyPokemon(currentTrainerFile.trp.hasItems, currentTrainerFile.trp.hasMoves);
}
currentTrainerFile.trp.partyCount = (byte)partyCountUpDown.Value;

127
DS_Map/ROMFiles/TrainerFile.cs
View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Threading;
using System.Windows.Forms;
namespace DSPRE.ROMFiles {
public class PartyPokemon : RomFile {
@ -16,8 +15,10 @@ namespace DSPRE.ROMFiles {
#endregion
#region Constructor
public PartyPokemon() {
public PartyPokemon(bool hasItems = false, bool hasMoves = false) {
UpdateItemsAndMoves(hasItems, hasMoves);
}
public PartyPokemon(ushort Unk1, ushort Level, ushort Pokemon, ushort Unk2, ushort? heldItem = null, ushort[] moves = null) {
pokeID = Pokemon;
level = Level;
@ -46,6 +47,21 @@ namespace DSPRE.ROMFiles {
}
return newData.ToArray();
}
public void UpdateItemsAndMoves(bool hasItems = false, bool hasMoves = false) {
if (hasItems) {
this.heldItem = 0;
}
if (hasMoves) {
this.moves = new ushort[4];
}
}
public override string ToString() {
return CheckEmpty() ? "Empty" : this.pokeID + " Lv. " + this.level;
}
public bool CheckEmpty () {
return this is null || pokeID is null || level <= 0;
}
#endregion
}
@ -153,51 +169,55 @@ namespace DSPRE.ROMFiles {
public Party(bool readFirstByte, int maxPoke, Stream partyData, TrainerProperties traipr) {
using (BinaryReader reader = new BinaryReader(partyData)) {
this.trp = traipr;
if (readFirstByte) {
byte flags = reader.ReadByte();
trp.hasMoves = (flags & 1) != 0;
trp.hasItems = (flags & 2) != 0;
trp.partyCount = (byte)((flags & 28) >> 2);
}
int dividend = 8;
int nMoves = 4;
try {
this.trp = traipr;
if (readFirstByte) {
byte flags = reader.ReadByte();
if (trp.hasMoves) {
dividend += nMoves * sizeof(ushort);
}
if (trp.hasItems) {
dividend += sizeof(ushort);
}
int endval = Math.Min((int)(partyData.Length-1 / dividend), trp.partyCount);
this.content = new PartyPokemon[maxPoke];
for (int i = 0; i < endval; i++) {
ushort unknown1 = reader.ReadUInt16();
ushort level = reader.ReadUInt16();
ushort pokemon = reader.ReadUInt16();
ushort? heldItem = null;
ushort[] moves = null;
if (trp.hasItems) {
heldItem = reader.ReadUInt16();
trp.hasMoves = (flags & 1) != 0;
trp.hasItems = (flags & 2) != 0;
trp.partyCount = (byte)((flags & 28) >> 2);
}
int dividend = 8;
int nMoves = 4;
if (trp.hasMoves) {
moves = new ushort[4];
for (int m = 0; m < moves.Length; m++) {
ushort val = reader.ReadUInt16();
moves[m] = (ushort)(val == 0xFFFF ? 0 : val);
}
dividend += nMoves * sizeof(ushort);
}
if (trp.hasItems) {
dividend += sizeof(ushort);
}
content[i] = new PartyPokemon(unknown1, level, pokemon, reader.ReadUInt16(), heldItem, moves);
int endval = Math.Min((int)(partyData.Length - 1 / dividend), trp.partyCount);
this.content = new PartyPokemon[maxPoke];
for (int i = 0; i < endval; i++) {
ushort unknown1 = reader.ReadUInt16();
ushort level = reader.ReadUInt16();
ushort pokemon = reader.ReadUInt16();
ushort? heldItem = null;
ushort[] moves = null;
if (trp.hasItems) {
heldItem = reader.ReadUInt16();
}
if (trp.hasMoves) {
moves = new ushort[4];
for (int m = 0; m < moves.Length; m++) {
ushort val = reader.ReadUInt16();
moves[m] = (ushort)(val == 0xFFFF ? 0 : val);
}
}
content[i] = new PartyPokemon(unknown1, level, pokemon, reader.ReadUInt16(), heldItem, moves);
}
for (int i = endval; i < maxPoke; i++) {
content[i] = new PartyPokemon();
};
} catch (EndOfStreamException) {
MessageBox.Show("There was a problem reading the party data of this " + this.GetType().Name + ".", "Read Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
for (int i = endval; i < maxPoke; i++) {
content[i] = new PartyPokemon();
};
}
}
@ -209,6 +229,27 @@ namespace DSPRE.ROMFiles {
content[index] = value;
}
}
public override string ToString() {
if (this.content == null) {
return "Empty";
} else {
string buffer = "";
byte nonEmptyCtr = 0;
foreach(PartyPokemon p in this.content) {
if (!p.CheckEmpty()) {
nonEmptyCtr++;
}
}
buffer += nonEmptyCtr + " Poke ";
if (this.trp.hasMoves) {
buffer += ", moves ";
}
if (this.trp.hasItems) {
buffer += ", items ";
}
return buffer;
}
}
public override byte[] ToByteArray() {
MemoryStream newData = new MemoryStream();
using (BinaryWriter writer = new BinaryWriter(newData)) {
@ -218,7 +259,7 @@ namespace DSPRE.ROMFiles {
}
foreach (PartyPokemon poke in this.content) {
if (poke.pokeID != null && poke.level > 0) {
if (!poke.CheckEmpty()) {
writer.Write(poke.ToByteArray());
}
}