Merge branch 'main' into main

2025-10-08 23:25:24 +02:00
parent aa5ebd13fc 9b6c77ea3f
commit 6787fab0c2
19 changed files with 106 additions and 30 deletions
@@ -13,3 +13,9 @@ DEF_JOKER_GFX(11)
 DEF_JOKER_GFX(12)
 DEF_JOKER_GFX(13)
 DEF_JOKER_GFX(14)
+DEF_JOKER_GFX(15)
+DEF_JOKER_GFX(16)
+DEF_JOKER_GFX(17)
+DEF_JOKER_GFX(18)
+DEF_JOKER_GFX(19)
+DEF_JOKER_GFX(20)
@@ -36,7 +36,7 @@
 #define DEFAULT_JOKER_ID 0
 #define GREEDY_JOKER_ID 1 // This is just an example to show the patern of making joker IDs
 #define JOKER_STENCIL_ID 16
-#define PAREIDOLIA_JOKER_ID 30
+#define PAREIDOLIA_JOKER_ID 41

 typedef struct 
 {
@@ -16,5 +16,11 @@
 #include "joker_gfx12.h"
 #include "joker_gfx13.h"
 #include "joker_gfx14.h"
+#include "joker_gfx15.h"
+#include "joker_gfx16.h"
+#include "joker_gfx17.h"
+#include "joker_gfx18.h"
+#include "joker_gfx19.h"
+#include "joker_gfx20.h"

 #endif