Skip to content

Commit 9c75737

Browse files
SuperSaiyajinStackZSuperSaiyajinStackZ
committed
SAV -> Sav (Part 1).
Lol, SAV sounds like i'd be mad.
1 parent 19d62d2 commit 9c75737

22 files changed

Lines changed: 267 additions & 910 deletions

‎include/gba/GBAHouseItem.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
NOTE:
3535
Items from your Inventory and the ones from your House have different structures, hence it's a separate class.
3636
Also the House Items are annoying handled as well.
37-
Each item of the room changes the offsets to + 0x6 for data after 0xD6 of the SAVSlot.
37+
Each item of the room changes the offsets to + 0x6 for data after 0xD6 of the SavSlot.
3838
*/
3939
namespace S2Editor {
4040
enum class GBAHouseItemDirection : uint8_t { Right = 0x1, Down = 0x3, Left = 0x5, Up = 0x7, Invalid = 0xFF };

‎include/gba/GBASav.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232

3333

3434
namespace S2Editor {
35-
class GBASAV {
35+
class GBASav {
3636
public:
37-
GBASAV(const std::string &SAVFile);
38-
GBASAV(std::unique_ptr<uint8_t[]> &Data, const uint32_t Size);
37+
GBASav(const std::string &SavFile);
38+
GBASav(std::unique_ptr<uint8_t[]> &Data, const uint32_t Size);
3939

4040
void ValidationCheck();
4141

‎include/nds/NDSSav.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232

3333

3434
namespace S2Editor {
35-
class NDSSAV {
35+
class NDSSav {
3636
public:
37-
NDSSAV(const std::string &SAVFile);
38-
NDSSAV(std::unique_ptr<uint8_t[]> &Data, const uint32_t Size);
37+
NDSSav(const std::string &SavFile);
38+
NDSSav(std::unique_ptr<uint8_t[]> &Data, const uint32_t Size);
3939

4040
void ValidationCheck();
4141
int8_t FetchSlot(const uint8_t SavSlot, const uint8_t Reg);

‎include/shared/CoreCommon.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535

3636
namespace S2Editor {
37-
enum class SAVType : uint8_t { _GBA = 0x0, _NDS, _NONE };
37+
enum class SavType : uint8_t { _GBA = 0x0, _NDS, _NONE };
3838
enum class NDSSavRegion : uint8_t { Unknown = 0x0, Int, Jpn };
3939
};
4040

‎include/shared/SAVUtils.hpp‎

Lines changed: 0 additions & 138 deletions
This file was deleted.

‎source/gba/GBACast.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,35 @@
2525
*/
2626

2727
#include "GBACast.hpp"
28-
#include "../shared/SAVUtils.hpp"
28+
#include "../shared/SavUtils.hpp"
2929

3030

3131
namespace S2Editor {
3232
/* Get and Set Friendly Conversation level. */
33-
uint8_t GBACast::Friendly() const { return GBASAVUtils::Read<uint8_t>(this->Offs); };
34-
void GBACast::Friendly(const uint8_t V) { GBASAVUtils::Write<uint8_t>(this->Offs, std::min<uint8_t>(3, V)); };
33+
uint8_t GBACast::Friendly() const { return GBASavUtils::Read<uint8_t>(this->Offs); };
34+
void GBACast::Friendly(const uint8_t V) { GBASavUtils::Write<uint8_t>(this->Offs, std::min<uint8_t>(3, V)); };
3535

3636
/* Get and Set Romance Conversation level. */
37-
uint8_t GBACast::Romance() const { return GBASAVUtils::Read<uint8_t>(this->Offs + 0x1); };
38-
void GBACast::Romance(const uint8_t V) { GBASAVUtils::Write<uint8_t>(this->Offs + 0x1, std::min<uint8_t>(3, V)); };
37+
uint8_t GBACast::Romance() const { return GBASavUtils::Read<uint8_t>(this->Offs + 0x1); };
38+
void GBACast::Romance(const uint8_t V) { GBASavUtils::Write<uint8_t>(this->Offs + 0x1, std::min<uint8_t>(3, V)); };
3939

4040
/* Get and Set Intimidate Conversation level. */
41-
uint8_t GBACast::Intimidate() const { return GBASAVUtils::Read<uint8_t>(this->Offs + 0x2); };
42-
void GBACast::Intimidate(const uint8_t V) { GBASAVUtils::Write<uint8_t>(this->Offs + 0x2, std::min<uint8_t>(3, V)); };
41+
uint8_t GBACast::Intimidate() const { return GBASavUtils::Read<uint8_t>(this->Offs + 0x2); };
42+
void GBACast::Intimidate(const uint8_t V) { GBASavUtils::Write<uint8_t>(this->Offs + 0x2, std::min<uint8_t>(3, V)); };
4343

4444
/* Get and Set Cast Feeling. */
45-
GBACastFeeling GBACast::Feeling() const { return (GBACastFeeling)GBASAVUtils::Read<uint8_t>(this->Offs + 0x3); };
46-
void GBACast::Feeling(const GBACastFeeling V) { GBASAVUtils::Write<uint8_t>(this->Offs + 0x3, (uint8_t)V); };
45+
GBACastFeeling GBACast::Feeling() const { return (GBACastFeeling)GBASavUtils::Read<uint8_t>(this->Offs + 0x3); };
46+
void GBACast::Feeling(const GBACastFeeling V) { GBASavUtils::Write<uint8_t>(this->Offs + 0x3, (uint8_t)V); };
4747

4848
/* Get and Set the hours how long the feeling lasts. */
49-
uint8_t GBACast::FeelingEffectHours() const { return GBASAVUtils::Read<uint8_t>(this->Offs + 0x6); };
50-
void GBACast::FeelingEffectHours(const uint8_t V) { GBASAVUtils::Write<uint8_t>(this->Offs + 0x6, V); };
49+
uint8_t GBACast::FeelingEffectHours() const { return GBASavUtils::Read<uint8_t>(this->Offs + 0x6); };
50+
void GBACast::FeelingEffectHours(const uint8_t V) { GBASavUtils::Write<uint8_t>(this->Offs + 0x6, V); };
5151

5252
/* Get and Set registered on phone state. */
53-
bool GBACast::RegisteredOnPhone() const { return GBASAVUtils::Read<uint8_t>(this->Offs + 0x7); };
54-
void GBACast::RegisteredOnPhone(const bool V) { GBASAVUtils::Write<uint8_t>(this->Offs + 0x7, V); };
53+
bool GBACast::RegisteredOnPhone() const { return GBASavUtils::Read<uint8_t>(this->Offs + 0x7); };
54+
void GBACast::RegisteredOnPhone(const bool V) { GBASavUtils::Write<uint8_t>(this->Offs + 0x7, V); };
5555

5656
/* Get and Set Secret Unlock state. */
57-
bool GBACast::Secret() const { return GBASAVUtils::Read<uint8_t>(this->Offs + 0x8); };
58-
void GBACast::Secret(const bool V) { GBASAVUtils::Write<uint8_t>(this->Offs + 0x8, V); };
57+
bool GBACast::Secret() const { return GBASavUtils::Read<uint8_t>(this->Offs + 0x8); };
58+
void GBACast::Secret(const bool V) { GBASavUtils::Write<uint8_t>(this->Offs + 0x8, V); };
5959
};

‎source/gba/GBAEpisode.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
*/
2626

2727
#include "GBAEpisode.hpp"
28-
#include "../shared/SAVUtils.hpp"
28+
#include "../shared/SavUtils.hpp"
2929

3030

3131
namespace S2Editor {
3232
/* Get and Set Episode Ratings. */
3333
uint8_t GBAEpisode::Rating(const uint8_t Category) const {
34-
return GBASAVUtils::Read<uint8_t>(this->Offs + std::min<uint8_t>(3, Category));
34+
return GBASavUtils::Read<uint8_t>(this->Offs + std::min<uint8_t>(3, Category));
3535
};
3636
void GBAEpisode::Rating(const uint8_t Category, const uint8_t V) {
37-
GBASAVUtils::Write<uint8_t>(this->Offs + std::min<uint8_t>(3, Category), std::min<uint8_t>(25, V));
37+
GBASavUtils::Write<uint8_t>(this->Offs + std::min<uint8_t>(3, Category), std::min<uint8_t>(25, V));
3838
};
3939

4040
/* Get and Set the Unlocked State. */
41-
bool GBAEpisode::State() const { return GBASAVUtils::Read<uint8_t>(this->Offs + 0x4); };
42-
void GBAEpisode::State(const bool V) { GBASAVUtils::Write<uint8_t>(this->Offs + 0x4, V); };
41+
bool GBAEpisode::State() const { return GBASavUtils::Read<uint8_t>(this->Offs + 0x4); };
42+
void GBAEpisode::State(const bool V) { GBASavUtils::Write<uint8_t>(this->Offs + 0x4, V); };
4343
};

‎source/gba/GBAHouse.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
*/
2626

2727
#include "GBAHouse.hpp"
28-
#include "../shared/SAVUtils.hpp"
28+
#include "../shared/SavUtils.hpp"
2929

3030

3131
namespace S2Editor {
3232
/*
3333
Get and Set the Room Design.
3434
Only 0 - 3 SHOULD be used at all, the others aren't actual room designs and instead may cause issues.
3535
*/
36-
uint8_t GBAHouse::Roomdesign() const { return GBASAVUtils::ReadBits(this->Offs + 0x2E, true); };
37-
void GBAHouse::Roomdesign(const uint8_t V) { GBASAVUtils::WriteBits(this->Offs + 0x2E, true, V); };
36+
uint8_t GBAHouse::Roomdesign() const { return GBASavUtils::ReadBits(this->Offs + 0x2E, true); };
37+
void GBAHouse::Roomdesign(const uint8_t V) { GBASavUtils::WriteBits(this->Offs + 0x2E, true, V); };
3838

3939
/* Get the Items of your House / Room. */
4040
std::unique_ptr<GBAHouseItem> GBAHouse::Items() const { return std::make_unique<GBAHouseItem>(this->Offs + 0xD6); };

0 commit comments

Comments
 (0)