info scrollable & player load bug repaired

Author: NotImplementedLife

FSPDS.cbp

@@ -43,6 +43,7 @@
 		<Unit filename="arm9/Makefile" />
 		<Unit filename="arm9/include/console.h" />
 		<Unit filename="arm9/include/filesystem.h" />
+		<Unit filename="arm9/include/info.h" />
 		<Unit filename="arm9/include/player.h" />
 		<Unit filename="arm9/include/ppm.h" />
 		<Unit filename="arm9/include/tabsystem.h" />

arm9/include/info.h

@@ -1,41 +1,42 @@
 #ifndef FSPDS_INFO_H_INCLUDED
 #define FSPDS_INFO_H_INCLUDED
 
-#define INFO_COUNT 7
+#define INFO_COUNT 9
 
 void noprint(u8 r) {}
 
-void InfoPrintSeparatorLine(u8 r)
+void InfoPrintSeparatorLine()
 {
-    c_goto(r,1);
     for(u8 i=0;i<10;i++) iprintf("---");
 }
 
-void InfoPrintFileNameLabel(u8 r)
+void InfoPrintFileNameLabel()
 {
-    c_goto(r,1);
     iprintf("File name:");
 }
 
-void InfoPrintFileNameValue(u8 r)
+void InfoPrintFileNameValue()
 {
-    c_goto(r,2);
+    iprintf(" ");
     iprintf(files[7*CurrentPage+PageSelection]);
 }
 
-void InfoPrintFramesCount(u8 r)
+void InfoPrintFramesCount()
 {
-    c_goto(r,1);
     iprintf("Frames count: %u",ppmHead_FrameCount);
 }
 
-void InfoPrintLockState(u8 r)
+void InfoPrintLockState()
 {
-    c_goto(r,1);
     iprintf("Locked : ");
     iprintf(ppmMeta_Lock?"YES":"NO ");
 }
 
+void InfoPrintFramePlaybackSpeed()
+{
+    iprintf("Playback Speed : %d",ppm_FramePlaybackSpeed);
+}
+
 void (*InfoLine[INFO_COUNT])()=
 {
     InfoPrintFileNameLabel,
@@ -44,19 +45,26 @@ void (*InfoLine[INFO_COUNT])()=
     InfoPrintFramesCount,
     InfoPrintSeparatorLine,
     InfoPrintLockState,
-    InfoPrintSeparatorLine
+    InfoPrintSeparatorLine,
+    InfoPrintFramePlaybackSpeed,
+    InfoPrintSeparatorLine,
 };
 
 u8 InfoScrollPos=0;
 
 void InfoDisplay()
 {
+    consoleSetWindow(&consoleFG,1,1,30,22);
+    consoleClear();
+    c_goto(0,0);
     for(u8 i=1,p=InfoScrollPos;i<31;i++)
     {
         if(p>=INFO_COUNT)
             break;
         InfoLine[p++](i);
+        iprintf("\n");
     }
+    consoleSetWindow(&consoleFG,0,0,32,24);
 }
 
 

arm9/include/player.h

@@ -183,7 +183,6 @@ void playerNextFrame()
                     if(x-tX>=256) break;
                     u8 dx=(x-tX);
                     layer[BL+c]^= ((bool)(layerA[BA+(dx>>3)]&(1<<(dx&0x7))))<<b;
-
                 }
         }
     }
@@ -205,9 +204,9 @@ void playerNextFrame()
     layer1Color=FlipnoteColors[layer1Color];
     layer2Color=FlipnoteColors[layer2Color];
 
-    for(u16 y=0;y<192;y++)
+    for(u16 y=0,yy=0;y<192;y++)
     {
-        u16 yy=(y<<5);
+        //u16 yy=(y<<5);
         for(u8 c=32;c--;yy++)
         {
             for(u8 b=0;b<8;b++)

arm9/include/ppm.h

@@ -27,6 +27,11 @@ void ppm_loadMetadata()
     fseek(fp,36,SEEK_CUR); // skip filenames - redundant data
     fread(ppmMeta_RootAuthorId,8,1,fp);
     fread(&ppmMeta_Timestamp,sizeof(u32),1,fp);
+
+    // Jump to frame playback speed
+    fseek(fp,-ppmHead_SoundDataSize-0xA0,SEEK_END);
+    fread(&ppm_FramePlaybackSpeed,1,1, fp);
+    ppm_FramePlaybackSpeed=8-ppm_FramePlaybackSpeed;
     fclose(fp);
 }
 
@@ -42,9 +47,6 @@ void ppm_loadAnimationData()
     ppmHead_FrameCount++;
     /// Assume size of frame offset table is 4*FrameCount, we don't need that
     /// Jump directly to flags
-    //fseek(PPM_Current,0x6A0,SEEK_SET);
-    //fread(&ppmADat_0x6A0,2,1,PPM_Current);
-    //fseek(PPM_Current,4,SEEK_CUR);
     fseek(PPM_Current,0x6A6,SEEK_SET);
     fread(&ppmADat_0x6A6,2,1,PPM_Current);
     // read offset table

arm9/include/tabsystem.h

@@ -80,15 +80,15 @@ void InfoTabKeyDown(u32 input)
         if(InfoScrollPos<INFO_COUNT-1)
         {
             InfoScrollPos++;
-            InfoTabDrawing(); // ! expensive
+            InfoDisplay();
         }
     }
     else if(input & KEY_UP)
     {
         if(InfoScrollPos>0)
         {
             InfoScrollPos--;
-            InfoTabDrawing();
+            InfoDisplay();
         }
     }
 }
@@ -103,6 +103,10 @@ void PlayTabLoading()
         PlayerForceAnimationReload=false;
         PlayerLoadedFileIndex=7*CurrentPage+PageSelection;
     }
+    else
+    {
+
+    }
 }
 
 const char* PlayButton="\033[10;14H\026\027  \033[11;14H\002\002\026\027\033[12;14H\002\002\x18\x19\033[13;14H\x18\x19  ";
@@ -127,7 +131,9 @@ void PlayTabPlayButtonPressed()
     {
         c_goto(18,10);
         iprintf("Loading...");
+        PlayerFrameIndex=0;
         ppm_loadAnimationData();
+        PlayerLoadedFileIndex=7*CurrentPage+PageSelection;
         c_goto(18,10);
         iprintf("          ");
         PlayerLoadedFileIndex=index;

arm9/include/vars.h

@@ -27,6 +27,8 @@ u8 ppmMeta_CurrentAuthorId[8];
 u8 ppmMeta_RootAuthorId[8];
 u32 ppmMeta_Timestamp;
 
+u8 ppm_FramePlaybackSpeed;
+
 FILE* PPM_Current;
 
 ///u16 ppmADat_0x6A0; // Size of frame offset table