fixing merge conflicts

1 files changed, 0 insertions, 496 deletions

diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
deleted file mode 100644
index d052992ad..000000000
--- a/src/reset_rtc_screen.c
+++ /dev/null
@@ -1,496 +0,0 @@
-#include "global.h"
-#include "event_data.h"
-#include "main.h"
-#include "menu.h"
-#include "palette.h"
-#include "rtc.h"
-#include "save.h"
-#include "sprite.h"
-#include "songs.h"
-#include "sound.h"
-#include "string_util.h"
-#include "strings.h"
-#include "strings2.h"
-#include "task.h"
-#include "text.h"
-#include "unknown_task.h"
-
-struct ResetRtcStruct
-{
-    /*0x0*/ u8 dataIndex;
-    /*0x2*/ u16 minVal;
-    /*0x4*/ u16 maxVal;
-    /*0x6*/ u8 left;
-    /*0x7*/ u8 right;
-    /*0x8*/ u8 unk8;
-};
-
-extern u16 gSaveFileStatus;
-
-extern struct ResetRtcStruct gUnknown_08376420[];
-extern struct SpritePalette gUnknown_083764BC;
-extern struct SpriteTemplate gSpriteTemplate_83764E8;
-extern u8 gUnknown_08376500[];
-
-void CB2_ResetRtcScreen(void);
-void VBlankCB_ResetRtcScreen(void);
-void Task_ResetRtcScreen(u8);
-
-void SpriteCB_ResetRtcCusor0(struct Sprite *sprite)
-{
-    int state = gTasks[sprite->data0].data[2];
-    if (state != sprite->data1)
-    {
-        sprite->data1 = state;
-        switch (state)
-        {
-        case 1:
-            sprite->invisible = FALSE;
-            sprite->animNum = 1;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 53;
-            sprite->pos1.y = 68;
-            break;
-        case 2:
-            sprite->invisible = FALSE;
-            sprite->animNum = 1;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 86;
-            sprite->pos1.y = 68;
-            break;
-        case 3:
-            sprite->invisible = FALSE;
-            sprite->animNum = 1;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 107;
-            sprite->pos1.y = 68;
-            break;
-        case 4:
-            sprite->invisible = FALSE;
-            sprite->animNum = 1;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 128;
-            sprite->pos1.y = 68;
-            break;
-        case 5:
-            sprite->invisible = FALSE;
-            sprite->animNum = 2;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 155;
-            sprite->pos1.y = 80;
-            break;
-        case 6:
-            DestroySprite(sprite);
-            break;
-        }
-    }
-}
-
-void SpriteCB_ResetRtcCusor1(struct Sprite *sprite)
-{
-    int state = gTasks[sprite->data0].data[2];
-    if (state != sprite->data1)
-    {
-        sprite->data1 = state;
-        switch (state)
-        {
-        case 1:
-            sprite->invisible = FALSE;
-            sprite->animNum = 0;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 53;
-            sprite->pos1.y = 92;
-            break;
-        case 2:
-            sprite->invisible = FALSE;
-            sprite->animNum = 0;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 86;
-            sprite->pos1.y = 92;
-            break;
-        case 3:
-            sprite->invisible = FALSE;
-            sprite->animNum = 0;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 107;
-            sprite->pos1.y = 92;
-            break;
-        case 4:
-            sprite->invisible = FALSE;
-            sprite->animNum = 0;
-            sprite->animDelayCounter = 0;
-            sprite->pos1.x = 128;
-            sprite->pos1.y = 92;
-            break;
-        case 5:
-            sprite->invisible = TRUE;
-            break;
-        case 6:
-            DestroySprite(sprite);
-            break;
-        }
-    }
-}
-
-void ResetRtcScreen_CreateCursor(u8 taskId)
-{
-    int spriteId;
-
-    LoadSpritePalette(&gUnknown_083764BC);
-
-    spriteId = CreateSpriteAtEnd(&gSpriteTemplate_83764E8, 53, 68, 0);
-    gSprites[spriteId].callback = SpriteCB_ResetRtcCusor0;
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = -1;
-
-    spriteId = CreateSpriteAtEnd(&gSpriteTemplate_83764E8, 53, 68, 0);
-    gSprites[spriteId].callback = SpriteCB_ResetRtcCusor1;
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = -1;
-}
-
-void ResetRtcScreen_FreeCursorPalette(void)
-{
-    FreeSpritePaletteByTag(gUnknown_083764BC.tag);
-}
-
-void ResetRtcScreen_HideChooseTimeWindow(void)
-{
-    MenuZeroFillWindowRect(3, 8, 25, 11);
-}
-
-void ResetRtcScreen_PrintTime(u8 x, u8 y, u16 days, u8 hours, u8 minutes, u8 seconds)
-{
-    u8 *dest = gStringVar4;
-    days %= 10000;
-    hours %= 24;
-    minutes %= 60;
-    seconds %= 60;
-    sub_8072C44(gStringVar1, days, 24, 1);
-    dest = StringCopy(dest, gStringVar1);
-    dest = StringCopy(dest, gOtherText_Day);
-    sub_8072C44(gStringVar1, hours, 18, 1);
-    dest = StringCopy(dest, gStringVar1);
-    dest = StringCopy(dest, gUnknown_08376500);
-    dest = ConvertIntToDecimalStringN(dest, minutes, STR_CONV_MODE_LEADING_ZEROS, 2);
-    dest = StringCopy(dest, gUnknown_08376500);
-    ConvertIntToDecimalStringN(dest, seconds, STR_CONV_MODE_LEADING_ZEROS, 2);
-    MenuPrint(gStringVar4, x, y);
-}
-
-void ResetRtcScreen_ShowChooseTimeWindow(u16 days, u8 hours, u8 minutes, u8 seconds)
-{
-    MenuDrawTextWindow(3, 8, 25, 11);
-    MenuPrint(gOtherText_OK, 20, 9);
-    ResetRtcScreen_PrintTime(4, 9, days, hours, minutes, seconds);
-}
-
-bool32 ResetRtcScreen_MoveTimeUpDown(s16 *val, int minVal, int maxVal, u16 keys)
-{
-    if (keys & DPAD_DOWN)
-    {
-        (*val)--;
-        if (*val < minVal)
-            *val = maxVal;
-    }
-    else if (keys & DPAD_UP)
-    {
-        (*val)++;
-        if (*val > maxVal)
-            *val = minVal;
-    }
-    else if (keys & DPAD_LEFT)
-    {
-        *val -= 10;
-        if (*val < minVal)
-            *val = maxVal;
-    }
-    else if (keys & DPAD_RIGHT)
-    {
-        *val += 10;
-        if (*val > maxVal)
-            *val = minVal;
-    }
-    else
-    {
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-void Task_ResetRtc_3(u8 taskId)
-{
-    gTasks[taskId].data[0] = 1;
-}
-
-void Task_ResetRtc_2(u8 taskId)
-{
-    ResetRtcScreen_HideChooseTimeWindow();
-    ResetRtcScreen_FreeCursorPalette();
-    gTasks[taskId].func = Task_ResetRtc_3;
-}
-
-void Task_ResetRtc_1(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-    u8 selection = data[2];
-    struct ResetRtcStruct *selectionInfo = &gUnknown_08376420[selection - 1];
-
-    if (gMain.newKeys & B_BUTTON)
-    {
-        gTasks[taskId].func = Task_ResetRtc_2;
-        data[1] = 0;
-        data[2] = 6;
-        PlaySE(SE_SELECT);
-        return;
-    }
-
-    if (gMain.newKeys & DPAD_RIGHT)
-    {
-        if (selectionInfo->right)
-        {
-            data[2] = selectionInfo->right;
-            PlaySE(SE_SELECT);
-            return;
-        }
-    }
-
-    if (gMain.newKeys & DPAD_LEFT)
-    {
-        if (selectionInfo->left)
-        {
-            data[2] = selectionInfo->left;
-            PlaySE(SE_SELECT);
-            return;
-        }
-    }
-
-    if (selection == 5)
-    {
-        if (gMain.newKeys & A_BUTTON)
-        {
-            gLocalTime.days = data[3];
-            gLocalTime.hours = data[4];
-            gLocalTime.minutes = data[5];
-            gLocalTime.seconds = data[6];
-            PlaySE(SE_SELECT);
-            gTasks[taskId].func = Task_ResetRtc_2;
-            data[1] = 1;
-            data[2] = 6;
-        }
-    }
-    else if (ResetRtcScreen_MoveTimeUpDown(&data[selectionInfo->dataIndex], selectionInfo->minVal, selectionInfo->maxVal, gMain.newAndRepeatedKeys & (DPAD_UP | DPAD_DOWN)))
-    {
-        PlaySE(SE_SELECT);
-        ResetRtcScreen_PrintTime(4, 9, data[3], data[4], data[5], data[6]);
-    }
-}
-
-void Task_ResetRtc_0(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-    data[0] = 0;
-    data[3] = gLocalTime.days;
-    data[4] = gLocalTime.hours;
-    data[5] = gLocalTime.minutes;
-    data[6] = gLocalTime.seconds;
-    ResetRtcScreen_ShowChooseTimeWindow(data[3], data[4], data[5], data[6]);
-    ResetRtcScreen_CreateCursor(taskId);
-    data[2] = 2;
-    gTasks[taskId].func = Task_ResetRtc_1;
-}
-
-void CB2_InitResetRtcScreen(void)
-{
-    u8 *addr;
-    u32 size;
-
-    REG_DISPCNT = 0;
-    SetVBlankCallback(NULL);
-
-    DmaClear16(3, PLTT, PLTT_SIZE);
-
-    addr = (u8 *)VRAM;
-    size = 0x18000;
-    while (1)
-    {
-        DmaFill16(3, 0, addr, 0x1000);
-        addr += 0x1000;
-        size -= 0x1000;
-        if (size <= 0x1000)
-        {
-            DmaFill16(3, 0, addr, size);
-            break;
-        }
-    }
-
-    ResetOamRange(0, 128);
-    LoadOam();
-    remove_some_task();
-    dp12_8087EA4();
-    ResetSpriteData();
-    ResetTasks();
-    ResetPaletteFade();
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
-    REG_DISPCNT = 4352;
-    SetVBlankCallback(VBlankCB_ResetRtcScreen);
-    SetMainCallback2(CB2_ResetRtcScreen);
-    CreateTask(Task_ResetRtcScreen, 80);
-}
-
-void CB2_ResetRtcScreen(void)
-{
-    RunTasks();
-    AnimateSprites();
-    BuildOamBuffer();
-    UpdatePaletteFade();
-}
-
-void VBlankCB_ResetRtcScreen(void)
-{
-    ProcessSpriteCopyRequests();
-    LoadOam();
-    TransferPlttBuffer();
-}
-
-void ResetRtcScreen_ShowMessage(const u8 *str)
-{
-    MenuDisplayMessageBox();
-    MenuPrint(str, 2, 15);
-}
-
-void Task_ShowResetRtcPrompt(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-
-    switch (data[0])
-    {
-    case 0:
-        MenuZeroFillScreen();
-        MenuDrawTextWindow(0, 0, 20, 10);
-        MenuPrint(gSystemText_PresentTime, 1, 1);
-        ResetRtcScreen_PrintTime(
-            1,
-            3,
-            gLocalTime.days,
-            gLocalTime.hours,
-            gLocalTime.minutes,
-            gLocalTime.seconds);
-        MenuPrint(gSystemText_PreviousTime, 1, 5);
-        ResetRtcScreen_PrintTime(
-            1,
-            7,
-            gSaveBlock2.lastBerryTreeUpdate.days,
-            gSaveBlock2.lastBerryTreeUpdate.hours,
-            gSaveBlock2.lastBerryTreeUpdate.minutes,
-            gSaveBlock2.lastBerryTreeUpdate.seconds);
-        ResetRtcScreen_ShowMessage(gSystemText_ResetRTCPrompt);
-        data[0]++;
-    case 1:
-        if (gMain.newKeys & B_BUTTON)
-        {
-            DestroyTask(taskId);
-            DoSoftReset();
-        }
-        else if (gMain.newKeys & A_BUTTON)
-        {
-            PlaySE(SE_SELECT);
-            DestroyTask(taskId);
-        }
-        break;
-    }
-}
-
-void Task_ResetRtcScreen(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-
-    switch (data[0])
-    {
-    case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF);
-        data[0] = 1;
-        break;
-    case 1:
-        if (!gPaletteFade.active)
-        {
-            if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
-            {
-                ResetRtcScreen_ShowMessage(gSystemText_NoSaveFileNoTime);
-                data[0] = 5;
-            }
-            else
-            {
-                RtcCalcLocalTime();
-                data[1] = CreateTask(Task_ShowResetRtcPrompt, 80);
-                data[0] = 2;
-            }
-        }
-        break;
-    case 2:
-        if (gTasks[data[1]].isActive != TRUE)
-        {
-            MenuZeroFillScreen();
-            ResetRtcScreen_ShowMessage(gSystemText_PleaseResetTime);
-            gLocalTime = gSaveBlock2.lastBerryTreeUpdate;
-            data[1] = CreateTask(Task_ResetRtc_0, 80);
-            data[0] = 3;
-        }
-        break;
-    case 3:
-        if (gTasks[data[1]].data[0])
-        {
-            if (!gTasks[data[1]].data[1])
-            {
-                DestroyTask(data[1]);
-                data[0] = 2;
-            }
-            else
-            {
-                DestroyTask(data[1]);
-                RtcReset();
-                RtcCalcLocalTimeOffset(
-                    gLocalTime.days,
-                    gLocalTime.hours,
-                    gLocalTime.minutes,
-                    gLocalTime.seconds);
-                gSaveBlock2.lastBerryTreeUpdate = gLocalTime;
-                VarSet(VAR_DAYS, gLocalTime.days);
-                DisableResetRTC();
-                ResetRtcScreen_ShowMessage(gSystemText_ClockResetDataSave);
-                data[0] = 4;
-            }
-        }
-        break;
-    case 4:
-        if (TrySavingData(0) == TRUE)
-        {
-            ResetRtcScreen_ShowMessage(gSystemText_SaveCompleted);
-            PlaySE(SE_PINPON);
-        }
-        else
-        {
-            ResetRtcScreen_ShowMessage(gSystemText_SaveFailed);
-            PlaySE(SE_BOO);
-        }
-        data[0] = 5;
-    case 5:
-        if (gMain.newKeys & A_BUTTON)
-        {
-            BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, 0xFFFF);
-            data[0] = 6;
-        }
-        else
-        {
-            break;
-        }
-    case 6:
-        if (!gPaletteFade.active)
-        {
-            DestroyTask(taskId);
-            DoSoftReset();
-        }
-    }
-}