Merge pull request #20 from TraceEntertains/main

Fix touchscreen button select bug and use FRD instead of ACT for account detection to make it simpler

Author: jonbarrow

app/source/frda.c

@@ -57,6 +57,18 @@ Result FRDA_CreateLocalAccount(u8 localAccountId, NascEnvironment nascEnvironmen
 	return (Result)cmdbuf[1];
 }
 
+Result FRDA_GetLocalAccountId(u8 *localAccountId) {
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+	cmdbuf[0] = IPC_MakeHeader(0xB, 2, 0);
+
+	if (R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret;
+
+	*localAccountId = (u8)cmdbuf[2];
+
+	return (Result)cmdbuf[1];
+}
+
 Result FRDA_SetLocalAccountId(u8 localAccountId) {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -82,4 +94,4 @@ Result FRDA_SetClientSdkVersion(u32 sdkVer) {
 		return ret;
 
 	return (Result)cmdbuf[1];
-}
+}

app/source/frda.h

@@ -17,9 +17,10 @@ Result frdAInit();
 void frdAExit();
 Handle *frdAGetSessionHandle();
 Result FRDA_CreateLocalAccount(u8 localAccountId, NascEnvironment nascEnvironment, u8 serverTypeField1, u8 serverTypeField2);
+Result FRDA_GetLocalAccountId(u8 *localAccountId);
 Result FRDA_SetLocalAccountId(u8 localAccountId);
 Result FRDA_SetClientSdkVersion(u32 sdkVer);
 
 #ifdef __cplusplus
 }
-#endif
+#endif

app/source/main.c

@@ -22,6 +22,29 @@
 		printf("%s error: %08lx\n\n", name, rc); \
 	}
 
+
+C2D_Sprite debug_button;
+C2D_Sprite debug_header;
+C2D_Sprite go_back;
+C2D_Sprite header;
+C2D_Sprite nintendo_deselected;
+C2D_Sprite nintendo_btn_selected;
+C2D_Sprite nintendo_selected;
+C2D_Sprite nintendo_loaded_deselected;
+C2D_Sprite pretendo_deselected;
+C2D_Sprite pretendo_btn_selected;
+C2D_Sprite pretendo_selected;
+C2D_Sprite pretendo_loaded_deselected;
+C2D_Sprite top;
+
+C2D_TextBuf g_staticBuf;
+C2D_TextBuf g_dynamicBuf;
+
+u32 screen = 0;
+
+Account buttonSelected;
+Account currentEnv;
+
 /**
  * Switches the friends and act accounts.
  *
@@ -36,6 +59,9 @@ Result switchAccounts(Account friend_account_id) {
 		return rc;
 	}
 
+	currentEnv = friend_account_id;
+	buttonSelected = currentEnv;
+
 	u32 act_account_index = 0;
 	handleResult(ACTA_GetAccountIndexOfFriendAccountId(&act_account_index, friend_account_id), "Get persistent id for creation");
 
@@ -63,29 +89,6 @@ Result createAccount(Account friend_account_id) {
 	return rc;
 }
 
-C2D_Sprite debug_button;
-C2D_Sprite debug_header;
-C2D_Sprite go_back;
-C2D_Sprite header;
-C2D_Sprite nintendo_deselected;
-C2D_Sprite nintendo_btn_selected;
-C2D_Sprite nintendo_selected;
-C2D_Sprite nintendo_loaded_deselected;
-C2D_Sprite pretendo_deselected;
-C2D_Sprite pretendo_btn_selected;
-C2D_Sprite pretendo_selected;
-C2D_Sprite pretendo_loaded_deselected;
-C2D_Sprite top;
-
-C2D_TextBuf g_staticBuf;
-C2D_TextBuf g_dynamicBuf;
-
-u32 current_persistent_id = 0;
-u32 screen = 0;
-
-u32 act_account_count = 0;
-u32 current_account = 0;
-
 static void sceneInit(void)
 {
 	C2D_SpriteSheet spriteSheet = C2D_SpriteSheetLoadFromMem(sheet_t3x, sheet_t3x_size);
@@ -139,22 +142,6 @@ int main()
 	C2D_Init(C2D_DEFAULT_MAX_OBJECTS);
 	C2D_Prepare();
 
-	u32 rc = 0;
-
-	u32 act_account_index = 0;
-	u32 current_persistent_id = 0;
-	u32 pretendo_persistent_id = 0;
-	handleResult(ACTA_GetAccountIndexOfFriendAccountId(&act_account_index, 2), "Get persistent id for Pretendo");
-	handleResult(ACTA_GetPersistentId(&current_persistent_id, ACT_CURRENT_ACCOUNT), "Current persistent id");
-	handleResult(ACTA_GetPersistentId(&pretendo_persistent_id, act_account_index), "Current persistent id");
-
-	if (current_persistent_id == pretendo_persistent_id) {
-		current_account = 1;
-	}
-	else {
-		current_account = 0;
-	}
-
 	// This version or higher is required creating/swapping friend accounts
 	FRDA_SetClientSdkVersion(0x70000c8);
 
@@ -165,9 +152,8 @@ int main()
 	// Initialize the scene
 	sceneInit();
 
-	ACTA_GetAccountCount(&act_account_count);
-
-	Account buttonSelected = (Account)(current_account + 1);
+	FRDA_GetLocalAccountId(&currentEnv);
+	buttonSelected = currentEnv;
 
 	// Main loop
 	while (aptMainLoop()) {
@@ -179,14 +165,14 @@ int main()
 
 		if (kDown & KEY_TOUCH) {
 			if ((touch.px >= 165 && touch.px <= 165 + 104) && (touch.py >= 59 && touch.py <= 59 + 113)) {
+				buttonSelected = Nintendo;
 				switchAccounts(buttonSelected);
 				needsReboot = true;
 				break;
 			}
 			else if ((touch.px >= 49 && touch.px <= 49 + 104) && (touch.py >= 59 && touch.py <= 59 + 113)) {
-				if (switchAccounts(buttonSelected)) {
-					createAccount(buttonSelected);
-				}
+				buttonSelected = Pretendo;
+				if (switchAccounts(buttonSelected)) createAccount(buttonSelected);
 				needsReboot = true;
 				break;
 			}
@@ -204,7 +190,7 @@ int main()
 		C2D_SceneBegin(bottom_screen);
 		if (screen == 0) {
 			if (buttonSelected == Nintendo) {
-				if (current_account == NASC_ENV_Prod) {
+				if (currentEnv == Nintendo) {
 					C2D_DrawSprite(&nintendo_selected);
 					C2D_DrawSprite(&pretendo_deselected);
 				}
@@ -214,7 +200,7 @@ int main()
 				}
 			}
 			else if (buttonSelected == Pretendo) {
-				if (current_account == NASC_ENV_Test) {
+				if (currentEnv == Pretendo) {
 					C2D_DrawSprite(&nintendo_deselected);
 					C2D_DrawSprite(&pretendo_selected);
 				}