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

Merge pull request #108 from cellos51/smiley_scary_face

Browse Source 
Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code
This commit is contained in:
MeirGavish
2025-08-22 19:55:46 +03:00
committed by GitHub
parent c5488fb008 2d50005e30
commit ff54bb244f
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/joker_gfx14.grit
+1
View File
@@ -0,0 +1 @@
-gB4 -Mw4 -Mh4 -m! -pn 16
graphics/joker_gfx14.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

include/joker_gfx.h
+1
View File
@@ -15,5 +15,6 @@
#include "joker_gfx11.h" #include "joker_gfx11.h"
#include "joker_gfx12.h" #include "joker_gfx12.h"
#include "joker_gfx13.h" #include "joker_gfx13.h"
#include "joker_gfx14.h"
#endif #endif
source/joker.c
+2
View File
@@ -132,6 +132,7 @@ void joker_init()
joker_gfxTiles[11] = joker_gfx11Tiles; joker_gfxTiles[11] = joker_gfx11Tiles;
joker_gfxTiles[12] = joker_gfx12Tiles; joker_gfxTiles[12] = joker_gfx12Tiles;
joker_gfxTiles[13] = joker_gfx13Tiles; joker_gfxTiles[13] = joker_gfx13Tiles;
joker_gfxTiles[14] = joker_gfx14Tiles;
joker_gfxPal[0] = joker_gfx0Pal; joker_gfxPal[0] = joker_gfx0Pal;
joker_gfxPal[1] = joker_gfx1Pal; joker_gfxPal[1] = joker_gfx1Pal;
@@ -147,6 +148,7 @@ void joker_init()
joker_gfxPal[11] = joker_gfx11Pal; joker_gfxPal[11] = joker_gfx11Pal;
joker_gfxPal[12] = joker_gfx12Pal; joker_gfxPal[12] = joker_gfx12Pal;
joker_gfxPal[13] = joker_gfx13Pal; joker_gfxPal[13] = joker_gfx13Pal;
joker_gfxPal[14] = joker_gfx14Pal;
for (int i = 0; i < num_spritesheets; i++) for (int i = 0; i < num_spritesheets; i++)
{ {
source/joker_effects.c
+3 -4
View File
@@ -382,7 +382,6 @@ static JokerEffect scholar_joker_effect(Joker *joker, Card *scored_card) {
return effect; return effect;
} }
__attribute__((unused))
static JokerEffect scary_face_joker_effect(Joker *joker, Card *scored_card) { static JokerEffect scary_face_joker_effect(Joker *joker, Card *scored_card) {
JokerEffect effect = {0}; JokerEffect effect = {0};
if (scored_card == NULL) if (scored_card == NULL)
@@ -422,7 +421,6 @@ static JokerEffect bull_joker_effect(Joker *joker, Card *scored_card) {
return effect; return effect;
} }
__attribute__((unused))
static JokerEffect smiley_face_joker_effect(Joker *joker, Card *scored_card) { static JokerEffect smiley_face_joker_effect(Joker *joker, Card *scored_card) {
JokerEffect effect = {0}; JokerEffect effect = {0};
if (scored_card == NULL) if (scored_card == NULL)
@@ -505,16 +503,17 @@ const JokerInfo joker_registry[] = {
{ COMMON_JOKER, 4, scholar_joker_effect }, // 26 { COMMON_JOKER, 4, scholar_joker_effect }, // 26
{ COMMON_JOKER, 4, business_card_joker_effect }, // 27 { COMMON_JOKER, 4, business_card_joker_effect }, // 27
// Business card should be paired with Shortcut for palette optimization when it's added // Business card should be paired with Shortcut for palette optimization when it's added
{ COMMON_JOKER, 4, scary_face_joker_effect }, // 28
{ COMMON_JOKER, 4, smiley_face_joker_effect }, // 29
// 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
{ COMMON_JOKER, 5, raised_fist_joker_effect }, { COMMON_JOKER, 5, raised_fist_joker_effect },
{ COMMON_JOKER, 6, reserved_parking_joker_effect }, { COMMON_JOKER, 6, reserved_parking_joker_effect },
{ COMMON_JOKER, 4, scary_face_joker_effect },
{ COMMON_JOKER, 4, abstract_joker_effect }, { COMMON_JOKER, 4, abstract_joker_effect },
{ UNCOMMON_JOKER, 6, bull_joker_effect}, { UNCOMMON_JOKER, 6, bull_joker_effect},
{ COMMON_JOKER, 4, smiley_face_joker_effect },
#endif #endif
}; };