From 6a1f3bcd7a8bc909deae7f6535d95c0a84988597 Mon Sep 17 00:00:00 2001
From: cellos51 <creeper521@outlook.com>
Date: Wed, 23 Jul 2025 20:14:22 -0400
Subject: [PATCH] I hope this works

---
 include/card.h  |  5 +++++
 include/joker.h | 11 ++++++-----
 source/card.c   |  8 +++++---
 source/joker.c  |  9 ++++++---
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/include/card.h b/include/card.h
index 33e052a..eb9a447 100644
--- a/include/card.h
+++ b/include/card.h
@@ -6,6 +6,11 @@
 
 #include "sprite.h"
 
+#define CARD_TID 0
+#define CARD_SPRITE_OFFSET 16
+#define CARD_PB 0
+#define CARD_STARTING_LAYER 0
+
 // Card suits
 #define HEARTS 0
 #define CLUBS 1
diff --git a/include/joker.h b/include/joker.h
index 63e251b..b29d0a2 100644
--- a/include/joker.h
+++ b/include/joker.h
@@ -1,15 +1,16 @@
 #ifndef JOKER_H
 #define JOKER_H
 
-#define JOKER_TID 880 // Tile ID for the starting index in the tile memory
-#define JOKER_SPRITE_OFFSET 16 // Offset for the joker sprites
-#define JOKER_PB 4 // Palette bank for the default jokers
-#define JOKER_STARTING_LAYER 27
-
 #include <maxmod.h>
 
 #include "sprite.h"
 #include "card.h"
+#include "game.h"
+
+#define JOKER_TID (MAX_HAND_SIZE + MAX_SELECTION_SIZE) * JOKER_SPRITE_OFFSET // Tile ID for the starting index in the tile memory
+#define JOKER_SPRITE_OFFSET 16 // Offset for the joker sprites
+#define JOKER_PB 4 // Palette bank for the default jokers
+#define JOKER_STARTING_LAYER 27
 
 #define BASE_EDITION 0
 #define FOIL_EDITION 1
diff --git a/source/card.c b/source/card.c
index fe50fa2..0db4130 100644
--- a/source/card.c
+++ b/source/card.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 
 #include "deck_gfx.h"
+#include "graphic_utils.h"
 
 // Audio
 #include "soundbank.h"
@@ -18,8 +19,7 @@ const static u16 card_sprite_lut[NUM_SUITS][NUM_RANKS] = {
 
 void card_init()
 {
-    GRIT_CPY(&tile_mem[4], deck_gfxTiles);
-    GRIT_CPY(pal_obj_mem, deck_gfxPal);
+    GRIT_CPY(&pal_obj_mem[CARD_PB], deck_gfxPal);
 }
 
 // Card methods
@@ -149,8 +149,10 @@ void card_object_update(CardObject *card_object)
 
 void card_object_set_sprite(CardObject *card_object, int layer)
 {
+    int tile_index = CARD_TID + (layer * CARD_SPRITE_OFFSET);
+    memcpy32(&tile_mem[4][tile_index], &deck_gfxTiles[card_sprite_lut[card_object->card->suit][card_object->card->rank] * TILE_SIZE], TILE_SIZE * CARD_SPRITE_OFFSET);
     sprite_destroy(&card_object->sprite); // Destroy the old sprite if it exists
-    card_object->sprite = sprite_new(ATTR0_SQUARE | ATTR0_4BPP | ATTR0_AFF, ATTR1_SIZE_32, card_sprite_lut[card_object->card->suit][card_object->card->rank], 0, layer);
+    card_object->sprite = sprite_new(ATTR0_SQUARE | ATTR0_4BPP | ATTR0_AFF, ATTR1_SIZE_32, tile_index, 0, layer + CARD_STARTING_LAYER);
 }
 
 void card_object_shake(CardObject *card_object, mm_word sound_id)
diff --git a/source/joker.c b/source/joker.c
index f76f387..767c969 100644
--- a/source/joker.c
+++ b/source/joker.c
@@ -36,8 +36,7 @@ static bool used_layers[MAX_JOKER_OBJECTS] = {false}; // Track used layers for j
 
 void joker_init()
 {
-    GRIT_CPY(&tile_mem[4][JOKER_TID], joker_gfxTiles);
-    memcpy16(&pal_obj_mem[PAL_ROW_LEN * JOKER_PB], joker_gfxPal, sizeof(joker_gfxPal) / 2);
+    GRIT_CPY(&pal_obj_mem[PAL_ROW_LEN * JOKER_PB], joker_gfxPal);
 }
 
 Joker *joker_new(u8 id)
@@ -100,14 +99,18 @@ JokerObject *joker_object_new(Joker *joker)
     }
 
     joker_object->joker = joker;
+
+    int tile_index = JOKER_TID + (layer * JOKER_SPRITE_OFFSET);
+    memcpy32(&tile_mem[4][tile_index], &joker_gfxTiles[joker->id * TILE_SIZE * JOKER_SPRITE_OFFSET], TILE_SIZE * JOKER_SPRITE_OFFSET);
     joker_object->sprite = sprite_new
     (
         ATTR0_SQUARE | ATTR0_4BPP | ATTR0_AFF, 
         ATTR1_SIZE_32, 
-        JOKER_TID + (JOKER_SPRITE_OFFSET * joker->id), 
+        tile_index, 
         JOKER_PB,
         JOKER_STARTING_LAYER + layer
     );
+
     joker_object->tx = 0; // Target position
     joker_object->ty = 0;
     joker_object->x = 0;