From 908dba520032ded32c025ace66383af38d39b44a Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 25 May 2024 20:26:22 +0200 Subject: [PATCH] Mangle functions --- asm/itcm.s | 8 +++---- asm/ov00/Actor/Actor.inc | 10 ++++----- asm/ov00/Actor/Actor.s | 10 ++++----- asm/ov00/ov00_020c3e54.inc | 2 +- asm/ov00/ov00_020c3e54.s | 8 +++---- asm/ov12.inc | 2 +- asm/ov12.s | 10 ++++----- asm/ov14/Actor/ActorRupee.inc | 2 +- asm/ov14/Actor/ActorRupee.s | 2 +- asm/ov14/ov14_0211f640.inc | 2 +- asm/ov14/ov14_0211f640.s | 20 +++++++++--------- asm/ov14/ov14_0213b778.inc | 2 +- asm/ov14/ov14_0213b778.s | 40 +++++++++++++++++------------------ asm/ov15.inc | 2 +- asm/ov15.s | 10 ++++----- asm/ov17.inc | 2 +- asm/ov17.s | 4 ++-- asm/ov19.inc | 2 +- asm/ov19.s | 2 +- asm/ov20.inc | 2 +- asm/ov20.s | 4 ++-- asm/ov21.inc | 2 +- asm/ov21.s | 8 +++---- asm/ov22.inc | 2 +- asm/ov22.s | 20 +++++++++--------- asm/ov23.inc | 2 +- asm/ov23.s | 6 +++--- asm/ov24.inc | 2 +- asm/ov24.s | 16 +++++++------- asm/ov25.inc | 2 +- asm/ov25.s | 12 +++++------ asm/ov26.inc | 2 +- asm/ov26.s | 2 +- asm/ov27.inc | 2 +- asm/ov27.s | 10 ++++----- asm/ov28.inc | 2 +- asm/ov28.s | 2 +- asm/ov29.inc | 4 ++-- asm/ov29.s | 4 ++-- asm/ov32.inc | 2 +- asm/ov32.s | 4 ++-- asm/ov34.inc | 8 +++---- asm/ov34.s | 14 ++++++------ asm/ov35.inc | 2 +- asm/ov35.s | 4 ++-- asm/ov36.inc | 2 +- asm/ov36.s | 4 ++-- asm/ov37.inc | 2 +- asm/ov37.s | 2 +- asm/ov38.inc | 8 +++---- asm/ov38.s | 12 +++++------ asm/ov43.inc | 2 +- asm/ov43.s | 6 +++--- asm/ov44.inc | 2 +- asm/ov44.s | 4 ++-- asm/ov47.inc | 2 +- asm/ov47.s | 4 ++-- asm/ov48.inc | 2 +- asm/ov48.s | 2 +- asm/ov49.inc | 2 +- asm/ov49.s | 2 +- asm/ov50.inc | 2 +- asm/ov50.s | 2 +- asm/ov51.inc | 2 +- asm/ov51.s | 8 +++---- 65 files changed, 176 insertions(+), 176 deletions(-) diff --git a/asm/itcm.s b/asm/itcm.s index ed956e51..c5e1d0a6 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -9141,9 +9141,9 @@ _ZN11ItemManager21GetEquipItemUncheckedEi: ; 0x01fffcec _01fffd00: .word gItemManager arm_func_end _ZN11ItemManager21GetEquipItemUncheckedEi - .global func_01fffd04 - arm_func_start func_01fffd04 -func_01fffd04: ; 0x01fffd04 + .global _ZN5Actor13func_01fffd04Ei + arm_func_start _ZN5Actor13func_01fffd04Ei +_ZN5Actor13func_01fffd04Ei: ; 0x01fffd04 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x60 mov r6, r0 @@ -9277,7 +9277,7 @@ _01fffef8: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _01ffff04: .word gMapManager - arm_func_end func_01fffd04 + arm_func_end _ZN5Actor13func_01fffd04Ei .global func_01ffff08 arm_func_start func_01ffff08 diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 9e4972d0..4822b021 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -42,7 +42,7 @@ .extern func_01ffbe34 .extern _ZN8Cylinder8OverlapsEPS_ .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern _ZN12TouchControl13func_0202b864EP5Vec3pic .extern _ZN12TouchControl13func_0202b894EP5Vec3pic .extern func_0202d95c @@ -65,11 +65,11 @@ .extern func_ov05_02103f4c .extern _ZN14EquipBoomerang8GetActorEv .extern _ZN9EquipRope18func_ov14_0213d420Ev -.extern func_ov14_0213d440 +.extern _ZN9EquipRope18func_ov14_0213d440Ei .extern _ZN9EquipRope18func_ov14_0213d480Ei -.extern func_ov14_0213d81c -.extern func_ov14_0213d91c -.extern func_ov14_0213dadc +.extern _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p +.extern _ZN9EquipRope18func_ov14_0213d91cEi +.extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder .extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor .extern gAdventureFlags diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index ff639720..6add608c 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -2173,7 +2173,7 @@ _ZN5Actor18func_ov00_020c2ed4Ev: ; 0x020c2ed4 bl _ZN10EquipSword12GetEquipRopeEv ldr r1, [r4, #8] mov r5, r0 - bl func_ov14_0213d440 + bl _ZN9EquipRope18func_ov14_0213d440Ei movs r6, r0 bmi _020c2fb0 mov r0, r5 @@ -2186,7 +2186,7 @@ _ZN5Actor18func_ov00_020c2ed4Ev: ; 0x020c2ed4 add r2, sp, #0x10 mov r0, r5 mov r1, r6 - bl func_ov14_0213d81c + bl _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p cmp r0, #0 beq _020c2fa4 ldr r1, [sp, #0x10] @@ -2201,7 +2201,7 @@ _ZN5Actor18func_ov00_020c2ed4Ev: ; 0x020c2ed4 bl Vec3p_Add mov r0, r4 mov r1, #1 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 bne _020c2f8c add r1, sp, #0 @@ -2210,13 +2210,13 @@ _ZN5Actor18func_ov00_020c2ed4Ev: ; 0x020c2ed4 add r2, sp, #0 mov r0, r5 mov r1, r6 - bl func_ov14_0213dadc + bl _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder add sp, sp, #0x1c ldmia sp!, {r3, r4, r5, r6, pc} _020c2f8c: mov r0, r5 mov r1, r6 - bl func_ov14_0213d91c + bl _ZN9EquipRope18func_ov14_0213d91cEi add sp, sp, #0x1c mov r0, #0 ldmia sp!, {r3, r4, r5, r6, pc} diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index d1623c5a..c5b76ca5 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -343,7 +343,7 @@ .extern func_01ffe1cc .extern func_01ffe468 .extern func_01fffb4c -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020029fc .extern func_02002bac .extern func_02002bb8 diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index ac68aae2..1228b832 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -9229,7 +9229,7 @@ _020cb2a4: bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r4, #0x110] cmp r0, #0 ldreqb r0, [r4, #0x112] @@ -10730,7 +10730,7 @@ _020cc5e4: bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add sp, sp, #0x18 ldmia sp!, {r4, pc} arm_func_end func_ov00_020cc524 @@ -12405,7 +12405,7 @@ func_ov00_020cdab0: ; 0x020cdab0 mov r1, #0 strh r0, [r2, #0x9c] ldr r0, [r4] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r0, [r4] strh r5, [r0, #0x9c] ldmia sp!, {r3, r4, r5, pc} @@ -21717,7 +21717,7 @@ _020d4c64: ldr r2, [sp, #0x3c] str r2, [r10, #0x5c] str r5, [r4, #0x18] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r1, [r4, #0x18] mov r7, r0 sub r0, r1, #1 diff --git a/asm/ov12.inc b/asm/ov12.inc index b61cb647..ac96f42e 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -213,7 +213,7 @@ .extern func_01fffbec .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02002bac .extern func_02003a9c .extern func_02003b04 diff --git a/asm/ov12.s b/asm/ov12.s index aaa6d5b5..2fcf2950 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -1855,7 +1855,7 @@ _02114398: str r1, [sp, #0x18] str r1, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei movs r4, r0 ldrneb r0, [r6, #0x110] cmpne r0, #0 @@ -2022,7 +2022,7 @@ _021145fc: str r1, [sp, #0x18] str r1, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 ldrneb r0, [r8, #0x110] cmpne r0, #0 @@ -2147,7 +2147,7 @@ _021147d4: bl func_ov12_02113f9c mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -2193,7 +2193,7 @@ _02114854: _02114890: mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add sp, sp, #0x18 ldmia sp!, {r4, pc} .align 2, 0 @@ -34608,7 +34608,7 @@ _0212ed88: mov r1, #0 mov r0, r5 strb r1, [r5, #0x165] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _0212ee30 ldr r2, [r5, #0xcc] diff --git a/asm/ov14/Actor/ActorRupee.inc b/asm/ov14/Actor/ActorRupee.inc index df7f2a46..482c18ce 100644 --- a/asm/ov14/Actor/ActorRupee.inc +++ b/asm/ov14/Actor/ActorRupee.inc @@ -62,7 +62,7 @@ .extern data_ov00_020e9370 .extern data_ov00_020eec9c .extern Vec3p_Add -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_0202bc38 .extern func_ov00_0207a13c .extern func_ov00_0207a1c8 diff --git a/asm/ov14/Actor/ActorRupee.s b/asm/ov14/Actor/ActorRupee.s index 43ecb25d..dad4c562 100644 --- a/asm/ov14/Actor/ActorRupee.s +++ b/asm/ov14/Actor/ActorRupee.s @@ -236,7 +236,7 @@ _ZN10ActorRupee4MoveEv: ; 0x0213b120 strh r0, [r4, #0x9c] mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 movne r0, #0 strne r0, [r4, #0x60] diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index f035f477..ba033a23 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -221,7 +221,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020020d0 .extern func_0200250c .extern func_02002540 diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index a63e51cf..83ed17ad 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -1139,7 +1139,7 @@ _021203e0: mov r1, #0 bic r2, r4, #4 strh r2, [r6, #0x9c] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 movne r0, #0 strneb r0, [r6, #0x118] @@ -1154,7 +1154,7 @@ _02120438: mov r1, #0 mov r0, r6 str r1, [r2, #0x34] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _0212052c ldr r1, _02120758 ; =data_ov14_0215abec @@ -4319,7 +4319,7 @@ _02122fcc: str r2, [r10, #0x58] ldr r2, [sp, #0x2c] str r2, [r10, #0x5c] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei movs r7, r0 ldreqb r0, [r10, #0x111] cmpeq r0, #0 @@ -6175,7 +6175,7 @@ _021247d8: mov r2, #2 mov r0, r5 strh r2, [r5, #0x9c] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r0, _02124c60 ; =data_ov14_0215ac9c mov r1, #0 str r1, [r0, #0x34] @@ -6222,7 +6222,7 @@ _0212486c: b _02124944 _021248a8: mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02124930 ldr r1, [r5, #0xb8] @@ -26593,7 +26593,7 @@ _021350d4: bl Vec3p_Add mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r5, #0x110] cmp r0, #0 ldreqb r0, [r5, #0x112] @@ -28091,7 +28091,7 @@ _021363a4: bl Vec3p_Add mov r0, r6 mov r1, r4 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r1, [r6, #0x111] mov r4, r0 cmp r1, #0 @@ -33247,7 +33247,7 @@ _0213a640: bl Vec3p_Add mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r0, [r5, #0x64] cmp r0, #0 bgt _0213a7fc @@ -33285,7 +33285,7 @@ _0213a68c: bl Vec3p_Add mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r5, #0x111] cmp r0, #0 beq _0213a7fc @@ -33583,7 +33583,7 @@ func_ov14_0213aa68: ; 0x0213aa68 bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov14_0213aa68 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index 646222e8..d6df7888 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -244,7 +244,7 @@ .extern func_01fffbec .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020029fc .extern func_02002c14 .extern func_0200388c diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 073d75af..3ffa645a 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -2563,9 +2563,9 @@ _0213d438: .word gActorManager _0213d43c: .word _ZN12ActorManager8GetActorEP8ActorRef arm_func_end _ZN9EquipRope18func_ov14_0213d420Ev - .global func_ov14_0213d440 - arm_func_start func_ov14_0213d440 -func_ov14_0213d440: ; 0x0213d440 + .global _ZN9EquipRope18func_ov14_0213d440Ei + arm_func_start _ZN9EquipRope18func_ov14_0213d440Ei +_ZN9EquipRope18func_ov14_0213d440Ei: ; 0x0213d440 ldrsh r2, [r0, #0xa] cmp r2, #0 blt _0213d478 @@ -2584,7 +2584,7 @@ _0213d450: _0213d478: mvn r0, #0 bx lr - arm_func_end func_ov14_0213d440 + arm_func_end _ZN9EquipRope18func_ov14_0213d440Ei .global _ZN9EquipRope18func_ov14_0213d480Ei arm_func_start _ZN9EquipRope18func_ov14_0213d480Ei @@ -2884,9 +2884,9 @@ _0213d810: ldmia sp!, {r4, r5, pc} arm_func_end func_ov14_0213d788 - .global func_ov14_0213d81c - arm_func_start func_ov14_0213d81c -func_ov14_0213d81c: ; 0x0213d81c + .global _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p + arm_func_start _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p +_ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p: ; 0x0213d81c stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x1c mov r5, r1 @@ -2955,11 +2955,11 @@ _0213d908: .align 2, 0 _0213d914: .word 0x00000e66 _0213d918: .word gVec3p_ZERO - arm_func_end func_ov14_0213d81c + arm_func_end _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p - .global func_ov14_0213d91c - arm_func_start func_ov14_0213d91c -func_ov14_0213d91c: ; 0x0213d91c + .global _ZN9EquipRope18func_ov14_0213d91cEi + arm_func_start _ZN9EquipRope18func_ov14_0213d91cEi +_ZN9EquipRope18func_ov14_0213d91cEi: ; 0x0213d91c stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r2, #0x1c mul r5, r1, r2 @@ -2999,7 +2999,7 @@ _0213d990: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0213d9a8: .word gMapManager - arm_func_end func_ov14_0213d91c + arm_func_end _ZN9EquipRope18func_ov14_0213d91cEi .global func_ov14_0213d9ac arm_func_start func_ov14_0213d9ac @@ -3088,9 +3088,9 @@ _0213dad4: .word gMapManager _0213dad8: .word gActorManager arm_func_end func_ov14_0213d9ac - .global func_ov14_0213dadc - arm_func_start func_ov14_0213dadc -func_ov14_0213dadc: ; 0x0213dadc + .global _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder + arm_func_start _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder +_ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder: ; 0x0213dadc stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0xc mov r6, r0 @@ -3113,7 +3113,7 @@ func_ov14_0213dadc: ; 0x0213dadc mov r0, #1 add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end func_ov14_0213dadc + arm_func_end _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder .global func_ov14_0213db34 thumb_func_start func_ov14_0213db34 @@ -3134,7 +3134,7 @@ func_ov14_0213db34: ; 0x0213db34 _0213db4e: add r0, r5, #0 add r1, r4, #0 - blx func_ov14_0213d91c + blx _ZN9EquipRope18func_ov14_0213d91cEi add r4, r4, #1 cmp r4, #2 blt _0213db4e @@ -3157,7 +3157,7 @@ _0213db7c: _0213db80: mov r0, r5 mov r1, r4 - bl func_ov14_0213d91c + bl _ZN9EquipRope18func_ov14_0213d91cEi add r4, r4, #1 cmp r4, #2 blt _0213db80 @@ -16207,7 +16207,7 @@ func_ov14_02147b18: ; 0x02147b18 mov r4, r0 mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r4, #0 ldreqb r0, [r5, #0x112] cmpeq r0, #0 @@ -16239,7 +16239,7 @@ func_ov14_02147bb0: ; 0x02147bb0 bl func_ov14_02145414 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} .align 2, 0 _02147bd4: .word 0x00000aab diff --git a/asm/ov15.inc b/asm/ov15.inc index 0e1de4d8..17a000b7 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -312,7 +312,7 @@ .extern func_01fffb4c .extern func_01fffb80 .extern func_01fffbec -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02001a9c .extern func_0200250c .extern func_02002540 diff --git a/asm/ov15.s b/asm/ov15.s index 7ecfa95e..17a3ea23 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -6745,7 +6745,7 @@ func_ov15_02125278: ; 0x02125278 ldr r4, [r5, #0x4c] mov r1, #0 str r1, [r5, #0x4c] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _021252b8 mov r0, r5 @@ -7552,7 +7552,7 @@ _02125d90: bge _02125dbc mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02125dbc mov r0, r4 @@ -25480,7 +25480,7 @@ _02134dc0: _02134dd0: mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02134e14 ldrb r0, [r4, #0x112] @@ -55620,7 +55620,7 @@ _0214e660: _0214e6e4: mov r0, r10 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r10, #0x110] cmp r0, #0 ldreqb r0, [r10, #0x112] @@ -84184,7 +84184,7 @@ _02167114: _021671bc: mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 bne _021671f0 mov r0, #0x1000 diff --git a/asm/ov17.inc b/asm/ov17.inc index e3235237..7a51885d 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -145,7 +145,7 @@ .extern func_01ffa9fc .extern func_01ffbe34 .extern func_01ffbf5c -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02002c14 .extern func_020038a4 .extern func_020078f4 diff --git a/asm/ov17.s b/asm/ov17.s index 54b63bb7..176c563a 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -6925,7 +6925,7 @@ _02160b10: ldmgeia sp!, {r3, r4, r5, pc} mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r5, #0x111] cmp r0, #0 addeq sp, sp, #0x20 @@ -6998,7 +6998,7 @@ _02160c28: bge _02160d68 mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r5, #0x111] cmp r0, #0 beq _02160d68 diff --git a/asm/ov19.inc b/asm/ov19.inc index 3ded4016..7ace5dba 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -156,7 +156,7 @@ .extern func_01fffbec .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02016fe8 .extern func_02018450 .extern func_02019534 diff --git a/asm/ov19.s b/asm/ov19.s index c111b7f2..a99116f7 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -8466,7 +8466,7 @@ func_ov19_02174554: ; 0x02174554 bl func_ov00_020cc438 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov19_02174554 diff --git a/asm/ov20.inc b/asm/ov20.inc index 781edc72..480b7d4d 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -144,7 +144,7 @@ .extern func_01ffbe78 .extern func_01fffbec .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02016fe8 .extern func_02018450 .extern func_02018cb8 diff --git a/asm/ov20.s b/asm/ov20.s index 5113e337..1c8dfcbb 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -5086,7 +5086,7 @@ _02171b54: mov r0, r5 bge _02171b8c mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02171bd8 mov r0, r5 @@ -5606,7 +5606,7 @@ _02172258: bl Vec3p_Add mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r5, #0x111] cmp r0, #0 beq _021724cc diff --git a/asm/ov21.inc b/asm/ov21.inc index acaa078f..ca741302 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -101,7 +101,7 @@ .extern Atan2 .extern func_01ffbe78 .extern func_01ffbf5c -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020020d0 .extern func_0200250c .extern func_02002540 diff --git a/asm/ov21.s b/asm/ov21.s index c10f34c1..8154c446 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -653,7 +653,7 @@ func_ov21_0216de7c: ; 0x0216de7c bl func_ov21_0216df08 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov21_0216de7c @@ -679,7 +679,7 @@ func_ov21_0216deac: ; 0x0216deac bl func_ov21_0216df08 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -1449,7 +1449,7 @@ _0216e868: bl func_ov21_0216df08 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0216e8c4: .word gSinCosTable @@ -2736,7 +2736,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} mov r0, r10 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 addeq sp, sp, #0x118 moveq r0, #0 diff --git a/asm/ov22.inc b/asm/ov22.inc index 5eef1c99..87ea724f 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -154,7 +154,7 @@ .extern func_01fffbec .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020020d0 .extern func_0200250c .extern func_02002540 diff --git a/asm/ov22.s b/asm/ov22.s index 53be09ce..2b406907 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -3463,7 +3463,7 @@ func_ov22_02170434: ; 0x02170434 ble _02170474 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add r0, r4, #0x470 mov r1, #5 bl func_ov22_0216f41c @@ -4004,7 +4004,7 @@ func_ov22_02170b50: ; 0x02170b50 bl func_ov14_0214a92c mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r1, _02170be4 ; =0x00000aab add r0, r4, #0xa8 str r1, [sp] @@ -4821,7 +4821,7 @@ func_ov22_02171638: ; 0x02171638 bl func_ov22_021719c4 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov22_02171638 @@ -4896,7 +4896,7 @@ _0217171c: bl func_ov22_021719c4 mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02171764: .word gSinCosTable @@ -5021,7 +5021,7 @@ _0217190c: bl func_ov22_021719c4 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add sp, sp, #0x24 ldmia sp!, {r4, r5, pc} .align 2, 0 @@ -5731,7 +5731,7 @@ func_ov22_021721f8: ; 0x021721f8 cmp r0, #0 ldmgeia sp!, {r4, pc} mov r0, r4 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r4, #0x111] cmp r0, #0 ldmeqia sp!, {r4, pc} @@ -5981,7 +5981,7 @@ _02172564: _0217259c: mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r4, #0 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 @@ -6063,7 +6063,7 @@ func_ov22_0217260c: ; 0x0217260c _021726b0: mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r5, #0 beq _021726d0 mov r0, r4 @@ -8351,7 +8351,7 @@ _021744c8: _02174514: mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei _02174520: add r0, r5, #0x21c bl func_ov00_020c5e20 @@ -8458,7 +8458,7 @@ func_ov22_0217463c: ; 0x0217463c bl func_ov00_020cc3fc mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei mov r0, r4 bl func_ov00_020cc438 mov r0, #1 diff --git a/asm/ov23.inc b/asm/ov23.inc index 45b7dd5a..5ca9be5d 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -202,7 +202,7 @@ .extern func_01fffbec .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02016fe8 .extern func_02018450 .extern func_02019570 diff --git a/asm/ov23.s b/asm/ov23.s index 5d6aa464..587af445 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -754,7 +754,7 @@ func_ov23_0216e024: ; 0x0216e024 ldmleia sp!, {r4, pc} mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add r0, r4, #0x470 mov r1, #4 bl func_ov23_0216d74c @@ -1184,7 +1184,7 @@ func_ov23_0216e598: ; 0x0216e598 bl func_ov14_0214a92c mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add r0, r4, #0xa8 str r6, [sp] mov r3, r5 @@ -9839,7 +9839,7 @@ _021758c0: mov r0, r4 mov r1, #0 str r2, [r4, #0xa0] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} .align 2, 0 _021758e4: .word data_ov23_0217acac diff --git a/asm/ov24.inc b/asm/ov24.inc index 3f22a905..bc2c0ba4 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -144,7 +144,7 @@ .extern _ZN8Cylinder8OverlapsEPS_ .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02005dcc .extern func_02007908 .extern func_020079d8 diff --git a/asm/ov24.s b/asm/ov24.s index 5ef27d17..ce270da3 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -3962,7 +3962,7 @@ _02170980: bl func_ov24_0216ffb8 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _021709f8 ldr r1, [r4, #0x74] @@ -4210,7 +4210,7 @@ _02170d28: bl func_ov24_0216ffb8 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02170d90 ldr r1, [r4, #0x74] @@ -4307,7 +4307,7 @@ func_ov24_02170e8c: ; 0x02170e8c bl func_ov24_0216ffb8 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei mov r0, r4 bl func_ov24_0217009c cmp r0, #0 @@ -4362,7 +4362,7 @@ func_ov24_02170f3c: ; 0x02170f3c sub sp, sp, #4 mov r4, r0 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add r0, r4, #0x300 ldrh r0, [r0, #0x54] cmp r0, #0 @@ -4436,7 +4436,7 @@ _02171020: _0217102c: mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r0, [r5, #0x330] cmp r4, r0 ldmltia sp!, {r3, r4, r5, pc} @@ -4484,7 +4484,7 @@ func_ov24_021710b4: ; 0x021710b4 bl func_ov24_0216ffb8 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei mov r0, r4 bl func_ov24_0217009c cmp r0, #0 @@ -4587,7 +4587,7 @@ _021711f4: bl func_ov24_0216ffb8 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} .align 2, 0 _0217120c: .word gSinCosTable @@ -12242,7 +12242,7 @@ _021776c8: mov r0, r5 bge _021776fc mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02177700 mov r0, r5 diff --git a/asm/ov25.inc b/asm/ov25.inc index 97eefe94..84d9b1b7 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -151,7 +151,7 @@ .extern func_01ffe1cc .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02002c14 .extern func_02016fe8 .extern func_02018450 diff --git a/asm/ov25.s b/asm/ov25.s index a70b1115..8592f1ed 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -5281,7 +5281,7 @@ func_ov25_02171e30: ; 0x02171e30 bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov25_02171e30 @@ -5296,7 +5296,7 @@ func_ov25_02171e58: ; 0x02171e58 bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov25_02171e58 @@ -6806,7 +6806,7 @@ _02173294: bl func_ov25_02173354 mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _021732b4: .word 0x00001555 @@ -6856,7 +6856,7 @@ func_ov25_021732fc: ; 0x021732fc bl func_ov25_02173354 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -11016,7 +11016,7 @@ func_ov25_02176b88: ; 0x02176b88 bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov25_02176b88 @@ -12928,7 +12928,7 @@ _02178404: ldmia sp!, {r3, r4, r5, pc} _02178430: mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02178450 mov r0, r5 diff --git a/asm/ov26.inc b/asm/ov26.inc index ac6b9607..a0e5e602 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -166,7 +166,7 @@ .extern func_01ffe468 .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020020d0 .extern func_0200250c .extern func_02002540 diff --git a/asm/ov26.s b/asm/ov26.s index bf308b45..6e84dce9 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -3862,7 +3862,7 @@ func_ov26_02170320: ; 0x02170320 str r2, [r4, #0x4c] ldr r2, [sp, #0x10] str r2, [r4, #0x50] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei mov r2, #0 add r1, sp, #4 add r0, r4, #0x48 diff --git a/asm/ov27.inc b/asm/ov27.inc index 0a902c61..154606e0 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -140,7 +140,7 @@ .extern func_01fffbec .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02018450 .extern func_0201b1bc .extern func_0201e388 diff --git a/asm/ov27.s b/asm/ov27.s index e2b3a982..38773c36 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -5343,7 +5343,7 @@ _02172154: bl func_ov27_02172ab8 mov r0, r6 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r6, #0x110] cmp r0, #0 ldreqb r0, [r6, #0x112] @@ -10240,7 +10240,7 @@ func_ov27_021761dc: ; 0x021761dc bl func_ov27_02177bc4 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei mov r0, r4 ldr r1, [r0] ldr r1, [r1, #0xbc] @@ -10991,7 +10991,7 @@ _02176c68: bl func_ov27_02177bc4 mov r0, r10 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r9, #0 beq _02176da0 cmp r6, #0 @@ -11135,7 +11135,7 @@ func_ov27_02176e88: ; 0x02176e88 bl func_ov27_02177bc4 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov27_02176e88 @@ -11184,7 +11184,7 @@ func_ov27_02176ed0: ; 0x02176ed0 bl func_ov27_02177bc4 mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 diff --git a/asm/ov28.inc b/asm/ov28.inc index 184bbc86..e5737f49 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -144,7 +144,7 @@ .extern Vec3p_Distance .extern Atan2 .extern func_01fffbec -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020078f4 .extern func_02007908 .extern func_02016fe8 diff --git a/asm/ov28.s b/asm/ov28.s index bb64b2a9..ecc1d669 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -12887,7 +12887,7 @@ func_ov28_02177bec: ; 0x02177bec _02177cd0: mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r0, [r4, #0x18c] cmp r0, #0 beq _02177d94 diff --git a/asm/ov29.inc b/asm/ov29.inc index 4e94bd05..6ffc6013 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -338,10 +338,10 @@ .extern func_ov14_02120998 .extern func_ov14_02122e98 .extern _ZN9EquipRope18func_ov14_0213d420Ev -.extern func_ov14_0213d440 +.extern _ZN9EquipRope18func_ov14_0213d440Ei .extern _ZN9EquipRope18func_ov14_0213d480Ei .extern func_ov14_0213d5d0 -.extern func_ov14_0213dadc +.extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder .extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .extern func_ov14_021448d4 .extern func_ov14_021448dc diff --git a/asm/ov29.s b/asm/ov29.s index fa6372f8..27a98020 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -9647,7 +9647,7 @@ func_ov29_02175900: ; 0x02175900 bl func_ov29_021758f0 ldr r1, [r6, #8] mov r4, r0 - bl func_ov14_0213d440 + bl _ZN9EquipRope18func_ov14_0213d440Ei movs r5, r0 bmi _02175a94 mov r0, r4 @@ -9738,7 +9738,7 @@ _02175a64: add r2, sp, #0xc mov r0, r4 mov r1, r5 - bl func_ov14_0213dadc + bl _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, pc} _02175a88: diff --git a/asm/ov32.inc b/asm/ov32.inc index 238ebbe8..7c9ac082 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -127,7 +127,7 @@ .extern func_01ffbf5c .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020020d0 .extern func_0200250c .extern func_02002540 diff --git a/asm/ov32.s b/asm/ov32.s index 5a42458f..f07d46db 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -6021,7 +6021,7 @@ func_ov32_02180a8c: ; 0x02180a8c blx r1 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei add r1, r4, #0x400 ldrsh r1, [r1, #8] mov r5, r0 @@ -6301,7 +6301,7 @@ func_ov32_02180e08: ; 0x02180e08 _02180e3c: mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov32_02180e08 diff --git a/asm/ov34.inc b/asm/ov34.inc index 097c16c9..4bff8792 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -98,7 +98,7 @@ .extern Atan2 .extern func_01ffa9fc .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020078f4 .extern func_02007908 .extern func_02016fe8 @@ -232,12 +232,12 @@ .extern func_ov14_021231d4 .extern func_ov14_02123904 .extern _ZN9EquipRope18func_ov14_0213d420Ev -.extern func_ov14_0213d440 +.extern _ZN9EquipRope18func_ov14_0213d440Ei .extern _ZN9EquipRope18func_ov14_0213d480Ei .extern func_ov14_0213d594 .extern func_ov14_0213d5d0 -.extern func_ov14_0213d91c -.extern func_ov14_0213dadc +.extern _ZN9EquipRope18func_ov14_0213d91cEi +.extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder .extern func_ov14_0213dba4 .extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor diff --git a/asm/ov34.s b/asm/ov34.s index b93f1e0c..f8a5dcd8 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -6530,7 +6530,7 @@ func_ov34_02181a00: ; 0x02181a00 bl func_ov34_021800c4 ldr r1, [r6, #8] mov r4, r0 - bl func_ov14_0213d440 + bl _ZN9EquipRope18func_ov14_0213d440Ei movs r5, r0 bmi _02181afc mov r0, r4 @@ -6566,7 +6566,7 @@ func_ov34_02181a00: ; 0x02181a00 add r2, sp, #0x44 mov r0, r4 mov r1, r5 - bl func_ov14_0213dadc + bl _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder add r1, r6, #0x104 add r0, sp, #0x50 add r2, sp, #0x38 @@ -6608,7 +6608,7 @@ _02181afc: beq _02181b50 mov r0, r4 mov r1, r5 - bl func_ov14_0213d91c + bl _ZN9EquipRope18func_ov14_0213d91cEi _02181b50: add r0, r6, #0x104 add r0, r0, #0x1c00 @@ -9234,7 +9234,7 @@ func_ov34_02184024: ; 0x02184024 bl func_ov34_021800c4 ldr r1, [r6, #8] mov r4, r0 - bl func_ov14_0213d440 + bl _ZN9EquipRope18func_ov14_0213d440Ei movs r5, r0 bmi _02184104 mov r0, r4 @@ -9282,7 +9282,7 @@ _02184084: add r2, sp, #0xc mov r0, r4 mov r1, r5 - bl func_ov14_0213dadc + bl _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, pc} _02184104: @@ -10141,7 +10141,7 @@ _02184c10: _02184c64: mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02184c8c mov r0, r4 @@ -10325,7 +10325,7 @@ _02184ea8: _02184efc: mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 addeq sp, sp, #0x30 ldmeqia sp!, {r3, r4, r5, pc} diff --git a/asm/ov35.inc b/asm/ov35.inc index a085c0f6..b08ff9af 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -129,7 +129,7 @@ .extern func_01ffbe78 .extern func_01fffbec .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020079d8 .extern func_02016fe8 .extern func_0201838c diff --git a/asm/ov35.s b/asm/ov35.s index a0c31b09..2e6ba6f2 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -2723,7 +2723,7 @@ _0217e23c: bl func_ov00_020cc3fc mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei strb r0, [r5, #0x302] ldr r0, [r5, #0x48] str r0, [r5, #0x2f0] @@ -5539,7 +5539,7 @@ _02180a98: bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei strb r0, [r4, #0x566] mov r0, r4 bl func_ov35_0218307c diff --git a/asm/ov36.inc b/asm/ov36.inc index f4a5496a..09d33e41 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -114,7 +114,7 @@ .extern func_01ffe1cc .extern func_01fffbec .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020078f4 .extern func_02007908 .extern func_020079d8 diff --git a/asm/ov36.s b/asm/ov36.s index 4e4a3600..c4640108 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -2210,7 +2210,7 @@ _0217db28: bl func_ov36_0218543c mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei mov r0, r4 bl func_ov36_021858f0 add r0, r4, #0x158 @@ -11918,7 +11918,7 @@ _02186470: _02186488: mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r5, #0x111] cmp r0, #0 ldreqb r0, [r5, #0x110] diff --git a/asm/ov37.inc b/asm/ov37.inc index 26671732..ca4bf997 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -116,7 +116,7 @@ .extern func_01fffbec .extern func_01fffcd8 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_020079d8 .extern func_02016fe8 .extern func_02018450 diff --git a/asm/ov37.s b/asm/ov37.s index 32b10692..95b5c37e 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -9953,7 +9953,7 @@ _02184850: mov r1, #0 mov r0, r5 str r1, [r2, #0x34] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _021848cc ldr r0, [r5, #0xc4] diff --git a/asm/ov38.inc b/asm/ov38.inc index 25f2efff..77a75b04 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -232,11 +232,11 @@ .extern func_ov14_021231d4 .extern func_ov14_02123904 .extern _ZN9EquipRope18func_ov14_0213d420Ev -.extern func_ov14_0213d440 +.extern _ZN9EquipRope18func_ov14_0213d440Ei .extern _ZN9EquipRope18func_ov14_0213d480Ei -.extern func_ov14_0213d81c -.extern func_ov14_0213d91c -.extern func_ov14_0213dadc +.extern _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p +.extern _ZN9EquipRope18func_ov14_0213d91cEi +.extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder .extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor .extern func_ov29_0216d74c diff --git a/asm/ov38.s b/asm/ov38.s index 0d7eb42b..824746f9 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -1986,7 +1986,7 @@ func_ov38_0217d918: ; 0x0217d918 bl func_ov38_0217dac0 ldr r1, [r7, #8] mov r5, r0 - bl func_ov14_0213d440 + bl _ZN9EquipRope18func_ov14_0213d440Ei movs r6, r0 bmi _0217da1c mov r0, r5 @@ -1999,7 +1999,7 @@ func_ov38_0217d918: ; 0x0217d918 add r2, sp, #0x1c mov r0, r5 mov r1, r6 - bl func_ov14_0213d81c + bl _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p cmp r0, #0 beq _0217da0c ldr r1, [sp, #0x1c] @@ -2029,14 +2029,14 @@ func_ov38_0217d918: ; 0x0217d918 add r2, sp, #0xc mov r0, r5 mov r1, r6 - bl func_ov14_0213dadc + bl _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder cmp r0, #0 moveq r4, #0 b _0217da20 _0217d9f0: mov r0, r5 mov r1, r6 - bl func_ov14_0213d91c + bl _ZN9EquipRope18func_ov14_0213d91cEi mov r0, r5 bl func_ov57_02199e24 mov r4, #0 @@ -2939,7 +2939,7 @@ func_ov38_0217e688: ; 0x0217e688 bl func_ov38_0217dac0 ldr r1, [r4, #8] mov r5, r0 - bl func_ov14_0213d440 + bl _ZN9EquipRope18func_ov14_0213d440Ei add r1, r4, #0x1000 ldr r2, [r1, #0x5c] mov r6, r0 @@ -2962,7 +2962,7 @@ func_ov38_0217e688: ; 0x0217e688 add r2, sp, #0 mov r0, r5 mov r1, r6 - bl func_ov14_0213dadc + bl _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder add sp, sp, #0x10 mov r0, r7 ldmia sp!, {r3, r4, r5, r6, r7, pc} diff --git a/asm/ov43.inc b/asm/ov43.inc index 0ea635b3..e34e395f 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -82,7 +82,7 @@ .extern Vec3p_Axpy .extern Atan2 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_0201e544 .extern func_0202b154 .extern func_0202da8c diff --git a/asm/ov43.s b/asm/ov43.s index 67f2c363..7d6d705b 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -3146,7 +3146,7 @@ _0218bf54: bl func_ov00_020cc45c mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r0, [r4, #0x2a0] cmp r0, #0 moveq r6, #2 @@ -3641,7 +3641,7 @@ _0218c690: bl func_ov00_020cc45c mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei mov r0, r4 bl func_ov00_020cb58c cmp r0, #0 @@ -3733,7 +3733,7 @@ _0218c7e8: bl func_ov00_020cc45c mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldr r0, [r4, #0x29c] add r0, r0, #0xc bl func_0202e58c diff --git a/asm/ov44.inc b/asm/ov44.inc index d30c4c71..4f197842 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -86,7 +86,7 @@ .extern Vec3p_Axpy .extern Atan2 .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02002bf4 .extern func_02016fe8 .extern func_0201e544 diff --git a/asm/ov44.s b/asm/ov44.s index 113d9f53..a0af6e4c 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -1932,7 +1932,7 @@ _0218accc: mov r0, r4 mov r1, #0 ldr r5, [r4, #0x64] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r4, #0x111] cmp r0, #0 addeq sp, sp, #0x3c @@ -3967,7 +3967,7 @@ func_ov44_0218c4b8: ; 0x0218c4b8 bl Vec3p_Add mov r0, r5 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 mov r0, r5 beq _0218c53c diff --git a/asm/ov47.inc b/asm/ov47.inc index 8c639125..7f788d2a 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -92,7 +92,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02018450 .extern func_0201b1bc .extern func_0201e388 diff --git a/asm/ov47.s b/asm/ov47.s index f4007b74..3f2dcead 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -820,7 +820,7 @@ _02190ab8: bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r4, #0x17c] cmp r0, #0 beq _02190b14 @@ -4648,7 +4648,7 @@ func_ov47_02193dec: ; 0x02193dec bl Vec3p_Add mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov47_02193dec diff --git a/asm/ov48.inc b/asm/ov48.inc index 53ea7e21..18e32c3e 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -154,7 +154,7 @@ .extern Atan2 .extern func_01ffbf5c .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02002c14 .extern func_02016fe8 .extern func_020197bc diff --git a/asm/ov48.s b/asm/ov48.s index 08b6bf21..ca75871c 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -2776,7 +2776,7 @@ func_ov48_02192060: ; 0x02192060 bl func_ov00_020cc438 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov48_02192060 diff --git a/asm/ov49.inc b/asm/ov49.inc index 9f3f0b96..65524f3b 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -99,7 +99,7 @@ .extern Vec3p_Distance .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02016fe8 .extern func_02018450 .extern func_02019534 diff --git a/asm/ov49.s b/asm/ov49.s index a3bea689..c6fc392d 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -2647,7 +2647,7 @@ _021978a8: mov r0, r5 mov r1, #0 ldr r4, [r5, #0x64] - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r0, [r5, #0x111] cmp r0, #0 beq _021979e0 diff --git a/asm/ov50.inc b/asm/ov50.inc index 4591ac82..18c4ddbc 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -104,7 +104,7 @@ .extern Atan2 .extern _ZN8Cylinder8OverlapsEPS_ .extern func_01fffbec -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_0202b154 .extern func_0202bb78 .extern func_0202bbbc diff --git a/asm/ov50.s b/asm/ov50.s index 4228f49c..d9aedd29 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -373,7 +373,7 @@ _021959c8: str r1, [r6, #0xa0] mov r0, r6 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldrb r1, [r6, #0x110] mov r4, r0 cmp r1, #0 diff --git a/asm/ov51.inc b/asm/ov51.inc index 530b03a2..0ccd76b1 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -87,7 +87,7 @@ .extern Atan2 .extern func_01ffe1cc .extern _ZN11ItemManager21GetEquipItemUncheckedEi -.extern func_01fffd04 +.extern _ZN5Actor13func_01fffd04Ei .extern func_02002c14 .extern func_02016fe8 .extern func_020197fc diff --git a/asm/ov51.s b/asm/ov51.s index 63cf2f8e..f16ec677 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -733,7 +733,7 @@ _02195e48: mov r0, r5 bge _02195e7c mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei cmp r0, #0 beq _02195e80 mov r0, r5 @@ -1978,7 +1978,7 @@ func_ov51_02196dec: ; 0x02196dec bl func_ov51_02196dc4 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov51_02196dec @@ -2135,7 +2135,7 @@ _02197018: bl func_ov51_02196dc4 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} .align 2, 0 _02197030: .word 0x00000199 @@ -2156,7 +2156,7 @@ func_ov51_02197038: ; 0x02197038 bl func_ov51_02196dc4 mov r0, r4 mov r1, #0 - bl func_01fffd04 + bl _ZN5Actor13func_01fffd04Ei ldmia sp!, {r4, pc} arm_func_end func_ov51_02197038