ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11492 from mandar1jn/file-improvements 

Improve the data in the first data block of the skylanders figures
This commit is contained in:
Pierre Bourdon 2023-01-31 03:02:39 +01:00 committed by GitHub
parent c63eb75435 c8a91abadc
commit 2843cd10a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/IOS/USB/Emulated/Skylander.cpp
View File

@ -8,6 +8,7 @@
#include <vector> #include <vector>
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/Random.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/Timer.h" #include "Common/Timer.h"
#include "Core/Core.h" #include "Core/Core.h"
@ -747,11 +748,24 @@ bool SkylanderPortal::CreateSkylander(const std::string& file_path, u16 sky_id,
{ {
memcpy(&file_data[(index * 0x40) + 0x36], &other_blocks, sizeof(other_blocks)); memcpy(&file_data[(index * 0x40) + 0x36], &other_blocks, sizeof(other_blocks));
} }
// Set the NUID of the figure
Common::Random::Generate(&file_data[0], 4);
// The BCC (Block Check Character)
file_data[4] = file_data[0] ^ file_data[1] ^ file_data[2] ^ file_data[3];
// ATQA
file_data[5] = 0x81;
file_data[6] = 0x01;
// SAK
file_data[7] = 0x0F;
// Set the skylander info // Set the skylander info
u16 sky_info = (sky_id | sky_var) + 1;
memcpy(&file_data[0], &sky_info, sizeof(sky_info));
memcpy(&file_data[0x10], &sky_id, sizeof(sky_id)); memcpy(&file_data[0x10], &sky_id, sizeof(sky_id));
memcpy(&file_data[0x1C], &sky_var, sizeof(sky_var)); memcpy(&file_data[0x1C], &sky_var, sizeof(sky_var));
// Set checksum // Set checksum
u16 checksum = SkylanderCRC16(0xFFFF, file_data, 0x1E); u16 checksum = SkylanderCRC16(0xFFFF, file_data, 0x1E);
memcpy(&file_data[0x1E], &checksum, sizeof(checksum)); memcpy(&file_data[0x1E], &checksum, sizeof(checksum));

2
Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp
View File

@ -29,6 +29,7 @@
#include "Core/System.h" #include "Core/System.h"
#include "DolphinQt/QtUtils/DolphinFileDialog.h" #include "DolphinQt/QtUtils/DolphinFileDialog.h"
#include "DolphinQt/Resources.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
// Qt is not guaranteed to keep track of file paths using native file pickers, so we use this // Qt is not guaranteed to keep track of file paths using native file pickers, so we use this
@ -521,6 +522,7 @@ const std::map<const std::pair<const u16, const u16>, const char*> list_skylande
SkylanderPortalWindow::SkylanderPortalWindow(QWidget* parent) : QWidget(parent) SkylanderPortalWindow::SkylanderPortalWindow(QWidget* parent) : QWidget(parent)
{ {
setWindowTitle(tr("Skylanders Manager")); setWindowTitle(tr("Skylanders Manager"));
setWindowIcon(Resources::GetAppIcon());
setObjectName(QString::fromStdString("skylanders_manager")); setObjectName(QString::fromStdString("skylanders_manager"));
setMinimumSize(QSize(700, 200)); setMinimumSize(QSize(700, 200));