Moved draw code from main.c into output.c

source/main.c

@@ -1,70 +1,9 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <math.h>
-#include <string.h>
 #include <3ds.h>
 
-#include "costable.h"
-#include "text.h"
 #include "output.h"
 
-char superStr[8192];
-int cnt;
-
-s32 pcCos(u16 v)
-{
-	return costable[v&0x1FF];
-}
-
-int countLines(const char* str)
-{
-	if (!str)
-		return 0;
-
-	int cnt = 1;
-	while (*str == '\n' ? ++cnt : *str)
-		str++;
-	return cnt;
-}
-
-void cutLine(char* str)
-{
-	if (!str || !*str)
-		return;
-
-	char* str2 = str;
-	while ((*str2) && (*(str2 + 1)) && (*str2 != '\n'))
-		str2++;
-	str2++;
-
-	memmove(str, str2, strlen(str2) + 1);
-}
-
-void drawFrame()
-{
-	u8* bufAdr = gfxGetFramebuffer(GFX_TOP, GFX_LEFT, NULL, NULL);
-
-	int x, y;
-	for (x = 1; x < 400; x++) {
-		for (y = 1; y < 240; y++) {
-			u32 v=(y + x * 240) * 3;
-			bufAdr[v]   = (pcCos(x + cnt) + 4096) / 32;
-			bufAdr[v+1] = (pcCos(y - 256 + cnt) + 4096) / 64;
-			bufAdr[v+2] = (pcCos(x + 128 - cnt) + 4096) / 32;
-		}
-	}
-	x = countLines(superStr);
-	while (x > (240 / fontDefault.height - 3)) {
-		cutLine(superStr);
-		x--;
-	}
-	gfxDrawText(GFX_TOP, GFX_LEFT, NULL, superStr, 240 - fontDefault.height * 3, 10);
-	cnt++;
-
-	gfxFlushBuffers();
-	gfxSwapBuffers();
-}
-
 int main()
 {
 	srvInit();

source/output.c

@@ -0,0 +1,65 @@
+#include "output.h"
+
+#include <string.h>
+#include <math.h>
+#include <3ds.h>
+
+#include "costable.h"
+#include "text.h"
+
+char superStr[8192];
+static int cnt;
+
+static s32 pcCos(u16 v)
+{
+	return costable[v&0x1FF];
+}
+
+static int countLines(const char* str)
+{
+	if (!str)
+		return 0;
+
+	int cnt = 1;
+	while (*str == '\n' ? ++cnt : *str)
+		str++;
+	return cnt;
+}
+
+static void cutLine(char* str)
+{
+	if (!str || !*str)
+		return;
+
+	char* str2 = str;
+	while ((*str2) && (*(str2 + 1)) && (*str2 != '\n'))
+		str2++;
+	str2++;
+
+	memmove(str, str2, strlen(str2) + 1);
+}
+
+void drawFrame()
+{
+	u8* bufAdr = gfxGetFramebuffer(GFX_TOP, GFX_LEFT, NULL, NULL);
+
+	int x, y;
+	for (x = 1; x < 400; x++) {
+		for (y = 1; y < 240; y++) {
+			u32 v=(y + x * 240) * 3;
+			bufAdr[v]   = (pcCos(x + cnt) + 4096) / 32;
+			bufAdr[v+1] = (pcCos(y - 256 + cnt) + 4096) / 64;
+			bufAdr[v+2] = (pcCos(x + 128 - cnt) + 4096) / 32;
+		}
+	}
+	x = countLines(superStr);
+	while (x > (240 / fontDefault.height - 3)) {
+		cutLine(superStr);
+		x--;
+	}
+	gfxDrawText(GFX_TOP, GFX_LEFT, NULL, superStr, 240 - fontDefault.height * 3, 10);
+	cnt++;
+
+	gfxFlushBuffers();
+	gfxSwapBuffers();
+}