Merge branch 'master' into unk_0200CABC

4 files changed, 15 insertions, 2 deletions

diff --git a/include/main.h b/include/main.h
index ba4d7bc2..87110de5 100644
--- a/include/main.h
+++ b/include/main.h
@@ -94,7 +94,7 @@ struct Main
     u16 touchNew;
     u16 touchHeld;
     u8 touchpadReadAuto;
-    u8 unk65;
+    u8 screensFlipped;
     u8 unk66;
     u8 unk67;
     u8 softResetDisabled;
diff --git a/include/save_block_2.h b/include/save_block_2.h
index a4514c96..fb2bc92a 100644
--- a/include/save_block_2.h
+++ b/include/save_block_2.h
@@ -152,6 +152,6 @@ BOOL FlashLoadChunk(u32 src, void * dest, u32 size);
 void FlashWriteCommandCallback(void * arg);
 int FlashWriteChunkInternal(u32 dest, void * src, u32 size);
 BOOL WaitFlashWrite(int lock, BOOL * res);
-void SaveErrorHandling(int lock, int errno);
+void SaveErrorHandling(int lock, u32 errno);
 
 #endif //POKEDIAMOND_SAVE_BLOCK_2_H
diff --git a/include/save_data_read_error.h b/include/save_data_read_error.h
new file mode 100644
index 00000000..d3556734
--- /dev/null
+++ b/include/save_data_read_error.h
@@ -0,0 +1,7 @@
+#ifndef POKEDIAMOND_SAVE_DATA_READ_ERROR_H
+#define POKEDIAMOND_SAVE_DATA_READ_ERROR_H
+
+void ShowSaveDataReadError(u32 heap_id);
+void ShowGBACartRemovedError(u32 heap_id);
+
+#endif
diff --git a/include/save_data_write_error.h b/include/save_data_write_error.h
new file mode 100644
index 00000000..e4c77453
--- /dev/null
+++ b/include/save_data_write_error.h
@@ -0,0 +1,6 @@
+#ifndef POKEDIAMOND_SAVE_DATA_WRITE_ERROR_H
+#define POKEDIAMOND_SAVE_DATA_WRITE_ERROR_H
+
+void ShowSaveDataWriteError(u32 heap_id, u32 err_no);
+
+#endif