From 1eb08c70e1b76c35def6f5aabd4a449bcab7c317 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 24 Jun 2020 10:38:59 -0400
Subject: Decompile unk_02034710.s

---
 include/global.fieldmap.h | 27 +++++++++++++++++++++++++++
 include/global.h          |  3 ++-
 include/map_header.h      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 include/global.fieldmap.h
 create mode 100644 include/map_header.h

(limited to 'include')

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
new file mode 100644
index 00000000..4557a2e7
--- /dev/null
+++ b/include/global.fieldmap.h
@@ -0,0 +1,27 @@
+#ifndef POKEDIAMOND_GLOBAL_FIELDMAP_H
+#define POKEDIAMOND_GLOBAL_FIELDMAP_H
+
+struct MapHeader
+{
+    u8 unk0;
+    u8 unk1;
+    u16 unk2;
+    u16 unk4;
+    u16 unk6;
+    u16 unk8;
+    u16 unkA;
+    u16 unkC;
+    u16 unkE;
+    u16 unk10;
+    u16 mapsec;
+    u8 unk14;
+    u8 unk15;
+    u8 unk16;
+    u8 unk17_0:4;
+    u8 unk17_4:1;
+    u8 unk17_5:1;
+    u8 unk17_6:1;
+    u8 unk17_7:1;
+};
+
+#endif //POKEDIAMOND_GLOBAL_FIELDMAP_H
diff --git a/include/global.h b/include/global.h
index 88ca58ff..2b5771ee 100644
--- a/include/global.h
+++ b/include/global.h
@@ -6,6 +6,7 @@
 #include "MWC_string.h"
 #include "function_target.h"
 #include "nitro.h"
+#include "global.fieldmap.h"
 #include "constants/global.h"
 
 #define NELEMS(a) (sizeof(a) / sizeof(*(a)))
@@ -35,6 +36,6 @@ extern void ErrorHandling(void);
 #define GF_ASSERT(expr) do {if (!(expr)) ErrorHandling();} while (0)
 
 extern const enum GameLanguage gGameLanguage;
-extern const enum GameVersion gGameVersion;
+extern const u8 gGameVersion;
 
 #endif //GUARD_GLOBAL_H
diff --git a/include/map_header.h b/include/map_header.h
new file mode 100644
index 00000000..a6f5ee55
--- /dev/null
+++ b/include/map_header.h
@@ -0,0 +1,44 @@
+#ifndef POKEDIAMOND_MAP_HEADER_H
+#define POKEDIAMOND_MAP_HEADER_H
+
+struct UnkStruct_020EED78
+{
+    u16 unk0;
+    u16 unk2;
+};
+
+u8 FUN_02034724(u32 mapno);
+u8 FUN_02034738(u32 mapno);
+u16 FUN_0203474C(u32 mapno);
+u16 FUN_02034774(u32 mapno);
+u16 FUN_02034788(u32 mapno);
+u16 FUN_0203479C(u32 mapno);
+u16 FUN_020347B0(u32 mapno);
+u16 FUN_020347C4(u32 mapno);
+BOOL FUN_020347D8(u32 mapno);
+u16 FUN_020347FC(u32 mapno);
+u16 FUN_02034810(u32 mapno);
+u16 FUN_02034824(u32 mapno);
+u8 FUN_02034838(u32 mapno);
+u8 FUN_0203484C(u32 mapno);
+u8 FUN_02034860(u32 mapno);
+u8 FUN_0203487C(u32 mapno);
+u8 FUN_02034898(u32 mapno);
+u8 FUN_020348B4(u32 mapno);
+u8 FUN_020348D0(u32 mapno);
+BOOL FUN_020348E4(u32 mapno);
+BOOL FUN_02034908(u32 mapno);
+BOOL FUN_0203491C(u32 mapno);
+BOOL FUN_02034930(u32 mapno);
+BOOL FUN_02034944(u32 mapno);
+BOOL FUN_02034964(u32 mapno);
+BOOL FUN_02034984(u32 mapno);
+BOOL FUN_02034998(u32 mapno);
+BOOL FUN_020349AC(u32 mapno);
+BOOL FUN_020349B8(u32 mapno);
+BOOL FUN_020349CC(u32 mapno);
+BOOL FUN_020349D8(u32 mapno);
+BOOL FUN_020349E4(u16 a0);
+u16 FUN_02034A04(u16 a0);
+
+#endif //POKEDIAMOND_MAP_HEADER_H
-- 
cgit v1.2.3


From 9a773792e9bed5eb55cd5e3ebdfdade652e8c5dd Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 24 Jun 2020 11:04:05 -0400
Subject: Remove temporary struct definition

---
 include/map_header.h | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'include')

diff --git a/include/map_header.h b/include/map_header.h
index a6f5ee55..0adb5886 100644
--- a/include/map_header.h
+++ b/include/map_header.h
@@ -1,12 +1,6 @@
 #ifndef POKEDIAMOND_MAP_HEADER_H
 #define POKEDIAMOND_MAP_HEADER_H
 
-struct UnkStruct_020EED78
-{
-    u16 unk0;
-    u16 unk2;
-};
-
 u8 FUN_02034724(u32 mapno);
 u8 FUN_02034738(u32 mapno);
 u16 FUN_0203474C(u32 mapno);
-- 
cgit v1.2.3