From a18d7b03e843d6d049ace5f5d0c5e8041398c2cd Mon Sep 17 00:00:00 2001 From: AdAstra-LD Date: Thu, 8 Apr 2021 14:12:29 +0200 Subject: [PATCH] New NSBMD Utilities icons --- DS_Map/Properties/Resources.Designer.cs | 30 +++++ DS_Map/Properties/Resources.resx | 105 ++++++++++-------- DS_Map/ROMFiles/MapFile.cs | 33 +++--- .../Program Icons/addTextureToNSBMD.png | Bin 0 -> 1547 bytes .../Program Icons/removeTextureNSBMD.png | Bin 0 -> 1033 bytes .../Program Icons/saveTextureFromNSBMD.png | Bin 0 -> 1617 bytes 6 files changed, 100 insertions(+), 68 deletions(-) create mode 100644 DS_Map/Resources/Graphics/Program Icons/addTextureToNSBMD.png create mode 100644 DS_Map/Resources/Graphics/Program Icons/removeTextureNSBMD.png create mode 100644 DS_Map/Resources/Graphics/Program Icons/saveTextureFromNSBMD.png diff --git a/DS_Map/Properties/Resources.Designer.cs b/DS_Map/Properties/Resources.Designer.cs index 9477f1e..72030fa 100644 --- a/DS_Map/Properties/Resources.Designer.cs +++ b/DS_Map/Properties/Resources.Designer.cs @@ -70,6 +70,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap addTextureToNSBMD { + get { + object obj = ResourceManager.GetObject("addTextureToNSBMD", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona). /// @@ -1596,6 +1606,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap removeTextureNSBMD { + get { + object obj = ResourceManager.GetObject("removeTextureNSBMD", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// @@ -1656,6 +1676,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap saveTextureFromNSBMD { + get { + object obj = ResourceManager.GetObject("saveTextureFromNSBMD", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// diff --git a/DS_Map/Properties/Resources.resx b/DS_Map/Properties/Resources.resx index 4c803e6..fb99cc0 100644 --- a/DS_Map/Properties/Resources.resx +++ b/DS_Map/Properties/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -133,12 +136,18 @@ ..\Resources\Graphics\weather\hgss\hgsssnow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\spawnCoordsMatrixeditorIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\Program Icons\addIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Program Icons\saveTextureFromNSBMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -148,8 +157,11 @@ ..\Resources\Graphics\Program Icons\unpackAllIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Program Icons\removeTextureNSBMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\wrenchIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\Camera Angles\DPPt\dpcamera6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -157,6 +169,9 @@ ..\Resources\Graphics\weather\hgss\hgssarcade.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -166,9 +181,6 @@ ..\Resources\Graphics\Program Icons\goToTrigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Camera Angles\DPPt\ptcamera1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Graphics\Camera Angles\DPPt\ptcamera14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -247,15 +259,12 @@ ..\Resources\Graphics\weather\hgss\hgssnormal.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Weather\DPPt\dpdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\camera angles\hgss\hgsscamera07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\Weather\DPPt\ptthunderstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Event Icons\warp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Graphics\Area Icons\hgsswood.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -271,8 +280,8 @@ ..\Resources\Graphics\Weather\DPPt\ptsandfall.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Camera Angles\DPPt\ptcamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Program Icons\goToOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\Program Icons\arrowleft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -301,9 +310,6 @@ ..\Resources\Graphics\Camera Angles\DPPt\dpcamera9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Area Icons\hgsswater.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Graphics\camera angles\hgss\hgsscamera05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -316,6 +322,9 @@ ..\Resources\Graphics\Area Icons\areaicon03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -328,9 +337,6 @@ ..\Resources\Graphics\Area Icons\areaicon09.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Camera Angles\DPPt\ptcamera7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Graphics\Event Icons\dawn_platinum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -370,11 +376,8 @@ ..\resources\graphics\weather\dppt\ptdim.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Event Icons\gray_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Graphics\Camera Angles\DPPt\dpcamera8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\Program Icons\wideLensImageTransp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -388,6 +391,9 @@ ..\Resources\Graphics\Weather\DPPt\dprain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Event Icons\warp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -406,8 +412,11 @@ ..\Resources\Graphics\program icons\importarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Camera Angles\DPPt\ptcamera8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Area Icons\hgsswater.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Graphics\Area Icons\areaicon05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\camera angles\hgss\hgsscamera01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -421,9 +430,6 @@ ..\Resources\Graphics\Weather\DPPt\dplightning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\camera angles\hgss\hgsscamera02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Graphics\Weather\DPPt\ptdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -433,6 +439,9 @@ ..\Resources\Graphics\program icons\pasteicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\camera angles\hgss\hgsscamera03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptlightning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -454,6 +463,9 @@ ..\Resources\Graphics\Event Icons\brown_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Program Icons\scriptDBIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -475,11 +487,8 @@ ..\Resources\Graphics\Event Icons\overworld.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Program Icons\goToOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Event Icons\red_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\Program Icons\map_editor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -502,8 +511,8 @@ ..\Resources\Graphics\Weather\DPPt\dpthunderstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\camera angles\hgss\hgsscamera03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Event Icons\gray_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\Area Icons\dp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -535,14 +544,14 @@ ..\Resources\Graphics\Weather\DPPt\dpnormal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Event Icons\red_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Tools\blz.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Graphics\Area Icons\areaicon05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Plat @@ -604,14 +613,14 @@ ..\Resources\Graphics\Program Icons\warpGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Camera Angles\DPPt\ptcamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\camera angles\hgss\hgsscamera14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\Program Icons\scriptDBIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\camera angles\hgss\hgsscamera02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\weather\hgss\hgssdiamond.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -619,8 +628,8 @@ ..\Resources\Graphics\Program Icons\resetListIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Graphics\camera angles\hgss\hgsscamera07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Weather\DPPt\dpdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Graphics\Program Icons\deleteIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -637,7 +646,7 @@ ..\Resources\Graphics\Program Icons\WheelClick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wrenchIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Program Icons\addTextureToNSBMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/DS_Map/ROMFiles/MapFile.cs b/DS_Map/ROMFiles/MapFile.cs index ebaf904..9820ca9 100644 --- a/DS_Map/ROMFiles/MapFile.cs +++ b/DS_Map/ROMFiles/MapFile.cs @@ -86,7 +86,7 @@ namespace DSPRE.ROMFiles { ImportBuildings(new MemoryStream(reader.ReadBytes(buildingsSectionLength))); /* Read nsbmd model */ - ImportMapModel(new MemoryStream(reader.ReadBytes(nsbmdSectionLength))); + LoadMapModel(reader.ReadBytes(nsbmdSectionLength)); /* Read bdhc data */ ImportTerrain(new MemoryStream(reader.ReadBytes(bdhcSectionLength))); @@ -138,33 +138,26 @@ namespace DSPRE.ROMFiles { } } } - public void ImportMapModel(Stream newData) { - using (BinaryReader reader = new BinaryReader(newData)) { - reader.BaseStream.Position = 0xE; - if (reader.ReadInt16() > 1) {// If there is more than one file, it means there are embedded textures we must remove - using (BinaryWriter writer = new BinaryWriter(new MemoryStream())) { - reader.BaseStream.Position = 0x1C; - uint mdl0Size = reader.ReadUInt32(); // Read mdl0 file size + public void LoadMapModel(byte[] newData) { + using (BinaryReader modelReader = new BinaryReader(new MemoryStream(newData))) { - reader.BaseStream.Position = 0x0; - writer.Write(reader.ReadBytes(0x8)); // Write firt header bytes, same for all NSBMD. - writer.Write(mdl0Size + 0x14); - writer.Write((short)0x10); // Writes BMD0 header size (always 16) - writer.Write((short)0x1); // Write new number of sub-files, since embedded textures are removed - writer.Write(0x14); // Writes new start offset of MDL0 - reader.BaseStream.Position = 0x18; - writer.Write(reader.ReadBytes((int)mdl0Size)); // Writes MDL0; + if (modelReader.ReadUInt32() != NSBMD.NDS_TYPE_BMD0) { + MessageBox.Show("Please select an NSBMD file.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error)); + return; + } - mapModelData = ((MemoryStream)writer.BaseStream).ToArray(); - } + modelReader.BaseStream.Position = 0xE; + if (modelReader.ReadInt16() > 1) { // If there is more than one file, it means there are embedded textures we must remove + mapModelData = DSUtils.GetModelWithoutTextures(newData); } else { - reader.BaseStream.Position = 0x0; - mapModelData = reader.ReadBytes((int)newData.Length); + modelReader.BaseStream.Position = 0x0; + mapModelData = modelReader.ReadBytes((int)modelReader.BaseStream.Length); } mapModel = NSBMDLoader.LoadNSBMD(new MemoryStream(mapModelData)); } } + public void ImportPermissions(Stream newData) { using (BinaryReader reader = new BinaryReader(newData)) { for (int i = 0; i < 32; i++) { diff --git a/DS_Map/Resources/Graphics/Program Icons/addTextureToNSBMD.png b/DS_Map/Resources/Graphics/Program Icons/addTextureToNSBMD.png new file mode 100644 index 0000000000000000000000000000000000000000..20fe6add11b23f4dfffa1d945ac62c44acebacfb GIT binary patch literal 1547 zcmV+m2K4!fP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz1)xbpK~z{rwU=8@ zTvZgu|8p2%E`-}~8HV8^mw~p{cBriqKro@LJeX=9d{Wai@xk`Nub?k}gzA%z#y9Iz zQ)42gY1&i^5=gmND-@Xmg`tBm7Z_$-YwdFmXD;B>w7+C!?|tU5*MG0Q_Sy#<3L~wz z&&z+#f7lDA)1s^I!fw~3pNQ@Nv0drsu)Qsf?<1O+X0{apsbm_Vi+A~PUSIhhD#t@d z0lyEW9=8m$$q=GDhFiVsySNQUjZ^yZwJ1U#j{#fsz9Pe?T9$IE?1Q&}4~K!O3i%-s ziHWmhG9_b!Qdfx*_w1Q+tUJ$(MsCiZphb1_Xx|sXYSQTI1aAMqn zoaaQ~((gcTmyEHvs9IjnOjsB2elPI-9rS0mWE-+@pw|~Aa-xw*LwxBN6U3MRG*R(b#>-gMc~a=QS;9A zujOGf9*3P?;LNug!x7NB{U|YW?xy6h7*t-a~?3+M=zUn z+9pYsZ5(z3?&o`l3lyVrU?d3K7|+Q8ZXIPVl$DjpbH(Qv*5edC1GaR znH)oXQM4-6-=V@p#YsiLy%y z&c=Pl8XfK*8i`%Hv^F;M0pY16Kh4rrvlx|-_g@bUcB!uwL35VErl~zmr}WI#$5ygM zB-ZH?BNKQoW|_)19d#k267nfvg*MXDM9ES@iN|?CZBd0&CQmHU-pwzOr~Q@Zg>$2- z8knRovtV8nhyD$^@OW{L7F6r42PU3a1n@~<^~S|w^d}zxQz1$s^|)a8WVTnSQ1iZ5 zsO#PAb2Ll=eE&0s)0L;>bQ)NtD3D`ba|c~suXd=_$0|troUq${EcB1b8|u$z#kzDJDnxxmemf>kuBZ7ECsEs4(|FEs+_90 z#G^@UuPh+7MXR!qpxnFlr#@g7gOsw*5&T1>d$Ijem7D3jPm2r<1BFr{QYx}TrO z4+}7^vCmI7Ym{s@gqG9jq=c=bL}go|q*WMNxi$L0;6M=fOHN_;*a)Kj*Tvky5iHXF z4z?GgEVXRTwM8eRL-#ZNBuyvZ^NU$kyv<&*DyqJ<^s>K36H`!ODyAxDv__w3ZZ3zj z+JmmHF0pg{K`L@;EBQBL9yXra@MB;K;QcpppzC-WTDx1tgz_CUoS~vpOm(4&W?^%Z zN}|G}TBfDeh3SPg`tnwv-u#;}k1?0k4`T{AQr{%jROLowJz|dSuh3DsF9_w6IKa6<_+J<^i;dEpC&aV_FJyn@y`kXop?@7H=0Pz_Fdru=0 x+s32OvCLzrw>fZP9meb|eQf+s0)fEW{{jbDIy{KnGn@bb002ovPDHLkV1f?Y=86CS literal 0 HcmV?d00001 diff --git a/DS_Map/Resources/Graphics/Program Icons/removeTextureNSBMD.png b/DS_Map/Resources/Graphics/Program Icons/removeTextureNSBMD.png new file mode 100644 index 0000000000000000000000000000000000000000..b4346d78a93efd70334ce965f5e11778e8276132 GIT binary patch literal 1033 zcmV+k1or!hP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz1D;7lK~z{ry_R1{ zlTj4FkGY3UVW{*V_#hD)6k@bp&RyT<_jkhj!DZ*(d+s^s-gEBVmjl+2=r>bL z?Hehiol4T?{O9B-%xn7ELcem*n>0T^&mC{pIU?4R4Q>|&IU)ct$#hc-ii(Q(go4#o z5=_w0Lz}a+vs{!ljueSR(6KS`xb&Op9#k4oHJnF1)Heh5F)t*iNF)-FmzPI9C8tz5o}4)fp5R*; z?DD3aKdtrfqBBF40xKkzmLSQheEh&}czOIVv^^YxcTH~7oeMB9JaLf*9sm|zG#cg2 z3_DAa&2EQ^=nR~E{Sn?Y*29tKA9xK|Ar_1A6o@qN05I=mWo5jXft8QB#~SFn&bonP60Z2`zoMds}rUhs(Arg4ML8h2r&gEB_+By;SejD z_v{_$Z#xa&j@9sMD1Qg`kA~s=oyX9?-hpwQA{1#xKl%CjT$Uy$CwVhuWre?RjjZ7s zy@vDrC1m<$pngWz5Ed5!3JR!WfJME`ub~y^h=Cq%7XN9*HB6rX4v5>JM>re?r_)J2 zZI;+OQB_q1Hg;RI5HBtwz85e6U51B;C1y~{&CONh+Nhx}t_cJJWJMd&R|l}RwkG*} zK5j&7-YU2jZM3wsD2jZ2eVu;-r~(KEgX!Hm91a@YJh%}AZHZIq?(UY@hY4@#05C$a z+p)1Rz9<`@ZS;Y@+-`R|fDj5^ub0%a5BehKp;Q^N4ui!11Kt4U^SbICz=>?Oji^ol zmFVl0Q(Rn3k~X+5nM|tgy%?LDo1>AGEx8{&0nGq}jA%tIN3JVJD=4{b5rFAaTv%90 zk{Y8qtEd9d+fk-yJ;hqKO-~>mkCT)gR5j4s+Y2)@Gh9aeem_atbaZr(WKL;mDRg#r za#>Y`^viL%TqFUEjEs<^OPx#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz1?EXaK~z{rwU^6p z)KwJ6znw?hc`%)s&a|aWTkK<6UXd0h5GbwTp*1mJOk5dbSU{A88#hK4n5ch(3JVv+ zg_@wK3xg6Z5&}WXBa}yLDW$bT3+w#Bbvspwx8GiuG&5QmbW@lyVasdzMyKjD%V@Y0J`5sEe zovVRRHA>29vOMG%VphD6d-s5`yTIi;>OrnfJ;*Nc>)U|hVmT>K$e!D+uol~lRWOsh zISP2aYNTNA=gBxNu^3QRMjt1E?i=bOK@l5}!Imb#?Uav#LD_1rSb5NwS2>d$Chzij z&PLoJuh{^G4PZt_WSb_r5fv+t!K<5rcpNx!S-e{cCGYMQZ9W6uJWq2ej;^7_O(cM+ zDd7Gzp#AW8fOA8ziGkg2Sh)3zPf+S~!s#xB#b!fksr8IU4_sw?F?LaxB3l>jNluh)bDPPUF<1H4}TVV2^3M^vvc+w0b1 zz_Cn?3bUkW*Dao!thCF48R8}mkgk~dfX+Slg|_ndEu<_`GHEBhv#6&_!KNDk?r7Z*;Y|GrXxCQ0B3?e zf*IYvat-K>01xHkCBuu@K*9Plx9UJ0PF`$j1n9Ifh!%F)| zxyjr123kEC+y)kR1zeSNRJ3G#B;qN|j^9RlhP*P7q^rQ`n`*$YF)Jt->t)f)#z2rP zjFP>ixP_eB(i+09jqBt`{}Vr-zk)Lt|K>Z0G=$^wA6bZgBkANr_wC&^@RX{EeM(Fx z;`r?Q5zrNd>1G3%%sYFkX-RX>{-;GEp1`NaBM67X9~uViXpx-@bZ1nVDo{7Wf&^$w z9lreM!Q50t6hI9nBHEOmlca|YP!$J<*4J7n*oqJt%bu*01mGv=D1%xF}4uHVT}=9ix`s!CODl@K4*k05;< z3Rr|lsFd0R*;e<7+FB1B{&F-oHw)RdwUy2fxt07*&%?rVYdspn0N#Hc1I_E|v9e{Q z5P|0bmT#n@VyC)LL$k0r$V#HDT((SI(247}C+OxauipGl&!guu>tPH7R#nyrsqwiG zn~WJEprwnB_EQ~~Lo-RL?|a)yu_bdJp}XDK>FCAYa0~}_tPt7(@&@1 zSY#4Y_ohTEa0HRG&|fub7ZT~ehSb=fc_lj3FXl1NW!A$OSy12EhBAi>7tj7d>!d=J z8M~x91*lrDI!hpN1Ff5%M{I5ugWVT$(@?dG;J|tmeSLkZ_vD1b;TQe|zrrV5l#%Nd P00000NkvXXu0mjf<&FTa literal 0 HcmV?d00001