diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2022-11-13 23:07:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-13 18:07:27 -0500 |
| commit | c165ed015c8cbd379fafaad11146bf909aedf647 (patch) | |
| tree | d2e2603cdf1d08b8f6553041e9324f733ba26399 /src/code/game.c | |
| parent | abb4201e57ed2200b745a5dc067665818141ca3e (diff) | |
Improvements to Video Interface related functions and data (#1332)
* Improvements to VI related functions
* Fix
* Suggested changes
* Comment enum values
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Suggested changes, plus comments in visetspecial.c
* Name gViConfigModeType
* Further suggested changes
* Format
* Fix comment on modeLPN2
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'src/code/game.c')
| -rw-r--r-- | src/code/game.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/code/game.c b/src/code/game.c index 297bd2c6e..b004dd367 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -243,14 +243,14 @@ void GameState_Update(GameState* gameState) { func_800C4344(gameState); if (SREG(63) == 1u) { - if (SREG(48) < 0) { - SREG(48) = 0; + if (R_VI_MODE_EDIT_STATE < VI_MODE_EDIT_STATE_INACTIVE) { + R_VI_MODE_EDIT_STATE = VI_MODE_EDIT_STATE_INACTIVE; gfxCtx->viMode = &gViConfigMode; gfxCtx->viFeatures = gViConfigFeatures; gfxCtx->xScale = gViConfigXScale; gfxCtx->yScale = gViConfigYScale; - } else if (SREG(48) > 0) { - ViMode_Update(&sViMode, gameState->input); + } else if (R_VI_MODE_EDIT_STATE > VI_MODE_EDIT_STATE_INACTIVE) { + ViMode_Update(&sViMode, &gameState->input[0]); gfxCtx->viMode = &sViMode.customViMode; gfxCtx->viFeatures = sViMode.viFeatures; gfxCtx->xScale = 1.0f; @@ -261,6 +261,7 @@ void GameState_Update(GameState* gameState) { gfxCtx->viFeatures = gViConfigFeatures; gfxCtx->xScale = gViConfigXScale; gfxCtx->yScale = gViConfigYScale; + if (SREG(63) == 6 || (SREG(63) == 2u && osTvType == OS_TV_NTSC)) { gfxCtx->viMode = &osViModeNtscLan1; gfxCtx->yScale = 1.0f; @@ -304,7 +305,8 @@ void GameState_Update(GameState* gameState) { HREG(83) = HREG(82); HREG(84) = HREG(81); gViConfigAdditionalScanLines = HREG(82); - gViConfigYScale = HREG(81) == 0 ? 240.0f / (gViConfigAdditionalScanLines + 240.0f) : 1.0f; + gViConfigYScale = + HREG(81) == 0 ? ((f32)SCREEN_HEIGHT) / (gViConfigAdditionalScanLines + (f32)SCREEN_HEIGHT) : 1.0f; D_80009430 = 1; } } @@ -406,7 +408,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g func_800ACE70(&D_801664F0); func_800AD920(&D_80166500); VisMono_Init(&sMonoColors); - if (SREG(48) == 0) { + if (R_VI_MODE_EDIT_STATE == VI_MODE_EDIT_STATE_INACTIVE) { ViMode_Init(&sViMode); } SpeedMeter_Init(&D_801664D0); @@ -436,7 +438,7 @@ void GameState_Destroy(GameState* gameState) { func_800ACE90(&D_801664F0); func_800AD950(&D_80166500); VisMono_Destroy(&sMonoColors); - if (SREG(48) == 0) { + if (R_VI_MODE_EDIT_STATE == VI_MODE_EDIT_STATE_INACTIVE) { ViMode_Destroy(&sViMode); } THA_Dt(&gameState->tha); |