From ca2bc94c2be5d7b915e5ab913ef026aa12b8fc0f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 3 Nov 2017 20:59:29 -0400
Subject: through sub_80E6BF8

---
 include/cable_club.h    | 12 ++++++++++++
 include/global.h        |  6 +++---
 include/record_mixing.h | 19 +++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 include/cable_club.h
 create mode 100644 include/record_mixing.h

(limited to 'include')

diff --git a/include/cable_club.h b/include/cable_club.h
new file mode 100644
index 000000000..adb0c4f90
--- /dev/null
+++ b/include/cable_club.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_CABLE_CLUB_H
+#define GUARD_CABLE_CLUB_H
+
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+
+void sub_80B37D4(TaskFunc taskFunc);
+
+#endif //GUARD_CABLE_CLUB_H
diff --git a/include/global.h b/include/global.h
index 3421517d7..ad4f23c2b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -192,7 +192,8 @@ struct SaveBlock2
     /*0xAC*/ u32 encryptionKey;
 
         // TODO: fix and verify labels
-    /*0xB0*/ u8 field_B0[316];
+    /*0xB0*/ u8 field_B0[0x2c];
+    /*0xDC*/ u8 field_0DC[0x110];
     /*0x1EC*/ struct BerryCrush berryCrush;
     /*0x1FC*/ struct PokemonJumpResults pokeJump;
     /*0x20C*/ struct BerryPickingResults berryPick;
@@ -579,13 +580,12 @@ struct SaveBlock1
     /*0x2BB0*/ u16 unk2BB0[6];
     /*0x2BBC*/ u16 unk2BBC[6];
     /*0x2BC8*/ u16 unk2BC8[6];
-    /*0x2BD4*/ u16 unk2BD4[3];
+    /*0x2BD4*/ u16 unk2BD4[6];
     /*0x2BE0*/ struct MailStruct mail[16];
     /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system
     /*0x2E25*/ u8 unk2E25[3]; // possibly padding?
     /*0x2E28*/ OldMan oldMan;
     /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
-    /*0x2e8c*/ u8 filler_2E8C[0x4];
     /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum
     /*0x3030*/ struct DaycareData daycare;
     /*0x3150*/ struct LinkBattleRecord linkBattleRecords[5];
diff --git a/include/record_mixing.h b/include/record_mixing.h
new file mode 100644
index 000000000..5ccbdc0dd
--- /dev/null
+++ b/include/record_mixing.h
@@ -0,0 +1,19 @@
+#ifndef GUARD_RECORD_MIXING_H
+#define GUARD_RECORD_MIXING_H
+
+// Exported type declarations
+
+struct DayCareMailRecordMixing {
+    struct MailStruct mail;
+    u8 OT_name[OT_NAME_LENGTH + 1];
+    u8 monName[11];
+    u8 language_maybe : 4;
+    u8 unknown : 4;
+    u32 stepsTaken;
+};
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+
+#endif //GUARD_RECORD_MIXING_H
-- 
cgit v1.2.3


From f8486b31c531dd9622e748e1382ab9e4b8a5fc5c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 3 Nov 2017 21:56:18 -0400
Subject: sub_80E6CA0

---
 include/battle_tower.h         |  1 +
 include/gba/gba.h              |  1 +
 include/gba/libc.h             | 10 ++++++++++
 include/global.h               |  7 -------
 include/mystery_event_script.h |  1 +
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 include/gba/libc.h

(limited to 'include')

diff --git a/include/battle_tower.h b/include/battle_tower.h
index 25b439c1b..a3bd3b6e8 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -2,5 +2,6 @@
 #define GUARD_BATTLE_TOWER_H
 
 u16 sub_8164FCC(u8, u8);
+void sub_81659DC(void *a0, void *a1);
 
 #endif //GUARD_BATTLE_TOWER_H
diff --git a/include/gba/gba.h b/include/gba/gba.h
index 42ae3cdde..19b65dbca 100644
--- a/include/gba/gba.h
+++ b/include/gba/gba.h
@@ -7,5 +7,6 @@
 #include "gba/multiboot.h"
 #include "gba/syscall.h"
 #include "gba/macro.h"
+#include "gba/libc.h"
 
 #endif // GUARD_GBA_GBA_H
diff --git a/include/gba/libc.h b/include/gba/libc.h
new file mode 100644
index 000000000..9ed82ac28
--- /dev/null
+++ b/include/gba/libc.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_LIBC_H
+#define GUARD_LIBC_H
+
+void *memset(void *dst, int val, size_t size);
+void *memcpy(void *dst, const void *src, size_t size);
+int strcmp(const char *s1, const char *s2);
+char *strcpy(char *dst0, const char *src0);
+#define abs(x) ((x) >= 0 ? (x) : -(x))
+
+#endif //GUARD_LIBC_H
diff --git a/include/global.h b/include/global.h
index ad4f23c2b..f3c58a3d8 100644
--- a/include/global.h
+++ b/include/global.h
@@ -11,13 +11,6 @@
 #define asm_comment(x) asm volatile("@ -- " x " -- ")
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
 
-#if defined (__APPLE__) || defined (__CYGWIN__)
-void *memset(void *, int, size_t);
-void *memcpy(void *, const void *, size_t);
-int strcmp(const char *s1, const char *s2);
-char* strcpy(char *dst0, const char *src0);
-#endif // __APPLE__
-
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
 
 // useful math macros
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index ab23a8d00..1fad6c485 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -4,5 +4,6 @@
 u32 RunMysteryEventScript(u8 *);
 void SetMysteryEventScriptStatus(u32 val);
 u16 GetRecordMixingGift(void);
+u16 sub_81539D4(void);
 
 #endif // GUARD_MYSTERY_EVENT_SCRIPT_H
-- 
cgit v1.2.3


From 20ebcf71699a3463e130b68b1c2c2a3f984c8db8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 3 Nov 2017 22:07:36 -0400
Subject: sub_80E6D54

---
 include/mauville_old_man.h | 1 +
 include/secret_base.h      | 1 +
 include/tv.h               | 1 +
 3 files changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index aefc76083..25c5d8cd2 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -4,5 +4,6 @@
 
 void SetMauvilleOldMan(void);
 u8 sub_81201C8(void);
+void sub_8120B70(OldMan *dest);
 
 #endif // GUARD_MAUVILLE_OLD_MAN_H
diff --git a/include/secret_base.h b/include/secret_base.h
index 14defff26..d3ef57653 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -8,5 +8,6 @@
 // Exported ROM declarations
 void sub_80E9578(void);
 void sub_80E980C(void);
+void sub_80EB18C(struct SecretBaseRecord *dest);
 
 #endif //GUARD_SECRET_BASE_H
diff --git a/include/tv.h b/include/tv.h
index 43f36d69f..ea5bb726f 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -13,5 +13,6 @@ void sub_80EE184(void);
 void sub_80EEA70(void);
 void sub_80F14F8(TVShow *shows);
 size_t sub_80EF370(int value);
+void sub_80F1208(TVShow *dest);
 
 #endif //GUARD_TV_H
-- 
cgit v1.2.3


From 1c3e7f169f26d471280a0f7aa1043dbd68e981c7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 3 Nov 2017 22:26:12 -0400
Subject: sub_80E6E24

---
 include/global.h        | 5 +++--
 include/link.h          | 2 ++
 include/record_mixing.h | 2 ++
 include/secret_base.h   | 1 +
 include/tv.h            | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/global.h b/include/global.h
index f3c58a3d8..8343f99f8 100644
--- a/include/global.h
+++ b/include/global.h
@@ -490,12 +490,13 @@ struct LilycoveLadyContest
     /*0x00e*/ u8 language;
 };
 
-typedef union // TODO
+typedef union
 {
     struct LilycoveLadyQuiz quiz;
     struct LilycoveLadyFavour favour;
     struct LilycoveLadyContest contest;
     u8 id;
+    u8 pad[0x40];
 } LilycoveLady;
 
 struct WaldaPhrase
@@ -592,7 +593,7 @@ struct SaveBlock1
     /*0x3B14*/ struct RecordMixingGift recordMixingGift;
     /*0x3B24*/ u8 seen2[52];
     /*0x3B58*/ LilycoveLady lilycoveLady;
-    /*0x3B88*/ u8 filler_3B88[0x1E8];
+    /*0x3B98*/ u8 filler_3B88[0x1D8];
     /*0x3D70*/ struct WaldaPhrase waldaPhrase;
     // sizeof: 0x3D88
 };
diff --git a/include/link.h b/include/link.h
index 7a6563144..1bcdb047c 100644
--- a/include/link.h
+++ b/include/link.h
@@ -192,5 +192,7 @@ void sub_8011BD0(void);
 u8 sub_800ABAC(void);
 u8 sub_800ABBC(void);
 void sub_800AC34(void);
+bool32 sub_800A064(void);
+bool32 sub_800A03C(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/record_mixing.h b/include/record_mixing.h
index 5ccbdc0dd..86e4b982e 100644
--- a/include/record_mixing.h
+++ b/include/record_mixing.h
@@ -16,4 +16,6 @@ struct DayCareMailRecordMixing {
 
 // Exported ROM declarations
 
+void sub_80E8260(void *);
+
 #endif //GUARD_RECORD_MIXING_H
diff --git a/include/secret_base.h b/include/secret_base.h
index d3ef57653..43ea66ebc 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -9,5 +9,6 @@
 void sub_80E9578(void);
 void sub_80E980C(void);
 void sub_80EB18C(struct SecretBaseRecord *dest);
+void sub_80E9914(void);
 
 #endif //GUARD_SECRET_BASE_H
diff --git a/include/tv.h b/include/tv.h
index ea5bb726f..9dc0f7719 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -14,5 +14,6 @@ void sub_80EEA70(void);
 void sub_80F14F8(TVShow *shows);
 size_t sub_80EF370(int value);
 void sub_80F1208(TVShow *dest);
+void sub_80F0BB8(void);
 
 #endif //GUARD_TV_H
-- 
cgit v1.2.3


From c05444679059e0692275781d065d36e79610cc4c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 10:15:58 -0400
Subject: through sub_80E715C

---
 include/cable_club.h     | 1 +
 include/field_screen.h   | 1 +
 include/fldeff_80F9BCC.h | 2 ++
 include/link.h           | 3 ++-
 include/overworld.h      | 1 +
 include/strings.h        | 1 +
 6 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/cable_club.h b/include/cable_club.h
index adb0c4f90..44831235c 100644
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -8,5 +8,6 @@
 // Exported ROM declarations
 
 void sub_80B37D4(TaskFunc taskFunc);
+u8 sub_80B3050(void);
 
 #endif //GUARD_CABLE_CLUB_H
diff --git a/include/field_screen.h b/include/field_screen.h
index 089e79cc4..6e33a8b7b 100644
--- a/include/field_screen.h
+++ b/include/field_screen.h
@@ -9,5 +9,6 @@
 void pal_fill_black(void);
 bool8 sub_80ABDFC(void);
 void sub_80AF168(void);
+void sub_80AF2B4(u8 taskId);
 
 #endif //GUARD_FIELD_SCREEN_H
diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h
index ecce04943..aae4751c1 100644
--- a/include/fldeff_80F9BCC.h
+++ b/include/fldeff_80F9BCC.h
@@ -9,5 +9,7 @@
 
 void sub_80FA5E4(s16 id, s16 x, s16 y);
 void sub_80FA794(s16 x, s16 y);
+void sub_80FB00C(void);
+void sub_80FB074(void);
 
 #endif //GUARD_FLDEFF_80F9BCC_H
diff --git a/include/link.h b/include/link.h
index 1bcdb047c..6e60a1a84 100644
--- a/include/link.h
+++ b/include/link.h
@@ -192,7 +192,8 @@ void sub_8011BD0(void);
 u8 sub_800ABAC(void);
 u8 sub_800ABBC(void);
 void sub_800AC34(void);
-bool32 sub_800A064(void);
+bool32 Link_AnyPartnersPlayingRubyOrSapphrie(void);
 bool32 sub_800A03C(void);
+void sub_8009628(u8);
 
 #endif // GUARD_LINK_H
diff --git a/include/overworld.h b/include/overworld.h
index 19bcaaf01..63c54eee3 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -64,5 +64,6 @@ void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpNum);
 void c2_load_new_map(void);
 void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused);
 void mapldr_default(void);
+void sub_808729C(void);
 
 #endif //GUARD_ROM4_H
diff --git a/include/strings.h b/include/strings.h
index fcdb1eca4..735fc1f1c 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -75,5 +75,6 @@ extern const u8 gText_NoRegistry[];
 extern const u8 gText_OkayToDeleteFromRegistry[];
 extern const u8 gText_RegisteredDataDeleted[];
 extern const u8 gUnknown_085EA79D[];
+extern const u8 gText_RecordMixingComplete[];
 
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From 411cb29f4ab513da00d15ff16fc98fed8b31dfdb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 10:55:39 -0400
Subject: sub_80E7324

---
 include/link.h    | 2 ++
 include/strings.h | 1 +
 2 files changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/link.h b/include/link.h
index 6e60a1a84..8cd2ee72e 100644
--- a/include/link.h
+++ b/include/link.h
@@ -195,5 +195,7 @@ void sub_800AC34(void);
 bool32 Link_AnyPartnersPlayingRubyOrSapphrie(void);
 bool32 sub_800A03C(void);
 void sub_8009628(u8);
+u8 sub_800AA48(void);
+void sub_8009FAC(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/strings.h b/include/strings.h
index 735fc1f1c..7ba979cdc 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -75,6 +75,7 @@ extern const u8 gText_NoRegistry[];
 extern const u8 gText_OkayToDeleteFromRegistry[];
 extern const u8 gText_RegisteredDataDeleted[];
 extern const u8 gUnknown_085EA79D[];
+extern const u8 gText_MixingRecords[];
 extern const u8 gText_RecordMixingComplete[];
 
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From 6c746425ed48ba6d4d6519959b13914192da95b7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 11:16:07 -0400
Subject: sub_80E756C

---
 include/link.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/link.h b/include/link.h
index 8cd2ee72e..79ec62961 100644
--- a/include/link.h
+++ b/include/link.h
@@ -6,6 +6,8 @@
 #define QUEUE_CAPACITY 50
 #define BLOCK_BUFFER_SIZE 0x100
 
+#define gBlockSendBuffer gUnknown_020228C4 // FIXME
+
 #define LINK_STAT_LOCAL_ID               0x00000003
 #define LINK_STAT_PLAYER_COUNT           0x0000001C
 #define LINK_STAT_PLAYER_COUNT_SHIFT     2
@@ -197,5 +199,6 @@ bool32 sub_800A03C(void);
 void sub_8009628(u8);
 u8 sub_800AA48(void);
 void sub_8009FAC(void);
+void sub_800A4D8(u8);
 
 #endif // GUARD_LINK_H
-- 
cgit v1.2.3


From d921e555d20151c420eb0dab03913125a7bbf1fb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 11:39:23 -0400
Subject: sub_80E7630

---
 include/link.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/link.h b/include/link.h
index 79ec62961..04a7d3864 100644
--- a/include/link.h
+++ b/include/link.h
@@ -200,5 +200,6 @@ void sub_8009628(u8);
 u8 sub_800AA48(void);
 void sub_8009FAC(void);
 void sub_800A4D8(u8);
+u8 sub_800A9D8(void);
 
 #endif // GUARD_LINK_H
-- 
cgit v1.2.3


From 158e9ff7623a8eba3e00c962e1050c6937bf535a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 12:20:40 -0400
Subject: sub_80E78C4

---
 include/link.h             | 2 +-
 include/mauville_old_man.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/link.h b/include/link.h
index 04a7d3864..77e9a9d24 100644
--- a/include/link.h
+++ b/include/link.h
@@ -194,7 +194,7 @@ void sub_8011BD0(void);
 u8 sub_800ABAC(void);
 u8 sub_800ABBC(void);
 void sub_800AC34(void);
-bool32 Link_AnyPartnersPlayingRubyOrSapphrie(void);
+bool32 Link_AnyPartnersPlayingRubyOrSapphire(void);
 bool32 sub_800A03C(void);
 void sub_8009628(u8);
 u8 sub_800AA48(void);
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 25c5d8cd2..0c0ed624a 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -5,5 +5,8 @@
 void SetMauvilleOldMan(void);
 u8 sub_81201C8(void);
 void sub_8120B70(OldMan *dest);
+void sub_8120D34(OldMan *dest, u8 version, u16 language);
+void sub_8120CD0(OldMan *dest, u8 version, u16 language);
+void sub_8120670(void);
 
 #endif // GUARD_MAUVILLE_OLD_MAN_H
-- 
cgit v1.2.3


From f2e723660bba8432f398784f9a1ea0d609e24e8d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 18:48:13 -0400
Subject: sub_80E7948

---
 include/battle_tower.h | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/battle_tower.h b/include/battle_tower.h
index a3bd3b6e8..7bacf5249 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -1,7 +1,44 @@
 #ifndef GUARD_BATTLE_TOWER_H
 #define GUARD_BATTLE_TOWER_H
 
+struct RSBattleTowerRecord {
+    /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100
+    /*0x01*/ u8 trainerClass;
+    /*0x02*/ u16 winStreak;
+    /*0x04*/ u8 name[8];
+    /*0x0C*/ u8 trainerId[4];
+    /*0x10*/ struct {
+        u16 easyChat[6];
+    } greeting;
+    /*0x1C*/ struct UnknownPokemonStruct party[3];
+    /*0xA0*/ u32 checksum;
+    /*0xA4*/ u16 unk_11c8;
+};
+
+struct EmeraldBattleTowerRecord {
+    /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100
+    /*0x01*/ u8 trainerClass;
+    /*0x02*/ u16 winStreak;
+    /*0x04*/ u8 name[8];
+    /*0x0C*/ u8 trainerId[4];
+    /*0x10*/ struct {
+        u16 easyChat[6];
+    } greeting;
+    /*0x1C*/ u8 filler_1c[0x18];
+    /*0x34*/ struct UnknownPokemonStruct party[4];
+    /*0xe4*/ u8 language;
+    u8 filler_e5[7];
+};
+
+union BattleTowerRecord {
+    struct RSBattleTowerRecord ruby_sapphire;
+    struct EmeraldBattleTowerRecord emerald;
+};
+
 u16 sub_8164FCC(u8, u8);
-void sub_81659DC(void *a0, void *a1);
+void sub_81659DC(union BattleTowerRecord *a0, union BattleTowerRecord *a1);
+bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *);
+bool32 sub_8164F70(union BattleTowerRecord *);
+void sub_81628A0(union BattleTowerRecord *);
 
 #endif //GUARD_BATTLE_TOWER_H
-- 
cgit v1.2.3


From 8d05aeccec2efb8943823124aaca79277d5ed305 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 19:03:41 -0400
Subject: sub_80E7A14

---
 include/lilycove_lady.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/lilycove_lady.h b/include/lilycove_lady.h
index c7776131b..66922273e 100644
--- a/include/lilycove_lady.h
+++ b/include/lilycove_lady.h
@@ -6,7 +6,7 @@ void SetLilycoveLady(void);
 void sub_818DA78(void);
 void sub_818DEF4(void);
 void sub_818E564(void);
-void sub_818E570(const struct LilycoveLadyQuiz *quiz);
+void sub_818E570(const LilycoveLady *lilycoveLady);
 bool8 sub_818E704(struct Pokeblock *pokeblock);
 void sub_818E7E0(u8 *dest1, u8 *dest2);
 void sub_818E81C(u8 *dest);
-- 
cgit v1.2.3


From 0a17fc98f6cc08151aab395064185815e41ab898 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 6 Nov 2017 23:03:11 -0500
Subject: nonmatching sub_80E7B60

---
 include/record_mixing.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/record_mixing.h b/include/record_mixing.h
index 86e4b982e..e327d1510 100644
--- a/include/record_mixing.h
+++ b/include/record_mixing.h
@@ -7,11 +7,16 @@ struct DayCareMailRecordMixing {
     struct MailStruct mail;
     u8 OT_name[OT_NAME_LENGTH + 1];
     u8 monName[11];
-    u8 language_maybe : 4;
-    u8 unknown : 4;
-    u32 stepsTaken;
+    u8 language_maybe:4;
+    u8 unknown:4;
 };
 
+struct UnkStruct_80E7B60 {
+    struct DayCareMailRecordMixing unk_00[2];
+    u32 unk_70;
+    u16 unk_74[2];
+}; // size = 0x78
+
 // Exported RAM declarations
 
 // Exported ROM declarations
-- 
cgit v1.2.3


From 8d6007256f2d59765c89c41af4f3487e283e9381 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 6 Nov 2017 23:20:11 -0500
Subject: sub_80E7F68

---
 include/items.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'include')

diff --git a/include/items.h b/include/items.h
index 69515f18e..b8cc23d82 100644
--- a/include/items.h
+++ b/include/items.h
@@ -386,4 +386,13 @@ enum
     ITEM_OLD_SEA_MAP,    // 0x178
 };
 
+enum
+{
+    ITEMS_POCKET,
+    BALLS_POCKET,
+    TMHM_POCKET,
+    BERRIES_POCKET,
+    KEYITEMS_POCKET
+};
+
 #endif // GUARD_ITEMS_H
-- 
cgit v1.2.3


From bc063b45d05716d1eab283f6d474bcdc601cafde Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 6 Nov 2017 23:33:39 -0500
Subject: sub_80E7FF8

---
 include/link.h      | 1 +
 include/load_save.h | 3 ++-
 include/save.h      | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/link.h b/include/link.h
index 77e9a9d24..a33c7da89 100644
--- a/include/link.h
+++ b/include/link.h
@@ -201,5 +201,6 @@ u8 sub_800AA48(void);
 void sub_8009FAC(void);
 void sub_800A4D8(u8);
 u8 sub_800A9D8(void);
+bool8 sub_801048C(u8);
 
 #endif // GUARD_LINK_H
diff --git a/include/load_save.h b/include/load_save.h
index 1f406bbad..ba85d4ad8 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -19,6 +19,7 @@ void LoadSerializedGame(void);
 void LoadPlayerBag(void);
 void SavePlayerBag(void);
 void SetSaveBlocksPointers(u16);
-void MoveSaveBlocks_ResetHeap(void);
+void sub_8076D5C(void);
+void sav2_gender2_inplace_and_xFE(void);
 
 #endif // GUARD_LOAD_SAVE_H
diff --git a/include/save.h b/include/save.h
index 6c1238cd2..a3473371e 100644
--- a/include/save.h
+++ b/include/save.h
@@ -92,5 +92,8 @@ u8 HandleSavingData(u8 saveType);
 //u8 unref_sub_8126080(u8 sector, u8 *data);
 u16 sub_815355C(void);
 u8 sub_81534D0(u8);
+u8 sub_8153430(void);
+bool8 sub_8153474(void);
+void sub_8153688(u8 taskId);
 
 #endif // GUARD_SAVE_H
-- 
cgit v1.2.3