refactor: update blind and joker definitions; change game state to GAME_BLIND_SELECT

include/blind.h

@@ -18,9 +18,10 @@ 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 SMALL_BLIND_TID 832
+#define BLIND_SPRITE_OFFSET 16
-#define BIG_BLIND_TID (SMALL_BLIND_TID + 16)
+#define SMALL_BLIND_TID 960
-#define BOSS_BLIND_TID (BIG_BLIND_TID + 16)
+#define BIG_BLIND_TID (BLIND_SPRITE_OFFSET * BIG_BLIND)
+#define BOSS_BLIND_TID (BLIND_SPRITE_OFFSET * BOSS_BLIND)
 
 #define BLIND_TEXT_COLOR_INDEX 1
 #define BLIND_SHADOW_COLOR_INDEX 2

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

source/game.c

@@ -27,7 +27,7 @@ static uint timer = 0; // This might already exist in libtonc but idk so i'm jus
 static int game_speed = 1;
 static int background = 0;
 
-static enum GameState game_state = GAME_SHOP; // The current game state, this is used to determine what the game is doing at any given time
+static enum GameState game_state = GAME_BLIND_SELECT; // The current game state, this is used to determine what the game is doing at any given time
 static enum HandState hand_state = HAND_DRAW;
 static enum PlayState play_state = PLAY_PLAYING;
 static int state = 0; // General state variable, used for switch statements in each game state related function
@@ -51,7 +51,7 @@ static int discards = 0;
 
 static int round = 0;
 static int ante = 1;
-static int money = 100;
+static int money = 4;
 static int score = 0;
 static int temp_score = 0; // This is the score that shows in the same spot as the hand type.
 static FIXED lerped_score = 0;