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:
co-authored by
Rickey
MathisMartin31
parent
461584b674
commit
5cf9e2674d
@@ -16,11 +16,3 @@ DEF_JOKER_GFX(14)
|
||||
DEF_JOKER_GFX(15)
|
||||
DEF_JOKER_GFX(16)
|
||||
DEF_JOKER_GFX(17)
|
||||
DEF_JOKER_GFX(18)
|
||||
DEF_JOKER_GFX(19)
|
||||
DEF_JOKER_GFX(20)
|
||||
DEF_JOKER_GFX(21)
|
||||
DEF_JOKER_GFX(22)
|
||||
DEF_JOKER_GFX(23)
|
||||
DEF_JOKER_GFX(24)
|
||||
DEF_JOKER_GFX(25)
|
||||
|
||||
+7
-7
@@ -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
|
||||
{
|
||||
|
||||
@@ -20,14 +20,6 @@
|
||||
#include "joker_gfx15.h"
|
||||
#include "joker_gfx16.h"
|
||||
#include "joker_gfx17.h"
|
||||
#include "joker_gfx18.h"
|
||||
#include "joker_gfx19.h"
|
||||
#include "joker_gfx20.h"
|
||||
#include "joker_gfx21.h"
|
||||
#include "joker_gfx22.h"
|
||||
#include "joker_gfx23.h"
|
||||
#include "joker_gfx24.h"
|
||||
#include "joker_gfx25.h"
|
||||
|
||||
#endif
|
||||
// clang-format on
|
||||
|
||||
Reference in New Issue
Block a user