Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize

2023-01-18 11:07:12 -05:00
parent f4a2040843 4a9c4951ab
commit 0cc10a1ada
1149 changed files with 44393 additions and 46317 deletions
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -95,7 +95,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
        gTasks[taskId].func = Task_ClearSaveData;
        break;
    case 1:
-    case -1:
+    case MENU_B_PRESSED:
        PlaySE(SE_SELECT);
        DestroyTask(taskId);
        SetMainCallback2(CB2_FadeAndDoReset);