Revert "Sprite vram optimizations"

include/blind.h

@@ -18,10 +18,9 @@ static const int ante_lut[MAX_ANTE + 1] = {100, 300, 800, 2000, 5000, 11000, 200
 #define BIG_BLIND_PB 2
 #define BOSS_BLIND_PB 3
 
-#define BLIND_SPRITE_OFFSET 16
-#define SMALL_BLIND_TID 960
-#define BIG_BLIND_TID (BLIND_SPRITE_OFFSET * BIG_BLIND)
-#define BOSS_BLIND_TID (BLIND_SPRITE_OFFSET * BOSS_BLIND)
+#define SMALL_BLIND_TID 832
+#define BIG_BLIND_TID (SMALL_BLIND_TID + 16)
+#define BOSS_BLIND_TID (BIG_BLIND_TID + 16)
 
 #define BLIND_TEXT_COLOR_INDEX 1
 #define BLIND_SHADOW_COLOR_INDEX 2

include/card.h

@@ -6,11 +6,6 @@
 
 #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

include/joker.h

@@ -1,16 +1,15 @@
 #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