From 11df03430020f7b6e73951fd622aa00424d8de79 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 25 May 2024 20:16:23 +0200 Subject: [PATCH] Mangle `EquipRope::func_ov14_0213ddd4` --- asm/ov00/Actor/Actor.inc | 2 +- asm/ov00/Actor/Actor.s | 2 +- asm/ov14/ov14_0213b778.s | 8 ++++---- asm/ov29.inc | 2 +- asm/ov29.s | 2 +- asm/ov34.inc | 2 +- asm/ov34.s | 2 +- asm/ov38.inc | 2 +- asm/ov38.s | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index cba81464..9e4972d0 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -70,7 +70,7 @@ .extern func_ov14_0213d81c .extern func_ov14_0213d91c .extern func_ov14_0213dadc -.extern func_ov14_0213ddd4 +.extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor .extern gAdventureFlags .extern gItemManager diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 3b5d3a30..ff639720 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -2143,7 +2143,7 @@ _ZN5Actor18func_ov00_020c2e7cEv: ; 0x020c2e7c cmp r1, #0 bne _020c2eb4 mov r1, r6 - bl func_ov14_0213ddd4 + bl _ZN9EquipRope18func_ov14_0213ddd4EP5Actor cmp r0, #0 ldrgesh r1, [r4, #0x70] cmpge r1, r0 diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index c011f670..073d75af 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -3320,9 +3320,9 @@ _0213dda8: bx lr arm_func_end func_ov14_0213dda0 - .global func_ov14_0213ddd4 - arm_func_start func_ov14_0213ddd4 -func_ov14_0213ddd4: ; 0x0213ddd4 + .global _ZN9EquipRope18func_ov14_0213ddd4EP5Actor + arm_func_start _ZN9EquipRope18func_ov14_0213ddd4EP5Actor +_ZN9EquipRope18func_ov14_0213ddd4EP5Actor: ; 0x0213ddd4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x2c mov r5, r0 @@ -3398,7 +3398,7 @@ _0213def0: mvn r0, #0 add sp, sp, #0x2c ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end func_ov14_0213ddd4 + arm_func_end _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .global _ZN9EquipRope18func_ov14_0213defcEP5Actor arm_func_start _ZN9EquipRope18func_ov14_0213defcEP5Actor diff --git a/asm/ov29.inc b/asm/ov29.inc index 589324e8..4e94bd05 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -342,7 +342,7 @@ .extern _ZN9EquipRope18func_ov14_0213d480Ei .extern func_ov14_0213d5d0 .extern func_ov14_0213dadc -.extern func_ov14_0213ddd4 +.extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .extern func_ov14_021448d4 .extern func_ov14_021448dc .extern func_ov14_021448e4 diff --git a/asm/ov29.s b/asm/ov29.s index 0b1e35ca..fa6372f8 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -9596,7 +9596,7 @@ _02175850: bl func_ov29_021758f0 mov r1, r5 mov r6, r0 - bl func_ov14_0213ddd4 + bl _ZN9EquipRope18func_ov14_0213ddd4EP5Actor movs r4, r0 bmi _021758d0 ldr r0, _021758ec ; =data_ov29_0217bc78 diff --git a/asm/ov34.inc b/asm/ov34.inc index d2218a5e..097c16c9 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -239,7 +239,7 @@ .extern func_ov14_0213d91c .extern func_ov14_0213dadc .extern func_ov14_0213dba4 -.extern func_ov14_0213ddd4 +.extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor .extern func_ov14_0213dfbc .extern func_ov14_0213e144 diff --git a/asm/ov34.s b/asm/ov34.s index 4d0e9161..b93f1e0c 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -4703,7 +4703,7 @@ _0217ffc8: bl func_ov34_021800c4 mov r1, r5 mov r4, r0 - bl func_ov14_0213ddd4 + bl _ZN9EquipRope18func_ov14_0213ddd4EP5Actor cmp r0, #0 blt _02180038 mov r0, r4 diff --git a/asm/ov38.inc b/asm/ov38.inc index aaebcf7c..25f2efff 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -237,7 +237,7 @@ .extern func_ov14_0213d81c .extern func_ov14_0213d91c .extern func_ov14_0213dadc -.extern func_ov14_0213ddd4 +.extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor .extern func_ov29_0216d74c .extern func_ov29_0216d77c diff --git a/asm/ov38.s b/asm/ov38.s index 1172183f..0d7eb42b 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -4365,7 +4365,7 @@ _0217fa8c: bl func_ov38_0217dac0 mov r1, r4 mov r5, r0 - bl func_ov14_0213ddd4 + bl _ZN9EquipRope18func_ov14_0213ddd4EP5Actor cmp r0, #0 blt _0217fae8 mov r0, r5