huge loops

1 files changed, 2 insertions, 381 deletions

diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s
index 43f2a258..5a654a24 100644
--- a/arm9/asm/unk_02016B94.s
+++ b/arm9/asm/unk_02016B94.s
@@ -61,388 +61,9 @@
 
 
 
-	thumb_func_start FUN_02018268
-FUN_02018268: ; 0x02018268
-	push {r4-r7, lr}
-	sub sp, #0x44
-	str r1, [sp, #0x0]
-	str r2, [sp, #0x4]
-	add r7, r0, #0x0
-	ldr r0, [sp, #0x58]
-	add r6, r3, #0x0
-	str r0, [sp, #0x58]
-	ldr r0, [sp, #0x5c]
-	ldr r4, [sp, #0x68]
-	str r0, [sp, #0x5c]
-	ldr r0, [sp, #0x6c]
-	str r0, [sp, #0x6c]
-	ldr r0, [r7, #0x0]
-	str r0, [sp, #0x2c]
-	cmp r0, #0x0
-	bne _0201828C
-	b _020183D6
-_0201828C:
-	ldrb r0, [r7, #0x15]
-	add r1, sp, #0x40
-	add r1, #0x1
-	add r2, sp, #0x40
-	bl FUN_02017850
-	add r0, sp, #0x70
-	ldrb r0, [r0, #0x0]
-	cmp r0, #0x0
-	bne _0201833A
-	mov r0, #0x0
-	str r0, [sp, #0x28]
-	ldr r0, [sp, #0x58]
-	cmp r0, #0x0
-	bls _020182CA
-	add r1, sp, #0x48
-	ldrb r0, [r1, #0x1c]
-	str r0, [sp, #0x1c]
-	ldrb r0, [r1, #0x18]
-	str r0, [sp, #0x18]
-	lsl r1, r0, #0x1
-	ldr r0, [sp, #0x5c]
-	add r0, r0, r1
-	str r0, [sp, #0x14]
-_020182BC:
-	ldr r1, [sp, #0x4]
-	ldr r0, [sp, #0x28]
-	add r0, r1, r0
-	add r1, sp, #0x40
-	ldrb r1, [r1, #0x0]
-	cmp r0, r1
-	blt _020182CC
-_020182CA:
-	b _020183D6
-_020182CC:
-	ldr r2, [sp, #0x1c]
-	ldr r1, [sp, #0x28]
-	add r2, r2, r1
-	ldr r1, [sp, #0x6c]
-	cmp r2, r1
-	bge _020183D6
-	mov r5, #0x0
-	cmp r6, #0x0
-	bls _02018326
-	add r1, r4, #0x0
-	mul r1, r2
-	lsl r2, r1, #0x1
-	ldr r1, [sp, #0x14]
-	lsl r0, r0, #0x18
-	add r1, r1, r2
-	lsr r0, r0, #0x18
-	str r1, [sp, #0x10]
-	str r0, [sp, #0x30]
-_020182F0:
-	add r1, sp, #0x40
-	ldr r0, [sp, #0x0]
-	ldrb r1, [r1, #0x1]
-	add r0, r0, r5
-	cmp r0, r1
-	bge _02018326
-	ldr r1, [sp, #0x18]
-	add r1, r1, r5
-	cmp r1, r4
-	bge _02018326
-	ldrb r2, [r7, #0x15]
-	lsl r0, r0, #0x18
-	ldr r1, [sp, #0x30]
-	lsr r0, r0, #0x18
-	bl FUN_02017FFC
-	ldr r1, [sp, #0x10]
-	lsl r2, r5, #0x1
-	ldrh r1, [r1, r2]
-	lsl r2, r0, #0x1
-	ldr r0, [sp, #0x2c]
-	strh r1, [r0, r2]
-	add r0, r5, #0x1
-	lsl r0, r0, #0x18
-	lsr r5, r0, #0x18
-	cmp r5, r6
-	blo _020182F0
-_02018326:
-	ldr r0, [sp, #0x28]
-	add r0, r0, #0x1
-	lsl r0, r0, #0x18
-	lsr r1, r0, #0x18
-	str r1, [sp, #0x28]
-	ldr r0, [sp, #0x58]
-	cmp r1, r0
-	blo _020182BC
-	add sp, #0x44
-	pop {r4-r7, pc}
-_0201833A:
-	mov r0, #0x0
-	str r0, [sp, #0x8]
-	ldr r0, [sp, #0x58]
-	cmp r0, #0x0
-	bls _020183D6
-	add r1, sp, #0x48
-	ldrb r0, [r1, #0x1c]
-	str r0, [sp, #0x24]
-	ldrb r0, [r1, #0x18]
-	str r0, [sp, #0x20]
-_0201834E:
-	ldr r1, [sp, #0x4]
-	ldr r0, [sp, #0x8]
-	add r1, r1, r0
-	add r0, sp, #0x40
-	ldrb r0, [r0, #0x0]
-	cmp r1, r0
-	bge _020183D6
-	ldr r2, [sp, #0x24]
-	ldr r0, [sp, #0x8]
-	add r0, r2, r0
-	ldr r2, [sp, #0x6c]
-	cmp r0, r2
-	bge _020183D6
-	mov r5, #0x0
-	cmp r6, #0x0
-	bls _020183C6
-	lsl r1, r1, #0x18
-	lsl r0, r0, #0x18
-	lsr r1, r1, #0x18
-	lsr r0, r0, #0x18
-	str r1, [sp, #0x34]
-	str r0, [sp, #0x3c]
-_0201837A:
-	add r1, sp, #0x40
-	ldr r0, [sp, #0x0]
-	ldrb r1, [r1, #0x1]
-	add r0, r0, r5
-	cmp r0, r1
-	bge _020183C6
-	ldr r1, [sp, #0x20]
-	add r1, r1, r5
-	str r1, [sp, #0xc]
-	cmp r1, r4
-	bge _020183C6
-	ldrb r2, [r7, #0x15]
-	lsl r0, r0, #0x18
-	ldr r1, [sp, #0x34]
-	lsr r0, r0, #0x18
-	bl FUN_02017FFC
-	str r0, [sp, #0x38]
-	ldr r0, [sp, #0xc]
-	ldr r1, [sp, #0x3c]
-	lsl r0, r0, #0x18
-	ldr r3, [sp, #0x6c]
-	lsr r0, r0, #0x18
-	add r2, r4, #0x0
-	bl FUN_02018068
-	lsl r1, r0, #0x1
-	ldr r0, [sp, #0x5c]
-	ldrh r0, [r0, r1]
-	ldr r1, [sp, #0x38]
-	lsl r2, r1, #0x1
-	ldr r1, [sp, #0x2c]
-	strh r0, [r1, r2]
-	add r0, r5, #0x1
-	lsl r0, r0, #0x18
-	lsr r5, r0, #0x18
-	cmp r5, r6
-	blo _0201837A
-_020183C6:
-	ldr r0, [sp, #0x8]
-	add r0, r0, #0x1
-	lsl r0, r0, #0x18
-	lsr r1, r0, #0x18
-	str r1, [sp, #0x8]
-	ldr r0, [sp, #0x58]
-	cmp r1, r0
-	blo _0201834E
-_020183D6:
-	add sp, #0x44
-	pop {r4-r7, pc}
-	.balign 4
 
-	thumb_func_start FUN_020183DC
-FUN_020183DC: ; 0x020183DC
-	push {r4-r7, lr}
-	sub sp, #0x44
-	str r1, [sp, #0x0]
-	str r2, [sp, #0x4]
-	add r7, r0, #0x0
-	ldr r0, [sp, #0x58]
-	add r6, r3, #0x0
-	str r0, [sp, #0x58]
-	ldr r0, [sp, #0x5c]
-	ldr r4, [sp, #0x68]
-	str r0, [sp, #0x5c]
-	ldr r0, [sp, #0x6c]
-	str r0, [sp, #0x6c]
-	ldr r0, [r7, #0x0]
-	str r0, [sp, #0x2c]
-	cmp r0, #0x0
-	bne _02018400
-	b _0201853C
-_02018400:
-	ldrb r0, [r7, #0x15]
-	add r1, sp, #0x40
-	add r1, #0x1
-	add r2, sp, #0x40
-	bl FUN_02017850
-	add r0, sp, #0x70
-	ldrb r0, [r0, #0x0]
-	cmp r0, #0x0
-	bne _020184A4
-	mov r0, #0x0
-	str r0, [sp, #0x28]
-	ldr r0, [sp, #0x58]
-	cmp r0, #0x0
-	bhi _02018420
-	b _0201853C
-_02018420:
-	add r1, sp, #0x48
-	ldrb r0, [r1, #0x1c]
-	str r0, [sp, #0x1c]
-	ldrb r0, [r1, #0x18]
-	ldr r1, [sp, #0x5c]
-	str r0, [sp, #0x18]
-	add r0, r1, r0
-	str r0, [sp, #0x14]
-_02018430:
-	ldr r1, [sp, #0x4]
-	ldr r0, [sp, #0x28]
-	add r0, r1, r0
-	add r1, sp, #0x40
-	ldrb r1, [r1, #0x0]
-	cmp r0, r1
-	bge _0201853C
-	ldr r2, [sp, #0x1c]
-	ldr r1, [sp, #0x28]
-	add r2, r2, r1
-	ldr r1, [sp, #0x6c]
-	cmp r2, r1
-	bge _0201853C
-	mov r5, #0x0
-	cmp r6, #0x0
-	bls _02018490
-	ldr r1, [sp, #0x14]
-	mul r2, r4
-	lsl r0, r0, #0x18
-	add r1, r1, r2
-	lsr r0, r0, #0x18
-	str r1, [sp, #0x10]
-	str r0, [sp, #0x30]
-_0201845E:
-	add r1, sp, #0x40
-	ldr r0, [sp, #0x0]
-	ldrb r1, [r1, #0x1]
-	add r0, r0, r5
-	cmp r0, r1
-	bge _02018490
-	ldr r1, [sp, #0x18]
-	add r1, r1, r5
-	cmp r1, r4
-	bge _02018490
-	ldrb r2, [r7, #0x15]
-	lsl r0, r0, #0x18
-	ldr r1, [sp, #0x30]
-	lsr r0, r0, #0x18
-	bl FUN_02017FFC
-	ldr r1, [sp, #0x10]
-	ldrb r2, [r1, r5]
-	ldr r1, [sp, #0x2c]
-	strb r2, [r1, r0]
-	add r0, r5, #0x1
-	lsl r0, r0, #0x18
-	lsr r5, r0, #0x18
-	cmp r5, r6
-	blo _0201845E
-_02018490:
-	ldr r0, [sp, #0x28]
-	add r0, r0, #0x1
-	lsl r0, r0, #0x18
-	lsr r1, r0, #0x18
-	str r1, [sp, #0x28]
-	ldr r0, [sp, #0x58]
-	cmp r1, r0
-	blo _02018430
-	add sp, #0x44
-	pop {r4-r7, pc}
-_020184A4:
-	mov r0, #0x0
-	str r0, [sp, #0x8]
-	ldr r0, [sp, #0x58]
-	cmp r0, #0x0
-	bls _0201853C
-	add r1, sp, #0x48
-	ldrb r0, [r1, #0x1c]
-	str r0, [sp, #0x24]
-	ldrb r0, [r1, #0x18]
-	str r0, [sp, #0x20]
-_020184B8:
-	ldr r1, [sp, #0x4]
-	ldr r0, [sp, #0x8]
-	add r1, r1, r0
-	add r0, sp, #0x40
-	ldrb r0, [r0, #0x0]
-	cmp r1, r0
-	bge _0201853C
-	ldr r2, [sp, #0x24]
-	ldr r0, [sp, #0x8]
-	add r0, r2, r0
-	ldr r2, [sp, #0x6c]
-	cmp r0, r2
-	bge _0201853C
-	mov r5, #0x0
-	cmp r6, #0x0
-	bls _0201852C
-	lsl r1, r1, #0x18
-	lsl r0, r0, #0x18
-	lsr r1, r1, #0x18
-	lsr r0, r0, #0x18
-	str r1, [sp, #0x34]
-	str r0, [sp, #0x3c]
-_020184E4:
-	add r1, sp, #0x40
-	ldr r0, [sp, #0x0]
-	ldrb r1, [r1, #0x1]
-	add r0, r0, r5
-	cmp r0, r1
-	bge _0201852C
-	ldr r1, [sp, #0x20]
-	add r1, r1, r5
-	str r1, [sp, #0xc]
-	cmp r1, r4
-	bge _0201852C
-	ldrb r2, [r7, #0x15]
-	lsl r0, r0, #0x18
-	ldr r1, [sp, #0x34]
-	lsr r0, r0, #0x18
-	bl FUN_02017FFC
-	str r0, [sp, #0x38]
-	ldr r0, [sp, #0xc]
-	ldr r1, [sp, #0x3c]
-	lsl r0, r0, #0x18
-	ldr r3, [sp, #0x6c]
-	lsr r0, r0, #0x18
-	add r2, r4, #0x0
-	bl FUN_02018068
-	ldr r1, [sp, #0x5c]
-	ldrb r2, [r1, r0]
-	ldr r1, [sp, #0x2c]
-	ldr r0, [sp, #0x38]
-	strb r2, [r1, r0]
-	add r0, r5, #0x1
-	lsl r0, r0, #0x18
-	lsr r5, r0, #0x18
-	cmp r5, r6
-	blo _020184E4
-_0201852C:
-	ldr r0, [sp, #0x8]
-	add r0, r0, #0x1
-	lsl r0, r0, #0x18
-	lsr r1, r0, #0x18
-	str r1, [sp, #0x8]
-	ldr r0, [sp, #0x58]
-	cmp r1, r0
-	blo _020184B8
-_0201853C:
-	add sp, #0x44
-	pop {r4-r7, pc}
+
+
 
 	thumb_func_start FUN_02018540
 FUN_02018540: ; 0x02018540