diff --git a/asm/main.s b/asm/main.s index 9d43a7fa..f4c3fd58 100644 --- a/asm/main.s +++ b/asm/main.s @@ -62506,7 +62506,7 @@ func_0202eef8: ; 0x0202eef8 ldreq r0, [r6, #8] cmpeq r0, #0 addeq sp, sp, #0x28 -.ifdef JPN +.ifdef EUR moveq r0, #0 .endif ldmeqia sp!, {r4, r5, r6, pc} @@ -63626,27 +63626,9 @@ _0202f8dc: .word data_027e0618 _0202f8e0: .word data_027e0900 _0202f8e4: .word data_ov00_020ee734 - .global func_0202f8e8 - thumb_func_start func_0202f8e8 -func_0202f8e8: ; 0x0202f8e8 - push {r3, lr} - ldr r0, _0202f90c ; =data_027e0618 - bl func_0202cf34 - bl func_0202bac4 - blx func_02003a18 - ldr r2, _0202f910 ; =0x04001000 - ldr r0, _0202f914 ; =0xfffeffff - ldr r1, [r2] - and r0, r1 - str r0, [r2] - mov r0, #1 - blx func_0200ef98 - pop {r3, pc} - nop - thumb_func_end func_0202f8e8 -_0202f90c: .word data_027e0618 -_0202f910: .word 0x04001000 -_0202f914: .word 0xfffeffff +.ifdef EUR +.include "main/func_0202f8e8.s" ; This function was moved up in EUR/USA +.endif .global func_0202f918 thumb_func_start func_0202f918 @@ -63722,11 +63704,13 @@ _0202f99c: .word data_ov00_020ee734 func_0202f9a0: ; 0x0202f9a0 stmdb sp!, {r4, lr} mov r4, r0 +.ifdef EUR ldrb r0, [r4, #1] cmp r0, #0 beq _0202f9bc blx func_0202f8e8 ldmia sp!, {r4, pc} +.endif _0202f9bc: ldrb r0, [r4] cmp r0, #0 @@ -63759,6 +63743,10 @@ _0202f9fc: _0202fa20: .word data_027e05f8 _0202fa24: .word data_027e071c +.ifdef JPN +.include "main/func_0202f8e8.s" ; This function was moved up in EUR/USA +.endif + .global func_0202fa28 thumb_func_start func_0202fa28 func_0202fa28: ; 0x0202fa28 diff --git a/asm/main/func_0202f8e8.s b/asm/main/func_0202f8e8.s new file mode 100644 index 00000000..26dc2157 --- /dev/null +++ b/asm/main/func_0202f8e8.s @@ -0,0 +1,21 @@ + .global func_0202f8e8 + thumb_func_start func_0202f8e8 +func_0202f8e8: ; 0x0202f8e8 + push {r3, lr} + ldr r0, _0202f90c ; =data_027e0618 + bl func_0202cf34 + bl func_0202bac4 + blx func_02003a18 + ldr r2, _0202f910 ; =0x04001000 + ldr r0, _0202f914 ; =0xfffeffff + ldr r1, [r2] + and r0, r1 + str r0, [r2] + mov r0, #1 + blx func_0200ef98 + pop {r3, pc} + nop + thumb_func_end func_0202f8e8 +_0202f90c: .word data_027e0618 +_0202f910: .word 0x04001000 +_0202f914: .word 0xfffeffff