Removed pointless functions, fixed incorrect prompt and did general code

reformatting. (main.h is now pointless)
noirscape · Apr 10, 2018 · fd615c8 · fd615c8
1 parent 0c015f5
commit fd615c8
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 44 deletions.
diff --git a/source/main.c b/source/main.c
@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include <3ds.h>
 #include "editprofile.h"
-#include "main.h"
 #include "title.h"
 #include "struct.h"
 
-int main() {
+int main() 
+{
     cfguInit();
     gfxInitDefault();
     PrintConsole topScreen, bottomScreen;
@@ -18,7 +18,9 @@ int main() {
     int profile_num = 0;
     bool fusion_mode = false;
     bool not_busy = true;
-    bool version_undetermined = true;
+    bool region_autochecked = false;
+    bool region_selected = false;
+    bool save_selected = false;
     u32 lowid;
 
     printf("Metroid: SAMUS RETURNS amiibo unlocker v1.1a\nPress A to continue.\n");
@@ -36,24 +38,26 @@ int main() {
             case MAIN_SCREEN:
                 if (kDown & KEY_A) 
                 {
-                    printSaveSelect();
                     state = VERSION_TO_EDIT;
                 }
                 break;
 
             case VERSION_TO_EDIT: // Determining region
-                if (version_undetermined)
+                if (!region_autochecked)
                 {
                     lowid = title_check(&regions_found);
                     if (regions_found.total_regions == 0)
                     {
                         printf("Press START to exit.\n");
                         state = SUCCESS;
-                    } else if (regions_found.total_regions == 1)
+                    } 
+                    else if (regions_found.total_regions == 1)
                     {
-                    state = SELECT_SAVE;
-                    } else {
-                        version_undetermined = false;
+                        region_selected = true;
+                    } 
+                    else
+                    {
+                        region_autochecked = true;
                         // Insert code here to display stuff about region selection
                         if(regions_found.JPN)
                             printf("JPN region detected. Press X to use this region.\n");
@@ -62,49 +66,58 @@ int main() {
                         if(regions_found.PAL)
                             printf("PAL region detected. Press A to use this region.\n");
                     }
-                } else {
+                }
+                else
+                {
                     if (kDown & KEY_X) // JPN region
                     {
                         printf("JPN region selected.\n");
                         lowid = JPN_LOWID;
-                        state = SELECT_SAVE;
+                        region_selected = true;
                     }
                     if (kDown & KEY_Y) // USA region
                     {
                         printf("USA region selected.\n");
                         lowid = USA_LOWID;
-                        state = SELECT_SAVE;
+                        region_selected = true;
                     }
                     if (kDown & KEY_A) // PAL region
                     {
                         printf("PAL region selected.\n");
                         lowid = PAL_LOWID;
-                        state = SELECT_SAVE;
+                        region_selected = true;
                     }
                 }
+                if (region_selected)
+                {
+                    printf("\n---------------------\nSelect a save file to modify.\nY for save 1, B for save 2, X for save 3.\nPress START to exit.\n");
+                    state = SELECT_SAVE;
+                }
                 break;
 
             case SELECT_SAVE: // Save file selection
                 if (kDown & KEY_Y) // Save 1 was chosen
                 {
                     profile_num = 0;
                     printf("You selected the 1st save file.\n");
-                    printFusionSelect();
-                    state = FUSION_OR_NOT;
+                    save_selected = true;
                 }
                 if (kDown & KEY_B) // Save 2 was chosen
                 {
                     profile_num = 1;
                     printf("You selected the 2nd save file.\n");
-                    printFusionSelect();
-                    state = FUSION_OR_NOT;
+                    save_selected = true;
                 }
                 if (kDown & KEY_X) // Save 3 was chosen
                 {
                     profile_num = 2;
                     printf("You selected the 3rd save file.\n");
-                    printFusionSelect();
-                    state = FUSION_OR_NOT;
+                    save_selected = true;
+                }
+                if (save_selected)
+                {
+                    printf("\n---------------------\nEnable fusion mode for this save file?\n A for yes, B for no.\n");
+                    save_selected = true;
                 }
                 break;
 
@@ -125,10 +138,13 @@ int main() {
             case THE_WIZARD_IS_BUSY: // Here the editing happens
                 not_busy = false;
                 Result res = edit_profile(profile_num, fusion_mode, lowid);
-                if(R_FAILED(res)) {
+                if(R_FAILED(res)) 
+                {
                     printf("\x1b[s\x1b[30;16H%4lx\n\x1b[u", res);
                     printf("Something went wrong, please see the error message below.\n");
-                } else {
+                } 
+                else
+                {
                     printf("Amiibo's have been unlocked for the selected save file. Press START to exit.");
                 }
                 not_busy = true;
@@ -147,12 +163,4 @@ int main() {
     cfguExit();
     gfxExit();
     return 0;
-}
-
-void printSaveSelect() {
-    printf("\n---------------------\nSelect a save file to modify.\nY for save 1, B for save 2, X for save 3.\nPress START to exit.\n");
-}
-
-void printFusionSelect() {
-    printf("\n---------------------\nEnable fusion mode for this save file?\n A for yes, B for no.\n");
-}
+}
diff --git a/source/main.h b/source/main.h
diff --git a/source/struct.h b/source/struct.h
@@ -1,7 +1,7 @@
 #ifndef _STRUCTH_
 #define _STRUCTH_
 
-typedef struct Regions {
+typedef struct {
     bool PAL;
     bool USA;
     bool JPN;

diff --git a/source/title.c b/source/title.c
@@ -28,7 +28,8 @@ u32 title_check(Regions *regions_found)
         // Card inserted, let's verify it's a CTR (3DS) card and not a TWL (DS) card.
         FS_CardType card_type;
         FSUSER_GetCardType(&card_type);
-        if (card_type == CARD_CTR) {
+        if (card_type == CARD_CTR) 
+        {
             // Yay! It's a CTR card, let's check the title.
             AM_GetTitleList(&titles_read, MEDIATYPE_GAME_CARD, 1, &title_id);
             int title_valid = valid_title(title_id, &lowid, regions_found);
@@ -51,7 +52,7 @@ u32 title_check(Regions *regions_found)
         valid_title(sd_titles[i], &lowid, regions_found);
     }
     free(sd_titles);
-    printf("Found a total of %i\n regions.", regions_found->total_regions);
+    printf("Found a total of %i regions.\n", regions_found->total_regions);
 
     switch(regions_found->total_regions)
     {