Merge pull request #146 from Eebit/ui_targetselection

Decompile ui_targetselection into uiselecttarget
FireEmblemUniverse · Apr 17, 2022 · 94d53ef · 94d53ef
2 parents c2b7de2 + 5543e6c
commit 94d53ef
Show file tree

Hide file tree

Showing 19 changed files with 574 additions and 830 deletions.
diff --git a/asm/bb.s b/asm/bb.s
@@ -766,7 +766,7 @@ sub_8035A0C: @ 0x08035A0C
 	adds r6, #0x4c
 	movs r0, #0
 	ldrsh r4, [r6, r0]
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r4, r0
 	bne _08035A2A
 	adds r0, r5, #0

diff --git a/asm/bmcommanddbg.s b/asm/bmcommanddbg.s
@@ -179,7 +179,7 @@ CanUnitUseAttack: @ 0x08034428
 	str r0, [r1]
 	ldr r0, _0803446C  @ AddUnitToTargetListIfNotAllied
 	bl ForEachUnitInRange
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _0803445A
 	movs r0, #1
@@ -201,7 +201,7 @@ CanActiveUnitUseRescue: @ 0x08034470
 	ldr r0, _08034488  @ gActiveUnit
 	ldr r0, [r0]
 	bl MakeRescueTargetList
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08034484
 	movs r0, #1
@@ -219,7 +219,7 @@ CanActiveUnitUseTrade: @ 0x0803448C
 	ldr r0, _080344A4  @ gActiveUnit
 	ldr r0, [r0]
 	bl MakeTradeTargetList
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _080344A0
 	movs r0, #1

diff --git a/asm/bmmenu.s b/asm/bmmenu.s
@@ -454,7 +454,7 @@ RescueUsability: @ 0x080228A4
 	bne _080228D4
 	adds r0, r2, #0
 	bl MakeRescueTargetList
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _080228D4
 	movs r0, #1
@@ -516,7 +516,7 @@ DropUsability: @ 0x08022910
 	beq _08022940
 	adds r0, r2, #0
 	bl MakeDropTargetList
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08022940
 	movs r0, #1
@@ -592,7 +592,7 @@ TakeUsability: @ 0x0802298C
 	bne _080229CC
 	adds r0, r3, #0
 	bl MakeTakeTargetList
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _080229CC
 	movs r0, #1
@@ -648,7 +648,7 @@ GiveUsability: @ 0x080229F4
 	beq _08022A34
 	adds r0, r3, #0
 	bl sub_8025594
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08022A34
 	movs r0, #1
@@ -992,7 +992,7 @@ UnknownMenu_IsAvailable: @ 0x08022CA4
 	ldr r0, [r5]
 	adds r1, r4, #0
 	bl MakeTargetListForWeapon
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08022CE8
 	movs r0, #1
@@ -1341,7 +1341,7 @@ ItemSubMenu_IsTradeAvailable: @ 0x08022F34
 	bne _08022F80
 	adds r0, r2, #0
 	bl MakeTradeTargetList
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08022F80
 	movs r0, #1
@@ -1570,7 +1570,7 @@ sub_80230F0: @ 0x080230F0
 	bne _0802314E
 	adds r0, r2, #0
 	bl sub_8025B6C
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08023118
 _0802310E:
@@ -1697,7 +1697,7 @@ PlayCommandEffect: @ 0x080231D0
 	ldr r6, _08023248  @ gActiveUnit
 	ldr r0, [r6]
 	bl sub_8025B6C
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	negs r1, r0
 	orrs r1, r0
 	lsrs r1, r1, #0x1f
@@ -3083,7 +3083,7 @@ TalkCommandUsability: @ 0x08023C80
 	bne _08023C9E
 	adds r0, r2, #0
 	bl sub_8025610
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	bne _08023CA8
 _08023C9E:
@@ -3167,12 +3167,12 @@ SupportCommandUsability: @ 0x08023D14
 	bne _08023D40
 	adds r0, r2, #0
 	bl MakeTargetListForSupport
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08023D40
 	ldr r0, [r4]
 	bl sub_8025610
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08023D48
 _08023D40:
@@ -3268,7 +3268,7 @@ _08023DD8:
 	ldr r0, [r4]
 	movs r1, #0x1e
 	bl MakeTargetListForDoorAndBridges
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	movs r1, #3
 	cmp r0, #0
 	beq _08023DEC
@@ -3385,7 +3385,7 @@ _08023E98: .4byte gActiveUnit
 _08023E9C:
 	adds r0, r2, #0
 	bl sub_80258A4
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	movs r1, #3
 	cmp r0, #0
 	beq _08023EAE
@@ -3841,7 +3841,7 @@ StealCommandUsability: @ 0x0802418C
 	bne _080241BC
 	adds r0, r2, #0
 	bl MakeTargetListForSteal
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	bne _080241C4
 _080241BC:
@@ -4140,7 +4140,7 @@ SummonCommandUsability: @ 0x080243D8
 	bne _0802445A
 	adds r0, r2, #0
 	bl sub_8025CA4
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _0802445A
 	ldr r4, _08024428  @ 0x0000FFFF
@@ -4995,7 +4995,7 @@ _080249D8:
 	ldr r0, [r5]
 	adds r1, r4, #0
 	bl MakeTargetListForWeapon
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	bne _080249CC
 _08024A06:
@@ -5047,7 +5047,7 @@ AttackBallistaCommandUsability: @ 0x08024A28
 	lsls r2, r2, #1
 	adds r1, r1, r2
 	bl MakeTargetListForWeapon
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	bne _08024A70
 _08024A66:
@@ -5077,7 +5077,7 @@ ItemMenu_Is1stCommandAvailable: @ 0x08024A88
 	ldr r0, _08024AA0  @ gActiveUnit
 	ldr r0, [r0]
 	bl sub_8025B6C
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	beq _08024AA4
 	movs r0, #1

diff --git a/asm/bmtarget.s b/asm/bmtarget.s
@@ -643,13 +643,13 @@ MakeTradeTargetList: @ 0x080252D0
 	ands r0, r1
 	cmp r0, #0
 	beq _08025332
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	adds r4, r0, #0
 	ldr r0, [r6]
 	ldrb r0, [r0, #0x1b]
 	bl GetUnit
 	bl _call_via_r7
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r4, r0
 	beq _08025332
 	adds r0, r4, #0
@@ -2917,7 +2917,7 @@ sub_8026414: @ 0x08026414
 	mov r7, r8
 	push {r7}
 	mov r8, r0
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	adds r7, r0, #0
 	movs r6, #0
 	cmp r6, r7

diff --git a/asm/bmusailment.s b/asm/bmusailment.s
@@ -495,7 +495,7 @@ sub_8035E20: @ 0x08035E20
 	ldr r0, _08035E3C  @ gRAMChapterData
 	ldrb r0, [r0, #0xf]
 	bl sub_8025904
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	bne _08035E40
 	adds r0, r4, #0
@@ -534,7 +534,7 @@ sub_8035E50: @ 0x08035E50
 	strb r0, [r1, #0xc]
 	movs r0, #0
 	ldrsh r4, [r5, r0]
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r4, r0
 	bne _08035E8C
 	adds r0, r7, #0
@@ -710,7 +710,7 @@ sub_8035FB8: @ 0x08035FB8
 	bl sub_80259EC
 	movs r0, #4
 	bl sub_8026414
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	bne _08035FE0
 	adds r0, r4, #0
@@ -834,7 +834,7 @@ sub_80360B8: @ 0x080360B8
 	ldr r0, _080360D4  @ gRAMChapterData
 	ldrb r0, [r0, #0xf]
 	bl sub_8025A64
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	bne _080360D8
 	adds r0, r4, #0
@@ -934,7 +934,7 @@ _08036184: .4byte gActionData
 sub_8036188: @ 0x08036188
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r0, #0
 	bne _0803619C
 	adds r0, r4, #0
@@ -1085,7 +1085,7 @@ sub_80362A4: @ 0x080362A4
 	strb r0, [r1, #0xc]
 	movs r0, #0
 	ldrsh r4, [r4, r0]
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	cmp r4, r0
 	bne _080362E0
 	adds r0, r7, #0

diff --git a/asm/bmusemind.s b/asm/bmusemind.s
@@ -735,7 +735,7 @@ ExecFortify: @ 0x0802F154
 	adds r0, r5, #0
 	bl GetUnitItemHealAmount
 	adds r6, r0, #0
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	adds r5, r0, #0
 	movs r4, #0
 	cmp r4, r5
@@ -794,7 +794,7 @@ sub_802F208: @ 0x0802F208
 	ldrb r0, [r0, #0xc]
 	bl GetUnit
 	bl MakeTargetListForFuckingNightmare
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	adds r6, r0, #0
 	movs r5, #0
 	cmp r5, r6
@@ -925,7 +925,7 @@ sub_802F30C: @ 0x0802F30C
 	ldrb r0, [r4, #0xc]
 	bl GetUnit
 	bl MakeTargetListForLatona
-	bl sub_804FD28
+	bl GetSelectTargetCount
 	adds r6, r0, #0
 	movs r5, #0
 	cmp r5, r6