Through GetMonBaseStat

1 files changed, 0 insertions, 230 deletions

diff --git a/arm9/asm/pokemon_s.s b/arm9/asm/pokemon_s.s
index d88114bc..987aaf06 100644
--- a/arm9/asm/pokemon_s.s
+++ b/arm9/asm/pokemon_s.s
@@ -24,236 +24,6 @@ UNK_021C5AC0: ; 0x021C5AC0
 
 	.text
 
-	thumb_func_start AllocAndLoadMonPersonal
-AllocAndLoadMonPersonal: ; 0x0206851C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, r1, #0x0
-	mov r1, #0x2c
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl LoadMonPersonal
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start GetPersonalAttr
-GetPersonalAttr: ; 0x02068538
-	push {r4-r6, lr}
-	add r4, r0, #0x0
-	add r6, r1, #0x0
-	cmp r4, #0x0
-	bne _02068546
-	bl ErrorHandling
-_02068546:
-	cmp r6, #0x20
-	bhi _0206863A
-	add r0, r6, r6
-	add r0, pc
-	ldrh r0, [r0, #0x6]
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	add pc, r0
-_02068556: ; jump table (using 16-bit offset)
-	.short _02068598 - _02068556 - 2; case 0
-	.short _0206859C - _02068556 - 2; case 1
-	.short _020685A0 - _02068556 - 2; case 2
-	.short _020685A4 - _02068556 - 2; case 3
-	.short _020685A8 - _02068556 - 2; case 4
-	.short _020685AC - _02068556 - 2; case 5
-	.short _020685B0 - _02068556 - 2; case 6
-	.short _020685B4 - _02068556 - 2; case 7
-	.short _020685B8 - _02068556 - 2; case 8
-	.short _020685BC - _02068556 - 2; case 9
-	.short _020685C0 - _02068556 - 2; case 10
-	.short _020685C8 - _02068556 - 2; case 11
-	.short _020685D0 - _02068556 - 2; case 12
-	.short _020685D8 - _02068556 - 2; case 13
-	.short _020685E0 - _02068556 - 2; case 14
-	.short _020685E8 - _02068556 - 2; case 15
-	.short _020685F0 - _02068556 - 2; case 16
-	.short _020685F4 - _02068556 - 2; case 17
-	.short _020685F8 - _02068556 - 2; case 18
-	.short _020685FC - _02068556 - 2; case 19
-	.short _02068600 - _02068556 - 2; case 20
-	.short _02068604 - _02068556 - 2; case 21
-	.short _02068608 - _02068556 - 2; case 22
-	.short _0206860C - _02068556 - 2; case 23
-	.short _02068610 - _02068556 - 2; case 24
-	.short _02068614 - _02068556 - 2; case 25
-	.short _02068618 - _02068556 - 2; case 26
-	.short _0206861C - _02068556 - 2; case 27
-	.short _02068624 - _02068556 - 2; case 28
-	.short _0206862C - _02068556 - 2; case 29
-	.short _02068630 - _02068556 - 2; case 30
-	.short _02068634 - _02068556 - 2; case 31
-	.short _02068638 - _02068556 - 2; case 32
-_02068598:
-	ldrb r5, [r4, #0x0]
-	b _0206863A
-_0206859C:
-	ldrb r5, [r4, #0x1]
-	b _0206863A
-_020685A0:
-	ldrb r5, [r4, #0x2]
-	b _0206863A
-_020685A4:
-	ldrb r5, [r4, #0x3]
-	b _0206863A
-_020685A8:
-	ldrb r5, [r4, #0x4]
-	b _0206863A
-_020685AC:
-	ldrb r5, [r4, #0x5]
-	b _0206863A
-_020685B0:
-	ldrb r5, [r4, #0x6]
-	b _0206863A
-_020685B4:
-	ldrb r5, [r4, #0x7]
-	b _0206863A
-_020685B8:
-	ldrb r5, [r4, #0x8]
-	b _0206863A
-_020685BC:
-	ldrb r5, [r4, #0x9]
-	b _0206863A
-_020685C0:
-	ldrh r0, [r4, #0xa]
-	lsl r0, r0, #0x1e
-	lsr r5, r0, #0x1e
-	b _0206863A
-_020685C8:
-	ldrh r0, [r4, #0xa]
-	lsl r0, r0, #0x1c
-	lsr r5, r0, #0x1e
-	b _0206863A
-_020685D0:
-	ldrh r0, [r4, #0xa]
-	lsl r0, r0, #0x1a
-	lsr r5, r0, #0x1e
-	b _0206863A
-_020685D8:
-	ldrh r0, [r4, #0xa]
-	lsl r0, r0, #0x18
-	lsr r5, r0, #0x1e
-	b _0206863A
-_020685E0:
-	ldrh r0, [r4, #0xa]
-	lsl r0, r0, #0x16
-	lsr r5, r0, #0x1e
-	b _0206863A
-_020685E8:
-	ldrh r0, [r4, #0xa]
-	lsl r0, r0, #0x14
-	lsr r5, r0, #0x1e
-	b _0206863A
-_020685F0:
-	ldrh r5, [r4, #0xc]
-	b _0206863A
-_020685F4:
-	ldrh r5, [r4, #0xe]
-	b _0206863A
-_020685F8:
-	ldrb r5, [r4, #0x10]
-	b _0206863A
-_020685FC:
-	ldrb r5, [r4, #0x11]
-	b _0206863A
-_02068600:
-	ldrb r5, [r4, #0x12]
-	b _0206863A
-_02068604:
-	ldrb r5, [r4, #0x13]
-	b _0206863A
-_02068608:
-	ldrb r5, [r4, #0x14]
-	b _0206863A
-_0206860C:
-	ldrb r5, [r4, #0x15]
-	b _0206863A
-_02068610:
-	ldrb r5, [r4, #0x16]
-	b _0206863A
-_02068614:
-	ldrb r5, [r4, #0x17]
-	b _0206863A
-_02068618:
-	ldrb r5, [r4, #0x18]
-	b _0206863A
-_0206861C:
-	ldrb r0, [r4, #0x19]
-	lsl r0, r0, #0x19
-	lsr r5, r0, #0x19
-	b _0206863A
-_02068624:
-	ldrb r0, [r4, #0x19]
-	lsl r0, r0, #0x18
-	lsr r5, r0, #0x1f
-	b _0206863A
-_0206862C:
-	ldr r5, [r4, #0x1c]
-	b _0206863A
-_02068630:
-	ldr r5, [r4, #0x20]
-	b _0206863A
-_02068634:
-	ldr r5, [r4, #0x24]
-	b _0206863A
-_02068638:
-	ldr r5, [r4, #0x28]
-_0206863A:
-	add r0, r5, #0x0
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FreeMonPersonal
-FreeMonPersonal: ; 0x02068640
-	push {r4, lr}
-	add r4, r0, #0x0
-	bne _0206864A
-	bl ErrorHandling
-_0206864A:
-	add r0, r4, #0x0
-	bl FreeToHeap
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start GetMonBaseStat_HandleFormeConversion
-GetMonBaseStat_HandleFormeConversion: ; 0x02068654
-	push {r3-r5, lr}
-	add r4, r2, #0x0
-	bl ResolveMonForme
-	mov r1, #0x0
-	bl AllocAndLoadMonPersonal
-	add r5, r0, #0x0
-	add r1, r4, #0x0
-	bl GetPersonalAttr
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl FreeMonPersonal
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start GetMonBaseStat
-GetMonBaseStat: ; 0x02068678
-	push {r3-r5, lr}
-	add r4, r1, #0x0
-	mov r1, #0x0
-	bl AllocAndLoadMonPersonal
-	add r5, r0, #0x0
-	add r1, r4, #0x0
-	bl GetPersonalAttr
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl FreeMonPersonal
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
 	thumb_func_start GetPercentProgressTowardsNextLevel
 GetPercentProgressTowardsNextLevel: ; 0x02068698
 	push {r3-r7, lr}