From 52fa45e426ef0ac5847b38c8b03adacb95f06bff Mon Sep 17 00:00:00 2001
From: cellos51 <creeper521@outlook.com>
Date: Fri, 18 Jul 2025 20:38:34 -0400
Subject: [PATCH] Refactor joker selection logic in game shop

---
 Makefile      |  6 +++---
 source/game.c | 20 ++------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index d5c7ebc..cafa2aa 100644
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,9 @@ GRAPHICS	:= graphics
 #---------------------------------------------------------------------------------
 ARCH	:=	-mthumb -mthumb-interwork
 
-CFLAGS	:=	-O3 -Wall \
+CFLAGS	:= -O3 -Wall \
         -mcpu=arm7tdmi -mtune=arm7tdmi \
-        -ffast-math -fomit-frame-pointer -funroll-loops -flto \
+        -ffast-math -fomit-frame-pointer -funroll-loops \
         $(ARCH)
 
 CFLAGS	+=	$(INCLUDE)
@@ -48,7 +48,7 @@ CFLAGS	+=	$(INCLUDE)
 CXXFLAGS	:=	$(CFLAGS) -fno-rtti -fno-exceptions
 
 ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-g $(ARCH) -Wl,-Map,$(notdir $*.map) -flto
+LDFLAGS	=	-g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
diff --git a/source/game.c b/source/game.c
index 14451a7..e699015 100644
--- a/source/game.c
+++ b/source/game.c
@@ -2138,33 +2138,17 @@ void game_shop()
                 {
                     if (i == selection_x - 1 && top_row)
                     {
-                        shop_jokers[i]->selected = true;
+                        shop_jokers[i]->ty = int2fx(61);
 
                         if (key_hit(KEY_A) && jokers_top < MAX_JOKERS_SIZE - 1)
                         {
                             joker_push(shop_jokers[i]);
-                            shop_jokers[i]->selected = false;
                             shop_jokers[i] = NULL; // Remove the joker from the shop
                         }
                     }
                     else
                     {
-                        shop_jokers[i]->selected = false;
-                    }
-                }
-            }
-
-            for (int i = 0; i < MAX_SHOP_JOKERS; i++)
-            {
-                if (shop_jokers[i] != NULL)
-                {
-                    if (shop_jokers[i]->selected)
-                    {
-                        shop_jokers[i]->ty = int2fx(61);
-                    }
-                    else
-                    {
-                        shop_jokers[i]->ty = int2fx(71); // Reset the y position to the default position
+                        shop_jokers[i]->ty = int2fx(71);
                     }
                 }
             }