diff --git a/asm/include/overlay_10.inc b/asm/include/overlay_10.inc index f1ddcf01..697dc7e9 100644 --- a/asm/include/overlay_10.inc +++ b/asm/include/overlay_10.inc @@ -193,11 +193,11 @@ .public MemsetSimple .public MemZero .public MultiplyByFixedPoint -.public ov11_022EA428 .public ov11_023061CC .public ov11_02306C64 .public ov11_02306C9C .public ov29_022DD83C +.public ov29_022EA428 .public ov29_0234C584 .public ov29_0234C5EC .public ov29_0234C668 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index b57d45c9..e46d50a8 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -1439,7 +1439,7 @@ ov10_022BDCBC: ; 0x022BDCBC cmp r1, #0 bne _022BDD30 mov r1, r0 - bl ov11_022EA428 + bl ov29_022EA428 _022BDD30: add r0, r4, #0xe8 bl sub_0206423C @@ -1621,7 +1621,7 @@ ov10_022BDF34: ; 0x022BDF34 cmp r0, #0 bne _022BDF90 mov r0, #0xd - bl ov11_022EA428 + bl ov29_022EA428 _022BDF90: ldr r1, [r4] mov r0, #2 @@ -4364,7 +4364,7 @@ _022C034C: bne _022C0364 mov r0, #5 mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 _022C0364: ldr r0, [r4] cmp r0, #0 @@ -5905,8 +5905,8 @@ _022C17C8: bl sub_02027B58 add r0, sp, #0x104 + OV10_022C1748_STACK_OFFSET bl InitPreprocessorArgs - ldrsh r2, [r5, #0x4a] #ifdef EUROPE + ldrsh r1, [r5, #0x4a] add r0, sp, #4 str r1, [sp, #0x168] ldrsh r1, [r5, #0x4c] @@ -5917,6 +5917,7 @@ _022C17C8: add r0, sp, #0x44 add r2, sp, #4 #else + ldrsh r2, [r5, #0x4a] ldr r1, _022C1838 ; =ov10_022DC02C add r0, sp, #4 str r2, [sp, #0x128] diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 5b4c2b19..f5303e36 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -16574,10 +16574,6 @@ _022EA3EC: add r0, r0, #0x100 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 - arm_func_end ov11_022EA0BC - - arm_func_start ov11_022EA428 -ov11_022EA428: ; 0x022EA428 cmp r0, #0xff movgt r7, #0x80 bgt _022EA444 @@ -16849,7 +16845,7 @@ _022EA7FC: .word ov11_02389128 _022EA800: .word ov11_02389018 _022EA804: .word ov11_0238916C _022EA808: .word ov11_02388FD4 - arm_func_end ov11_022EA428 + arm_func_end ov11_022EA0BC arm_func_start ov11_022EA80C ov11_022EA80C: ; 0x022EA80C