Merge branch 'vitasdk'

frangarcj · Aug 24, 2015 · 8f60725 · 8f60725
2 parents 174ca1a + 1b41a24
commit 8f60725
Show file tree

Hide file tree

Showing 3 changed files with 28,712 additions and 2 deletions.
diff --git a/smsplus/psp/main.c b/smsplus/psp/main.c
@@ -8,12 +8,33 @@
 #include "psplib/video.h"
 #include "psplib/pl_psp.h"
 #include "psplib/ctrl.h"
+#include <vita2d.h>
 
 #include "menu.h"
+#include "revitalize.h"
 
 PSP2_MODULE_INFO(0,1,PSP_APP_NAME);
 //PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER);
 
+void show_splash()
+{
+	vita2d_start_drawing();
+	vita2d_clear_screen();
+
+	vita2d_texture *splash = vita2d_create_empty_texture(960, 544);
+
+	splash = vita2d_load_PNG_buffer(revitalize);
+
+	vita2d_draw_texture(splash, 0, 0);
+
+	vita2d_end_drawing();
+	vita2d_swap_buffers();
+
+	sceKernelDelayThread(5000000); // Delay 5 seconds
+
+	vita2d_free_texture(splash);
+}
+
 static void ExitCallback(void* arg)
 {
   ExitPSP = 1;
@@ -27,6 +48,8 @@ int main(int argc,char *argv[])
   pspCtrlInit();
   pspVideoInit();
 
+  show_splash();
+
   /* Initialize callbacks */
   pl_psp_register_callback(PSP_EXIT_CALLBACK,
                            ExitCallback,

diff --git a/smsplus/psp/menu.c b/smsplus/psp/menu.c
@@ -501,7 +501,7 @@ void DisplayMenu()
     ResumeEmulation = 0;
 
     /* Set normal clock frequency */
-    pl_psp_set_clock_freq(222);
+    //pl_psp_set_clock_freq(222);
     /* Set buttons to autorepeat */
     pspCtrlSetPollingMode(PSP_CTRL_AUTOREPEAT);
 
@@ -575,7 +575,7 @@ void DisplayMenu()
     if (!ExitPSP)
     {
       /* Set clock frequency during emulation */
-      pl_psp_set_clock_freq(Options.ClockFreq);
+      //pl_psp_set_clock_freq(Options.ClockFreq);
       /* Set buttons to normal mode */
       pspCtrlSetPollingMode(PSP_CTRL_NORMAL);