From 2fd4f339b42c010191c199772b09ac34c580de94 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 23 Mar 2021 12:11:10 -0500 Subject: Miscellaneous Work (Again) (#31) * move some personality data from asm to C * combine personality_test files and add my close attempt at RedrawPartnerSelectionMenu * decomp some more wonder mail funcs and label some more data * lots of data splitting and move some to src * split out more dungeon data * continue splitting out more dungeon data * doc rescue team rank/pts funcs/data and exclusive pokemon ewram * doc more sound things and decomp a func * decomp LoadTeamRankBadge and label some data members * split out rescue team and text util stuff * forgot a constant * match a few funcs and clean up a few * cleaned up sub_80A28B4 --- asm/code_801D760.s | 151 ----------------------------------------------------- 1 file changed, 151 deletions(-) (limited to 'asm/code_801D760.s') diff --git a/asm/code_801D760.s b/asm/code_801D760.s index 6032d36..fa9c366 100644 --- a/asm/code_801D760.s +++ b/asm/code_801D760.s @@ -5,157 +5,6 @@ .text - thumb_func_start sub_801D894 -sub_801D894: - push {r4-r6,lr} - sub sp, 0x68 - ldr r0, _0801D8A8 - ldr r1, [r0] - ldrb r0, [r1, 0x6] - cmp r0, 0 - bne _0801D8AC - bl sub_8098FB4 - b _0801D8B2 - .align 2, 0 -_0801D8A8: .4byte gUnknown_203B250 -_0801D8AC: - ldrb r0, [r1, 0x6] - bl GetFriendAreaName -_0801D8B2: - add r2, sp, 0x68 - add r1, sp, 0x4 - movs r3, 0 - bl xxx_format_string - add r0, sp, 0x4 - bl sub_8008ED0 - movs r4, 0x80 - subs r4, r0 - lsrs r0, r4, 31 - adds r4, r0 - asrs r4, 1 - movs r0, 0x1 - bl sub_8008C54 - movs r0, 0x1 - bl sub_80073B8 - movs r6, 0 - str r6, [sp] - adds r0, r4, 0 - movs r1, 0x4 - add r2, sp, 0x4 - movs r3, 0x1 - bl xxx_call_draw_string - movs r0, 0x1 - bl sub_80073E0 - movs r0, 0x2 - bl sub_8008C54 - movs r0, 0x2 - bl sub_80073B8 - movs r0, 0x2 - movs r1, 0x8 - movs r2, 0x6 - bl sub_801D970 - ldr r5, _0801D964 - bl sub_8092178 - lsls r0, 24 - lsrs r0, 24 - bl GetTeamRankString - adds r4, r0, 0 - bl sub_8092110 - adds r3, r0, 0 - add r0, sp, 0x4 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_800D158 - str r6, [sp] - movs r0, 0x20 - movs r1, 0x4 - add r2, sp, 0x4 - movs r3, 0x2 - bl xxx_call_draw_string - ldr r1, _0801D968 - ldr r0, _0801D96C - ldr r0, [r0] - movs r2, 0x98 - lsls r2, 2 - adds r0, r2 - ldr r2, [r0] - add r0, sp, 0x4 - bl sub_800D158 - str r6, [sp] - movs r0, 0x20 - movs r1, 0x12 - add r2, sp, 0x4 - movs r3, 0x2 - bl xxx_call_draw_string - movs r0, 0x2 - bl sub_80073E0 - add sp, 0x68 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0801D964: .4byte gUnknown_80DBF3C -_0801D968: .4byte gUnknown_80DBF4C -_0801D96C: .4byte gUnknown_203B460 - thumb_func_end sub_801D894 - - thumb_func_start sub_801D970 -sub_801D970: - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - mov r8, r0 - mov r9, r1 - mov r10, r2 - ldr r0, _0801D9DC - ldr r1, _0801D9E0 - bl OpenFileAndGetFileDataPtr - adds r7, r0, 0 - ldr r0, [r7, 0x4] - ldr r6, [r0] - ldr r5, [r0, 0x4] - movs r4, 0 -_0801D994: - adds r0, r4, 0 - adds r0, 0xE0 - adds r1, r5, 0 - bl SetBGPaletteBufferColorArray - adds r5, 0x4 - adds r4, 0x1 - cmp r4, 0xF - ble _0801D994 - bl sub_8092178 - lsls r0, 24 - lsrs r0, 17 - adds r6, r0 - movs r0, 0x10 - str r0, [sp] - str r6, [sp, 0x4] - movs r0, 0xE - str r0, [sp, 0x8] - mov r0, r8 - mov r1, r9 - mov r2, r10 - movs r3, 0x10 - bl sub_8007E20 - adds r0, r7, 0 - bl CloseFile - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0801D9DC: .4byte gUnknown_80DBF60 -_0801D9E0: .4byte gTitleMenuFileArchive - thumb_func_end sub_801D970 - thumb_func_start sub_801D9E4 sub_801D9E4: push {r4,r5,lr} -- cgit v1.2.3