m_cpak OK (#238)

* Yaml setup

* mCPk_InitPak

* mCPk_get_pkinfo

* mCPk_PakOpen

* func_80079080_jp

* mCPk_SavePak

* func_8007919C_jp

* func_80079378_jp

* func_8007920C_jp

* func_80078EE0_jp

* func_80078EB4_jp

* func_8007942C_jp

* func_800792FC_jp

* func_800793A8_jp

* func_80079D00_jp

* func_80079BF8_jp

* func_80079B28_jp

* func_80079EA4_jp

* func_800794E4_jp

* func_80078F08_jp

* func_80079030_jp

* func_80078FE8_jp

* func_8007967C_jp

* func_80079708_jp

* func_80079760_jp

* func_80079838_jp

* func_800798DC_jp

* func_80079A24_jp

* func_80079AAC_jp

* func_80079E54_jp

* func_80079D50_jp

* func_80079E14_jp

* func_80079EDC_jp

* func_8007A008_jp

* func_80079F44_jp

* func_8007A080_jp

* func_80078F34_jp

* Some cleanup

* m_cpak

6 files changed, 106 insertions, 76 deletions

diff --git a/include/69CB30.h b/include/69CB30.h
deleted file mode 100644
index 8e5d298..0000000
--- a/include/69CB30.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef C_69CB30_H
-#define C_69CB30_H
-
-#include "ultra64.h"
-#include "unk.h"
-
-struct Animal_c;
-struct PrivateInfo;
-
-typedef struct PakInfo {
-    /* 0x00 */ UNK_TYPE1 unk_00[0x70];
-    /* 0x70 */ s32 unk_70;
-} PakInfo; // size >= 0x70
-
-s32 mCPk_PakOpen(PakInfo* info, s32 arg1);
-// void func_80078EB4_jp();
-// void func_80078EE0_jp();
-// void func_80078F08_jp();
-// void func_80078F34_jp();
-// void func_80078FE8_jp();
-// void func_80079030_jp();
-// void func_80079080_jp();
-UNK_RET mCPk_InitPak(UNK_TYPE arg0);
-// void func_8007919C_jp();
-// void func_8007920C_jp();
-// void func_800792FC_jp();
-// void func_80079378_jp();
-// void func_800793A8_jp();
-s32 mCPk_SavePak(struct PrivateInfo*, struct Animal_c*, PakInfo*);
-s32 func_8007942C_jp(struct PrivateInfo*, struct Animal_c*, PakInfo*);
-// void func_800794E4_jp();
-// void func_8007967C_jp();
-// void func_80079708_jp();
-// void func_80079760_jp();
-// void func_80079838_jp();
-// void func_800798DC_jp();
-// void func_80079A24_jp();
-// void func_80079AAC_jp();
-// void func_80079B28_jp();
-// void func_80079BF8_jp();
-// void func_80079D00_jp();
-// void func_80079D50_jp();
-// void func_80079E14_jp();
-// void func_80079E54_jp();
-// void func_80079EA4_jp();
-// void func_80079EDC_jp();
-// void func_80079F44_jp();
-// void func_8007A008_jp();
-PakInfo* mCPk_get_pkinfo(void);
-// void func_8007A080_jp();
-
-#endif
diff --git a/include/6B8F20.h b/include/6B8F20.h
index e14aba4..a829368 100644
--- a/include/6B8F20.h
+++ b/include/6B8F20.h
@@ -36,6 +36,6 @@ void func_80095414_jp(void);
 // void func_800965A8_jp();
 // void func_800965F4_jp();
 // void func_800966D8_jp();
-// void func_800966E0_jp();
+UNK_RET func_800966E0_jp(void);
 
 #endif
diff --git a/include/6F12E0.h b/include/6F12E0.h
index 168b25f..18f721e 100644
--- a/include/6F12E0.h
+++ b/include/6F12E0.h
@@ -3,16 +3,18 @@
 
 #include "ultra64.h"
 
-// void func_800CD640_jp();
-// void func_800CD68C_jp();
-// void func_800CD730_jp();
-// void func_800CD760_jp();
-// void func_800CD82C_jp();
-// void func_800CD8F8_jp();
-// void func_800CD990_jp();
-// void func_800CD9F0_jp();
-// void func_800CDA4C_jp();
-// void func_800CDA90_jp();
+#include "m_cpak.h"
+
+void func_800CD640_jp(PakInfo74Struct* arg0, void*, void*);
+UNK_RET func_800CD68C_jp(PakInfo04Struct* arg0, UNK_TYPE arg1);
+size_t func_800CD730_jp(PakInfo04Struct* arg0);
+UNK_RET func_800CD760_jp(PakInfo04Struct* arg0, UNK_TYPE arg1, u32 arg2, void* arg3);
+UNK_RET func_800CD82C_jp(PakInfo04Struct* arg0, UNK_TYPE arg1, u32 arg2, void* arg3);
+UNK_RET func_800CD8F8_jp(PakInfo04Struct* arg0, PakInfo74Struct* arg1, u32 arg2);
+UNK_RET func_800CD990_jp(PakInfo04Struct* arg0, PakInfo74Struct* arg1);
+void func_800CD9F0_jp(PakInfo04Struct* arg0, PakInfo74Struct* arg1);
+UNK_RET func_800CDA4C_jp(PakInfo04Struct* arg0, PakInfo94Struct* arg1);
+UNK_RET func_800CDA90_jp(PakInfo04Struct* arg0, UNK_PTR, UNK_PTR);
 // void func_800CDAD0_jp();
 // void func_800CDB10_jp();
 // void func_800CDBE0_jp();
diff --git a/include/code_variables.h b/include/code_variables.h
index 42b5de2..b1e0978 100644
--- a/include/code_variables.h
+++ b/include/code_variables.h
@@ -184,11 +184,6 @@ extern s32 CanLookGokiCount;
 // extern UNK_TYPE D_80104688_jp;
 // extern UNK_TYPE D_80104690_jp;
 
-// extern UNK_TYPE D_80104790_jp;
-// extern UNK_TYPE D_80104794_jp;
-// extern UNK_TYPE D_80104798_jp;
-// extern UNK_TYPE D_8010479C_jp;
-// extern UNK_TYPE D_801047A4_jp;
 // extern UNK_TYPE D_801047A8_jp;
 // extern UNK_TYPE D_801047B0_jp;
 // extern UNK_TYPE D_801047B8_jp;
@@ -1120,9 +1115,6 @@ extern u8 D_80113854_jp;
 // extern UNK_TYPE RO_FLT_801167EC_jp;
 // extern UNK_TYPE RO_FLT_801167F0_jp;
 // extern UNK_TYPE RO_FLT_801167F4_jp;
-// extern UNK_TYPE RO_80116800_jp;
-// extern UNK_TYPE RO_STR_80116804_jp;
-// extern UNK_TYPE RO_80116808_jp;
 // extern UNK_TYPE jtbl_80116810_jp;
 // extern UNK_TYPE RO_FLT_80116828_jp;
 // extern UNK_TYPE RO_STR_80116830_jp;
@@ -1777,8 +1769,6 @@ extern u16 D_80000400[];
 // extern UNK_TYPE B_80126D60_jp;
 // extern UNK_TYPE B_80126E60_jp;
 
-// extern UNK_TYPE B_80137960_jp;
-// extern UNK_TYPE B_80137C40_jp;
 // extern UNK_TYPE B_80137C48_jp;
 // extern UNK_TYPE B_80138818_jp;
 // extern UNK_TYPE B_80138E40_jp;
diff --git a/include/m_cpak.h b/include/m_cpak.h
new file mode 100644
index 0000000..0a6c723
--- /dev/null
+++ b/include/m_cpak.h
@@ -0,0 +1,90 @@
+#ifndef M_CPAK_H
+#define M_CPAK_H
+
+#include "ultra64.h"
+#include "unk.h"
+
+#include "m_npc.h"
+#include "m_private.h"
+
+typedef struct B80137C40Unk0000Struct {
+    /* 0x0000 */ u16 unk_0000;
+    /* 0x0002 */ UNK_TYPE1 unk_0002[0x0006];
+    /* 0x0008 */ PrivateInfo priv;
+    /* 0x0BD8 */ Animal_c animal;
+    /* 0x1100 */ u16 unk_1100;
+    /* 0x1102 */ UNK_TYPE1 unk_1102[0x00FE];
+} B80137C40Unk0000Struct; // size = 0x1200
+
+typedef struct B80137C40Struct {
+    /* 0x0000 */ B80137C40Unk0000Struct unk_0000;
+    /* 0x1200 */ OSMesgQueue* unk_1200;
+    /* 0x1204 */ UNK_TYPE unk_1204;
+    /* 0x1208 */ u16 unk_1208;
+} B80137C40Struct; // size = 0x1208
+
+// For alignment this can only have members of size 1 or 2
+typedef struct D80104798Struct {
+    /* 0x0 */ UNK_TYPE1 unk0[0x10];
+} D80104798Struct; // size 0x10
+
+typedef struct D801047A8Struct {
+    /* 0x0 */ UNK_TYPE1 unk_0[0x08];
+} D801047A8Struct; // size <= 0x8
+
+typedef struct D801047B0Struct {
+    /* 0x0000 */ u16 unk_0000;
+    /* 0x0002 */ UNK_TYPE1 unk_0002[0x66FE];
+} D801047B0Struct; // size = 0x6700;
+
+typedef struct PakInfo74Struct {
+    /* 0x00 */ size_t unk_00;
+    /* 0x04 */ UNK_TYPE1 unk_04[0x6];
+    /* 0x0A */ char unk_0A[4];
+    /* 0x0E */ D80104798Struct unk_0E;
+    /* 0x1E */ UNK_TYPE1 unk_1E[0x2];
+} PakInfo74Struct; // size = 0x20
+
+typedef struct PakInfo94Struct {
+    /* 0x00 */ UNK_TYPE1 unk_00[0x20];
+} PakInfo94Struct; // size = 0x20
+
+typedef struct PakInfo04Struct {
+    /* 0x00 */ OSPfs pfs;
+    /* 0x68 */ s32 unk_68;
+    /* 0x6C */ s32 unk_6C;
+} PakInfo04Struct; // size = 0x70
+
+typedef struct PakInfo {
+    /* 0x000 */ UNK_TYPE unk_00;
+    /* 0x004 */ PakInfo04Struct unk_04;
+    /* 0x074 */ PakInfo74Struct unk_74;
+    /* 0x090 */ PakInfo94Struct unk_94[16];
+    /* 0x294 */ s32 unk_294[16];
+    /* 0x2D4 */ size_t unk_2D4;
+    /* 0x2D8 */ s32 unk_2D8;
+    /* 0x2DC */ s32 unk_2DC;
+} PakInfo; // size >= 0x2DC
+
+UNK_RET mCPk_PakOpen(PakInfo* info, s32 arg1);
+UNK_RET func_80078F08_jp(PakInfo* info);
+s32 func_80078FE8_jp(PakInfo* info);
+void func_80079080_jp(B80137C40Struct* arg0);
+UNK_RET mCPk_InitPak(UNK_TYPE arg0);
+PrivateInfo* func_800793A8_jp(void);
+s32 mCPk_SavePak(PrivateInfo* priv, Animal_c* animal, PakInfo* info);
+s32 func_8007942C_jp(PrivateInfo* priv, Animal_c* animal, PakInfo* info);
+s32 func_80079760_jp(void);
+void* func_80079838_jp(void);
+s32 func_800798DC_jp(PakInfo* info);
+UNK_RET func_80079AAC_jp(void);
+UNK_RET func_80079D00_jp(void);
+s32 func_80079E54_jp(D801047B0Struct* arg0, PakInfo* arg1);
+UNK_RET func_80079EA4_jp(UNK_PTR, PakInfo* info);
+void func_80079EDC_jp(void);
+s32 func_80079F44_jp(void);
+void func_8007A008_jp(void);
+PakInfo* mCPk_get_pkinfo(void);
+s32 func_8007A080_jp(void);
+
+#endif
diff --git a/include/m_flashrom.h b/include/m_flashrom.h
index e6b3fdd..e6a026a 100644
--- a/include/m_flashrom.h
+++ b/include/m_flashrom.h
@@ -13,8 +13,8 @@ struct CommonData;
 void func_8008EE24_jp(void);
 // void func_8008EE5C_jp();
 // void func_8008EE6C_jp();
-// void func_8008EE7C_jp();
-// void func_8008EEB4_jp();
+u16 func_8008EE7C_jp(UNK_PTR, s32);
+u16 func_8008EEB4_jp(void*, UNK_TYPE, u16);
 // void func_8008EEE8_jp();
 // void func_8008EF0C_jp();
 s32 mFRm_CheckSaveData(void);
@@ -46,7 +46,7 @@ void func_8008FA50_jp(void);
 // void func_8008FDD4_jp();
 // void func_8008FE74_jp();
 // void func_8008FF60_jp();
-// void func_80090044_jp();
+s32 func_80090044_jp(void);
 // void func_800900B0_jp();
 
 #endif