From d02d607131c2b2381a43acdb429ef2c29fd39abc Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 9 Jul 2023 20:46:45 -0400 Subject: [PATCH] Removed incorrect ov11 calls --- asm/include/itcm.inc | 2 +- asm/include/overlay_31.inc | 4 +-- asm/itcm.s | 2 +- asm/overlay_31.s | 62 +++++++++++++++++++------------------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc index 86f960ea..3d51680a 100644 --- a/asm/include/itcm.inc +++ b/asm/include/itcm.inc @@ -33,7 +33,7 @@ .public sub_020275F8 .public sub_0207A244 .public AbilityIsActive2 -.public ov11_022FBE04 +.public ov29_022FBE04 .public IqSkillIsEnabled .public ov29_022E333C .public SetMonsterActionFields diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 66de7525..16727e30 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -2,7 +2,7 @@ #pragma once .public ov29_0234FB6C .public GetRecruitRate2 -.public ov11_022EA428 +.public ov29_022EA428 .public sub_02030A2C .public AllManip1 .public IsBlinded @@ -90,7 +90,7 @@ .public sub_02041B7C .public sub_0203FE5C .public ov29_022E0C2C -.public ov11_02300BF8 +.public ov29_02300BF8 .public CanMonsterSpawn .public ov29_022E1618 .public sub_020420F4 diff --git a/asm/itcm.s b/asm/itcm.s index 261cbd4b..1cd34808 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -2485,7 +2485,7 @@ _01FFAF28: b _01FFB2A4 _01FFAF7C: mov r0, sb - bl ov11_022FBE04 + bl ov29_022FBE04 cmp r0, #0 bne _01FFB2A4 add r0, r4, #4 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index b00f4128..30c0a441 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -361,7 +361,7 @@ ov31_02382E18: ; 0x02382E18 mov r8, r1 mov r0, #6 mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, #0x62 bl AdvanceFrame mov r0, #0x62 @@ -390,19 +390,19 @@ _02382E64: beq _02382EA0 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 b _02382EC4 _02382EA0: cmp r8, #0 beq _02382EB8 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 b _02382EC4 _02382EB8: mov r0, #0 mov r1, r0 - bl ov11_022EA428 + bl ov29_022EA428 _02382EC4: mov r0, #1 bl ov29_022E0C2C @@ -1096,7 +1096,7 @@ _02383A74: bl ov31_023837C8 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, #1 b _0238511C _02383AC4: @@ -1765,7 +1765,7 @@ _02384490: bne _023844AC mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r5, #1 b _023850D8 _023844AC: @@ -1777,7 +1777,7 @@ _023844AC: bl ov29_022EBBE8 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r5, #0 b _023850D8 _023844D8: @@ -1787,7 +1787,7 @@ _023844D8: bl ov29_022EBB68 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r5, #0 b _023850D8 _023844FC: @@ -1972,7 +1972,7 @@ _02384758: mov r1, #0 ldr fp, [r0, #0xb4] strb r1, [fp, #0x161] - bl ov11_02300BF8 + bl ov29_02300BF8 cmp r0, #0 moveq r0, #1 streq r0, [sp, #0x18] @@ -2455,7 +2455,7 @@ _02384E30: bne _02384E90 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r5, #1 b _023850D8 _02384E90: @@ -2469,7 +2469,7 @@ _02384E90: mov r0, #0xb mov r1, #0 strb r2, [r7, #0x4e] - bl ov11_022EA428 + bl ov29_022EA428 mov r5, #0 b _023850D8 _02384EC4: @@ -2521,13 +2521,13 @@ _02384F34: mov r0, #0 mov r1, r0 strb r2, [r7, #0x54] - bl ov11_022EA428 + bl ov29_022EA428 mov r5, #0 b _023850D8 _02384F88: mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, #1 bl ov29_022EB398 b _02383B08 @@ -2600,20 +2600,20 @@ _02385028: mov r2, #1 mov r1, r0 strb r2, [r7, #0x23c] - bl ov11_022EA428 + bl ov29_022EA428 mov r5, #0 b _023850D8 _023850B0: mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, #1 bl ov29_022EB398 b _02383B08 _023850C8: mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r5, #0 _023850D8: ldr r0, _023848A8 ; =0x02353538 @@ -2752,7 +2752,7 @@ _0238529C: bne _023852CC mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 bl ov29_022F0B8C mov r1, #0 bl ov31_023860A4 @@ -2765,7 +2765,7 @@ _023852CC: bne _023852FC mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 bl ov29_022F0B8C mov r1, #0 bl ov31_023860A4 @@ -2778,7 +2778,7 @@ _023852FC: bne _02385328 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 bl ov29_022F0B8C bl ov31_0238619C mov r0, #1 @@ -2790,7 +2790,7 @@ _02385328: bne _02385354 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 bl ov29_022F0B8C bl ov31_02386204 mov r0, #1 @@ -2802,7 +2802,7 @@ _02385354: bne _02385380 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 bl ov29_022F0B8C mov r1, #1 bl ov31_02386308 @@ -3075,7 +3075,7 @@ _023856D0: bl ov29_022EBC2C mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, #8 mov r1, #0x1b bl ov29_022EA370 @@ -4068,7 +4068,7 @@ ov31_0238647C: ; 0x0238647C _023864B4: mov r0, #6 mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 ldr r0, _02386B10 ; =0x0235352C ldr r0, [r0] ldr r0, [r0, #0x24] @@ -4190,7 +4190,7 @@ _02386674: bl sub_020407C0 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, #2 mov r1, #0x1b bl ov29_022EA370 @@ -4295,7 +4295,7 @@ _023867A0: _023867F8: mov r0, #6 mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, r4 bl sub_0203088C _0238680C: @@ -4748,7 +4748,7 @@ _02386E3C: bl sub_0202E6C8 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 _02386E68: mov r6, #2 b _02386EBC @@ -4791,7 +4791,7 @@ _02386EBC: _02386EF8: mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 add sp, sp, #0xf4 ldmdb sp!, {r3, r4, r5, r6, pc} .align 2, 0 @@ -5260,7 +5260,7 @@ _023875D8: _023875F0: mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 bl ov31_02386F2C mov r0, #0x1b bl AdvanceFrame @@ -5375,7 +5375,7 @@ _0238775C: _0238776C: mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, sb bl ov29_023021F0 add sp, sp, #0x78 @@ -5965,7 +5965,7 @@ _02387FEC: _0238800C: mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, #4 mov r1, #0x3e bl ov29_022EA370 @@ -7846,7 +7846,7 @@ _02389D1C: bl sub_0202E6C8 mov r0, #0xb mov r1, #0 - bl ov11_022EA428 + bl ov29_022EA428 mov r0, #4 mov r1, #0x3e bl ov29_022EA370