summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-06 12:28:12 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-06 12:28:12 -0600
commit680d3fd7b980578024226eccffe2e01072826227 (patch)
tree45bd58a6df683e25685a2a6bd9ff2d4c5116dcf5 /include/global.h
parentb3551bc2f328c286c6ecc45ea288665d46b44260 (diff)
parent7bf330e9f2b048a9b3d7882c80c9aa413c55484a (diff)
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h
index 0764718ca..eea1574b7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -14,9 +14,9 @@
#define INCBIN_S8 {0}
#define INCBIN_S16 {0}
#define INCBIN_S32 {0}
-void * memcpy (void *, const void *, size_t);
-void * memset (void *, int, size_t);
-int strcmp (const char *, const char *);
+void *memcpy (void *, const void *, size_t);
+void *memset (void *, int, size_t);
+int strcmp (const char *, const char *);
#endif
// Prevent cross-jump optimization.
@@ -843,5 +843,6 @@ struct HallOfFame
extern struct HallOfFame gHallOfFame;
extern struct SaveBlock2 gSaveBlock2;
+extern u8 ewram[];
#endif // GUARD_GLOBAL_H