Fixed merge conflict

1 files changed, 6 insertions, 10 deletions

diff --git a/src/code/title_setup.c b/src/code/title_setup.c
index d7ac9cc87..827987d33 100644
--- a/src/code/title_setup.c
+++ b/src/code/title_setup.c
@@ -1,21 +1,17 @@
 #include <global.h>
 
-void TitleSetup_InitImpl(GameState* gameState)
-{
-    //Zelda common data initalization
+void TitleSetup_InitImpl(GameState* gameState) {
+    // Zelda common data initalization
     osSyncPrintf("ゼルダ共通データ初期化\n");
     SaveContext_Init();
     gameState->running = false;
-    gameState->init = Title_Init; gameState->size = sizeof(TitleContext);
+    SET_NEXT_GAMESTATE(gameState, Title_Init, TitleContext);
 }
 
-void TitleSetup_Destroy(GameState* gameState)
-{
-
+void TitleSetup_Destroy(GameState* gameState) {
 }
 
-void TitleSetup_Init(GameState* gameState)
-{
+void TitleSetup_Init(GameState* gameState) {
     gameState->destroy = TitleSetup_Destroy;
     TitleSetup_InitImpl(gameState);
-}
\ No newline at end of file
+}