diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-12-29 00:57:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-29 00:57:37 -0500 |
| commit | 4192a40adf85e4825775f16a33df6e84d6ec0bcb (patch) | |
| tree | 276dec6b4672931232c9ec6e1134b463cc773abd /src/slot_machine.c | |
| parent | f554f09aedeea7478e650d263a40a9949bc898d6 (diff) | |
| parent | aadab8b0167f1f74a28d4234509faffd8dca7bc2 (diff) | |
Merge pull request #1583 from GriffinRichards/renametilemaps
Give less generic names to some tilemaps, some misc fixes
Diffstat (limited to 'src/slot_machine.c')
| -rw-r--r-- | src/slot_machine.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/slot_machine.c b/src/slot_machine.c index 6cbcd76fd..c58de415b 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -7154,18 +7154,18 @@ static const struct SpriteSheet sSlotMachineSpriteSheets[22] = static const u8 *const sReelBackground_Tilemap = gSlotMachineReelBackground_Tilemap; -static const u16 sUnused[] = +static const u16 sUnusedColors[] = { - 0x6F7B, - 0x6968, - 0x36AB, - 0x7FFF, - 0x5750, - 0x7EC0, - 0x02BA, - 0x02BA, - 0x01FD, - 0x01FD, + RGB(27, 27, 27), + RGB(8, 11, 26), + RGB(11, 21, 13), + RGB(31, 31, 31), + RGB(16, 26, 21), + RGB(0, 22, 31), + RGB(26, 21, 0), + RGB(26, 21, 0), + RGB(29, 15, 0), + RGB(29, 15, 0), }; // 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 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[] = { |