diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-29 10:53:04 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-29 10:53:04 -0400 |
| commit | 30b7a6fb95d8c364d6c7aaacf2fbf49bff0061cb (patch) | |
| tree | feb67a938de6e0c4f11c0b23329f2f013b40ef5f /include | |
| parent | 63d3135bde32ed110ddf7624ea4dc8a76b20523b (diff) | |
Remove useless struct and deprecated definition
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 1 | ||||
| -rw-r--r-- | include/global.h | 12 |
2 files changed, 6 insertions, 7 deletions
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. |