From 6d94143587401daace4e620f06bbacf22b6aea62 Mon Sep 17 00:00:00 2001
From: Cuyler36 <jeremy96@vt.edu>
Date: Sun, 23 Apr 2023 23:15:25 -0400
Subject: [PATCH] Add homes to Save_t

---
 include/m_common_data.h | 14 +++++++++-----
 include/m_land_h.h      |  7 ++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/m_common_data.h b/include/m_common_data.h
index adcbacab..d9f1cb68 100644
--- a/include/m_common_data.h
+++ b/include/m_common_data.h
@@ -6,6 +6,8 @@
 #include "m_land_h.h"
 #include "lb_rtc.h"
 #include "m_flashrom.h"
+#include "m_home.h"
+#include "m_private.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,15 +34,17 @@ typedef struct time_s {
 typedef struct Save_s {
   /* 0x000000 */ mFRm_chk_t save_check;
   /* 0x000014 */ int scene_no;
-  u8 _tmp0[0x9108];
+  /* 0x000018 */ u8 _tmp0[0x9108];
   /* 0x009120 */ mLd_land_info_c land_info;
-  u8 _tmp1[0x17DE8];
+  /* 0x00912C */ u8 _tmp1[0xBBC];
+  /* 0x009CE8 */ mHm_hs_c homes[PLAYER_NUM];
+  /* 0x0137A8 */ u8 _tmp2[0xD76C];
   /* 0x020F14 */ lbRTC_ymd_t renew_time;
-  u8 _tmp2[0x476];
+  /* 0x020F18 */ u8 _tmp3[0x476];
   /* 0x02138E */ u8 saved_rom_debug;
-  u8 _tmp3[0x1199];
+  /* 0x02138F */ u8 _tmp4[0x1199];
   /* 0x022528 */ OSTime time_delta;
-  u8 _tmp4[0x3AD0];
+  /* 0x022530 */ u8 _tmp5[0x3AD0];
 } Save_t;
 
 typedef union save_u {
diff --git a/include/m_land_h.h b/include/m_land_h.h
index 1330a653..563d29fd 100644
--- a/include/m_land_h.h
+++ b/include/m_land_h.h
@@ -11,10 +11,11 @@ extern "C" {
 #define LAND_NAME_SIZE 8
 #define LAND_NAME_MURA_SIZE (LAND_NAME_SIZE + 2)
 
+/* sizeof(mLd_land_info_c) == 0x0C */
 typedef struct land_info_s {
-  u8 name[LAND_NAME_SIZE];
-  s8 exists;
-  u16 id;
+  /* 0x00 */ u8 name[LAND_NAME_SIZE];
+  /* 0x08 */ s8 exists;
+  /* 0x0A */ u16 id;
 } mLd_land_info_c;
 
 #ifdef __cplusplus