Skip to content

Commit 5cb98b5

Browse files
trigger-segfaulttrigger-segfault
committed
Updated to version 1.4.5.5 Beta
1 parent da74c69 commit 5cb98b5

19 files changed

+178
-53
lines changed

‎PokemonManager.v11.suo

13 KB
Binary file not shown.

‎PokemonManager/Items/ItemDatabase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ public static BitmapSource GetDecorationFullSizeImageFromID(byte id) {
281281
public static BitmapSource GetItemImageFromID(ushort id) {
282282
if (gen3ImageMap.ContainsKey(id))
283283
return gen3ImageMap[id];
284-
return null;
284+
return gen3ImageMap[0];
285285
}
286286

287287
public static DecorationData GetDecorationFromID(byte id) {
@@ -311,7 +311,7 @@ public static DecorationData GetDecorationTypeAt(int index, DecorationTypes deco
311311
public static ItemData GetItemFromID(ushort id) {
312312
if (gen3ItemMap.ContainsKey(id))
313313
return gen3ItemMap[id];
314-
return null;
314+
return gen3ItemMap[0];
315315
}
316316

317317
public static bool ContainsItemWithID(ushort id) {

‎PokemonManager/Items/ItemPocket.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class ItemPocketEventArgs : EventArgs {
2626
public class ItemPocket {
2727

2828
private static Dictionary<ItemTypes, Dictionary<int, int>> ItemOrders = new Dictionary<ItemTypes, Dictionary<int, int>>{
29-
{ItemTypes.PC, new Dictionary<int, int>{{3, 0}, {7, 1}, {2, 2}, {0, 3}, {1, 4}, {9, 5}, {4, 6}, {5, 7}, {6, 8}}},
30-
{ItemTypes.Items, new Dictionary<int, int>{{0, 0}, {1, 1}, {2, 2}, {3, 3}, {7, 4}, {9, 5}}},
31-
{ItemTypes.Misc, new Dictionary<int, int>{{7, 0}, {1, 1}, {9, 3}}}
29+
{ItemTypes.PC, new Dictionary<int, int>{{3, 0}, {7, 1}, {2, 2}, {0, 3}, {1, 4}, {9, 5}, {4, 6}, {5, 7}, {6, 8}, {90, 9}}},
30+
{ItemTypes.Items, new Dictionary<int, int>{{0, 0}, {1, 1}, {2, 2}, {3, 3}, {7, 4}, {9, 5}, {90, 6}}},
31+
{ItemTypes.Misc, new Dictionary<int, int>{{7, 0}, {1, 1}, {9, 3}, {90, 2}}}
3232
};
3333

3434
#region Members

‎PokemonManager/PokeManager.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,6 +2173,18 @@ public static void MoveAllSelectedPokemonTo(IPokePC pokePC, int box, int index)
21732173
}
21742174
}
21752175

2176+
public static bool CanSafelyPlaceHeldUnknownItem(IPokeContainer container) {
2177+
if (IsHoldingSingle) {
2178+
return holdPokemon.Pokemon.HeldItemID == 0 || holdPokemon.Pokemon.HeldItemData.ID != 0 || holdPokemon.Pokemon.GameSave == container.GameSave;
2179+
}
2180+
else if (IsHoldingSelection) {
2181+
foreach (PokemonLocation pokemon in selectedPokemon) {
2182+
if (pokemon.Pokemon.HeldItemID != 0 && pokemon.Pokemon.HeldItemData.ID == 0 && pokemon.Pokemon.GameSave != container.GameSave)
2183+
return false;
2184+
}
2185+
}
2186+
return true;
2187+
}
21762188
public static bool IsHoldingPokemon {
21772189
get { return holdPokemon != null; }
21782190
}
@@ -2208,6 +2220,9 @@ public static void PlaceSelection(IPokeContainer container, int index) {
22082220
container.PokePC.PlacePokemonInNextAvailableSlot(container is IPokeBox ? (int)((IPokeBox)container).BoxNumber : -1, index, pokemon.Pokemon);
22092221
pokemon.Pokemon.IsMoving = false;
22102222
}
2223+
for (int i = 0; i < selectedPokemon.Count; i++) {
2224+
selectedPokemon[i] = new PokemonLocation(selectedPokemon[i].Pokemon.PokemonFinder.Pokemon);
2225+
}
22112226
holdPokemon = null;
22122227
if (holdAdorner != null)
22132228
holdAdorner.DisableAdorner();

‎PokemonManager/PokemonStructures/ManagerPokePC.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public void InsertBox(int index) {
176176
};
177177
Random random = new Random((int)DateTime.Now.Ticks);
178178
byte wallpaper = possibilities[random.Next(possibilities.Length)];
179-
boxes.Insert(index, new ManagerPokeBox(this, (byte)boxes.Count, "BOX" + (boxes.Count + 1).ToString(), (PokeBoxWallpapers)wallpaper));
179+
InsertBox(index, new ManagerPokeBox(this, (byte)boxes.Count, "BOX" + (boxes.Count + 1).ToString(), (PokeBoxWallpapers)wallpaper));
180180
}
181181
public void InsertBox(int index, ManagerPokeBox box) {
182182
GameSave.IsChanged = true;

‎PokemonManager/PokemonStructures/PokemonSearch.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ public enum SortMethods {
2525
Level,
2626
Friendship,
2727
HatchCounter,
28+
Type,
29+
FirstType,
30+
SecondType,
31+
HiddenPowerType,
2832
HiddenPowerDamage,
2933
TotalStats,
3034
TotalIVs,
@@ -691,6 +695,12 @@ private long GetSortMethodValue(IPokemon pokemon) {
691695
case SortMethods.Level: return pokemon.Level;
692696
case SortMethods.Friendship: return (!pokemon.IsEgg ? pokemon.Friendship : 70);
693697
case SortMethods.HatchCounter: return (pokemon.IsEgg ? pokemon.Friendship : 0);
698+
case SortMethods.Type: return ((int)pokemon.PokemonData.Type2 > (int)pokemon.PokemonData.Type1 ?
699+
((int)pokemon.PokemonData.Type2 * 100 + (int)pokemon.PokemonData.Type1) :
700+
((int)pokemon.PokemonData.Type1 * 100 + (pokemon.PokemonData.HasTwoTypes ? (int)pokemon.PokemonData.Type2 : 0)));
701+
case SortMethods.FirstType: return ((int)pokemon.PokemonData.Type1 * 100) + (pokemon.PokemonData.HasTwoTypes ? (int)pokemon.PokemonData.Type2 : 0);
702+
case SortMethods.SecondType: return (pokemon.PokemonData.HasTwoTypes ? (int)pokemon.PokemonData.Type2 * 100 + (int)pokemon.PokemonData.Type1 : (int)pokemon.PokemonData.Type1 * 100);
703+
case SortMethods.HiddenPowerType: return (int)pokemon.HiddenPowerType;
694704
case SortMethods.HiddenPowerDamage: return pokemon.HiddenPowerDamage;
695705
case SortMethods.TotalStats: return ((int)pokemon.HP + pokemon.Attack + pokemon.Defense + pokemon.SpAttack + pokemon.SpDefense + pokemon.Speed);
696706
case SortMethods.TotalIVs: return ((int)pokemon.HPIV + pokemon.AttackIV + pokemon.DefenseIV + pokemon.SpAttackIV + pokemon.SpDefenseIV + pokemon.SpeedIV);

‎PokemonManager/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.4.5.3")]
55-
[assembly: AssemblyFileVersion("1.4.5.3")]
54+
[assembly: AssemblyVersion("1.4.5.5")]
55+
[assembly: AssemblyFileVersion("1.4.5.5")]
5656
[assembly: GuidAttribute("d527114e-3888-417f-807f-e08fef41029c")]
5757
[assembly: NeutralResourcesLanguageAttribute("en")]

‎PokemonManager/Windows/ComboBoxGameSaves.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,24 @@ public void RefreshGameSaves() {
8282
}
8383

8484
}
85-
public void ReloadGameSaves() {
85+
public void ReloadGameSaves(bool keepIndex = false) {
86+
int previousSelectedIndex = SelectedIndex;
87+
bool hasPreviousIndex = false;
8688
Items.Clear();
8789

8890
if (!DesignerProperties.GetIsInDesignMode(this)) {
8991
for (int i = -1; i < PokeManager.NumGameSaves; i++) {
9092
ComboBoxItem comboBoxItem = new ComboBoxItem();
9193
FillComboBoxItem(i, comboBoxItem);
9294
Items.Add(comboBoxItem);
95+
if (i + 1 == previousSelectedIndex)
96+
hasPreviousIndex = true;
9397
}
9498
}
95-
SelectedIndex = 0;
99+
if (keepIndex && hasPreviousIndex)
100+
SelectedIndex = previousSelectedIndex;
101+
else
102+
SelectedIndex = 0;
96103
}
97104
public void ResetGameSaveVisibility() {
98105
for (int i = -1; i < PokeManager.NumGameSaves; i++) {

‎PokemonManager/Windows/ComboBoxPCRows.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,24 @@ public void RefreshRows() {
4848
}
4949

5050
}
51-
public void ReloadRows() {
51+
public void ReloadRows(bool keepIndex = false) {
52+
int previousSelectedIndex = SelectedIndex;
53+
bool hasPreviousIndex = false;
5254
Items.Clear();
5355

5456
if (!DesignerProperties.GetIsInDesignMode(this)) {
5557
for (int i = 0; i < PokeManager.ManagerGameSave.NumPokePCRows; i++) {
5658
ComboBoxItem comboBoxItem = new ComboBoxItem();
5759
comboBoxItem.Content = PokeManager.ManagerGameSave.GetPokePCRow(i).Name;
5860
Items.Add(comboBoxItem);
61+
if (i == previousSelectedIndex)
62+
hasPreviousIndex = true;
5963
}
6064
}
61-
SelectedIndex = 0;
65+
if (keepIndex && hasPreviousIndex)
66+
SelectedIndex = previousSelectedIndex;
67+
else
68+
SelectedIndex = 0;
6269
}
6370
public void ResetRowVisibility() {
6471
for (int i = 0; i < PokeManager.ManagerGameSave.NumPokePCRows; i++) {

‎PokemonManager/Windows/EditBoxWindow.xaml.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ public partial class EditBoxWindow : Window {
7575
private string newWallpaperName;
7676
private bool newUsingCustomWallpaper;
7777
private int customWallpaperStartIndex;
78+
private bool silentEdit;
7879

79-
public EditBoxWindow(IPokeBox pokeBox) {
80+
public EditBoxWindow(IPokeBox pokeBox, bool silentEdit) {
8081
InitializeComponent();
8182
if (pokeBox is BoxPokeBox) {
8283
this.newName = ((BoxPokeBox)pokeBox).RealName;
@@ -88,6 +89,7 @@ public EditBoxWindow(IPokeBox pokeBox) {
8889
}
8990
this.buttonQuotes1.Content = "“";
9091
this.buttonQuotes2.Content = "”";
92+
this.silentEdit = silentEdit;
9193

9294
string[] wallpaperNames = null;
9395
if (pokeBox.GameType == GameTypes.Ruby || pokeBox.GameType == GameTypes.Sapphire)
@@ -168,7 +170,8 @@ private void OKClicked(object sender, RoutedEventArgs e) {
168170
ManagerPokeBox.UsingCustomWallpaper = newUsingCustomWallpaper;
169171
ManagerPokeBox.WallpaperName = newWallpaperName;
170172
}
171-
PokeManager.RefreshUI();
173+
if (!silentEdit)
174+
PokeManager.RefreshUI();
172175
DialogResult = true;
173176
}
174177

@@ -207,8 +210,8 @@ private void WriteCharacter(string character) {
207210
}
208211
}
209212

210-
public static bool? ShowDialog(Window owner, IPokeBox pokeBox) {
211-
EditBoxWindow window = new EditBoxWindow(pokeBox);
213+
public static bool? ShowDialog(Window owner, IPokeBox pokeBox, bool silentEdit = false) {
214+
EditBoxWindow window = new EditBoxWindow(pokeBox, silentEdit);
212215
window.Owner = owner;
213216
return window.ShowDialog();
214217
}

‎PokemonManager/Windows/ItemViewerTab.xaml.cs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -414,15 +414,19 @@ private bool HasSelection {
414414
}
415415

416416
private void OnContextMenuOpening(object sender, ContextMenuEventArgs e) {
417-
if (selectedItem != null) {
417+
if (selectedItem != null && selectedItem.ItemData.ID != 0) {
418418
if (HasSelection) {
419419
selectionIsImportant = -1;
420420
selectionMax = 0;
421421
bool roomInCollection = false;
422+
bool unknownItem = false;
422423
ItemTypes itemType = SelectedItems[0].ItemData.PocketType;
423424
foreach (Item item in SelectedItems) {
424425
selectionMax = Math.Max(selectionMax, (int)item.Count);
425-
if (item.ItemData.IsImportant) {
426+
if (item.ItemData.ID == 0) {
427+
unknownItem = true;
428+
}
429+
else if (item.ItemData.IsImportant) {
426430
if (selectionIsImportant == -1)
427431
selectionIsImportant = 1;
428432
else if (selectionIsImportant == 0)
@@ -445,12 +449,12 @@ private void OnContextMenuOpening(object sender, ContextMenuEventArgs e) {
445449
((MenuItem)contextMenu.Items[1]).Header = (pocket.PocketType == ItemTypes.PC ? "Withdraw All" : "Deposit All");
446450
((MenuItem)contextMenu.Items[2]).Header = (selectionIsImportant == 1 ? "Add to Collection" : "Send To");
447451

448-
((MenuItem)contextMenu.Items[0]).IsEnabled = selectionIsImportant == 0 && pocket.Inventory.ContainsPocket(ItemTypes.PC);
449-
((MenuItem)contextMenu.Items[1]).IsEnabled = selectionIsImportant == 0 && pocket.Inventory.ContainsPocket(ItemTypes.PC);
450-
((MenuItem)contextMenu.Items[2]).IsEnabled = itemType != ItemTypes.Unknown && (selectionIsImportant == 0 || (roomInCollection && selectionIsImportant == 1));
452+
((MenuItem)contextMenu.Items[0]).IsEnabled = !unknownItem && selectionIsImportant == 0 && pocket.Inventory.ContainsPocket(ItemTypes.PC);
453+
((MenuItem)contextMenu.Items[1]).IsEnabled = !unknownItem && selectionIsImportant == 0 && pocket.Inventory.ContainsPocket(ItemTypes.PC);
454+
((MenuItem)contextMenu.Items[2]).IsEnabled = !unknownItem && itemType != ItemTypes.Unknown && (selectionIsImportant == 0 || (roomInCollection && selectionIsImportant == 1));
451455
((MenuItem)contextMenu.Items[3]).IsEnabled = false;
452-
((MenuItem)contextMenu.Items[5]).IsEnabled = (selectionIsImportant == 0 || pocket.GameSave.GameIndex == -1);
453-
((MenuItem)contextMenu.Items[6]).IsEnabled = (selectionIsImportant == 0 || pocket.GameSave.GameIndex == -1);
456+
((MenuItem)contextMenu.Items[5]).IsEnabled = !unknownItem && (selectionIsImportant == 0 || pocket.GameSave.GameIndex == -1);
457+
((MenuItem)contextMenu.Items[6]).IsEnabled = !unknownItem && (selectionIsImportant == 0 || pocket.GameSave.GameIndex == -1);
454458
}
455459
else {
456460
((MenuItem)contextMenu.Items[0]).Header = (pocket.PocketType == ItemTypes.PC ? "Withdraw" : "Deposit");

‎PokemonManager/Windows/ManageBoxesWindow.xaml.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,10 @@ private void OnAddBox(object sender, RoutedEventArgs e) {
175175
}
176176
private void OnEditBox(object sender, RoutedEventArgs e) {
177177
if (selectedBox != null) {
178-
var result = EditBoxWindow.ShowDialog(this, selectedBox);
178+
var result = EditBoxWindow.ShowDialog(this, selectedBox, true);
179179
if (result.HasValue && result.Value) {
180180
((Label)((StackPanel)boxes[selectedIndex].Content).Children[1]).Content = selectedBox.Name;
181+
((Image)((Grid)((StackPanel)boxes[selectedIndex].Content).Children[0]).Children[0]).Source = selectedBox.WallpaperImage;
181182
pokeBoxControl.LoadBox(selectedBox, PokeManager.GetIndexOfGame(selectedBox.PokePC.GameSave));
182183
}
183184
}
@@ -242,6 +243,7 @@ private void OnAddRow(object sender, RoutedEventArgs e) {
242243
if (EditRowWindow.ShowDialog(this, null)) {
243244
comboBoxRows.ReloadRows();
244245
comboBoxRows.SelectedIndex = PokeManager.ManagerGameSave.NumPokePCRows - 1;
246+
buttonRemoveRow.IsEnabled = true;
245247
}
246248
}
247249

@@ -257,9 +259,9 @@ private void OnRemoveRow(object sender, RoutedEventArgs e) {
257259
PokeManager.ManagerGameSave.RemovePokePCRow(rowIndex);
258260
comboBoxRows.ReloadRows();
259261
buttonRemoveRow.IsEnabled = PokeManager.ManagerGameSave.NumPokePCRows > 1;
262+
buttonMoveRowUp.IsEnabled = rowIndex != 0;
263+
buttonMoveRowDown.IsEnabled = rowIndex + 1 < PokeManager.ManagerGameSave.NumPokePCRows;
260264
}
261-
buttonMoveRowDown.IsEnabled = rowIndex != 0;
262-
buttonMoveRowUp.IsEnabled = rowIndex + 1 < PokeManager.ManagerGameSave.NumPokePCRows;
263265
}
264266

265267
private void OnRowSelectionChanged(object sender, SelectionChangedEventArgs e) {

‎PokemonManager/Windows/PokeBoxControl.xaml.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ public void UnloadBox() {
360360
gridDaycare.Visibility = Visibility.Hidden;
361361
gridParty.Visibility = Visibility.Hidden;
362362
gridBox.Visibility = Visibility.Hidden;
363+
gridPurifier.Visibility = Visibility.Hidden;
363364

364365
rectEditBox.Opacity = 0;
365366
}
@@ -803,6 +804,11 @@ private void TryMovePokemon(PokeBoxTagStructure tag) {
803804
IPokemon pkm = tag.Control.pokeContainer[tag.BoxIndex];
804805
if (mode == PokeBoxControlModes.MovePokemon) {
805806
if (PokeManager.IsHoldingPokemon) {
807+
if (!PokeManager.CanSafelyPlaceHeldUnknownItem(tag.Control.pokeContainer)) {
808+
MessageBoxResult unknownItemResult = TriggerMessageBox.Show(Window.GetWindow(this), "A Pokémon that you are holding is holding an Unknown Item. Sending it to a different game may cause problems. Are you sure you want to place it?", "Unknown Item", MessageBoxButton.YesNo);
809+
if (unknownItemResult == MessageBoxResult.No)
810+
return;
811+
}
806812
if (!PokeManager.CanPlaceShadowPokemon(tag.Control.pokeContainer)) {
807813
TriggerMessageBox.Show(Window.GetWindow(this), "Cannot move Shadow Pokémon to a different game until they have been purified", "Can't Place");
808814
}
@@ -1303,6 +1309,8 @@ private void OnContextMenuReleaseAllClicked(object sender, RoutedEventArgs e) {
13031309
foreach (IPokemon pokemon in pokeContainer) {
13041310
if (pokemon.IsHoldingItem)
13051311
PokeManager.ManagerGameSave.Inventory.Items[pokemon.HeldItemData.PocketType].AddItem(pokemon.HeldItemID, 1);
1312+
if (PokeManager.IsPokemonSelected(pokemon))
1313+
PokeManager.UnselectPokemon(pokemon);
13061314
pokemon.PokeContainer.Remove(pokemon);
13071315
pokemon.IsReleased = true;
13081316
}
@@ -1381,6 +1389,8 @@ private void OnContextMenuReleaseClicked(object sender, RoutedEventArgs e) {
13811389
if (pokeContainer[selectedIndex].IsHoldingItem)
13821390
PokeManager.ManagerGameSave.Inventory.Items[pokeContainer[selectedIndex].HeldItemData.PocketType].AddItem(pokeContainer[selectedIndex].HeldItemID, 1);
13831391
// Be freeeeeeeeeeee (in the void forever)
1392+
if (PokeManager.IsPokemonSelected(pokeContainer[selectedIndex]))
1393+
PokeManager.UnselectPokemon(pokeContainer[selectedIndex]);
13841394
pokeContainer[selectedIndex].IsReleased = true;
13851395
pokeContainer[selectedIndex] = null;
13861396
PokeManager.RefreshUI();

‎PokemonManager/Windows/PokeManagerWindow.xaml.cs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,10 @@ private void OnWindowLoaded(object sender, RoutedEventArgs e) {
237237

238238
private void OnTick(object sender, EventArgs e) {
239239
// Don't do this while dialog windows are opened.
240-
if (this.OwnedWindows.Count == 0) {
240+
/*foreach (Window window in this.OwnedWindows) {
241+
if (
242+
}*/
243+
if (!System.Windows.Interop.ComponentDispatcher.IsThreadModal) {//this.OwnedWindows.Count == 0) {
241244
bool changesMade = false;
242245
List<IGameSave> changedGames = new List<IGameSave>();
243246
for (int i = 0; i < PokeManager.NumGameSaves; i++) {
@@ -253,7 +256,7 @@ private void OnTick(object sender, EventArgs e) {
253256
if (changesMade) {
254257
MessageBoxResult result = TriggerMessageBox.Show(this,
255258
"Changes have been made to one or more of the loaded save files outside of Trigger's PC, would you like to reload all saves?" +
256-
"\n\nWarning:If you have saved changes to the modified games since running the games you could end up with save conflicts if you do reload",
259+
"\n\nWarning: If you have saved changes to the modified games since running the games you could end up with save conflicts if you do reload",
257260
"Changes Detected", MessageBoxButton.YesNo
258261
);
259262
if (result == MessageBoxResult.Yes && PokeManager.IsChanged)
@@ -331,12 +334,13 @@ public void ReloadGames() {
331334
PokeManager.IsReloading = true;
332335
if (PokemonSearchWindow != null)
333336
PokemonSearchWindow.Close();
334-
pokemonViewer.Reload();
335337
loaded = false;
336-
comboBoxGameSaves.ReloadGameSaves();
337-
comboBoxGameSaves.SelectedGameIndex = PokeManager.Settings.IsValidDefaultGame ? PokeManager.Settings.DefaultGame : -1;
338+
comboBoxGameSaves.ReloadGameSaves(true);
339+
//comboBoxGameSaves.SelectedGameIndex = PokeManager.Settings.IsValidDefaultGame ? PokeManager.Settings.DefaultGame : -1;
338340
loaded = true;
339-
LoadGame(PokeManager.Settings.IsValidDefaultGame ? PokeManager.Settings.DefaultGame : -1);
341+
pokemonViewer.gameSave = comboBoxGameSaves.SelectedGameSave;
342+
pokemonViewer.ReloadGames();
343+
LoadGame(comboBoxGameSaves.SelectedGameIndex);
340344
PokeManager.IsReloading = false;
341345
}
342346
public void FinishActions() {
@@ -440,7 +444,7 @@ public void LoadGame(int gameIndex) {
440444
ErrorMessageBox.Show(ex);
441445
}
442446
else {
443-
MessageBoxResult result = TriggerMessageBox.Show(this, "An error occured while displaying this game save. The save may be corrupted or this may have been an error on Trigger's PC's end. Would you like to view the full exception?", "Load Error", MessageBoxButton.YesNo);
447+
MessageBoxResult result = TriggerMessageBox.Show(this, "An error occured while displaying this game save. The save may be corrupted or this may have been an error on Trigger's PC's end. Would you like to see the error?", "Load Error", MessageBoxButton.YesNo);
444448
if (result == MessageBoxResult.Yes)
445449
ErrorMessageBox.Show(ex);
446450
LoadGame(-1);

0 commit comments

Comments
 (0)