Merge branch 'develop-flynn' into flynn-to-dev

2026-09-08 04:06:33 -04:00 · 2022-12-06 21:29:27 -05:00
parent d9f3844b2d 00cbd347b2
commit 4f109178ff
19 changed files with 296 additions and 185 deletions
@@ -1980,7 +1980,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
                } else {//baguettes
                    PosX = 98;
                }
-                s16 PosY = 200; //General Pos of C button icon
+                s16 PosY = 200 - pauseCtx->infoPanelOffsetY; //General Pos of C button icon
                s16 icon_w = 46; // Original texture size
                s16 icon_h = 16;
                s32 icon_x_offset;