Merge pull request #622 from huderlem/ereader

Finish decompiling ereader and faraway island code

9 files changed, 61 insertions, 12 deletions

diff --git a/include/constants/vars.h b/include/constants/vars.h
index c025d62fc..67a9e6cbd 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -74,7 +74,7 @@
 #define VAR_UNUSUAL_WEATHER_LOCATION         0x4037
 #define VAR_UNUSUAL_WEATHER_STEP_COUNTER     0x4038
 #define VAR_SHOULD_END_UNUSUAL_WEATHER       0x4039
-#define VAR_NEVER_READ_0x403A                0x403A // Var is written to, but never checked
+#define VAR_FARAWAY_ISLAND_STEP_COUNTER      0x403A
 #define VAR_REGICE_STEPS_1                   0x403B
 #define VAR_REGICE_STEPS_2                   0x403C
 #define VAR_REGICE_STEPS_3                   0x403D
diff --git a/include/ereader.h b/include/ereader.h
deleted file mode 100755
index da31c8212..000000000
--- a/include/ereader.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GUARD_EREADER_H
-#define GUARD_EREADER_H
-
-bool32 sub_81D3B34(void);
-u32 sub_81D427C(void);
-bool8 sub_81D4A58(struct EventObject*);
-bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
-
-#endif // GUARD_EREADER_H
diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
new file mode 100755
index 000000000..54b36ef0f
--- /dev/null
+++ b/include/ereader_helpers.h
@@ -0,0 +1,20 @@
+#ifndef GUARD_EREADER_HELPERS_H
+#define GUARD_EREADER_HELPERS_H
+
+struct Unk81D38FC
+{
+    u8 unk0[0x270];
+    int checksum;
+};
+
+bool8 sub_81D3920(u8 *buffer);
+bool32 sub_81D3AB0(struct Unk81D38FC *arg0);
+bool32 sub_81D3B34(void);
+int sub_81D3D70(u8, u32, u32*, u32*);
+void sub_81D3F9C(void);
+void sub_81D3FAC(void);
+void sub_81D41A0(void);
+void sub_81D41F4(void);
+void sub_81D4238(void);
+
+#endif // GUARD_EREADER_HELPERS_H
diff --git a/include/ereader_screen.h b/include/ereader_screen.h
new file mode 100755
index 000000000..0e3e51c76
--- /dev/null
+++ b/include/ereader_screen.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_EREADER_SCREEN_H
+#define GUARD_EREADER_SCREEN_H
+
+void sub_81D5014(void);
+
+#endif // GUARD_EREADER_SCREEN_H
diff --git a/include/faraway_island.h b/include/faraway_island.h
new file mode 100755
index 000000000..89b4bcd08
--- /dev/null
+++ b/include/faraway_island.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_FARAWAY_ISLAND_H
+#define GUARD_FARAWAY_ISLAND_H
+
+u32 sub_81D427C(void);
+bool8 sub_81D4A58(struct EventObject*);
+void UpdateFarawayIslandStepCounter(void);
+bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
+bool8 IsMewPlayingHideAndSeek(void);
+
+#endif // GUARD_FARAWAY_ISLAND_H
diff --git a/include/link.h b/include/link.h
index 24a834c68..1e865e72b 100644
--- a/include/link.h
+++ b/include/link.h
@@ -230,7 +230,6 @@ bool8 IsLinkMaster(void);
 void CB2_LinkError(void);
 u8 GetSioMultiSI(void);
 bool8 IsLinkConnectionEstablished(void);
-void SetSuppressLinkErrorMessage(bool8);
 bool8 HasLinkErrorOccurred(void);
 void ResetSerial(void);
 u32 LinkMain1(u8 *shouldAdvanceLinkState, u16 *sendCmd, u16 (*recvCmds)[CMD_LENGTH]);
diff --git a/include/pokenav.h b/include/pokenav.h
index 4e02461fe..13cb0babf 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -3,7 +3,6 @@
 #include "list_menu.h"
 
 bool8 sub_81D312C(void *arg0);
-void sub_81D4998(void);
 void CB2_InitPokeNav(void);
 
 #endif //GUARD_POKENAV_H
diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h
index ac9bbb5c3..0f13718e5 100644
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -20,4 +20,8 @@ bool32 sub_802C908(u16);
 void nullsub_89(u8 taskId);
 void var_800D_set_xB(void);
 
+bool32 mevent_0814257C(u8 *textState, const u8 *str);
+void sub_8018884(const u8 *src);
+void sub_80186A4(void);
+
 #endif //GUARD_rom_8011DC0_H
diff --git a/include/strings.h b/include/strings.h
index 9e464562d..1e4c789df 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2563,4 +2563,24 @@ extern const u8 gUnknown_0862BAC4[];
 extern const u8 gUnknown_0862BACF[];
 extern const u8 gUnknown_0862BADA[];
 
+// E-Reader
+extern const u8 gUnknown_085EDFD6[];
+extern const u8 gUnknown_085EDFF5[];
+extern const u8 gUnknown_085EE014[];
+extern const u8 gUnknown_085EE035[];
+extern const u8 gUnknown_085EE05C[];
+extern const u8 gUnknown_085EE06B[];
+extern const u8 gUnknown_085EE080[];
+extern const u8 gUnknown_085EE097[];
+extern const u8 gUnknown_085EE0A3[];
+extern const u8 gUnknown_085EE0BF[];
+extern const u8 gUnknown_085EE0DC[];
+extern const u8 gUnknown_085EE0FA[];
+extern const u8 gUnknown_085EE107[];
+extern const u8 gUnknown_085EE120[];
+extern const u8 gUnknown_085EE12D[];
+extern const u8 gUnknown_085EE14B[];
+extern const u8 gUnknown_085EE14F[];
+extern const u8 gUnknown_085EE154[];
+
 #endif // GUARD_STRINGS_H