mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 01:40:47 +00:00
Code Issues Projects Releases Wiki Activity

Match more GC button colors (#2156)

Browse source
This commit is contained in:
cadmic 2024-09-07 10:26:56 -07:00 • committed by GitHub
parent 88c4475967
commit 96914a25c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 113 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View file

@ -25,6 +25,16 @@
#define KALEIDO_COLOR_PROMPT_UNK_B 100
#endif
#if !PLATFORM_GC
#define KALEIDO_COLOR_CURSOR_UNK_R 0
#define KALEIDO_COLOR_CURSOR_UNK_G 50
#define KALEIDO_COLOR_CURSOR_UNK_B 255
#else
#define KALEIDO_COLOR_CURSOR_UNK_R 0
#define KALEIDO_COLOR_CURSOR_UNK_G 255
#define KALEIDO_COLOR_CURSOR_UNK_B 50
#endif
typedef enum {
/* 0 */ VTX_PAGE_ITEM,
/* 1 */ VTX_PAGE_EQUIP,
@ -866,7 +876,7 @@ static void* sCursorTexs[] = {
static s16 sCursorColors[][3] = {
{ 255, 255, 255 },
{ 255, 255, 0 },
{ 0, 255, 50 },
{ KALEIDO_COLOR_CURSOR_UNK_R, KALEIDO_COLOR_CURSOR_UNK_G, KALEIDO_COLOR_CURSOR_UNK_B },
};
static void* sSavePromptTexs[] =
@ -1178,8 +1188,18 @@ Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, void** textures) {
void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
static s16 D_8082ACF4[][3] = {
{ 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 255, 255, 0 }, { 0, 0, 0 },
{ 0, 0, 0 }, { 255, 255, 0 }, { 0, 255, 50 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 255, 50 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 255, 255, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 255, 255, 0 },
{ KALEIDO_COLOR_CURSOR_UNK_R, KALEIDO_COLOR_CURSOR_UNK_G, KALEIDO_COLOR_CURSOR_UNK_B },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ KALEIDO_COLOR_CURSOR_UNK_R, KALEIDO_COLOR_CURSOR_UNK_G, KALEIDO_COLOR_CURSOR_UNK_B },
};
static s16 D_8082AD3C = 20;
static s16 D_8082AD40 = 0;