wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor joker selection logic in game shop

Browse Source
This commit is contained in:
cellos51
2025-07-18 20:38:34 -04:00
parent c06b179764
commit 52fa45e426
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -3
View File
@@ -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
source/game.c
+2 -18
View File
@@ -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);
}
}
}