From 2bc26e7d39c0f72e2146b03dd659b9cc1a3dda5a Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Tue, 4 Jun 2024 10:20:52 -0700
Subject: [PATCH] more cleanup

---
 src/code_8097670.c | 59 ++++++++++++++++++++++++++++++++++++++++
 src/code_8097DD0.c | 68 ----------------------------------------------
 2 files changed, 59 insertions(+), 68 deletions(-)

diff --git a/src/code_8097670.c b/src/code_8097670.c
index 1744a2282..3c12ee8fa 100644
--- a/src/code_8097670.c
+++ b/src/code_8097670.c
@@ -351,3 +351,62 @@ void sub_8097944(void)
     sub_80976F8(7);
   }
 }
+
+void sub_8097C18(struct unkStruct_8094924 *r0)
+{
+    sub_8097944();
+    SaveIntegerBits(r0, &gUnknown_203B494->numAdventures, 0x11);
+    SaveIntegerBits(r0, &gUnknown_203B494->unk8, 0x11);
+    SaveIntegerBits(r0, &gUnknown_203B494->unkC, 0x11);
+    SaveIntegerBits(r0, &gUnknown_203B494->unk0, 0x20);
+    SaveIntegerBits(r0, &gUnknown_203B494->unk14, 0xE);
+    SaveIntegerBits(r0, &gUnknown_203B494->unk16, 0xE);
+    SaveIntegerBits(r0, &gUnknown_203B494->unk18, 0x9);
+    SaveIntegerBits(r0, &gUnknown_203B494->unkC0, 0x11);
+    SaveIntegerBits(r0, gUnknown_203B494->unk1C, 0xE0 << 1);
+    SaveIntegerBits(r0, gUnknown_203B494->unk54, 0xE0 << 1);
+    SaveIntegerBits(r0, gUnknown_203B494->unk8C, 0xD0 << 1);
+    SaveDungeonLocation(r0, &gUnknown_203B494->dungeonLocation);
+}
+
+void sub_8097CC0(struct unkStruct_8094924 *r0)
+{
+    RestoreIntegerBits(r0, &gUnknown_203B494->numAdventures, 0x11);
+    RestoreIntegerBits(r0, &gUnknown_203B494->unk8, 0x11);
+    RestoreIntegerBits(r0, &gUnknown_203B494->unkC, 0x11);
+    RestoreIntegerBits(r0, &gUnknown_203B494->unk0, 0x20);
+    RestoreIntegerBits(r0, &gUnknown_203B494->unk14, 0xE);
+    RestoreIntegerBits(r0, &gUnknown_203B494->unk16, 0xE);
+    RestoreIntegerBits(r0, &gUnknown_203B494->unk18, 0x9);
+    RestoreIntegerBits(r0, &gUnknown_203B494->unkC0, 0x11);
+    RestoreIntegerBits(r0, gUnknown_203B494->unk1C, 0xE0 << 1);
+    RestoreIntegerBits(r0, gUnknown_203B494->unk54, 0xE0 << 1);
+    RestoreIntegerBits(r0, gUnknown_203B494->unk8C, 0xD0 << 1);
+    RestoreDungeonLocation(r0, &gUnknown_203B494->dungeonLocation);
+}
+
+// Save something...
+u32 sub_8097D60(u8 *r0, u32 size)
+{
+    struct unkStruct_8094924 backup;
+    xxx_init_struct_8094924_save_809486C(&backup, r0, size);
+    WriteGameOptions(&backup);
+    WritePlayTime(&backup);
+    sub_8097C18(&backup);
+    WriteExclusivePokemon(&backup);
+    nullsub_102(&backup);
+    return backup.unk8;
+}
+
+// Read something...
+u32 sub_8097D98(u8 *r0, u32 size)
+{
+    struct unkStruct_8094924 backup;
+    xxx_init_struct_8094924_restore_809485C(&backup, r0, size);
+    ReadGameOptions(&backup);
+    ReadPlayTime(&backup);
+    sub_8097CC0(&backup);
+    ReadExclusivePokemon(&backup);
+    nullsub_102(&backup);
+    return backup.unk8;
+}
diff --git a/src/code_8097DD0.c b/src/code_8097DD0.c
index d7e6f04e9..7d1277eb4 100644
--- a/src/code_8097DD0.c
+++ b/src/code_8097DD0.c
@@ -1,72 +1,4 @@
 #include "global.h"
-#include "code_8092334.h"
-#include "code_8097670.h"
-#include "pokemon.h"
-#include "exclusive_pokemon.h"
-
-extern void SaveDungeonLocation(struct unkStruct_8094924*, DungeonLocation*);
-extern void RestoreDungeonLocation(struct unkStruct_8094924*, DungeonLocation*);
-void ReadGameOptions(struct unkStruct_8094924 *param_1);
-void ReadPlayTime(struct unkStruct_8094924 *r0);
-void WriteGameOptions(struct unkStruct_8094924 *param_1);
-void WritePlayTime(struct unkStruct_8094924 *r0);
-
-void sub_8097C18(struct unkStruct_8094924 *r0)
-{
-    sub_8097944();
-    SaveIntegerBits(r0, &gUnknown_203B494->numAdventures, 0x11);
-    SaveIntegerBits(r0, &gUnknown_203B494->unk8, 0x11);
-    SaveIntegerBits(r0, &gUnknown_203B494->unkC, 0x11);
-    SaveIntegerBits(r0, &gUnknown_203B494->unk0, 0x20);
-    SaveIntegerBits(r0, &gUnknown_203B494->unk14, 0xE);
-    SaveIntegerBits(r0, &gUnknown_203B494->unk16, 0xE);
-    SaveIntegerBits(r0, &gUnknown_203B494->unk18, 0x9);
-    SaveIntegerBits(r0, &gUnknown_203B494->unkC0, 0x11);
-    SaveIntegerBits(r0, gUnknown_203B494->unk1C, 0xE0 << 1);
-    SaveIntegerBits(r0, gUnknown_203B494->unk54, 0xE0 << 1);
-    SaveIntegerBits(r0, gUnknown_203B494->unk8C, 0xD0 << 1);
-    SaveDungeonLocation(r0, &gUnknown_203B494->dungeonLocation);
-}
-
-void sub_8097CC0(struct unkStruct_8094924 *r0)
-{
-    RestoreIntegerBits(r0, &gUnknown_203B494->numAdventures, 0x11);
-    RestoreIntegerBits(r0, &gUnknown_203B494->unk8, 0x11);
-    RestoreIntegerBits(r0, &gUnknown_203B494->unkC, 0x11);
-    RestoreIntegerBits(r0, &gUnknown_203B494->unk0, 0x20);
-    RestoreIntegerBits(r0, &gUnknown_203B494->unk14, 0xE);
-    RestoreIntegerBits(r0, &gUnknown_203B494->unk16, 0xE);
-    RestoreIntegerBits(r0, &gUnknown_203B494->unk18, 0x9);
-    RestoreIntegerBits(r0, &gUnknown_203B494->unkC0, 0x11);
-    RestoreIntegerBits(r0, gUnknown_203B494->unk1C, 0xE0 << 1);
-    RestoreIntegerBits(r0, gUnknown_203B494->unk54, 0xE0 << 1);
-    RestoreIntegerBits(r0, gUnknown_203B494->unk8C, 0xD0 << 1);
-    RestoreDungeonLocation(r0, &gUnknown_203B494->dungeonLocation);
-}
-
-u32 sub_8097D60(u8 *r0, u32 size)
-{
-    struct unkStruct_8094924 backup;
-    xxx_init_struct_8094924_save_809486C(&backup, r0, size);
-    WriteGameOptions(&backup);
-    WritePlayTime(&backup);
-    sub_8097C18(&backup);
-    WriteExclusivePokemon(&backup);
-    nullsub_102(&backup);
-    return backup.unk8;
-}
-
-u32 sub_8097D98(u8 *r0, u32 size)
-{
-    struct unkStruct_8094924 backup;
-    xxx_init_struct_8094924_restore_809485C(&backup, r0, size);
-    ReadGameOptions(&backup);
-    ReadPlayTime(&backup);
-    sub_8097CC0(&backup);
-    ReadExclusivePokemon(&backup);
-    nullsub_102(&backup);
-    return backup.unk8;
-}
 
 bool8 sub_8097DD0(s32 *param_1, s32 *param_2)
 {