dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document roulette flash util

Browse Source
This commit is contained in:
GriffinR
2020-08-04 19:19:36 -04:00
parent 868f831167
commit 8e800e2061
3 changed files with 362 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/roulette_util.h
+29 -26
View File
@@ -33,34 +33,37 @@ struct PulseBlend
struct PulseBlendPalette pulseBlendPalettes[16]; struct PulseBlendPalette pulseBlendPalettes[16];
}; };
struct UnkStruct1
#define FLASHUTIL_USE_EXISTING_COLOR (1 << 15)
struct RouletteFlashSettings
{ {
u16 var00; u16 color;
u16 var02; u16 paletteOffset;
u8 var04; u8 numColors;
u8 var05; u8 delay;
u8 var06; s8 unk6; // Set but never used
s8 var07_0:5; s8 numFadeCycles:5;
s8 var07_5:2; s8 unk7_5:2; // Set but never used
s8 var07_7:1; s8 colorDeltaDir:1;
}; };
struct UnkStruct3 struct RouletteFlashPalette
{ {
u8 var00_0:7; u8 state:7;
bool8 active:1; bool8 available:1;
u8 var01; u8 delayCounter;
s8 var02; s8 fadeCycleCounter;
s8 var03; s8 colorDelta;
struct UnkStruct1 var04; struct RouletteFlashSettings settings;
}; };
struct UnkStruct0 struct RouletteFlashUtil
{ {
u8 var00; u8 enabled;
u8 var01; u8 unused;
u16 var02; //flag for each UnkStruct3 u16 flags;
struct UnkStruct3 var04[0x10]; struct RouletteFlashPalette palettes[16];
}; };
int InitPulseBlendPaletteSettings(struct PulseBlend *, const struct PulseBlendSettings *); int InitPulseBlendPaletteSettings(struct PulseBlend *, const struct PulseBlendSettings *);
@@ -71,10 +74,10 @@ void UnmarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8);
void UpdatePulseBlend(struct PulseBlend *); void UpdatePulseBlend(struct PulseBlend *);
void ClearTilemapRect(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height); void ClearTilemapRect(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height);
void SetTilemapRect(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height); void SetTilemapRect(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height);
void task_tutorial_controls_fadein(struct UnkStruct0 *r0); void RouletteFlash_Run(struct RouletteFlashUtil *r0);
void sub_8151678(struct UnkStruct0 *r0); void RouletteFlash_Reset(struct RouletteFlashUtil *r0);
u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2); u8 RouletteFlash_Add(struct RouletteFlashUtil *r0, u8 r1, const struct RouletteFlashSettings *r2);
void sub_8151A9C(struct UnkStruct0 *r0, u16 r1); void RouletteFlash_Stop(struct RouletteFlashUtil *r0, u16 r1);
void sub_8151A48(struct UnkStruct0 *r0, u16 r1); void RouletteFlash_Enable(struct RouletteFlashUtil *r0, u16 r1);
#endif // GUARD_ROULETTE_UTIL_H #endif // GUARD_ROULETTE_UTIL_H
src/roulette.c
+228 -204
View File
@@ -100,6 +100,26 @@
#define F_PURPLE_SKITTY (1 << SQU_PURPLE_SKITTY) #define F_PURPLE_SKITTY (1 << SQU_PURPLE_SKITTY)
#define F_PURPLE_MAKUHITA (1 << SQU_PURPLE_MAKUHITA) #define F_PURPLE_MAKUHITA (1 << SQU_PURPLE_MAKUHITA)
// Flags for flashing selections on the roulette wheel
#define F_FLASH_COLOR_O_WYNAUT (1 << 0)
#define F_FLASH_COLOR_G_AZURILL (1 << 1)
#define F_FLASH_COLOR_P_SKITTY (1 << 2)
#define F_FLASH_COLOR_O_MAKUHITA (1 << 3)
#define F_FLASH_COLOR_G_WYNAUT (1 << 4)
#define F_FLASH_COLOR_P_AZURILL (1 << 5)
#define F_FLASH_COLOR_O_SKITTY (1 << 6)
#define F_FLASH_COLOR_G_MAKUHITA (1 << 7)
#define F_FLASH_COLOR_P_WYNAUT (1 << 8)
#define F_FLASH_COLOR_O_AZURILL (1 << 9)
#define F_FLASH_COLOR_G_SKITTY (1 << 10)
#define F_FLASH_COLOR_P_MAKUHITA (1 << 11)
#define F_FLASH_OUTER_EDGES (1 << 12) // when the player wins
#define FLASH_ICON (NUM_ROULETTE_SLOTS + 1)
#define FLASH_ICON_2 (FLASH_ICON + 1)
#define FLASH_ICON_3 (FLASH_ICON + 2)
#define F_FLASH_ICON (1 << FLASH_ICON)
#define F_FLASH_COLUMN (1 << FLASH_ICON | 1 << FLASH_ICON_2 | 1 << FLASH_ICON_3)
#define MAX_MULTIPLIER 12 #define MAX_MULTIPLIER 12
#define PALTAG_SHADOW 1 #define PALTAG_SHADOW 1
@@ -271,7 +291,7 @@ struct GridSelection
u8 tilemapOffset; u8 tilemapOffset;
u32 flag; u32 flag;
u32 inSelectionFlags; u32 inSelectionFlags;
u16 var10; u16 flashFlags;
}; };
struct RouletteSlot struct RouletteSlot
@@ -336,7 +356,7 @@ static EWRAM_DATA struct Roulette
TaskFunc nextTask; TaskFunc nextTask;
u8 filler_2[4]; u8 filler_2[4];
TaskFunc prevTask; TaskFunc prevTask;
struct UnkStruct0 flashUtil; struct RouletteFlashUtil flashUtil;
u16 tilemapBuffers[7][0x400]; u16 tilemapBuffers[7][0x400];
u16 *gridTilemap; u16 *gridTilemap;
} *sRoulette = NULL; } *sRoulette = NULL;
@@ -461,7 +481,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 0, .tilemapOffset = 0,
.flag = 0, .flag = 0,
.inSelectionFlags = 0, .inSelectionFlags = 0,
.var10 = 0x0, .flashFlags = 0,
}, },
[COL_WYNAUT] = { [COL_WYNAUT] = {
.spriteIdOffset = 12, .spriteIdOffset = 12,
@@ -474,7 +494,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 0, .tilemapOffset = 0,
.flag = F_WYNAUT_COL, .flag = F_WYNAUT_COL,
.inSelectionFlags = F_WYNAUT_COL | F_ORANGE_WYNAUT | F_GREEN_WYNAUT | F_PURPLE_WYNAUT, .inSelectionFlags = F_WYNAUT_COL | F_ORANGE_WYNAUT | F_GREEN_WYNAUT | F_PURPLE_WYNAUT,
.var10 = 0xE000, .flashFlags = F_FLASH_COLUMN,
}, },
[COL_AZURILL] = { [COL_AZURILL] = {
.spriteIdOffset = 13, .spriteIdOffset = 13,
@@ -487,7 +507,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 0, .tilemapOffset = 0,
.flag = F_AZURILL_COL, .flag = F_AZURILL_COL,
.inSelectionFlags = F_AZURILL_COL | F_ORANGE_AZURILL | F_GREEN_AZURILL | F_PURPLE_AZURILL, .inSelectionFlags = F_AZURILL_COL | F_ORANGE_AZURILL | F_GREEN_AZURILL | F_PURPLE_AZURILL,
.var10 = 0xE000, .flashFlags = F_FLASH_COLUMN,
}, },
[COL_SKITTY] = { [COL_SKITTY] = {
.spriteIdOffset = 14, .spriteIdOffset = 14,
@@ -500,7 +520,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 0, .tilemapOffset = 0,
.flag = F_SKITTY_COL, .flag = F_SKITTY_COL,
.inSelectionFlags = F_SKITTY_COL | F_ORANGE_SKITTY | F_GREEN_SKITTY | F_PURPLE_SKITTY, .inSelectionFlags = F_SKITTY_COL | F_ORANGE_SKITTY | F_GREEN_SKITTY | F_PURPLE_SKITTY,
.var10 = 0xE000, .flashFlags = F_FLASH_COLUMN,
}, },
[COL_MAKUHITA] = { [COL_MAKUHITA] = {
.spriteIdOffset = 15, .spriteIdOffset = 15,
@@ -513,7 +533,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 0, .tilemapOffset = 0,
.flag = F_MAKUHITA_COL, .flag = F_MAKUHITA_COL,
.inSelectionFlags = F_MAKUHITA_COL | F_ORANGE_MAKUHITA | F_GREEN_MAKUHITA | F_PURPLE_MAKUHITA, .inSelectionFlags = F_MAKUHITA_COL | F_ORANGE_MAKUHITA | F_GREEN_MAKUHITA | F_PURPLE_MAKUHITA,
.var10 = 0xE000, .flashFlags = F_FLASH_COLUMN,
}, },
[ROW_ORANGE] = { [ROW_ORANGE] = {
.spriteIdOffset = 16, .spriteIdOffset = 16,
@@ -526,7 +546,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 12, .tilemapOffset = 12,
.flag = F_ORANGE_ROW, .flag = F_ORANGE_ROW,
.inSelectionFlags = F_ORANGE_ROW | F_ORANGE_WYNAUT | F_ORANGE_AZURILL | F_ORANGE_SKITTY | F_ORANGE_MAKUHITA, .inSelectionFlags = F_ORANGE_ROW | F_ORANGE_WYNAUT | F_ORANGE_AZURILL | F_ORANGE_SKITTY | F_ORANGE_MAKUHITA,
.var10 = 0x249, .flashFlags = F_FLASH_COLOR_O_WYNAUT | F_FLASH_COLOR_O_AZURILL | F_FLASH_COLOR_O_SKITTY | F_FLASH_COLOR_O_MAKUHITA,
}, },
[SQU_ORANGE_WYNAUT] = { [SQU_ORANGE_WYNAUT] = {
.spriteIdOffset = 0, .spriteIdOffset = 0,
@@ -539,7 +559,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 3, .tilemapOffset = 3,
.flag = F_ORANGE_WYNAUT, .flag = F_ORANGE_WYNAUT,
.inSelectionFlags = F_ORANGE_WYNAUT, .inSelectionFlags = F_ORANGE_WYNAUT,
.var10 = 0x2001, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_O_WYNAUT,
}, },
[SQU_ORANGE_AZURILL] = { [SQU_ORANGE_AZURILL] = {
.spriteIdOffset = 9, .spriteIdOffset = 9,
@@ -552,7 +572,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 3, .tilemapOffset = 3,
.flag = F_ORANGE_AZURILL, .flag = F_ORANGE_AZURILL,
.inSelectionFlags = F_ORANGE_AZURILL, .inSelectionFlags = F_ORANGE_AZURILL,
.var10 = 0x2200, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_O_AZURILL,
}, },
[SQU_ORANGE_SKITTY] = { [SQU_ORANGE_SKITTY] = {
.spriteIdOffset = 6, .spriteIdOffset = 6,
@@ -565,7 +585,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 3, .tilemapOffset = 3,
.flag = F_ORANGE_SKITTY, .flag = F_ORANGE_SKITTY,
.inSelectionFlags = F_ORANGE_SKITTY, .inSelectionFlags = F_ORANGE_SKITTY,
.var10 = 0x2040, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_O_SKITTY,
}, },
[SQU_ORANGE_MAKUHITA] = { [SQU_ORANGE_MAKUHITA] = {
.spriteIdOffset = 3, .spriteIdOffset = 3,
@@ -578,7 +598,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 3, .tilemapOffset = 3,
.flag = F_ORANGE_MAKUHITA, .flag = F_ORANGE_MAKUHITA,
.inSelectionFlags = F_ORANGE_MAKUHITA, .inSelectionFlags = F_ORANGE_MAKUHITA,
.var10 = 0x2008, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_O_MAKUHITA,
}, },
[ROW_GREEN] = { [ROW_GREEN] = {
.spriteIdOffset = 17, .spriteIdOffset = 17,
@@ -591,7 +611,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 15, .tilemapOffset = 15,
.flag = F_GREEN_ROW, .flag = F_GREEN_ROW,
.inSelectionFlags = F_GREEN_ROW | F_GREEN_WYNAUT | F_GREEN_AZURILL | F_GREEN_SKITTY | F_GREEN_MAKUHITA, .inSelectionFlags = F_GREEN_ROW | F_GREEN_WYNAUT | F_GREEN_AZURILL | F_GREEN_SKITTY | F_GREEN_MAKUHITA,
.var10 = 0x492, .flashFlags = F_FLASH_COLOR_G_WYNAUT | F_FLASH_COLOR_G_AZURILL | F_FLASH_COLOR_G_SKITTY | F_FLASH_COLOR_G_MAKUHITA,
}, },
[SQU_GREEN_WYNAUT] = { [SQU_GREEN_WYNAUT] = {
.spriteIdOffset = 4, .spriteIdOffset = 4,
@@ -604,7 +624,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 6, .tilemapOffset = 6,
.flag = F_GREEN_WYNAUT, .flag = F_GREEN_WYNAUT,
.inSelectionFlags = F_GREEN_WYNAUT, .inSelectionFlags = F_GREEN_WYNAUT,
.var10 = 0x2010, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_G_WYNAUT,
}, },
[SQU_GREEN_AZURILL] = { [SQU_GREEN_AZURILL] = {
.spriteIdOffset = 1, .spriteIdOffset = 1,
@@ -617,7 +637,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 6, .tilemapOffset = 6,
.flag = F_GREEN_AZURILL, .flag = F_GREEN_AZURILL,
.inSelectionFlags = F_GREEN_AZURILL, .inSelectionFlags = F_GREEN_AZURILL,
.var10 = 0x2002, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_G_AZURILL,
}, },
[SQU_GREEN_SKITTY] = { [SQU_GREEN_SKITTY] = {
.spriteIdOffset = 10, .spriteIdOffset = 10,
@@ -630,7 +650,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 6, .tilemapOffset = 6,
.flag = F_GREEN_SKITTY, .flag = F_GREEN_SKITTY,
.inSelectionFlags = F_GREEN_SKITTY, .inSelectionFlags = F_GREEN_SKITTY,
.var10 = 0x2400, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_G_SKITTY,
}, },
[SQU_GREEN_MAKUHITA] = { [SQU_GREEN_MAKUHITA] = {
.spriteIdOffset = 7, .spriteIdOffset = 7,
@@ -643,7 +663,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 6, .tilemapOffset = 6,
.flag = F_GREEN_MAKUHITA, .flag = F_GREEN_MAKUHITA,
.inSelectionFlags = F_GREEN_MAKUHITA, .inSelectionFlags = F_GREEN_MAKUHITA,
.var10 = 0x2080, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_G_MAKUHITA,
}, },
[ROW_PURPLE] = { [ROW_PURPLE] = {
.spriteIdOffset = 18, .spriteIdOffset = 18,
@@ -656,7 +676,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 18, .tilemapOffset = 18,
.flag = F_PURPLE_ROW, .flag = F_PURPLE_ROW,
.inSelectionFlags = F_PURPLE_ROW | F_PURPLE_WYNAUT | F_PURPLE_AZURILL | F_PURPLE_SKITTY | F_PURPLE_MAKUHITA, .inSelectionFlags = F_PURPLE_ROW | F_PURPLE_WYNAUT | F_PURPLE_AZURILL | F_PURPLE_SKITTY | F_PURPLE_MAKUHITA,
.var10 = 0x924, .flashFlags = F_FLASH_COLOR_P_WYNAUT | F_FLASH_COLOR_P_AZURILL | F_FLASH_COLOR_P_SKITTY | F_FLASH_COLOR_P_MAKUHITA,
}, },
[SQU_PURPLE_WYNAUT] = { [SQU_PURPLE_WYNAUT] = {
.spriteIdOffset = 8, .spriteIdOffset = 8,
@@ -669,7 +689,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 9, .tilemapOffset = 9,
.flag = F_PURPLE_WYNAUT, .flag = F_PURPLE_WYNAUT,
.inSelectionFlags = F_PURPLE_WYNAUT, .inSelectionFlags = F_PURPLE_WYNAUT,
.var10 = 0x2100, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_P_WYNAUT,
}, },
[SQU_PURPLE_AZURILL] = { [SQU_PURPLE_AZURILL] = {
.spriteIdOffset = 5, .spriteIdOffset = 5,
@@ -682,7 +702,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 9, .tilemapOffset = 9,
.flag = F_PURPLE_AZURILL, .flag = F_PURPLE_AZURILL,
.inSelectionFlags = F_PURPLE_AZURILL, .inSelectionFlags = F_PURPLE_AZURILL,
.var10 = 0x2020, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_P_AZURILL,
}, },
[SQU_PURPLE_SKITTY] = { [SQU_PURPLE_SKITTY] = {
.spriteIdOffset = 2, .spriteIdOffset = 2,
@@ -695,7 +715,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 9, .tilemapOffset = 9,
.flag = F_PURPLE_SKITTY, .flag = F_PURPLE_SKITTY,
.inSelectionFlags = F_PURPLE_SKITTY, .inSelectionFlags = F_PURPLE_SKITTY,
.var10 = 0x2004, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_P_SKITTY,
}, },
[SQU_PURPLE_MAKUHITA] = { [SQU_PURPLE_MAKUHITA] = {
.spriteIdOffset = 11, .spriteIdOffset = 11,
@@ -708,7 +728,7 @@ static const struct GridSelection sGridSelections[NUM_GRID_SELECTIONS + 1] =
.tilemapOffset = 9, .tilemapOffset = 9,
.flag = F_PURPLE_MAKUHITA, .flag = F_PURPLE_MAKUHITA,
.inSelectionFlags = F_PURPLE_MAKUHITA, .inSelectionFlags = F_PURPLE_MAKUHITA,
.var10 = 0x2800, .flashFlags = F_FLASH_ICON | F_FLASH_COLOR_P_MAKUHITA,
}, },
}; };
@@ -835,171 +855,174 @@ static const struct RouletteTable sRouletteTables[] =
} }
}; };
static const struct UnkStruct1 gUnknown_085B6388[NUM_ROULETTE_SLOTS + 1] = // Data to flash the color indicator for each slot on the roulette wheel
static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + 1] =
{ {
{ { // F_FLASH_COLOR_O_WYNAUT
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x0005, .paletteOffset = 0x5,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_G_AZURILL
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x000A, .paletteOffset = 0xA,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_P_SKITTY
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x0015, .paletteOffset = 0x15,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_O_MAKUHITA
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x0055, .paletteOffset = 0x55,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_G_WYNAUT
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x005A, .paletteOffset = 0x5A,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_P_AZURILL
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x0065, .paletteOffset = 0x65,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_O_SKITTY
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x0075, .paletteOffset = 0x75,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_G_MAKUHITA
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x007A, .paletteOffset = 0x7A,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_P_WYNAUT
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x0085, .paletteOffset = 0x85,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_O_AZURILL
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x0095, .paletteOffset = 0x95,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_G_SKITTY
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x009A, .paletteOffset = 0x9A,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_COLOR_P_MAKUHITA
.var00 = 0x8000, .color = FLASHUTIL_USE_EXISTING_COLOR,
.var02 = 0x00A5, .paletteOffset = 0xA5,
.var04 = 1, .numColors = 1,
.var05 = 1, .delay = 1,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 8, .numFadeCycles = 8,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ { // F_FLASH_OUTER_EDGES
.var00 = 0x77D6, .color = RGB(22, 30, 29),
.var02 = 0x0028, .paletteOffset = 0x28,
.var04 = 2, .numColors = 2,
.var05 = 10, .delay = 10,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 14, .numFadeCycles = 14,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
}; };
static const struct UnkStruct1 gUnknown_085B63F0[NUM_BOARD_COLORS] = // Data to flash any pokemon icon (F_FLASH_ICON) on the roulette wheel. One entry for each color row
// Each poke icon flashes with the tint of the row color it belongs to, so the pokemon itself is irrelevant
static const struct RouletteFlashSettings sFlashData_PokeIcons[NUM_BOARD_COLORS] =
{ {
{ [GET_ROW_IDX(ROW_ORANGE)] = {
.var00 = 0x53FF, .color = RGB(31, 31, 20),
.var02 = 0x0101, .paletteOffset = 0x101,
.var04 = 5, .numColors = 5,
.var05 = 30, .delay = 30,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 14, .numFadeCycles = 14,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ [GET_ROW_IDX(ROW_GREEN)] = {
.var00 = 0x7FFB, .color = RGB(27, 31, 31),
.var02 = 0x0106, .paletteOffset = 0x106,
.var04 = 5, .numColors = 5,
.var05 = 30, .delay = 30,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 14, .numFadeCycles = 14,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
}, },
{ [GET_ROW_IDX(ROW_PURPLE)] = {
.var00 = 0x7F7F, .color = RGB(31, 27, 31),
.var02 = 0x010B, .paletteOffset = 0x10B,
.var04 = 5, .numColors = 5,
.var05 = 30, .delay = 30,
.var06 = 0xFF, .unk6 = -1,
.var07_0 = 14, .numFadeCycles = 14,
.var07_5 = -2, .unk7_5 = -2,
.var07_7 = 0 .colorDeltaDir = 0,
} }
}; };
@@ -1020,8 +1043,8 @@ static void CB2_Roulette(void)
RunTasks(); RunTasks();
AnimateSprites(); AnimateSprites();
BuildOamBuffer(); BuildOamBuffer();
if (sRoulette->flashUtil.var00) if (sRoulette->flashUtil.enabled)
task_tutorial_controls_fadein(&sRoulette->flashUtil); RouletteFlash_Run(&sRoulette->flashUtil);
} }
static void VBlankCB_Roulette(void) static void VBlankCB_Roulette(void)
@@ -1110,12 +1133,13 @@ static void InitRouletteTableData(void)
else else
gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = bgColors[1]; gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = bgColors[1];
sub_8151678(&sRoulette->flashUtil); RouletteFlash_Reset(&sRoulette->flashUtil);
// Init flash util for flashing the selected colors on the wheel // Init flash util for flashing the selected colors on the wheel
// + 1 for the additional entry to flash the outer edges on a win
for (i = 0; i < NUM_ROULETTE_SLOTS + 1; i++) for (i = 0; i < NUM_ROULETTE_SLOTS + 1; i++)
{ {
sub_815168C(&sRoulette->flashUtil, i, &gUnknown_085B6388[i]); RouletteFlash_Add(&sRoulette->flashUtil, i, &sFlashData_Colors[i]);
} }
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
@@ -1421,8 +1445,8 @@ static void ProcessBetGridInput(u8 taskId)
UpdateGridSelection(taskId); UpdateGridSelection(taskId);
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_8151A9C(&sRoulette->flashUtil, 0xFFFF); // Reset previous flashing wheel color selection RouletteFlash_Stop(&sRoulette->flashUtil, 0xFFFF);
sRoulette->flashUtil.var04[13].active = sRoulette->flashUtil.var04[14].active = sRoulette->flashUtil.var04[15].active = FALSE; // Same as above, but for icon sRoulette->flashUtil.palettes[FLASH_ICON].available = sRoulette->flashUtil.palettes[FLASH_ICON_2].available = sRoulette->flashUtil.palettes[FLASH_ICON_3].available = FALSE;
FlashSelectionOnWheel(gTasks[taskId].tSelectionId); FlashSelectionOnWheel(gTasks[taskId].tSelectionId);
// Switch all the poke (column) headers to gray outlines // Switch all the poke (column) headers to gray outlines
@@ -1680,7 +1704,7 @@ static void Task_RecordBallHit(u8 taskId)
bool8 won = IsHitInBetSelection(RecordHit(taskId, sRoulette->hitSlot), sRoulette->betSelection[sRoulette->curBallNum]); bool8 won = IsHitInBetSelection(RecordHit(taskId, sRoulette->hitSlot), sRoulette->betSelection[sRoulette->curBallNum]);
gTasks[taskId].tWonBet = won; gTasks[taskId].tWonBet = won;
if (won == TRUE) if (won == TRUE)
sub_8151A48(&sRoulette->flashUtil, 0x1000); // Flash outer edges of wheel RouletteFlash_Enable(&sRoulette->flashUtil, F_FLASH_OUTER_EDGES);
} }
if (gTasks[taskId].data[1] <= 60) if (gTasks[taskId].data[1] <= 60)
{ {
@@ -1853,8 +1877,8 @@ static void Task_PrintPayout(u8 taskId)
static void Task_EndTurn(u8 taskId) static void Task_EndTurn(u8 taskId)
{ {
sub_8151A9C(&sRoulette->flashUtil, 0xFFFF); RouletteFlash_Stop(&sRoulette->flashUtil, 0xFFFF);
sRoulette->flashUtil.var04[13].active = sRoulette->flashUtil.var04[14].active = sRoulette->flashUtil.var04[15].active = FALSE; sRoulette->flashUtil.palettes[FLASH_ICON].available = sRoulette->flashUtil.palettes[FLASH_ICON_2].available = sRoulette->flashUtil.palettes[FLASH_ICON_3].available = FALSE;
gSprites[sRoulette->spriteIds[SPR_WHEEL_ICONS + sGridSelections[gTasks[taskId].tWinningSquare].spriteIdOffset]].invisible = TRUE; gSprites[sRoulette->spriteIds[SPR_WHEEL_ICONS + sGridSelections[gTasks[taskId].tWinningSquare].spriteIdOffset]].invisible = TRUE;
gTasks[taskId].func = Task_TryPrintEndTurnMsg; gTasks[taskId].func = Task_TryPrintEndTurnMsg;
} }
@@ -1937,8 +1961,8 @@ static void Task_ClearBoard(u8 taskId)
static void ExitRoulette(u8 taskId) static void ExitRoulette(u8 taskId)
{ {
sub_8151A9C(&sRoulette->flashUtil, 0xFFFF); RouletteFlash_Stop(&sRoulette->flashUtil, 0xFFFF);
sub_8151678(&sRoulette->flashUtil); RouletteFlash_Reset(&sRoulette->flashUtil);
SetCoins(gTasks[taskId].tCoins); SetCoins(gTasks[taskId].tCoins);
if (GetCoins() < sRoulette->minBet) if (GetCoins() < sRoulette->minBet)
gSpecialVar_0x8004 = TRUE; gSpecialVar_0x8004 = TRUE;
@@ -2108,9 +2132,9 @@ static bool8 IsHitInBetSelection(u8 gridSquare, u8 betSelection)
static void FlashSelectionOnWheel(u8 selectionId) static void FlashSelectionOnWheel(u8 selectionId)
{ {
u16 var0 = 0; u16 flashFlags = 0;
u8 numSelected; u8 numSelected;
u16 var3; u16 palOffset;
u8 i; u8 i;
switch (selectionId) switch (selectionId)
@@ -2122,47 +2146,46 @@ static void FlashSelectionOnWheel(u8 selectionId)
for (i = (selectionId + 1); i < (selectionId + 5); i++) for (i = (selectionId + 1); i < (selectionId + 5); i++)
{ {
if (!(sRoulette->hitFlags & sGridSelections[i].flag)) if (!(sRoulette->hitFlags & sGridSelections[i].flag))
var0 |= sGridSelections[i].var10; flashFlags |= sGridSelections[i].flashFlags;
} }
sub_8151A48(&sRoulette->flashUtil, var0 &= 0xDFFF); RouletteFlash_Enable(&sRoulette->flashUtil, flashFlags &= ~(F_FLASH_ICON));
break; break;
default: default:
{ {
// Selection is either a column or individual square // Selection is either a column or individual square
struct UnkStruct1 var1[NUM_BOARD_COLORS]; struct RouletteFlashSettings iconFlash[NUM_BOARD_COLORS];
memcpy(var1, gUnknown_085B63F0, sizeof(var1)); memcpy(iconFlash, sFlashData_PokeIcons, sizeof(iconFlash));
if (selectionId >= COL_WYNAUT && selectionId <= COL_MAKUHITA) if (selectionId >= COL_WYNAUT && selectionId <= COL_MAKUHITA)
numSelected = NUM_BOARD_COLORS; // Selection is full column numSelected = NUM_BOARD_COLORS; // Selection is full column
else else
numSelected = 1; numSelected = 1;
var3 = GET_ROW_IDX(selectionId); palOffset = GET_ROW_IDX(selectionId);
switch (GET_COL(selectionId)) switch (GET_COL(selectionId))
{ {
// The specific color of the poke it references doesn't matter, because the icons themelves all share a palette // The specific color of the poke it references doesn't matter, because the icons of a poke share a palette
// So it just uses the first sprite ID of each // So it just uses the first sprite ID of each
case COL_WYNAUT: case COL_WYNAUT:
var3 = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_WYNAUT]].oam.paletteNum * 16; palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_WYNAUT]].oam.paletteNum * 16;
break; break;
case COL_AZURILL: case COL_AZURILL:
var3 = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_GREEN_AZURILL]].oam.paletteNum * 16; palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_GREEN_AZURILL]].oam.paletteNum * 16;
break; break;
case COL_SKITTY: case COL_SKITTY:
var3 = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_PURPLE_SKITTY]].oam.paletteNum * 16; palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_PURPLE_SKITTY]].oam.paletteNum * 16;
break; break;
case COL_MAKUHITA: case COL_MAKUHITA:
var3 = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_MAKUHITA]].oam.paletteNum * 16; palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_MAKUHITA]].oam.paletteNum * 16;
break; break;
} }
if (numSelected == 1) if (numSelected == 1)
{ {
// Selection is individual square // Selection is individual square, add entry in flash util for its icon
if (!(sRoulette->hitFlags & sGridSelections[selectionId].flag)) if (!(sRoulette->hitFlags & sGridSelections[selectionId].flag))
{ {
// Set poke icon of selected square to flash iconFlash[GET_ROW_IDX(selectionId)].paletteOffset += palOffset;
var1[GET_ROW_IDX(selectionId)].var02 += var3; RouletteFlash_Add(&sRoulette->flashUtil, NUM_ROULETTE_SLOTS + 1, &iconFlash[GET_ROW_IDX(selectionId)]);
sub_815168C(&sRoulette->flashUtil, 13, &var1[GET_ROW_IDX(selectionId)]);
} }
else else
{ {
@@ -2172,25 +2195,26 @@ static void FlashSelectionOnWheel(u8 selectionId)
} }
else else
{ {
// Selection is full column // Selection is full column, add entry in flash util for each unhit space's icon
// If there is only 1 unhit space, also add its flags so its color will flash as well
for (i = 0; i < NUM_BOARD_COLORS; i++) for (i = 0; i < NUM_BOARD_COLORS; i++)
{ {
u8 var4 = i * 5 + selectionId + 5; u8 columnSlotId = i * 5 + selectionId + 5;
if (!(sRoulette->hitFlags & sGridSelections[var4].flag)) if (!(sRoulette->hitFlags & sGridSelections[columnSlotId].flag))
{ {
// Set poke icons of selected squares to flash iconFlash[GET_ROW_IDX(columnSlotId)].paletteOffset += palOffset;
var1[GET_ROW_IDX(var4)].var02 += var3; RouletteFlash_Add(&sRoulette->flashUtil, i + NUM_ROULETTE_SLOTS + 1, &iconFlash[GET_ROW_IDX(columnSlotId)]);
sub_815168C(&sRoulette->flashUtil, i + 13, &var1[GET_ROW_IDX(var4)]);
if (numSelected == 3) if (numSelected == 3)
var0 = sGridSelections[var4].var10; flashFlags = sGridSelections[columnSlotId].flashFlags;
numSelected--; numSelected--;
} }
} }
// If there was more than 1 space in the column, reset flags; only icons will flash
if (numSelected != 2) if (numSelected != 2)
var0 = 0; flashFlags = 0;
} }
// Do flash // Do flash
sub_8151A48(&sRoulette->flashUtil, var0 |= sGridSelections[selectionId].var10); RouletteFlash_Enable(&sRoulette->flashUtil, flashFlags |= sGridSelections[selectionId].flashFlags);
break; break;
} }
} }
src/roulette_util.c
+105 -100
View File
@@ -1,212 +1,217 @@
#include "global.h" #include "global.h"
#include "palette.h" #include "palette.h"
#include "roulette.h"
#include "roulette_util.h" #include "roulette_util.h"
#include "util.h" #include "util.h"
// "Roulette Util" is perhaps more accurately a general flashing util // "RouletteFlash" is more accurately a general flashing/fading util
// e.g. it handles fading the palettes for the color selections on the Roulette wheel // this file handles fading the palettes for the color/icon selections on the Roulette wheel
// but it also handles the "pulse blend" effect of Mirage Tower // but it also handles the "pulse blend" effect of Mirage Tower
void sub_8151678(struct UnkStruct0 *r0) void RouletteFlash_Reset(struct RouletteFlashUtil *flash)
{ {
r0->var00 = 0; flash->enabled = 0;
r0->var02 = 0; flash->flags = 0;
memset(&r0->var04, 0, sizeof(r0->var04)); memset(&flash->palettes, 0, sizeof(flash->palettes));
} }
u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2) u8 RouletteFlash_Add(struct RouletteFlashUtil *flash, u8 id, const struct RouletteFlashSettings *settings)
{ {
if (!(r1 < 16) || (r0->var04[r1].active)) if (id >= ARRAY_COUNT(flash->palettes) || flash->palettes[id].available)
return 0xFF; return 0xFF;
r0->var04[r1].var04.var00 = r2->var00; flash->palettes[id].settings.color = settings->color;
r0->var04[r1].var04.var02 = r2->var02; flash->palettes[id].settings.paletteOffset = settings->paletteOffset;
r0->var04[r1].var04.var04 = r2->var04; flash->palettes[id].settings.numColors = settings->numColors;
r0->var04[r1].var04.var05 = r2->var05; flash->palettes[id].settings.delay = settings->delay;
r0->var04[r1].var04.var06 = r2->var06; flash->palettes[id].settings.unk6 = settings->unk6;
r0->var04[r1].var04.var07_0 = r2->var07_0; flash->palettes[id].settings.numFadeCycles = settings->numFadeCycles;
r0->var04[r1].var04.var07_5 = r2->var07_5; flash->palettes[id].settings.unk7_5 = settings->unk7_5;
r0->var04[r1].var04.var07_7 = r2->var07_7; flash->palettes[id].settings.colorDeltaDir = settings->colorDeltaDir;
r0->var04[r1].var00_0 = 0; flash->palettes[id].state = 0;
r0->var04[r1].active = TRUE; flash->palettes[id].available = TRUE;
r0->var04[r1].var02 = 0; flash->palettes[id].fadeCycleCounter = 0;
r0->var04[r1].var01 = 0; flash->palettes[id].delayCounter = 0;
if (r0->var04[r1].var04.var07_7 < 0) if (flash->palettes[id].settings.colorDeltaDir < 0)
r0->var04[r1].var03 = 0xFF; flash->palettes[id].colorDelta = -1;
else else
r0->var04[r1].var03 = 1; flash->palettes[id].colorDelta = 1;
return r1; return id;
} }
u8 sub_8151710(struct UnkStruct0 *r0, u8 r1) // Unused
static u8 RouletteFlash_Remove(struct RouletteFlashUtil *flash, u8 id)
{ {
if (r1 >= 16) if (id >= ARRAY_COUNT(flash->palettes))
return 0xFF; return 0xFF;
if (!r0->var04[r1].active) if (!flash->palettes[id].available)
return 0xFF; return 0xFF;
memset(&r0->var04[r1], 0, sizeof(r0->var04[r1])); memset(&flash->palettes[id], 0, sizeof(flash->palettes[id]));
return r1; return id;
} }
u8 sub_8151744(struct UnkStruct3 *r0) static u8 RouletteFlash_FadePalette(struct RouletteFlashPalette *pal)
{ {
u8 i; u8 i;
u8 returnval; u8 returnval;
for (i = 0; i < r0->var04.var04; i++) for (i = 0; i < pal->settings.numColors; i++)
{ {
struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[r0->var04.var02 + i]; struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[pal->settings.paletteOffset + i];
struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[r0->var04.var02 + i]; struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[pal->settings.paletteOffset + i];
switch (r0->var00_0) switch (pal->state)
{ {
case 1: case 1:
if (faded->r + r0->var03 >= 0 && faded->r + r0->var03 < 32) // Fade color
faded->r += r0->var03; if (faded->r + pal->colorDelta >= 0 && faded->r + pal->colorDelta < 32)
if (faded->g + r0->var03 >= 0 && faded->g + r0->var03 < 32) faded->r += pal->colorDelta;
faded->g += r0->var03; if (faded->g + pal->colorDelta >= 0 && faded->g + pal->colorDelta < 32)
if (faded->b + r0->var03 >= 0 && faded->b + r0->var03 < 32) faded->g += pal->colorDelta;
faded->b += r0->var03; if (faded->b + pal->colorDelta >= 0 && faded->b + pal->colorDelta < 32)
faded->b += pal->colorDelta;
break; break;
case 2: case 2:
if (r0->var03 < 0) // Fade back to original color
if (pal->colorDelta < 0)
{ {
if (faded->r + r0->var03 >= unfaded->r) if (faded->r + pal->colorDelta >= unfaded->r)
faded->r += r0->var03; faded->r += pal->colorDelta;
if (faded->g + r0->var03 >= unfaded->g) if (faded->g + pal->colorDelta >= unfaded->g)
faded->g += r0->var03; faded->g += pal->colorDelta;
if (faded->b + r0->var03 >= unfaded->b) if (faded->b + pal->colorDelta >= unfaded->b)
faded->b += r0->var03; faded->b += pal->colorDelta;
} }
else else
{ {
if (faded->r + r0->var03 <= unfaded->r) if (faded->r + pal->colorDelta <= unfaded->r)
faded->r += r0->var03; faded->r += pal->colorDelta;
if (faded->g + r0->var03 <= unfaded->g) if (faded->g + pal->colorDelta <= unfaded->g)
faded->g += r0->var03; faded->g += pal->colorDelta;
if (faded->b + r0->var03 <= unfaded->b) if (faded->b + pal->colorDelta <= unfaded->b)
faded->b += r0->var03; faded->b += pal->colorDelta;
} }
break; break;
} }
} }
if ((u32)r0->var02++ != r0->var04.var07_0) if ((u32)pal->fadeCycleCounter++ != pal->settings.numFadeCycles)
{ {
returnval = 0; returnval = 0;
} }
else else
{ {
r0->var02 = 0; pal->fadeCycleCounter = 0;
r0->var03 *= -1; pal->colorDelta *= -1;
if (r0->var00_0 == 1) if (pal->state == 1)
r0->var00_0++; pal->state++;
else else
r0->var00_0--; pal->state--;
returnval = 1; returnval = 1;
} }
return returnval; return returnval;
} }
u8 sub_815194C(struct UnkStruct3 *r0) static u8 RouletteFlash_FlashPalette(struct RouletteFlashPalette *pal)
{ {
u8 rg2 = 0; u8 i = 0;
switch (pal->state)
switch (r0->var00_0)
{ {
case 1: case 1:
for (rg2 = 0; rg2 < r0->var04.var04; rg2++) // Flash to color
gPlttBufferFaded[r0->var04.var02 + rg2] = r0->var04.var00; for (; i < pal->settings.numColors; i++)
r0->var00_0++; gPlttBufferFaded[pal->settings.paletteOffset + i] = pal->settings.color;
pal->state++;
break; break;
case 2: case 2:
for (rg2 = 0; rg2 < r0->var04.var04; rg2++) // Restore to original color
gPlttBufferFaded[r0->var04.var02 + rg2] = gPlttBufferUnfaded[r0->var04.var02 + rg2]; for (; i < pal->settings.numColors; i++)
r0->var00_0--; gPlttBufferFaded[pal->settings.paletteOffset + i] = gPlttBufferUnfaded[pal->settings.paletteOffset + i];
pal->state--;
break; break;
} }
return 1; return 1;
} }
void task_tutorial_controls_fadein(struct UnkStruct0 *r0) void RouletteFlash_Run(struct RouletteFlashUtil *flash)
{ {
u8 i = 0; u8 i = 0;
if (r0->var00) if (flash->enabled)
{ {
for (i = 0; i < 16; i++) for (i = 0; i < ARRAY_COUNT(flash->palettes); i++)
{ {
if ((r0->var02 >> i) & 1) if ((flash->flags >> i) & 1)
{ {
if (--r0->var04[i].var01 == 0xFF) // if underflow ? if (--flash->palettes[i].delayCounter == (u8)-1)
{ {
if (r0->var04[i].var04.var00 & 0x8000) // PlttData->unused_15 ? if (flash->palettes[i].settings.color & FLASHUTIL_USE_EXISTING_COLOR)
sub_8151744(&r0->var04[i]); RouletteFlash_FadePalette(&flash->palettes[i]);
else else
sub_815194C(&r0->var04[i]); RouletteFlash_FlashPalette(&flash->palettes[i]);
r0->var04[i].var01 = r0->var04[i].var04.var05; flash->palettes[i].delayCounter = flash->palettes[i].settings.delay;
} }
} }
} }
} }
} }
void sub_8151A48(struct UnkStruct0 *r0, u16 flags) void RouletteFlash_Enable(struct RouletteFlashUtil *flash, u16 flags)
{ {
u8 i = 0; u8 i = 0;
r0->var00++; flash->enabled++;
for (i = 0; i < 16; i++) for (i = 0; i < ARRAY_COUNT(flash->palettes); i++)
{ {
if ((flags >> i) & 1) if ((flags >> i) & 1)
{ {
if (r0->var04[i].active) if (flash->palettes[i].available)
{ {
r0->var02 |= 1 << i; flash->flags |= 1 << i;
r0->var04[i].var00_0 = 1; flash->palettes[i].state = 1;
} }
} }
} }
} }
void sub_8151A9C(struct UnkStruct0 *r0, u16 flags) void RouletteFlash_Stop(struct RouletteFlashUtil *flash, u16 flags)
{ {
u8 i; u8 i;
for (i = 0; i < 16; i++) for (i = 0; i < ARRAY_COUNT(flash->palettes); i++)
{ {
if ((r0->var02 >> i) & 1) if ((flash->flags >> i) & 1)
{ {
if (r0->var04[i].active) if (flash->palettes[i].available)
{ {
if ((flags >> i) & 1) if ((flags >> i) & 1)
{ {
u32 offset = r0->var04[i].var04.var02; u32 offset = flash->palettes[i].settings.paletteOffset;
u16 *faded = &gPlttBufferFaded[offset]; u16 *faded = &gPlttBufferFaded[offset];
u16 *unfaded = &gPlttBufferUnfaded[offset]; u16 *unfaded = &gPlttBufferUnfaded[offset];
memcpy(faded, unfaded, r0->var04[i].var04.var04 * 2); memcpy(faded, unfaded, flash->palettes[i].settings.numColors * 2);
r0->var04[i].var00_0 = 0; flash->palettes[i].state = 0;
r0->var04[i].var02 = 0; flash->palettes[i].fadeCycleCounter = 0;
r0->var04[i].var01 = 0; flash->palettes[i].delayCounter = 0;
if (r0->var04[i].var04.var07_7 < 0) if (flash->palettes[i].settings.colorDeltaDir < 0)
r0->var04[i].var03 = 0xFF; flash->palettes[i].colorDelta = -1;
else else
r0->var04[i].var03 = 0x1; flash->palettes[i].colorDelta = 1;
} }
} }
} }
} }
if (flags == 0xFFFF) if (flags == 0xFFFF)
{ {
r0->var00 = 0; // Stopped all
r0->var02 = 0; flash->enabled = 0;
flash->flags = 0;
} }
else else
{ {
r0->var02 = r0->var02 & ~flags; flash->flags &= ~flags;
} }
} }