diff options
| author | cadmic <cadmic24@gmail.com> | 2024-07-17 15:52:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-17 18:52:38 -0400 |
| commit | c83b93aae40de16779219c357d343415f6ff339a (patch) | |
| tree | 5301c2d09989e172309a8f1284636c8dd5a0ccb0 /src/code/z_kaleido_setup.c | |
| parent | 4fbb48177fcf38d339cab6bc725421e13be7d6bb (diff) | |
Match NTSC z_parameter.c and z_construct.c (#1987)
* Match NTSC z_parameter.c and z_construct.c
* Comment which REG collide
* Use new REGs everywhere
* Use new REGs everywhere for real
Diffstat (limited to 'src/code/z_kaleido_setup.c')
| -rw-r--r-- | src/code/z_kaleido_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 36a01c123..3148d6fb5 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -83,8 +83,8 @@ void KaleidoSetup_Update(PlayState* play) { // mainState is also overwritten later before being used. pauseCtx->mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE; - //! @bug REG collision - if (R_START_LABEL_DD(0) == 0) { + //! @bug REG collision, ZREG(48) is also R_START_LABEL_SCALE for NTSC and R_START_LABEL_DD(0) for PAL + if (ZREG(48) == 0) { // Never reached, unused, and the data would be wrong anyway // (scrolling left from this would not bring to the initial page) pauseCtx->eye.x = sKaleidoSetupUnusedEyeX[pauseCtx->pageIndex]; |