From 438426784bddc61fe565f8666f54f6cd4e85dbe6 Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Thu, 21 Oct 2021 22:03:22 -0400
Subject: [PATCH] Fix some warnings, and update mips to c tool

---
 mips_to_c.sh |  2 +-
 src/video.c  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mips_to_c.sh b/mips_to_c.sh
index 17f5913d..cb067e3c 100755
--- a/mips_to_c.sh
+++ b/mips_to_c.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 ASMFILE=$(find . -type f -name "*$1.s")
-python3 ../mips_to_c/mips_to_c.py --context ctx.c -f $1 $ASMFILE > $1.c
\ No newline at end of file
+python3 ../mips_to_c/mips_to_c.py --compiler ido --pointer-style right --context ctx.c -f $1 $ASMFILE > $1.c
\ No newline at end of file
diff --git a/src/video.c b/src/video.c
index 5feded75..0048b7a3 100644
--- a/src/video.c
+++ b/src/video.c
@@ -139,13 +139,13 @@ void init_vi_settings(void) {
             } else if (osTvType == TV_TYPE_MPAL) {
                 tvViMode = &osViModeMpalLpn1;
             }
-            memory_copy(tvViMode, &gTvViMode, sizeof(OSViMode));
+            memory_copy((u8 *)tvViMode, (u8 *)&gTvViMode, sizeof(OSViMode));
             if (osTvType == TV_TYPE_PAL) {
-                //TODO: Figure out what the 0x18 is for
-                gTvViMode.fldRegs[0].vStart -= (0x18 << 16);
-                gTvViMode.fldRegs[1].vStart -= (0x18 << 16);
-                gTvViMode.fldRegs[0].vStart += 0x18;
-                gTvViMode.fldRegs[1].vStart += 0x18;
+                //A simple osViExtendVStart to add an additional 24 scanlines?
+                gTvViMode.fldRegs[0].vStart -= (24 << 16);
+                gTvViMode.fldRegs[1].vStart -= (24 << 16);
+                gTvViMode.fldRegs[0].vStart += 24;
+                gTvViMode.fldRegs[1].vStart += 24;
             }
             osViSetMode(&gTvViMode);
             break;
@@ -158,7 +158,7 @@ void init_vi_settings(void) {
                 tvViMode = &osViModeMpalLpn1;
             }
             
-            memory_copy(tvViMode, &gTvViMode, sizeof(OSViMode));
+            memory_copy((u8 *)tvViMode, (u8 *)&gTvViMode, sizeof(OSViMode));
             gTvViMode.comRegs.width = WIDTH(640);
             gTvViMode.comRegs.xScale = SCALE(1, 0);
             gTvViMode.fldRegs[0].origin = ORIGIN(1280);
@@ -173,7 +173,7 @@ void init_vi_settings(void) {
             } else if (osTvType == TV_TYPE_MPAL) {
                 tvViMode = &osViModeMpalLan1;
             }
-            memory_copy(tvViMode, &gTvViMode, sizeof(OSViMode));
+            memory_copy((u8 *)tvViMode, (u8 *)&gTvViMode, sizeof(OSViMode));
             gTvViMode.comRegs.width = WIDTH(640);
             gTvViMode.comRegs.xScale = SCALE(1, 0);
             gTvViMode.fldRegs[0].origin = ORIGIN(1280);
@@ -204,7 +204,7 @@ void init_vi_settings(void) {
 
 void init_framebuffer(s32 index) {
     if (gVideoFramebuffers[index] != 0) {
-        func_80071538(gVideoFramebuffers[index]);
+        func_80071538((u8 *)gVideoFramebuffers[index]);
         free_from_memory_pool(gVideoFramebuffers[index]);
     }
     gVideoFbWidths[index] = gVideoModeResolutions[gVideoModeIndex & 7].width;