diff options
| author | fig02 <fig02srl@gmail.com> | 2020-07-16 21:37:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 21:37:53 -0400 |
| commit | 24ab14f7482d48e94338a9dbf1a07abb15d3b77f (patch) | |
| tree | 5262c8346a46f41b450a71725d06a3cec1dfdfb1 /src/code/game.c | |
| parent | bc14f6d93e2463dfe81660013c591b3ddd6b3ab3 (diff) | |
Change Colors To Decimal (#260)
* fix colliderinit typo
* convert as many colors i can find to decimal
* fix GPACK_RGBA5551, merge fhgFire
* fix remaining colors
* remove unwanted file
* alpha as 1
Diffstat (limited to 'src/code/game.c')
| -rw-r--r-- | src/code/game.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/game.c b/src/code/game.c index 2aa4bf6ea..782a9934f 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -120,12 +120,12 @@ void func_800C4344(GameState* gameState) { // regalloc differences void GameState_DrawInputDisplay(u16 input, Gfx** gfx) { static const u16 sInpDispBtnColors[] = { - GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), - GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), - GPACK_RGBA5551(0x00, 0xFF, 0xFF, 1), GPACK_RGBA5551(0xFF, 0x00, 0xFF, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), - GPACK_RGBA5551(0x78, 0x78, 0x78, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), - GPACK_RGBA5551(0xFF, 0x00, 0x00, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), GPACK_RGBA5551(0x00, 0xFF, 0x00, 1), - GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), + GPACK_RGBA5551(255, 255, 0, 1), GPACK_RGBA5551(255, 255, 0, 1), GPACK_RGBA5551(255, 255, 0, 1), + GPACK_RGBA5551(255, 255, 0, 1), GPACK_RGBA5551(120, 120, 120, 1), GPACK_RGBA5551(120, 120, 120, 1), + GPACK_RGBA5551(0, 255, 255, 1), GPACK_RGBA5551(255, 0, 255, 1), GPACK_RGBA5551(120, 120, 120, 1), + GPACK_RGBA5551(120, 120, 120, 1), GPACK_RGBA5551(120, 120, 120, 1), GPACK_RGBA5551(120, 120, 120, 1), + GPACK_RGBA5551(255, 0, 0, 1), GPACK_RGBA5551(120, 120, 120, 1), GPACK_RGBA5551(0, 255, 0, 1), + GPACK_RGBA5551(0, 0, 255, 1), }; s32 i, j, k; Gfx* gfxP = *gfx; |