diff options
| author | cadmic <cadmic24@gmail.com> | 2024-08-27 00:33:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-27 09:33:20 +0200 |
| commit | d2aca2239fb2a814ffe9bfad8f2a100445e11ce8 (patch) | |
| tree | 287c09ccc8e3eb3578233d527fc19013d0279798 /src/code/z_parameter.c | |
| parent | c00991da29ac2032f7194892538173b093d192ec (diff) | |
[ntsc-1.2] Match a bunch of small stuff (#2094)
* Match z_fbdemo_wipe1.c
* Fix gDPSetTileCustom
* Match z_eff_ss_dead.c
* Match src/code/audio_thread_manager.c
* Match z_parameter.c
* Match KaleidoScope_DrawWorldMap
* Format
* 1 -> AUDIOMGR_DEBUG_LEVEL_NO_RSP
* Actually match KaleidoScope_DrawWorldMap
* Add comment on duplicate code
* Revert "Fix gDPSetTileCustom"
This reverts commit de09338d92e50dd3b9cb8ee7214e2e6b3fecf7ff.
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 64a0cffaa..d4c9825a7 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2813,7 +2813,8 @@ void Interface_DrawItemButtons(PlayState* play) { if (IS_PAUSED(&play->pauseCtx)) { // Start Button Texture, Color & Label gDPPipeSync(OVERLAY_DISP++); - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 120, 120, interfaceCtx->startAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, START_BUTTON_R, START_BUTTON_G, START_BUTTON_B, + interfaceCtx->startAlpha); #if OOT_NTSC gSPTextureRectangle(OVERLAY_DISP++, 132 << 2, 17 << 2, (132 + 22) << 2, 39 << 2, G_TX_RENDERTILE, 0, 0, @@ -3258,9 +3259,9 @@ void Interface_Draw(PlayState* play) { } svar2 = rupeeDigitsFirst[CUR_UPG_VALUE(UPG_WALLET)]; - svar5 = rupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)]; + svar4 = rupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)]; - for (svar1 = 0, svar3 = 42; svar1 < svar5; svar1++, svar2++, svar3 += 8) { + for (svar1 = 0, svar3 = 42; svar1 < svar4; svar1++, svar2++, svar3 += 8) { OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)gCounterDigit0Tex + (8 * 16 * interfaceCtx->counterDigits[svar2])), 8, 16, svar3, 206, 8, 16, 1 << 10, 1 << 10); |