From f3845bdeddd7fce3eab967922b664c540736c829 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Mon, 21 Sep 2020 00:28:50 -0500
Subject: more decomping of funcs

---
 src/save1.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'src/save1.c')

diff --git a/src/save1.c b/src/save1.c
index b7de6c6..1063c66 100644
--- a/src/save1.c
+++ b/src/save1.c
@@ -1,6 +1,32 @@
 #include "global.h"
 
+
+struct UnkSaveStruct1
+{
+    /* 0x0 */ u32 unk0;
+    /* 0x4 */ u32 unk4;
+    /* 0x8 */ u16 unk8;
+    /* 0xA */ u8 unkA;
+};
+
 extern void MemoryFree(void *);
+extern void sub_8011860();
+extern void xxx_draw_string_80144C4();
+extern void nullsub_8(u8);
+extern void sub_8005180();
+extern void sub_80060EC();
+extern void sub_800CB20();
+extern void sub_800485C();
+extern void CopySpritesToOam();
+extern void sub_8005304();
+extern void TransferBGPaletteBuffer();
+extern void xxx_call_update_bg_vram();
+extern void sub_8009908();
+extern void xxx_call_update_bg_sound_input();
+extern void ResetSprites(u8 r0);
+
+
+extern struct UnkSaveStruct1 *gUnknown_203B46C;
 
 extern u8 *gUnknown_203B194;
 
@@ -11,3 +37,21 @@ void sub_80129FC()
         gUnknown_203B194 = NULL;
     }
 }
+
+void sub_8012A18()
+{
+    sub_8011860();
+    xxx_draw_string_80144C4();
+    nullsub_8(gUnknown_203B46C->unkA);
+    sub_8005180();
+    sub_80060EC();
+    sub_800CB20();
+    sub_800485C();
+    CopySpritesToOam();
+    sub_8005304();
+    TransferBGPaletteBuffer();
+    xxx_call_update_bg_vram();
+    sub_8009908();
+    xxx_call_update_bg_sound_input();
+    ResetSprites(0);
+}
-- 
cgit v1.2.3


From 93ed78878789a60e9c3e7e0566f3dc8f7ed1f7d2 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sat, 26 Sep 2020 18:30:40 -0500
Subject: more decomping

---
 src/save1.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

(limited to 'src/save1.c')

diff --git a/src/save1.c b/src/save1.c
index 1063c66..5b8ad19 100644
--- a/src/save1.c
+++ b/src/save1.c
@@ -9,6 +9,28 @@ struct UnkSaveStruct1
     /* 0xA */ u8 unkA;
 };
 
+struct UnkStruct
+{
+    /* 0x0 */ u8 unk0;
+    /* 0x1 */ u8 unk1;
+    /* 0x2 */ u8 unk2;
+    /* 0x3 */ u8 unk3;
+    /* 0x4 */ u8 unk4;
+    /* 0x5 */ u32 unk5;
+    /* 0x9 */ u32 unk9;
+    /* 0xD */ u32 unkD;
+    /* 0x12 */ u32 unk11;
+    /* 0x16 */ u32 unk15;
+    /* 0x1A */ u32 unk19;
+    /* 0x1E */ u32 unk1D;
+    /* 0x24 */ u32 unk24;
+    /* 0x28 */ u8 unk28;
+    /* 0x29 */ u8 unk29;
+    /* 0x2A */ u8 unk2A;
+    /* 0x2B */ u8 unk2B;
+    /* 0x2C */ u8 unk2C;
+};
+
 extern void MemoryFree(void *);
 extern void sub_8011860();
 extern void xxx_draw_string_80144C4();
@@ -24,7 +46,8 @@ extern void xxx_call_update_bg_vram();
 extern void sub_8009908();
 extern void xxx_call_update_bg_sound_input();
 extern void ResetSprites(u8 r0);
-
+extern u32 sub_8012AE8(void);
+extern void nullsub_34(struct UnkStruct *r0);
 
 extern struct UnkSaveStruct1 *gUnknown_203B46C;
 
@@ -55,3 +78,53 @@ void sub_8012A18()
     xxx_call_update_bg_sound_input();
     ResetSprites(0);
 }
+
+u32 sub_8012A64(struct UnkStruct *r0, u32 r1)
+{
+    if(r0 == NULL)
+    {
+        return sub_8012AE8();
+    }
+    if(r1 != -1)
+    {
+        nullsub_34(r0);
+    }
+    if(r0->unk1 != 0)
+    {
+        r0->unk1 = 0;
+        return 1;
+    }
+    if(r0->unk2 == 0)
+    {
+        return sub_8012AE8();
+    }
+    r0->unk2 = r0->unk1;
+    return 2;
+}
+
+// TODO match that one line
+//u32 GetKeyPress(struct UnkStruct *r0)
+//{
+//    if(r0 == NULL)
+//    {
+//        return sub_8012AE8();
+//    }
+//    // TODO it's not a struct access..
+//    if(r0->unk29 != 0)
+//    {
+//        return 1;
+//    }
+//    if(r0->unk2A != 0)
+//    {
+//        return 2;
+//    }
+//    if(r0->unk2C != 0)
+//    {
+//        return 9;
+//    }
+//    if(r0->unk2B == 0)
+//    {
+//        return sub_8012AE8();
+//    }
+//    return 0xA;
+//}
-- 
cgit v1.2.3


From 6c9dd59b5691cd7d5a19c740e8d22779e6a101aa Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Thu, 15 Oct 2020 16:56:25 -0500
Subject: nonmatch bc I'm so close on those

---
 src/save1.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/save1.c')

diff --git a/src/save1.c b/src/save1.c
index 5b8ad19..a194557 100644
--- a/src/save1.c
+++ b/src/save1.c
@@ -1,4 +1,6 @@
 #include "global.h"
+#include "code_800558C.h"
+#include "input.h"
 
 
 struct UnkSaveStruct1
@@ -36,9 +38,7 @@ extern void sub_8011860();
 extern void xxx_draw_string_80144C4();
 extern void nullsub_8(u8);
 extern void sub_8005180();
-extern void sub_80060EC();
 extern void sub_800CB20();
-extern void sub_800485C();
 extern void CopySpritesToOam();
 extern void sub_8005304();
 extern void TransferBGPaletteBuffer();
@@ -69,7 +69,7 @@ void sub_8012A18()
     sub_8005180();
     sub_80060EC();
     sub_800CB20();
-    sub_800485C();
+    sub_800485C(); // Input related
     CopySpritesToOam();
     sub_8005304();
     TransferBGPaletteBuffer();
-- 
cgit v1.2.3