From 34ccc1e35c8737873d508caea5db40c37ab24a58 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 1 Oct 2023 17:15:45 +0200 Subject: [PATCH] Diff JPN func_0203cb00 --- asm/main.s | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/asm/main.s b/asm/main.s index 2738752d..291c625c 100644 --- a/asm/main.s +++ b/asm/main.s @@ -82608,29 +82608,48 @@ func_0203cabc: ; 0x0203cabc .global func_0203cb00 arm_func_start func_0203cb00 func_0203cb00: ; 0x0203cb00 +.ifdef EUR stmdb sp!, {r3, lr} +.endif ldr r2, [r1] mov r0, #1 ldrh r1, [r2] cmp r1, #0xa +.ifdef EUR ldmeqia sp!, {r3, pc} +.endif +.ifdef JPN + bxeq lr +.endif cmp r1, #0x1a mov ip, #0 bne _0203cb4c ldrb r3, [r2, #3] ldrh r2, [r2, #4] ldr r1, _0203cb58 ; =0x00ff0002 +.ifdef EUR mov lr, ip +.endif orr r2, r2, r3, lsl #16 cmp r2, r1 +.ifdef EUR cmpne r2, #0xff0000 movne lr, r0 cmp lr, #0 movne ip, #1 +.endif +.ifdef JPN + movne ip, r0 +.endif _0203cb4c: cmp ip, #0 moveq r0, #0 +.ifdef EUR ldmia sp!, {r3, pc} +.endif +.ifdef JPN + bx lr +.endif .align 2, 0 arm_func_end func_0203cb00 _0203cb58: .word 0x00ff0002