Merge pull request #169 from SethBarberee/nov_2023

Nov 2023
pret · Dec 10, 2023 · 6d4046b · 6d4046b
2 parents 45b1881 + 5d34103
commit 6d4046b
Show file tree

Hide file tree

Showing 53 changed files with 8,658 additions and 10,267 deletions.
diff --git a/asm/code_80130A8.s b/asm/code_80130A8.s
diff --git a/asm/code_80140DC.s b/asm/code_80140DC.s
diff --git a/asm/code_8040094.s b/asm/code_8040094.s
@@ -2771,106 +2771,4 @@ _08041692:
 	bx r1
 	thumb_func_end sub_8041550
 
-	thumb_func_start sub_80416A4
-sub_80416A4:
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r2, 24
-	lsrs r2, 24
-	movs r3, 0
-	ldrsh r4, [r0, r3]
-	lsls r3, r4, 1
-	adds r3, r4
-	lsls r3, 11
-	movs r4, 0xC0
-	lsls r4, 4
-	adds r3, r4
-	str r3, [sp]
-	movs r4, 0x2
-	ldrsh r3, [r0, r4]
-	lsls r0, r3, 1
-	adds r0, r3
-	lsls r0, 11
-	movs r3, 0x80
-	lsls r3, 5
-	adds r0, r3
-	str r0, [sp, 0x4]
-	mov r0, sp
-	bl sub_80416E0
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80416A4
-
-	thumb_func_start sub_80416E0
-sub_80416E0:
-	push {r4,r5,lr}
-	sub sp, 0x28
-	adds r3, r0, 0
-	lsls r2, 24
-	lsrs r5, r2, 24
-	str r1, [sp]
-	movs r2, 0
-	str r2, [sp, 0x4]
-	movs r4, 0x1
-	negs r4, r4
-	str r4, [sp, 0x8]
-	mov r1, sp
-	ldr r0, [r3]
-	cmp r0, 0
-	bge _08041700
-	adds r0, 0xFF
-_08041700:
-	asrs r0, 8
-	strh r0, [r1, 0xC]
-	mov r1, sp
-	ldr r0, [r3, 0x4]
-	cmp r0, 0
-	bge _0804170E
-	adds r0, 0xFF
-_0804170E:
-	asrs r0, 8
-	strh r0, [r1, 0xE]
-	str r4, [sp, 0x14]
-	mov r0, sp
-	strh r2, [r0, 0x10]
-	strh r2, [r0, 0x12]
-	ldr r0, _08041738
-	str r0, [sp, 0x18]
-	add r0, sp, 0x1C
-	bl sub_8004E8C
-	mov r0, sp
-	movs r1, 0
-	bl sub_8041764
-	adds r4, r0, 0
-	cmp r5, 0
-	beq _08041758
-	movs r5, 0
-	b _08041744
-	.align 2, 0
-_08041738: .4byte 0x0000ffff
-_0804173C:
-	movs r0, 0x42
-	bl sub_803E46C
-	adds r5, 0x1
-_08041744:
-	cmp r5, 0x63
-	bgt _08041754
-	adds r0, r4, 0
-	bl sub_800E9A8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804173C
-_08041754:
-	movs r4, 0x1
-	negs r4, r4
-_08041758:
-	adds r0, r4, 0
-	add sp, 0x28
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80416E0
-
         .align 2,0