Some more pokenav

2019-07-25 21:41:02 +02:00
parent fd07c608fc
commit 56b124fdec
6 changed files with 132 additions and 227 deletions
--- a/asm/pokenav_unk_8.s
+++ b/asm/pokenav_unk_8.s
@@ -5,219 +5,7 @@

@ File centered around AllocSubstruct(7)

-    thumb_func_start sub_81CEF3C
-sub_81CEF3C: @ 81CEF3C
-	push {r4,lr}
-	movs r0, 0x7
-	movs r1, 0x24
-	bl AllocSubstruct
-	adds r4, r0, 0
-	cmp r4, 0
-	beq _081CEF90
-	ldr r1, =0x000006ac
-	movs r0, 0x12
-	bl AllocSubstruct
-	str r0, [r4, 0x20]
-	cmp r0, 0
-	beq _081CEF90
-	ldr r0, =sub_81CF010
-	str r0, [r4]
-	ldr r0, =sub_81CF11C
-	movs r1, 0x1
-	bl CreateLoopedTask
-	str r0, [r4, 0x4]
-	movs r0, 0
-	str r0, [r4, 0x18]
-	bl sub_81C76AC
-	ldr r1, =gUnknown_086233A0
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	str r0, [r4, 0x14]
-	movs r0, 0x1
-	b _081CEF92
-	.pool
-_081CEF90:
-	movs r0, 0
-_081CEF92:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81CEF3C

-	thumb_func_start sub_81CEF98
-sub_81CEF98: @ 81CEF98
-	push {r4,lr}
-	movs r0, 0x7
-	movs r1, 0x24
-	bl AllocSubstruct
-	adds r4, r0, 0
-	cmp r4, 0
-	beq _081CEFD4
-	movs r0, 0x12
-	bl GetSubstructPtr
-	str r0, [r4, 0x20]
-	ldr r0, =sub_81CF030
-	str r0, [r4]
-	movs r0, 0x1
-	str r0, [r4, 0x18]
-	bl sub_81C76AC
-	ldr r1, =gUnknown_086233A0
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	str r0, [r4, 0x14]
-	movs r0, 0x1
-	b _081CEFD6
-	.pool
-_081CEFD4:
-	movs r0, 0
-_081CEFD6:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81CEF98
-
-	thumb_func_start sub_81CEFDC
-sub_81CEFDC: @ 81CEFDC
-	push {lr}
-	movs r0, 0x7
-	bl GetSubstructPtr
-	ldr r1, [r0]
-	bl _call_via_r1
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81CEFDC
-
-	thumb_func_start sub_81CEFF0
-sub_81CEFF0: @ 81CEFF0
-	push {lr}
-	movs r0, 0x7
-	bl GetSubstructPtr
-	ldr r0, [r0, 0x1C]
-	cmp r0, 0
-	bne _081CF004
-	movs r0, 0x12
-	bl FreePokenavSubstruct
-_081CF004:
-	movs r0, 0x7
-	bl FreePokenavSubstruct
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81CEFF0
-
-	thumb_func_start sub_81CF010
-sub_81CF010: @ 81CF010
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, [r4, 0x4]
-	bl IsLoopedTaskActive
-	cmp r0, 0
-	bne _081CF022
-	ldr r0, =sub_81CF030
-	str r0, [r4]
-_081CF022:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81CF010
-
-	thumb_func_start sub_81CF030
-sub_81CF030: @ 81CF030
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r2, =gMain
-	ldrh r1, [r2, 0x30]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _081CF048
-	movs r0, 0x1
-	b _081CF0A6
-	.pool
-_081CF048:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _081CF054
-	movs r0, 0x2
-	b _081CF0A6
-_081CF054:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _081CF062
-	movs r0, 0x3
-	b _081CF0A6
-_081CF062:
-	movs r0, 0x10
-	ands r0, r1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r2, 0
-	beq _081CF072
-	movs r0, 0x4
-	b _081CF0A6
-_081CF072:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _081CF088
-	str r2, [r4, 0x1C]
-	ldr r0, =sub_81CF0B0
-	str r0, [r4]
-	movs r0, 0x5
-	b _081CF0A6
-	.pool
-_081CF088:
-	movs r5, 0x1
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _081CF096
-	movs r0, 0
-	b _081CF0A6
-_081CF096:
-	bl GetSelectedMatchCall
-	ldr r1, [r4, 0x20]
-	strh r0, [r1, 0x2]
-	str r5, [r4, 0x1C]
-	ldr r0, =sub_81CF0B8
-	str r0, [r4]
-	movs r0, 0x6
-_081CF0A6:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81CF030
-
-	thumb_func_start sub_81CF0B0
-sub_81CF0B0: @ 81CF0B0
-	ldr r0, =0x000186a3
-	bx lr
-	.pool
-	thumb_func_end sub_81CF0B0
-
-	thumb_func_start sub_81CF0B8
-sub_81CF0B8: @ 81CF0B8
-	ldr r0, =0x000186a9
-	bx lr
-	.pool
-	thumb_func_end sub_81CF0B8
-
-	thumb_func_start sub_81CF0C0
-sub_81CF0C0: @ 81CF0C0
-	push {lr}
-	movs r0, 0x7
-	bl GetSubstructPtr
-	ldr r0, [r0, 0x18]
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81CF0C0

 	thumb_func_start sub_81CF0D0
 sub_81CF0D0: @ 81CF0D0