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

Fixes #21

Browse Source
This commit is contained in:
Miguel Terol Espino 2023-06-15 18:46:04 +02:00 committed by AdAstra-LD
parent 7b9d9ac8ce
commit 5b2e2e44e6
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DS_Map/Main Window.cs
View File

@ -8693,7 +8693,6 @@ namespace DSPRE {
string[] trNames = RomInfo.GetSimpleTrainerNames();
bool error = currentIndex >= trNames.Length;
currentTrainerFile = new TrainerFile(
new TrainerProperties(
(ushort)trainerComboBox.SelectedIndex,
@ -8702,7 +8701,6 @@ namespace DSPRE {
new FileStream(RomInfo.gameDirs[DirNames.trainerParty].unpackedDir + suffix, FileMode.Open),
error ? TrainerFile.NAME_NOT_FOUND : trNames[currentIndex]
);
RefreshTrainerPartyGUI();
RefreshTrainerPropertiesGUI();

18
DS_Map/ROMFiles/TrainerFile.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections;
using System.IO;
using System.Windows.Forms;
using static DSPRE.DSUtils.ARM9;
namespace DSPRE.ROMFiles {
public class PartyPokemon : RomFile {
@ -36,6 +37,15 @@ namespace DSPRE.ROMFiles {
this.heldItem = heldItem;
this.moves = moves;
}
public PartyPokemon(ushort difficulty, ushort Level, ushort pokeNum, ushort? heldItem = null, ushort[] moves = null)
{
// Simply adding a new constructor for Diamond and Pearl since they dont have ball seal config
pokeID = pokeNum;
level = Level;
this.difficulty = difficulty;
this.heldItem = heldItem;
this.moves = moves;
}
public PartyPokemon(ushort difficulty, ushort Level, ushort pokeNum, ushort formNum, ushort ballSealConfig, ushort? heldItem = null, ushort[] moves = null) :
this(difficulty, Level, pokeNum, ballSealConfig, heldItem, moves) {
@ -57,7 +67,8 @@ namespace DSPRE.ROMFiles {
writer.Write(move);
}
}
writer.Write(ballSeals);
if(RomInfo.gameFamily == RomInfo.gFamEnum.HGSS || RomInfo.gameFamily == RomInfo.gFamEnum.Plat)
writer.Write(ballSeals); // Diamond and Pearl apparently dont save ball capsule data in enemy trainer pokedata!!!
}
return newData.ToArray();
}
@ -224,8 +235,11 @@ namespace DSPRE.ROMFiles {
moves[m] = (ushort)(val == ushort.MaxValue ? 0 : val);
}
}
if (RomInfo.gameFamily == RomInfo.gFamEnum.HGSS || RomInfo.gameFamily == RomInfo.gFamEnum.Plat)
content[i] = new PartyPokemon(unknown1, level, pokemon, form_no, reader.ReadUInt16(), heldItem, moves);
else
content[i] = new PartyPokemon(unknown1, level, pokemon, form_no, heldItem, moves); // Diamond and Pearl apparently dont save ball capsule data in enemy trainer pokedata!!!
content[i] = new PartyPokemon(unknown1, level, pokemon, form_no, reader.ReadUInt16(), heldItem, moves);
}
for (int i = endval; i < maxPoke; i++) {
content[i] = new PartyPokemon();