From efe794d1d83002525f5e1dc5ba9fcd39795cfaae Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Thu, 19 Mar 2026 20:45:55 +1000 Subject: [PATCH] more accurate types for these iterators --- src/game/behaviors/texscroll.inc.c | 8 ++++---- src/game/scroll_targets.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/behaviors/texscroll.inc.c b/src/game/behaviors/texscroll.inc.c index 5ac1b4b69..10eeed2fa 100644 --- a/src/game/behaviors/texscroll.inc.c +++ b/src/game/behaviors/texscroll.inc.c @@ -137,7 +137,7 @@ void uv_update_scroll(void) { scroll->prevF32 = calloc(scroll->size, sizeof(f32)); u8 bhvIndex = MIN(bhv, 2); - for (u16 k = 0; k < scroll->size; k++) { + for (u32 k = 0; k < scroll->size; k++) { scroll->interpF32[k] = verts[k]->n.ob[bhvIndex]; } } else { @@ -145,7 +145,7 @@ void uv_update_scroll(void) { scroll->prevS16 = calloc(scroll->size, sizeof(s16)); u8 bhvIndex = MIN(bhv-SCROLL_UV_X, 1); - for (u16 k = 0; k < scroll->size; k++) { + for (u32 k = 0; k < scroll->size; k++) { scroll->interpS16[k] = verts[k]->n.tc[bhvIndex]; } } @@ -154,12 +154,12 @@ void uv_update_scroll(void) { // Prepare for interpolation if (bhv < SCROLL_UV_X) { u8 bhvIndex = MIN(bhv, 2); - for (u16 i = 0; i < scroll->size; i++) { + for (u32 i = 0; i < scroll->size; i++) { scroll->prevF32[i] = verts[i]->n.ob[bhvIndex]; } } else { u8 bhvIndex = MIN(bhv-SCROLL_UV_X, 1); - for (u16 i = 0; i < scroll->size; i++) { + for (u32 i = 0; i < scroll->size; i++) { scroll->prevS16[i] = verts[i]->n.tc[bhvIndex]; } } diff --git a/src/game/scroll_targets.c b/src/game/scroll_targets.c index ff00cf244..20d7df51a 100644 --- a/src/game/scroll_targets.c +++ b/src/game/scroll_targets.c @@ -133,13 +133,13 @@ void patch_scroll_targets_interpolated(f32 delta) { Vtx* *verts = scroll->vertices; if (scroll->bhv < SCROLL_UV_X) { u8 bhvIndex = MIN(scroll->bhv, 2); - for (u16 k = 0; k < scroll->size; k++) { + for (u32 k = 0; k < scroll->size; k++) { f32 diff = wrap_f32(scroll->interpF32[k] - scroll->prevF32[k]); verts[k]->n.ob[bhvIndex] = wrap_f32(scroll->prevF32[k] + diff * delta); } } else { u8 bhvIndex = MIN(scroll->bhv-SCROLL_UV_X, 1); - for (u16 k = 0; k < scroll->size; k++) { + for (u32 k = 0; k < scroll->size; k++) { s32 diff = wrap_s32(scroll->interpS16[k] - scroll->prevS16[k]); verts[k]->n.tc[bhvIndex] = wrap_s32(scroll->prevS16[k] + diff * delta); }