Merge pull request #171 from SethBarberee/dec_2023

pret · Jan 30, 2024 · ed83438 · ed83438
2 parents 8529cad + a372938
commit ed83438
Show file tree

Hide file tree

Showing 40 changed files with 10,981 additions and 12,099 deletions.
diff --git a/asm/code_80130A8.s b/asm/code_80130A8.s
@@ -299,29 +299,4 @@ _080140AC: .4byte 0x00003fff
 _080140B0: .4byte 0x00000fff
 	thumb_func_end sub_8013F84
 
-	thumb_func_start sub_80140B4
-sub_80140B4:
-	push {r4-r7,lr}
-	ldr r4, _080140D8
-	adds r2, r0, 0
-	movs r3, 0x3
-_080140BC:
-	adds r1, r2, 0
-	adds r0, r4, 0
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	adds r4, 0x18
-	adds r2, 0x18
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080140BC
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080140D8: .4byte gUnknown_80D47C8
-	thumb_func_end sub_80140B4
-
     .align 2,0
diff --git a/asm/code_80140DC.s b/asm/code_80140DC.s
@@ -5,35 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8014214
-sub_8014214:
-	push {r4-r6,lr}
-	sub sp, 0x14
-	lsls r6, r2, 16
-	movs r2, 0x1
-	negs r2, r2
-	ldr r3, _08014244
-	movs r5, 0
-	str r5, [sp]
-	movs r4, 0x3
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	str r1, [sp, 0xC]
-	movs r1, 0xC0
-	lsls r1, 18
-	orrs r1, r6
-	lsrs r1, 16
-	str r1, [sp, 0x10]
-	movs r1, 0
-	bl sub_8014248
-	add sp, 0x14
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08014244: .4byte gUnknown_80D4880
-	thumb_func_end sub_8014214
-
 	thumb_func_start sub_8014248
 sub_8014248:
 	push {r4-r7,lr}