diff --git a/asm/main.s b/asm/main.s index b3e21b7a..7d721b4e 100644 --- a/asm/main.s +++ b/asm/main.s @@ -69678,6 +69678,7 @@ _020333b8: func_020333e0: ; 0x020333e0 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 +.ifdef EUR mov r6, r2 ldr r4, [r6] mov r7, r1 @@ -69685,7 +69686,14 @@ func_020333e0: ; 0x020333e0 ldrb r5, [r4, #3] ldrh r4, [r4, #4] ldr r2, _020334b0 ; =0x0001001e +.endif +.ifdef JPN + mov r5, r2 + mov r6, r1 + ldr r1, [r5] +.endif mov r8, r0 +.ifdef EUR orr r0, r4, r5, lsl #16 cmp r0, r2 moveq r0, #0 @@ -69694,6 +69702,11 @@ func_020333e0: ; 0x020333e0 ldr r1, [r1] mov r0, r8 mov r5, r3 +.endif +.ifdef JPN + mov r7, r3 + str r1, [sp, #4] +.endif mov r4, #1 bl func_02033b0c cmp r0, #0 @@ -69704,8 +69717,14 @@ func_020333e0: ; 0x020333e0 beq _02033468 ldr r4, [sp, #0x20] mov r0, r8 +.ifdef EUR mov r1, r7 mov r3, r5 +.endif +.ifdef JPN + mov r1, r6 + mov r3, r7 +.endif add r2, r8, #0xc str r4, [sp] bl func_02033628 @@ -69721,11 +69740,23 @@ _02033468: beq _0203349c add r0, sp, #4 bl func_020374b4 +.ifdef EUR ldrsh r1, [r7, #8] add r0, r1, r0 strh r0, [r7, #8] +.endif +.ifdef JPN + ldrsh r1, [r6, #8] + add r0, r1, r0 + strh r0, [r6, #8] +.endif _0203349c: +.ifdef EUR mov r0, r6 +.endif +.ifdef JPN + mov r0, r5 +.endif bl func_02037604 mov r0, r4 add sp, sp, #8