From 4f66d1b7f2630aa1b805ac8e848ebae38faaacd3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Apr 2018 14:09:33 -0400
Subject: through sub_811A15C (two nonmatching)

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

(limited to 'include')

diff --git a/include/main.h b/include/main.h
index f348e48f8..8a7c4d67c 100644
--- a/include/main.h
+++ b/include/main.h
@@ -65,5 +65,6 @@ void DoSoftReset(void);
 void ClearPokemonCrySongs(void);
 
 extern const char BuildDateTime[];
+extern s8 gPcmDmaCounter;
 
 #endif // GUARD_MAIN_H
-- 
cgit v1.2.3


From 63d3135bde32ed110ddf7624ea4dc8a76b20523b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Apr 2018 10:42:47 -0400
Subject: Decompile pokedex_cry_screen data

---
 include/global.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/global.h b/include/global.h
index 82c4916bd..89f56e174 100644
--- a/include/global.h
+++ b/include/global.h
@@ -10,12 +10,12 @@
 #if defined(__APPLE__) || defined(__CYGWIN__)
 #define _(x) x
 #define __(x) x
-#define INCBIN_U8 {0}
-#define INCBIN_U16 {0}
-#define INCBIN_U32 {0}
-#define INCBIN_S8 {0}
-#define INCBIN_S16 {0}
-#define INCBIN_S32 {0}
+#define INCBIN_U8(...) {0}
+#define INCBIN_U16(...) {0}
+#define INCBIN_U32(...) {0}
+#define INCBIN_S8(...) {0}
+#define INCBIN_S16(...) {0}
+#define INCBIN_S32(...) {0}
 #endif
 
 // Prevent cross-jump optimization.
-- 
cgit v1.2.3


From 30b7a6fb95d8c364d6c7aaacf2fbf49bff0061cb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Apr 2018 10:53:04 -0400
Subject: Remove useless struct and deprecated definition

---
 include/ewram.h  |  1 -
 include/global.h | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/ewram.h b/include/ewram.h
index 6b164648b..87af8dd53 100644
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -248,7 +248,6 @@ extern u8 gSharedMem[];
 #define ewram1c000                      (*(struct Unk201C000 *)(gSharedMem + 0x1C000)) // FIXME, names too similar
 #define eHallOfFameMons1                (struct HallofFameMons*)(&gSharedMem[0x1C000])
 #define eHOFPCScreenEffect              (*(struct PCScreenEffectStruct *)(gSharedMem + 0x1c000))
-#define EWRAM_1C800                     (*(struct Unk201C800 *)(gSharedMem + 0x1C800))
 #define ewram1D000                      ((struct Pokemon *)(gSharedMem + 0x1D000))
 #define ewram1D000_2                    ((u16 *)(gSharedMem + 0x1D000))
 #define ewram1D400                      ((u16 *)(gSharedMem + 0x1D400))
diff --git a/include/global.h b/include/global.h
index 89f56e174..82c4916bd 100644
--- a/include/global.h
+++ b/include/global.h
@@ -10,12 +10,12 @@
 #if defined(__APPLE__) || defined(__CYGWIN__)
 #define _(x) x
 #define __(x) x
-#define INCBIN_U8(...) {0}
-#define INCBIN_U16(...) {0}
-#define INCBIN_U32(...) {0}
-#define INCBIN_S8(...) {0}
-#define INCBIN_S16(...) {0}
-#define INCBIN_S32(...) {0}
+#define INCBIN_U8 {0}
+#define INCBIN_U16 {0}
+#define INCBIN_U32 {0}
+#define INCBIN_S8 {0}
+#define INCBIN_S16 {0}
+#define INCBIN_S32 {0}
 #endif
 
 // Prevent cross-jump optimization.
-- 
cgit v1.2.3