basic bottom screen

smealum · Nov 20, 2014 · cc6f38b · cc6f38b
1 parent 182d6b2
commit cc6f38b
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 2 deletions.
diff --git a/data/blocks.bin b/data/blocks.bin
diff --git a/source/main.c b/source/main.c
@@ -13,6 +13,7 @@
 #include "player.h"
 #include "text.h"
 #include "configuration.h"
+#include "subscreen.h"
 
 #include "test_vsh_shbin.h"
 #include "terrain_bin.h"
@@ -157,7 +158,8 @@ int main(int argc, char** argv)
 	memset(debugValue, 0x00, sizeof(debugValue));
 
 	aptOpenSession();
-	Result ret=APT_SetAppCpuTimeLimit(NULL, 30);
+	// Result ret=APT_SetAppCpuTimeLimit(NULL, 30);
+	Result ret=APT_SetAppCpuTimeLimit(NULL, 80);
 	aptCloseSession();
 
 	print("%08X\n",(unsigned int)ret);
@@ -184,6 +186,7 @@ int main(int argc, char** argv)
 	initDispatcher(NULL);
 	initChunkPool();
 	initWorld(&world);
+	initSubscreen();
 	print("generating world...\n");
 
 	initPlayer(&player);
@@ -261,6 +264,7 @@ int main(int argc, char** argv)
 		}
 
 		GX_SetMemoryFill(gxCmdBuf, (u32*)gpuOut, 0x68B0D8FF, (u32*)&gpuOut[0x2EE00], 0x201, (u32*)gpuDOut, 0x00000000, (u32*)&gpuDOut[0x2EE00], 0x201);
+		drawSubscreen(&player);
 		gspWaitForPSC0();
 		gfxSwapBuffersGpu();
 
@@ -278,6 +282,7 @@ int main(int argc, char** argv)
 		// drawBottom(); //DEBUG
 	}
 
+	exitSubscreen();
 	exitDispatcher(NULL);
 	exitWorld(&world);
 	exitGeneration();

diff --git a/source/text.h b/source/text.h
@@ -4,7 +4,8 @@
 
 #include "font.h"
 
-#define print(...) sprintf(&superStr[strlen(superStr)], __VA_ARGS__); drawBottom()
+// #define print(...) sprintf(&superStr[strlen(superStr)], __VA_ARGS__); drawBottom()
+#define print(...) 
 
 void drawBottom();
 extern char superStr[];