summaryrefslogtreecommitdiff
path: root/src/berry_blender.c
diff options
context:
space:
mode:
authorU-User-PC\User <golemgalvanize@github.com>2017-10-03 15:54:19 -0400
committerU-User-PC\User <golemgalvanize@github.com>2017-10-03 15:54:19 -0400
commit1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch)
treefca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /src/berry_blender.c
parent0a88d1042a80bcc703d05f1cf19527272424a03f (diff)
parentd32ec8bf7246468625ab68a2d62835d70b7ac98c (diff)
I hope this fixes merge conflicts
Diffstat (limited to 'src/berry_blender.c')
-rw-r--r--src/berry_blender.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c
new file mode 100644
index 000000000..db50fe4c4
--- /dev/null
+++ b/src/berry_blender.c
@@ -0,0 +1,18 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+IWRAM_DATA void *berry_blender_c_unused_03000de4;
+IWRAM_DATA s16 gUnknown_03000DE8[8];
+IWRAM_DATA s16 gUnknown_03000DF8[6];
+IWRAM_DATA s16 gUnknown_03000E04;
+IWRAM_DATA s16 gUnknown_03000E06;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text