moved rsf stuff from user_set to rsf_set

makerom/user_settings.h

@@ -49,20 +49,6 @@ typedef enum
 	NCCH
 } output_format;
 
-typedef struct
-{
-	char *name;
-	char *value;
-} dname_item;
-
-
-typedef struct
-{ 
-	dname_item *items;
-	u32 m_items;
-	u32 u_items;
-} dname_struct; 
-
 static const char output_extention[4][5] = {".cxi",".cfa",".cci",".cia"};
 
 /* This does not follow style, so the rsf string names match the variables where they're stored */
@@ -244,6 +230,19 @@ typedef struct
 	} CommonHeaderKey;
 } rsf_settings;
 
+typedef struct
+{
+	char *name;
+	char *value;
+} dname_item;
+
+typedef struct
+{ 
+	dname_item *items;
+	u32 m_items;
+	u32 u_items;
+} dname_struct; 
+
 typedef struct
 {
 	struct{
@@ -302,16 +301,11 @@ typedef struct
 		u16 titleVersion[3];
 
 		u64 contentId[CIA_MAX_CONTENT]; // For CIA
-	} cia; // CIA Settings
-	
-	
+	} cia; // CIA Settings	
 } user_settings;
 
 // Prototypes
 
 void init_UserSettings(user_settings *usr_settings);
 void free_UserSettings(user_settings *usr_settings);
-int ParseArgs(int argc, char *argv[], user_settings *usr_settings);
-void ReadYAMLtest(char *filepath);
-
-void free_RsfSettings(rsf_settings *set);
+int ParseArgs(int argc, char *argv[], user_settings *usr_settings);