Implement arbitrary-sized joker spritesheets (#285)

* Convert static joker sprites indexes to maps for dynamic spritesheets size

* tmp commit

* reorder Joker spritesheets

* more reordering

* Joker maps, will test later

* More reorders and palette optimizations. Sprites now work

* Fix Joker gfx

* Format joker.c

* Fix rebase error

* Integrate Shoot the Moon art

* format

* format

* removing useless GBAL_UNUSED from photograph Joker effect func

* Tidy up joker.c variables formatting

* Fix magic number

* Add context for map in joker.c

Co-authored-by: Rickey <ric@rf3.xyz>

* Update source/joker.c

Co-authored-by: Rickey <ric@rf3.xyz>

* Apply suggestion from @ricfehr3

Co-authored-by: Rickey <ric@rf3.xyz>

* format

* reduce clutter in joker_effects.c file by defining a macro for forward static declarations of joker effect funcs

* refactored some maps in joker.c to make it more concise

* clang format

* adding back how to mark functions as unused when Jokers don't have a sprite yet

* format

* Remove comment about unused functions for Jokers without art

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: Rickey <ric@rf3.xyz>
This commit is contained in:
Geralt
2026-03-29 01:58:05 +01:00
committed by GitHub
parent 461584b674
commit 5cf9e2674d
40 changed files with 196 additions and 414 deletions
+7 -7
View File
@@ -85,13 +85,13 @@ enum JokerEvent
// Jokers in the game
#define DEFAULT_JOKER_ID 0
#define GREEDY_JOKER_ID 1
#define STENCIL_JOKER_ID 16
#define SHORTCUT_JOKER_ID 26
#define PAREIDOLIA_JOKER_ID 30
#define BLUEPRINT_JOKER_ID 39
#define BRAINSTORM_JOKER_ID 40
#define FOUR_FINGERS_JOKER_ID 48
#define STENCIL_JOKER_ID 15
#define GREEDY_JOKER_ID 18
#define SHORTCUT_JOKER_ID 38
#define BRAINSTORM_JOKER_ID 41
#define PAREIDOLIA_JOKER_ID 46
#define FOUR_FINGERS_JOKER_ID 50
#define BLUEPRINT_JOKER_ID 52
typedef struct
{