diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-14 12:50:49 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-14 14:57:41 -0500 |
commit | 5ef7bf7bf4208f806214c781a2367d4129732461 (patch) | |
tree | a6ff5a05096f01b7f3825812c5c89d98e0bc04ba | |
parent | 0d5f88f49696d695aa934c76c500ffff4db36f4a (diff) |
data/link_rfu.s --> data/easy_chat_2.s
-rw-r--r-- | asm/link_rfu_4.s | 1001 | ||||
-rw-r--r-- | data/easy_chat_2.s (renamed from data/link_rfu.s) | 0 | ||||
-rw-r--r-- | data/link_rfu_4.s | 124 | ||||
-rw-r--r-- | include/link_rfu.h | 29 | ||||
-rw-r--r-- | ld_script.txt | 5 | ||||
-rw-r--r-- | src/link.c | 2 | ||||
-rw-r--r-- | src/link_rfu.c | 2 | ||||
-rw-r--r-- | src/link_rfu_2.c | 91 | ||||
-rw-r--r-- | src/link_rfu_4.c | 596 | ||||
-rw-r--r-- | sym_bss.txt | 6 |
10 files changed, 681 insertions, 1175 deletions
diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index 7d3d3ca7a..ab67ce135 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -5,979 +5,6 @@ .text - thumb_func_start sub_80FC478 -sub_80FC478: @ 80FC478 - push {r4,r5,lr} - adds r3, r0, 0 - movs r0, 0 - movs r4, 0 - movs r5, 0x46 -_080FC482: - adds r2, r0, 0x1 - movs r1, 0x45 - muls r0, r5 - adds r0, r3 - adds r0, 0x45 -_080FC48C: - strb r4, [r0] - subs r0, 0x1 - subs r1, 0x1 - cmp r1, 0 - bge _080FC48C - adds r0, r2, 0 - cmp r0, 0x13 - ble _080FC482 - movs r1, 0 - ldr r2, _080FC4C8 @ =0x00000579 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - movs r2, 0xAF - lsls r2, 3 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - ldr r2, _080FC4CC @ =0x0000057a - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - ldr r2, _080FC4D0 @ =0x0000057b - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080FC4C8: .4byte 0x00000579 -_080FC4CC: .4byte 0x0000057a -_080FC4D0: .4byte 0x0000057b - thumb_func_end sub_80FC478 - - thumb_func_start sub_80FC4D4 -sub_80FC4D4: @ 80FC4D4 - push {r4,lr} - adds r3, r0, 0 - movs r1, 0 - movs r4, 0 -_080FC4DC: - lsls r0, r1, 3 - adds r2, r1, 0x1 - subs r0, r1 - movs r1, 0xD - lsls r0, 1 - adds r0, r3 - adds r0, 0xD -_080FC4EA: - strb r4, [r0] - subs r0, 0x1 - subs r1, 0x1 - cmp r1, 0 - bge _080FC4EA - adds r1, r2, 0 - cmp r1, 0x27 - ble _080FC4DC - movs r1, 0 - ldr r2, _080FC524 @ =0x00000231 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - movs r2, 0x8C - lsls r2, 2 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - ldr r2, _080FC528 @ =0x00000232 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - ldr r2, _080FC52C @ =0x00000233 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080FC524: .4byte 0x00000231 -_080FC528: .4byte 0x00000232 -_080FC52C: .4byte 0x00000233 - thumb_func_end sub_80FC4D4 - - thumb_func_start sub_80FC530 -sub_80FC530: @ 80FC530 - push {r4,lr} - adds r3, r0, 0 - movs r1, 0 - movs r4, 0 -_080FC538: - lsls r0, r1, 8 - adds r2, r1, 0x1 - movs r1, 0xFF - adds r0, r3 - adds r0, 0xFF -_080FC542: - strb r4, [r0] - subs r0, 0x1 - subs r1, 0x1 - cmp r1, 0 - bge _080FC542 - adds r1, r2, 0 - cmp r1, 0x1 - ble _080FC538 - movs r1, 0 - ldr r2, _080FC57C @ =0x00000201 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - movs r2, 0x80 - lsls r2, 2 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - ldr r2, _080FC580 @ =0x00000202 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - ldr r2, _080FC584 @ =0x00000203 - adds r0, r3, r2 - ldrb r2, [r0] - strb r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080FC57C: .4byte 0x00000201 -_080FC580: .4byte 0x00000202 -_080FC584: .4byte 0x00000203 - thumb_func_end sub_80FC530 - - thumb_func_start sub_80FC588 -sub_80FC588: @ 80FC588 - push {r4-r7,lr} - adds r5, r0, 0 - adds r6, r1, 0 - ldr r1, _080FC620 @ =0x0000057a - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0x13 - bhi _080FC628 - ldr r0, _080FC624 @ =0x04000208 - ldrh r1, [r0] - adds r7, r1, 0 - movs r1, 0 - strh r1, [r0] - movs r3, 0 - movs r2, 0 -_080FC5A6: - adds r1, r6, r2 - ldrb r0, [r1] - cmp r0, 0 - bne _080FC5BA - ldrb r0, [r1, 0x1] - cmp r0, 0 - bne _080FC5BA - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 -_080FC5BA: - adds r2, 0xE - cmp r2, 0x45 - ble _080FC5A6 - cmp r3, 0x5 - beq _080FC618 - movs r2, 0 - movs r0, 0xAF - lsls r0, 3 - adds r3, r5, r0 - movs r4, 0x46 -_080FC5CE: - ldrb r0, [r3] - adds r1, r0, 0 - muls r1, r4 - adds r1, r2, r1 - adds r1, r5, r1 - adds r0, r6, r2 - ldrb r0, [r0] - strb r0, [r1] - adds r2, 0x1 - cmp r2, 0x45 - ble _080FC5CE - movs r1, 0xAF - lsls r1, 3 - adds r4, r5, r1 - ldrb r0, [r4] - adds r0, 0x1 - ldrb r1, [r4] - strb r0, [r4] - ldrb r0, [r4] - movs r1, 0x14 - bl __umodsi3 - ldrb r1, [r4] - strb r0, [r4] - ldr r0, _080FC620 @ =0x0000057a - adds r1, r5, r0 - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r1, 0 - adds r0, r6, 0 - adds r0, 0x45 -_080FC610: - strb r1, [r0] - subs r0, 0x1 - cmp r0, r6 - bge _080FC610 -_080FC618: - ldr r0, _080FC624 @ =0x04000208 - strh r7, [r0] - b _080FC632 - .align 2, 0 -_080FC620: .4byte 0x0000057a -_080FC624: .4byte 0x04000208 -_080FC628: - ldr r1, _080FC638 @ =0x0000057b - adds r0, r5, r1 - ldrb r1, [r0] - movs r1, 0x1 - strb r1, [r0] -_080FC632: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FC638: .4byte 0x0000057b - thumb_func_end sub_80FC588 - - thumb_func_start sub_80FC63C -sub_80FC63C: @ 80FC63C - push {r4-r7,lr} - adds r6, r0, 0 - adds r5, r1, 0 - ldr r1, _080FC6CC @ =0x00000232 - adds r0, r6, r1 - ldrb r0, [r0] - cmp r0, 0x27 - bhi _080FC6D4 - ldr r1, _080FC6D0 @ =0x04000208 - ldrh r0, [r1] - adds r7, r0, 0 - movs r0, 0 - strh r0, [r1] - movs r2, 0 - ldrb r0, [r5] - cmp r0, 0 - bne _080FC66C -_080FC65E: - adds r2, 0x1 - cmp r2, 0xD - bgt _080FC66C - adds r0, r5, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080FC65E -_080FC66C: - cmp r2, 0xE - beq _080FC6C4 - movs r2, 0 - movs r0, 0x8C - lsls r0, 2 - adds r3, r6, r0 -_080FC678: - ldrb r1, [r3] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 1 - adds r0, r2, r0 - adds r0, r6, r0 - adds r1, r5, r2 - ldrb r1, [r1] - strb r1, [r0] - adds r2, 0x1 - cmp r2, 0xD - ble _080FC678 - movs r1, 0x8C - lsls r1, 2 - adds r4, r6, r1 - ldrb r0, [r4] - adds r0, 0x1 - ldrb r1, [r4] - strb r0, [r4] - ldrb r0, [r4] - movs r1, 0x28 - bl __umodsi3 - ldrb r1, [r4] - strb r0, [r4] - ldr r0, _080FC6CC @ =0x00000232 - adds r1, r6, r0 - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r1, 0 - adds r0, r5, 0 - adds r0, 0xD -_080FC6BC: - strb r1, [r0] - subs r0, 0x1 - cmp r0, r5 - bge _080FC6BC -_080FC6C4: - ldr r0, _080FC6D0 @ =0x04000208 - strh r7, [r0] - b _080FC6DE - .align 2, 0 -_080FC6CC: .4byte 0x00000232 -_080FC6D0: .4byte 0x04000208 -_080FC6D4: - ldr r1, _080FC6E4 @ =0x00000233 - adds r0, r6, r1 - ldrb r1, [r0] - movs r1, 0x1 - strb r1, [r0] -_080FC6DE: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FC6E4: .4byte 0x00000233 - thumb_func_end sub_80FC63C - - thumb_func_start sub_80FC6E8 -sub_80FC6E8: @ 80FC6E8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - adds r3, r1, 0 - ldr r1, _080FC730 @ =0x04000208 - ldrh r0, [r1] - mov r8, r0 - movs r0, 0 - strh r0, [r1] - movs r1, 0xAF - lsls r1, 3 - adds r0, r5, r1 - ldr r7, _080FC734 @ =0x00000579 - adds r4, r5, r7 - ldrb r1, [r0] - ldrb r0, [r4] - cmp r1, r0 - beq _080FC718 - ldr r1, _080FC738 @ =0x0000057b - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080FC73C -_080FC718: - movs r1, 0 - adds r0, r3, 0 - adds r0, 0x45 -_080FC71E: - strb r1, [r0] - subs r0, 0x1 - cmp r0, r3 - bge _080FC71E - ldr r0, _080FC730 @ =0x04000208 - mov r7, r8 - strh r7, [r0] - movs r0, 0 - b _080FC784 - .align 2, 0 -_080FC730: .4byte 0x04000208 -_080FC734: .4byte 0x00000579 -_080FC738: .4byte 0x0000057b -_080FC73C: - movs r2, 0 - movs r6, 0x46 -_080FC740: - adds r1, r3, r2 - ldrb r0, [r4] - adds r7, r0, 0 - muls r7, r6 - adds r0, r7, 0 - adds r0, r2, r0 - adds r0, r5, r0 - ldrb r0, [r0] - strb r0, [r1] - adds r2, 0x1 - cmp r2, 0x45 - ble _080FC740 - ldr r0, _080FC790 @ =0x00000579 - adds r4, r5, r0 - ldrb r0, [r4] - adds r0, 0x1 - ldrb r1, [r4] - strb r0, [r4] - ldrb r0, [r4] - movs r1, 0x14 - bl __umodsi3 - ldrb r1, [r4] - strb r0, [r4] - ldr r7, _080FC794 @ =0x0000057a - adds r1, r5, r7 - ldrb r0, [r1] - subs r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - ldr r0, _080FC798 @ =0x04000208 - mov r1, r8 - strh r1, [r0] - movs r0, 0x1 -_080FC784: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080FC790: .4byte 0x00000579 -_080FC794: .4byte 0x0000057a -_080FC798: .4byte 0x04000208 - thumb_func_end sub_80FC6E8 - - thumb_func_start sub_80FC79C -sub_80FC79C: @ 80FC79C - push {r4-r7,lr} - adds r5, r0, 0 - adds r6, r1, 0 - movs r1, 0x8C - lsls r1, 2 - adds r0, r5, r1 - adds r1, 0x1 - adds r4, r5, r1 - ldrb r1, [r0] - ldrb r0, [r4] - cmp r1, r0 - beq _080FC7C0 - ldr r1, _080FC7C4 @ =0x00000233 - adds r0, r5, r1 - ldrb r0, [r0] - adds r2, r0, 0 - cmp r2, 0 - beq _080FC7C8 -_080FC7C0: - movs r0, 0 - b _080FC814 - .align 2, 0 -_080FC7C4: .4byte 0x00000233 -_080FC7C8: - ldr r1, _080FC81C @ =0x04000208 - ldrh r0, [r1] - adds r7, r0, 0 - strh r2, [r1] - movs r3, 0 -_080FC7D2: - adds r2, r6, r3 - ldrb r1, [r4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 1 - adds r0, r3, r0 - adds r0, r5, r0 - ldrb r0, [r0] - strb r0, [r2] - adds r3, 0x1 - cmp r3, 0xD - ble _080FC7D2 - ldr r0, _080FC820 @ =0x00000231 - adds r4, r5, r0 - ldrb r0, [r4] - adds r0, 0x1 - ldrb r1, [r4] - strb r0, [r4] - ldrb r0, [r4] - movs r1, 0x28 - bl __umodsi3 - ldrb r1, [r4] - strb r0, [r4] - ldr r0, _080FC824 @ =0x00000232 - adds r1, r5, r0 - ldrb r0, [r1] - subs r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - ldr r0, _080FC81C @ =0x04000208 - strh r7, [r0] - movs r0, 0x1 -_080FC814: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080FC81C: .4byte 0x04000208 -_080FC820: .4byte 0x00000231 -_080FC824: .4byte 0x00000232 - thumb_func_end sub_80FC79C - - thumb_func_start sub_80FC828 -sub_80FC828: @ 80FC828 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - ldrb r0, [r4, 0x1] - cmp r0, 0 - bne _080FC83E - adds r0, r2, 0 - movs r1, 0 - bl sub_80FC888 - b _080FC880 -_080FC83E: - movs r3, 0 -_080FC840: - ldrb r1, [r2, 0x1C] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 1 - adds r0, r3, r0 - adds r0, r2, r0 - adds r1, r4, r3 - ldrb r1, [r1] - strb r1, [r0] - adds r3, 0x1 - cmp r3, 0xD - ble _080FC840 - ldrb r0, [r2, 0x1C] - adds r0, 0x1 - ldrb r1, [r2, 0x1C] - strb r0, [r2, 0x1C] - ldrb r1, [r2, 0x1C] - movs r0, 0x1 - ands r0, r1 - ldrb r1, [r2, 0x1C] - strb r0, [r2, 0x1C] - ldrb r0, [r2, 0x1E] - cmp r0, 0x1 - bhi _080FC87A - ldrb r0, [r2, 0x1E] - adds r0, 0x1 - ldrb r1, [r2, 0x1E] - strb r0, [r2, 0x1E] - b _080FC880 -_080FC87A: - ldrb r0, [r2, 0x1C] - ldrb r1, [r2, 0x1D] - strb r0, [r2, 0x1D] -_080FC880: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FC828 - - thumb_func_start sub_80FC888 -sub_80FC888: @ 80FC888 - push {r4,r5,lr} - adds r3, r0, 0 - adds r5, r1, 0 - ldrb r0, [r3, 0x1E] - cmp r0, 0 - bne _080FC898 - movs r0, 0 - b _080FC8D2 -_080FC898: - cmp r5, 0 - beq _080FC8B6 - movs r4, 0 -_080FC89E: - adds r2, r5, r4 - ldrb r1, [r3, 0x1D] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 1 - adds r0, r4, r0 - adds r0, r3, r0 - ldrb r0, [r0] - strb r0, [r2] - adds r4, 0x1 - cmp r4, 0xD - ble _080FC89E -_080FC8B6: - ldrb r0, [r3, 0x1D] - adds r0, 0x1 - ldrb r1, [r3, 0x1D] - strb r0, [r3, 0x1D] - ldrb r1, [r3, 0x1D] - movs r0, 0x1 - ands r0, r1 - ldrb r1, [r3, 0x1D] - strb r0, [r3, 0x1D] - ldrb r0, [r3, 0x1E] - subs r0, 0x1 - ldrb r1, [r3, 0x1E] - strb r0, [r3, 0x1E] - movs r0, 0x1 -_080FC8D2: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80FC888 - - thumb_func_start sub_80FC8D8 -sub_80FC8D8: @ 80FC8D8 - push {r4,r5,lr} - adds r3, r0, 0 - adds r5, r1, 0 - ldr r1, _080FC92C @ =0x00000202 - adds r0, r3, r1 - ldrb r0, [r0] - cmp r0, 0x1 - bhi _080FC930 - movs r2, 0 - movs r0, 0x80 - lsls r0, 2 - adds r4, r3, r0 -_080FC8F0: - ldrb r0, [r4] - lsls r0, 8 - adds r0, r2, r0 - adds r0, r3, r0 - adds r1, r5, r2 - ldrb r1, [r1] - strb r1, [r0] - adds r2, 0x1 - cmp r2, 0xFF - ble _080FC8F0 - movs r0, 0x80 - lsls r0, 2 - adds r1, r3, r0 - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - ldrb r2, [r1] - movs r0, 0x1 - ands r0, r2 - ldrb r2, [r1] - strb r0, [r1] - ldr r0, _080FC92C @ =0x00000202 - adds r1, r3, r0 - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - b _080FC93A - .align 2, 0 -_080FC92C: .4byte 0x00000202 -_080FC930: - ldr r1, _080FC940 @ =0x00000203 - adds r0, r3, r1 - ldrb r1, [r0] - movs r1, 0x1 - strb r1, [r0] -_080FC93A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080FC940: .4byte 0x00000203 - thumb_func_end sub_80FC8D8 - - thumb_func_start sub_80FC944 -sub_80FC944: @ 80FC944 - push {r4,r5,lr} - adds r3, r0, 0 - adds r5, r1, 0 - movs r1, 0x80 - lsls r1, 2 - adds r0, r3, r1 - adds r1, 0x1 - adds r4, r3, r1 - ldrb r1, [r0] - ldrb r0, [r4] - cmp r1, r0 - beq _080FC966 - ldr r1, _080FC96C @ =0x00000203 - adds r0, r3, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080FC970 -_080FC966: - movs r0, 0 - b _080FC9AA - .align 2, 0 -_080FC96C: .4byte 0x00000203 -_080FC970: - movs r2, 0 -_080FC972: - adds r0, r5, r2 - ldrb r1, [r4] - lsls r1, 8 - adds r1, r2, r1 - adds r1, r3, r1 - ldrb r1, [r1] - strb r1, [r0] - adds r2, 0x1 - cmp r2, 0xFF - ble _080FC972 - ldr r0, _080FC9B0 @ =0x00000201 - adds r1, r3, r0 - ldrb r0, [r1] - adds r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - ldrb r2, [r1] - movs r0, 0x1 - ands r0, r2 - ldrb r2, [r1] - strb r0, [r1] - ldr r0, _080FC9B4 @ =0x00000202 - adds r1, r3, r0 - ldrb r0, [r1] - subs r0, 0x1 - ldrb r2, [r1] - strb r0, [r1] - movs r0, 0x1 -_080FC9AA: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080FC9B0: .4byte 0x00000201 -_080FC9B4: .4byte 0x00000202 - thumb_func_end sub_80FC944 - - thumb_func_start sub_80FC9B8 -sub_80FC9B8: @ 80FC9B8 - push {r4-r7,lr} - adds r6, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r1, 0 - movs r5, 0 - cmp r1, 0x1 - beq _080FC9F6 - cmp r1, 0x1 - bgt _080FC9D2 - cmp r1, 0 - beq _080FC9DC - b _080FCA6A -_080FC9D2: - cmp r0, 0x2 - beq _080FCA16 - cmp r0, 0x3 - beq _080FCA36 - b _080FCA6A -_080FC9DC: - movs r4, 0 -_080FC9DE: - adds r0, r6, r4 - adds r1, r4, 0x1 - strb r1, [r0] - lsls r0, r5, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - adds r4, r1, 0 - cmp r4, 0xC7 - ble _080FC9DE - b _080FCA30 -_080FC9F6: - movs r4, 0 - adds r2, r6, 0 - adds r2, 0xC8 -_080FC9FC: - adds r0, r6, r4 - adds r1, r4, 0x1 - strb r1, [r0] - lsls r0, r5, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - adds r4, r1, 0 - cmp r4, 0x63 - ble _080FC9FC - strh r5, [r2] - b _080FCA6A -_080FCA16: - movs r4, 0 -_080FCA18: - bl Random - lsls r0, 24 - lsrs r0, 24 - adds r1, r6, r4 - strb r0, [r1] - adds r0, r5, r0 - lsls r0, 16 - lsrs r5, r0, 16 - adds r4, 0x1 - cmp r4, 0xC7 - ble _080FCA18 -_080FCA30: - adds r0, r6, r4 - strh r5, [r0] - b _080FCA6A -_080FCA36: - movs r4, 0 - ldr r3, _080FCA70 @ =gUnknown_3002018 - ldrb r1, [r3] - ldrb r0, [r3] - adds r7, r0, 0x1 - adds r2, r1, 0x1 - movs r0, 0xFF - mov r12, r0 -_080FCA46: - adds r0, r6, r4 - adds r1, r4, 0x1 - strb r2, [r0] - adds r0, r4, r7 - mov r4, r12 - ands r0, r4 - adds r0, r5, r0 - lsls r0, 16 - lsrs r5, r0, 16 - adds r2, 0x1 - adds r4, r1, 0 - cmp r1, 0xC7 - ble _080FCA46 - adds r0, r6, r1 - strh r5, [r0] - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] -_080FCA6A: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCA70: .4byte gUnknown_3002018 - thumb_func_end sub_80FC9B8 - - thumb_func_start sub_80FCA74 -sub_80FCA74: @ 80FCA74 - push {r4,r5,lr} - adds r4, r0, 0 - movs r3, 0 - ldrb r0, [r1] - cmp r0, 0xFF - beq _080FCA98 - ldr r5, _080FCAA4 @ =gUnknown_843F104 - adds r2, r1, 0 -_080FCA84: - adds r1, r4, r3 - ldrb r0, [r2] - adds r0, r5 - ldrb r0, [r0] - strb r0, [r1] - adds r2, 0x1 - adds r3, 0x1 - ldrb r0, [r2] - cmp r0, 0xFF - bne _080FCA84 -_080FCA98: - adds r1, r4, r3 - movs r0, 0 - strb r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080FCAA4: .4byte gUnknown_843F104 - thumb_func_end sub_80FCA74 - - thumb_func_start sub_80FCAA8 -sub_80FCAA8: @ 80FCAA8 - push {r4,r5,lr} - adds r4, r0, 0 - movs r3, 0 - ldrb r0, [r1] - cmp r0, 0 - beq _080FCACC - ldr r5, _080FCAD8 @ =gUnknown_843F004 - adds r2, r1, 0 -_080FCAB8: - adds r1, r4, r3 - ldrb r0, [r2] - adds r0, r5 - ldrb r0, [r0] - strb r0, [r1] - adds r2, 0x1 - adds r3, 0x1 - ldrb r0, [r2] - cmp r0, 0 - bne _080FCAB8 -_080FCACC: - adds r1, r4, r3 - movs r0, 0xFF - strb r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080FCAD8: .4byte gUnknown_843F004 - thumb_func_end sub_80FCAA8 - - thumb_func_start sub_80FCADC -sub_80FCADC: @ 80FCADC - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r6, 0 - ldr r0, _080FCB04 @ =gRfuLinkStatus - ldr r4, [r0] - ldrb r2, [r4, 0x2] - ldrb r1, [r4] - adds r7, r0, 0 - cmp r1, 0x1 - bne _080FCB32 - movs r3, 0 - ands r1, r2 - cmp r1, 0 - beq _080FCB0E - cmp r5, 0x1 - bne _080FCB08 - ldrb r0, [r4, 0xA] - b _080FCB4C - .align 2, 0 -_080FCB04: .4byte gRfuLinkStatus -_080FCB08: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 -_080FCB0E: - lsrs r2, 1 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3 - bhi _080FCB4A - movs r0, 0x1 - ands r0, r2 - cmp r0, 0 - beq _080FCB0E - adds r0, r6, 0x1 - cmp r5, r0 - bne _080FCB08 -_080FCB28: - ldr r0, [r7] - adds r0, 0xA - adds r0, r3 - ldrb r0, [r0] - b _080FCB4C -_080FCB32: - movs r3, 0 - movs r1, 0x1 -_080FCB36: - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _080FCB28 - lsrs r2, 1 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3 - bls _080FCB36 -_080FCB4A: - movs r0, 0 -_080FCB4C: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80FCADC - thumb_func_start sub_80FCB54 sub_80FCB54: @ 80FCB54 push {r4-r7,lr} @@ -1276,7 +303,7 @@ _080FCD8A: ldrb r0, [r0] cmp r0, 0x1 bne _080FCDE4 - ldr r0, _080FCDD0 @ =gUnknown_843F284 + ldr r0, _080FCDD0 @ =sWirelessStatusIndicatorSpriteTemplate adds r1, r3, 0 movs r3, 0 bl CreateSprite @@ -1290,7 +317,7 @@ _080FCD8A: adds r4, r0 ldr r0, _080FCDD8 @ =0x00001234 strh r0, [r4, 0x3C] - ldr r0, _080FCDDC @ =gUnknown_843F274 + ldr r0, _080FCDDC @ =sWirelessStatusIndicatorSpriteSheet ldrh r0, [r0, 0x6] bl GetSpriteTileStartByTag strh r0, [r4, 0x3A] @@ -1304,13 +331,13 @@ _080FCD8A: b _080FCE2A .align 2, 0 _080FCDCC: .4byte gRfuLinkStatus -_080FCDD0: .4byte gUnknown_843F284 +_080FCDD0: .4byte sWirelessStatusIndicatorSpriteTemplate _080FCDD4: .4byte gSprites _080FCDD8: .4byte 0x00001234 -_080FCDDC: .4byte gUnknown_843F274 +_080FCDDC: .4byte sWirelessStatusIndicatorSpriteSheet _080FCDE0: .4byte gUnknown_203ACE4 _080FCDE4: - ldr r0, _080FCE30 @ =gUnknown_843F284 + ldr r0, _080FCE30 @ =sWirelessStatusIndicatorSpriteTemplate adds r1, r3, 0 movs r3, 0 bl CreateSprite @@ -1324,7 +351,7 @@ _080FCDE4: adds r0, r5 ldr r1, _080FCE3C @ =0x00001234 strh r1, [r0, 0x3C] - ldr r0, _080FCE40 @ =gUnknown_843F274 + ldr r0, _080FCE40 @ =sWirelessStatusIndicatorSpriteSheet ldrh r0, [r0, 0x6] bl GetSpriteTileStartByTag ldrb r2, [r4] @@ -1348,11 +375,11 @@ _080FCE2A: pop {r0} bx r0 .align 2, 0 -_080FCE30: .4byte gUnknown_843F284 +_080FCE30: .4byte sWirelessStatusIndicatorSpriteTemplate _080FCE34: .4byte gUnknown_203ACE4 _080FCE38: .4byte gSprites _080FCE3C: .4byte 0x00001234 -_080FCE40: .4byte gUnknown_843F274 +_080FCE40: .4byte sWirelessStatusIndicatorSpriteSheet thumb_func_end CreateWirelessStatusIndicatorSprite thumb_func_start DestroyWirelessStatusIndicatorSprite @@ -1406,7 +433,7 @@ _080FCEA4: .4byte 0x070003e8 thumb_func_start LoadWirelessStatusIndicatorSpriteGfx LoadWirelessStatusIndicatorSpriteGfx: @ 80FCEA8 push {r4,lr} - ldr r4, _080FCED4 @ =gUnknown_843F274 + ldr r4, _080FCED4 @ =sWirelessStatusIndicatorSpriteSheet ldrh r0, [r4, 0x6] bl GetSpriteTileStartByTag lsls r0, 16 @@ -1416,7 +443,7 @@ LoadWirelessStatusIndicatorSpriteGfx: @ 80FCEA8 adds r0, r4, 0 bl LoadCompressedSpriteSheet _080FCEC0: - ldr r0, _080FCEDC @ =gUnknown_843F27C + ldr r0, _080FCEDC @ =sWirelessStatusIndicatorSpritePalette bl LoadSpritePalette ldr r1, _080FCEE0 @ =gUnknown_203ACE4 movs r0, 0xFF @@ -1425,9 +452,9 @@ _080FCEC0: pop {r0} bx r0 .align 2, 0 -_080FCED4: .4byte gUnknown_843F274 +_080FCED4: .4byte sWirelessStatusIndicatorSpriteSheet _080FCED8: .4byte 0xffff0000 -_080FCEDC: .4byte gUnknown_843F27C +_080FCEDC: .4byte sWirelessStatusIndicatorSpritePalette _080FCEE0: .4byte gUnknown_203ACE4 thumb_func_end LoadWirelessStatusIndicatorSpriteGfx @@ -1653,7 +680,7 @@ _080FD072: movs r1, 0x84 lsls r1, 3 adds r0, r4, r1 - ldr r1, _080FD114 @ =gUnknown_843F204 + ldr r1, _080FD114 @ =sWirelessStatusIndicatorOamData ldr r2, [r1, 0x4] ldr r1, [r1] str r1, [r0] @@ -1728,7 +755,7 @@ _080FD106: bx r0 .align 2, 0 _080FD110: .4byte gMain -_080FD114: .4byte gUnknown_843F204 +_080FD114: .4byte sWirelessStatusIndicatorOamData _080FD118: .4byte 0x00000422 _080FD11C: .4byte 0x000001ff _080FD120: .4byte 0xfffffe00 diff --git a/data/link_rfu.s b/data/easy_chat_2.s index 79be01714..79be01714 100644 --- a/data/link_rfu.s +++ b/data/easy_chat_2.s diff --git a/data/link_rfu_4.s b/data/link_rfu_4.s index da3b341dc..a6e9accb7 100644 --- a/data/link_rfu_4.s +++ b/data/link_rfu_4.s @@ -2,127 +2,3 @@ .include "constants/constants.inc" .section .rodata .align 2, 0 - -gUnknown_843EEC0:: - .incbin "graphics/interface/wireless_link_icon.gbapal" - -gUnknown_843EEE0:: - .incbin "graphics/interface/wireless_link_icon.4bpp.lz" - -gUnknown_843F004:: @ 843F004 - .byte 0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37 - .byte 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f - .byte 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47 - .byte 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f - .byte 0x00, 0xab, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0xb2, 0xf1, 0x00, 0xae, 0xad, 0xba - .byte 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8 - .byte 0xa9, 0xaa, 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f - .byte 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1 - .byte 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9 - .byte 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1 - .byte 0xd2, 0xd3, 0xd4, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6 - .byte 0x00, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb - .byte 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3 - .byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb - .byte 0xec, 0xed, 0xee, 0x2d, 0x2f, 0x30, 0x31, 0x32 - .byte 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02 - .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a - .byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 - .byte 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a - .byte 0x1b, 0xad, 0xb3, 0xb4, 0x00, 0xaf, 0x7d, 0x7f - .byte 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0xa0 - .byte 0xae, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57 - .byte 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f - .byte 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67 - .byte 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f - .byte 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77 - .byte 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7e, 0xb0, 0xac - .byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23 - .byte 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b - .byte 0x2c, 0x2e, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c - .byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94 - -gUnknown_843F104:: @ 843F104 - .byte 0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c - .byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94 - .byte 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c - .byte 0x9d, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3 - .byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb - .byte 0xec, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c - .byte 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07 - .byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 - .byte 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f - .byte 0x84, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7 - .byte 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf - .byte 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 - .byte 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf - .byte 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7 - .byte 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7 - .byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2 - .byte 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa - .byte 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03 - .byte 0x04, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f - .byte 0xaf, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 - .byte 0x37, 0x38, 0x39, 0x21, 0xdf, 0xa1, 0xb0, 0xa5 - .byte 0xde, 0x24, 0x2a, 0xa2, 0xa3, 0x22, 0x23, 0x20 - .byte 0xa4, 0x20, 0x2f, 0x41, 0x42, 0x43, 0x44, 0x45 - .byte 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d - .byte 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55 - .byte 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63 - .byte 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b - .byte 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73 - .byte 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20 - .byte 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20 - .byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 - -gUnknown_843F204:: @ 843F204 - .4byte 0x40000000, 0x00000000 - -gAnimCmd_843F20C:: - obj_image_anim_frame 0x0004, 5 - obj_image_anim_frame 0x0008, 5 - obj_image_anim_frame 0x000c, 5 - obj_image_anim_frame 0x0010, 10 - obj_image_anim_frame 0x000c, 5 - obj_image_anim_frame 0x0008, 5 - obj_image_anim_jump 0 - -gAnimCmd_843F228:: - obj_image_anim_frame 0x0004, 5 - obj_image_anim_frame 0x0008, 5 - obj_image_anim_frame 0x000c, 10 - obj_image_anim_frame 0x0008, 5 - obj_image_anim_jump 0 - -gAnimCmd_843F23C:: - obj_image_anim_frame 0x0004, 5 - obj_image_anim_frame 0x0008, 5 - obj_image_anim_jump 0 - -gAnimCmd_843F248:: - obj_image_anim_frame 0x0004, 10 - obj_image_anim_frame 0x0014, 10 - obj_image_anim_jump 0 - -gAnimCmd_843F254:: - obj_image_anim_frame 0x0018, 10 - obj_image_anim_frame 0x0004, 10 - obj_image_anim_jump 0 - -gSpriteAnimTable_843F260:: - .4byte gAnimCmd_843F20C - .4byte gAnimCmd_843F228 - .4byte gAnimCmd_843F23C - .4byte gAnimCmd_843F248 - .4byte gAnimCmd_843F254 - -gUnknown_843F274:: @ 843F274 - obj_tiles gUnknown_843EEE0, 0x0380, 54321 - -gUnknown_843F27C:: @ 843F27C - obj_pal gUnknown_843EEC0, 54322 - -gUnknown_843F284:: @ 843F284 - spr_template 54321, 54322, gUnknown_843F204, gSpriteAnimTable_843F260, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/include/link_rfu.h b/include/link_rfu.h index bc3fa6b70..f23d1d95e 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -145,6 +145,15 @@ struct UnkRfuStruct_2_Sub_c1c /* 0x1e */ vu8 unk_1e; }; +struct UnkRfuStruct_Sub_Unused +{ + /* 0x000 */ u8 unk_00[2][256]; + /* 0x200 */ vu8 unk_200; + /* 0x201 */ vu8 unk_201; + /* 0x202 */ vu8 unk_202; + /* 0x203 */ vu8 unk_203; +}; + struct UnkRfuStruct_2 { /* 0x000 */ void (*RfuFunc)(void); @@ -157,7 +166,7 @@ struct UnkRfuStruct_2 /* 0x00f */ u8 unk_0f; /* 0x010 */ u16 unk_10; /* 0x012 */ u16 unk_12; - /* 0x014 */ u8 unk_14[4][14]; + /* 0x014 */ u8 unk_14[RFU_CHILD_MAX][14]; /* 0x04c */ u8 unk_4c[14]; /* 0x05a */ u8 unk_5a; /* 0x05b */ u8 unk_5b; @@ -193,14 +202,14 @@ struct UnkRfuStruct_2 /* 0x986 */ u8 unk_cce; // childId /* 0x987 */ u8 unk_ccf; /* 0x988 */ vu8 unk_cd0; - /* 0x989 */ u8 unk_cd1[4]; - /* 0x98d */ u8 unk_cd5[4]; + /* 0x989 */ u8 unk_cd1[RFU_CHILD_MAX]; + /* 0x98d */ u8 unk_cd5[RFU_CHILD_MAX]; /* 0x991 */ u8 unk_cd9; /* 0x992 */ u8 unk_cda; /* 0x993 */ vu8 unk_cdb; /* 0x994 */ vu8 unk_cdc; /* 0x995 */ u8 unk_cdd; - /* 0x996 */ u8 unk_cde[4]; + /* 0x996 */ u8 unk_cde[RFU_CHILD_MAX]; /* 0x99a */ u8 unk_ce2; /* 0x99b */ u8 unk_ce3; /* 0x99c */ u8 unk_ce4; @@ -209,8 +218,8 @@ struct UnkRfuStruct_2 /* 0x99f */ u8 unk_ce7; /* 0x9a0 */ u8 unk_ce8; /* 0x9a1 */ u8 unk_ce9; - /* 0x9a2 */ u8 unk_cea[4]; - /* 0x9a6 */ u8 unk_cee[4]; + /* 0x9a2 */ u8 unk_cea[RFU_CHILD_MAX]; + /* 0x9a6 */ u8 unk_cee[RFU_CHILD_MAX]; }; // size: 0x9AC extern struct UnkRfuStruct_1 gUnknown_3005E10; @@ -235,7 +244,7 @@ bool32 IsSendingKeysToRfu(void); void Rfu_set_zero(void); u8 GetRfuPlayerCount(void); void sub_80F9828(void); -u8 rfu_get_multiplayer_id(void); +u8 LinkRfu_GetMultiplayerId(void); bool32 Rfu_InitBlockSend(const u8 * src, size_t size); bool8 sub_80FA0F8(u8 a0); u8 Rfu_GetBlockReceivedStatus(void); @@ -272,13 +281,13 @@ void sub_80FD52C(void); u8 sub_80FD610(u16 parentId, u16 unk_1a); bool8 sub_80FC79C(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2); bool8 sub_80FC888(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2); -bool8 sub_80FC828(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2); +void sub_80FC828(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2); bool8 sub_80FC6E8(struct UnkRfuStruct_2_Sub_124 * a0, u8 *a1); -bool8 sub_80FC63C(struct UnkRfuStruct_2_Sub_9e8 * a0, u8 *a1); +void sub_80FC63C(struct UnkRfuStruct_2_Sub_9e8 * a0, u8 *a1); u8 sub_80FEA34(u8 a0, u16 a1); void sub_80FDA30(u32 a0); void sub_80FCB54(struct GFtgtGname *data, u8 r9, bool32 r2, s32 r3); -void rfu_syncVBlank_(void); +void LinkRfu_syncVBlank_(void); s32 sub_80FD430(void (*func1)(u8, u8), void (*func2)(u16)); void sub_80FEB3C(void); void sub_80FAFE0(u8 a0); diff --git a/ld_script.txt b/ld_script.txt index 942e4ece3..a4b99d525 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -226,6 +226,7 @@ SECTIONS { src/save_menu_util.o(.text); src/map_preview_screen.o(.text); src/link_rfu_2.o(.text); + src/link_rfu_4.o(.text); asm/link_rfu_4.o(.text); src/link_rfu.o(.text); asm/easy_chat_2.o(.text); @@ -511,8 +512,8 @@ SECTIONS { data/box_party_pokemon_dropdown.o(.rodata); src/map_preview_screen.o(.rodata); src/link_rfu_2.o(.rodata); - data/link_rfu_4.o(.rodata); - data/link_rfu.o(.rodata); + src/link_rfu_4.o(.rodata); + data/easy_chat_2.o(.rodata); src/pokedex_screen.o(.rodata); data/pokedex_screen.o(.rodata); src/list_menu.o(.rodata); diff --git a/src/link.c b/src/link.c index bdaa48cdf..7be93026b 100644 --- a/src/link.c +++ b/src/link.c @@ -984,7 +984,7 @@ u8 GetMultiplayerId(void) { if (gWirelessCommType == 1) { - return rfu_get_multiplayer_id(); + return LinkRfu_GetMultiplayerId(); } return SIO_MULTI_CNT->id; } diff --git a/src/link_rfu.c b/src/link_rfu.c index 195394cfe..0d6e14551 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -417,7 +417,7 @@ static bool8 sub_80FD850(u16 reqCommandId) return retVal; } -void rfu_syncVBlank_(void) +void LinkRfu_syncVBlank_(void) { if (rfu_syncVBlank()) { diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index f63fe2a69..a06e3bc9c 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -24,7 +24,6 @@ struct UnkRfuStruct_8010A14{ static EWRAM_DATA struct UnkLinkRfuStruct_02022B2C gUnknown_203ABF0 = {}; static EWRAM_DATA struct UnkLinkRfuStruct_02022B44 gUnknown_203AC08 = {}; -static u8 gUnknown_3001188; static struct RfuAPIBuffer gRfuAPIBuffer; static u8 gUnknown_3001FF8[14]; static u16 gUnknown_3002008[7]; @@ -276,7 +275,7 @@ static void sub_80F887C(s32 r2, s32 r5) s32 r6 = 0; if (r5 == -1) { - for (i = 0; i < 4; r2 >>= 1, i++) + for (i = 0; i < RFU_CHILD_MAX; r2 >>= 1, i++) { if (r2 & 1) { @@ -287,7 +286,7 @@ static void sub_80F887C(s32 r2, s32 r5) } else { - for (i = 0; i < 4; r1 >>= 1, i++) + for (i = 0; i < RFU_CHILD_MAX; r1 >>= 1, i++) { if (!(r1 & 1)) { @@ -296,13 +295,13 @@ static void sub_80F887C(s32 r2, s32 r5) } for (r4 = 4; r4 != 0; r4--) { - for (i = 0; i < 4 && Rfu.unk_cde[i] != r4; i++); + for (i = 0; i < RFU_CHILD_MAX && Rfu.unk_cde[i] != r4; i++); if (i == 4) { r6 = r4; } } - for (r5 &= ~r2, i = 0; i < 4; r5 >>= 1, i++) + for (r5 &= ~r2, i = 0; i < RFU_CHILD_MAX; r5 >>= 1, i++) { if (r5 & 1) { @@ -351,8 +350,8 @@ static void sub_80F893C(u8 taskId) { u8 r5 = 1 << Rfu.unk_c3e; rfu_clearSlot(12, Rfu.unk_c3e); - rfu_setRecvBuffer(16, Rfu.unk_c3e, Rfu.unk_c3f, 70); - rfu_UNI_setSendData(r5, Rfu.unk_4c, 14); + rfu_setRecvBuffer(16, Rfu.unk_c3e, Rfu.unk_c3f, sizeof(Rfu.unk_c3f)); + rfu_UNI_setSendData(r5, Rfu.unk_4c, sizeof(Rfu.unk_4c)); gTasks[taskId].data[1] = 8; DestroyTask(taskId); if (gUnknown_203AC08.unk_0f == 0) @@ -370,11 +369,11 @@ static void sub_80F8AA4(void) { u8 i; u8 r5 = gUnknown_3005E10.unk_00; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if (r5 & 1) { - rfu_setRecvBuffer(16, i, Rfu.unk_14[i], 14); + rfu_setRecvBuffer(16, i, Rfu.unk_14[i], sizeof(Rfu.unk_14[i])); rfu_clearSlot(3, i); } r5 >>= 1; @@ -384,7 +383,7 @@ static void sub_80F8AA4(void) static void sub_80F8AEC(void) { u8 r5 = gUnknown_3005E10.unk_00; - rfu_UNI_setSendData(r5, Rfu.unk_c87, 70); + rfu_UNI_setSendData(r5, Rfu.unk_c87, sizeof(Rfu.unk_c87)); Rfu.unk_cda = sub_80F886C(r5); Rfu.unk_ce2 = r5; sub_80F887C(r5, -1); @@ -416,7 +415,7 @@ static void sub_80F8B34(u8 taskId) case 18: break; case 13: - if (rfu_UNI_setSendData(1 << Rfu.unk_c3e, Rfu.unk_4c, 14) == 0) + if (rfu_UNI_setSendData(1 << Rfu.unk_c3e, Rfu.unk_4c, sizeof(Rfu.unk_4c)) == 0) { Rfu.unk_0c = 0; DestroyTask(taskId); @@ -521,7 +520,7 @@ void sub_80F8DC0(void) sub_80F85F8(); } } - for (i = 0; i < 3; i++) + for (i = 0; i < NELEMS(gUnknown_843ED88); i++) { if (FuncIsActiveTask(gUnknown_843ED88[i]) == TRUE) { @@ -597,7 +596,7 @@ static void sub_80F8FAC(u8 a0) { u8 i; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if (a0 & 1) { @@ -751,7 +750,7 @@ static bool32 sub_80F9204(void) Rfu.unk_cdc = 0; gUnknown_203AC08.unk_06++; flags = gUnknown_3005E10.unk_00; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if (flags & 1) { @@ -787,18 +786,18 @@ static bool32 sub_80F9204(void) { gUnknown_203AC08.unk_0e = 0; rfu_clearSlot(3, Rfu.unk_cda); - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((Rfu.unk_ce5 >> i) & 1) { - rfu_setRecvBuffer(0x10, i, Rfu.unk_14[i], 14); + rfu_setRecvBuffer(0x10, i, Rfu.unk_14[i], sizeof(Rfu.unk_14[i])); } } sub_80F887C(Rfu.unk_ce2, Rfu.unk_ce2 | Rfu.unk_ce5); Rfu.unk_ce9 = Rfu.unk_ce5; Rfu.unk_ce2 |= Rfu.unk_ce5; Rfu.unk_ce5 = 0; - rfu_UNI_setSendData(Rfu.unk_ce2, Rfu.unk_c87, 70); + rfu_UNI_setSendData(Rfu.unk_ce2, Rfu.unk_c87, sizeof(Rfu.unk_c87)); Rfu.unk_cda = sub_80F886C(Rfu.unk_ce2); CreateTask(sub_80FAA94, 0); } @@ -930,7 +929,7 @@ static u8 sub_80F9770(const u8 *a0) if (Rfu.unk_0c == 1) return FALSE; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { Rfu.unk_cde[i] = a0[i]; } @@ -939,7 +938,7 @@ static u8 sub_80F9770(const u8 *a0) static void rfu_func_080F97B8(void) { - // static u8 gUnknown_3001188; + static u8 gUnknown_3001188; if (gReceivedRemoteLinkPlayers && gHeldKeyCodeToSend != LINK_KEY_CODE_NULL && gLinkTransferringData != TRUE) @@ -1149,7 +1148,7 @@ static void sub_80F9D04(u16 command) Rfu.playerCount = gUnknown_843EC41[tmp] + 1; gSendCmd[1] = Rfu.playerCount; buff = (u8 *)(gSendCmd + 2); - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) buff[i] = Rfu.unk_cde[i]; break; case 0x6600: @@ -1450,7 +1449,7 @@ bool32 sub_80FA44C(u32 a0) u8 sub_80FA484(bool32 a0) { - if (a0 == FALSE) + if (!a0) return sub_80FEA34(0, 0); sub_80FEA34(1, 0x258); return 0; @@ -1462,7 +1461,7 @@ void sub_80FA4A8(void) sub_80FD760(FALSE); } -u8 rfu_get_multiplayer_id(void) +u8 LinkRfu_GetMultiplayerId(void) { if (Rfu.unk_0c == 1) return 0; @@ -1476,12 +1475,12 @@ u8 GetRfuPlayerCount(void) bool8 IsLinkRfuTaskFinished(void) { - return Rfu.RfuFunc ? FALSE : TRUE; + return Rfu.RfuFunc != NULL ? FALSE : TRUE; } static void CallRfuFunc(void) { - if (Rfu.RfuFunc) + if (Rfu.RfuFunc != NULL) Rfu.RfuFunc(); } @@ -1518,7 +1517,7 @@ bool32 sub_80FA5D4(void) { u8 flags = 0; s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if (Rfu.unk_cd5[i] == 11) { @@ -1531,7 +1530,7 @@ bool32 sub_80FA5D4(void) rfu_REQ_disconnect(flags); rfu_waitREQComplete(); } - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if (Rfu.unk_cd5[i] == 10 || Rfu.unk_cd5[i] == 11) return TRUE; @@ -1579,7 +1578,7 @@ static void sub_80FA738(void) s32 i; sub_80FA528(); - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if (gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_SUCCESS || gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_FAILED) { @@ -1683,7 +1682,7 @@ static void sub_80FA834(u8 taskId) sub_80FEA34(1, 0x258); if (Rfu.unk_ce6) { - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((Rfu.unk_ce6 >> i) & 1) { @@ -1700,7 +1699,7 @@ static void sub_80FA9D0(u16 a0) { s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((a0 >> i) & 1) Rfu.unk_cde[i] = 0; @@ -1711,7 +1710,7 @@ static void sub_80FA9FC(const struct UnkRfuStruct_8010A14 *a0) { s32 i; Rfu.playerCount = a0->unk_0f; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) Rfu.unk_cde[i] = a0->unk_10[i]; for (i = 0; i < MAX_RFU_PLAYERS; i++) { @@ -1769,7 +1768,7 @@ static void sub_80FAA94(u8 taskId) r5 = (struct UnkRfuStruct_8010A14 *)gBlockSendBuffer; memcpy(r5->unk_00, "PokemonSioInfo", sizeof("PokemonSioInfo")); r5->unk_0f = Rfu.playerCount; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) r5->unk_10[i] = Rfu.unk_cde[i]; memcpy(r5->unk_14, gLinkPlayers, sizeof gLinkPlayers); gTasks[taskId].data[0]++; @@ -1777,7 +1776,7 @@ static void sub_80FAA94(u8 taskId) case 4: r5 = (struct UnkRfuStruct_8010A14 *)gBlockSendBuffer; r5->unk_0f = Rfu.playerCount; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) r5->unk_10[i] = Rfu.unk_cde[i]; memcpy(r5->unk_14, gLinkPlayers, sizeof gLinkPlayers); if (SendBlock(0, gBlockSendBuffer, 0xa0)) @@ -1791,7 +1790,7 @@ static void sub_80FAA94(u8 taskId) Rfu.unk_ce8 = 0; if (Rfu.unk_ce6) { - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((Rfu.unk_ce6 >> i) & 1) { @@ -1958,7 +1957,7 @@ void sub_80FB030(u32 a0) r5 = 0; r7 = 0; r8 = Rfu.unk_ce2 ^ Rfu.unk_ce3; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((r8 >> i) & 1) { @@ -2020,7 +2019,7 @@ static void sub_80FB184(u8 a0, u8 unused1) break; case 0x11: sub_80FB564(gUnknown_3005E10.unk_14); - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((gUnknown_3005E10.unk_14 >> i) & 1) { @@ -2165,7 +2164,7 @@ static void sub_80FB564(s32 a0) { s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((a0 >> i) & 1) { @@ -2180,7 +2179,7 @@ static u8 sub_80FB5A0(s32 a0) u8 ret = 0; u8 i; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((a0 >> i) & 1) { @@ -2370,7 +2369,7 @@ bool8 Rfu_IsMaster(void) void RFUVSync(void) { - rfu_syncVBlank_(); + LinkRfu_syncVBlank_(); } void sub_80FBA44(void) @@ -2400,7 +2399,7 @@ static void sub_80FBA78(void) sub_800B1F4(); OpenLink(); SeedRng(gMain.vblankCounter2); - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) gSaveBlock2Ptr->playerTrainerId[i] = Random() % 256; SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP); @@ -2480,7 +2479,7 @@ static u8 sub_80FBC70(const u8 *a0, u16 a1) u8 i; u8 ret = 0xFF; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { u16 trainerId = ReadU16(((struct GFtgtGname *)gRfuLinkStatus->partner[i].gname)->unk_00.playerTrainerId); if (sub_80FA44C(gRfuLinkStatus->partner[i].serialNo) @@ -2520,7 +2519,7 @@ void sub_80FBD6C(u32 a0) s32 i; u8 var = 0; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if (Rfu.unk_cde[i] == a0 && (Rfu.unk_ce2 >> i) & 1) var |= 1 << i; @@ -2716,7 +2715,7 @@ bool32 sub_80FC1CC(void) { s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((gUnknown_3005E10.unk_00 >> i) & 1 && Rfu.unk_cd1[i] == 0) return FALSE; @@ -2755,7 +2754,7 @@ static void sub_80FC228(void) nullsub_88(gRfuLinkStatus->linkLossSlotFlag, 0x17, 1, 1); if (Rfu.unk_0c == 1) { - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if ((gRfuLinkStatus->getNameFlag >> i) & 1) { @@ -2764,7 +2763,7 @@ static void sub_80FC228(void) nullsub_87(gRfuLinkStatus->partner[i].uname, 0x16, i + 3); } } - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { for (j = 0; j < 14; j++) { @@ -2775,7 +2774,7 @@ static void sub_80FC228(void) } else if (gRfuLinkStatus->connSlotFlag != 0 && gRfuLinkStatus->getNameFlag != 0) { - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { nullsub_88(0, 1, i + 3, 4); nullsub_87(gUnknown_843EE47, 6, i + 3); @@ -2796,7 +2795,7 @@ static void sub_80FC228(void) nullsub_87(gRfuLinkStatus->partner[i].uname, 0x16, i + 3); } } - for (; i < 4; i++) + for (; i < RFU_CHILD_MAX; i++) { nullsub_88(0, 1, i + 3, 4); nullsub_87(gUnknown_843EE47, 6, i + 3); diff --git a/src/link_rfu_4.c b/src/link_rfu_4.c new file mode 100644 index 000000000..44ea69d35 --- /dev/null +++ b/src/link_rfu_4.c @@ -0,0 +1,596 @@ +#include "global.h" +#include "link_rfu.h" +#include "random.h" +#include "text.h" + +const u16 gWirelessLinkIconPalette[] = INCBIN_U16("graphics/interface/wireless_link_icon.gbapal"); + +const u32 gWirelessLinkIconPic[] = INCBIN_U32("graphics/interface/wireless_link_icon.4bpp.lz"); + +const u8 sWireless_ASCIItoRSETable[] = { + 0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x00, 0xab, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xb2, 0xf1, 0x00, 0xae, 0xad, 0xba, + 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, + 0xa9, 0xaa, 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, + 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, + 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, + 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, + 0xd2, 0xd3, 0xd4, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, + 0x00, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, + 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, + 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, + 0xec, 0xed, 0xee, 0x2d, 0x2f, 0x30, 0x31, 0x32, + 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02, + 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, + 0x1b, 0xad, 0xb3, 0xb4, 0x00, 0xaf, 0x7d, 0x7f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0xa0, + 0xae, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7e, 0xb0, 0xac, + 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, + 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, + 0x2c, 0x2e, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, + 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94 +}; + +const u8 sWireless_RSEtoASCIITable[] = { + 0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, + 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, + 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, + 0x9d, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3, + 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, + 0xec, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c, + 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x84, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, + 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, + 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, + 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7, + 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2, + 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, + 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03, + 0x04, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0xaf, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, + 0x37, 0x38, 0x39, 0x21, 0xdf, 0xa1, 0xb0, 0xa5, + 0xde, 0x24, 0x2a, 0xa2, 0xa3, 0x22, 0x23, 0x20, + 0xa4, 0x20, 0x2f, 0x41, 0x42, 0x43, 0x44, 0x45, + 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, + 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, + 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63, + 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, + 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20, + 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 +}; + +const struct OamData sWirelessStatusIndicatorOamData = + { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x16), + .x = 0, + .size = SPRITE_SIZE(16x16), + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + }; + +const union AnimCmd sWirelessStatusIndicatorAnim0[] = { + // 3 bars + ANIMCMD_FRAME( 4, 5), + ANIMCMD_FRAME( 8, 5), + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(16, 10), + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME( 8, 5), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd sWirelessStatusIndicatorAnim1[] = { + // 2 bars + ANIMCMD_FRAME( 4, 5), + ANIMCMD_FRAME( 8, 5), + ANIMCMD_FRAME(12, 10), + ANIMCMD_FRAME( 8, 5), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd sWirelessStatusIndicatorAnim2[] = { + // 1 bar + ANIMCMD_FRAME(4, 5), + ANIMCMD_FRAME(8, 5), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd sWirelessStatusIndicatorAnim3[] = { + // searching + ANIMCMD_FRAME( 4, 10), + ANIMCMD_FRAME(20, 10), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd sWirelessStatusIndicatorAnim4[] = { + // error + ANIMCMD_FRAME(24, 10), + ANIMCMD_FRAME( 4, 10), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd *const sWirelessStatusIndicatorAnims[] = { + sWirelessStatusIndicatorAnim0, + sWirelessStatusIndicatorAnim1, + sWirelessStatusIndicatorAnim2, + sWirelessStatusIndicatorAnim3, + sWirelessStatusIndicatorAnim4 +}; + +const struct CompressedSpriteSheet sWirelessStatusIndicatorSpriteSheet = { + gWirelessLinkIconPic, 0x0380, 0xD431 +}; + +const struct SpritePalette sWirelessStatusIndicatorSpritePalette = { + gWirelessLinkIconPalette, 0xD432 +}; + +const struct SpriteTemplate sWirelessStatusIndicatorSpriteTemplate = { + 0xD431, + 0xD432, + &sWirelessStatusIndicatorOamData, + sWirelessStatusIndicatorAnims, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +void sub_80FC478(struct UnkRfuStruct_2_Sub_124 *ptr) +{ + s32 i; + s32 j; + + for (i = 0; i < 20; i++) + { + for (j = 0; j < 70; j++) + { + ptr->unk_00[i][j] = 0; + } + } + ptr->unk_8c1 = 0; + ptr->unk_8c0 = 0; + ptr->unk_8c2 = 0; + ptr->unk_8c3 = 0; +} + +void sub_80FC4D4(struct UnkRfuStruct_2_Sub_9e8 *ptr) +{ + s32 i; + s32 j; + + for (i = 0; i < 40; i++) + { + for (j = 0; j < 14; j++) + { + ptr->unk_00[i][j] = 0; + } + } + ptr->unk_231 = 0; + ptr->unk_230 = 0; + ptr->unk_232 = 0; + ptr->unk_233 = 0; +} + +void sub_80FC530(struct UnkRfuStruct_Sub_Unused *ptr) +{ + s32 i; + s32 j; + + for (i = 0; i < 2; i++) + { + for (j = 0; j < 256; j++) + { + ptr->unk_00[i][j] = 0; + } + } + ptr->unk_201 = 0; + ptr->unk_200 = 0; + ptr->unk_202 = 0; + ptr->unk_203 = 0; +} + +void sub_80FC588(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) +{ + s32 i; + u16 imeBak; + u8 count; + + if (q1->unk_8c2 < 20) + { + imeBak = REG_IME; + REG_IME = 0; + count = 0; + for (i = 0; i < 70; i += 14) + { + if (q2[i] == 0 && q2[i + 1] == 0) + { + count++; + } + } + if (count != 5) + { + for (i = 0; i < 70; i++) + { + q1->unk_00[q1->unk_8c0][i] = q2[i]; + } + q1->unk_8c0++; + q1->unk_8c0 %= 20; + q1->unk_8c2++; + for (i = 0; i < 70; i++) + { + q2[i] = 0; + } + } + REG_IME = imeBak; + } + else + { + q1->unk_8c3 = 1; + } +} + +void sub_80FC63C(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) +{ + s32 i; + u16 imeBak; + + if (q1->unk_232 < 40) + { + imeBak = REG_IME; + REG_IME = 0; + for (i = 0; i < 14; i++) + { + if (q2[i] != 0) + { + break; + } + } + if (i != 14) + { + for (i = 0; i < 14; i++) + { + q1->unk_00[q1->unk_230][i] = q2[i]; + } + q1->unk_230++; + q1->unk_230 %= 40; + q1->unk_232++; + for (i = 0; i < 14; i++) + { + q2[i] = 0; + } + } + REG_IME = imeBak; + } + else + { + q1->unk_233 = 1; + } +} + +bool8 sub_80FC6E8(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) +{ + u16 imeBak; + s32 i; + + imeBak = REG_IME; + REG_IME = 0; + if (q1->unk_8c0 == q1->unk_8c1 || q1->unk_8c3 != 0) + { + for (i = 0; i < 70; i++) + { + q2[i] = 0; + } + REG_IME = imeBak; + return FALSE; + } + for (i = 0; i < 70; i++) + { + q2[i] = q1->unk_00[q1->unk_8c1][i]; + } + q1->unk_8c1++; + q1->unk_8c1 %= 20; + q1->unk_8c2--; + REG_IME = imeBak; + return TRUE; +} + +bool8 sub_80FC79C(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) +{ + s32 i; + u16 imeBak; + + if (q1->unk_230 == q1->unk_231 || q1->unk_233 != 0) + { + return FALSE; + } + imeBak = REG_IME; + REG_IME = 0; + for (i = 0; i < 14; i++) + { + q2[i] = q1->unk_00[q1->unk_231][i]; + } + q1->unk_231++; + q1->unk_231 %= 40; + q1->unk_232--; + REG_IME = imeBak; + return TRUE; +} + +void sub_80FC828(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2) +{ + s32 i; + + if (q2[1] == 0) + { + sub_80FC888(q1, NULL); + } + else + { + for (i = 0; i < 14; i++) + { + q1->unk_00[q1->unk_1c][i] = q2[i]; + } + q1->unk_1c++; + q1->unk_1c %= 2; + if (q1->unk_1e < 2) + { + q1->unk_1e++; + } + else + { + q1->unk_1d = q1->unk_1c; + } + } +} + +bool8 sub_80FC888(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2) +{ + s32 i; + + if (q1->unk_1e == 0) + { + return FALSE; + } + if (q2 != NULL) + { + for (i = 0; i < 14; i++) + { + q2[i] = q1->unk_00[q1->unk_1d][i]; + } + } + q1->unk_1d++; + q1->unk_1d %= 2; + q1->unk_1e--; + return TRUE; +} + +void sub_80FC8D8(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) +{ + s32 i; + + if (q1->unk_202 < 2) + { + for (i = 0; i < 256; i++) + { + q1->unk_00[q1->unk_200][i] = q2[i]; + } + q1->unk_200++; + q1->unk_200 %= 2; + q1->unk_202++; + } + else + { + q1->unk_203 = 1; + } +} + +bool8 sub_80FC944(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) +{ + s32 i; + + if (q1->unk_200 == q1->unk_201 || q1->unk_203) + { + return FALSE; + } + for (i = 0; i < 256; i++) + { + q2[i] = q1->unk_00[q1->unk_201][i]; + } + q1->unk_201++; + q1->unk_201 %= 2; + q1->unk_202--; + return TRUE; +} + +void sub_80FC9B8(u8 *q1, u8 mode) +{ + s32 i; + u8 rval; + u16 r5 = 0; + static u8 _3002018; + + switch (mode) + { + case 0: + for (i = 0; i < 200; i++) + { + q1[i] = i + 1; + r5 += i + 1; + } + *((u16 *)(q1 + i)) = r5; + break; + case 1: + for (i = 0; i < 100; i++) + { + q1[i] = i + 1; + r5 += i + 1; + } + *((u16 *)(q1 + 200)) = r5; + break; + case 2: + for (i = 0; i < 200; i++) + { + rval = Random(); + q1[i] = rval; + r5 += rval; + } + *((u16 *)(q1 + i)) = r5; + break; + case 3: + for (i = 0; i < 200; i++) + { + q1[i] = i + 1 + _3002018; + r5 += (i + 1 + _3002018) & 0xFF; + } + *((u16 *)(q1 + i)) = r5; + _3002018++; + break; + } +} + +void PkmnStrToASCII(u8 *q1, const u8 *q2) +{ + s32 i; + + for (i = 0; q2[i] != EOS; i++) + { + q1[i] = sWireless_RSEtoASCIITable[q2[i]]; + } + q1[i] = 0; +} + +void ASCIIToPkmnStr(u8 *q1, const u8 *q2) +{ + s32 i; + + for (i = 0; q2[i] != 0; i++) + { + q1[i] = sWireless_ASCIItoRSETable[q2[i]]; + } + q1[i] = EOS; +} + +#ifdef NONMATCHING +u8 sub_80FCADC(u8 maxFlags) +{ + u8 flagCount = 0; + u8 flags = gRfuLinkStatus->connSlotFlag; + u8 i; + + if (gRfuLinkStatus->parentChild == MODE_PARENT) + { + for (i = 0; i < 4; flags >>= 1, i++) + { + if (flags & 1) + { + if (maxFlags == flagCount + 1) + return gRfuLinkStatus->strength[i]; + flagCount++; + } + } + return 0; + } + else + { + for (i = 0; i < 4; flags >>= 1, i++) + { + if (flags & 1) + return gRfuLinkStatus->strength[i]; + } + return 0; + } +} +#else +NAKED +u8 sub_80FCADC(u8 maxFlags) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tlsls r0, 24\n" + "\tlsrs r5, r0, 24\n" + "\tmovs r6, 0\n" + "\tldr r0, _080FCB04 @ =gRfuLinkStatus\n" + "\tldr r4, [r0]\n" + "\tldrb r2, [r4, 0x2]\n" + "\tldrb r1, [r4]\n" + "\tadds r7, r0, 0\n" + "\tcmp r1, 0x1\n" + "\tbne _080FCB32\n" + "\tmovs r3, 0\n" + "\tands r1, r2\n" + "\tcmp r1, 0\n" + "\tbeq _080FCB0E\n" + "\tcmp r5, 0x1\n" + "\tbne _080FCB08\n" + "\tldrb r0, [r4, 0xA]\n" + "\tb _080FCB4C\n" + "\t.align 2, 0\n" + "_080FCB04: .4byte gRfuLinkStatus\n" + "_080FCB08:\n" + "\tadds r0, r6, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r6, r0, 24\n" + "_080FCB0E:\n" + "\tlsrs r2, 1\n" + "\tadds r0, r3, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r3, r0, 24\n" + "\tcmp r3, 0x3\n" + "\tbhi _080FCB4A\n" + "\tmovs r0, 0x1\n" + "\tands r0, r2\n" + "\tcmp r0, 0\n" + "\tbeq _080FCB0E\n" + "\tadds r0, r6, 0x1\n" + "\tcmp r5, r0\n" + "\tbne _080FCB08\n" + "_080FCB28:\n" + "\tldr r0, [r7]\n" + "\tadds r0, 0xA\n" + "\tadds r0, r3\n" + "\tldrb r0, [r0]\n" + "\tb _080FCB4C\n" + "_080FCB32:\n" + "\tmovs r3, 0\n" + "\tmovs r1, 0x1\n" + "_080FCB36:\n" + "\tadds r0, r2, 0\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbne _080FCB28\n" + "\tlsrs r2, 1\n" + "\tadds r0, r3, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r3, r0, 24\n" + "\tcmp r3, 0x3\n" + "\tbls _080FCB36\n" + "_080FCB4A:\n" + "\tmovs r0, 0\n" + "_080FCB4C:\n" + "\tpop {r4-r7}\n" + "\tpop {r1}\n" + "\tbx r1"); +} +#endif diff --git a/sym_bss.txt b/sym_bss.txt index e6ef49e94..059233848 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -72,11 +72,9 @@ gUnknown_3000FE8: @ 3000FE8 .include "src/easy_chat.o" .align 2 .include "src/link_rfu_2.o" - .align 2 -gUnknown_3002018: @ 3002018 - .space 0x4 - + .include "src/link_rfu_4.o" + .align 2 .include "src/quest_log.o" .align 2 |