diff --git a/asm/main.s b/asm/main.s index a1ac8d13..1d53a5bf 100644 --- a/asm/main.s +++ b/asm/main.s @@ -79031,7 +79031,12 @@ _02039d70: .word data_02056be4 arm_func_start func_02039d74 func_02039d74: ; 0x02039d74 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} +.ifdef EUR sub sp, sp, #0x88 +.endif +.ifdef JPN + sub sp, sp, #0x68 +.endif mov r3, #0 str r3, [sp, #0x24] str r3, [sp, #0x20] @@ -79039,7 +79044,12 @@ func_02039d74: ; 0x02039d74 ldr r3, [r0] mov sb, r1 mov r8, r2 +.ifdef EUR ldrb r5, [sl, #0x50] +.endif +.ifdef JPN + ldrb r5, [sl, #0x51] +.endif ldr r4, _0203a15c ; =data_027e0c68 ldr r3, [r3, #0x6c] add r1, sp, #0x24 @@ -79181,7 +79191,12 @@ _02039f54: bl func_0203a2c0 cmp r0, #0 beq _0203a0b4 +.ifdef EUR add r0, sp, #0x68 +.endif +.ifdef JPN + add r0, sp, #0x48 +.endif bl func_01ffbe34 ldr r0, _0203a17c ; =data_02056a10 mov r3, #4 @@ -79207,6 +79222,7 @@ _02039f54: str r1, [sp, #0x10] ldr r0, [r0, #0x10] cmp r0, #1 +.ifdef EUR bne _0203a04c blx func_0202ab48 cmp r0, #0 @@ -79216,6 +79232,12 @@ _02039f54: rsb r0, r0, #0x108 add r0, r0, r1 str r0, [sp, #0x14] +.endif +.ifdef JPN + subeq r0, r2, #0x80 + rsbeq r0, r0, #0x88 + streq r0, [sp, #0x14] +.endif _0203a04c: ldrb r0, [sl, #0x57f] cmp r0, #0 @@ -79224,14 +79246,21 @@ _0203a04c: ldrsh r0, [r0, #0x6c] cmp r0, #0 bgt _0203a090 +.ifdef EUR add r0, sp, #0x48 bl func_01ffbe34 mov r0, #1 strb r0, [sp, #0x52] +.endif ldr r1, [sp, #0x14] ldr r2, [sp, #0x10] +.ifdef EUR add r3, sp, #0x48 +.endif add r0, sl, #0x1f0 +.ifdef JPN + mov r3, #0 +.endif bl func_02034a1c b _0203a0b4 _0203a090: @@ -79247,7 +79276,12 @@ _0203a090: _0203a0b4: ldr r0, [sl, #8] cmp r0, #0 +.ifdef EUR addeq sp, sp, #0x88 +.endif +.ifdef JPN + addeq sp, sp, #0x68 +.endif ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldrb r0, [r0, #0x1c] cmp r0, #1 @@ -79259,15 +79293,25 @@ _0203a0dc: mov r0, #0 _0203a0e0: cmp r0, #0 +.ifdef EUR addeq sp, sp, #0x88 +.endif +.ifdef JPN + addeq sp, sp, #0x68 +.endif ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} add r0, sp, #0x28 bl func_01ffbe34 mov r0, #1 strb r0, [sp, #0x32] cmp r4, #0 +.ifdef EUR rsbne r0, r0, #0x120 moveq r0, #0x18 +.endif +.ifdef JPN + ldrne r0, _0203a184 +.endif add r2, sp, #0xc add r3, sp, #8 mov r1, #2 @@ -79287,7 +79331,12 @@ _0203a0e0: str r1, [sp, #0xc] str r2, [sp, #8] bl func_02034a1c +.ifdef EUR add sp, sp, #0x88 +.endif +.ifdef JPN + add sp, sp, #0x68 +.endif ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_02039d74 @@ -79296,12 +79345,22 @@ _0203a160: .word data_027e077c _0203a164: .word data_02056be4 _0203a168: .word data_027e0618 _0203a16c: .word data_027e0cbc +.ifdef EUR _0203a170: .word 0x0000013b +.endif +.ifdef JPN +_0203a170: .word 0x0000013a +.endif _0203a174: .word data_02056a04 _0203a178: .word data_02056a16 _0203a17c: .word data_02056a10 _0203a180: .word data_027e0c38 +.ifdef EUR _0203a184: .word 0x0000011f +.endif +.ifdef JPN +_0203a184: .word 0x0000011e +.endif .global func_0203a188 arm_func_start func_0203a188