From 557a8a5d83db6381f2986946bf6f98178818781d Mon Sep 17 00:00:00 2001
From: Sheila Aman <sheila@vulpine.house>
Date: Sat, 22 May 2021 01:29:51 -0500
Subject: [PATCH] Preliminary support for Project Demi-inspired innate ability
 mods

---
 readme.html    |  7 ++++--
 src/data.hh    |  9 ++++++++
 src/exdeath.cc | 62 ++++++++++++++++++++++++++++++++++++++++++--------
 src/exdeath.hh | 31 ++++++++++++++++++-------
 4 files changed, 90 insertions(+), 19 deletions(-)
 create mode 100644 src/data.hh
diff --git a/readme.html b/readme.html
index 8cbe501..de46fa5 100644
--- a/readme.html
+++ b/readme.html
@@ -12,7 +12,9 @@ body {
 	<head>
 	<body>
 		<h2>Exdeath</h2>
-		<p>Exdeath is a patch compactor, a tool that applies multiple patches to a single target file. This version (0.2) provides the following options:</p>
+		<p>Exdeath is a patch compactor, a tool that applies multiple patches to a single target file. You will need the US version of the Gameboy Advance release, which you can find through your favourite search engine. This version provides the following features:</p>
+		<h3>Main</h3>
+		<p>The real meat of the program: the patches.</p>
 		<ul>
 			<li>Base:<ul>
 				<li>None &mdash; The base game.</li>
@@ -24,7 +26,8 @@ body {
 			<li><a href="https://drive.google.com/file/d/1kQeTEu55-Pt_0-fLSYIeUW50LxW6CcLN/view?usp=sharing">Double AP</a>: This option doubles the ABP gains, making it faster to master Jobs (most relevant for !Dualcast).</li>
 			<li><a href="http://www.romhacking.net/hacks/563/">Sound Restoration</a>: This option modifies the soundfont and corrects some slow-down issues. It can cause artifacting, however. Older versions of VisualBoyAdvance will require the GBA BIOS file in order to run normally with this option.</li>
 		</ul>
-		<p>You will need the US version of the Gameboy Advance release, which you can find through your favourite search engine.</p>
+		<h3>Innate abilities</h3>
+		<p>Each checkbox applies the listed innate ability to all Jobs.</p>
 	</body>
 </html>
 
diff --git a/src/data.hh b/src/data.hh
new file mode 100644
index 0000000..2332ba5
--- /dev/null
+++ b/src/data.hh
@@ -0,0 +1,9 @@
+enum Job {
+    Passages = 0x01,
+    Pitfalls = 0x02,
+    LiteStep = 0x04,
+    Dash     = 0x08,
+    Learning = 0x10
+};
+
+const long int job_innates = 0x156138;
diff --git a/src/exdeath.cc b/src/exdeath.cc
index ce7734a..8735e97 100644
--- a/src/exdeath.cc
+++ b/src/exdeath.cc
@@ -34,9 +34,20 @@ Exdeath::Exdeath(QWidget *parent) : QWidget(parent) {
 	error = new QErrorMessage();
 	filename = nullptr;
 
+	layContainer = new QVBoxLayout(this);
+
 	layMain = new QGridLayout(this);
 	layMode = new QVBoxLayout(this);
+	layDemi = new QVBoxLayout(this);
 
+	grpMain = new QGroupBox("Main");
+	grpMain->setLayout(layMain);
+	grpDemi = new QGroupBox("Innate abilities");
+	grpDemi->setLayout(layDemi);
+	layContainer->addWidget(grpMain);
+	layContainer->addWidget(grpDemi);
+
+	// Main options
 	txtROM       = new QLabel("ROM:");
 	txtMode      = new QLabel("Mode:");
 	txtPortraits = new QLabel("FFT-style Portraits:");
@@ -46,6 +57,7 @@ Exdeath::Exdeath(QWidget *parent) : QWidget(parent) {
 
 	btnROM   = new QPushButton("Select ROM");
 	btnApply = new QPushButton("Apply");
+	layContainer->addWidget(btnApply);
 
 	radBase    = new QRadioButton("Base");
 	radFiesta  = new QRadioButton("Fiesta");
@@ -71,8 +83,18 @@ Exdeath::Exdeath(QWidget *parent) : QWidget(parent) {
 	layMain->addWidget(chkAP, 3, 1);
 	layMain->addWidget(txtSound, 4, 0);
 	layMain->addWidget(chkSound, 4, 1);
-	layMain->addWidget(btnApply, 5, 1);
 
+	// Project Demi options
+	chkPassages = new QCheckBox("Innate Passages");
+	chkPitfalls = new QCheckBox("Innate Pitfalls");
+	chkLiteStep = new QCheckBox("Innate Light Step");
+	chkDash     = new QCheckBox("Innate Dash");
+	chkLearning = new QCheckBox("Innate Learning");
+	layDemi->addWidget(chkPassages);
+	layDemi->addWidget(chkPitfalls);
+	layDemi->addWidget(chkLiteStep);
+	layDemi->addWidget(chkDash);
+	layDemi->addWidget(chkLearning);
 	connect(btnROM, &QPushButton::clicked, this, &Exdeath::btnROM_clicked);
 	connect(btnApply, &QPushButton::clicked, this, &Exdeath::btnApply_clicked);
 }
@@ -129,17 +151,16 @@ void Exdeath::btnApply_clicked(bool trigger) {
 		patches << ":/patches/sound_restoration.ips";
 	}
 
-	if (patches.size() == 0) {
-		return;
-	}
-
 	target = new QFile(output);
 	target->open(QIODevice::ReadWrite);
-
-	for (int i = 0; i < patches.size(); i++) {
-		applyPatch(target, patches[i]);
+	if (patches.size() != 0) {
+		for (int i = 0; i < patches.size(); i++) {
+			applyPatch(target, patches[i]);
+		}
+	}
+	if (chkPassages->isChecked() || chkPitfalls->isChecked() || chkLiteStep->isChecked() || chkDash->isChecked() || chkLearning->isChecked()) {
+		applyDemi(target);
 	}
-
 	target->close();
 }
 
@@ -183,3 +204,26 @@ void Exdeath::applyPatch(QFile *file, QString patch) {
 	file->flush();
 	data->close();
 }
+void Exdeath::applyDemi(QFile *file) {
+	unsigned char base = 0;
+
+	if (!(radBase->isChecked() || radFiesta->isChecked())) {
+		error->showMessage("You must use Base or Fiesta to use these options.");
+		return;
+	}
+
+	if (chkPassages->isChecked()) base |= Job::Passages;
+	if (chkPitfalls->isChecked()) base |= Job::Pitfalls;
+	if (chkLiteStep->isChecked()) base |= Job::LiteStep;
+	if (chkDash->isChecked())     base |= Job::Dash;
+	if (chkLearning->isChecked()) base |= Job::Learning;
+
+	for (int i = 0; i < 26; i++) {
+		char temp[2];
+		file->seek(job_innates + (i * 2));
+		file->read(temp, 2);
+		temp[0] |= base;
+		file->seek(job_innates + (i * 2));
+		file->write(temp, 2);
+	}
+}
diff --git a/src/exdeath.hh b/src/exdeath.hh
index 0defa5c..1d01381 100644
--- a/src/exdeath.hh
+++ b/src/exdeath.hh
@@ -1,19 +1,22 @@
 #ifndef EXDEATH_HH_GUARD
 #define EXDEATH_HH_GUARD
 
-#include <QWidget>
+#include <QCheckBox>
+#include <QCryptographicHash>
+#include <QErrorMessage>
+#include <QFile>
+#include <QFileDialog>
 #include <QGridLayout>
-#include <QVBoxLayout>
+#include <QGroupBox>
+#include <QIODevice>
 #include <QLabel>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QCheckBox>
-#include <QFileDialog>
 #include <QStandardPaths>
-#include <QFile>
-#include <QIODevice>
-#include <QCryptographicHash>
-#include <QErrorMessage>
+#include <QVBoxLayout>
+#include <QWidget>
+
+#include "data.hh"
 
 class Exdeath : public QWidget {
 public:
@@ -25,8 +28,10 @@ private:
 
 	QErrorMessage *error;
 
+	QVBoxLayout *layContainer;
 	QGridLayout *layMain;
 	QVBoxLayout *layMode;
+	QGroupBox *grpMain;
 
 	QLabel *txtROM;
 	QLabel *txtMode;
@@ -46,9 +51,19 @@ private:
 	QCheckBox *chkAP;
 	QCheckBox *chkSound;
 
+	QGroupBox *grpDemi;
+	QVBoxLayout *layDemi;
+	
+	QCheckBox *chkPassages;
+	QCheckBox *chkPitfalls;
+	QCheckBox *chkLiteStep;
+	QCheckBox *chkDash;
+	QCheckBox *chkLearning;
+
 	void btnROM_clicked(bool trigger);
 	void btnApply_clicked(bool trigger);
 	void applyPatch(QFile *file, QString patch);
+	void applyDemi(QFile *file);
 };
 
 #endif
\ No newline at end of file
