6 files changed, 66 insertions, 23 deletions
diff --git a/include/68AB30.h b/include/68AB30.h
deleted file mode 100644
index 1281555..0000000
--- a/include/68AB30.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef C_68AB30_H
-#define C_68AB30_H
-
-#include "ultra64.h"
-
-// void func_80066E90_jp();
-// void func_80066EB8_jp();
-// void func_80066F1C_jp();
-void mNW_InitMyOriginal(void);
-// void func_80066F8C_jp();
-// void func_8006700C_jp();
-void mCkRh_DecideNowGokiFamilyCount(s32 player_no);
-// void func_80067190_jp();
-// void func_80067264_jp();
-// void func_80067338_jp();
-// void func_800673BC_jp();
-// void func_800673CC_jp();
-// void func_80067414_jp();
-
-#endif
diff --git a/include/code_variables.h b/include/code_variables.h
index eb70e01..526347a 100644
--- a/include/code_variables.h
+++ b/include/code_variables.h
@@ -60,7 +60,8 @@
 // extern UNK_TYPE D_80102C68_jp;
 // extern UNK_TYPE D_80103C68_jp;
 // extern UNK_TYPE D_80103CE0_jp;
-// extern UNK_TYPE D_80103D50_jp;
+//TODO: find where this belongs
+extern s32 CanLookGokiCount;
 // extern UNK_TYPE D_80103D55_jp;
 // extern UNK_TYPE D_80103D59_jp;
 // extern UNK_TYPE D_80103D60_jp;
diff --git a/include/m_cockroach.h b/include/m_cockroach.h
new file mode 100644
index 0000000..2e18ea3
--- /dev/null
+++ b/include/m_cockroach.h
@@ -0,0 +1,24 @@
+#ifndef M_COCKROACH_H
+#define M_COCKROACH_H
+
+#include "ultra64.h"
+#include "m_home.h"
+
+#define mCkRh_MAX_NUM 10
+#define mCkRh_MAX_LOOK_NUM 3
+
+s32 mCkRh_GokiFamilyCount2Good(s32 count);
+s32 mCkRh_InitGokiSaveData_1Room(s32 player);
+void mCkRh_InitGokiSaveData_1Room_ByHomeData(mHm_hs_c * home);
+void mCkRh_InitGokiSaveData_InitNewPlayer(void);
+void mCkRh_SavePlayTime(s32 player);
+s32 mCkRh_DaysGapCompareWithSaveTime(s32 player);
+void mCkRh_DecideNowGokiFamilyCount(s32 player);
+s32 mCkRh_PlussGokiN_NowRoom(s32 count);
+s32 mCkRh_MinusGokiN_NowRoom(s32 count);
+s32 mCkRh_NowSceneGokiFamilyCount(void);
+void mCkRh_InitCanLookGokiCount(void);
+s32 mCkRh_CalcCanLookGokiCount(s32 count);
+s32 mCkRh_GetCanLookGokiCount(void);
+
+#endif
diff --git a/include/m_field_info.h b/include/m_field_info.h
index 556ede8..85da72a 100644
--- a/include/m_field_info.h
+++ b/include/m_field_info.h
@@ -7,10 +7,37 @@
 
 struct Game_Play;
 
+typedef enum FieldType {
+  /* 0 */ FI_FIELDTYPE_FG,
+  /* 1 */ FI_FIELDTYPE_1,
+  /* 2 */ FI_FIELDTYPE_2,
+  /* 3 */ FI_FIELDTYPE_ROOM,
+  /* 4 */ FI_FIELDTYPE_NPC_ROOM,
+  /* 5 */ FI_FIELDTYPE_DEMO,
+  /* 6 */ FI_FIELDTYPE_PLAYER_ROOM,
+  /* 7 */ FI_FIELDTYPE_NUM,
+} FieldType;
+
+
+#define FI_TO_FIELD_ID(type, index) (((type) << 12) | (index))
+
+typedef enum FieldRoom {
+  /* 0x6000 */ FI_FIELD_PLAYER0_ROOM = FI_TO_FIELD_ID(FI_FIELDTYPE_PLAYER_ROOM, 0),
+  /* 0x6001 */ FI_FIELD_PLAYER1_ROOM,
+  /* 0x6002 */ FI_FIELD_PLAYER2_ROOM,
+  /* 0x6003 */ FI_FIELD_PLAYER3_ROOM,
+} FieldRoom;
+
+
+#define FI_GET_PLAYER_ROOM_NO(fieldId) (((fieldId)-FI_FIELD_PLAYER0_ROOM) & 3)
+#define FI_IS_PLAYER_ROOM(fieldId) \
+  ((fieldId) == FI_FIELD_PLAYER0_ROOM || (fieldId) == FI_FIELD_PLAYER1_ROOM || \
+   (fieldId) == FI_FIELD_PLAYER2_ROOM || (fieldId) == FI_FIELD_PLAYER3_ROOM)
+
 // void func_80087C30_jp();
 // void func_80087C40_jp();
 // void func_80087C64_jp();
-s32 mFI_GetFieldId(void);
+u16 mFI_GetFieldId(void);
 // void func_80087C9C_jp();
 // void func_80087D30_jp();
 // void func_80087DC8_jp();
diff --git a/include/m_home.h b/include/m_home.h
index 3d0b73c..787b447 100644
--- a/include/m_home.h
+++ b/include/m_home.h
@@ -4,6 +4,7 @@
 #include "ultra64.h"
 #include "6DB420.h"
 #include "unk.h"
+#include "lb_rtc.h"
 
 #define HOME_MAILBOX_SIZE 10
 #define HANIWA_ITEM_HOLD_NUM 4
@@ -48,6 +49,13 @@ typedef struct Haniwa_c {
     /* 0x58 */ u32 bells; /* held bells from selling items */
 } Haniwa_c; // size = 0x5C
 
+// Original name is mHm_goki_c
+typedef struct mHm_goki_c {
+  /* 0x00 */ lbRTC_ymd_t time;
+  /* 0x04 */ u8 num;
+  /* 0x05 */ u8 pad;
+} mHm_goki_c; // size = 0x6
+
 typedef struct mHm_hs_c {
     /* 0x000 */ PersonalID unk_000;
     /* 0x010 */ UNK_TYPE1 unk_010[0x12];
@@ -56,7 +64,8 @@ typedef struct mHm_hs_c {
     /* 0x024 */ u8 unk_024;
     /* 0x025 */ UNK_TYPE1 unk025[0xABB];
     /* 0xAE0 */ Haniwa_c haniwa;
-    /* 0xB3C */ UNK_TYPE1 unkB3C[0xC];
+    /* 0xB3C */ mHm_goki_c goki;
+    /* 0xB42 */ UNK_TYPE1 unkB42[0x6];
 } mHm_hs_c; // size = 0xB48
 
 
diff --git a/include/m_house.h b/include/m_house.h
index 539a4a0..165dbf2 100644
--- a/include/m_house.h
+++ b/include/m_house.h
@@ -27,4 +27,6 @@ typedef enum mHS_HOUSE {
   /* 4 */ mHS_HOUSE_NUM
 } mHS_HOUSE;
 
+s32 mHS_get_arrange_idx(s32 player);
+
 #endif