decomp some more

7 files changed, 8 insertions, 280 deletions

diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
index 49ef590..bb4e09e 100644
--- a/asm/code_80428A0.s
+++ b/asm/code_80428A0.s
@@ -1099,7 +1099,7 @@ _08043318:
 	movs r0, 0xA
 	strh r0, [r1]
 	ldr r0, [r2]
-	bl sub_80840D8
+	bl SetDungeonRNG
 _08043346:
 	ldr r0, [r4]
 	ldr r1, _080434C4
@@ -4197,4 +4197,4 @@ ResetAction:
 	bx lr
 	thumb_func_end ResetAction
 
-	.align 2, 0
\ No newline at end of file
+	.align 2, 0
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index 8e97c19..417d5da 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -5863,7 +5863,7 @@ sub_8055640:
 	lsrs r4, 24
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl sub_8071A44
+	bl CalculateMovePower
 	mov r8, r0
 	adds r0, r5, 0
 	bl GetMoveCriticalHitChance
@@ -5917,7 +5917,7 @@ sub_80556BC:
 	lsls r4, 24
 	lsrs r4, 24
 	adds r1, r5, 0
-	bl sub_8071A44
+	bl CalculateMovePower
 	mov r8, r0
 	adds r0, r5, 0
 	bl GetMoveCriticalHitChance
diff --git a/asm/code_8057144.s b/asm/code_8057144.s
index 8aecb64..795e7cf 100644
--- a/asm/code_8057144.s
+++ b/asm/code_8057144.s
@@ -218,7 +218,7 @@ sub_805727C:
 _080572D2:
 	adds r0, r4, 0
 _080572D4:
-	bl sub_8084160
+	bl RollPercentChance_2
 	lsls r0, 24
 	lsrs r4, r0, 24
 	b _080572E0
@@ -276,7 +276,7 @@ _08057324:
 _08057336:
 	lsls r0, r4, 1
 _08057338:
-	bl sub_8084160
+	bl RollPercentChance_2
 	lsls r0, 24
 	lsrs r0, 24
 _08057340:
diff --git a/asm/code_8057824.s b/asm/code_8057824.s
index 7ea4a18..3943de2 100644
--- a/asm/code_8057824.s
+++ b/asm/code_8057824.s
@@ -4918,7 +4918,7 @@ _08059E8A:
 	lsrs r4, 24
 	adds r0, r6, 0
 	adds r1, r7, 0
-	bl sub_8071A44
+	bl CalculateMovePower
 	adds r5, r0, 0
 	adds r0, r7, 0
 	bl GetMoveCriticalHitChance
@@ -5100,7 +5100,7 @@ _08059FFE:
 	lsrs r4, 24
 	adds r0, r6, 0
 	adds r1, r7, 0
-	bl sub_8071A44
+	bl CalculateMovePower
 	adds r5, r0, 0
 	adds r0, r7, 0
 	bl GetMoveCriticalHitChance
diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s
index 699dad9..caa62de 100644
--- a/asm/code_80718D8.s
+++ b/asm/code_80718D8.s
@@ -5,249 +5,6 @@
 
 	.text
 
-	thumb_func_start LoadIQSkills
-LoadIQSkills:
-	push {r4-r6,lr}
-	ldr r5, [r0, 0x70]
-	ldrb r1, [r5, 0x6]
-	cmp r1, 0
-	beq _08071978
-	adds r4, r5, 0
-	adds r4, 0x90
-	adds r0, r4, 0
-	movs r1, 0x8
-	bl SetIQSkill
-	adds r0, r4, 0
-	movs r1, 0x6
-	bl SetIQSkill
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl SetIQSkill
-	adds r0, r5, 0
-	adds r0, 0xF7
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08071954
-	adds r0, r4, 0
-	movs r1, 0x12
-	bl SetIQSkill
-_08071954:
-	ldrb r0, [r5, 0x9]
-	ldr r1, _08071974
-	movs r2, 0
-	ldrsh r1, [r1, r2]
-	cmp r0, r1
-	blt _08071968
-	adds r0, r4, 0
-	movs r1, 0x16
-	bl SetIQSkill
-_08071968:
-	adds r1, r5, 0
-	adds r1, 0x94
-	movs r0, 0x2
-	strb r0, [r1]
-	b _080719BE
-	.align 2, 0
-_08071974: .4byte gItemMasterMinWildLevel
-_08071978:
-	adds r0, r5, 0
-	adds r0, 0x90
-	strb r1, [r0]
-	adds r2, r5, 0
-	adds r2, 0x91
-	strb r1, [r2]
-	adds r2, 0x1
-	strb r1, [r2]
-	movs r4, 0x1
-	adds r6, r0, 0
-_0807198C:
-	movs r1, 0xC
-	ldrsh r0, [r5, r1]
-	lsls r1, r4, 24
-	lsrs r1, 24
-	bl HasIQForSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _080719B8
-	movs r1, 0x1
-	lsls r1, r4
-	adds r0, r5, 0
-	adds r0, 0x8C
-	bl IsIQSkillSet
-	lsls r0, 24
-	cmp r0, 0
-	beq _080719B8
-	adds r0, r6, 0
-	adds r1, r4, 0
-	bl SetIQSkill
-_080719B8:
-	adds r4, 0x1
-	cmp r4, 0x17
-	ble _0807198C
-_080719BE:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end LoadIQSkills
-
-	thumb_func_start CanSeeTeammate
-CanSeeTeammate:
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, [r5, 0x70]
-	ldrb r0, [r0, 0x6]
-	cmp r0, 0
-	beq _080719D6
-	b _08071A0A
-_080719D2:
-	movs r0, 0x1
-	b _08071A0C
-_080719D6:
-	movs r6, 0
-_080719D8:
-	ldr r0, _08071A14
-	ldr r0, [r0]
-	lsls r1, r6, 2
-	ldr r2, _08071A18
-	adds r0, r2
-	adds r0, r1
-	ldr r4, [r0]
-	adds r0, r5, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _08071A04
-	cmp r5, r4
-	beq _08071A04
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl CanSee
-	lsls r0, 24
-	cmp r0, 0
-	bne _080719D2
-_08071A04:
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _080719D8
-_08071A0A:
-	movs r0, 0
-_08071A0C:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08071A14: .4byte gDungeonGlobalData
-_08071A18: .4byte 0x0001357c
-	thumb_func_end CanSeeTeammate
-
-	thumb_func_start GetMoveType_2
-GetMoveType_2:
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	ldrh r1, [r2, 0x2]
-	movs r0, 0xA2
-	lsls r0, 1
-	cmp r1, r0
-	beq _08071A38
-	adds r0, r2, 0
-	bl GetMoveType
-	lsls r0, 24
-	lsrs r0, 24
-	b _08071A3E
-_08071A38:
-	ldr r0, [r3, 0x70]
-	adds r0, 0x3E
-	ldrb r0, [r0]
-_08071A3E:
-	pop {r1}
-	bx r1
-	thumb_func_end GetMoveType_2
-
-	thumb_func_start sub_8071A44
-sub_8071A44:
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	ldrh r1, [r4, 0x2]
-	movs r0, 0xA2
-	lsls r0, 1
-	cmp r1, r0
-	beq _08071A60
-	adds r0, r4, 0
-	bl GetMovePower
-	ldrb r1, [r4, 0x5]
-	adds r0, r1
-	b _08071A6A
-_08071A60:
-	ldr r0, [r2, 0x70]
-	movs r1, 0x3C
-	ldrsh r0, [r0, r1]
-	ldrb r4, [r4, 0x5]
-	adds r0, r4
-_08071A6A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8071A44
-
-	thumb_func_start ToolboxEnabled
-ToolboxEnabled:
-	push {lr}
-	movs r1, 0x2
-	ldrsh r0, [r0, r1]
-	bl IsToolboxEnabled
-	lsls r0, 24
-	cmp r0, 0
-	beq _08071A84
-	movs r0, 0x1
-	b _08071A86
-_08071A84:
-	movs r0, 0
-_08071A86:
-	pop {r1}
-	bx r1
-	thumb_func_end ToolboxEnabled
-
-	thumb_func_start sub_8071A8C
-sub_8071A8C:
-	push {r4,lr}
-	adds r4, r0, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _08071AC2
-	ldr r1, [r4, 0x70]
-	adds r0, r1, 0
-	adds r0, 0xA4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _08071AC2
-	adds r0, r1, 0
-	adds r0, 0x40
-	ldrb r0, [r0]
-	cmp r0, 0x4A
-	beq _08071AB4
-	cmp r0, 0x47
-	bne _08071AB8
-_08071AB4:
-	movs r0, 0x1
-	b _08071ABA
-_08071AB8:
-	movs r0, 0
-_08071ABA:
-	cmp r0, 0
-	bne _08071AC2
-	movs r0, 0x1
-	b _08071AC4
-_08071AC2:
-	movs r0, 0
-_08071AC4:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8071A8C
-
 	thumb_func_start SetVisualFlags
 SetVisualFlags:
 	push {r4,r5,lr}
diff --git a/asm/code_808333C.s b/asm/code_808333C.s
index 5677a42..bd38800 100644
--- a/asm/code_808333C.s
+++ b/asm/code_808333C.s
@@ -1865,15 +1865,4 @@ _080840D0: .4byte 0xffff0000
 _080840D4: .4byte 0x00ffffff
 	thumb_func_end sub_80840A4
 
-	thumb_func_start sub_80840D8
-sub_80840D8:
-	ldr r2, _080840E4
-	movs r1, 0x1
-	orrs r1, r0
-	str r1, [r2]
-	bx lr
-	.align 2, 0
-_080840E4: .4byte gDungeonRngState
-	thumb_func_end sub_80840D8
-
 	.align 2, 0
diff --git a/asm/code_8084160.s b/asm/code_808417C.s
index fce2f1b..03b4f3b 100644
--- a/asm/code_8084160.s
+++ b/asm/code_808417C.s
@@ -5,24 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8084160
-sub_8084160:
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x64
-	bl DungeonRandomCapped
-	cmp r0, r4
-	blt _08084172
-	movs r0, 0
-	b _08084174
-_08084172:
-	movs r0, 0x1
-_08084174:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8084160
-
 	thumb_func_start sub_808417C
 sub_808417C:
 	push {r4-r6,lr}