diff --git a/asm/main.s b/asm/main.s index c673a4cc..370c9a96 100644 --- a/asm/main.s +++ b/asm/main.s @@ -79971,16 +79971,29 @@ func_0203a988: ; 0x0203a988 ldr r3, [r3, #0x14] mov r2, #0x40 blx r3 +.ifdef EUR ldr r0, [r6, #0x154] mov r2, #0 cmp r0, #0 ldrnesb r0, [r0, #5] moveq r0, #2 +.endif +.ifdef JPN + mov r0, #2 +.endif str r0, [sp] add r0, r6, #0x100 +.ifdef JPN + ldrb r1, [r6, #0x51] +.endif ldrsb r3, [r0, #0x1e] +.ifdef EUR ldrb r1, [r6, #0x50] +.endif mov r0, r6 +.ifdef JPN + mov r2, #0 +.endif bl func_0203dcfc _0203a9e4: add r0, r6, #0x410 @@ -80060,7 +80073,12 @@ _0203aaf4: ldrsh r1, [r1, #0x6e] cmp r1, #0 bne _0203ab38 +.ifdef EUR ldrb r1, [r6, #0x50] +.endif +.ifdef JPN + ldrb r1, [r6, #0x51] +.endif bl func_0203cabc mov r2, #0 mov r1, #0x1a @@ -80166,6 +80184,7 @@ _0203ac78: mov r1, #0 strh r1, [r0, #0x72] b _0203ad24 +.ifdef EUR _0203ac8c: ldr r0, _0203ae94 ; =data_027e103c ldr r0, [r0] @@ -80180,6 +80199,7 @@ _0203ac8c: add r1, r2, #4 bl func_ov05_02103f8c b _0203ad24 +.endif _0203acc0: ldrh r2, [r5, #6] ldr r0, _0203ae9c ; =data_027e0e60 @@ -80231,16 +80251,29 @@ _0203ad4c: ldr r3, [r3, #0x14] mov r2, #0x30 blx r3 +.ifdef EUR ldr r0, [r6, #0x154] mov r2, #0 cmp r0, #0 ldrnesb r0, [r0, #5] moveq r0, #2 +.endif +.ifdef JPN + mov r0, #2 +.endif str r0, [sp] add r0, r6, #0x100 +.ifdef JPN + ldrb r1, [r6, #0x51] +.endif ldrsb r3, [r0, #0x1e] +.ifdef EUR ldrb r1, [r6, #0x50] +.endif mov r0, r6 +.ifdef JPN + mov r2, #0 +.endif bl func_0203dcfc _0203ada0: ldrb r0, [r6, #0x580] @@ -80252,18 +80285,36 @@ _0203ada0: ldr r3, [r3, #0x14] mov r2, #0x28 blx r3 +.ifdef EUR ldr r0, [r6, #0x154] mov r2, #0 cmp r0, #0 ldrnesb r0, [r0, #5] moveq r0, #2 +.endif +.ifdef JPN + mov r0, #2 +.endif str r0, [sp] add r0, r6, #0x100 ldrsb r3, [r0, #0x1e] +.ifdef EUR ldrb r1, [r6, #0x50] +.endif +.ifdef JPN + ldrb r1, [r6, #0x51] +.endif mov r0, r6 +.ifdef JPN + mov r2, #0 +.endif bl func_0203dcfc +.ifdef EUR ldrb r2, [r6, #0x50] +.endif +.ifdef JPN + ldrb r2, [r6, #0x51] +.endif ldr r1, _0203aea4 ; =data_027e0c68 mov r0, r6 cmp r2, #0 @@ -80310,7 +80361,9 @@ _0203ae88: .word 0x00010017 _0203ae8c: .word 0x00020001 _0203ae90: .word 0xffff0001 _0203ae94: .word data_027e103c +.ifdef EUR _0203ae98: .word data_027e0d3c +.endif _0203ae9c: .word data_027e0e60 _0203aea0: .word data_02057ed0 _0203aea4: .word data_027e0c68