diff options
author | YamaArashi <shadow962@live.com> | 2016-09-05 02:29:10 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-09-05 02:29:10 -0700 |
commit | fcb116339a7cc4bebc478970008171d8dbca3a90 (patch) | |
tree | 923b12f926fe88f27659af763ddfe5f40dde2f57 | |
parent | 2085d7169e75b1fb417948d6e5167007064df258 (diff) |
tab to spaces
-rw-r--r-- | src/main_menu.c | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 5e2e61f11..e41aecbb2 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -720,82 +720,82 @@ void set_default_player_name(u8 a); void Task_Birch1(u8 taskId) { - SetUpWindowConfig(&gWindowConfig_81E6C3C); - sub_8071C4C(&gWindowConfig_81E6CE4); - REG_WIN0H = 0; - REG_WIN0V = 0; - REG_WININ = 0; - REG_WINOUT = 0; - REG_BLDCNT = 0; - REG_BLDALPHA = 0; - REG_BLDY = 0; - LZ77UnCompVram(gUnknown_081E768C, (void *)BG_VRAM); + SetUpWindowConfig(&gWindowConfig_81E6C3C); + sub_8071C4C(&gWindowConfig_81E6CE4); + REG_WIN0H = 0; + REG_WIN0V = 0; + REG_WININ = 0; + REG_WINOUT = 0; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + REG_BLDY = 0; + LZ77UnCompVram(gUnknown_081E768C, (void *)BG_VRAM); LZ77UnCompVram(gUnknown_081E7834, (void *)(BG_VRAM + 0x3800)); - LoadPalette(gUnknown_081E764C, 0, 0x40); - LoadPalette(gUnknown_081E796C, 1, 0x10); - remove_some_task(); - ResetSpriteData(); - FreeAllSpritePalettes(); - AddBirchSpeechObjects(taskId); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); - REG_BG1CNT = 0x00000703; - REG_DISPCNT = 0x9A << 5; - gTasks[taskId].data[4] = 0; - gTasks[taskId].func = task_new_game_prof_birch_speech_2; - gTasks[taskId].data[2] = 0xFF; - gTasks[taskId].data[3] = 0xFF; - gTasks[taskId].data[7] = 0xD8; - - sub_8075474(0xBB << 1); + LoadPalette(gUnknown_081E764C, 0, 0x40); + LoadPalette(gUnknown_081E796C, 1, 0x10); + remove_some_task(); + ResetSpriteData(); + FreeAllSpritePalettes(); + AddBirchSpeechObjects(taskId); + BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + REG_BG1CNT = 0x00000703; + REG_DISPCNT = 0x9A << 5; + gTasks[taskId].data[4] = 0; + gTasks[taskId].func = task_new_game_prof_birch_speech_2; + gTasks[taskId].data[2] = 0xFF; + gTasks[taskId].data[3] = 0xFF; + gTasks[taskId].data[7] = 0xD8; + + sub_8075474(0xBB << 1); } void task_new_game_prof_birch_speech_2(u8 taskId) { - struct Task *tasks = gTasks; - struct Task *task = &tasks[taskId]; - - if(task->data[7] != 0) - { - task->data[7]--; - } - else - { - u8 spriteId = task->data[8]; - struct Sprite *sprites = gSprites; - struct Sprite *sprite = &sprites[spriteId]; - sprite->pos1.x = 0x88; - sprite->pos1.y = 0x3C; - sprite->invisible = 0; - sprite->oam.objMode = 1; - sub_800B534(taskId, 0xA); - sub_800B6C0(taskId, 0x14); - task->data[7] = 0x50; - task->func = task_new_game_prof_birch_speech_3; - } + struct Task *tasks = gTasks; + struct Task *task = &tasks[taskId]; + + if(task->data[7] != 0) + { + task->data[7]--; + } + else + { + u8 spriteId = task->data[8]; + struct Sprite *sprites = gSprites; + struct Sprite *sprite = &sprites[spriteId]; + sprite->pos1.x = 0x88; + sprite->pos1.y = 0x3C; + sprite->invisible = 0; + sprite->oam.objMode = 1; + sub_800B534(taskId, 0xA); + sub_800B6C0(taskId, 0x14); + task->data[7] = 0x50; + task->func = task_new_game_prof_birch_speech_3; + } } void task_new_game_prof_birch_speech_3(u8 taskId) { - struct Task *tasks = gTasks; - struct Task *task = &tasks[taskId]; - - if(task->data[5] != 0) - { - struct Sprite *sprites = gSprites; - struct Sprite *sprite = &sprites[(s16)task->data[8]]; - - sprite->oam.objMode = 0; - if((u16)task->data[7]) - { - task->data[7]--; - } - else - { - DrawDefaultWindow(0x2, 0xD, 0x1B, 0x12); - AddTextPrinterWithCallbackForMessage(gUnknown_081C6D78, 0x3, 0xE); - task->func = task_new_game_prof_birch_speech_4; - } - } + struct Task *tasks = gTasks; + struct Task *task = &tasks[taskId]; + + if(task->data[5] != 0) + { + struct Sprite *sprites = gSprites; + struct Sprite *sprite = &sprites[(s16)task->data[8]]; + + sprite->oam.objMode = 0; + if((u16)task->data[7]) + { + task->data[7]--; + } + else + { + DrawDefaultWindow(0x2, 0xD, 0x1B, 0x12); + AddTextPrinterWithCallbackForMessage(gUnknown_081C6D78, 0x3, 0xE); + task->func = task_new_game_prof_birch_speech_4; + } + } } void task_new_game_prof_birch_speech_4(u8 taskId) @@ -811,30 +811,30 @@ void task_new_game_prof_birch_speech_4(u8 taskId) void task_new_game_prof_birch_speech_5(u8 taskId) { - if(sub_8072CF4(0x18)) - gTasks[taskId].func = task_new_game_prof_birch_speech_6; + if(sub_8072CF4(0x18)) + gTasks[taskId].func = task_new_game_prof_birch_speech_6; } void task_new_game_prof_birch_speech_6(u8 taskId) { - struct Task *tasks = gTasks; - struct Task *task = &tasks[taskId]; - u8 data = (u8)task->data[9]; - struct Sprite *sprites = gSprites; - struct Sprite *sprite = &sprites[data]; - - sprite->pos1.x = 0x68; - sprite->pos1.y = 0x48; - sprite->invisible = 0; - sprite->data0 = 0; - AddTextPrinterForMessage(data, sprite->oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF); - task->func = task_new_game_prof_birch_speech_7; - task->data[7] = 0; + struct Task *tasks = gTasks; + struct Task *task = &tasks[taskId]; + u8 data = (u8)task->data[9]; + struct Sprite *sprites = gSprites; + struct Sprite *sprite = &sprites[data]; + + sprite->pos1.x = 0x68; + sprite->pos1.y = 0x48; + sprite->invisible = 0; + sprite->data0 = 0; + AddTextPrinterForMessage(data, sprite->oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF); + task->func = task_new_game_prof_birch_speech_7; + task->data[7] = 0; } void task_new_game_prof_birch_speech_7(u8 taskId) { - struct Task *tasks; + struct Task *tasks; struct Task *task; if(sub_8075374()) @@ -863,7 +863,7 @@ void task_new_game_prof_birch_speech_7(u8 taskId) void task_new_game_prof_birch_speech_8(u8 taskId) { - if(sub_8072CF4(0x18)) + if(sub_8072CF4(0x18)) { AddTextPrinterWithCallbackForMessage(gUnknown_081C6E1A, 0x3, 0xE); gTasks[taskId].func = task_new_game_prof_birch_speech_9; @@ -872,7 +872,7 @@ void task_new_game_prof_birch_speech_8(u8 taskId) void task_new_game_prof_birch_speech_9(u8 taskId) { - if(sub_8072CF4(0x18)) + if(sub_8072CF4(0x18)) { DrawDefaultWindow(0x2, 0xD, 0x1B, 0x12); AddTextPrinterWithCallbackForMessage(gUnknown_081C6FCB, 0x3, 0xE); @@ -903,7 +903,7 @@ void task_new_game_prof_birch_speech_10(u8 taskId) void task_new_game_prof_birch_speech_11(u8 taskId) { struct Task *tasks = gTasks; - struct Task *task = &tasks[taskId]; + struct Task *task = &tasks[taskId]; if((s16)task->data[4] != -0x3C) { @@ -949,7 +949,7 @@ void task_new_game_prof_birch_speech_12(u8 taskId) void task_new_game_prof_birch_speech_13(u8 taskId) { struct Task *tasks = gTasks; - struct Task *task = &tasks[taskId]; + struct Task *task = &tasks[taskId]; if(task->data[5]) { @@ -963,7 +963,7 @@ void task_new_game_prof_birch_speech_13(u8 taskId) void task_new_game_prof_birch_speech_14(u8 taskId) { - DrawDefaultWindow(2, 0xD, 0x1B, 0x12); + DrawDefaultWindow(2, 0xD, 0x1B, 0x12); AddTextPrinterWithCallbackForMessage(gUnknown_081C6FD8, 3, 14); gTasks[taskId].func = task_new_game_prof_birch_speech_15; } |