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

Added art for xmult hand jokers The Duo The Trio, The Family, The Order, and The Tribe by @MathisMartin31

Browse Source
This commit is contained in:
MeirGavish
2025-10-07 23:52:49 +03:00
parent c529c4be69
commit a0f1ef7780
9 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/joker_gfx17.grit
+1
View File
@@ -0,0 +1 @@
-gB4 -Mw4 -Mh4 -m! -pn 16
graphics/joker_gfx17.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

graphics/joker_gfx18.grit
+1
View File
@@ -0,0 +1 @@
-gB4 -Mw4 -Mh4 -m! -pn 16
graphics/joker_gfx18.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

graphics/joker_gfx19.grit
+1
View File
@@ -0,0 +1 @@
-gB4 -Mw4 -Mh4 -m! -pn 16
graphics/joker_gfx19.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 888 B

include/def_joker_gfx_table.h
+4 -1
View File
@@ -14,4 +14,7 @@ DEF_JOKER_GFX(12)
DEF_JOKER_GFX(13) DEF_JOKER_GFX(13)
DEF_JOKER_GFX(14) DEF_JOKER_GFX(14)
DEF_JOKER_GFX(15) DEF_JOKER_GFX(15)
DEF_JOKER_GFX(16) DEF_JOKER_GFX(16)
DEF_JOKER_GFX(17)
DEF_JOKER_GFX(18)
DEF_JOKER_GFX(19)
include/joker_gfx.h
+3
View File
@@ -18,5 +18,8 @@
#include "joker_gfx14.h" #include "joker_gfx14.h"
#include "joker_gfx15.h" #include "joker_gfx15.h"
#include "joker_gfx16.h" #include "joker_gfx16.h"
#include "joker_gfx17.h"
#include "joker_gfx18.h"
#include "joker_gfx19.h"
#endif #endif
source/joker_effects.c
+6 -16
View File
@@ -464,7 +464,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) {
return effect; return effect;
} }
__attribute__((unused))
static JokerEffect the_duo_joker_effect(Joker *joker, Card *scored_card) { static JokerEffect the_duo_joker_effect(Joker *joker, Card *scored_card) {
JokerEffect effect = {0}; JokerEffect effect = {0};
if (scored_card != NULL) if (scored_card != NULL)
@@ -480,9 +479,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) {
return effect; return effect;
} }
// graphics available from @MathisMartin31
__attribute__((unused))
static JokerEffect the_trio_joker_effect(Joker *joker, Card *scored_card) { static JokerEffect the_trio_joker_effect(Joker *joker, Card *scored_card) {
JokerEffect effect = {0}; JokerEffect effect = {0};
if (scored_card != NULL) if (scored_card != NULL)
@@ -498,8 +494,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) {
return effect; return effect;
} }
// graphics available from @MathisMartin31
__attribute__((unused))
static JokerEffect the_family_joker_effect(Joker *joker, Card *scored_card) { static JokerEffect the_family_joker_effect(Joker *joker, Card *scored_card) {
JokerEffect effect = {0}; JokerEffect effect = {0};
if (scored_card != NULL) if (scored_card != NULL)
@@ -515,8 +509,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) {
return effect; return effect;
} }
// graphics available from @MathisMartin31
__attribute__((unused))
static JokerEffect the_order_joker_effect(Joker *joker, Card *scored_card) { static JokerEffect the_order_joker_effect(Joker *joker, Card *scored_card) {
JokerEffect effect = {0}; JokerEffect effect = {0};
if (scored_card != NULL) if (scored_card != NULL)
@@ -531,8 +523,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) {
return effect; return effect;
} }
// graphics available from @MathisMartin31
__attribute__((unused))
static JokerEffect the_tribe_joker_effect(Joker *joker, Card *scored_card) { static JokerEffect the_tribe_joker_effect(Joker *joker, Card *scored_card) {
JokerEffect effect = {0}; JokerEffect effect = {0};
if (scored_card != NULL) if (scored_card != NULL)
@@ -643,16 +633,16 @@ const JokerInfo joker_registry[] = {
{ COMMON_JOKER, 6, reserved_parking_joker_effect }, // 31 { COMMON_JOKER, 6, reserved_parking_joker_effect }, // 31
{ COMMON_JOKER, 4, abstract_joker_effect }, // 32 { COMMON_JOKER, 4, abstract_joker_effect }, // 32
{ UNCOMMON_JOKER, 6, bull_joker_effect}, // 33 { UNCOMMON_JOKER, 6, bull_joker_effect}, // 33
{ RARE_JOKER, 8, the_duo_joker_effect}, // 34
{ RARE_JOKER, 8, the_trio_joker_effect}, // 35
{ RARE_JOKER, 8, the_family_joker_effect}, // 36
{ RARE_JOKER, 8, the_order_joker_effect}, // 37
{ RARE_JOKER, 8, the_tribe_joker_effect}, // 38
// The following jokers don't have sprites yet, // The following jokers don't have sprites yet,
// uncomment them when their sprites are added. // uncomment them when their sprites are added.
#if 0 #if 0
{ RARE_JOKER, 8, the_duo_joker_effect}, { UNCOMMON_JOKER, 7, bootstraps_joker_effect},
{ RARE_JOKER, 8, the_trio_joker_effect},
{ RARE_JOKER, 8, the_family_joker_effect},
{ RARE_JOKER, 8, the_order_joker_effect},
{ RARE_JOKER, 8, the_tribe_joker_effect},
{ UNCOMMON_JOKER, 7, bootstraps_joker_effect},
{ COMMON_JOKER, 5, shoot_the_moon_joker_effect}, { COMMON_JOKER, 5, shoot_the_moon_joker_effect},
#endif #endif
}; };