Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rubberduckycooly
Rubberduckycooly committed Aug 30, 2019
1 parent b807462 commit e340723
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 12 deletions.
15 changes: 11 additions & 4 deletions Ducky's RSDK Unpacker/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public partial class MainForm : DockContent
Retro_Formats.EngineType engineType;

List<string> FileList = new List<string>();
Dictionary<string, string> KeyList = new Dictionary<string, string>();

RSDKvRS.DataFile DatavRS;
RSDKv1.DataFile Datav1;
Expand All @@ -35,7 +36,7 @@ public MainForm()
private void SelectDataFileButton_Click(object sender, EventArgs e)
{
OpenFileDialog dlg = new OpenFileDialog();
dlg.Filter = "RSDKvRS Data files|Data*.bin|RSDKv1 Data files|Data*.bin|RSDKv2 Data files|*.rsdk|RSDKvB Data files|*.rsdk|RSDKv5 Data files|*.rsdk";
dlg.Filter = "RSDKvRS Data files|Data*.bin|RSDKv1 Data files|Data*.bin|RSDKv2 Data files|Data*.rsdk|RSDKvB Data files|Data*.rsdk|RSDKv5 Data files|*.rsdk";

if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK)
{
Expand Down Expand Up @@ -104,10 +105,16 @@ private void SelectDataFileButton_Click(object sender, EventArgs e)
StreamReader reader = new StreamReader(File.OpenRead("Data/DataFileUnpacker/RSDKv5FileList.txt"));
while (!reader.EndOfStream)
{
FileList.Add(reader.ReadLine());
string[] info = reader.ReadLine().Split(',');
FileList.Add(info[0]);
if (info.Length > 2)
{
KeyList.Add(info[1].ToUpper(), info[2].ToUpper());
}
}
reader.Close();
}
//Scan Object list and create hashes
if (File.Exists("Data/DataFileUnpacker/RSDKv5Objects.txt"))
{
StreamReader reader = new StreamReader(File.OpenRead("Data/DataFileUnpacker/RSDKv5Objects.txt"));
Expand Down Expand Up @@ -141,7 +148,7 @@ private void SelectDataFileButton_Click(object sender, EventArgs e)
}
if (FileList != null && FileList.Count > 0)
{
Datav5 = new RSDKv5.DataFile(filename, FileList);
Datav5 = new RSDKv5.DataFile(filename, FileList, KeyList);
SetFileListv5();
}
break;
Expand Down Expand Up @@ -258,7 +265,7 @@ private void SelectFolderButton_Click(object sender, EventArgs e)
private void BuildDataButton_Click(object sender, EventArgs e)
{
SaveFileDialog dlg = new SaveFileDialog();
dlg.Filter = "RSDKvRS Data files|Data*.bin|RSDKv1 Data files|Data*.bin|RSDKv2 Data files|Data*.rsdk|RSDKvB Data files|Data*.rsdk|RSDKv5 Data files|Data*.rsdk";
dlg.Filter = "RSDKvRS Data files|Data*.bin|RSDKv1 Data files|Data*.bin|RSDKv2 Data files|Data*.rsdk|RSDKvB Data files|Data*.rsdk|RSDKv5 Data files|*.rsdk";

if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK)
{
Expand Down
Binary file modified RetroED/obj/Debug/RetroED.csproj.GenerateResource.cache
View file
Binary file not shown.
Binary file modified RetroED/obj/Debug/RetroED.csprojAssemblyReference.cache
View file
Binary file not shown.
Binary file modified RetroED/obj/Debug/RetroED.exe
View file
Binary file not shown.
Binary file modified RetroED/obj/Debug/RetroED.pdb
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions StaticObjectNotes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Format:
[ObjectName] -> [ObjectPath] -> [Functionality]

AIZRockPile -> Data/Objects/Static/F6626BD9dd2ED205493601497475537B.bin - ???
AIZSetup -> Data/Objects/Static/???.bin - AniTile Speeds
AIZSetup -> Data/Objects/Static/E89CBBD08E19C44DD87fB3C4C8D1CCA3.bin - AniTile Speeds
AIZTornado -> Data/Objects/Static/837851AB76D9F726E97291E6F761921C.bin - ???
AmoebaDroid -> Data/Objects/Static/3B3672B8B3DE043AA60690ECA5BED7A6.bin - Controls The broken boss pieces
Animals -> Data/Objects/Static/33B8E672A1DEA5654AF81AEF98BDAA6F.bin - Animal Speeds
Expand Down Expand Up @@ -42,7 +42,7 @@ MagnetSphere -> Data/Objects/Static/621330217AC74CC89913DEA666BC9FF3.bin - ???
MechaBu -> Data/Objects/Static/84E00179988757CB56408205E78A1FB1.bin - ???
MegaOctus -> Data/Objects/Static/133AFFEDB305BB473FAEF8E9C1F12CEB.bin - ???
MeterDroid -> Data/Objects/Static/AEAC38DA20219D86FAFBB6160AA9807A.bin - ???
OOZSetup -> Data/Objects/Static/802E9898B64AC948F5D5AD68A3EA7EA0.bin - ???
OOZSetup -> Data/Objects/Static/802E9898B64AC948F5D5AD68A3EA7EA0.bin - AniTile Speeds
PKingAttack -> Data/Objects/Static/BDAE7DAB3C274B2303267EAA0537B68E.bin - ???
PSZ1Setup -> Data/Objects/Static/5B0D0FAB588338D885220934A018173D.bin - AniTile Speeds
PSZ2Setup -> Data/Objects/Static/391E5E934C51410C0240DA5E2450B07E.bin - AniTile Speeds
Expand All @@ -51,7 +51,7 @@ PetalPile -> Data/Objects/Static/F616C91F1678EDCF31391321516CFAC8.bin - ???
PhantomEgg -> Data/Objects/Static/8384F8660903B07FC41E700C43D03993.bin - ???
PhantomGunner -> Data/Objects/Static/98C225B734D79CBB525795C65DEFE95B.bin - ???
PhantomHand -> Data/Objects/Static/40409B350D17BD7B989EEED055D03DE7.bin - ???
Player -> Data/Objects/Static/36D61A3DE508B500AE0ECF8D33F32943.bin - Physics, Super Palettes, (Assumiingly) Rings to next 1up, continue lives, target score
Player -> Data/Objects/Static/36D61A3DE508B500AE0ECF8D33F32943.bin - Physics, Super Palettes, (Assumiingly) Rings to next 1up, continue lives, target score, shield (???)
PullChain -> Data/Objects/Static/17710E51F9B6C877A8F4640441E48FC6.bin - ???
PuyoAI -> Data/Objects/Static/7E443122AD19335046B4A94E529198EA.bin - ???
PuyoBean -> Data/Objects/Static/CBDE41F38DF0EBA5B517E51B1A149582.bin - ???
Expand Down
6 changes: 1 addition & 5 deletions build/Data/DataFileUnpacker/RSDKv5FileList.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ Data/Music/TitleScreen.ogg
Data/Music/TrueEnd.ogg
Data/Music/TryAgain.ogg
Data/Music/UFOSpecial.ogg
//RollSwitch - Not in gameconfig/stageconfig
Data/Objects/Static/BD7B0128A038883FE438A56FF8225BA8.bin
//Not in gameconfig/stageconfig
Data/Objects/Static/DE88C44102F952196553C77A58F4C880.bin
Data/Palettes/EncoreCPZ.act
Data/Palettes/EncoreCPZw.act
Data/Palettes/EncoreFBZ.act
Expand Down Expand Up @@ -370,7 +366,7 @@ Data/SoundFX/MSZ/MysticTransform.wav
Data/SoundFX/MSZ/MysticTwinkle.wav
Data/SoundFX/MSZ/Piano00C2.wav
Data/SoundFX/MSZ/Pinata.wav
Data/SoundFX/MSZ/?.wav
Data/SoundFX/MSZ/?.wav,3465D2CF44EB0A1C10CC0CFEDC98278C,C74C654DDB022F2EFC88DC3B53F1F235
Data/SoundFX/MSZ/SandFall.wav
Data/SoundFX/MSZ/SandSwim.wav
Data/SoundFX/MSZ/Spray.wav
Expand Down
2 changes: 2 additions & 0 deletions build/Data/DataFileUnpacker/RSDKv5Objects.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,13 +407,15 @@ RingField
RisingLava
RockDrill
RockemSockem
RollSwitch
RollerMKII
RotatingSpikes
RotatingStair
RubyPortal
SDashWheel
SP500
SP500MkII
SPZSetup
SPZ1Intro
SPZ1Setup
SPZ2Outro
Expand Down

0 comments on commit e340723

Please sign in to comment.