Handle the Movement thing a bit different.

SuperSaiyajinStackZ · SuperSaiyajinStackZ · commit a7cee9ff9d02 · 2021-03-28T21:01:13.000+02:00
diff --git a/include/gba/GBASlot.hpp b/include/gba/GBASlot.hpp
@@ -36,7 +36,7 @@
 
 class GBASlot {
 public:
-	GBASlot(const uint8_t Slot, const uint8_t AddOffs = 0) : Move(AddOffs), Slot(Slot), Offs(Slot * 0x1000) { };
+	GBASlot(const uint8_t Slot) : Slot(Slot), Offs(Slot * 0x1000) { };
 
 	uint16_t Time() const;
 	void Time(const uint16_t V);
@@ -108,12 +108,10 @@ class GBASlot {
 
 	bool FixChecksum();
 private:
-	uint8_t Move = 0;
 	uint8_t Slot = 0;
 	uint32_t Offs = 0;
 
-	/* The House Item Amount seems to affect some stuff and move things around for 0x6 per Item. */
-	uint32_t Offset(const uint32_t DefaultOffs = 0x0) const { return this->Offs + DefaultOffs + (this->Move * 0x6); };
+	uint32_t Offset(const uint32_t DefaultOffs = 0x0) const;
 
 	/* This contains all official Episode Values found at offset (Slot * 0x1000) + 0x1A9. */
 	static constexpr uint8_t EPVals[12] = {
diff --git a/source/gba/GBAHouseItem.cpp b/source/gba/GBAHouseItem.cpp
@@ -142,6 +142,8 @@ void GBAHouseItem::Direction(const uint8_t Index, const GBAHouseItemDirection V)
 /*
 	Add an Item to the House.
 	This needs to be handled like this, because things move 0x6 bytes up when an Item is being added.
+
+	NOTE: The game seems to handle it the other way than this, by doing an insert or something at the 0xD7'th byte, but this way works too.
 */
 bool GBAHouseItem::AddItem(const uint8_t ID, const uint8_t Flag, const uint8_t UseCount, const uint8_t XPos, const uint8_t YPos, const GBAHouseItemDirection Direction) {
 	if (this->Count() == 0xC) return false; // Not allowed to add more than 0xC / 12 Items.
diff --git a/source/gba/GBASav.cpp b/source/gba/GBASav.cpp
@@ -75,12 +75,7 @@ bool GBASAV::SlotExist(const uint8_t Slot) {
 std::unique_ptr<GBASlot> GBASAV::Slot(const uint8_t Slot) {
 	if (!this->SlotExist(Slot)) return nullptr;
 
-	/*
-		The second parameter are the Item count inside the House.
-		This seems to affect things after the House Items to move for 0x6 per House Item.
-		Max Count seems to be 0xC, sooo.. `DefaultOffs + (0xC * 0x6)` which is 0x48 / 72.
-	*/
-	return std::make_unique<GBASlot>(Slot, this->SAVData.get()[(Slot * 0x1000) + 0xD6]);
+	return std::make_unique<GBASlot>(Slot);
 };
 
 /* Get a Settings class. */
diff --git a/source/gba/GBASlot.cpp b/source/gba/GBASlot.cpp
@@ -28,6 +28,15 @@
 #include "../shared/Checksum.hpp"
 #include "../shared/SAVUtils.hpp"
 
+/*
+	The House Item Amount seems to affect some stuff and move things around for 0x6 per Item.
+	So, we get the Item Count of the House from the 0xD6'th Byte from the GBASlot.
+
+	const uint32_t DefaultOffs: The Default Offset, for things without an Item in your house.
+*/
+uint32_t GBASlot::Offset(const uint32_t DefaultOffs) const { return this->Offs + DefaultOffs + (GBASAVUtils::Read<uint8_t>(this->Offs + 0xD6) * 0x6); };
+
+
 /* Get and Set Time. */
 uint16_t GBASlot::Time() const { return GBASAVUtils::Read<uint16_t>(this->Offs + 0x2); };
 void GBASlot::Time(const uint16_t V) { GBASAVUtils::Write<uint16_t>(this->Offs + 0x2, V); };
@@ -142,7 +151,7 @@ void GBASlot::CurrentEpisode(const uint8_t V, const bool ValidCheck) {
 };
 
 /* Get an Episode class. */
-std::unique_ptr<GBAEpisode> GBASlot::Episode(const uint8_t EP) const { return std::make_unique<GBAEpisode>(this->Slot, EP, this->Move); };
+std::unique_ptr<GBAEpisode> GBASlot::Episode(const uint8_t EP) const { return std::make_unique<GBAEpisode>(this->Slot, EP, GBASAVUtils::Read<uint8_t>(this->Offs + 0xD6)); };
 
 /* Get a Cast class. */
 std::unique_ptr<GBACast> GBASlot::Cast(const uint8_t CST) const {
