From d45f95e9e7e271b7a6b7cd31f3ff269316a8603b Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 9 Jul 2023 20:53:46 -0400 Subject: [PATCH] Removed incorrect ov29 calls --- asm/include/overlay_11.inc | 1 - asm/overlay_02.s | 16 ++++---- asm/overlay_11.s | 77 +++++++++++++++++++++++++++++--------- 3 files changed, 68 insertions(+), 26 deletions(-) diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index a2dfa1a5..51be269d 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -666,7 +666,6 @@ .public ScriptSpecialProcess0x17 .public GetItemAtIdx .public GetPartner -.public ov29_022DEBA4 .public sub_0201DE10 .public sub_02056E04 .public SaveScriptVariableValue diff --git a/asm/overlay_02.s b/asm/overlay_02.s index 735be39f..d912b9c9 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -11475,8 +11475,8 @@ _02331124: .byte 0x20, 0x1C, 0x4A, 0xF5, 0x32, 0xEB, 0x01, 0x20, 0xF8, 0xBD, 0x20, 0x1C, 0x4A, 0xF5, 0x2C, 0xEB .byte 0x00, 0x20, 0xF8, 0xBD, 0xD0, 0x94, 0x35, 0x02 - thumb_func_start ov29_023311A8 -ov29_023311A8: ; 0x023311A8 + thumb_func_start ov02_023311A8 +ov02_023311A8: ; 0x023311A8 push {r3, r4, r5, r6, r7, lr} add r5, r1, #0 add r7, r0, #0 @@ -11565,7 +11565,7 @@ _02331254: .word 0x023594D0 _02331258: .word 0x0000231F _0233125C: .word 0x02359550 _02331260: .word 0x02330BF5 - thumb_func_end ov29_023311A8 + thumb_func_end ov02_023311A8 _02331264: .byte 0x01, 0x48, 0xC0, 0x6A, 0x70, 0x47, 0xC0, 0x46, 0xD0, 0x94, 0x35, 0x02 .byte 0x10, 0xB5, 0x0C, 0x1C, 0x00, 0x2C, 0x0C, 0xDD, 0x07, 0x48, 0x48, 0xF5, 0xE6, 0xEE, 0x07, 0x49 @@ -11575,8 +11575,8 @@ _02331264: .byte 0x04, 0x49, 0x20, 0x1C, 0xC9, 0x68, 0x88, 0x47, 0x01, 0x48, 0x48, 0xF5, 0x08, 0xEF, 0x10, 0xBD .byte 0x64, 0x95, 0x35, 0x02, 0xD0, 0x94, 0x35, 0x02 - thumb_func_start ov29_023312C8 -ov29_023312C8: ; 0x023312C8 + thumb_func_start ov02_023312C8 +ov02_023312C8: ; 0x023312C8 push {r3, lr} blx EnableIrqFlag ldr r1, _023312E8 ; =0x023594D0 @@ -11595,7 +11595,7 @@ _023312DA: .align 2, 0 _023312E8: .word 0x023594D0 _023312EC: .word 0x02359554 - thumb_func_end ov29_023312C8 + thumb_func_end ov02_023312C8 thumb_func_start ov02_023312F0 ov02_023312F0: ; 0x023312F0 @@ -11640,7 +11640,7 @@ ov02_02331364: ; 0x02331364 ldr r0, _023313F8 ; =0x023594D0 mov r4, #1 str r6, [r0, #0x70] - bl ov29_023312C8 + bl ov02_023312C8 mov r0, #0xd0 add r7, r6, #0 mul r7, r0 @@ -11675,7 +11675,7 @@ _02331394: str r0, [r6, #0x5c] ldr r0, _02331404 ; =0x02331329 add r1, r3, #0 - bl ov29_023311A8 + bl ov02_023311A8 cmp r0, #0 bne _023313C0 sub r0, r4, #3 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index fc80df41..d86b99d0 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -2403,8 +2403,8 @@ _022DDDE0: ; jump table b _022E04DC ; case 297 b ov11_022DE834 ; case 298 b ov11_022DE834 ; case 299 - b ov29_022DEBA4 ; case 300 - b ov29_022DEBA4 ; case 301 + b ov11_022DEBA4 ; case 300 + b ov11_022DEBA4 ; case 301 b ov11_022DE934 ; case 302 b ov11_022DE9B8 ; case 303 b ov11_022DEAC4 ; case 304 @@ -3072,21 +3072,64 @@ _022DEB80: movne r0, #3 b _022E2478 arm_func_end ov11_022DEAC4 -_022DEBA4: - .byte 0xB0, 0x00, 0xD6, 0xE1, 0x3F, 0x17, 0x00, 0xEB, 0x00, 0x98, 0xA0, 0xE1 - .byte 0xB2, 0x10, 0xD6, 0xE1, 0x14, 0x00, 0x84, 0xE2, 0x49, 0x78, 0xA0, 0xE1, 0xA1, 0x15, 0x00, 0xEB - .byte 0x00, 0x80, 0xA0, 0xE1, 0xB4, 0x00, 0xD6, 0xE1, 0x37, 0x17, 0x00, 0xEB, 0x00, 0x0C, 0xA0, 0xE1 - .byte 0x00, 0x10, 0xE0, 0xE3, 0x49, 0x08, 0x51, 0xE1, 0x40, 0x6C, 0xA0, 0xE1, 0x34, 0x01, 0x9F, 0x05 - .byte 0x08, 0x10, 0xA0, 0xE1, 0xF8, 0x70, 0xD0, 0x01, 0x00, 0x00, 0x56, 0xE3, 0x4E, 0x0F, 0x8D, 0xE2 - .byte 0xD2, 0x61, 0xD4, 0xB1, 0x81, 0x16, 0x00, 0xEB, 0x4E, 0x1F, 0x8D, 0xE2, 0x07, 0x00, 0xA0, 0xE1 - .byte 0xC3, 0x19, 0x00, 0xEB, 0x38, 0x01, 0x9F, 0xE5, 0x4E, 0x1F, 0x8D, 0xE2, 0x00, 0x00, 0x55, 0xE1 - .byte 0x01, 0x30, 0xA0, 0x03, 0x00, 0x30, 0xA0, 0x13, 0x07, 0x00, 0xA0, 0xE1, 0x06, 0x20, 0xA0, 0xE1 - .byte 0xFF, 0x30, 0x03, 0xE2, 0xCA, 0x61, 0x00, 0xEB, 0xE8, 0x00, 0x9F, 0xE5, 0xFA, 0x10, 0xD0, 0xE1 - .byte 0x07, 0x00, 0x51, 0xE1, 0xBA, 0x70, 0xC0, 0x11, 0xF8, 0x00, 0xD4, 0x11, 0x01, 0x00, 0x50, 0x13 - .byte 0x06, 0x00, 0xA0, 0x13, 0x0B, 0x0E, 0x00, 0x1A, 0xF8, 0x00, 0xD4, 0xE1, 0x01, 0x00, 0x50, 0xE3 - .byte 0x07, 0x0E, 0x00, 0x1A, 0x04, 0x00, 0xA0, 0xE1, 0x3E, 0xF7, 0xFF, 0xEB, 0x00, 0x00, 0x50, 0xE3 - .byte 0xF0, 0x01, 0xD4, 0x11, 0x00, 0x00, 0x50, 0x13, 0x06, 0x00, 0xA0, 0x13, 0x01, 0x00, 0xA0, 0x03 - .byte 0xB6, 0x04, 0xC4, 0x01, 0x03, 0x00, 0xA0, 0x03, 0xFE, 0x0D, 0x00, 0xEA + + arm_func_start ov11_022DEBA4 +ov11_022DEBA4: ; 0x022DEBA4 + ldrh r0, [r6] + bl ov11_022E48AC + mov sb, r0, lsl #0x10 + ldrh r1, [r6, #2] + add r0, r4, #0x14 + mov r7, sb, asr #0x10 + bl ov11_022E4248 + mov r8, r0 + ldrh r0, [r6, #4] + bl ov11_022E48AC + mov r0, r0, lsl #0x18 + mvn r1, #0 + cmp r1, sb, asr #16 + mov r6, r0, asr #0x18 + ldreq r0, _022DED18 ; =0x02324E80 + mov r1, r8 + ldreqsh r7, [r0, #8] + cmp r6, #0 + add r0, sp, #0x138 + ldrltsb r6, [r4, #0x12] + bl ov11_022E4600 + add r1, sp, #0x138 + mov r0, r7 + bl ov11_022E5314 + ldr r0, _022DED44 ; =0x0000012D + add r1, sp, #0x138 + cmp r5, r0 + moveq r3, #1 + movne r3, #0 + mov r0, r7 + mov r2, r6 + and r3, r3, #0xff + bl ov11_022F7354 + ldr r0, _022DED18 ; =0x02324E80 + ldrsh r1, [r0, #0xa] + cmp r1, r7 + strneh r7, [r0, #0xa] + ldrnesh r0, [r4, #8] + cmpne r0, #1 + movne r0, #6 + bne _022E2478 + ldrsh r0, [r4, #8] + cmp r0, #1 + bne _022E2474 + mov r0, r4 + bl ov11_022DC958 + cmp r0, #0 + ldrnesh r0, [r4, #0x10] + cmpne r0, #0 + movne r0, #6 + moveq r0, #1 + streqh r0, [r4, #0x46] + moveq r0, #3 + b _022E2478 + arm_func_end ov11_022DEBA4 arm_func_start ov11_022DEC7C ov11_022DEC7C: ; 0x022DEC7C