diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2024-08-15 04:05:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-14 22:05:41 -0400 |
| commit | fda0e6ad4badc0eea701934b80354de4ab5cad98 (patch) | |
| tree | 634adcb23f9c65f1bfeb005d7b842c2454aade1c /src/code/z_construct.c | |
| parent | d3b9ba17da552430ffb5a5a766b8489bd4156f39 (diff) | |
[ntsc-1.2] Match z_construct.c, z_draw.c, z_kaleido_setup.c and partially z_actor.c (#2039)
* func_80033C30
* Interface_Init
* z_draw.c
* KaleidoSetup_Destroy , n64dd.h
* z_kaleido_setup.c
* add n64dd files to spec
according to tools/disasm/ntsc-1.2/files_code.csv , they're between irqmgr.o and fault.o
putting them before or after malloc_debug.o in the spec is an arbitrary choice
Diffstat (limited to 'src/code/z_construct.c')
| -rw-r--r-- | src/code/z_construct.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/code/z_construct.c b/src/code/z_construct.c index f9bfa5efd..a7bd1a658 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -177,16 +177,20 @@ void Interface_Init(PlayState* play) { interfaceCtx->unk_23C = interfaceCtx->unk_242 = 0; R_ITEM_BTN_X(0) = B_BUTTON_X; - R_B_BTN_COLOR(0) = 255; - R_B_BTN_COLOR(1) = 30; - R_B_BTN_COLOR(2) = 30; + + R_B_BTN_COLOR(0) = B_BUTTON_R; + R_B_BTN_COLOR(1) = B_BUTTON_G; + R_B_BTN_COLOR(2) = B_BUTTON_B; + R_ITEM_ICON_X(0) = B_BUTTON_X; R_ITEM_AMMO_X(0) = B_BUTTON_X + 2; + R_A_BTN_X = A_BUTTON_X; R_A_ICON_X = A_BUTTON_X; - R_A_BTN_COLOR(0) = 0; - R_A_BTN_COLOR(1) = 200; - R_A_BTN_COLOR(2) = 50; + + R_A_BTN_COLOR(0) = A_BUTTON_R; + R_A_BTN_COLOR(1) = A_BUTTON_G; + R_A_BTN_COLOR(2) = A_BUTTON_B; } #define TEXTBOX_SEGMENT_SIZE \ |