From e0667115537c45a4de6baf4080dacbd50aac677f Mon Sep 17 00:00:00 2001
From: unknown <pheenoh@gmail.com>
Date: Fri, 25 Dec 2020 21:11:16 -0500
Subject: [PATCH] add missing class in d_save and clang-format

---
 .clang-format                    | 73 ++++++++++++++++++++++++++++++++
 include/d/d_save/d_save/d_save.h | 14 ++++--
 2 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 .clang-format

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000000..81456b86b9a
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,73 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     100
+CommentPragmas:  '^ (IWYU pragma:|NOLINT)'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ForEachMacros:   []
+IncludeCategories:
+  - Regex:           '^<[Ww]indows\.h>$'
+    Priority:        1
+  - Regex:           '^<'
+    Priority:        2
+  - Regex:           '^"'
+    Priority:        3
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth:        4
+UseTab:          false
+...
diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h
index 5190ca29b40..5efbe9cfbaa 100644
--- a/include/d/d_save/d_save/d_save.h
+++ b/include/d/d_save/d_save/d_save.h
@@ -1,5 +1,5 @@
-#ifndef D_SAVE_H_
-#define D_SAVE_H_
+#ifndef __D_SAVE_H_
+#define __D_SAVE_H_
 
 #include "dolphin/types.h"
 #include "global.h"
@@ -658,6 +658,7 @@ class dSv_player_config_c {
     u8 unk9;
     u8 unk10;
     u8 unk11;
+    u8 padding[4];
 };
 
 class dSv_player_c {
@@ -871,6 +872,12 @@ class dSv_turnRestart_c {
     s8 unk18;
 };
 
+class dSv_reserve_c {
+   public:
+   private:
+    u8 unk[80];
+};
+
 class dSv_save_c {
    public:
     void init(void);
@@ -887,11 +894,10 @@ class dSv_save_c {
 
    private:
     dSv_player_c player;
-    u8 unk492[4];
     dSv_memory_c area_flags[32];
     dSv_memory2_c unk_flags[64];
     dSv_event_c event_flags;
-    u8 unk2288[80];
+    dSv_reserve_c reserve;
     dSv_MiniGame_c minigame_flags;
 };