diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:18:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:18:34 -0400 |
| commit | f43de6e5826b30335a843413c4f3043d7f6d5395 (patch) | |
| tree | 880867e0d39569b5a8be546b1e2b0e2bd8021024 /include/global.h | |
| parent | 3b3423d1a751134ff7941b41bad72e0e75314647 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into lilycove_lady
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/global.h b/include/global.h index 42629cf48..64ed869ef 100644 --- a/include/global.h +++ b/include/global.h @@ -9,6 +9,12 @@ // to help in decompiling #define asm_comment(x) asm volatile("@ -- " x " -- ") +#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") + +#if defined (__APPLE__) || defined (__CYGWIN__) +void memset(void *, int, size_t); +void memcpy(void *, const void *, size_t); +#endif // __APPLE__ #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) @@ -794,4 +800,6 @@ struct Bitmap // TODO: Find a better spot for this u32 height:16; }; +extern u8 gReservedSpritePaletteCount; + #endif // GUARD_GLOBAL_H |