diff options
| -rw-r--r-- | asm/contest_link_80C857C.s | 210 | ||||
| -rw-r--r-- | src/battle/contest_link_80C857C.c | 68 |
2 files changed, 68 insertions, 210 deletions
diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index e73efe74d..6dc96e85d 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,216 +5,6 @@ .text -.ifdef ENGLISH - thumb_func_start sub_80C8938 -sub_80C8938: @ 80C8938 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, _080C8968 @ =gTasks - mov r8, r0 - lsls r6, r5, 2 - adds r0, r6, r5 - lsls r7, r0, 3 - mov r1, r8 - adds r4, r7, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C896C - cmp r0, 0x1 - beq _080C8998 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C89CE - .align 2, 0 -_080C8968: .4byte gTasks -_080C896C: - ldr r1, _080C8994 @ =gBlockSendBuffer - ldrh r0, [r4, 0x1A] - strb r0, [r1] - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C898C - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C89CE - movs r0, 0x2 - bl sub_8007E9C -_080C898C: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C89CE - .align 2, 0 -_080C8994: .4byte gBlockSendBuffer -_080C8998: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C89CE - movs r3, 0 - mov r12, r8 - adds r1, r6, 0 - ldr r4, _080C89D8 @ =gBlockRecvBuffer - mov r0, r12 - adds r0, 0xA - adds r2, r7, r0 - movs r6, 0x80 - lsls r6, 1 -_080C89B4: - ldrh r0, [r4] - strh r0, [r2] - adds r4, r6 - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C89B4 - adds r1, r5 - lsls r1, 3 - add r1, r12 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_080C89CE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C89D8: .4byte gBlockRecvBuffer - thumb_func_end sub_80C8938 -.else - thumb_func_start sub_80C8938 -sub_80C8938: @ 80C8938 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080C8960 @ =gTasks - lsls r5, r4, 2 - adds r0, r5, r4 - lsls r6, r0, 3 - adds r2, r6, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - mov r8, r1 - cmp r0, 0x1 - beq _080C89C4 - cmp r0, 0x1 - bgt _080C8964 - cmp r0, 0 - beq _080C896C - b _080C8A0C - .align 2, 0 -_080C8960: .4byte gTasks -_080C8964: - cmp r0, 0x2 - beq _080C8A00 - cmp r0, 0x8 - bne _080C8A0C -_080C896C: - ldr r1, _080C89A0 @ =gBlockSendBuffer - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - mov r2, r8 - adds r4, r0, r2 - ldrh r0, [r4, 0x1A] - strb r0, [r1] - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C89B6 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8A1A - movs r3, 0x8 - ldrsh r0, [r4, r3] - cmp r0, 0 - bne _080C89A4 - movs r0, 0x3 - strh r0, [r4, 0x8] - b _080C8A1A - .align 2, 0 -_080C89A0: .4byte gBlockSendBuffer -_080C89A4: - movs r0, 0x1 - bl de_sub_80C9274 - movs r0, 0x2 - bl sub_8007E9C - movs r0, 0x1 - strh r0, [r4, 0x8] - b _080C8A1A -_080C89B6: - movs r0, 0x1 - bl de_sub_80C9294 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C8A1A -_080C89C4: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8A1A - movs r3, 0 - adds r7, r5, 0 - ldr r1, _080C89FC @ =gBlockRecvBuffer - mov r0, r8 - adds r0, 0xA - adds r2, r6, r0 - movs r5, 0x80 - lsls r5, 1 -_080C89DE: - ldrh r0, [r1] - strh r0, [r2] - adds r1, r5 - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C89DE - adds r1, r7, r4 - lsls r1, 3 - add r1, r8 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C8A1A - .align 2, 0 -_080C89FC: .4byte gBlockRecvBuffer -_080C8A00: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc - b _080C8A1A -_080C8A0C: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - add r0, r8 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] -_080C8A1A: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8938 -.endif - thumb_func_start sub_80C89DC sub_80C89DC: @ 80C89DC push {r4,lr} diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 937193172..17b82388c 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -330,6 +330,74 @@ void sub_80C88AC(u8 taskId) } } +void sub_80C8938(u8 taskId) +{ + int i; + + switch (gTasks[taskId].data[0]) + { +#if ENGLISH + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; +#elif GERMAN + case 8: +#endif + case 0: + gBlockSendBuffer[0] = gTasks[taskId].data[9]; + if (GetMultiplayerId() == 0) + { + if (sub_8007ECC()) + { +#if GERMAN + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[0] = 3; + } + else + { + de_sub_80C9274(TRUE); +#endif + sub_8007E9C(2); +#if ENGLISH + gTasks[taskId].data[0]++; +#elif GERMAN + gTasks[taskId].data[0] = 1; + } +#endif + } + } + else + { +#if GERMAN + de_sub_80C9294(TRUE); +#endif + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + for (i = 0; i < MAX_LINK_PLAYERS; i++) + { + gTasks[taskId].data[i + 1] = gBlockRecvBuffer[i][0]; + } + gTasks[taskId].data[0]++; + } + break; +#if GERMAN + case 2: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + default: + gTasks[taskId].data[0]++; + break; +#endif + } +} + asm(".section .text_de"); #if GERMAN |