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

Merge pull request #58 from Mixone-FinallyHere/encounter-editor-overhaul

Browse Source 
Overhaul DPPT Wild Editor
This commit is contained in:
Miguel 2025-08-05 19:59:07 +02:00 committed by GitHub
commit 52d90ca631
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 2276 additions and 2657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3580
DS_Map/Editors/WildEditorDPPt.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1266
DS_Map/Editors/WildEditorDPPt.cs
View File

File diff suppressed because it is too large Load Diff

79
DS_Map/Editors/WildEditorDPPt.resx
View File

@ -118,17 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pictureBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK
wjAURHOEHkFw1WWv5dalV/Eqnq0y+qeM32iaNgkUMvAIbfIzr2Lo6TlMzsMwE3vVLih9TNNCUxEtv4/j
i6YiKGAxuZ3eVBfBpfrlnqoivny+XhZUAhQX+VeuqAQoIrK23ONFsGaLbC0nnAOUACpiVd9h+R4Bwnkl
KYGNmASIlaxB7wBJAfxsJUV0FvBuq/wMN/lP5rOXALEyj57Xu7FaZTx6eKuInvF3WU06LM4V0fec56xd
nRcOexEtisEZrHbVvrB4jQjPYbXxcmHxLxHuYbWROmGxF2lSromJ2FbbUMQee46SEJ5ZnKbRL7JVWgAA
AABJRU5ErkJggg==
</value>
</data>
<data name="pictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAXCAYAAAARIY8tAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@ -152,7 +141,7 @@
5iyytD+jVgO/8BKARcqIvbMYewvh+HTWsnu37AAAAABJRU5ErkJggg==
</value>
</data>
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="pokeRadarLabel1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAASNJREFUSEu1
kSuyg0AURLOcSJbAEpCRWcKTkZHILAPJkpCRSBxJT6WpZtLzKSpPnGLmAufwOY3j+K/YoaNpmhW4czns
@ -163,7 +152,69 @@
rkJggg==
</value>
</data>
<data name="pictureBox7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="leafGreenLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAPVJREFUSEvt
kt0JwkAQhK8EwQYCPvkoWID12IJv1mEr1pYwYSeM62r+7g4CGfg4kru9+SKmPXs2k8Pp2BJ7VS8ovbxv
A1VFtPz8uvZUFUEBi0nzaHqKi+BS/XJPURFffm+fAyoBsov8K1dUAmQRmVru8SJYZ4ssLSecA5QAKmJV
32H5GgHCeWVUAhuRBIhKpqB3gFEB/Gw5RXQW8G6r/Aw3+U/ms5cAUZlHz+vdWK0yjh5eKqJn/F1WMx4W
zxXR95znrF09Lxz2IloUwRmsdtW6sHiKCM9htfF8YfEvEe5htZEyYbEXqVKuiURsq24oYo97tpKUOuY4
se+sYKF3AAAAAElFTkSuQmCC
</value>
</data>
<data name="fireRedLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAPdJREFUSEvt
kt0JwkAQhK8EHyxAEAQffbcBW7EFW7AEW7G2hAk7YVxX83c5CNzAx5Hc7c0XMdXUbCbH/a4h9qpcUPq+
XXqKimj563ruKCqCAhaTx+nQsboILtUv96wq4sub571HJUB2kX/likqALCJjyz1eBOtkkbnlhHOAEkBF
rOo7LF8iQDivDEpgI5IAUckY9A4wKICfLaeIzgLebZWf4Sb/yXz2EiAq8+h5vRurVcbRw3NF9Iy/y2qG
w+KpIvqe85y1q6eFw15EiyI4g9WuWhYWjxHhOaw2ni8s/iXCPaw2sk5Y7EWKlGsiEdsqG4rYY81WklIL
+xm6wwtjZsEAAAAASUVORK5CYII=
</value>
</data>
<data name="sapphireLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAPhJREFUSEvt
kssNwjAQRF0CBwpA4sSRBjjRAG3QAlfKoBVqSzTRTjQsC/k5liJ5pCcrsdfzgkg1NZvJbn9siL0qF5Se
b++eoiJafrq+OoqKoIDF5HB5dKwugkv1yz2rivjy+7PpUQmQXeRfuaISIIvI2HKPF8E6WWRuOeEcoARQ
Eav6DsuXCBDOK4MS2IgkQFQyBr0DDArgZ8sporOAd1vlZ7jJfzKfvQSIyjx6Xu/GapVx9PBcET3j77Ka
4bB4qoi+5zxn7epp4bAX0aIIzmC1q5aFxWNEeA6rjecLi3+JcA+rjawTFnuRIuWaSMS2yoYi9lizlaTU
AtJ1v1MDEgMTAAAAAElFTkSuQmCC
</value>
</data>
<data name="emeraldLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAPdJREFUSEvt
kjsOwjAQRH0ESkokKkoqzsEZ6LgCV6HnFJwt0UQ70bAs5OdYiuSRnqzEXs8LItXUbCa7474h9qpcUHp+
33qKimj56XntKCqCAhaTw+PSsboILtUv96wq4svvzatHJUB2kX/likqALCJjyz1eBOtkkbnlhHOAEkBF
rOo7LF8iQDivDEpgI5IAUckY9A4wKICfLaeIzgLebZWf4Sb/yXz2EiAq8+h5vRurVcbRw3NF9Iy/y2qG
w+KpIvqe85y1q6eFw15EiyI4g9WuWhYWjxHhOaw2ni8s/iXCPaw2sk5Y7EWKlGsiEdsqG4rYY81WklIL
2InTJyfj+T4AAAAASUVORK5CYII=
</value>
</data>
<data name="rubyLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vQAADr0BR/uQrQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAPBJREFUSEvtkkEK
wjAURHOEHkFw1WWv5dalV/Eqnq0y+qeM32iaNgkUMvAIbfIzr2Lo6TlMzsMwE3vVLih9TNNCUxEtv4/j
i6YiKGAxuZ3eVBfBpfrlnqoivny+XhZUAhQX+VeuqAQoIrK23ONFsGaLbC0nnAOUACpiVd9h+R4Bwnkl
KYGNmASIlaxB7wBJAfxsJUV0FvBuq/wMN/lP5rOXALEyj57Xu7FaZTx6eKuInvF3WU06LM4V0fec56xd
nRcOexEtisEZrHbVvrB4jQjPYbXxcmHxLxHuYbWROmGxF2lSromJ2FbbUMQee46SEJ5ZnKbRL7JVWgAA
AABJRU5ErkJggg==
</value>
</data>
<data name="pokeRadarLabel2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAASNJREFUSEu1
kSuyg0AURLOcSJbAEpCRWcKTkZHILAPJkpCRSBxJT6WpZtLzKSpPnGLmAufwOY3j+K/YoaNpmhW4czns
MAbiv+ctoJGaqB3GQNL3/dp13SbEcVmWQC5ihzEQDMMQIlhTPk1TIBf5GiiUAQ2ovBTZbRSKeCMC+ESU
IwZKkZ2U6FPiCHEcwB5grbE4UiUHbdsGeE6lGssGnBzS+Xpd5/s97CHlNaTqDbLyN4/PGjMXITZQIz/3
z2KE92YDKTm4DHMyQnlVQOWQaiD1Jk6eDVAeB4L8/cM1kJLbAJ/GvYHKsdaAk4Mt4L4nRU6Oe5RYTLZF
KRLLVZJjt8lFjsjB1yAVOSIHdqgRckQO7BAwgqcHPw8ASBV3TQk7/B3j6QXmQ06b07b3wAAAAABJRU5E
rkJggg==
</value>
</data>
<data name="superRodPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK
6QAACukB/XXO0wAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABOElE
@ -186,7 +237,7 @@
L3NUGae+AAAAAElFTkSuQmCC
</value>
</data>
<data name="pictureBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="oldRodPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK
6QAACukB/XXO0wAAACB0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgTVi7kSokAAABFElE

8
DS_Map/ROMFiles/EncounterFile.cs
View File

@ -139,7 +139,7 @@ namespace DSPRE.ROMFiles {
public uint[] walkingPokemon = new uint[12];
/* Time-specific encounters */
public uint[] morningPokemon = new uint[2];
public uint[] dayPokemon = new uint[2];
public uint[] nightPokemon = new uint[2];
/* Dual slot exclusives */
@ -180,9 +180,9 @@ namespace DSPRE.ROMFiles {
/* Time-specific encounters */
for (int i = 0; i < 2; i++) {
try {
morningPokemon[i] = reader.ReadUInt32();
dayPokemon[i] = reader.ReadUInt32();
} catch {
morningPokemon[i] = 0x00;
dayPokemon[i] = 0x00;
fieldsWithErrors.Add("Morning encounters" + ' ' + '[' + i + ']' + msgFixed);
}
}
@ -342,7 +342,7 @@ namespace DSPRE.ROMFiles {
/* Time-specific encounters */
for (int i = 0; i < 2; i++) {
writer.Write(morningPokemon[i]);
writer.Write(dayPokemon[i]);
}
for (int i = 0; i < 2; i++) {

BIN
DS_Map/Resources/Graphics/Program Icons/dualslot_cart/cart_emerald.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 389 B

BIN
DS_Map/Resources/Graphics/Program Icons/dualslot_cart/cart_fire_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 393 B

BIN
DS_Map/Resources/Graphics/Program Icons/dualslot_cart/cart_leaf_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 390 B

0
DS_Map/Resources/Graphics/Program Icons/dualslot_encounters.png → DS_Map/Resources/Graphics/Program Icons/dualslot_cart/cart_ruby.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

BIN
DS_Map/Resources/Graphics/Program Icons/dualslot_cart/cart_sapphire.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 407 B