From f2581b0d986a0d8fc7727dfa67c0ca550c81de89 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Mon, 2 Oct 2023 17:56:43 +0200
Subject: [PATCH] Fix diff mistakes and disasm some unreachable code

---
 asm/main.s | 64 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/asm/main.s b/asm/main.s
index c3020585..c6e22ef8 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -84383,7 +84383,7 @@ func_0203dcfc: ; 0x0203dcfc
 	ldrh r1, [r6, #0x4a]
 	ldrb r2, [r6, #0x4c]
 .endif
-.ifdef EUR
+.ifdef JPN
 	ldrh r1, [r6, #0x3e]
 	ldrh r2, [r6, #0x40]
 .endif
@@ -108758,9 +108758,15 @@ _0204f5b0:
 	bne _0204f5b0
 	b _0204f608
 _0204f5c8:
-	.byte 0x3c, 0x30, 0x9b, 0xe5, 0x04, 0x10, 0xa0, 0xe1
-	.byte 0x07, 0x20, 0xa0, 0xe1, 0x06, 0x00, 0x89, 0xe0, 0xc7, 0xff, 0xff, 0xeb, 0xa1, 0x01, 0x00, 0xeb
-	.byte 0x00, 0x00, 0x8b, 0xe2, 0x96, 0xff, 0xff, 0xeb, 0x06, 0x00, 0x00, 0xea
+	ldr r3, [r11, #0x3c]
+	mov r1, r4
+	mov r2, r7
+	add r0, r9, r6
+	bl func_0204f4fc
+	bl func_0204fc68
+	add r0, r11, #0x0
+	bl func_0204f444
+	b _0204f608
 _0204f5ec:
 	cmp r8, #0
 	beq _0204f608
@@ -108805,9 +108811,16 @@ _0204f658:
 	add sp, fp, #0x18
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, fp, pc}
 _0204f674:
-	.byte 0x38, 0x30, 0x9b, 0xe5, 0x07, 0x00, 0xa0, 0xe1, 0x08, 0x10, 0xa0, 0xe1
-	.byte 0x05, 0x20, 0xa0, 0xe1, 0x9c, 0xff, 0xff, 0xeb, 0x76, 0x01, 0x00, 0xeb, 0x00, 0x00, 0x8b, 0xe2
-	.byte 0x6b, 0xff, 0xff, 0xeb, 0x18, 0xd0, 0x8b, 0xe2, 0xf8, 0x89, 0xbd, 0xe8
+	ldr r3, [fp, #0x3c]
+	mov r0, r7
+	mov r1, r8
+	mov r2, r5
+	bl func_0204f4fc
+	bl func_0204fc68
+	add r0, fp, #0x0
+	bl func_0204f444
+	add sp, fp, #0x18
+	ldmia sp!, {r3, r4, r5, r6, r7, r8, fp, pc}
 _0204f69c:
 	cmp r6, #0
 	addeq sp, fp, #0x18
@@ -108844,14 +108857,28 @@ _0204f6f0:
 	bne _0204f6f0
 	add sp, fp, #0x30
 	ldmia sp!, {r4, r5, r6, r7, fp, pc}
-	arm_func_end func_0204f6c4
 _0204f70c:
-	.byte 0x14, 0xd0, 0x8b, 0xe5
-	.byte 0x01, 0x70, 0x57, 0xe2, 0x09, 0x00, 0x00, 0x0a, 0x06, 0x40, 0x44, 0xe0, 0x04, 0x00, 0xa0, 0xe1
-	.byte 0x35, 0xff, 0x2f, 0xe1, 0x01, 0x70, 0x57, 0xe2, 0xfa, 0xff, 0xff, 0x1a, 0x03, 0x00, 0x00, 0xea
-	.byte 0x5b, 0x00, 0x00, 0xeb, 0x00, 0x00, 0x8b, 0xe2, 0x41, 0xff, 0xff, 0xeb, 0x14, 0xd0, 0x9b, 0xe5
-	.byte 0x48, 0x01, 0x00, 0xeb, 0x18, 0x00, 0x8b, 0xe2, 0x3d, 0xff, 0xff, 0xeb, 0x30, 0xd0, 0x8b, 0xe2
-	.byte 0xf0, 0x88, 0xbd, 0xe8
+	str sp, [fp, #0x14]
+	subs r7, r7, #0x1
+	beq _0204f740
+_0204f718:
+	sub r4, r4, r6
+	mov r0, r4
+	blx r5
+	subs r7, r7, #0x1
+	bne _0204f718
+	b _0204f740
+	bl func_0204f8a4
+	add r0, fp, #0x0
+	bl func_0204f444
+	ldr sp, [fp, #0x14]
+_0204f740:
+	bl func_0204fc68
+	add r0, fp, #0x18
+	bl func_0204f444
+	add sp, fp, #0x30
+	ldmia sp!, {r4, r5, r6, r7, fp, pc}
+	arm_func_end func_0204f6c4
 
 	.global func_0204f754
 	arm_func_start func_0204f754
@@ -108875,10 +108902,13 @@ _0204f780:
 	bne _0204f780
 	add sp, fp, #0x18
 	ldmia sp!, {r4, r5, r6, r7, fp, pc}
-	arm_func_end func_0204f754
 _0204f79c:
-	.byte 0x40, 0x00, 0x00, 0xeb
-	.byte 0x00, 0x00, 0x8b, 0xe2, 0x26, 0xff, 0xff, 0xeb, 0x18, 0xd0, 0x8b, 0xe2, 0xf0, 0x88, 0xbd, 0xe8
+	bl func_0204f8a4
+	add r0, fp, #0x0
+	bl func_0204f444
+	add sp, fp, #0x18
+	ldmia sp!, {r4, r5, r6, r7, fp, pc}
+	arm_func_end func_0204f754
 
 	.global func_0204f7b0
 	arm_func_start func_0204f7b0