@@ -288,26 +288,16 @@ static BOOL DeleteSavedataApp_DoMainTask(DeleteSavedataApp_Data *data) {
288
288
data -> mainState = MAINSTATE_HANDLE_INPUT ;
289
289
break ;
290
290
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 :
303
294
data -> mainState = MAINSTATE_ASK_TO_CONFIRM ;
304
295
break ;
305
- }
306
-
307
- cancel1 : {
296
+ case LIST_CANCEL :
308
297
data -> mainState = MAINSTATE_EXIT ;
309
298
break ;
310
299
}
300
+ break ;
311
301
}
312
302
case MAINSTATE_ASK_TO_CONFIRM :
313
303
if (DeleteSavedataApp_PrintMessage (data , msg_0007_00001 , TRUE, 4 ) != TRUE) {
@@ -318,26 +308,16 @@ static BOOL DeleteSavedataApp_DoMainTask(DeleteSavedataApp_Data *data) {
318
308
data -> mainState = MAINSTATE_HANDLE_CONFIRMATION ;
319
309
break ;
320
310
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 :
333
314
data -> mainState = MAINSTATE_PRINT_DELETING_MESSAGE ;
334
315
break ;
335
- }
336
-
337
- cancel2 : {
316
+ case LIST_CANCEL :
338
317
data -> mainState = MAINSTATE_EXIT ;
339
318
break ;
340
319
}
320
+ break ;
341
321
}
342
322
case MAINSTATE_PRINT_DELETING_MESSAGE :
343
323
if (DeleteSavedataApp_PrintMessage (data , msg_0007_00002 , TRUE, TEXT_SPEED_INSTANT ) != TRUE) {
0 commit comments