Merge crc fix and small fix

upstream into a topic branch.

Makefile

@@ -2,6 +2,10 @@
 .SUFFIXES:
 #---------------------------------------------------------------------------------
 
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
+endif
+
 TOPDIR ?= $(CURDIR)
 include $(DEVKITPRO)/libnx/switch_rules
 

source/SaveDataFactory.cpp

@@ -148,6 +148,9 @@ SaveDataFactory::SaveDataFactory(const std::string save_inPath) {
         this->~SaveDataFactory();
         throw e;
     }
+
+    // in case crc is not fixed
+    updateCRC();
 }
 
 SaveDataFactory::~SaveDataFactory() {
@@ -237,6 +240,11 @@ void SaveDataFactory::decode() {
     }
 }
 
+void SaveDataFactory::updateCRC() {
+    *(uint32_t*)&m_saveData[0x8] =
+        crc32(0L, &m_saveData[HEADER_SIZE], m_bodySize);
+}
+
 void SaveDataFactory::shuffle() {
     uint8_t* tmpBodyUnshuffled = new uint8_t[m_bodySize];
     std::memcpy(tmpBodyUnshuffled, m_saveBody_encoded, m_bodySize);

source/SaveDataFactory.h

@@ -62,6 +62,7 @@ class SaveDataFactory {
     void encode();
     void decode();
     int randBytes(uint8_t* output, const size_t output_len);
+    void updateCRC();
 
     // save shuffle
     typedef struct {

source/main.cpp

@@ -94,4 +94,4 @@ int main(int argc, char const* argv[]) {
 #endif
 
     return ret;
-}
+}