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

1 files changed, 6 insertions, 118 deletions

diff --git a/asm/code_809D148.s b/asm/code_809D148.s
index c56442e..fa42327 100644
--- a/asm/code_809D148.s
+++ b/asm/code_809D148.s
@@ -2461,7 +2461,7 @@ _0809E6C2:
 	cmp r0, 0x1
 	bne _0809E6D0
 	ldr r0, _0809E6DC
-	bl sub_80920EC
+	bl SetRescueTeamName
 _0809E6D0:
 	ldr r1, [r4]
 	adds r0, r7, 0
@@ -9001,19 +9001,19 @@ _080A1EC4: .4byte gUnknown_202E628
 _080A1EC8: .4byte gUnknown_81167E8
 _080A1ECC: .4byte gUnknown_2039D98
 _080A1ED0:
-	bl sub_809211C
+	bl GetPtsToNextRank
 	b _080A177C
 _080A1ED6:
-	bl sub_8092178
+	bl GetRescueTeamRank
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_809211C
+	bl GetPtsToNextRank
 	cmp r0, 0
 	bgt _080A1EE8
 	b _080A236A
 _080A1EE8:
-	bl sub_8092158
-	bl sub_8092178
+	bl AddToTeamRankPts
+	bl GetRescueTeamRank
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
@@ -9923,116 +9923,4 @@ _080A2602:
 	bx r1
 	thumb_func_end sub_80A25AC
 
-	thumb_func_start sub_80A2608
-sub_80A2608:
-	adds r1, r0, 0
-	lsls r1, 16
-	asrs r1, 16
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080A261C
-	adds r0, r1
-	bx lr
-	.align 2, 0
-_080A261C: .4byte gUnknown_81168A8
-	thumb_func_end sub_80A2608
-
-	thumb_func_start sub_80A2620
-sub_80A2620:
-	push {lr}
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_80A26B8
-	adds r1, r0, 0
-	lsls r1, 16
-	asrs r1, 16
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080A2640
-	adds r0, r1
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080A2640: .4byte gUnknown_81168A8
-	thumb_func_end sub_80A2620
-
-	thumb_func_start sub_80A2644
-sub_80A2644:
-	ldr r1, _080A2650
-	lsls r0, 1
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	bx lr
-	.align 2, 0
-_080A2650: .4byte gUnknown_8116F24
-	thumb_func_end sub_80A2644
-
-	thumb_func_start sub_80A2654
-sub_80A2654:
-	push {lr}
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_80A2608
-	movs r1, 0xE
-	ldrsh r0, [r0, r1]
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A2654
-
-	thumb_func_start sub_80A2668
-sub_80A2668:
-	push {lr}
-	lsls r0, 16
-	ldr r2, _080A267C
-	adds r1, r0, r2
-	lsrs r0, r1, 16
-	cmp r0, 0x18
-	bls _080A2680
-	movs r0, 0x1
-	negs r0, r0
-	b _080A2682
-	.align 2, 0
-_080A267C: .4byte 0xffc90000
-_080A2680:
-	asrs r0, r1, 16
-_080A2682:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A2668
-
-	thumb_func_start sub_80A2688
-sub_80A2688:
-	push {lr}
-	lsls r0, 24
-	lsrs r1, r0, 24
-	adds r3, r1, 0
-	adds r2, r1, 0
-	subs r2, 0x4B
-	lsls r0, r2, 24
-	lsrs r0, 24
-	cmp r0, 0x16
-	bhi _080A26A0
-	adds r0, r2, 0
-	b _080A26B4
-_080A26A0:
-	cmp r1, 0x2F
-	bne _080A26A8
-	movs r0, 0x17
-	b _080A26B4
-_080A26A8:
-	cmp r3, 0x30
-	beq _080A26B2
-	movs r0, 0x1
-	negs r0, r0
-	b _080A26B4
-_080A26B2:
-	movs r0, 0x18
-_080A26B4:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A2688
-
         .align 2,0