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_803D110.s | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'asm/code_803D110.s') diff --git a/asm/code_803D110.s b/asm/code_803D110.s index f66bcde..daeaf51 100644 --- a/asm/code_803D110.s +++ b/asm/code_803D110.s @@ -6037,55 +6037,4 @@ _08040024: .4byte gUnknown_80F6544 _08040028: .4byte 0xfffff000 thumb_func_end sub_803FF18 - thumb_func_start sub_804002C -sub_804002C: - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r8, r0 - ldr r0, _08040088 - ldr r0, [r0] - ldr r1, _0804008C - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] - movs r5, 0 - movs r7, 0x1 -_08040046: - movs r4, 0 - adds r6, r5, 0x1 -_0804004A: - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8049590 - ldrh r1, [r0, 0x4] - orrs r1, r7 - strh r1, [r0, 0x4] - adds r4, 0x1 - cmp r4, 0x37 - ble _0804004A - adds r5, r6, 0 - cmp r5, 0x1F - ble _08040046 - movs r0, 0 - bl sub_803F580 - bl sub_8049ED4 - bl sub_8040A84 - ldr r0, _08040090 - ldr r1, [r0] - mov r0, r8 - bl sub_80522A8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08040088: .4byte gUnknown_203B418 -_0804008C: .4byte 0x0001820b -_08040090: .4byte gUnknown_80FD040 - thumb_func_end sub_804002C - .align 2,0 @ Don't pad with nop -- cgit v1.2.3