aboutsummaryrefslogtreecommitdiff
path: root/src/frontend/qt_sdl
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontend/qt_sdl')
-rw-r--r--src/frontend/qt_sdl/ROMInfoDialog.cpp69
-rw-r--r--src/frontend/qt_sdl/ROMManager.cpp4
-rw-r--r--src/frontend/qt_sdl/ROMManager.h6
3 files changed, 40 insertions, 39 deletions
diff --git a/src/frontend/qt_sdl/ROMInfoDialog.cpp b/src/frontend/qt_sdl/ROMInfoDialog.cpp
index e82ec4b..4be4cb0 100644
--- a/src/frontend/qt_sdl/ROMInfoDialog.cpp
+++ b/src/frontend/qt_sdl/ROMInfoDialog.cpp
@@ -43,16 +43,17 @@ ROMInfoDialog::ROMInfoDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ROMI
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
-
+ const NDSBanner* banner = NDSCart::Cart->Banner();
+ const NDSHeader& header = NDSCart::Cart->GetHeader();
u32 iconData[32 * 32];
- ROMManager::ROMIcon(NDSCart::Banner.Icon, NDSCart::Banner.Palette, iconData);
+ ROMManager::ROMIcon(banner->Icon, banner->Palette, iconData);
iconImage = QImage(reinterpret_cast<unsigned char*>(iconData), 32, 32, QImage::Format_ARGB32).copy();
ui->iconImage->setPixmap(QPixmap::fromImage(iconImage));
- if (NDSCart::Banner.Version == 0x103)
+ if (banner->Version == 0x103)
{
u32 animatedIconData[32 * 32 * 64] = {0};
- ROMManager::AnimatedROMIcon(NDSCart::Banner.DSiIcon, NDSCart::Banner.DSiPalette, NDSCart::Banner.DSiSequence, animatedIconData, animatedSequence);
+ ROMManager::AnimatedROMIcon(banner->DSiIcon, banner->DSiPalette, banner->DSiSequence, animatedIconData, animatedSequence);
for (int i = 0; i < 64; i++)
{
@@ -73,44 +74,44 @@ ROMInfoDialog::ROMInfoDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ROMI
ui->dsiIconImage->setPixmap(QPixmap::fromImage(iconImage));
}
- ui->iconTitle->setText(QString::fromUtf16(NDSCart::Banner.EnglishTitle));
+ ui->iconTitle->setText(QString::fromUtf16(banner->EnglishTitle));
- ui->japaneseTitle->setText(QString::fromUtf16(NDSCart::Banner.JapaneseTitle));
- ui->englishTitle->setText(QString::fromUtf16(NDSCart::Banner.EnglishTitle));
- ui->frenchTitle->setText(QString::fromUtf16(NDSCart::Banner.FrenchTitle));
- ui->germanTitle->setText(QString::fromUtf16(NDSCart::Banner.GermanTitle));
- ui->italianTitle->setText(QString::fromUtf16(NDSCart::Banner.ItalianTitle));
- ui->spanishTitle->setText(QString::fromUtf16(NDSCart::Banner.SpanishTitle));
+ ui->japaneseTitle->setText(QString::fromUtf16(banner->JapaneseTitle));
+ ui->englishTitle->setText(QString::fromUtf16(banner->EnglishTitle));
+ ui->frenchTitle->setText(QString::fromUtf16(banner->FrenchTitle));
+ ui->germanTitle->setText(QString::fromUtf16(banner->GermanTitle));
+ ui->italianTitle->setText(QString::fromUtf16(banner->ItalianTitle));
+ ui->spanishTitle->setText(QString::fromUtf16(banner->SpanishTitle));
- if (NDSCart::Banner.Version > 1)
- ui->chineseTitle->setText(QString::fromUtf16(NDSCart::Banner.ChineseTitle));
+ if (banner->Version > 1)
+ ui->chineseTitle->setText(QString::fromUtf16(banner->ChineseTitle));
else
ui->chineseTitle->setText("None");
- if (NDSCart::Banner.Version > 2)
- ui->koreanTitle->setText(QString::fromUtf16(NDSCart::Banner.KoreanTitle));
+ if (banner->Version > 2)
+ ui->koreanTitle->setText(QString::fromUtf16(banner->KoreanTitle));
else
ui->koreanTitle->setText("None");
- ui->gameTitle->setText(QString::fromLatin1(NDSCart::Header.GameTitle, 12));
- ui->gameCode->setText(QString::fromLatin1(NDSCart::Header.GameCode, 4));
- ui->makerCode->setText(QString::fromLatin1(NDSCart::Header.MakerCode, 2));
- ui->cardSize->setText(QString::number(128 << NDSCart::Header.CardSize) + " KB");
-
- ui->arm9RomOffset->setText(IntToHex(NDSCart::Header.ARM9ROMOffset));
- ui->arm9EntryAddress->setText(IntToHex(NDSCart::Header.ARM9EntryAddress));
- ui->arm9RamAddress->setText(IntToHex(NDSCart::Header.ARM9RAMAddress));
- ui->arm9Size->setText(QStringBytes(NDSCart::Header.ARM9Size));
-
- ui->arm7RomOffset->setText(IntToHex(NDSCart::Header.ARM7ROMOffset));
- ui->arm7EntryAddress->setText(IntToHex(NDSCart::Header.ARM7EntryAddress));
- ui->arm7RamAddress->setText(IntToHex(NDSCart::Header.ARM7RAMAddress));
- ui->arm7Size->setText(QStringBytes(NDSCart::Header.ARM7Size));
-
- ui->fntOffset->setText(IntToHex(NDSCart::Header.FNTOffset));
- ui->fntSize->setText(QStringBytes(NDSCart::Header.FNTSize));
- ui->fatOffset->setText(IntToHex(NDSCart::Header.FATOffset));
- ui->fatSize->setText(QStringBytes(NDSCart::Header.FATSize));
+ ui->gameTitle->setText(QString::fromLatin1(header.GameTitle, 12));
+ ui->gameCode->setText(QString::fromLatin1(header.GameCode, 4));
+ ui->makerCode->setText(QString::fromLatin1(header.MakerCode, 2));
+ ui->cardSize->setText(QString::number(128 << header.CardSize) + " KB");
+
+ ui->arm9RomOffset->setText(IntToHex(header.ARM9ROMOffset));
+ ui->arm9EntryAddress->setText(IntToHex(header.ARM9EntryAddress));
+ ui->arm9RamAddress->setText(IntToHex(header.ARM9RAMAddress));
+ ui->arm9Size->setText(QStringBytes(header.ARM9Size));
+
+ ui->arm7RomOffset->setText(IntToHex(header.ARM7ROMOffset));
+ ui->arm7EntryAddress->setText(IntToHex(header.ARM7EntryAddress));
+ ui->arm7RamAddress->setText(IntToHex(header.ARM7RAMAddress));
+ ui->arm7Size->setText(QStringBytes(header.ARM7Size));
+
+ ui->fntOffset->setText(IntToHex(header.FNTOffset));
+ ui->fntSize->setText(QStringBytes(header.FNTSize));
+ ui->fatOffset->setText(IntToHex(header.FATOffset));
+ ui->fatSize->setText(QStringBytes(header.FATSize));
}
diff --git a/src/frontend/qt_sdl/ROMManager.cpp b/src/frontend/qt_sdl/ROMManager.cpp
index 80f4652..5aa6f59 100644
--- a/src/frontend/qt_sdl/ROMManager.cpp
+++ b/src/frontend/qt_sdl/ROMManager.cpp
@@ -944,7 +944,7 @@ QString GBACartLabel()
}
-void ROMIcon(u8 (&data)[512], u16 (&palette)[16], u32* iconRef)
+void ROMIcon(const u8 (&data)[512], const u16 (&palette)[16], u32* iconRef)
{
int index = 0;
for (int i = 0; i < 4; i++)
@@ -975,7 +975,7 @@ void ROMIcon(u8 (&data)[512], u16 (&palette)[16], u32* iconRef)
#define SEQ_BMP(i) ((i & 0b0000011100000000) >> 8)
#define SEQ_DUR(i) ((i & 0b0000000011111111) >> 0)
-void AnimatedROMIcon(u8 (&data)[8][512], u16 (&palette)[8][16], u16 (&sequence)[64], u32 (&animatedTexRef)[32 * 32 * 64], std::vector<int> &animatedSequenceRef)
+void AnimatedROMIcon(const u8 (&data)[8][512], const u16 (&palette)[8][16], const u16 (&sequence)[64], u32 (&animatedTexRef)[32 * 32 * 64], std::vector<int> &animatedSequenceRef)
{
for (int i = 0; i < 64; i++)
{
diff --git a/src/frontend/qt_sdl/ROMManager.h b/src/frontend/qt_sdl/ROMManager.h
index 1ec0fe5..8e199db 100644
--- a/src/frontend/qt_sdl/ROMManager.h
+++ b/src/frontend/qt_sdl/ROMManager.h
@@ -57,9 +57,9 @@ void UndoStateLoad();
void EnableCheats(bool enable);
ARCodeFile* GetCheatFile();
-void ROMIcon(u8 (&data)[512], u16 (&palette)[16], u32* iconRef);
-void AnimatedROMIcon(u8 (&data)[8][512], u16 (&palette)[8][16],
- u16 (&sequence)[64], u32 (&animatedTexRef)[32 * 32 * 64],
+void ROMIcon(const u8 (&data)[512], const u16 (&palette)[16], u32* iconRef);
+void AnimatedROMIcon(const u8 (&data)[8][512], const u16 (&palette)[8][16],
+ const u16 (&sequence)[64], u32 (&animatedTexRef)[32 * 32 * 64],
std::vector<int> &animatedSequenceRef);
}