From 1297b37ba327c47b88757551f8bb405fe4892da3 Mon Sep 17 00:00:00 2001 From: idefix02 <237103031+idefix02@users.noreply.github.com> Date: Fri, 13 Nov 2026 19:11:04 +0100 Subject: [PATCH] Match Task_80B6D78 --- .../game/sa3/spstg__Task_80B6D78.inc | 353 ------------------ src/game/sa3/special_stage.c | 42 +-- 2 files changed, 17 insertions(+), 378 deletions(-) delete mode 100644 asm/non_matching/game/sa3/spstg__Task_80B6D78.inc diff --git a/asm/non_matching/game/sa3/spstg__Task_80B6D78.inc b/asm/non_matching/game/sa3/spstg__Task_80B6D78.inc deleted file mode 100644 index b70bc9b5c..000000000 --- a/asm/non_matching/game/sa3/spstg__Task_80B6D78.inc +++ /dev/null @@ -1,353 +0,0 @@ - -.syntax unified -.text - push {r4, r5, r6, r7, lr} - mov r7, sl - mov r6, sb - mov r5, r8 - push {r5, r6, r7} - sub sp, #0x24 - ldr r0, _080B6E4C @ =gCurTask - ldr r0, [r0] - ldrh r7, [r0, #6] - movs r0, #0xc0 - lsls r0, r0, #0x12 - adds r0, r0, r7 - mov r8, r0 - ldr r1, _080B6E50 @ =gDispCnt - movs r2, #0x92 - lsls r2, r2, #5 - adds r0, r2, #0 - strh r0, [r1] - ldr r1, _080B6E54 @ =gBgCntRegs - movs r4, #0 - ldr r0, _080B6E58 @ =0x00000703 - strh r0, [r1, #2] - ldr r0, _080B6E5C @ =gBgScrollRegs - strh r4, [r0, #4] - strh r4, [r0, #6] - ldr r1, _080B6E60 @ =0x0300000C - adds r0, r7, r1 - ldr r3, _080B6E64 @ =0x000001AB - movs r1, #0x1e - str r1, [sp] - movs r2, #0x14 - mov sb, r2 - str r2, [sp, #4] - str r4, [sp, #8] - movs r1, #1 - mov sl, r1 - str r1, [sp, #0xc] - str r4, [sp, #0x10] - str r4, [sp, #0x14] - movs r1, #0 - movs r2, #7 - bl sub_80B6B3C - ldr r0, _080B6E68 @ =gBldRegs - strh r4, [r0, #4] - strh r4, [r0] - strh r4, [r0, #2] - ldr r1, _080B6E6C @ =gUnknown_03001EA0 - ldr r0, _080B6E70 @ =0x06010000 - str r0, [r1] - ldr r0, _080B6E74 @ =gUnknown_03001E9C - str r4, [r0] - ldr r0, _080B6E78 @ =gStageData - ldrb r6, [r0, #0xd] - cmp r6, #0 - bne _080B6EC4 - ldr r2, _080B6E7C @ =0x0300027E - adds r0, r7, r2 - ldrb r2, [r0] - cmp r2, #0 - beq _080B6E94 - ldr r1, _080B6E80 @ =0x0300004C - adds r0, r7, r1 - ldr r5, _080B6E84 @ =gUnknown_080E3074 - ldr r2, _080B6E88 @ =0x0300027D - adds r4, r7, r2 - ldrb r1, [r4] - lsls r1, r1, #3 - adds r1, r1, r5 - ldrh r2, [r1, #4] - ldrh r3, [r1] - str r6, [sp] - movs r1, #0x82 - lsls r1, r1, #1 - str r1, [sp, #4] - mov r1, sb - str r1, [sp, #8] - str r6, [sp, #0xc] - ldrb r1, [r4] - lsls r1, r1, #3 - adds r1, r1, r5 - ldrb r1, [r1, #2] - str r1, [sp, #0x10] - str r6, [sp, #0x14] - movs r1, #1 - bl sub_80B6BB8 - ldr r2, _080B6E8C @ =0x03000074 - adds r0, r7, r2 - ldr r3, _080B6E90 @ =0x0000046D - str r6, [sp] - movs r1, #0xa5 - lsls r1, r1, #1 - str r1, [sp, #4] - movs r1, #0x1c - str r1, [sp, #8] - str r6, [sp, #0xc] - mov r1, sl - str r1, [sp, #0x10] - str r6, [sp, #0x14] - movs r1, #1 - movs r2, #0x28 - bl sub_80B6BB8 - b _080B6FA2 - .align 2, 0 -_080B6E4C: .4byte gCurTask -_080B6E50: .4byte gDispCnt -_080B6E54: .4byte gBgCntRegs -_080B6E58: .4byte 0x00000703 -_080B6E5C: .4byte gBgScrollRegs -_080B6E60: .4byte 0x0300000C -_080B6E64: .4byte 0x000001AB -_080B6E68: .4byte gBldRegs -_080B6E6C: .4byte gUnknown_03001EA0 -_080B6E70: .4byte 0x06010000 -_080B6E74: .4byte gUnknown_03001E9C -_080B6E78: .4byte gStageData -_080B6E7C: .4byte 0x0300027E -_080B6E80: .4byte 0x0300004C -_080B6E84: .4byte gUnknown_080E3074 -_080B6E88: .4byte 0x0300027D -_080B6E8C: .4byte 0x03000074 -_080B6E90: .4byte 0x0000046D -_080B6E94: - ldr r1, _080B6EBC @ =0x0300009C - adds r0, r7, r1 - ldr r3, _080B6EC0 @ =0x0000046D - str r2, [sp] - movs r1, #0x42 - str r1, [sp, #4] - movs r1, #0x1c - str r1, [sp, #8] - str r2, [sp, #0xc] - str r2, [sp, #0x10] - str r2, [sp, #0x14] - movs r1, #1 - movs r2, #0x20 - bl sub_80B6BB8 - movs r0, #0x43 @ MUS_SPECIAL_STAGE_RESULT_2 - bl m4aSongNumStart - b _080B7012 - .align 2, 0 -_080B6EBC: .4byte 0x0300009C -_080B6EC0: .4byte 0x0000046D -_080B6EC4: - movs r6, #0 - movs r2, #0 - str r2, [sp, #0x18] - movs r5, #0 - movs r4, #0 - ldr r0, _080B6FAC @ =0x03000074 - adds r3, r7, r0 - ldr r1, _080B6FB0 @ =0x030000C4 - adds r1, r1, r7 - mov sl, r1 - ldr r2, _080B6FB4 @ =0x0300004C - adds r2, r7, r2 - str r2, [sp, #0x1c] - adds r0, #0x28 - adds r0, r7, r0 - str r0, [sp, #0x20] - ldr r1, _080B6FB8 @ =0x0300027F - adds r0, r7, r1 - ldrb r1, [r0] - movs r2, #1 -_080B6EEC: - adds r0, r1, #0 - asrs r0, r4 - ands r0, r2 - cmp r0, #0 - beq _080B6EFC - adds r0, r6, #1 - lsls r0, r0, #0x18 - lsrs r6, r0, #0x18 -_080B6EFC: - adds r0, r4, #1 - lsls r0, r0, #0x18 - lsrs r4, r0, #0x18 - cmp r4, #6 - bls _080B6EEC - cmp r6, #1 - bls _080B6F0E - movs r2, #1 - str r2, [sp, #0x18] -_080B6F0E: - ldr r0, _080B6FBC @ =0x0000027E - add r0, r8 - mov sb, r0 - ldrb r0, [r0] - cmp r0, #0 - bne _080B6F1C - ldr r5, _080B6FC0 @ =0x0000FFF0 -_080B6F1C: - ldr r7, _080B6FC4 @ =0x00000481 - movs r4, #0 - str r4, [sp] - movs r0, #0x1c - str r0, [sp, #4] - lsls r5, r5, #0x10 - movs r1, #0xe0 - lsls r1, r1, #0xd - adds r5, r5, r1 - asrs r5, r5, #0x10 - str r5, [sp, #8] - str r4, [sp, #0xc] - movs r0, #8 - str r0, [sp, #0x10] - str r4, [sp, #0x14] - adds r0, r3, #0 - movs r1, #1 - movs r2, #8 - adds r3, r7, #0 - bl sub_80B6BB8 - str r4, [sp] - movs r0, #0x40 - str r0, [sp, #4] - str r5, [sp, #8] - str r4, [sp, #0xc] - str r6, [sp, #0x10] - str r4, [sp, #0x14] - mov r0, sl - movs r1, #1 - movs r2, #6 - adds r3, r7, #0 - bl sub_80B6BB8 - str r4, [sp] - movs r0, #0x58 - str r0, [sp, #4] - str r5, [sp, #8] - str r4, [sp, #0xc] - movs r0, #9 - str r0, [sp, #0x10] - str r4, [sp, #0x14] - ldr r0, [sp, #0x1c] - movs r1, #1 - movs r2, #0xc - adds r3, r7, #0 - bl sub_80B6BB8 - str r4, [sp] - movs r6, #0x8c - str r6, [sp, #4] - str r5, [sp, #8] - str r4, [sp, #0xc] - ldr r0, [sp, #0x18] - adds r0, #0xa - str r0, [sp, #0x10] - str r4, [sp, #0x14] - ldr r0, [sp, #0x20] - movs r1, #1 - movs r2, #0x16 - adds r3, r7, #0 - bl sub_80B6BB8 - mov r2, sb - ldrb r4, [r2] - cmp r4, #0 - beq _080B6FC8 -_080B6FA2: - movs r0, #0x42 @ MUS_SPECIAL_STAGE_RESULT_1 - bl m4aSongNumStart - b _080B7012 - .align 2, 0 -_080B6FAC: .4byte 0x03000074 -_080B6FB0: .4byte 0x030000C4 -_080B6FB4: .4byte 0x0300004C -_080B6FB8: .4byte 0x0300027F -_080B6FBC: .4byte 0x0000027E -_080B6FC0: .4byte 0x0000FFF0 -_080B6FC4: .4byte 0x00000481 -_080B6FC8: - mov r0, r8 - adds r0, #0xec - str r4, [sp] - movs r1, #0x24 - str r1, [sp, #4] - str r6, [sp, #8] - str r4, [sp, #0xc] - movs r1, #0xc - str r1, [sp, #0x10] - str r4, [sp, #0x14] - movs r1, #1 - movs r2, #0x14 - adds r3, r7, #0 - bl sub_80B6BB8 - movs r0, #0x8a - lsls r0, r0, #1 - add r0, r8 - str r4, [sp] - movs r1, #0xac - str r1, [sp, #4] - str r6, [sp, #8] - str r4, [sp, #0xc] - movs r1, #0xe - str r1, [sp, #0x10] - str r4, [sp, #0x14] - movs r1, #1 - movs r2, #8 - adds r3, r7, #0 - bl sub_80B6BB8 - ldr r0, _080B7064 @ =0x00000282 - add r0, r8 - strb r4, [r0] - movs r0, #0x43 @ MUS_SPECIAL_STAGE_RESULT_2 - bl m4aSongNumStart -_080B7012: - movs r4, #0 - movs r5, #0 -_080B7016: - lsls r0, r4, #2 - adds r0, r0, r4 - lsls r0, r0, #3 - movs r1, #0x9e - lsls r1, r1, #1 - adds r0, r0, r1 - add r0, r8 - ldr r2, _080B7068 @ =gUnknown_080E309C - lsls r1, r4, #3 - adds r1, r1, r2 - ldrh r2, [r1, #4] - ldrh r3, [r1] - str r5, [sp] - str r5, [sp, #4] - str r5, [sp, #8] - str r5, [sp, #0xc] - ldrb r1, [r1, #2] - str r1, [sp, #0x10] - str r5, [sp, #0x14] - movs r1, #1 - bl sub_80B6BB8 - adds r0, r4, #1 - lsls r0, r0, #0x18 - lsrs r4, r0, #0x18 - cmp r4, #7 - bls _080B7016 - ldr r0, _080B706C @ =gCurTask - ldr r1, [r0] - ldr r0, _080B7070 @ =Task_80B7314 - str r0, [r1, #8] - add sp, #0x24 - pop {r3, r4, r5} - mov r8, r3 - mov sb, r4 - mov sl, r5 - pop {r4, r5, r6, r7} - pop {r0} - bx r0 - .align 2, 0 -_080B7064: .4byte 0x00000282 -_080B7068: .4byte gUnknown_080E309C -_080B706C: .4byte gCurTask -_080B7070: .4byte Task_80B7314 - -.syntax divided diff --git a/src/game/sa3/special_stage.c b/src/game/sa3/special_stage.c index 804ea2e9f..528a70a7c 100644 --- a/src/game/sa3/special_stage.c +++ b/src/game/sa3/special_stage.c @@ -3565,16 +3565,13 @@ void sub_80B6CD8(u8 arg0, u8 arg1, u8 arg2, u8 arg3) } } -// (99.77%) https://decomp.me/scratch/o1LfW -NONMATCH("asm/non_matching/game/sa3/spstg__Task_80B6D78.inc", void Task_80B6D78(void)) +void Task_80B6D78(void) { s32 sp18; Sprite *s; s16 var_r5; - u8 var_r4; + u8 i; u8 var_r6; - TileInfo3 *temp_r1; - TileInfo3 *temp_r1_2; SpStage288 *strc288 = TASK_DATA(gCurTask); @@ -3592,9 +3589,8 @@ NONMATCH("asm/non_matching/game/sa3/spstg__Task_80B6D78.inc", void Task_80B6D78( if (gStageData.unkD == 0) { if (strc288->unk27E != 0) { s = &strc288->sprite4C; - temp_r1 = gUnknown_080E3074; - sub_80B6BB8(s, 1, (u16)temp_r1[strc288->unk27D].numTiles, temp_r1[strc288->unk27D].anim, 0, 0x104, 0x14, 0, - temp_r1[strc288->unk27D].variant, 0); + sub_80B6BB8(s, 1, gUnknown_080E3074[strc288->unk27D].numTiles, gUnknown_080E3074[strc288->unk27D].anim, 0, 0x104, 0x14, 0, + gUnknown_080E3074[strc288->unk27D].variant, 0); sub_80B6BB8(&strc288->sprite74, 1, 0x28U, 0x46DU, 0, 0x14A, 0x1C, 0, 1U, 0); m4aSongNumStart(MUS_SPECIAL_STAGE_RESULT_1); } else { @@ -3602,49 +3598,45 @@ NONMATCH("asm/non_matching/game/sa3/spstg__Task_80B6D78.inc", void Task_80B6D78( m4aSongNumStart(MUS_SPECIAL_STAGE_RESULT_2); } } else { - AnimId anim; + const AnimId anim = ANIM_SP_STAGE_DISCLAIMERS; var_r6 = 0; sp18 = 0; var_r5 = 0; - for (var_r4 = 0; var_r4 < 7; var_r4++) { - if (GetBit(strc288->unk27F, var_r4)) { + for (i = 0; i < 7; i++) { + if (GetBit(strc288->unk27F, i)) { var_r6 += 1; } } - if (var_r6 > 1U) { + if (var_r6 > 1) { sp18 = 1; } if (strc288->unk27E == 0) { var_r5 = -16; } - anim = ANIM_SP_STAGE_DISCLAIMERS; - var_r5 += 28; - sub_80B6BB8(&strc288->sprite74, 1, 8U, anim, 0, 0x1C, var_r5, 0, 8U, 0); - sub_80B6BB8(&strc288->spriteC4, 1, 6U, ANIM_SP_STAGE_DISCLAIMERS, 0, 0x40, var_r5, 0, var_r6, 0); - sub_80B6BB8(&strc288->sprite4C, 1, 12, ANIM_SP_STAGE_DISCLAIMERS, 0, 0x58, var_r5, 0, 9U, 0); - sub_80B6BB8(&strc288->sprite9C, 1, 22, ANIM_SP_STAGE_DISCLAIMERS, 0, 0x8C, var_r5, 0, sp18 + 10, 0); + sub_80B6BB8(&strc288->sprite74, 1, 8U, anim, 0, 0x1C, var_r5 + 28, 0, 8U, 0); + sub_80B6BB8(&strc288->spriteC4, 1, 6U, anim, 0, 0x40, var_r5 + 28, 0, var_r6, 0); + sub_80B6BB8(&strc288->sprite4C, 1, 12, anim, 0, 0x58, var_r5 + 28, 0, 9U, 0); + sub_80B6BB8(&strc288->sprite9C, 1, 22, anim, 0, 0x8C, var_r5 + 28, 0, sp18 + 10, 0); if (strc288->unk27E != 0) { m4aSongNumStart(MUS_SPECIAL_STAGE_RESULT_1); } else { - sub_80B6BB8(&strc288->spriteEC, 1, 0x14U, ANIM_SP_STAGE_DISCLAIMERS, 0, 0x24, 0x8C, 0, 0xCU, 0); - sub_80B6BB8(&strc288->sprite114, 1, 8U, ANIM_SP_STAGE_DISCLAIMERS, 0, 0xAC, 0x8C, 0, 0xEU, 0); + sub_80B6BB8(&strc288->spriteEC, 1, 0x14U, anim, 0, 0x24, 0x8C, 0, 0xCU, 0); + sub_80B6BB8(&strc288->sprite114, 1, 8U, anim, 0, 0xAC, 0x8C, 0, 0xEU, 0); strc288->unk282 = 0; m4aSongNumStart(MUS_SPECIAL_STAGE_RESULT_2); } } - for (var_r4 = 0; var_r4 < ARRAY_COUNT(gUnknown_080E309C); var_r4++) { - Sprite *s = &strc288->sprites13C[var_r4]; - temp_r1_2 = gUnknown_080E309C; - sub_80B6BB8(s, 1, (u16)temp_r1_2[var_r4].numTiles, temp_r1_2[var_r4].anim, 0, 0, 0, 0, temp_r1_2[var_r4].variant, 0); + for (i = 0; i < ARRAY_COUNT(gUnknown_080E309C); i++) { + Sprite *s = &strc288->sprites13C[i]; + sub_80B6BB8(s, 1, gUnknown_080E309C[i].numTiles, gUnknown_080E309C[i].anim, 0, 0, 0, 0, gUnknown_080E309C[i].variant, 0); } gCurTask->main = Task_80B7314; } -END_NONMATCH // (94.71%) https://decomp.me/scratch/z7ukN NONMATCH("asm/non_matching/game/sa3/spstg__sub_80B7074.inc", void sub_80B7074(void))