diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/effects.h | 2 | ||||
| -rw-r--r-- | include/global.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/effects.h b/include/effects.h index 396f4eaf..88f04fa4 100644 --- a/include/effects.h +++ b/include/effects.h @@ -42,7 +42,7 @@ typedef enum { FX_BROWN_SMOKE_LARGE, FX_BROWN_SMOKE2, FX_SWEAT, - FX_26, + FX_SPARKLE4, FX_27, FX_SLOW_EXPLOSION, FX_CONFETTI, diff --git a/include/global.h b/include/global.h index 94d19c8f..9b3557ce 100644 --- a/include/global.h +++ b/include/global.h @@ -101,6 +101,12 @@ #define FORCE_REGISTER(var, reg) register var asm(#reg) #endif +#if NON_MATCHING +#define MEMORY_BARRIER +#else +#define MEMORY_BARRIER asm("" ::: "memory") +#endif + typedef union { s32 WORD; struct { |