From 62f274227f76e42df206811889f76ea08a32ff4f Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Sun, 1 Oct 2023 15:45:28 +0200
Subject: [PATCH] Diff JPN func_020334b4

---
 asm/main.s | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/asm/main.s b/asm/main.s
index 7d721b4e..ee99e3de 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -69768,8 +69768,14 @@ _020334b0: .word 0x0001001e
 	.global func_020334b4
 	arm_func_start func_020334b4
 func_020334b4: ; 0x020334b4
+.ifdef EUR
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
+.endif
+.ifdef JPN
+	stmdb sp!, {r3, r4, r5, r6, r7, lr}
+.endif
 	sub sp, sp, #8
+.ifdef EUR
 	mov sb, r0
 	mov r8, r1
 	mov r7, r2
@@ -69829,20 +69835,54 @@ _02033570:
 	ldr r1, [sb, #0x2c]
 	add r2, r2, r5
 	add r3, r6, r3
+.endif
+.ifdef JPN
+	mov r4, r2
+	ldrsh r2, [r4, #0xe]
+	mov r5, r1
+	mov r6, r0
+	stmia sp, {r2, r5}
+	ldrsh r0, [r4, #8]
+	ldrsh lr, [r4, #0xa]
+	ldr ip, [sp, #0x20]
+	add r2, r0, r3
+	ldr r1, [r6, #0x2c]
+	add r0, r6, #0x10
+	add r3, lr, ip
+.endif
 	bl func_020296e0
+.ifdef EUR
 	ldr r6, [sb, #0x2c]
 	mov r1, r8
 	mov r0, r6
 	ldr r5, [sb, #0x30]
+.endif
+.ifdef JPN
+	ldr r7, [r6, #0x2c]
+	mov r1, r5
+	mov r0, r7
+	ldr r5, [r6, #0x30]
+.endif
 	bl func_02023ea4
+.ifdef EUR
 	ldr r2, _02033624 ; =0x0000ffff
 	mov r1, r0
 	cmp r1, r2
 	ldreq r0, [r6]
 	ldreqh r1, [r0, #2]
 	mov r0, r6
+.endif
+.ifdef JPN
+	ldr r2, _02033624 ; =0x0000ffff
+	mov r1, r0
+	cmp r1, r2
+	ldreq r0, [r7]
+	ldreqh r1, [r0, #2]
+	mov r0, r7
+.endif
 	bl func_02023eec
 	ldrsb r0, [r0, #2]
+.ifdef EUR
 	cmp r4, #0
 	ldrsh r1, [r7, #8]
 	add r0, r0, r5
@@ -69862,11 +69902,19 @@ _02033570:
 	streqb r0, [sb, #0x51]
 	add sp, sp, #8
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
+.endif
+.ifdef JPN
+	strh r0, [r4, #8]
+	add sp, sp, #8
+	ldmia sp!, {r3, r4, r5, r6, r7, pc}
+.endif
 	.align 2, 0
 	arm_func_end func_020334b4
+.ifdef EUR
 _02033618: .word data_02056fd0
 _0203361c: .word data_020570d0
 _02033620: .word 0x00000153
+.endif
 _02033624: .word 0x0000ffff
 
 	.global func_02033628