3 files changed, 11 insertions, 51 deletions

diff --git a/apps/plugins/rockboy/debug.c b/apps/plugins/rockboy/debug.c
index a829b98799..8dc7320035 100644
--- a/apps/plugins/rockboy/debug.c
+++ b/apps/plugins/rockboy/debug.c
@@ -571,7 +571,7 @@ void debug_disassemble(addr a, int c)
     static int opaddr;
     static char mnemonic[256];
     static char *pattern;
-    char meow[500],buf[300];
+    char ops_str[300];
     if(!debug_trace) return;
 
     while (c > 0)
@@ -600,8 +600,7 @@ void debug_disassemble(addr a, int c)
                 case 'B':
                 case 'b':
                     ops[k] = readb(a); a++;
-                    j += snprintf(mnemonic + j,255-j,
-                        "%02Xh", ops[k++]);
+                    j += snprintf(mnemonic + j,255-j, "%02Xh", ops[k++]);
                     break;
                 case 'W':
                 case 'w':
@@ -614,8 +613,7 @@ void debug_disassemble(addr a, int c)
                 case 'O':
                 case 'o':
                     ops[k] = readb(a); a++;
-                    j += snprintf(mnemonic + j, 255-j,"%+d",
-                        (n8)(ops[k++]));
+                    j += snprintf(mnemonic + j, 255-j,"%+d", (n8)(ops[k++]));
                     break;
                 }
                 i++;
@@ -626,52 +624,19 @@ void debug_disassemble(addr a, int c)
             }
         }
         mnemonic[j] = 0;
-        snprintf(buf,299,"%04X ", opaddr);
-        strcpy(meow,buf);
         switch (operand_count[ops[0]]) {
         case 1:
-            snprintf(buf,299,"%02X       ", ops[0]);
-            strcat(meow,buf);
+            snprintf(ops_str,sizeof(ops_str),"%02X      ", ops[0]);
             break;
         case 2:
-            snprintf(buf,299,"%02X %02X    ", ops[0], ops[1]);
-            strcat(meow,buf);
+            snprintf(ops_str,sizeof(ops_str),"%02X %02X   ", ops[0], ops[1]);
             break;
         case 3:
-            snprintf(buf,299,"%02X %02X %02X ", ops[0], ops[1], ops[2]);
-            strcat(meow,buf);
+            snprintf(ops_str,sizeof(ops_str),"%02X %02X %02X", ops[0], ops[1], ops[2]);
             break;
         }
-        snprintf(buf,"%-16.16s", mnemonic);
-        strcat(meow,buf);
-                rb->lcd_putsxy(0,0,meow);
+        rb->lcd_putsxyf(0,0,"%04X %s %-16.16s", opaddr, ops_str, mnemonic);
         rb->lcd_update();        
         c--;
     }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c
index 0da9fc7e9d..22f8864889 100644
--- a/apps/plugins/rockboy/lcd.c
+++ b/apps/plugins/rockboy/lcd.c
@@ -1009,10 +1009,6 @@ void setvidmode(void)
 
 void lcd_refreshline(void)
 {
-#ifdef HAVE_LCD_COLOR
-    char frameout[30];
-#endif
-
     if (!(R_LCDC & 0x80))
         return; /* should not happen... */
 
@@ -1112,8 +1108,8 @@ void lcd_refreshline(void)
     {
         if(options.showstats)
         {
-            snprintf(frameout,sizeof(frameout),"FPS: %d Frameskip: %d ",options.fps, options.frameskip);
-            rb->lcd_putsxy(0,LCD_HEIGHT-10,frameout);
+            rb->lcd_putsxyf(0,LCD_HEIGHT-10,"FPS: %d Frameskip: %d ",
+                    options.fps, options.frameskip);
             rb->lcd_update_rect(0,LCD_HEIGHT-10, LCD_WIDTH, 10);
         }
 
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c
index 6e8df5c0ea..242518c01e 100644
--- a/apps/plugins/rockboy/menu.c
+++ b/apps/plugins/rockboy/menu.c
@@ -171,7 +171,7 @@ static void build_slot_path(char *buf, size_t bufsiz, int slot_id) {
  *
  */
 static bool do_file(char *path, char *desc, bool is_load) {
-    char buf[200], desc_buf[20];
+    char desc_buf[20];
     int fd, file_mode;
     
     /* set file mode */
@@ -191,8 +191,7 @@ static bool do_file(char *path, char *desc, bool is_load) {
         loadstate(fd);
     
         /* print out a status message so the user knows the state loaded */
-        snprintf(buf, 200, "Loaded state from \"%s\"", path);
-        rb->splash(HZ * 1, buf);
+        rb->splashf(HZ * 1, "Loaded state from \"%s\"", path);
     }
     else
     {