Merge pull request #170 from tgsm/match-a-func

Match sub_80141E0
pret · Dec 17, 2023 · 8529cad · 8529cad
2 parents 6d4046b + 6e708df
commit 8529cad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 34 deletions.
diff --git a/asm/code_80140DC.s b/asm/code_80140DC.s
@@ -5,35 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80141E0
-sub_80141E0:
-	push {r4-r6,lr}
-	sub sp, 0x14
-	lsls r6, r2, 16
-	movs r2, 0x1
-	negs r2, r2
-	ldr r3, _08014210
-	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
-_08014210: .4byte gUnknown_80D485C
-	thumb_func_end sub_80141E0
-
 	thumb_func_start sub_8014214
 sub_8014214:
 	push {r4-r6,lr}

diff --git a/src/code_80140DC.c b/src/code_80140DC.c
@@ -80,8 +80,7 @@ void sub_80141B4(const u8 *text, u32 param_2, OpenedFile **file, u16 param_4)
     sub_8014248(text, param_2, -1, NULL, NULL, 3, 0, file, param_4);
 }
 
-// https://decomp.me/scratch/w4sX4
-// void sub_80141E0(const u8 *text, OpenedFile **file, u16 param_4)
-// {
-//     sub_8014248(text, 0, -1, gUnknown_80D485C, NULL, 3, 0, file, param_4);
-// }
+void sub_80141E0(const u8 *text, OpenedFile **file, u16 param_3)
+{
+    sub_8014248(text, 0, -1, gUnknown_80D485C, NULL, 3, 0, file, param_3 | 0x300);
+}