ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

RGB macro use in slot_machine

Browse Source
This commit is contained in:
GriffinR 2021-12-28 17:46:05 -05:00
parent 4fc345fff5
commit aba5264260
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/slot_machine/85A8524.bin
View File

Binary file not shown.

27
src/slot_machine.c
View File

@ -7154,18 +7154,18 @@ static const struct SpriteSheet sSlotMachineSpriteSheets[22] =
static const u8 *const sReelBackground_Tilemap = gSlotMachineReelBackground_Tilemap; static const u8 *const sReelBackground_Tilemap = gSlotMachineReelBackground_Tilemap;
static const u16 sUnused[] = static const u16 sUnusedColors[] =
{ {
0x6F7B, RGB(27, 27, 27),
0x6968, RGB(8, 11, 26),
0x36AB, RGB(11, 21, 13),
0x7FFF, RGB(31, 31, 31),
0x5750, RGB(16, 26, 21),
0x7EC0, RGB(0, 22, 31),
0x02BA, RGB(26, 21, 0),
0x02BA, RGB(26, 21, 0),
0x01FD, RGB(29, 15, 0),
0x01FD, RGB(29, 15, 0),
}; };
// The Bet 2 and 3 match line palettes are duplicated unnecessarily // The Bet 2 and 3 match line palettes are duplicated unnecessarily
@ -7234,7 +7234,10 @@ static const u16 *const sPokeballShiningPalTable[] =
}; };
static const u16 *const sDigitalDisplay_Pal = gSlotMachineDigitalDisplay_Pal; static const u16 *const sDigitalDisplay_Pal = gSlotMachineDigitalDisplay_Pal;
static const u16 sUnkPalette[] = INCBIN_U16("graphics/slot_machine/85A8524.bin"); static const u16 sUnkPalette[16] = {
[1] = RGB_WHITEALPHA,
[3] = RGB(8, 8, 8),
};
static const struct SpritePalette sSlotMachineSpritePalettes[] = static const struct SpritePalette sSlotMachineSpritePalettes[] =
{ {