From bf9df148326971550dc58c65e5e9dd5c7f734228 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 21 Nov 2022 19:17:21 +0200
Subject: Use FX enum and add another sparkle to the enum

---
 include/effects.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

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,
-- 
cgit v1.2.3


From 44e4b69cdbf2925ae82fe6e6a7336b8ba90b67f0 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 21 Nov 2022 19:18:07 +0200
Subject: =?UTF-8?q?Matches=20from=20site(Henny022p,octorock,L=C3=A9o=20Lam?=
 =?UTF-8?q?,ThothWhatsThis)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/global.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include')

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 {
-- 
cgit v1.2.3