Skip to content

Commit d1396a7

Browse files
committed
application/delete_save: Fix remaining fakematches
1 parent 9867831 commit d1396a7

File tree

1 file changed

+10
-30
lines changed

1 file changed

+10
-30
lines changed

src/application/delete_savedata.c

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -288,26 +288,16 @@ static BOOL DeleteSavedataApp_DoMainTask(DeleteSavedataApp_Data *data) {
288288
data->mainState = MAINSTATE_HANDLE_INPUT;
289289
break;
290290
case MAINSTATE_HANDLE_INPUT: {
291-
int result = Handle2dMenuInput_DeleteOnFinish(data->yesNoMenu, data->heapId);
292-
293-
// FIXME: Fakematch
294-
if (result == LIST_NO_MULTIPLE_SCROLL) {
295-
goto no_multiple_scroll1;
296-
} else if (result != LIST_CANCEL) {
297-
break;
298-
} else {
299-
goto cancel1;
300-
}
301-
302-
no_multiple_scroll1: {
291+
u32 result = Handle2dMenuInput_DeleteOnFinish(data->yesNoMenu, data->heapId);
292+
switch (result) {
293+
case LIST_NO_MULTIPLE_SCROLL:
303294
data->mainState = MAINSTATE_ASK_TO_CONFIRM;
304295
break;
305-
}
306-
307-
cancel1: {
296+
case LIST_CANCEL:
308297
data->mainState = MAINSTATE_EXIT;
309298
break;
310299
}
300+
break;
311301
}
312302
case MAINSTATE_ASK_TO_CONFIRM:
313303
if (DeleteSavedataApp_PrintMessage(data, msg_0007_00001, TRUE, 4) != TRUE) {
@@ -318,26 +308,16 @@ static BOOL DeleteSavedataApp_DoMainTask(DeleteSavedataApp_Data *data) {
318308
data->mainState = MAINSTATE_HANDLE_CONFIRMATION;
319309
break;
320310
case MAINSTATE_HANDLE_CONFIRMATION: {
321-
int result = Handle2dMenuInput_DeleteOnFinish(data->yesNoMenu, data->heapId);
322-
323-
// FIXME: Fakematch
324-
if (result == LIST_NO_MULTIPLE_SCROLL) {
325-
goto no_multiple_scroll2;
326-
} else if (result != LIST_CANCEL) {
327-
break;
328-
} else {
329-
goto cancel2;
330-
}
331-
332-
no_multiple_scroll2: {
311+
u32 result = Handle2dMenuInput_DeleteOnFinish(data->yesNoMenu, data->heapId);
312+
switch (result) {
313+
case LIST_NO_MULTIPLE_SCROLL:
333314
data->mainState = MAINSTATE_PRINT_DELETING_MESSAGE;
334315
break;
335-
}
336-
337-
cancel2: {
316+
case LIST_CANCEL:
338317
data->mainState = MAINSTATE_EXIT;
339318
break;
340319
}
320+
break;
341321
}
342322
case MAINSTATE_PRINT_DELETING_MESSAGE:
343323
if (DeleteSavedataApp_PrintMessage(data, msg_0007_00002, TRUE, TEXT_SPEED_INSTANT) != TRUE) {

0 commit comments

Comments
 (0)